]> git.saurik.com Git - wxWidgets.git/commitdiff
remove ODBC and DBgrid libraries
authorVadim Zeitlin <vadim@wxwidgets.org>
Tue, 23 Oct 2007 13:40:27 +0000 (13:40 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Tue, 23 Oct 2007 13:40:27 +0000 (13:40 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

232 files changed:
Makefile.in
autoconf_inc.m4
build/bakefiles/build_cfg.bkl
build/bakefiles/common.bkl
build/bakefiles/config.bkl
build/bakefiles/files.bkl
build/bakefiles/make_dist.mk
build/bakefiles/monolithic.bkl
build/bakefiles/multilib.bkl
build/bakefiles/odbc.bkl [deleted file]
build/bakefiles/wxpresets/presets/wx.bkl
build/bakefiles/wxpresets/presets/wx_win32.bkl
build/bakefiles/wxwin.py
build/mgl/config.wat
build/mgl/makefile.wat
build/msw/config.bcc
build/msw/config.gcc
build/msw/config.vc
build/msw/config.wat
build/msw/makefile.bcc
build/msw/makefile.gcc
build/msw/makefile.vc
build/msw/makefile.wat
build/msw/wx.dsw
build/msw/wx_adv.dsp
build/msw/wx_aui.dsp
build/msw/wx_base.dsp
build/msw/wx_core.dsp
build/msw/wx_dbgrid.dsp [deleted file]
build/msw/wx_dll.dsw
build/msw/wx_gl.dsp
build/msw/wx_html.dsp
build/msw/wx_media.dsp
build/msw/wx_net.dsp
build/msw/wx_odbc.dsp [deleted file]
build/msw/wx_qa.dsp
build/msw/wx_richtext.dsp
build/msw/wx_stc.dsp
build/msw/wx_xml.dsp
build/msw/wx_xrc.dsp
build/os2/config.wat
build/os2/makefile.wat
build/palmos/makefile
configure
configure.in
demos/dbbrowse/Makefile.in [deleted file]
demos/dbbrowse/bitmaps/col.ico [deleted file]
demos/dbbrowse/bitmaps/col.xpm [deleted file]
demos/dbbrowse/bitmaps/d_closed.ico [deleted file]
demos/dbbrowse/bitmaps/d_closed.xpm [deleted file]
demos/dbbrowse/bitmaps/d_open.ico [deleted file]
demos/dbbrowse/bitmaps/d_open.xpm [deleted file]
demos/dbbrowse/bitmaps/dsn.ico [deleted file]
demos/dbbrowse/bitmaps/dsn.xpm [deleted file]
demos/dbbrowse/bitmaps/dsnclose.ico [deleted file]
demos/dbbrowse/bitmaps/dsnclose.xpm [deleted file]
demos/dbbrowse/bitmaps/dsnopen.ico [deleted file]
demos/dbbrowse/bitmaps/dsnopen.xpm [deleted file]
demos/dbbrowse/bitmaps/f_closed.ico [deleted file]
demos/dbbrowse/bitmaps/f_closed.xpm [deleted file]
demos/dbbrowse/bitmaps/f_open.ico [deleted file]
demos/dbbrowse/bitmaps/f_open.xpm [deleted file]
demos/dbbrowse/bitmaps/key.ico [deleted file]
demos/dbbrowse/bitmaps/key.xpm [deleted file]
demos/dbbrowse/bitmaps/keyf.ico [deleted file]
demos/dbbrowse/bitmaps/keyf.xpm [deleted file]
demos/dbbrowse/bitmaps/logo.ico [deleted file]
demos/dbbrowse/bitmaps/logo.xpm [deleted file]
demos/dbbrowse/bitmaps/pgmctrl.bmp [deleted file]
demos/dbbrowse/bitmaps/pgmctrl.ico [deleted file]
demos/dbbrowse/bitmaps/pgmctrl.xpm [deleted file]
demos/dbbrowse/bitmaps/tab.ico [deleted file]
demos/dbbrowse/bitmaps/tab.xpm [deleted file]
demos/dbbrowse/bitmaps/view.ico [deleted file]
demos/dbbrowse/bitmaps/view.xpm [deleted file]
demos/dbbrowse/browsedb.cpp [deleted file]
demos/dbbrowse/browsedb.h [deleted file]
demos/dbbrowse/dbbrowse.bkl [deleted file]
demos/dbbrowse/dbbrowse.cpp [deleted file]
demos/dbbrowse/dbbrowse.dsp [deleted file]
demos/dbbrowse/dbbrowse.h [deleted file]
demos/dbbrowse/dbbrowse.rc [deleted file]
demos/dbbrowse/dbbrowseM5.xml [deleted file]
demos/dbbrowse/dbgrid.cpp [deleted file]
demos/dbbrowse/dbgrid.h [deleted file]
demos/dbbrowse/dbtree.cpp [deleted file]
demos/dbbrowse/dbtree.h [deleted file]
demos/dbbrowse/de/dbbrowse.mo [deleted file]
demos/dbbrowse/de/dbbrowse.po [deleted file]
demos/dbbrowse/de/de.po [deleted file]
demos/dbbrowse/de/help.mo [deleted file]
demos/dbbrowse/de/help.po [deleted file]
demos/dbbrowse/de/mo.cmd [deleted file]
demos/dbbrowse/de/mo_de.cmd [deleted file]
demos/dbbrowse/de/wxstd.mo [deleted file]
demos/dbbrowse/de/xget.cfg [deleted file]
demos/dbbrowse/de/xget.cmd [deleted file]
demos/dbbrowse/dlguser.cpp [deleted file]
demos/dbbrowse/dlguser.h [deleted file]
demos/dbbrowse/doc.cpp [deleted file]
demos/dbbrowse/doc.h [deleted file]
demos/dbbrowse/dummy.cpp [deleted file]
demos/dbbrowse/fr/wxstd.mo [deleted file]
demos/dbbrowse/fr/xget.cfg [deleted file]
demos/dbbrowse/help.cz/wxstd.mo [deleted file]
demos/dbbrowse/help.de/compiler.htm [deleted file]
demos/dbbrowse/help.de/dbbrowse.hhc [deleted file]
demos/dbbrowse/help.de/dbbrowse.hhk [deleted file]
demos/dbbrowse/help.de/dbbrowse.hhp [deleted file]
demos/dbbrowse/help.de/dbbrowse.htm [deleted file]
demos/dbbrowse/help.de/getcol.htm [deleted file]
demos/dbbrowse/help.de/getcolsh.htm [deleted file]
demos/dbbrowse/help.de/icons.htm [deleted file]
demos/dbbrowse/help.de/picgrams.htm [deleted file]
demos/dbbrowse/help.de/problems.htm [deleted file]
demos/dbbrowse/help.de/remstar.htm [deleted file]
demos/dbbrowse/help.de/sample.htm [deleted file]
demos/dbbrowse/help.de/startprm.htm [deleted file]
demos/dbbrowse/help.de/todo.htm [deleted file]
demos/dbbrowse/help.de/wxdb.htm [deleted file]
demos/dbbrowse/help.de/wxtable.htm [deleted file]
demos/dbbrowse/help.png/col.png [deleted file]
demos/dbbrowse/help.png/d_closed.png [deleted file]
demos/dbbrowse/help.png/d_open.png [deleted file]
demos/dbbrowse/help.png/dsn.png [deleted file]
demos/dbbrowse/help.png/dsnclose.png [deleted file]
demos/dbbrowse/help.png/dsnopen.png [deleted file]
demos/dbbrowse/help.png/f_closed.png [deleted file]
demos/dbbrowse/help.png/f_open.png [deleted file]
demos/dbbrowse/help.png/gnu.png [deleted file]
demos/dbbrowse/help.png/gtk.png [deleted file]
demos/dbbrowse/help.png/imbau.png [deleted file]
demos/dbbrowse/help.png/kde.png [deleted file]
demos/dbbrowse/help.png/key.png [deleted file]
demos/dbbrowse/help.png/keyf.png [deleted file]
demos/dbbrowse/help.png/linux.png [deleted file]
demos/dbbrowse/help.png/logo.png [deleted file]
demos/dbbrowse/help.png/motif.png [deleted file]
demos/dbbrowse/help.png/msvc.png [deleted file]
demos/dbbrowse/help.png/odbc.png [deleted file]
demos/dbbrowse/help.png/pgmctrl.png [deleted file]
demos/dbbrowse/help.png/redh.png [deleted file]
demos/dbbrowse/help.png/remstar.png [deleted file]
demos/dbbrowse/help.png/server.png [deleted file]
demos/dbbrowse/help.png/suse.png [deleted file]
demos/dbbrowse/help.png/tab.png [deleted file]
demos/dbbrowse/help.png/view.png [deleted file]
demos/dbbrowse/help.png/winnt.png [deleted file]
demos/dbbrowse/help.png/wins.png [deleted file]
demos/dbbrowse/help.std/compiler.htm [deleted file]
demos/dbbrowse/help.std/dbbrowse.hhc [deleted file]
demos/dbbrowse/help.std/dbbrowse.hhk [deleted file]
demos/dbbrowse/help.std/dbbrowse.hhp [deleted file]
demos/dbbrowse/help.std/dbbrowse.htm [deleted file]
demos/dbbrowse/help.std/getcol.htm [deleted file]
demos/dbbrowse/help.std/getcolsh.htm [deleted file]
demos/dbbrowse/help.std/icons.htm [deleted file]
demos/dbbrowse/help.std/picgrams.htm [deleted file]
demos/dbbrowse/help.std/problems.htm [deleted file]
demos/dbbrowse/help.std/remstar.htm [deleted file]
demos/dbbrowse/help.std/sample.htm [deleted file]
demos/dbbrowse/help.std/startprm.htm [deleted file]
demos/dbbrowse/help.std/todo.htm [deleted file]
demos/dbbrowse/help.std/wxdb.htm [deleted file]
demos/dbbrowse/help.std/wxtable.htm [deleted file]
demos/dbbrowse/makefile.bcc [deleted file]
demos/dbbrowse/makefile.gcc [deleted file]
demos/dbbrowse/makefile.gtk [deleted file]
demos/dbbrowse/makefile.vc [deleted file]
demos/dbbrowse/makefile.wat [deleted file]
demos/dbbrowse/pgmctrl.cpp [deleted file]
demos/dbbrowse/pgmctrl.h [deleted file]
demos/dbbrowse/std.h [deleted file]
demos/dbbrowse/tabpgwin.cpp [deleted file]
demos/dbbrowse/tabpgwin.h [deleted file]
docs/changes.txt
docs/latex/wx/category.tex
docs/latex/wx/db.tex [deleted file]
docs/latex/wx/libs.tex
docs/latex/wx/table.tex [deleted file]
docs/latex/wx/tdb.tex [deleted file]
docs/latex/wx/topics.tex
docs/latex/wx/tsamples.tex
docs/latex/wx/variant.tex
docs/latex/wx/wxusedef.tex
include/wx/chkconf.h
include/wx/db.h [deleted file]
include/wx/dbgrid.h [deleted file]
include/wx/dbkeyg.h [deleted file]
include/wx/dbtable.h [deleted file]
include/wx/dlimpexp.h
include/wx/isql.h [deleted file]
include/wx/isqlext.h [deleted file]
include/wx/mac/setup0.h
include/wx/mgl/chkconf.h
include/wx/motif/setup0.h
include/wx/msw/setup0.h
include/wx/msw/wince/setup.h
include/wx/os2/setup0.h
include/wx/palmos/setup0.h
include/wx/setup_inc.h
include/wx/univ/setup0.h
include/wx/variant.h
samples/console/console.cpp
samples/db/Makefile.in [deleted file]
samples/db/db.bkl [deleted file]
samples/db/db.dsp [deleted file]
samples/db/db.xpm [deleted file]
samples/db/dbM5.xml [deleted file]
samples/db/dbtest.cpp [deleted file]
samples/db/dbtest.h [deleted file]
samples/db/dbtest.ico [deleted file]
samples/db/dbtest.rc [deleted file]
samples/db/descrip.mms [deleted file]
samples/db/listdb.cpp [deleted file]
samples/db/listdb.h [deleted file]
samples/db/makefile.bcc [deleted file]
samples/db/makefile.gcc [deleted file]
samples/db/makefile.unx [deleted file]
samples/db/makefile.vc [deleted file]
samples/db/makefile.wat [deleted file]
setup.h.in
setup.h_vms
src/common/db.cpp [deleted file]
src/common/dbgrid.cpp [deleted file]
src/common/dbtable.cpp [deleted file]
src/common/variant.cpp
wx-config.in
wxBase.spec
wxGTK.spec
wxMotif.spec
wxX11.spec

index d405696c57a2197ca5dcdf058703e9d6742128e8..762d56786eee853180d7697a02f57c807145c3ce 100644 (file)
@@ -58,7 +58,6 @@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_XML = @EXTRALIBS_XML@
 EXTRALIBS_HTML = @EXTRALIBS_HTML@
-EXTRALIBS_ODBC = @EXTRALIBS_ODBC@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
 EXTRALIBS_SDL = @EXTRALIBS_SDL@
@@ -201,23 +200,6 @@ WXTIFF_OBJECTS =  \
        wxtiff_tif_warning.o \
        wxtiff_tif_write.o \
        wxtiff_tif_zip.o
-WXODBC_CFLAGS =        $(____SHARED) $(CPPFLAGS) $(CFLAGS)
-WXODBC_OBJECTS =  \
-       wxodbc_catalog.o \
-       wxodbc_connect.o \
-       wxodbc_dlf.o \
-       wxodbc_dlproc.o \
-       wxodbc_execute.o \
-       wxodbc_fetch.o \
-       wxodbc_hdbc.o \
-       wxodbc_henv.o \
-       wxodbc_herr.o \
-       wxodbc_hstmt.o \
-       wxodbc_info.o \
-       wxodbc_itrace.o \
-       wxodbc_misc.o \
-       wxodbc_prepare.o \
-       wxodbc_result.o
 WXEXPAT_CFLAGS =       -I./src/expat  $(____SHARED) $(CPPFLAGS) $(CFLAGS)
 WXEXPAT_OBJECTS =  \
        wxexpat_xmlparse.o \
@@ -448,10 +430,7 @@ ALL_BASE_HEADERS =  \
        wx/url.h \
        $(NET_PLATFORM_HDR) \
        wx/xml/xml.h \
-       wx/xtixml.h \
-       wx/db.h \
-       wx/dbkeyg.h \
-       wx/dbtable.h
+       wx/xtixml.h
 ALL_HEADERS =  \
        $(ALL_BASE_HEADERS) \
        $(ALL_GUI_HEADERS)
@@ -639,10 +618,7 @@ ALL_PORTS_BASE_HEADERS =  \
        wx/unix/gsockunx.h \
        wx/mac/carbon/gsockmac.h \
        wx/xml/xml.h \
-       wx/xtixml.h \
-       wx/db.h \
-       wx/dbkeyg.h \
-       wx/dbtable.h
+       wx/xtixml.h
 ALL_BASE_SOURCES =  \
        src/common/appbase.cpp \
        src/common/arcall.cpp \
@@ -803,22 +779,19 @@ ALL_BASE_SOURCES =  \
        src/msw/urlmsw.cpp \
        $(NET_WINCE_SRC) \
        src/xml/xml.cpp \
-       src/common/xtixml.cpp \
-       src/common/db.cpp \
-       src/common/dbtable.cpp
+       src/common/xtixml.cpp
 MONODLL_CFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DwxUSE_BASE=1 -DWXMAKINGDLL \
-       -I$(top_srcdir)/src/stc/scintilla/include \
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_BASE=1 -DWXMAKINGDLL -I$(top_srcdir)/src/stc/scintilla/include \
        -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
        $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS)
 MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
        $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 -DWXMAKINGDLL \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DwxUSE_BASE=1 -DWXMAKINGDLL \
        -I$(top_srcdir)/src/stc/scintilla/include \
        -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
        $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
@@ -925,16 +898,15 @@ MONODLL_ODEP =  $(___pch_wxprec_monodll_wx_wxprec_h_gch___depname)
 MONOLIB_CFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DwxUSE_BASE=1 -I$(top_srcdir)/src/stc/scintilla/include \
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_BASE=1 -I$(top_srcdir)/src/stc/scintilla/include \
        -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
        $(CPPFLAGS) $(CFLAGS)
 MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
        $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 \
-       -I$(top_srcdir)/src/stc/scintilla/include \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DwxUSE_BASE=1 -I$(top_srcdir)/src/stc/scintilla/include \
        -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
        $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 MONOLIB_OBJECTS =  \
@@ -1039,15 +1011,15 @@ MONOLIB_ODEP =  $(___pch_wxprec_monolib_wx_wxprec_h_gch___depname)
 BASEDLL_CFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) \
-       $(CPPFLAGS) $(CFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) \
+       $(CFLAGS)
 BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
        $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \
-       -DwxUSE_BASE=1 $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) \
+       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 BASEDLL_OBJECTS =  \
        $(__basedll___win32rc) \
        basedll_appbase.o \
@@ -1136,14 +1108,14 @@ BASEDLL_ODEP =  $(___pch_wxprec_basedll_wx_wxprec_h_gch___depname)
 BASELIB_CFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
 BASELIB_CXXFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
        $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 \
-       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CXXWARNINGS) $(CPPFLAGS) \
+       $(CXXFLAGS)
 BASELIB_OBJECTS =  \
        baselib_appbase.o \
        baselib_arcall.o \
@@ -1231,9 +1203,9 @@ BASELIB_ODEP =  $(___pch_wxprec_baselib_wx_wxprec_h_gch___depname)
 NETDLL_CXXFLAGS = $(__netdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(PIC_FLAG) \
-       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(PIC_FLAG) $(CXXWARNINGS) \
+       $(CPPFLAGS) $(CXXFLAGS)
 NETDLL_OBJECTS =  \
        $(__netdll___win32rc) \
        netdll_fs_inet.o \
@@ -1251,8 +1223,8 @@ NETDLL_ODEP =  $(___pch_wxprec_netdll_wx_wxprec_h_gch___depname)
 NETLIB_CXXFLAGS = $(__netlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_GUI=0 $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 NETLIB_OBJECTS =  \
        netlib_fs_inet.o \
        netlib_ftp.o \
@@ -1269,15 +1241,15 @@ NETLIB_ODEP =  $(___pch_wxprec_netlib_wx_wxprec_h_gch___depname)
 COREDLL_CFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) \
-       $(CPPFLAGS) $(CFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) $(CPPFLAGS) \
+       $(CFLAGS)
 COREDLL_CXXFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
        $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE \
-       -DwxUSE_BASE=0 $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) \
+       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 COREDLL_OBJECTS =  \
        $(__coredll___win32rc) \
        coredll_event.o \
@@ -1291,14 +1263,13 @@ COREDLL_ODEP =  $(___pch_wxprec_coredll_wx_wxprec_h_gch___depname)
 CORELIB_CFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS)
 CORELIB_CXXFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
        $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CXXWARNINGS) $(CPPFLAGS) \
-       $(CXXFLAGS)
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 CORELIB_OBJECTS =  \
        corelib_event.o \
        corelib_fs_mem.o \
@@ -1311,15 +1282,14 @@ CORELIB_ODEP =  $(___pch_wxprec_corelib_wx_wxprec_h_gch___depname)
 ADVDLL_CFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_ADV $(PIC_FLAG) $(CPPFLAGS) \
-       $(CFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXUSINGDLL -DWXMAKINGDLL_ADV $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS)
 ADVDLL_CXXFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_ADV $(PIC_FLAG) $(CXXWARNINGS) \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXUSINGDLL -DWXMAKINGDLL_ADV $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \
+       $(CXXFLAGS)
 ADVDLL_OBJECTS =  \
        $(__advdll___win32rc) \
        $(__ADVANCED_SRC_OBJECTS_2) \
@@ -1328,13 +1298,13 @@ ADVDLL_ODEP =  $(___pch_wxprec_advdll_wx_wxprec_h_gch___depname)
 ADVLIB_CFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) $(CPPFLAGS) $(CFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) \
+       $(CFLAGS)
 ADVLIB_CXXFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 ADVLIB_OBJECTS =  \
        $(__ADVANCED_SRC_OBJECTS_3) \
        $(__PLUGIN_ADV_SRC_OBJECTS_3)
@@ -1342,9 +1312,9 @@ ADVLIB_ODEP =  $(___pch_wxprec_advlib_wx_wxprec_h_gch___depname)
 MEDIADLL_CXXFLAGS = $(__mediadll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
        $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_MEDIA \
-       $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_MEDIA $(PIC_FLAG) $(CXXWARNINGS) \
+       $(CPPFLAGS) $(CXXFLAGS)
 MEDIADLL_OBJECTS =  \
        $(__mediadll___win32rc) \
        mediadll_mediactrlcmn.o \
@@ -1353,57 +1323,18 @@ MEDIADLL_ODEP =  $(___pch_wxprec_mediadll_wx_wxprec_h_gch___depname)
 MEDIALIB_CXXFLAGS = $(__medialib_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
        $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 MEDIALIB_OBJECTS =  \
        medialib_mediactrlcmn.o \
        $(__MEDIA_PLATFORM_SRC_OBJECTS_3)
 MEDIALIB_ODEP =  $(___pch_wxprec_medialib_wx_wxprec_h_gch___depname)
-ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \
-       -DWXMAKINGDLL_ODBC $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
-ODBCDLL_OBJECTS =  \
-       $(__odbcdll___win32rc) \
-       odbcdll_db.o \
-       odbcdll_dbtable.o
-ODBCDLL_ODEP =  $(___pch_wxprec_odbcdll_wx_wxprec_h_gch___depname)
-ODBCLIB_CXXFLAGS = $(__odbclib_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXWARNINGS) $(CPPFLAGS) \
-       $(CXXFLAGS)
-ODBCLIB_OBJECTS =  \
-       odbclib_db.o \
-       odbclib_dbtable.o
-ODBCLIB_ODEP =  $(___pch_wxprec_odbclib_wx_wxprec_h_gch___depname)
-DBGRIDDLL_CXXFLAGS = $(__dbgriddll_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_DBGRID \
-       $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
-DBGRIDDLL_OBJECTS =  \
-       $(__dbgriddll___win32rc) \
-       dbgriddll_dbgrid.o
-DBGRIDDLL_ODEP =  $(___pch_wxprec_dbgriddll_wx_wxprec_h_gch___depname)
-DBGRIDLIB_CXXFLAGS = $(__dbgridlib_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
-DBGRIDLIB_OBJECTS =  \
-       dbgridlib_dbgrid.o
-DBGRIDLIB_ODEP =  $(___pch_wxprec_dbgridlib_wx_wxprec_h_gch___depname)
 HTMLDLL_CXXFLAGS = $(__htmldll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
        $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_HTML \
-       $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_HTML $(PIC_FLAG) $(CXXWARNINGS) \
+       $(CPPFLAGS) $(CXXFLAGS)
 HTMLDLL_OBJECTS =  \
        $(__htmldll___win32rc) \
        $(__HTML_SRC_PLATFORM_OBJECTS_2) \
@@ -1434,8 +1365,8 @@ HTMLDLL_ODEP =  $(___pch_wxprec_htmldll_wx_wxprec_h_gch___depname)
 HTMLLIB_CXXFLAGS = $(__htmllib_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
        $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 HTMLLIB_OBJECTS =  \
        $(__HTML_SRC_PLATFORM_OBJECTS_3) \
        htmllib_helpctrl.o \
@@ -1465,9 +1396,9 @@ HTMLLIB_ODEP =  $(___pch_wxprec_htmllib_wx_wxprec_h_gch___depname)
 QADLL_CXXFLAGS = $(__qadll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_QA $(PIC_FLAG) $(CXXWARNINGS) \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXUSINGDLL -DWXMAKINGDLL_QA $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \
+       $(CXXFLAGS)
 QADLL_OBJECTS =  \
        $(__qadll___win32rc) \
        qadll_debugrpt.o \
@@ -1476,8 +1407,8 @@ QADLL_ODEP =  $(___pch_wxprec_qadll_wx_wxprec_h_gch___depname)
 QALIB_CXXFLAGS = $(__qalib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 QALIB_OBJECTS =  \
        qalib_debugrpt.o \
        qalib_dbgrptg.o
@@ -1485,9 +1416,9 @@ QALIB_ODEP =  $(___pch_wxprec_qalib_wx_wxprec_h_gch___depname)
 XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML $(PIC_FLAG) \
-       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML $(PIC_FLAG) $(CXXWARNINGS) \
+       $(CPPFLAGS) $(CXXFLAGS)
 XMLDLL_OBJECTS =  \
        $(__xmldll___win32rc) \
        xmldll_xml.o \
@@ -1496,8 +1427,8 @@ XMLDLL_ODEP =  $(___pch_wxprec_xmldll_wx_wxprec_h_gch___depname)
 XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_GUI=0 $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 XMLLIB_OBJECTS =  \
        xmllib_xml.o \
        xmllib_xtixml.o
@@ -1505,9 +1436,9 @@ XMLLIB_ODEP =  $(___pch_wxprec_xmllib_wx_wxprec_h_gch___depname)
 XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_XRC $(PIC_FLAG) $(CXXWARNINGS) \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXUSINGDLL -DWXMAKINGDLL_XRC $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \
+       $(CXXFLAGS)
 XRCDLL_OBJECTS =  \
        $(__xrcdll___win32rc) \
        xrcdll_xh_animatctrl.o \
@@ -1571,8 +1502,8 @@ XRCDLL_ODEP =  $(___pch_wxprec_xrcdll_wx_wxprec_h_gch___depname)
 XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 XRCLIB_OBJECTS =  \
        xrclib_xh_animatctrl.o \
        xrclib_xh_bmp.o \
@@ -1635,9 +1566,9 @@ XRCLIB_ODEP =  $(___pch_wxprec_xrclib_wx_wxprec_h_gch___depname)
 AUIDLL_CXXFLAGS = $(__auidll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_AUI $(PIC_FLAG) $(CXXWARNINGS) \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXUSINGDLL -DWXMAKINGDLL_AUI $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \
+       $(CXXFLAGS)
 AUIDLL_OBJECTS =  \
        $(__auidll___win32rc) \
        auidll_framemanager.o \
@@ -1649,8 +1580,8 @@ AUIDLL_ODEP =  $(___pch_wxprec_auidll_wx_wxprec_h_gch___depname)
 AUILIB_CXXFLAGS = $(__auilib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 AUILIB_OBJECTS =  \
        auilib_framemanager.o \
        auilib_dockart.o \
@@ -1661,9 +1592,9 @@ AUILIB_ODEP =  $(___pch_wxprec_auilib_wx_wxprec_h_gch___depname)
 RICHTEXTDLL_CXXFLAGS = $(__richtextdll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
        $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_RICHTEXT \
-       $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_RICHTEXT $(PIC_FLAG) \
+       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 RICHTEXTDLL_OBJECTS =  \
        $(__richtextdll___win32rc) \
        richtextdll_richtextctrl.o \
@@ -1679,8 +1610,8 @@ RICHTEXTDLL_ODEP =  $(___pch_wxprec_richtextdll_wx_wxprec_h_gch___depname)
 RICHTEXTLIB_CXXFLAGS = $(__richtextlib_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
        $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 RICHTEXTLIB_OBJECTS =  \
        richtextlib_richtextctrl.o \
        richtextlib_richtextbuffer.o \
@@ -1695,8 +1626,8 @@ RICHTEXTLIB_ODEP =  $(___pch_wxprec_richtextlib_wx_wxprec_h_gch___depname)
 STCDLL_CXXFLAGS = $(__stcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -I$(top_srcdir)/src/stc/scintilla/include \
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -I$(top_srcdir)/src/stc/scintilla/include \
        -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
        -DWXUSINGDLL -DWXMAKINGDLL_STC $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \
        $(CXXFLAGS)
@@ -1709,8 +1640,8 @@ STCDLL_ODEP =  $(___pch_wxprec_stcdll_wx_wxprec_h_gch___depname)
 STCLIB_CXXFLAGS = $(__stclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -I$(top_srcdir)/src/stc/scintilla/include \
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -I$(top_srcdir)/src/stc/scintilla/include \
        -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
        $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 STCLIB_OBJECTS =  \
@@ -1721,9 +1652,9 @@ STCLIB_ODEP =  $(___pch_wxprec_stclib_wx_wxprec_h_gch___depname)
 GLDLL_CXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_GL $(PIC_FLAG) $(CXXWARNINGS) \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXUSINGDLL -DWXMAKINGDLL_GL $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \
+       $(CXXFLAGS)
 GLDLL_OBJECTS =  \
        $(__gldll___win32rc) \
        gldll_glcmn.o \
@@ -1732,8 +1663,8 @@ GLDLL_ODEP =  $(___pch_wxprec_gldll_wx_wxprec_h_gch___depname)
 GLLIB_CXXFLAGS = $(__gllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
 GLLIB_OBJECTS =  \
        gllib_glcmn.o \
        $(__OPENGL_SRC_PLATFORM_OBJECTS_1)
@@ -1813,13 +1744,6 @@ COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN___wxtiff___depname = \
 @COND_PLATFORM_OS2_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
 @COND_PLATFORM_UNIX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
 @COND_PLATFORM_WIN32_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_win32.o
-COND_WXUSE_ODBC_BUILTIN___wxodbc___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_WXUSE_ODBC_BUILTIN@__wxodbc___depname = $(COND_WXUSE_ODBC_BUILTIN___wxodbc___depname)
-@COND_SHARED_0_WXUSE_ODBC_BUILTIN@__install_wxodbc___depname \
-@COND_SHARED_0_WXUSE_ODBC_BUILTIN@     = install_wxodbc
-@COND_SHARED_0_WXUSE_ODBC_BUILTIN@__uninstall_wxodbc___depname \
-@COND_SHARED_0_WXUSE_ODBC_BUILTIN@     = uninstall_wxodbc
 COND_WXUSE_EXPAT_BUILTIN___wxexpat___depname = \
        $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 @COND_WXUSE_EXPAT_BUILTIN@__wxexpat___depname = $(COND_WXUSE_EXPAT_BUILTIN___wxexpat___depname)
@@ -3348,7 +3272,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/glcanvas.h \
        $(OPENGL_HDR_PLATFORM) \
        wx/debugrpt.h \
-       wx/dbgrid.h \
        wx/xrc/xh_all.h \
        wx/xrc/xh_animatctrl.h \
        wx/xrc/xh_bmpbt.h \
@@ -3711,11 +3634,8 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
        monodll_m_tables.o \
        monodll_winpars.o \
        monodll_htmllbox.o \
-       monodll_db.o \
-       monodll_dbtable.o \
        monodll_debugrpt.o \
        monodll_dbgrptg.o \
-       monodll_dbgrid.o \
        monodll_xh_animatctrl.o \
        monodll_xh_bmp.o \
        monodll_xh_bmpcbox.o \
@@ -5570,11 +5490,8 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
        monolib_m_tables.o \
        monolib_winpars.o \
        monolib_htmllbox.o \
-       monolib_db.o \
-       monolib_dbtable.o \
        monolib_debugrpt.o \
        monolib_dbgrptg.o \
-       monolib_dbgrid.o \
        monolib_xh_animatctrl.o \
        monolib_xh_bmp.o \
        monolib_xh_bmpcbox.o \
@@ -10986,136 +10903,6 @@ COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
 @COND_SHARED_1@____wxmedia_namedll_DEP = $(__mediadll___depname)
 @COND_SHARED_0@____wxmedia_namelib_DEP = $(__medialib___depname)
-COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname = \
-       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__odbcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__install_odbcdll___depname \
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        = install_odbcdll
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__uninstall_odbcdll___depname \
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        = uninstall_odbcdll
-COND_PLATFORM_MACOSX_1___odbcdll___macinstnamecmd = -install_name \
-       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__odbcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___odbcdll___macinstnamecmd)
-COND_PLATFORM_OS2_1___odbcdll___importlib = -import \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__odbcdll___importlib = $(COND_PLATFORM_OS2_1___odbcdll___importlib)
-COND_WINDOWS_IMPLIB_1___odbcdll___importlib = \
-       -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__odbcdll___importlib = $(COND_WINDOWS_IMPLIB_1___odbcdll___importlib)
-@COND_GCC_PCH_1@__odbcdll_PCH_INC = -I.pch/wxprec_odbcdll
-@COND_ICC_PCH_1@__odbcdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_odbcdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_odbcdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_odbcdll/wx/wxprec.h.gch
-COND_USE_SOVERLINUX_1___odbcdll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__odbcdll___soname_flags = $(COND_USE_SOVERLINUX_1___odbcdll___soname_flags)
-COND_USE_SOVERSOLARIS_1___odbcdll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__odbcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___odbcdll___soname_flags)
-COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__odbcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_inst_cmd = rm -f \
-       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__odbcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_uninst_cmd = rm -f \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__odbcdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_uninst_cmd)
-@COND_PLATFORM_WIN32_1@__odbcdll___win32rc = odbcdll_version_rc.o
-COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@__odbclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depname)
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@__install_odbclib___depname \
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        = install_odbclib
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@__uninstall_odbclib___depname \
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        = uninstall_odbclib
-@COND_GCC_PCH_1@__odbclib_PCH_INC = -I.pch/wxprec_odbclib
-@COND_ICC_PCH_1@__odbclib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_odbclib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_odbclib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_odbclib/wx/wxprec.h.gch
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname = \
-       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__dbgriddll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__install_dbgriddll___depname \
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      = install_dbgriddll
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__uninstall_dbgriddll___depname \
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      = uninstall_dbgriddll
-COND_PLATFORM_MACOSX_1___dbgriddll___macinstnamecmd = -install_name \
-       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__dbgriddll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___dbgriddll___macinstnamecmd)
-COND_PLATFORM_OS2_1___dbgriddll___importlib = -import \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__dbgriddll___importlib = $(COND_PLATFORM_OS2_1___dbgriddll___importlib)
-COND_WINDOWS_IMPLIB_1___dbgriddll___importlib = \
-       -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_WINDOWS_IMPLIB_1@__dbgriddll___importlib = $(COND_WINDOWS_IMPLIB_1___dbgriddll___importlib)
-@COND_GCC_PCH_1@__dbgriddll_PCH_INC = -I.pch/wxprec_dbgriddll
-@COND_ICC_PCH_1@__dbgriddll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_dbgriddll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_dbgriddll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_dbgriddll/wx/wxprec.h.gch
-COND_USE_SOVERLINUX_1___dbgriddll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__dbgriddll___soname_flags = $(COND_USE_SOVERLINUX_1___dbgriddll___soname_flags)
-COND_USE_SOVERSOLARIS_1___dbgriddll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__dbgriddll___soname_flags = $(COND_USE_SOVERSOLARIS_1___dbgriddll___soname_flags)
-COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__dbgriddll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_inst_cmd = rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__dbgriddll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_uninst_cmd = rm -f \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__dbgriddll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_uninst_cmd)
-@COND_PLATFORM_WIN32_1@__dbgriddll___win32rc = dbgriddll_version_rc.o
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgridlib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__dbgridlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgridlib___depname)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__install_dbgridlib___depname \
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      = install_dbgridlib
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__uninstall_dbgridlib___depname \
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      = uninstall_dbgridlib
-@COND_GCC_PCH_1@__dbgridlib_PCH_INC = -I.pch/wxprec_dbgridlib
-@COND_ICC_PCH_1@__dbgridlib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_dbgridlib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_dbgridlib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_dbgridlib/wx/wxprec.h.gch
-@COND_SHARED_1@____wxdbgrid_namedll_DEP = $(__dbgriddll___depname)
-@COND_SHARED_0@____wxdbgrid_namelib_DEP = $(__dbgridlib___depname)
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname = \
        $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname)
@@ -11950,10 +11737,10 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \
        = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_LIBR_0 = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_62 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_61 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_61 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_61 = --define wxNO_THREADS
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_54 = --define __WXUNIVERSAL__
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_53 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_53 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_53 = --define wxNO_THREADS
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
@@ -11966,22 +11753,20 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \
 @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
 @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_BUILD_p_62 \
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_BUILD_p_54 \
 @COND_WXUSE_LIBTIFF_BUILTIN@   = --include-dir \
 @COND_WXUSE_LIBTIFF_BUILTIN@   $(wx_top_builddir)/src/tiff/libtiff
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_62 = \
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_54 = \
 @COND_WXUSE_LIBTIFF_BUILTIN@   --include-dir $(top_srcdir)/src/tiff/libtiff
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_62 = \
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_54 = \
 @COND_WXUSE_LIBJPEG_BUILTIN@   --include-dir $(top_srcdir)/src/jpeg
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_61 = \
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_53 = \
 @COND_WXUSE_LIBPNG_BUILTIN@    --include-dir $(top_srcdir)/src/png
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_63 = \
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_55 = \
 @COND_WXUSE_ZLIB_BUILTIN@      --include-dir $(top_srcdir)/src/zlib
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_61 = \
-@COND_WXUSE_ODBC_BUILTIN@      --include-dir $(top_srcdir)/src/odbc
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_61 = \
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_53 = \
 @COND_WXUSE_REGEX_BUILTIN@     --include-dir $(top_srcdir)/src/regex
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_61 = \
+@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_53 = \
 @COND_WXUSE_EXPAT_BUILTIN@     --include-dir $(top_srcdir)/src/expat/lib
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
@@ -11994,8 +11779,6 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \
 @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)
@@ -12011,15 +11794,14 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
 @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
 @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
 @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
 @COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib
 
 ### Targets: ###
 
-all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
 
-install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
        $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
        (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
        $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
@@ -12054,7 +11836,7 @@ install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__in
        @echo " ------------------------------------------------------"
        @echo " "
 
-uninstall: $(__uninstall_wxregex___depname) $(__uninstall_wxzlib___depname) $(__uninstall_wxpng___depname) $(__uninstall_wxjpeg___depname) $(__uninstall_wxtiff___depname) $(__uninstall_wxodbc___depname) $(__uninstall_wxexpat___depname) $(__uninstall_wxscintilla___depname) $(__uninstall_monodll___depname) $(__uninstall_monolib___depname) $(__uninstall_basedll___depname) $(__uninstall_baselib___depname) $(__uninstall_netdll___depname) $(__uninstall_netlib___depname) $(__uninstall_coredll___depname) $(__uninstall_corelib___depname) $(__uninstall_advdll___depname) $(__uninstall_advlib___depname) $(__uninstall_mediadll___depname) $(__uninstall_medialib___depname) $(__uninstall_odbcdll___depname) $(__uninstall_odbclib___depname) $(__uninstall_dbgriddll___depname) $(__uninstall_dbgridlib___depname) $(__uninstall_htmldll___depname) $(__uninstall_htmllib___depname) $(__uninstall_qadll___depname) $(__uninstall_qalib___depname) $(__uninstall_xmldll___depname) $(__uninstall_xmllib___depname) $(__uninstall_xrcdll___depname) $(__uninstall_xrclib___depname) $(__uninstall_auidll___depname) $(__uninstall_auilib___depname) $(__uninstall_richtextdll___depname) $(__uninstall_richtextlib___depname) $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname) $(__uninstall_gldll___depname) $(__uninstall_gllib___depname) $(__uninstall_sound_sdl___depname) locale_uninstall locale_msw_uninstall
+uninstall: $(__uninstall_wxregex___depname) $(__uninstall_wxzlib___depname) $(__uninstall_wxpng___depname) $(__uninstall_wxjpeg___depname) $(__uninstall_wxtiff___depname) $(__uninstall_wxexpat___depname) $(__uninstall_wxscintilla___depname) $(__uninstall_monodll___depname) $(__uninstall_monolib___depname) $(__uninstall_basedll___depname) $(__uninstall_baselib___depname) $(__uninstall_netdll___depname) $(__uninstall_netlib___depname) $(__uninstall_coredll___depname) $(__uninstall_corelib___depname) $(__uninstall_advdll___depname) $(__uninstall_advlib___depname) $(__uninstall_mediadll___depname) $(__uninstall_medialib___depname) $(__uninstall_htmldll___depname) $(__uninstall_htmllib___depname) $(__uninstall_qadll___depname) $(__uninstall_qalib___depname) $(__uninstall_xmldll___depname) $(__uninstall_xmllib___depname) $(__uninstall_xrcdll___depname) $(__uninstall_xrclib___depname) $(__uninstall_auidll___depname) $(__uninstall_auilib___depname) $(__uninstall_richtextdll___depname) $(__uninstall_richtextlib___depname) $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname) $(__uninstall_gldll___depname) $(__uninstall_gllib___depname) $(__uninstall_sound_sdl___depname) locale_uninstall locale_msw_uninstall
        (cd $(DESTDIR)$(datadir)/aclocal ; rm -f wxwin.m4)
        (cd $(DESTDIR)$(datadir)/bakefile/presets ; rm -f wx.bkl wx_unix.bkl wx_win32.bkl)
        for f in setup.h $(RCDEFS_H); do \
@@ -12071,8 +11853,6 @@ install-strip: install
        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@@ -12091,7 +11871,6 @@ clean: $(__clean_wxrc___depname)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
        rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@@ -12118,14 +11897,6 @@ clean: $(__clean_wxrc___depname)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-       rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-       rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
        rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
        rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@@ -12226,18 +11997,6 @@ distclean: clean
 @COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@uninstall_wxtiff: 
 @COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 
-@COND_WXUSE_ODBC_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXODBC_OBJECTS)
-@COND_WXUSE_ODBC_BUILTIN@      rm -f $@
-@COND_WXUSE_ODBC_BUILTIN@      $(AR) $(AROPTIONS) $@ $(WXODBC_OBJECTS)
-@COND_WXUSE_ODBC_BUILTIN@      $(RANLIB) $@
-
-@COND_SHARED_0_WXUSE_ODBC_BUILTIN@install_wxodbc: 
-@COND_SHARED_0_WXUSE_ODBC_BUILTIN@     $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0_WXUSE_ODBC_BUILTIN@     $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_SHARED_0_WXUSE_ODBC_BUILTIN@uninstall_wxodbc: 
-@COND_SHARED_0_WXUSE_ODBC_BUILTIN@     rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
 @COND_WXUSE_EXPAT_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXEXPAT_OBJECTS)
 @COND_WXUSE_EXPAT_BUILTIN@     rm -f $@
 @COND_WXUSE_EXPAT_BUILTIN@     $(AR) $(AROPTIONS) $@ $(WXEXPAT_OBJECTS)
@@ -12262,8 +12021,8 @@ distclean: clean
 @COND_SHARED_0_USE_STC_1@uninstall_wxscintilla: 
 @COND_SHARED_0_USE_STC_1@      rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 
-@COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__monodll___win32rc) $(__wxscintilla_library_link_DEP)
-@COND_MONOLITHIC_1_SHARED_1@   $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR) $(LDFLAGS)   -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__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) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_ODBC) $(PLUGIN_ADV_EXTRALIBS) $(__wxscintilla_library_link_LIBR_1)
+@COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__monodll___win32rc) $(__wxscintilla_library_link_DEP)
+@COND_MONOLITHIC_1_SHARED_1@   $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR) $(LDFLAGS)   -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(PLUGIN_ADV_EXTRALIBS) $(__wxscintilla_library_link_LIBR_1)
 @COND_MONOLITHIC_1_SHARED_1@   
 @COND_MONOLITHIC_1_SHARED_1@   $(__monodll___so_symlinks_cmd)
 
@@ -12296,8 +12055,8 @@ distclean: clean
 @COND_USE_PCH_1@.pch/wxprec_monolib/wx/wxprec.h.gch: 
 @COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_monolib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONOLIB_CXXFLAGS)
 
-@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___win32rc)
-@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(BASEDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__basedll___win32rc)
+@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(BASEDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
 @COND_MONOLITHIC_0_SHARED_1@   
 @COND_MONOLITHIC_0_SHARED_1@   $(__basedll___so_symlinks_cmd)
 
@@ -12332,8 +12091,8 @@ distclean: clean
 
 @COND_MONOLITHIC_0@wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP)
 
-@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__netdll___win32rc) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(NETDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__netdll___macinstnamecmd) $(__netdll___importlib) $(__netdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__netdll___win32rc) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(NETDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__netdll___macinstnamecmd) $(__netdll___importlib) $(__netdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0_SHARED_1@   
 @COND_MONOLITHIC_0_SHARED_1@   $(__netdll___so_symlinks_cmd)
 
@@ -12368,8 +12127,8 @@ distclean: clean
 
 @COND_MONOLITHIC_0@wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP)
 
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___win32rc) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(COREDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__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) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__coredll___win32rc) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(COREDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__coredll___so_symlinks_cmd)
 
@@ -12404,8 +12163,8 @@ distclean: clean
 
 @COND_MONOLITHIC_0_USE_GUI_1@wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP)
 
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__advdll___win32rc) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__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) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(PLUGIN_ADV_EXTRALIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__advdll___win32rc) $(__coredll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(PLUGIN_ADV_EXTRALIBS)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__advdll___so_symlinks_cmd)
 
@@ -12440,8 +12199,8 @@ distclean: clean
 
 @COND_MONOLITHIC_0_USE_GUI_1@wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP)
 
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__mediadll___win32rc) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     $(SHARED_LD_CXX) $@ $(MEDIADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__mediadll___macinstnamecmd) $(__mediadll___importlib) $(__mediadll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__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) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__mediadll___win32rc) $(__coredll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     $(SHARED_LD_CXX) $@ $(MEDIADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__mediadll___macinstnamecmd) $(__mediadll___importlib) $(__mediadll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     $(__mediadll___so_symlinks_cmd)
 
@@ -12476,78 +12235,8 @@ distclean: clean
 
 @COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1@wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
 
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__odbcdll___win32rc) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(SHARED_LD_CXX) $@ $(ODBCDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__odbcdll___macinstnamecmd) $(__odbcdll___importlib) $(__odbcdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_ODBC)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(__odbcdll___so_symlinks_cmd)
-
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@install_odbcdll: 
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        (cd $(DESTDIR)$(libdir) ; $(__odbcdll___so_symlinks_inst_cmd))
-
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@uninstall_odbcdll: 
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        (cd $(DESTDIR)$(libdir) ; $(__odbcdll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_odbcdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_odbcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ODBCDLL_CXXFLAGS)
-
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(ODBCLIB_OBJECTS)
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        rm -f $@
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(AR) $(AROPTIONS) $@ $(ODBCLIB_OBJECTS)
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(RANLIB) $@
-
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@install_odbclib: 
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@uninstall_odbclib: 
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_odbclib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_odbclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ODBCLIB_CXXFLAGS)
-
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__dbgriddll___win32rc) $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(SHARED_LD_CXX) $@ $(DBGRIDDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__dbgriddll___macinstnamecmd) $(__dbgriddll___importlib) $(__dbgriddll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__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) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(__dbgriddll___so_symlinks_cmd)
-
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@install_dbgriddll: 
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      (cd $(DESTDIR)$(libdir) ; $(__dbgriddll___so_symlinks_inst_cmd))
-
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@uninstall_dbgriddll: 
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      (cd $(DESTDIR)$(libdir) ; $(__dbgriddll___so_symlinks_uninst_cmd))
-
-@COND_USE_PCH_1@.pch/wxprec_dbgriddll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_dbgriddll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DBGRIDDLL_CXXFLAGS)
-
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(DBGRIDLIB_OBJECTS)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      rm -f $@
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(AR) $(AROPTIONS) $@ $(DBGRIDLIB_OBJECTS)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(RANLIB) $@
-
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@install_dbgridlib: 
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
-
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@uninstall_dbgridlib: 
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-
-@COND_USE_PCH_1@.pch/wxprec_dbgridlib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_dbgridlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DBGRIDLIB_CXXFLAGS)
-
-@COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1@wxdbgrid: $(____wxdbgrid_namedll_DEP) $(____wxdbgrid_namelib_DEP)
-
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__htmldll___win32rc) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__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) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_HTML)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__htmldll___win32rc) $(__coredll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_HTML)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(__htmldll___so_symlinks_cmd)
 
@@ -12582,8 +12271,8 @@ distclean: clean
 
 @COND_MONOLITHIC_0_USE_HTML_1@wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
 
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__qadll___win32rc) $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        $(SHARED_LD_CXX) $@ $(QADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__qadll___macinstnamecmd) $(__qadll___importlib) $(__qadll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__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) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__qadll___win32rc) $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        $(SHARED_LD_CXX) $@ $(QADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__qadll___macinstnamecmd) $(__qadll___importlib) $(__qadll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        $(__qadll___so_symlinks_cmd)
 
@@ -12618,8 +12307,8 @@ distclean: clean
 
 @COND_MONOLITHIC_0_USE_QA_1@wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP)
 
-@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__xmldll___win32rc) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(XMLDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_XML)
+@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__xmldll___win32rc) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(XMLDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_XML)
 @COND_MONOLITHIC_0_SHARED_1@   
 @COND_MONOLITHIC_0_SHARED_1@   $(__xmldll___so_symlinks_cmd)
 
@@ -12654,8 +12343,8 @@ distclean: clean
 
 @COND_MONOLITHIC_0@wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP)
 
-@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__xrcdll___win32rc) $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__htmldll_library_link_LIBR) $(LDFLAGS)   -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__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) $(__htmldll_library_link_LIBR_0) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__xrcdll___win32rc) $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__htmldll_library_link_LIBR) $(LDFLAGS)   -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__htmldll_library_link_LIBR_0) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ 
 @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(__xrcdll___so_symlinks_cmd)
 
@@ -12690,8 +12379,8 @@ distclean: clean
 
 @COND_MONOLITHIC_0_USE_XRC_1@wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP)
 
-@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__auidll___win32rc) $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(SHARED_LD_CXX) $@ $(AUIDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__auidll___macinstnamecmd) $(__auidll___importlib) $(__auidll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__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) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__auidll___win32rc) $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(SHARED_LD_CXX) $@ $(AUIDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__auidll___macinstnamecmd) $(__auidll___importlib) $(__auidll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ 
 @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(__auidll___so_symlinks_cmd)
 
@@ -12726,8 +12415,8 @@ distclean: clean
 
 @COND_MONOLITHIC_0_USE_AUI_1@wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
 
-@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__richtextdll___win32rc) $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    $(SHARED_LD_CXX) $@ $(RICHTEXTDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__htmldll_library_link_LIBR) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__richtextdll___macinstnamecmd) $(__richtextdll___importlib) $(__richtextdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__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) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) $(__htmldll_library_link_LIBR_0) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__richtextdll___win32rc) $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    $(SHARED_LD_CXX) $@ $(RICHTEXTDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__htmldll_library_link_LIBR) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__richtextdll___macinstnamecmd) $(__richtextdll___importlib) $(__richtextdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) $(__htmldll_library_link_LIBR_0) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    
 @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    $(__richtextdll___so_symlinks_cmd)
 
@@ -12762,8 +12451,8 @@ distclean: clean
 
 @COND_MONOLITHIC_0_USE_RICHTEXT_1@wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP)
 
-@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__wxscintilla___depname) $(__stcdll___win32rc) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__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) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__wxscintilla___depname) $(__stcdll___win32rc) $(__coredll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ 
 @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(__stcdll___so_symlinks_cmd)
 
@@ -12798,8 +12487,8 @@ distclean: clean
 
 @COND_MONOLITHIC_0_USE_STC_1@wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP)
 
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__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) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL)
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ 
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
 
@@ -13264,51 +12953,6 @@ wxtiff_tif_zip.o: $(srcdir)/src/tiff/libtiff/tif_zip.c
 @COND_PLATFORM_OS2_1@wxtiff_tif_unix.o: $(srcdir)/src/tiff/libtiff/tif_unix.c
 @COND_PLATFORM_OS2_1@  $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $(srcdir)/src/tiff/libtiff/tif_unix.c
 
-wxodbc_catalog.o: $(srcdir)/src/iodbc/catalog.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/catalog.c
-
-wxodbc_connect.o: $(srcdir)/src/iodbc/connect.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/connect.c
-
-wxodbc_dlf.o: $(srcdir)/src/iodbc/dlf.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/dlf.c
-
-wxodbc_dlproc.o: $(srcdir)/src/iodbc/dlproc.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/dlproc.c
-
-wxodbc_execute.o: $(srcdir)/src/iodbc/execute.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/execute.c
-
-wxodbc_fetch.o: $(srcdir)/src/iodbc/fetch.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/fetch.c
-
-wxodbc_hdbc.o: $(srcdir)/src/iodbc/hdbc.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/hdbc.c
-
-wxodbc_henv.o: $(srcdir)/src/iodbc/henv.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/henv.c
-
-wxodbc_herr.o: $(srcdir)/src/iodbc/herr.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/herr.c
-
-wxodbc_hstmt.o: $(srcdir)/src/iodbc/hstmt.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/hstmt.c
-
-wxodbc_info.o: $(srcdir)/src/iodbc/info.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/info.c
-
-wxodbc_itrace.o: $(srcdir)/src/iodbc/itrace.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/itrace.c
-
-wxodbc_misc.o: $(srcdir)/src/iodbc/misc.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/misc.c
-
-wxodbc_prepare.o: $(srcdir)/src/iodbc/prepare.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/prepare.c
-
-wxodbc_result.o: $(srcdir)/src/iodbc/result.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/result.c
-
 wxexpat_xmlparse.o: $(srcdir)/src/expat/lib/xmlparse.c
        $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $(srcdir)/src/expat/lib/xmlparse.c
 
@@ -14170,21 +13814,12 @@ monodll_winpars.o: $(srcdir)/src/html/winpars.cpp $(MONODLL_ODEP)
 monodll_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/htmllbox.cpp
 
-monodll_db.o: $(srcdir)/src/common/db.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/db.cpp
-
-monodll_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dbtable.cpp
-
 monodll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp
 
 monodll_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp
 
-monodll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp
-
 monodll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
 
@@ -17918,7 +17553,7 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp
 
 monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_BASE=1 --define WXMAKINGDLL --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define wxUSE_BASE=1 --define WXMAKINGDLL --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS
 
 monolib_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
@@ -18529,21 +18164,12 @@ monolib_winpars.o: $(srcdir)/src/html/winpars.cpp $(MONOLIB_ODEP)
 monolib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/htmllbox.cpp
 
-monolib_db.o: $(srcdir)/src/common/db.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/db.cpp
-
-monolib_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dbtable.cpp
-
 monolib_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp
 
 monolib_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp
 
-monolib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp
-
 monolib_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
 
@@ -22277,7 +21903,7 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
 
 basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1
 
 basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
@@ -23816,7 +23442,7 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
 
 netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET
 
 netdll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETDLL_ODEP)
        $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp
@@ -23921,7 +23547,7 @@ netlib_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETLIB_ODEP)
 @COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gsocket.cpp
 
 coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0
 
 coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp
@@ -29894,7 +29520,7 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp
 
 advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_ADV
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_ADV
 
 advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP)
        $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
@@ -30347,7 +29973,7 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
 
 mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA
 
 mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP)
        $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
@@ -30433,32 +30059,8 @@ medialib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIALIB_ODEP)
 @COND_TOOLKIT_X11@medialib_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
 @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
 
-odbcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ODBCDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_ODBC
-
-odbcdll_db.o: $(srcdir)/src/common/db.cpp $(ODBCDLL_ODEP)
-       $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $(srcdir)/src/common/db.cpp
-
-odbcdll_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(ODBCDLL_ODEP)
-       $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $(srcdir)/src/common/dbtable.cpp
-
-odbclib_db.o: $(srcdir)/src/common/db.cpp $(ODBCLIB_ODEP)
-       $(CXXC) -c -o $@ $(ODBCLIB_CXXFLAGS) $(srcdir)/src/common/db.cpp
-
-odbclib_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(ODBCLIB_ODEP)
-       $(CXXC) -c -o $@ $(ODBCLIB_CXXFLAGS) $(srcdir)/src/common/dbtable.cpp
-
-dbgriddll_version_rc.o: $(srcdir)/src/msw/version.rc $(DBGRIDDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_DBGRID
-
-dbgriddll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(DBGRIDDLL_ODEP)
-       $(CXXC) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp
-
-dbgridlib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(DBGRIDLIB_ODEP)
-       $(CXXC) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp
-
 htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_HTML
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_HTML
 
 htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(HTMLDLL_ODEP)
        $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp
@@ -30617,7 +30219,7 @@ htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP)
 @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
 
 qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_QA
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_QA
 
 qadll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(QADLL_ODEP)
        $(CXXC) -c -o $@ $(QADLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp
@@ -30632,7 +30234,7 @@ qalib_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(QALIB_ODEP)
        $(CXXC) -c -o $@ $(QALIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp
 
 xmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(XMLDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML
 
 xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(XMLDLL_ODEP)
        $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
@@ -30647,7 +30249,7 @@ xmllib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(XMLLIB_ODEP)
        $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp
 
 xrcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(XRCDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_XRC
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_XRC
 
 xrcdll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
@@ -30992,7 +30594,7 @@ xrclib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
 
 auidll_version_rc.o: $(srcdir)/src/msw/version.rc $(AUIDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_AUI
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_AUI
 
 auidll_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(AUIDLL_ODEP)
        $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp
@@ -31025,7 +30627,7 @@ auilib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUILIB_ODEP)
        $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
 
 richtextdll_version_rc.o: $(srcdir)/src/msw/version.rc $(RICHTEXTDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT
 
 richtextdll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTDLL_ODEP)
        $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
@@ -31082,7 +30684,7 @@ richtextlib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXT
        $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
 
 stcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(STCDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC
 
 stcdll_stc.o: $(srcdir)/src/stc/stc.cpp $(STCDLL_ODEP)
        $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp
@@ -31103,7 +30705,7 @@ stclib_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(STCLIB_ODEP)
        $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp
 
 gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_62) $(__INC_TIFF_p_62) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_GL
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_GL
 
 gldll_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLDLL_ODEP)
        $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp
@@ -31229,7 +30831,6 @@ MSWDIR   = $(WXDIR)/src/msw
 PMDIR    = $(WXDIR)/src/os2
 MACDIR   = $(WXDIR)/src/mac
 COCOADIR = $(WXDIR)/src/cocoa
-ODBCDIR  = $(WXDIR)/src/iodbc
 FTDIR    = $(WXDIR)/src/freetype
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
@@ -31316,14 +30917,6 @@ ALL_DIST: distrib_clean
        $(CP_P) $(REGEXDIR)/README $(DISTDIR)/src/regex
        $(CP_PR) $(EXPATDIR) $(DISTDIR)/src/expat
        #(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
-       mkdir $(DISTDIR)/src/iodbc
-       $(CP_P) $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
-       $(CP_P) $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
-       $(CP_P) $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc
-       $(CP_P) $(ODBCDIR)/*.exp $(DISTDIR)/src/iodbc
-       $(CP_P) $(ODBCDIR)/README $(DISTDIR)/src/iodbc
-       $(CP_P) $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc
-       $(CP_P) $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc
        # copy some files from include/ that are not installed:
        mkdir $(DISTDIR)/include
        mkdir $(DISTDIR)/include/wx
@@ -31675,8 +31268,6 @@ DEMOS_DIST: ALL_GUI_DIST
        $(CP_P) $(DEMODIR)/bombs/*.rc $(DISTDIR)/demos/bombs
        $(CP_P) $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
 
-       $(CP_PR) $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
-
        mkdir $(DISTDIR)/demos/forty
        $(CP_P) $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
        $(CP_P) $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
@@ -31935,7 +31526,7 @@ distdir: @GUIDIST@
        @# in other dist targets.
        find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
                        \( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
-                       -print | egrep -v '/(samples|dbbrowse)/.*\.hh.$$' | xargs rm -rf
+                       -print | egrep -v '/samples/.*\.hh.$$' | xargs rm -rf
 
 dist: distdir
        @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
@@ -32049,4 +31640,4 @@ rpm: bzip-dist
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all install uninstall clean distclean install_wxregex uninstall_wxregex install_wxzlib uninstall_wxzlib install_wxpng uninstall_wxpng install_wxjpeg uninstall_wxjpeg install_wxtiff uninstall_wxtiff install_wxodbc uninstall_wxodbc install_wxexpat uninstall_wxexpat install_wxscintilla uninstall_wxscintilla install_monodll uninstall_monodll install_monolib uninstall_monolib install_basedll uninstall_basedll install_baselib uninstall_baselib wxbase install_netdll uninstall_netdll install_netlib uninstall_netlib wxnet install_coredll uninstall_coredll install_corelib uninstall_corelib wxcore install_advdll uninstall_advdll install_advlib uninstall_advlib wxadv install_mediadll uninstall_mediadll install_medialib uninstall_medialib wxmedia install_odbcdll uninstall_odbcdll install_odbclib uninstall_odbclib install_dbgriddll uninstall_dbgriddll install_dbgridlib uninstall_dbgridlib wxdbgrid install_htmldll uninstall_htmldll install_htmllib uninstall_htmllib wxhtml install_qadll uninstall_qadll install_qalib uninstall_qalib wxqa install_xmldll uninstall_xmldll install_xmllib uninstall_xmllib wxxml install_xrcdll uninstall_xrcdll install_xrclib uninstall_xrclib wxxrc install_auidll uninstall_auidll install_auilib uninstall_auilib wxaui install_richtextdll uninstall_richtextdll install_richtextlib uninstall_richtextlib wxrichtext install_stcdll uninstall_stcdll install_stclib uninstall_stclib wxstc install_gldll uninstall_gldll install_gllib uninstall_gllib wxgl install_sound_sdl uninstall_sound_sdl samples
+.PHONY: all install uninstall clean distclean install_wxregex uninstall_wxregex install_wxzlib uninstall_wxzlib install_wxpng uninstall_wxpng install_wxjpeg uninstall_wxjpeg install_wxtiff uninstall_wxtiff install_wxexpat uninstall_wxexpat install_wxscintilla uninstall_wxscintilla install_monodll uninstall_monodll install_monolib uninstall_monolib install_basedll uninstall_basedll install_baselib uninstall_baselib wxbase install_netdll uninstall_netdll install_netlib uninstall_netlib wxnet install_coredll uninstall_coredll install_corelib uninstall_corelib wxcore install_advdll uninstall_advdll install_advlib uninstall_advlib wxadv install_mediadll uninstall_mediadll install_medialib uninstall_medialib wxmedia install_htmldll uninstall_htmldll install_htmllib uninstall_htmllib wxhtml install_qadll uninstall_qadll install_qalib uninstall_qalib wxqa install_xmldll uninstall_xmldll install_xmllib uninstall_xmllib wxxml install_xrcdll uninstall_xrcdll install_xrclib uninstall_xrclib wxxrc install_auidll uninstall_auidll install_auilib uninstall_auilib wxaui install_richtextdll uninstall_richtextdll install_richtextlib uninstall_richtextlib wxrichtext install_stcdll uninstall_stcdll install_stclib uninstall_stclib wxstc install_gldll uninstall_gldll install_gllib uninstall_gllib wxgl install_sound_sdl uninstall_sound_sdl samples
index e282eeaee7cc9a084d12bb5fe1ba256eaab5a911..2409c744b31e4b293ae1e093fdfc52d9b708212b 100644 (file)
@@ -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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[wx.bkl] ###
 dnl
 dnl This macro was generated by
 dnl Bakefile 0.2.2 (http://bakefile.sourceforge.net)
@@ -6,105 +6,105 @@ dnl Do not modify, all changes will be overwritten!
 
 BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2"
 
-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/propgrid/propgrid.bkl,../../contrib/build/svg/svg.bkl,../../tests/test.bkl,wx.bkl] ###
+dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[wx.bkl] ###
     COND_DEPS_TRACKING_1="#"
     if test "x$DEPS_TRACKING" = "x1" ; then
         COND_DEPS_TRACKING_1=""
     fi
     AC_SUBST(COND_DEPS_TRACKING_1)
-dnl ### begin block 20_COND_GCC_PCH_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/propgrid/propgrid.bkl,../../contrib/build/svg/svg.bkl,../../tests/test.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_GCC_PCH_1[wx.bkl] ###
     COND_GCC_PCH_1="#"
     if test "x$GCC_PCH" = "x1" ; then
         COND_GCC_PCH_1=""
     fi
     AC_SUBST(COND_GCC_PCH_1)
-dnl ### begin block 20_COND_ICC_PCH_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/propgrid/propgrid.bkl,../../contrib/build/svg/svg.bkl,../../tests/test.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_ICC_PCH_1[wx.bkl] ###
     COND_ICC_PCH_1="#"
     if test "x$ICC_PCH" = "x1" ; then
         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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[wx.bkl] ###
     COND_MONOLITHIC_0="#"
     if test "x$MONOLITHIC" = "x0" ; then
         COND_MONOLITHIC_0=""
@@ -140,24 +140,12 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1[wx.bkl]
         COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1[wx.bkl] ###
-    COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1[wx.bkl] ###
     COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1[wx.bkl] ###
-    COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1[wx.bkl] ###
     COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
@@ -206,24 +194,12 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1[wx.bkl]
         COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1[wx.bkl] ###
-    COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1[wx.bkl] ###
     COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1[wx.bkl] ###
-    COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1[wx.bkl] ###
     COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then
@@ -260,30 +236,18 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1[wx.bkl] ###
         COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1[wx.bkl] ###
-    COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_USE_HTML_1[wx.bkl] ###
     COND_MONOLITHIC_0_USE_HTML_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_HTML" = "x1" ; then
         COND_MONOLITHIC_0_USE_HTML_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_USE_HTML_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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_MEDIA_1[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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_0_USE_QA_1[wx.bkl] ###
     COND_MONOLITHIC_0_USE_QA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_QA" = "x1" ; then
@@ -308,7 +272,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_XRC_1[wx.bkl] ###
         COND_MONOLITHIC_0_USE_XRC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_USE_XRC_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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[wx.bkl] ###
     COND_MONOLITHIC_1="#"
     if test "x$MONOLITHIC" = "x1" ; then
         COND_MONOLITHIC_1=""
@@ -326,31 +290,31 @@ 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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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=""
     fi
     AC_SUBST(COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_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/propgrid/propgrid.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1[wx.bkl] ###
     COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="#"
     if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERCYGWIN" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
         COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_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/propgrid/propgrid.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[wx.bkl] ###
     COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#"
     if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
         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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[wx.bkl] ###
     COND_PLATFORM_MACOSX_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" ; then
         COND_PLATFORM_MACOSX_1=""
@@ -404,49 +368,37 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_GUI_1[wx.bkl] ###
         COND_PLATFORM_MACOSX_1_USE_GUI_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1_USE_GUI_1)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_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/propgrid/propgrid.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1[wx.bkl] ###
     COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
         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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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=""
-    fi
-    AC_SUBST(COND_PLATFORM_MAC_1)
-dnl ### begin block 20_COND_PLATFORM_MSDOS_0[../../samples/dialup/dialup.bkl] ###
-    COND_PLATFORM_MSDOS_0="#"
-    if test "x$PLATFORM_MSDOS" = "x0" ; then
-        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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[wx.bkl] ###
     COND_PLATFORM_UNIX_1="#"
     if test "x$PLATFORM_UNIX" = "x1" ; then
         COND_PLATFORM_UNIX_1=""
@@ -476,42 +428,24 @@ 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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[wx.bkl] ###
     COND_PLATFORM_WIN32_1="#"
     if test "x$PLATFORM_WIN32" = "x1" ; then
         COND_PLATFORM_WIN32_1=""
     fi
     AC_SUBST(COND_PLATFORM_WIN32_1)
-dnl ### begin block 20_COND_SHARED_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/propgrid/propgrid.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_SHARED_0[wx.bkl] ###
     COND_SHARED_0="#"
     if test "x$SHARED" = "x0" ; then
         COND_SHARED_0=""
     fi
     AC_SUBST(COND_SHARED_0)
-dnl ### begin block 20_COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0[../../samples/dialogs/dialogs.bkl] ###
-    COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0="#"
-    if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMAC" -a "x$WXUNIV" = "x0" ; then
-        COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0)
-dnl ### begin block 20_COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0[../../samples/dialogs/dialogs.bkl] ###
-    COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0="#"
-    if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then
-        COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0)
-dnl ### begin block 20_COND_SHARED_0_TOOLKIT_PM_WXUNIV_0[../../samples/dialogs/dialogs.bkl] ###
-    COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="#"
-    if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then
-        COND_SHARED_0_TOOLKIT_PM_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_SHARED_0_TOOLKIT_PM_WXUNIV_0)
 dnl ### begin block 20_COND_SHARED_0_USE_GUI_1_USE_OPENGL_1[wx.bkl] ###
     COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
     if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
@@ -542,24 +476,12 @@ dnl ### begin block 20_COND_SHARED_0_USE_STC_1[wx.bkl] ###
         COND_SHARED_0_USE_STC_1=""
     fi
     AC_SUBST(COND_SHARED_0_USE_STC_1)
-dnl ### begin block 20_COND_SHARED_0_USE_XRC_1[../../contrib/build/gizmos/gizmos.bkl] ###
-    COND_SHARED_0_USE_XRC_1="#"
-    if test "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then
-        COND_SHARED_0_USE_XRC_1=""
-    fi
-    AC_SUBST(COND_SHARED_0_USE_XRC_1)
 dnl ### begin block 20_COND_SHARED_0_WXUSE_EXPAT_BUILTIN[wx.bkl] ###
     COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#"
     if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then
         COND_SHARED_0_WXUSE_EXPAT_BUILTIN=""
     fi
     AC_SUBST(COND_SHARED_0_WXUSE_EXPAT_BUILTIN)
-dnl ### begin block 20_COND_SHARED_0_WXUSE_ODBC_BUILTIN[wx.bkl] ###
-    COND_SHARED_0_WXUSE_ODBC_BUILTIN="#"
-    if test "x$SHARED" = "x0" -a "x$wxUSE_ODBC" = "xbuiltin" ; then
-        COND_SHARED_0_WXUSE_ODBC_BUILTIN=""
-    fi
-    AC_SUBST(COND_SHARED_0_WXUSE_ODBC_BUILTIN)
 dnl ### begin block 20_COND_SHARED_0_WXUSE_REGEX_BUILTIN[wx.bkl] ###
     COND_SHARED_0_WXUSE_REGEX_BUILTIN="#"
     if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
@@ -572,7 +494,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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[wx.bkl] ###
     COND_SHARED_1="#"
     if test "x$SHARED" = "x1" ; then
         COND_SHARED_1=""
@@ -584,19 +506,13 @@ dnl ### begin block 20_COND_SHARED_1_USE_GUI_1_USE_OPENGL_1[wx.bkl] ###
         COND_SHARED_1_USE_GUI_1_USE_OPENGL_1=""
     fi
     AC_SUBST(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1)
-dnl ### begin block 20_COND_SHARED_1_USE_XRC_1[../../contrib/build/gizmos/gizmos.bkl] ###
-    COND_SHARED_1_USE_XRC_1="#"
-    if test "x$SHARED" = "x1" -a "x$USE_XRC" = "x1" ; then
-        COND_SHARED_1_USE_XRC_1=""
-    fi
-    AC_SUBST(COND_SHARED_1_USE_XRC_1)
 dnl ### begin block 20_COND_TOOLKIT_[wx.bkl] ###
     COND_TOOLKIT_="#"
     if test "x$TOOLKIT" = "x" ; then
         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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/helpview/src/helpview.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_COCOA[wx.bkl] ###
     COND_TOOLKIT_COCOA="#"
     if test "x$TOOLKIT" = "xCOCOA" ; then
         COND_TOOLKIT_COCOA=""
@@ -674,7 +590,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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[wx.bkl] ###
     COND_TOOLKIT_MAC="#"
     if test "x$TOOLKIT" = "xMAC" ; then
         COND_TOOLKIT_MAC=""
@@ -722,7 +638,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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[wx.bkl] ###
     COND_TOOLKIT_MSW="#"
     if test "x$TOOLKIT" = "xMSW" ; then
         COND_TOOLKIT_MSW=""
@@ -800,31 +716,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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[wx.bkl] ###
     COND_USE_GUI_1="#"
     if test "x$USE_GUI" = "x1" ; then
         COND_USE_GUI_1=""
@@ -848,85 +764,73 @@ 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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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=""
     fi
     AC_SUBST(COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN)
-dnl ### begin block 20_COND_USE_ODBC_1[../../demos/dbbrowse/dbbrowse.bkl,../../samples/db/db.bkl] ###
-    COND_USE_ODBC_1="#"
-    if test "x$USE_ODBC" = "x1" ; then
-        COND_USE_ODBC_1=""
-    fi
-    AC_SUBST(COND_USE_ODBC_1)
-dnl ### begin block 20_COND_USE_OPENGL_1[../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl] ###
-    COND_USE_OPENGL_1="#"
-    if test "x$USE_OPENGL" = "x1" ; then
-        COND_USE_OPENGL_1=""
-    fi
-    AC_SUBST(COND_USE_OPENGL_1)
-dnl ### begin block 20_COND_USE_PCH_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/propgrid/propgrid.bkl,../../contrib/build/svg/svg.bkl,../../tests/test.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_PCH_1[wx.bkl] ###
     COND_USE_PCH_1="#"
     if test "x$USE_PCH" = "x1" ; then
         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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[wx.bkl] ###
     COND_USE_RTTI_1="#"
     if test "x$USE_RTTI" = "x1" ; then
         COND_USE_RTTI_1=""
     fi
     AC_SUBST(COND_USE_RTTI_1)
-dnl ### begin block 20_COND_USE_SOSYMLINKS_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/propgrid/propgrid.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_SOSYMLINKS_1[wx.bkl] ###
     COND_USE_SOSYMLINKS_1="#"
     if test "x$USE_SOSYMLINKS" = "x1" ; then
         COND_USE_SOSYMLINKS_1=""
     fi
     AC_SUBST(COND_USE_SOSYMLINKS_1)
-dnl ### begin block 20_COND_USE_SOVERCYGWIN_1_USE_SOVERSION_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/propgrid/propgrid.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1[wx.bkl] ###
     COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="#"
     if test "x$USE_SOVERCYGWIN" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
         COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1=""
     fi
     AC_SUBST(COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1)
-dnl ### begin block 20_COND_USE_SOVERLINUX_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/propgrid/propgrid.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_SOVERLINUX_1[wx.bkl] ###
     COND_USE_SOVERLINUX_1="#"
     if test "x$USE_SOVERLINUX" = "x1" ; then
         COND_USE_SOVERLINUX_1=""
     fi
     AC_SUBST(COND_USE_SOVERLINUX_1)
-dnl ### begin block 20_COND_USE_SOVERSION_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/propgrid/propgrid.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_SOVERSION_0[wx.bkl] ###
     COND_USE_SOVERSION_0="#"
     if test "x$USE_SOVERSION" = "x0" ; then
         COND_USE_SOVERSION_0=""
     fi
     AC_SUBST(COND_USE_SOVERSION_0)
-dnl ### begin block 20_COND_USE_SOVERSOLARIS_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/propgrid/propgrid.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_SOVERSOLARIS_1[wx.bkl] ###
     COND_USE_SOVERSOLARIS_1="#"
     if test "x$USE_SOVERSOLARIS" = "x1" ; then
         COND_USE_SOVERSOLARIS_1=""
@@ -938,25 +842,25 @@ dnl ### begin block 20_COND_USE_STC_1[wx.bkl] ###
         COND_USE_STC_1=""
     fi
     AC_SUBST(COND_USE_STC_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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[wx.bkl] ###
     COND_USE_THREADS_1="#"
     if test "x$USE_THREADS" = "x1" ; then
         COND_USE_THREADS_1=""
     fi
     AC_SUBST(COND_USE_THREADS_1)
-dnl ### begin block 20_COND_USE_XRC_1[../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_XRC_1[wx.bkl] ###
     COND_USE_XRC_1="#"
     if test "x$USE_XRC" = "x1" ; then
         COND_USE_XRC_1=""
     fi
     AC_SUBST(COND_USE_XRC_1)
-dnl ### begin block 20_COND_WINDOWS_IMPLIB_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/propgrid/propgrid.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WINDOWS_IMPLIB_1[wx.bkl] ###
     COND_WINDOWS_IMPLIB_1="#"
     if test "x$WINDOWS_IMPLIB" = "x1" ; then
         COND_WINDOWS_IMPLIB_1=""
@@ -974,49 +878,43 @@ 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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[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/propgrid/propgrid.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/propgrid/propgridsample.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/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.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/editlbox/editlbox.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/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.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/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[wx.bkl] ###
     COND_WXUSE_ZLIB_BUILTIN="#"
     if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
         COND_WXUSE_ZLIB_BUILTIN=""
index 81f14c9faf1dcb29b5103fec2056741cdda9ff0b..117ea97d95896b2718cea0e17e2db87155a011c7 100644 (file)
                 @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
                 @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
                 @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
-                @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
                 @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
                 @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
-               @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
+                @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
                 @echo COMPILER=$(COMPILER) >>$(BUILD_CFG_FILE)
                 @echo CC=$(CC) >>$(BUILD_CFG_FILE)
                 @echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
index 77be8199ddb7e0e2ed11d46e68d184fe5cc6b502..f13bd3f0f6748fc3b0f5660d8cbea1302cf44410 100644 (file)
     <set var="WXLIB_XRC">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xrc')))</if>
     </set>
-    <set var="WXLIB_ODBC">
-        <if cond="MONOLITHIC=='0' and USE_ODBC=='1'">
-            $(mk.evalExpr(wxwin.mkLibName('odbc')))
-        </if>
-    </set>
-    <set var="WXLIB_DBGRID">
-        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('dbgrid')))</if>
-    </set>
     <set var="WXLIB_AUI">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('aui')))</if>
     </set>
     <if cond="FORMAT!='autoconf'">
         <set var="GDIPLUS_LIB">
             <if cond="USE_GDIPLUS=='1'">gdiplus</if>
-       </set>
-       <set var="GFXCTX_DEFINE">
+        </set>
+        <set var="GFXCTX_DEFINE">
             <if cond="USE_GDIPLUS=='1'">wxUSE_GRAPHICS_CONTEXT=1</if>
-       </set>
+        </set>
     </if>
 
     <set var="LINK_TARGET_CPU">
@@ -447,7 +439,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <include file="png.bkl"/>
     <include file="jpeg.bkl"/>
     <include file="tiff.bkl"/>
-    <include file="odbc.bkl"/>
     <include file="expat.bkl"/>
     <include file="scintilla.bkl"/>
 
@@ -512,7 +503,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <template id="wx_append_base_nomono">
         <!-- link against builtin 3rd party libs, if needed: -->
         <sys-lib>$(LIB_ZLIB)</sys-lib>
-        <sys-lib>$(LIB_ODBC)</sys-lib>
         <sys-lib>$(LIB_REGEX)</sys-lib>
         <sys-lib>$(LIB_EXPAT)</sys-lib>
 
@@ -566,9 +556,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
             <if cond="FORMAT=='borland'">
                 <sys-lib>oleacc</sys-lib>
             </if>
-            <if cond="FORMAT!='msevc4prj'">
-                <sys-lib>odbc32</sys-lib>
-            </if>
         </if>
     </template>
 
@@ -668,7 +655,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
               template="wx_3rdparty_dependencies_gui">
         <depends>wxexpat</depends>
         <depends>wxzlib</depends>
-        <depends cond="FORMAT=='autoconf'">wxodbc</depends>
         <depends>wxregex</depends>
     </template>
 
@@ -685,7 +671,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
     <template id="wx_3rdparty_includes"
               template="wx_3rdparty_includes_gui">
         <include>$(INC_ZLIB)</include>
-        <include>$(INC_ODBC)</include>
         <include>$(INC_REGEX)</include>
         <include>$(INC_EXPAT)</include>
     </template>
index a17f588216df3d531a54383e166d3b3eb17d8437..94af34ba27fceaf8a18ab4ea6640a43d2ca8dabc 100644 (file)
@@ -229,14 +229,6 @@ Acts according to BUILD by default.
         </description>
     </option>
 
-    <option name="USE_ODBC">
-        <values>0,1</values>
-        <default-value>0</default-value>
-        <description>
-            Build ODBC database classes (USE_GUI must be 1)?
-        </description>
-    </option>
-
     <!-- currently only VC++ can compile wxDebugReport which is in QA lib -->
     <set var="USE_QA_DEFAULT">
         <if cond="FORMAT in ['msvc','msvc6prj','msvs2005prj']">1</if>
@@ -347,7 +339,6 @@ to run the tests, include CppUnit library here.
         <option name="EXTRALIBS"/>
         <option name="EXTRALIBS_XML"/>
         <option name="EXTRALIBS_HTML"/>
-        <option name="EXTRALIBS_ODBC"/>
         <option name="EXTRALIBS_GUI"/>
         <option name="EXTRALIBS_OPENGL"/>
         <option name="EXTRALIBS_SDL"/>
@@ -399,7 +390,6 @@ it if SHARED=1 unless you know what you are doing.
         <set var="EXTRALIBS"/>
         <set var="EXTRALIBS_XML"/>
         <set var="EXTRALIBS_HTML"/>
-        <set var="EXTRALIBS_ODBC"/>
         <set var="EXTRALIBS_GUI"/>
         <set var="EXTRALIBS_OPENGL">
             <if cond="COMPILER=='wat' and TOOLKIT=='MSW'">opengl32.lib glu32.lib</if>
@@ -449,7 +439,6 @@ Set the version of your Mingw installation here.
         <set var="USE_MEDIA">1</set>
         <set var="USE_XRC">1</set>
         <set var="USE_OPENGL">1</set>
-        <set var="USE_ODBC">1</set>
         <set var="USE_QA">1</set>
         <set var="MONOLITHIC">0</set>
         <set var="USE_GUI">1</set>
index cc08b05ff499e9177761a5c3c1c3160183ad06e8..8c66d2db53258a5dc72a0a171dd995c9ce90ee97 100644 (file)
@@ -3202,28 +3202,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 
-<!-- ====================================================================== -->
-<!--                              ODBC classes                              -->
-<!-- ====================================================================== -->
-
-<set var="ODBC_SRC" hints="files">
-    src/common/db.cpp
-    src/common/dbtable.cpp
-</set>
-<set var="ODBC_HDR" hints="files">
-    wx/db.h
-    wx/dbkeyg.h
-    wx/dbtable.h
-</set>
-
-<set var="DBGRID_SRC" hints="files">
-    src/common/dbgrid.cpp
-</set>
-<set var="DBGRID_HDR" hints="files">
-    wx/dbgrid.h
-</set>
-
-
 <!-- ====================================================================== -->
 <!--                             Misc plugin sources:                       -->
 <!-- ====================================================================== -->
@@ -3529,7 +3507,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(LOWLEVEL_HDR)
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
-            $(OPENGL_HDR) $(QA_HDR) $(DBGRID_HDR) $(XRC_HDR) $(AUI_HDR) $(RICHTEXT_HDR)
+            $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(RICHTEXT_HDR)
             $(STC_HDR)
         </if>
     </set>
@@ -3538,7 +3516,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
         $(NET_CMN_HDR) $(NET_PLATFORM_HDR)
-        $(XML_HDR) $(ODBC_HDR)
+        $(XML_HDR)
     </set>
     <set var="ALL_HEADERS" make_var="1" hints="files">
         $(ALL_BASE_HEADERS) $(ALL_GUI_HEADERS)
@@ -3559,7 +3537,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(NET_OS2_HDR)
         $(NET_UNIX_HDR)
         $(NET_MAC_CARBONLIB_HDR)
-        $(XML_HDR) $(ODBC_HDR)
+        $(XML_HDR)
     </set>
 
     <!-- used by 'make dist', should include wxBase sources for all ports -->
@@ -3575,7 +3553,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_AND_GUI_MAC_SRC)
         $(BASE_AND_GUI_WIN32_SRC)
         $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)
-        $(XML_SRC) $(ODBC_SRC)
+        $(XML_SRC)
     </set>
 
 
index 1ba29afde49ae31a5827bab14c61e41f6ac5d280..051f5be21b7d23ca85f30a169ccc006d7635429a 100644 (file)
@@ -34,7 +34,6 @@ MSWDIR   = $(WXDIR)/src/msw
 PMDIR    = $(WXDIR)/src/os2
 MACDIR   = $(WXDIR)/src/mac
 COCOADIR = $(WXDIR)/src/cocoa
-ODBCDIR  = $(WXDIR)/src/iodbc
 FTDIR    = $(WXDIR)/src/freetype
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
@@ -121,14 +120,6 @@ ALL_DIST: distrib_clean
        $(CP_P) $(REGEXDIR)/README $(DISTDIR)/src/regex
        $(CP_PR) $(EXPATDIR) $(DISTDIR)/src/expat
        #(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
-       mkdir $(DISTDIR)/src/iodbc
-       $(CP_P) $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
-       $(CP_P) $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
-       $(CP_P) $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc
-       $(CP_P) $(ODBCDIR)/*.exp $(DISTDIR)/src/iodbc
-       $(CP_P) $(ODBCDIR)/README $(DISTDIR)/src/iodbc
-       $(CP_P) $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc
-       $(CP_P) $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc
        # copy some files from include/ that are not installed:
        mkdir $(DISTDIR)/include
        mkdir $(DISTDIR)/include/wx
@@ -480,8 +471,6 @@ DEMOS_DIST: ALL_GUI_DIST
        $(CP_P) $(DEMODIR)/bombs/*.rc $(DISTDIR)/demos/bombs
        $(CP_P) $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
 
-       $(CP_PR) $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
-
        mkdir $(DISTDIR)/demos/forty
        $(CP_P) $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
        $(CP_P) $(DEMODIR)/forty/makefile.unx $(DISTDIR)/demos/forty
@@ -740,7 +729,7 @@ distdir: @GUIDIST@
        @# in other dist targets.
        find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
                        \( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
-                       -print | egrep -v '/(samples|dbbrowse)/.*\.hh.$$' | xargs rm -rf
+                       -print | egrep -v '/samples/.*\.hh.$$' | xargs rm -rf
 
 dist: distdir
        @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
index daf88fdbcd327754900bcf511f169571a3bf7272..a37c94f4e8f5f26fcb1692cae7687c4de054970b 100644 (file)
@@ -4,8 +4,8 @@
 
     <set var="MONOLIB_GUI_SRC">
         <if cond="USE_GUI=='1'">
-            $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(ODBC_SRC) $(QA_SRC)
-            $(DBGRID_SRC) $(XRC_SRC) $(AUI_SRC) $(RICHTEXT_SRC) $(STC_SRC)
+            $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(QA_SRC)
+            $(XRC_SRC) $(AUI_SRC) $(RICHTEXT_SRC) $(STC_SRC)
         </if>
     </set>
     <set var="MONOLIB_SRC">
         <sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
         <ldlibs>$(EXTRALIBS_XML)</ldlibs>
         <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
-        <ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
         <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
         <msvc-headers>$(ALL_HEADERS)</msvc-headers>
-       <!-- STC stuff, should this be conditionalized? -->
+        <!-- STC stuff, should this be conditionalized? -->
         <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
         <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
         <define>__WX__</define>
@@ -39,7 +38,7 @@
         <if cond="FORMAT=='watcom'">
             <set var="LIB_PAGESIZE" overwrite="1">8192</set>
         </if>
-       <!-- STC stuff, should this be conditionalized? -->
+        <!-- STC stuff, should this be conditionalized? -->
         <include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
         <include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
         <define>__WX__</define>
index 0d57ebdbfe7cfedf8542c95d8d69696cb9ba223c..02007a089a8c515902eeca8f8c0bd0ccb1e2e87c 100644 (file)
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">media=medialib+mediadll</set>
 
 
-    <!-- ================================================================= -->
-    <!--                        DB classes library                         -->
-    <!-- ================================================================= -->
-
-    <dll id="odbcdll" template="wx_base_dll"
-         cond="SHARED=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_ODBC</define>
-        <sources>$(ODBC_SRC)</sources>
-        <msvc-headers>$(ODBC_HDR)</msvc-headers>
-        <library>basedll</library>
-        <ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
-    </dll>
-
-    <lib id="odbclib" template="wx_base_lib"
-        cond="SHARED=='0' and USE_ODBC=='1' and MONOLITHIC=='0'">
-        <sources>$(ODBC_SRC)</sources>
-        <msvc-headers>$(ODBC_HDR)</msvc-headers>
-    </lib>
-
-    <dll id="dbgriddll" template="wx_dll"
-         cond="SHARED=='1' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
-        <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_DBGRID</define>
-        <sources>$(DBGRID_SRC)</sources>
-        <msvc-headers>$(DBGRID_HDR)</msvc-headers>
-        <library>advdll</library>
-        <library>odbcdll</library>
-        <library>coredll</library>
-        <library>basedll</library>
-    </dll>
-
-    <lib id="dbgridlib" template="wx_lib"
-        cond="SHARED=='0' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
-        <sources>$(DBGRID_SRC)</sources>
-        <msvc-headers>$(DBGRID_HDR)</msvc-headers>
-    </lib>
-
-    <!-- <wxshortcut id="wxodbc" cond="MONOLITHIC=='0' and USE_ODBC=='1'"/> -->
-    <wxshortcut id="wxdbgrid" cond="MONOLITHIC=='0' and USE_GUI=='1' and USE_ODBC=='1'"/>
-
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">odbc=odbclib+odbcdll</set>
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">dbgrid=dbgridlib+dbgriddll</set>
-
-
     <!-- ================================================================ -->
     <!--                               wxHTML                             -->
     <!-- ================================================================ -->
diff --git a/build/bakefiles/odbc.bkl b/build/bakefiles/odbc.bkl
deleted file mode 100644 (file)
index 4c14177..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-
-    <if cond="FORMAT=='autoconf'">
-        <option name="wxUSE_ODBC"/>
-        <set var="LIB_ODBC">
-            <if cond="wxUSE_ODBC=='builtin'">wxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</if>
-        </set>
-    </if>
-    <if cond="FORMAT!='autoconf'">
-        <set var="wxUSE_ODBC">
-            <if cond="PLATFORM_UNIX=='1'">builtin</if>
-            <if cond="PLATFORM_UNIX=='0'">0</if>
-        </set>
-        <set var="LIB_ODBC">
-            <if cond="wxUSE_ODBC=='builtin'">wxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
-        </set>
-    </if>
-    <set var="INC_ODBC">
-        <if cond="wxUSE_ODBC=='builtin'">$(TOP_SRCDIR)src/odbc</if>
-    </set>
-
-    <lib id="wxodbc" template="3rdparty_lib"
-         cond="wxUSE_ODBC=='builtin' and BUILDING_LIB=='1'">
-        <dirname>$(LIBDIRNAME)</dirname>
-        <sources>
-            src/iodbc/catalog.c
-            src/iodbc/connect.c
-            src/iodbc/dlf.c
-            src/iodbc/dlproc.c
-            src/iodbc/execute.c
-            src/iodbc/fetch.c
-            src/iodbc/hdbc.c
-            src/iodbc/henv.c
-            src/iodbc/herr.c
-            src/iodbc/hstmt.c
-            src/iodbc/info.c
-            src/iodbc/itrace.c
-            src/iodbc/misc.c
-            src/iodbc/prepare.c
-            src/iodbc/result.c
-        </sources>
-    </lib>
-
-</makefile>
index 043deeb4983a704ec721276f54964a7b19e227a2..0c24e31aff0f2bf2756292725a0f985184eddcd0 100644 (file)
@@ -89,9 +89,7 @@
         <wx-lib>aui</wx-lib>
         <wx-lib>stc</wx-lib>
         <wx-lib>qa</wx-lib>
-        <wx-lib>dbgrid</wx-lib>
         <wx-lib>gl</wx-lib>
-        <wx-lib>odbc</wx-lib>
         <wx-lib>xrc</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>media</wx-lib>
                          tag definitions.
     -->
     <set var="WX_LIB_LIST">
-        base core net xml odbc xrc html adv media gl dbgrid qa aui richtext stc
+        base core net xml xrc html adv media gl qa aui richtext stc
     </set>
 
     <!-- if you define this variable to 0 before including wx presets, the
index bd209cf9bc24fa0ee2c357cab7a05345cdaa507c..35063a6ad2d6e0b8521580084c13ecdcc50e5324 100644 (file)
 
     <define-wxbase-lib-name>net</define-wxbase-lib-name>
     <define-wxbase-lib-name>xml</define-wxbase-lib-name>
-    <define-wxbase-lib-name>odbc</define-wxbase-lib-name>
 
 
     <!--   Libraries whose name is prefixed with 'wx' only          -->
     <define-wxlib-name>html</define-wxlib-name>
     <define-wxlib-name>adv</define-wxlib-name>
     <define-wxlib-name>qa</define-wxlib-name>
-    <define-wxlib-name>dbgrid</define-wxlib-name>
     <define-wxlib-name>gl</define-wxlib-name>
     <define-wxlib-name>aui</define-wxlib-name>
     <define-wxlib-name>stc</define-wxlib-name>
 
         <if cond="value=='net'"><sys-lib>$(WXLIB_NET_NAME)</sys-lib></if>
         <if cond="value=='xml'"><sys-lib>$(WXLIB_XML_NAME)</sys-lib></if>
-        <if cond="value=='odbc'"><sys-lib>$(WXLIB_ODBC_NAME)</sys-lib></if>
 
         <if cond="value=='media'"><sys-lib>$(WXLIB_MEDIA_NAME)</sys-lib></if>
         <if cond="value=='xrc'"><sys-lib>$(WXLIB_XRC_NAME)</sys-lib></if>
         <if cond="value=='html'"><sys-lib>$(WXLIB_HTML_NAME)</sys-lib></if>
         <if cond="value=='adv'"><sys-lib>$(WXLIB_ADV_NAME)</sys-lib></if>
         <if cond="value=='gl'"><sys-lib>$(WXLIB_GL_NAME)</sys-lib></if>
-        <if cond="value=='dbgrid'"><sys-lib>$(WXLIB_DBGRID_NAME)</sys-lib></if>
         <if cond="value=='qa'"><sys-lib>$(WXLIB_QA_NAME)</sys-lib></if>
         <if cond="value=='aui'"><sys-lib>$(WXLIB_AUI_NAME)</sys-lib></if>
         <if cond="value=='richtext'"><sys-lib>$(WXLIB_RICHTEXT_NAME)</sys-lib></if>
         <!-- If on borland, we don't need to do much            -->
         <if cond="FORMAT=='borland'">
             <sys-lib>ole2w32</sys-lib>
-            <sys-lib>odbc32</sys-lib>
         </if>
 
         <!-- Non-borland, on the other hand...                  -->
             <sys-lib>rpcrt4</sys-lib>
             <sys-lib>advapi32</sys-lib>
             <sys-lib>wsock32</sys-lib>
-            <sys-lib>odbc32</sys-lib>
         </if>
 
         <!-- Libs common to both borland and MSVC               -->
index d498c597fb5a4a15b215b778b7aa2ab73f28ac67..ebf4ecffacab25bb5dedc11ce98061e42c579207 100644 (file)
@@ -40,17 +40,16 @@ def mk_wxid(id):
 
 # All libs that are part of the main library (i.e. non-contrib):
 MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net',
-             'media', 'odbc', 'qa', 'dbgrid', 'xrc', 'aui', 'richtext', 'stc']
+             'media', 'qa', 'xrc', 'aui', 'richtext', 'stc']
 # List of library names/ids for categories with different names:
-LIBS_NOGUI = ['xml', 'net', 'odbc']
-LIBS_GUI   = ['core', 'adv', 'html', 'gl', 'qa', 'dbgrid', 'xrc', 'media',
+LIBS_NOGUI = ['xml', 'net']
+LIBS_GUI   = ['core', 'adv', 'html', 'gl', 'qa', 'xrc', 'media',
               'aui', 'richtext', 'stc']
 # Additional libraries that must be linked in:
 EXTRALIBS = {
     'gl' : '$(EXTRALIBS_OPENGL)',
     'xml' : '$(EXTRALIBS_XML)',
     'html' : '$(EXTRALIBS_HTML)',
-    'odbc' : '$(EXTRALIBS_ODBC)',
     'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
 }
 
index a56c7dea062bfcb0690983cbf45f9aa89056241d..171c12650b46e970338e1de6c4a091d6d6a13d07 100644 (file)
@@ -88,9 +88,6 @@ USE_RICHTEXT = 1
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0
 
-# Build ODBC database classes (USE_GUI must be 1)? [0,1]
-USE_ODBC = 0
-
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
 USE_QA = 0
 
index 5d12cae49569ec95a3f775a1f359a5108d2ca78d..1d1777eaf918d9ec91c4d8f4cb9886a588cd090b 100644 (file)
@@ -132,11 +132,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_m_tables.obj &
        $(OBJS)\monodll_winpars.obj &
        $(OBJS)\monodll_htmllbox.obj &
-       $(OBJS)\monodll_db.obj &
-       $(OBJS)\monodll_dbtable.obj &
        $(OBJS)\monodll_debugrpt.obj &
        $(OBJS)\monodll_dbgrptg.obj &
-       $(OBJS)\monodll_dbgrid.obj &
        $(OBJS)\monodll_xh_animatctrl.obj &
        $(OBJS)\monodll_xh_bmp.obj &
        $(OBJS)\monodll_xh_bmpcbox.obj &
@@ -464,11 +461,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_m_tables.obj &
        $(OBJS)\monolib_winpars.obj &
        $(OBJS)\monolib_htmllbox.obj &
-       $(OBJS)\monolib_db.obj &
-       $(OBJS)\monolib_dbtable.obj &
        $(OBJS)\monolib_debugrpt.obj &
        $(OBJS)\monolib_dbgrptg.obj &
-       $(OBJS)\monolib_dbgrid.obj &
        $(OBJS)\monolib_xh_animatctrl.obj &
        $(OBJS)\monolib_xh_bmp.obj &
        $(OBJS)\monolib_xh_bmpcbox.obj &
@@ -1231,46 +1225,6 @@ __medialib___depname = &
 !endif
 !endif
 !endif
-__odbcdll___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_ODBC 1
-__odbcdll___depname = &
-       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.dll
-!endif
-!endif
-!endif
-__odbclib___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_ODBC 1
-__odbclib___depname = &
-       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-!endif
-!endif
-!endif
-__dbgriddll___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-!ifeq USE_ODBC 1
-__dbgriddll___depname = &
-       $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.dll
-!endif
-!endif
-!endif
-!endif
-__dbgridlib___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-!ifeq USE_ODBC 1
-__dbgridlib___depname = &
-       $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-!endif
-!endif
-!endif
-!endif
 __htmldll___depname =
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
@@ -1548,7 +1502,7 @@ MAKEARGS = DOS32="$(DOS32)" CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" &
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
        USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
        USE_RICHTEXT="$(USE_RICHTEXT)" USE_OPENGL="$(USE_OPENGL)" &
-       USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" &
+       USE_QA="$(USE_QA)" &
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
        USE_GDIPLUS="$(USE_GDIPLUS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" &
        VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" &
@@ -2237,54 +2191,6 @@ MEDIALIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
 MEDIALIB_OBJECTS =  &
        $(OBJS)\medialib_dummy.obj &
        $(OBJS)\medialib_mediactrlcmn.obj
-ODBCDLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-       -d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-       $(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-       $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_ODBC &
-       /fh=$(OBJS)\wxprec_odbcdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
-ODBCDLL_OBJECTS =  &
-       $(OBJS)\odbcdll_dummy.obj &
-       $(OBJS)\odbcdll_db.obj &
-       $(OBJS)\odbcdll_dbtable.obj
-ODBCLIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-       -d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-       $(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-       $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-       -i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_odbclib.pch &
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-ODBCLIB_OBJECTS =  &
-       $(OBJS)\odbclib_dummy.obj &
-       $(OBJS)\odbclib_db.obj &
-       $(OBJS)\odbclib_dbtable.obj
-DBGRIDDLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-       -d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-       $(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-       $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_DBGRID &
-       /fh=$(OBJS)\wxprec_dbgriddll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
-DBGRIDDLL_OBJECTS =  &
-       $(OBJS)\dbgriddll_dummy.obj &
-       $(OBJS)\dbgriddll_dbgrid.obj
-DBGRIDLIB_CXXFLAGS = $(____DOS_CFLAG_p) $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
-       -d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
-       $(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
-       $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -wx -wcd=549 -wcd=656 &
-       -wcd=657 -wcd=667 -i=$(%SCITECH)\include -i=..\..\src\tiff -i=..\..\src\jpeg &
-       -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_dbgridlib.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-DBGRIDLIB_OBJECTS =  &
-       $(OBJS)\dbgridlib_dummy.obj &
-       $(OBJS)\dbgridlib_dbgrid.obj
 HTMLDLL_CXXFLAGS = $(____DOS_CFLAG_p) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) &
        -d__WXMGL__ -d__WXUNIVERSAL__ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) &
        $(__RTTI_DEFINE_p) -dwxNO_THREADS $(__UNICODE_DEFINE_p) &
@@ -2633,7 +2539,7 @@ $(OBJS) :
 
 ### Targets: ###
 
-all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
+all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -2665,12 +2571,6 @@ clean : .SYMBOLIC
        -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.dll
        -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
        -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
-       -del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.dll
-       -del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-       -del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-       -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.dll
-       -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-       -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
        -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.dll
        -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
        -del $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
@@ -2906,70 +2806,6 @@ $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 !endif
 !endif
 
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_ODBC 1
-$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.dll :  $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
-       @%create $(OBJS)\odbcdll.lbc
-       @%append $(OBJS)\odbcdll.lbc option quiet
-       @%append $(OBJS)\odbcdll.lbc name $^@
-       @%append $(OBJS)\odbcdll.lbc option caseexact
-       @%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10 libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10\$(__MGLPMLIBPATH_FILENAMES)
-       @for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.lbc file %i
-       @for %i in ( wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\odbcdll.lbc library %i
-       @%append $(OBJS)\odbcdll.lbc
-       @%append $(OBJS)\odbcdll.lbc system
-       wlink @$(OBJS)\odbcdll.lbc
-       wlib -q -n -b $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib +$^@
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_ODBC 1
-$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib :  $(ODBCLIB_OBJECTS)
-       @%create $(OBJS)\odbclib.lbc
-       @for %i in ($(ODBCLIB_OBJECTS)) do @%append $(OBJS)\odbclib.lbc +%i
-       wlib -q -p4096 -n -b $^@ @$(OBJS)\odbclib.lbc
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-!ifeq USE_ODBC 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.dll :  $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
-       @%create $(OBJS)\dbgriddll.lbc
-       @%append $(OBJS)\dbgriddll.lbc option quiet
-       @%append $(OBJS)\dbgriddll.lbc name $^@
-       @%append $(OBJS)\dbgriddll.lbc option caseexact
-       @%append $(OBJS)\dbgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME) libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10 libpath $(%SCITECH)\lib\$(__BUILD_FILENAMES)\dos32\ow10\$(__MGLPMLIBPATH_FILENAMES)
-       @for %i in ($(DBGRIDDLL_OBJECTS)) do @%append $(OBJS)\dbgriddll.lbc file %i
-       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) mgl.lib mglcpp.lib pm.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\dbgriddll.lbc library %i
-       @%append $(OBJS)\dbgriddll.lbc
-       @%append $(OBJS)\dbgriddll.lbc system
-       wlink @$(OBJS)\dbgriddll.lbc
-       wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib +$^@
-!endif
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-!ifeq USE_ODBC 1
-$(LIBDIRNAME)\wx$(PORTNAME)univ$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib :  $(DBGRIDLIB_OBJECTS)
-       @%create $(OBJS)\dbgridlib.lbc
-       @for %i in ($(DBGRIDLIB_OBJECTS)) do @%append $(OBJS)\dbgridlib.lbc +%i
-       wlib -q -p4096 -n -b $^@ @$(OBJS)\dbgridlib.lbc
-!endif
-!endif
-!endif
-!endif
-
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
 !ifeq USE_GUI 1
@@ -3225,7 +3061,6 @@ build_cfg_file : .SYMBOLIC $(SETUPHDIR)
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
-       @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
        @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
@@ -4563,21 +4398,12 @@ $(OBJS)\monodll_winpars.obj :  .AUTODEPEND ..\..\src\html\winpars.cpp
 $(OBJS)\monodll_htmllbox.obj :  .AUTODEPEND ..\..\src\generic\htmllbox.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_db.obj :  .AUTODEPEND ..\..\src\common\db.cpp
-       $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dbtable.obj :  .AUTODEPEND ..\..\src\common\dbtable.cpp
-       $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_debugrpt.obj :  .AUTODEPEND ..\..\src\common\debugrpt.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
-       $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -5766,21 +5592,12 @@ $(OBJS)\monolib_winpars.obj :  .AUTODEPEND ..\..\src\html\winpars.cpp
 $(OBJS)\monolib_htmllbox.obj :  .AUTODEPEND ..\..\src\generic\htmllbox.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_db.obj :  .AUTODEPEND ..\..\src\common\db.cpp
-       $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dbtable.obj :  .AUTODEPEND ..\..\src\common\dbtable.cpp
-       $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_debugrpt.obj :  .AUTODEPEND ..\..\src\common\debugrpt.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
-       $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -7854,36 +7671,6 @@ $(OBJS)\medialib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
 $(OBJS)\medialib_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\odbcdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-       $(CXX) -bt=dos -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $<
-
-$(OBJS)\odbcdll_db.obj :  .AUTODEPEND ..\..\src\common\db.cpp
-       $(CXX) -bt=dos -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $<
-
-$(OBJS)\odbcdll_dbtable.obj :  .AUTODEPEND ..\..\src\common\dbtable.cpp
-       $(CXX) -bt=dos -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $<
-
-$(OBJS)\odbclib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-       $(CXX) -bt=dos -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $<
-
-$(OBJS)\odbclib_db.obj :  .AUTODEPEND ..\..\src\common\db.cpp
-       $(CXX) -bt=dos -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $<
-
-$(OBJS)\odbclib_dbtable.obj :  .AUTODEPEND ..\..\src\common\dbtable.cpp
-       $(CXX) -bt=dos -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $<
-
-$(OBJS)\dbgriddll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-       $(CXX) -bt=dos -zq -fo=$^@ $(DBGRIDDLL_CXXFLAGS) $<
-
-$(OBJS)\dbgriddll_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
-       $(CXX) -bt=dos -zq -fo=$^@ $(DBGRIDDLL_CXXFLAGS) $<
-
-$(OBJS)\dbgridlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-       $(CXX) -bt=dos -zq -fo=$^@ $(DBGRIDLIB_CXXFLAGS) $<
-
-$(OBJS)\dbgridlib_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
-       $(CXX) -bt=dos -zq -fo=$^@ $(DBGRIDLIB_CXXFLAGS) $<
-
 $(OBJS)\htmldll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=dos -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
 
index 02c824eea8b105ddd981171fc597b2557f3fffcd..9785dd409ed37600ea56bb0391f136054779b0b5 100644 (file)
@@ -128,11 +128,6 @@ USE_STC = 1
 USE_OPENGL = 0
 !endif
 
-# Build ODBC database classes (USE_GUI must be 1)? [0,1]
-!ifndef USE_ODBC
-USE_ODBC = 0
-!endif
-
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
 !ifndef USE_QA
 USE_QA = 0
index 69ea740b72aaa69b4a0ae2f219c2abf841e539fe..745b48b7acffa1b49c20f9ae3e3704c0c35749f5 100644 (file)
@@ -82,9 +82,6 @@ USE_STC := 1
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL := 0
 
-# Build ODBC database classes (USE_GUI must be 1)? [0,1]
-USE_ODBC := 0
-
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
 USE_QA := 0
 
index 15bccf83b174ddaa79a394d0c5b4567286118b05..472dae964ddce4ef59e1ff48483e1c9de95caef9 100644 (file)
@@ -95,9 +95,6 @@ USE_STC = 1
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0
 
-# Build ODBC database classes (USE_GUI must be 1)? [0,1]
-USE_ODBC = 0
-
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
 USE_QA = 1
 
index 2ce90959211f32f9d22a2fc1c107ed88febfdb24..619f3b6fa8f09dcb4b42c2a9a47c6ce4ea373b47 100644 (file)
@@ -86,9 +86,6 @@ USE_STC = 1
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0
 
-# Build ODBC database classes (USE_GUI must be 1)? [0,1]
-USE_ODBC = 0
-
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
 USE_QA = 0
 
index c968acc9611453f0ec1df776cd4fc44d0b2fc124..ac40681155f13a1ebfc12e240a1c9da5a59bc586 100644 (file)
@@ -29,8 +29,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
        -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \
        -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \
        -DUSE_AUI="$(USE_AUI)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \
-       -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" \
-       -DUSE_ODBC="$(USE_ODBC)" -DUSE_QA="$(USE_QA)" \
+       -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
        -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
        -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \
        -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
@@ -917,52 +916,6 @@ MEDIALIB_OBJECTS =  \
        $(OBJS)\medialib_mediactrl_wmp10.obj \
        $(OBJS)\medialib_mediactrl_qt.obj \
        $(OBJS)\medialib_activex.obj
-ODBCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \
-       -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \
-       -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL \
-       -DWXMAKINGDLL_ODBC -Hu -H=$(OBJS)\wxprec_odbcdll.csm $(CPPFLAGS) $(CXXFLAGS)
-ODBCDLL_OBJECTS =  \
-       $(OBJS)\odbcdll_dummy.obj \
-       $(OBJS)\odbcdll_db.obj \
-       $(OBJS)\odbcdll_dbtable.obj
-ODBCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \
-       -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \
-       -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -Hu \
-       -H=$(OBJS)\wxprec_odbclib.csm $(CPPFLAGS) $(CXXFLAGS)
-ODBCLIB_OBJECTS =  \
-       $(OBJS)\odbclib_dummy.obj \
-       $(OBJS)\odbclib_db.obj \
-       $(OBJS)\odbclib_dbtable.obj
-DBGRIDDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \
-       -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \
-       -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_DBGRID \
-       -Hu -H=$(OBJS)\wxprec_dbgriddll.csm $(CPPFLAGS) $(CXXFLAGS)
-DBGRIDDLL_OBJECTS =  \
-       $(OBJS)\dbgriddll_dummy.obj \
-       $(OBJS)\dbgriddll_dbgrid.obj
-DBGRIDLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -DWXBUILDING \
-       -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \
-       -I..\..\src\regex -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_dbgridlib.csm \
-       $(CPPFLAGS) $(CXXFLAGS)
-DBGRIDLIB_OBJECTS =  \
-       $(OBJS)\dbgridlib_dummy.obj \
-       $(OBJS)\dbgridlib_dbgrid.obj
 HTMLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1423,11 +1376,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_m_tables.obj \
        $(OBJS)\monodll_winpars.obj \
        $(OBJS)\monodll_htmllbox.obj \
-       $(OBJS)\monodll_db.obj \
-       $(OBJS)\monodll_dbtable.obj \
        $(OBJS)\monodll_debugrpt.obj \
        $(OBJS)\monodll_dbgrptg.obj \
-       $(OBJS)\monodll_dbgrid.obj \
        $(OBJS)\monodll_xh_animatctrl.obj \
        $(OBJS)\monodll_xh_bmp.obj \
        $(OBJS)\monodll_xh_bmpcbox.obj \
@@ -2064,11 +2014,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_m_tables.obj \
        $(OBJS)\monolib_winpars.obj \
        $(OBJS)\monolib_htmllbox.obj \
-       $(OBJS)\monolib_db.obj \
-       $(OBJS)\monolib_dbtable.obj \
        $(OBJS)\monolib_debugrpt.obj \
        $(OBJS)\monolib_dbgrptg.obj \
-       $(OBJS)\monolib_dbgrid.obj \
        $(OBJS)\monolib_xh_animatctrl.obj \
        $(OBJS)\monolib_xh_bmp.obj \
        $(OBJS)\monolib_xh_bmpcbox.obj \
@@ -3777,28 +3724,6 @@ ____wxmedia_namedll_DEP = $(__mediadll___depname)
 !if "$(SHARED)" == "0"
 ____wxmedia_namelib_DEP = $(__medialib___depname)
 !endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
-__odbcdll___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).dll
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
-__odbclib___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-__dbgriddll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).dll
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-__dbgridlib___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-!endif
-!if "$(SHARED)" == "1"
-____wxdbgrid_namedll_DEP = $(__dbgriddll___depname)
-!endif
-!if "$(SHARED)" == "0"
-____wxdbgrid_namelib_DEP = $(__dbgridlib___depname)
-!endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
 __htmldll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).dll
@@ -3934,43 +3859,43 @@ __htmldll_library_link_LIBR = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
 !endif
 !if "$(USE_THREADS)" == "0"
-__THREADSFLAG_13 = 
+__THREADSFLAG_11 = 
 !endif
 !if "$(USE_THREADS)" == "1"
-__THREADSFLAG_13 = mt
+__THREADSFLAG_11 = mt
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_5 = i
+__RUNTIME_LIBS_4 = i
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_5 = 
+__RUNTIME_LIBS_4 = 
 !endif
 !if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_62 = -d__WXUNIVERSAL__
+__WXUNIV_DEFINE_p_54 = -d__WXUNIVERSAL__
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_61 = -d__WXDEBUG__
+__DEBUG_DEFINE_p_53 = -d__WXDEBUG__
 !endif
 !if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_61 = -d__WXDEBUG__
+__DEBUG_DEFINE_p_53 = -d__WXDEBUG__
 !endif
 !if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_61 = -dwxNO_EXCEPTIONS
+__EXCEPTIONS_DEFINE_p_53 = -dwxNO_EXCEPTIONS
 !endif
 !if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_61 = -dwxNO_RTTI
+__RTTI_DEFINE_p_53 = -dwxNO_RTTI
 !endif
 !if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_61 = -dwxNO_THREADS
+__THREAD_DEFINE_p_53 = -dwxNO_THREADS
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_62 = -d_UNICODE
+__UNICODE_DEFINE_p_54 = -d_UNICODE
 !endif
 !if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_61 = -dwxUSE_UNICODE_MSLU=1
+__MSLU_DEFINE_p_53 = -dwxUSE_UNICODE_MSLU=1
 !endif
 !if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_61 = -dwxUSE_GRAPHICS_CONTEXT=1
+__GFXCTX_DEFINE_p_53 = -dwxUSE_GRAPHICS_CONTEXT=1
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -4058,7 +3983,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
+all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -4119,22 +4044,6 @@ clean:
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).ils
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).tds
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ilc
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ild
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ilf
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).ils
-       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).tds
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ilc
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ild
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ilf
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).ils
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).tds
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).ilc
@@ -4259,7 +4168,7 @@ $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib: $(WXSCINTILLA_OBJECTS)
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP)
        ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(MONODLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib     $(__wxscintilla) import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\monodll_version.res
+       c0d32.obj $(MONODLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib    $(__wxscintilla) import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\monodll_version.res
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@
 !endif
@@ -4275,7 +4184,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\basedll_version.res
        ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(BASEDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\basedll_version.res
+       c0d32.obj $(BASEDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\basedll_version.res
 |
        implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@
 !endif
@@ -4295,7 +4204,7 @@ wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\netdll_version.res $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(NETDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\netdll_version.res
+       c0d32.obj $(NETDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\netdll_version.res
 |
        implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net $@
 !endif
@@ -4315,7 +4224,7 @@ wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\coredll_version.res $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(COREDLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\coredll_version.res
+       c0d32.obj $(COREDLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\coredll_version.res
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core $@
 !endif
@@ -4335,7 +4244,7 @@ wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\advdll_version.res
+       c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\advdll_version.res
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv $@
 !endif
@@ -4355,7 +4264,7 @@ wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj  $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(MEDIADLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\mediadll_version.res
+       c0d32.obj $(MEDIADLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\mediadll_version.res
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media $@
 !endif
@@ -4372,46 +4281,10 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
 !endif
 
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj  $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\odbcdll_version.res $(__basedll___depname)
-       ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(ODBCDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\odbcdll_version.res
-|
-       implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc $@
-!endif
-
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib: $(OBJS)\odbclib_dummy.obj  $(ODBCLIB_OBJECTS)
-       if exist $@ del $@
-       tlib /a /p4096 $@ @&&|
-       $(ODBCLIB_OBJECTS)
-|
-!endif
-
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG).dll: $(OBJS)\dbgriddll_dummy.obj  $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\dbgriddll_version.res $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
-       ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(DBGRIDDLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\dbgriddll_version.res
-|
-       implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid $@
-!endif
-
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj  $(DBGRIDLIB_OBJECTS)
-       if exist $@ del $@
-       tlib /a /p4096 $@ @&&|
-       $(DBGRIDLIB_OBJECTS)
-|
-!endif
-
-!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-wxdbgrid: $(____wxdbgrid_namedll_DEP) $(____wxdbgrid_namelib_DEP)
-!endif
-
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\htmldll_version.res
+       c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\htmldll_version.res
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html $@
 !endif
@@ -4431,7 +4304,7 @@ wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
        ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(QADLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\qadll_version.res
+       c0d32.obj $(QADLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\qadll_version.res
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa $@
 !endif
@@ -4451,7 +4324,7 @@ wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\xmldll_version.res $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(XMLDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\xmldll_version.res
+       c0d32.obj $(XMLDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xmldll_version.res
 |
        implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml $@
 !endif
@@ -4471,7 +4344,7 @@ wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(XRCDLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\xrcdll_version.res
+       c0d32.obj $(XRCDLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\xrcdll_version.res
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc $@
 !endif
@@ -4491,7 +4364,7 @@ wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj  $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(AUIDLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\auidll_version.res
+       c0d32.obj $(AUIDLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\auidll_version.res
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui $@
 !endif
@@ -4511,7 +4384,7 @@ wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj  $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(RICHTEXTDLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\richtextdll_version.res
+       c0d32.obj $(RICHTEXTDLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\richtextdll_version.res
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext $@
 !endif
@@ -4531,7 +4404,7 @@ wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj  $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla)  $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname)
        ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(STCDLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\stcdll_version.res
+       c0d32.obj $(STCDLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\stcdll_version.res
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc $@
 !endif
@@ -4551,7 +4424,7 @@ wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP)
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname)
        ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) @&&|
-       c0d32.obj $(GLDLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p)  import32.lib cw32$(__THREADSFLAG_13)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\gldll_version.res
+       c0d32.obj $(GLDLL_OBJECTS),$@,, $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p)  import32.lib cw32$(__THREADSFLAG_11)$(__RUNTIME_LIBS_4).lib,, $(OBJS)\gldll_version.res
 |
        implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl $@
 !endif
@@ -4616,7 +4489,6 @@ build_cfg_file: $(SETUPHDIR)
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
-       @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
        @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
@@ -5798,21 +5670,12 @@ $(OBJS)\monodll_winpars.obj: ..\..\src\html\winpars.cpp
 $(OBJS)\monodll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
-$(OBJS)\monodll_db.obj: ..\..\src\common\db.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_dbtable.obj: ..\..\src\common\dbtable.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
 $(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
 $(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
-$(OBJS)\monodll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
 $(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
@@ -7317,7 +7180,7 @@ $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
 !endif
 
 $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib  -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS $**
 
 $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) -H $**
@@ -7892,21 +7755,12 @@ $(OBJS)\monolib_winpars.obj: ..\..\src\html\winpars.cpp
 $(OBJS)\monolib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
-$(OBJS)\monolib_db.obj: ..\..\src\common\db.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_dbtable.obj: ..\..\src\common\dbtable.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
 $(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
 $(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
-$(OBJS)\monolib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
 $(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -9414,7 +9268,7 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) -H $**
 
 $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib  -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 $**
 
 $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
@@ -10023,7 +9877,7 @@ $(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) -H $**
 
 $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib  -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET $**
 
 $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
        $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) $**
@@ -10104,7 +9958,7 @@ $(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) -H $**
 
 $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib  -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 $**
 
 $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -12729,7 +12583,7 @@ $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) -H $**
 
 $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib  -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV $**
 
 $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
        $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
@@ -12906,7 +12760,7 @@ $(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) -H $**
 
 $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib  -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA $**
 
 $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
        $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) $**
@@ -12941,47 +12795,11 @@ $(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
 $(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp
        $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) $**
 
-$(OBJS)\odbcdll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) -H $**
-
-$(OBJS)\odbcdll_version.res: ..\..\src\msw\version.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib  -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_ODBC $**
-
-$(OBJS)\odbcdll_db.obj: ..\..\src\common\db.cpp
-       $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) $**
-
-$(OBJS)\odbcdll_dbtable.obj: ..\..\src\common\dbtable.cpp
-       $(CXX) -q -c -P -o$@ $(ODBCDLL_CXXFLAGS) $**
-
-$(OBJS)\odbclib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) -H $**
-
-$(OBJS)\odbclib_db.obj: ..\..\src\common\db.cpp
-       $(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) $**
-
-$(OBJS)\odbclib_dbtable.obj: ..\..\src\common\dbtable.cpp
-       $(CXX) -q -c -P -o$@ $(ODBCLIB_CXXFLAGS) $**
-
-$(OBJS)\dbgriddll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) -q -c -P -o$@ $(DBGRIDDLL_CXXFLAGS) -H $**
-
-$(OBJS)\dbgriddll_version.res: ..\..\src\msw\version.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib  -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_DBGRID $**
-
-$(OBJS)\dbgriddll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
-       $(CXX) -q -c -P -o$@ $(DBGRIDDLL_CXXFLAGS) $**
-
-$(OBJS)\dbgridlib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) -q -c -P -o$@ $(DBGRIDLIB_CXXFLAGS) -H $**
-
-$(OBJS)\dbgridlib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
-       $(CXX) -q -c -P -o$@ $(DBGRIDLIB_CXXFLAGS) $**
-
 $(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) -H $**
 
 $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib  -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML $**
 
 $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
        $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) $**
@@ -13134,7 +12952,7 @@ $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) -H $**
 
 $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib  -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA $**
 
 $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
        $(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) $**
@@ -13155,7 +12973,7 @@ $(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) -H $**
 
 $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib  -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML $**
 
 $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
        $(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) $**
@@ -13176,7 +12994,7 @@ $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) -H $**
 
 $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib  -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC $**
 
 $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
        $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
@@ -13527,7 +13345,7 @@ $(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) -H $**
 
 $(OBJS)\auidll_version.res: ..\..\src\msw\version.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib  -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI $**
 
 $(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp
        $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) $**
@@ -13566,7 +13384,7 @@ $(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) -H $**
 
 $(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib  -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT $**
 
 $(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
        $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) $**
@@ -13629,7 +13447,7 @@ $(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) -H $**
 
 $(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib  -i..\..\src\regex -i..\..\src\expat\lib -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dWXUSINGDLL -dWXMAKINGDLL_STC $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dWXUSINGDLL -dWXMAKINGDLL_STC $**
 
 $(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp
        $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) $**
@@ -13656,7 +13474,7 @@ $(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) -H $**
 
 $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib  -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL $**
 
 $(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp
        $(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) $**
index aa23efed59fe12b86a63cf9b6db76ed6963b5ec3..eb9c7ad7e2ade5febc86d7ebe23c3b15a053678f 100644 (file)
@@ -19,7 +19,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
        USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
        USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
-       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
        USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
        OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
@@ -911,56 +911,6 @@ MEDIALIB_OBJECTS =  \
        $(OBJS)\medialib_mediactrl_wmp10.o \
        $(OBJS)\medialib_mediactrl_qt.o \
        $(OBJS)\medialib_activex.o
-ODBCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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) \
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall -DWXBUILDING \
-       -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \
-       -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL \
-       -DWXMAKINGDLL_ODBC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \
-       $(CPPFLAGS) $(CXXFLAGS)
-ODBCDLL_OBJECTS =  \
-       $(OBJS)\odbcdll_dummy.o \
-       $(OBJS)\odbcdll_version_rc.o \
-       $(OBJS)\odbcdll_db.o \
-       $(OBJS)\odbcdll_dbtable.o
-ODBCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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) \
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall -DWXBUILDING \
-       -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \
-       -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-ODBCLIB_OBJECTS =  \
-       $(OBJS)\odbclib_dummy.o \
-       $(OBJS)\odbclib_db.o \
-       $(OBJS)\odbclib_dbtable.o
-DBGRIDDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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) \
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall -DWXBUILDING \
-       -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \
-       -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_DBGRID \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
-       $(CXXFLAGS)
-DBGRIDDLL_OBJECTS =  \
-       $(OBJS)\dbgriddll_dummy.o \
-       $(OBJS)\dbgriddll_version_rc.o \
-       $(OBJS)\dbgriddll_dbgrid.o
-DBGRIDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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) \
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I..\..\include -W -Wall -DWXBUILDING \
-       -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \
-       -I..\..\src\regex -I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-DBGRIDLIB_OBJECTS =  \
-       $(OBJS)\dbgridlib_dummy.o \
-       $(OBJS)\dbgridlib_dbgrid.o
 HTMLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1440,11 +1390,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_m_tables.o \
        $(OBJS)\monodll_winpars.o \
        $(OBJS)\monodll_htmllbox.o \
-       $(OBJS)\monodll_db.o \
-       $(OBJS)\monodll_dbtable.o \
        $(OBJS)\monodll_debugrpt.o \
        $(OBJS)\monodll_dbgrptg.o \
-       $(OBJS)\monodll_dbgrid.o \
        $(OBJS)\monodll_xh_animatctrl.o \
        $(OBJS)\monodll_xh_bmp.o \
        $(OBJS)\monodll_xh_bmpcbox.o \
@@ -2087,11 +2034,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_m_tables.o \
        $(OBJS)\monolib_winpars.o \
        $(OBJS)\monolib_htmllbox.o \
-       $(OBJS)\monolib_db.o \
-       $(OBJS)\monolib_dbtable.o \
        $(OBJS)\monolib_debugrpt.o \
        $(OBJS)\monolib_dbgrptg.o \
-       $(OBJS)\monolib_dbgrid.o \
        $(OBJS)\monolib_xh_animatctrl.o \
        $(OBJS)\monolib_xh_bmp.o \
        $(OBJS)\monolib_xh_bmpcbox.o \
@@ -3850,48 +3794,6 @@ ____wxmedia_namelib_DEP = $(__medialib___depname)
 endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
-ifeq ($(USE_ODBC),1)
-__odbcdll___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_gcc$(VENDORTAG).dll
-endif
-endif
-endif
-ifeq ($(MONOLITHIC),0)
-ifeq ($(SHARED),0)
-ifeq ($(USE_ODBC),1)
-__odbclib___depname = \
-       $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a
-endif
-endif
-endif
-ifeq ($(MONOLITHIC),0)
-ifeq ($(SHARED),1)
-ifeq ($(USE_GUI),1)
-ifeq ($(USE_ODBC),1)
-__dbgriddll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_gcc$(VENDORTAG).dll
-endif
-endif
-endif
-endif
-ifeq ($(MONOLITHIC),0)
-ifeq ($(SHARED),0)
-ifeq ($(USE_GUI),1)
-ifeq ($(USE_ODBC),1)
-__dbgridlib___depname = \
-       $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a
-endif
-endif
-endif
-endif
-ifeq ($(SHARED),1)
-____wxdbgrid_namedll_DEP = $(__dbgriddll___depname)
-endif
-ifeq ($(SHARED),0)
-____wxdbgrid_namelib_DEP = $(__dbgridlib___depname)
-endif
-ifeq ($(MONOLITHIC),0)
-ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_HTML),1)
 __htmldll___depname = \
@@ -4105,33 +4007,33 @@ endif
 endif
 endif
 ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_62 = --define __WXUNIVERSAL__
+__WXUNIV_DEFINE_p_54 = --define __WXUNIVERSAL__
 endif
 ifeq ($(BUILD),debug)
 ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p_61 = --define __WXDEBUG__
+__DEBUG_DEFINE_p_53 = --define __WXDEBUG__
 endif
 endif
 ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p_61 = --define __WXDEBUG__
+__DEBUG_DEFINE_p_53 = --define __WXDEBUG__
 endif
 ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONS_DEFINE_p_61 = --define wxNO_EXCEPTIONS
+__EXCEPTIONS_DEFINE_p_53 = --define wxNO_EXCEPTIONS
 endif
 ifeq ($(USE_RTTI),0)
-__RTTI_DEFINE_p_61 = --define wxNO_RTTI
+__RTTI_DEFINE_p_53 = --define wxNO_RTTI
 endif
 ifeq ($(USE_THREADS),0)
-__THREAD_DEFINE_p_61 = --define wxNO_THREADS
+__THREAD_DEFINE_p_53 = --define wxNO_THREADS
 endif
 ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_62 = --define _UNICODE
+__UNICODE_DEFINE_p_54 = --define _UNICODE
 endif
 ifeq ($(MSLU),1)
-__MSLU_DEFINE_p_61 = --define wxUSE_UNICODE_MSLU=1
+__MSLU_DEFINE_p_53 = --define wxUSE_UNICODE_MSLU=1
 endif
 ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_61 = --define wxUSE_GRAPHICS_CONTEXT=1
+__GFXCTX_DEFINE_p_53 = --define wxUSE_GRAPHICS_CONTEXT=1
 endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
@@ -4231,7 +4133,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: setup_h $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
+all: setup_h $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
@@ -4261,12 +4163,6 @@ clean:
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a
        -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_gcc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a
-       -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_gcc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a
-       -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a
        -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a
@@ -4341,7 +4237,7 @@ endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\monodll_version_rc.o $(__wxscintilla_library_link_DEP)
-       $(CXX) -shared -fPIC -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32     $(__wxscintilla)
+       $(CXX) -shared -fPIC -o $@ $(MONODLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32    $(__wxscintilla)
 endif
 endif
 
@@ -4357,7 +4253,7 @@ endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\basedll_version_rc.o
-       $(CXX) -shared -fPIC -o $@ $(BASEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
+       $(CXX) -shared -fPIC -o $@ $(BASEDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
 endif
 endif
 
@@ -4377,7 +4273,7 @@ endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\netdll_version_rc.o $(__basedll___depname)
-       $(CXX) -shared -fPIC -o $@ $(NETDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+       $(CXX) -shared -fPIC -o $@ $(NETDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 
@@ -4398,7 +4294,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\coredll_version_rc.o $(__basedll___depname)
-       $(CXX) -shared -fPIC -o $@ $(COREDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+       $(CXX) -shared -fPIC -o $@ $(COREDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -4424,7 +4320,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\advdll_version_rc.o $(__coredll___depname) $(__basedll___depname)
-       $(CXX) -shared -fPIC -o $@ $(ADVDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+       $(CXX) -shared -fPIC -o $@ $(ADVDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -4451,7 +4347,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_MEDIA),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG).dll: $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\mediadll_version_rc.o $(__coredll___depname) $(__basedll___depname)
-       $(CXX) -shared -fPIC -o $@ $(MEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+       $(CXX) -shared -fPIC -o $@ $(MEDIADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -4478,64 +4374,12 @@ endif
 endif
 endif
 
-ifeq ($(MONOLITHIC),0)
-ifeq ($(SHARED),1)
-ifeq ($(USE_ODBC),1)
-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_gcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\odbcdll_version_rc.o $(__basedll___depname)
-       $(CXX) -shared -fPIC -o $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
-endif
-endif
-endif
-
-ifeq ($(MONOLITHIC),0)
-ifeq ($(SHARED),0)
-ifeq ($(USE_ODBC),1)
-$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a: $(ODBCLIB_OBJECTS)
-       if exist $@ del $@
-       ar rcu $@ $(ODBCLIB_OBJECTS)
-       ranlib $@
-endif
-endif
-endif
-
-ifeq ($(MONOLITHIC),0)
-ifeq ($(SHARED),1)
-ifeq ($(USE_GUI),1)
-ifeq ($(USE_ODBC),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_gcc$(VENDORTAG).dll: $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\dbgriddll_version_rc.o $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
-       $(CXX) -shared -fPIC -o $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
-endif
-endif
-endif
-endif
-
-ifeq ($(MONOLITHIC),0)
-ifeq ($(SHARED),0)
-ifeq ($(USE_GUI),1)
-ifeq ($(USE_ODBC),1)
-$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.a: $(DBGRIDLIB_OBJECTS)
-       if exist $@ del $@
-       ar rcu $@ $(DBGRIDLIB_OBJECTS)
-       ranlib $@
-endif
-endif
-endif
-endif
-
-ifeq ($(MONOLITHIC),0)
-ifeq ($(USE_GUI),1)
-ifeq ($(USE_ODBC),1)
-wxdbgrid: $(____wxdbgrid_namedll_DEP) $(____wxdbgrid_namelib_DEP)
-endif
-endif
-endif
-
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_HTML),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\htmldll_version_rc.o $(__coredll___depname) $(__basedll___depname)
-       $(CXX) -shared -fPIC -o $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+       $(CXX) -shared -fPIC -o $@ $(HTMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -4565,7 +4409,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_QA),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG).dll: $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\qadll_version_rc.o $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
-       $(CXX) -shared -fPIC -o $@ $(QADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a
+       $(CXX) -shared -fPIC -o $@ $(QADLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a
 endif
 endif
 endif
@@ -4593,7 +4437,7 @@ endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\xmldll_version_rc.o $(__basedll___depname)
-       $(CXX) -shared -fPIC -o $@ $(XMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+       $(CXX) -shared -fPIC -o $@ $(XMLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 
@@ -4614,7 +4458,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_XRC),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\xrcdll_version_rc.o $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
-       $(CXX) -shared -fPIC -o $@ $(XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+       $(CXX) -shared -fPIC -o $@ $(XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -4640,7 +4484,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_AUI),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG).dll: $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\auidll_version_rc.o $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
-       $(CXX) -shared -fPIC -o $@ $(AUIDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+       $(CXX) -shared -fPIC -o $@ $(AUIDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -4666,7 +4510,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_RICHTEXT),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_gcc$(VENDORTAG).dll: $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\richtextdll_version_rc.o $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
-       $(CXX) -shared -fPIC -o $@ $(RICHTEXTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+       $(CXX) -shared -fPIC -o $@ $(RICHTEXTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -4692,7 +4536,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_STC),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_gcc$(VENDORTAG).dll: $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__wxscintilla) $(OBJS)\stcdll_version_rc.o $(__coredll___depname) $(__basedll___depname)
-       $(CXX) -shared -fPIC -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(LIBDIRNAME)\libwxscintilla$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+       $(CXX) -shared -fPIC -o $@ $(STCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxscintilla$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -4718,7 +4562,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_OPENGL),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\gldll_version_rc.o $(__basedll___depname) $(__coredll___depname)
-       $(CXX) -shared -fPIC -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32
+       $(CXX) -shared -fPIC -o $@ $(GLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32
 endif
 endif
 endif
@@ -4785,7 +4629,6 @@ build_cfg_file: $(SETUPHDIR)
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
-       @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
        @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
@@ -5967,21 +5810,12 @@ $(OBJS)\monodll_winpars.o: ../../src/html/winpars.cpp
 $(OBJS)\monodll_htmllbox.o: ../../src/generic/htmllbox.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monodll_db.o: ../../src/common/db.cpp
-       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monodll_dbtable.o: ../../src/common/dbtable.cpp
-       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monodll_debugrpt.o: ../../src/common/debugrpt.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\monodll_dbgrptg.o: ../../src/generic/dbgrptg.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monodll_dbgrid.o: ../../src/common/dbgrid.cpp
-       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monodll_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -7586,7 +7420,7 @@ $(OBJS)\monodll_joystick.o: ../../src/msw/joystick.cpp
 endif
 
 $(OBJS)\monodll_version_rc.o: ../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib  --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define wxUSE_BASE=1 --define WXMAKINGDLL --include-dir ..\../src/stc/scintilla/include --include-dir ..\../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define wxUSE_BASE=1 --define WXMAKINGDLL --include-dir ..\../src/stc/scintilla/include --include-dir ..\../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS
 
 $(OBJS)\monolib_dummy.o: ../../src/common/dummy.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -8161,21 +7995,12 @@ $(OBJS)\monolib_winpars.o: ../../src/html/winpars.cpp
 $(OBJS)\monolib_htmllbox.o: ../../src/generic/htmllbox.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monolib_db.o: ../../src/common/db.cpp
-       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monolib_dbtable.o: ../../src/common/dbtable.cpp
-       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monolib_debugrpt.o: ../../src/common/debugrpt.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\monolib_dbgrptg.o: ../../src/generic/dbgrptg.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monolib_dbgrid.o: ../../src/common/dbgrid.cpp
-       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monolib_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -9783,7 +9608,7 @@ $(OBJS)\basedll_dummy.o: ../../src/common/dummy.cpp
        $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\basedll_version_rc.o: ../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib  --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1
 
 $(OBJS)\basedll_appbase.o: ../../src/common/appbase.cpp
        $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -10392,7 +10217,7 @@ $(OBJS)\netdll_dummy.o: ../../src/common/dummy.cpp
        $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\netdll_version_rc.o: ../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib  --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET
 
 $(OBJS)\netdll_fs_inet.o: ../../src/common/fs_inet.cpp
        $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -10473,7 +10298,7 @@ $(OBJS)\coredll_dummy.o: ../../src/common/dummy.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\coredll_version_rc.o: ../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib  --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0
 
 $(OBJS)\coredll_event.o: ../../src/common/event.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13298,7 +13123,7 @@ $(OBJS)\advdll_dummy.o: ../../src/common/dummy.cpp
        $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\advdll_version_rc.o: ../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib  --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_ADV
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_ADV
 
 $(OBJS)\advdll_datectrl.o: ../../src/msw/datectrl.cpp
        $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13475,7 +13300,7 @@ $(OBJS)\mediadll_dummy.o: ../../src/common/dummy.cpp
        $(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\mediadll_version_rc.o: ../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib  --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_MEDIA
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_MEDIA
 
 $(OBJS)\mediadll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
        $(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13510,47 +13335,11 @@ $(OBJS)\medialib_mediactrl_qt.o: ../../src/msw/mediactrl_qt.cpp
 $(OBJS)\medialib_activex.o: ../../src/msw/ole/activex.cpp
        $(CXX) -c -o $@ $(MEDIALIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\odbcdll_dummy.o: ../../src/common/dummy.cpp
-       $(CXX) -c -o $@ $(ODBCDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\odbcdll_version_rc.o: ../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib  --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_ODBC
-
-$(OBJS)\odbcdll_db.o: ../../src/common/db.cpp
-       $(CXX) -c -o $@ $(ODBCDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\odbcdll_dbtable.o: ../../src/common/dbtable.cpp
-       $(CXX) -c -o $@ $(ODBCDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\odbclib_dummy.o: ../../src/common/dummy.cpp
-       $(CXX) -c -o $@ $(ODBCLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\odbclib_db.o: ../../src/common/db.cpp
-       $(CXX) -c -o $@ $(ODBCLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\odbclib_dbtable.o: ../../src/common/dbtable.cpp
-       $(CXX) -c -o $@ $(ODBCLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\dbgriddll_dummy.o: ../../src/common/dummy.cpp
-       $(CXX) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\dbgriddll_version_rc.o: ../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib  --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_DBGRID
-
-$(OBJS)\dbgriddll_dbgrid.o: ../../src/common/dbgrid.cpp
-       $(CXX) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\dbgridlib_dummy.o: ../../src/common/dummy.cpp
-       $(CXX) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\dbgridlib_dbgrid.o: ../../src/common/dbgrid.cpp
-       $(CXX) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\htmldll_dummy.o: ../../src/common/dummy.cpp
        $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\htmldll_version_rc.o: ../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib  --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_HTML
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_HTML
 
 $(OBJS)\htmldll_helpbest.o: ../../src/msw/helpbest.cpp
        $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13703,7 +13492,7 @@ $(OBJS)\qadll_dummy.o: ../../src/common/dummy.cpp
        $(CXX) -c -o $@ $(QADLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\qadll_version_rc.o: ../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib  --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_QA
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_QA
 
 $(OBJS)\qadll_debugrpt.o: ../../src/common/debugrpt.cpp
        $(CXX) -c -o $@ $(QADLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13724,7 +13513,7 @@ $(OBJS)\xmldll_dummy.o: ../../src/common/dummy.cpp
        $(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\xmldll_version_rc.o: ../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib  --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML
 
 $(OBJS)\xmldll_xml.o: ../../src/xml/xml.cpp
        $(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13745,7 +13534,7 @@ $(OBJS)\xrcdll_dummy.o: ../../src/common/dummy.cpp
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\xrcdll_version_rc.o: ../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib  --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_XRC
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_XRC
 
 $(OBJS)\xrcdll_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -14096,7 +13885,7 @@ $(OBJS)\auidll_dummy.o: ../../src/common/dummy.cpp
        $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\auidll_version_rc.o: ../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib  --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_AUI
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_AUI
 
 $(OBJS)\auidll_framemanager.o: ../../src/aui/framemanager.cpp
        $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -14135,7 +13924,7 @@ $(OBJS)\richtextdll_dummy.o: ../../src/common/dummy.cpp
        $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\richtextdll_version_rc.o: ../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib  --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT
 
 $(OBJS)\richtextdll_richtextctrl.o: ../../src/richtext/richtextctrl.cpp
        $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -14198,7 +13987,7 @@ $(OBJS)\stcdll_dummy.o: ../../src/common/dummy.cpp
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\stcdll_version_rc.o: ../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib  --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --include-dir ..\../src/stc/scintilla/include --include-dir ..\../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --include-dir ..\../src/stc/scintilla/include --include-dir ..\../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC
 
 $(OBJS)\stcdll_stc.o: ../../src/stc/stc.cpp
        $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -14225,7 +14014,7 @@ $(OBJS)\gldll_dummy.o: ../../src/common/dummy.cpp
        $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\gldll_version_rc.o: ../../src/msw/version.rc
-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib  --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_GL
+       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) --include-dir $(SETUPHDIR) --include-dir ..\../include --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_gcc$(VENDORTAG)  --include-dir ..\../src/tiff/libtiff --include-dir ..\../src/jpeg --include-dir ..\../src/png --include-dir ..\../src/zlib --include-dir ..\../src/regex --include-dir ..\../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_GL
 
 $(OBJS)\gldll_glcmn.o: ../../src/common/glcmn.cpp
        $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -14242,7 +14031,7 @@ $(OBJS)\gllib_glcmn.o: ../../src/common/glcmn.cpp
 $(OBJS)\gllib_glcanvas.o: ../../src/msw/glcanvas.cpp
        $(CXX) -c -o $@ $(GLLIB_CXXFLAGS) $(CPPDEPS) $<
 
-.PHONY: all clean setup_h wxbase wxnet wxcore wxadv wxmedia wxdbgrid wxhtml wxqa wxxml wxxrc wxaui wxrichtext wxstc wxgl samples build_cfg_file
+.PHONY: all clean setup_h wxbase wxnet wxcore wxadv wxmedia wxhtml wxqa wxxml wxxrc wxaui wxrichtext wxstc wxgl samples build_cfg_file
 
 
 # Dependencies tracking:
index 80dc641de3b361a8e9075ee67ba2400db132b003..6fe15b0ff14ee52c7bca34887b2303a543c7c31b 100644 (file)
@@ -20,7 +20,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
        USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
        USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
-       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
        USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
        OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
@@ -962,67 +962,7 @@ MEDIALIB_OBJECTS =  \
        $(OBJS)\medialib_mediactrl_wmp10.obj \
        $(OBJS)\medialib_mediactrl_qt.obj \
        $(OBJS)\medialib_activex.obj
-ODBCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_262)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
-       /DWXUSINGDLL /DWXMAKINGDLL_ODBC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_odbcdll.pch" $(CPPFLAGS) $(CXXFLAGS)
-ODBCDLL_OBJECTS =  \
-       $(OBJS)\odbcdll_dummy.obj \
-       $(OBJS)\odbcdll_version.res \
-       $(OBJS)\odbcdll_db.obj \
-       $(OBJS)\odbcdll_dbtable.obj
-ODBCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_275)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_odbclib.pch" $(CPPFLAGS) $(CXXFLAGS)
-ODBCLIB_OBJECTS =  \
-       $(OBJS)\odbclib_dummy.obj \
-       $(OBJS)\odbclib_db.obj \
-       $(OBJS)\odbclib_dbtable.obj
-DBGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_289)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
-       /DWXMAKINGDLL_DBGRID $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
-       /Fp"$(OBJS)\wxprec_dbgriddll.pch" $(CPPFLAGS) $(CXXFLAGS)
-DBGRIDDLL_OBJECTS =  \
-       $(OBJS)\dbgriddll_dummy.obj \
-       $(OBJS)\dbgriddll_version.res \
-       $(OBJS)\dbgriddll_dbgrid.obj
-DBGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \
-       $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__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) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
-       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
-       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
-       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_dbgridlib.pch" \
-       $(CPPFLAGS) $(CXXFLAGS)
-DBGRIDLIB_OBJECTS =  \
-       $(OBJS)\dbgridlib_dummy.obj \
-       $(OBJS)\dbgridlib_dbgrid.obj
-HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_316)$(__DEBUGRUNTIME) /DWIN32 \
+HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_262)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1060,7 +1000,7 @@ HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_m_tables.obj \
        $(OBJS)\htmldll_winpars.obj \
        $(OBJS)\htmldll_htmllbox.obj
-HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_329)$(__DEBUGRUNTIME) /DWIN32 \
+HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_275)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1097,7 +1037,7 @@ HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_m_tables.obj \
        $(OBJS)\htmllib_winpars.obj \
        $(OBJS)\htmllib_htmllbox.obj
-QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_343)$(__DEBUGRUNTIME) /DWIN32 \
+QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_289)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1113,7 +1053,7 @@ QADLL_OBJECTS =  \
        $(OBJS)\qadll_version.res \
        $(OBJS)\qadll_debugrpt.obj \
        $(OBJS)\qadll_dbgrptg.obj
-QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_356)$(__DEBUGRUNTIME) /DWIN32 \
+QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1128,7 +1068,7 @@ QALIB_OBJECTS =  \
        $(OBJS)\qalib_dummy.obj \
        $(OBJS)\qalib_debugrpt.obj \
        $(OBJS)\qalib_dbgrptg.obj
-XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_370)$(__DEBUGRUNTIME) /DWIN32 \
+XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_316)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1144,7 +1084,7 @@ XMLDLL_OBJECTS =  \
        $(OBJS)\xmldll_version.res \
        $(OBJS)\xmldll_xml.obj \
        $(OBJS)\xmldll_xtixml.obj
-XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_383)$(__DEBUGRUNTIME) /DWIN32 \
+XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_329)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1159,7 +1099,7 @@ XMLLIB_OBJECTS =  \
        $(OBJS)\xmllib_dummy.obj \
        $(OBJS)\xmllib_xml.obj \
        $(OBJS)\xmllib_xtixml.obj
-XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_397)$(__DEBUGRUNTIME) /DWIN32 \
+XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_343)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1230,7 +1170,7 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_wizrd.obj \
        $(OBJS)\xrcdll_xmlres.obj \
        $(OBJS)\xrcdll_xmlrsall.obj
-XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \
+XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_356)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1300,7 +1240,7 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_wizrd.obj \
        $(OBJS)\xrclib_xmlres.obj \
        $(OBJS)\xrclib_xmlrsall.obj
-AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_424)$(__DEBUGRUNTIME) /DWIN32 \
+AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_370)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1319,7 +1259,7 @@ AUIDLL_OBJECTS =  \
        $(OBJS)\auidll_floatpane.obj \
        $(OBJS)\auidll_auibook.obj \
        $(OBJS)\auidll_tabmdi.obj
-AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_437)$(__DEBUGRUNTIME) /DWIN32 \
+AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_383)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1337,7 +1277,7 @@ AUILIB_OBJECTS =  \
        $(OBJS)\auilib_floatpane.obj \
        $(OBJS)\auilib_auibook.obj \
        $(OBJS)\auilib_tabmdi.obj
-RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_451)$(__DEBUGRUNTIME) /DWIN32 \
+RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_397)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1360,7 +1300,7 @@ RICHTEXTDLL_OBJECTS =  \
        $(OBJS)\richtextdll_richtextsymboldlg.obj \
        $(OBJS)\richtextdll_richtextstyledlg.obj \
        $(OBJS)\richtextdll_richtextprint.obj
-RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_464)$(__DEBUGRUNTIME) /DWIN32 \
+RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1382,7 +1322,7 @@ RICHTEXTLIB_OBJECTS =  \
        $(OBJS)\richtextlib_richtextsymboldlg.obj \
        $(OBJS)\richtextlib_richtextstyledlg.obj \
        $(OBJS)\richtextlib_richtextprint.obj
-STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_478)$(__DEBUGRUNTIME) /DWIN32 \
+STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_424)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1401,7 +1341,7 @@ STCDLL_OBJECTS =  \
        $(OBJS)\stcdll_stc.obj \
        $(OBJS)\stcdll_PlatWX.obj \
        $(OBJS)\stcdll_ScintillaWX.obj
-STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_491)$(__DEBUGRUNTIME) /DWIN32 \
+STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_437)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1418,7 +1358,7 @@ STCLIB_OBJECTS =  \
        $(OBJS)\stclib_stc.obj \
        $(OBJS)\stclib_PlatWX.obj \
        $(OBJS)\stclib_ScintillaWX.obj
-GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_505)$(__DEBUGRUNTIME) /DWIN32 \
+GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_451)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1434,7 +1374,7 @@ GLDLL_OBJECTS =  \
        $(OBJS)\gldll_version.res \
        $(OBJS)\gldll_glcmn.obj \
        $(OBJS)\gldll_glcanvas.obj
-GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_518)$(__DEBUGRUNTIME) /DWIN32 \
+GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_464)$(__DEBUGRUNTIME) /DWIN32 \
        $(__DEBUGINFO) \
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \
        $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1610,11 +1550,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_m_tables.obj \
        $(OBJS)\monodll_winpars.obj \
        $(OBJS)\monodll_htmllbox.obj \
-       $(OBJS)\monodll_db.obj \
-       $(OBJS)\monodll_dbtable.obj \
        $(OBJS)\monodll_debugrpt.obj \
        $(OBJS)\monodll_dbgrptg.obj \
-       $(OBJS)\monodll_dbgrid.obj \
        $(OBJS)\monodll_xh_animatctrl.obj \
        $(OBJS)\monodll_xh_bmp.obj \
        $(OBJS)\monodll_xh_bmpcbox.obj \
@@ -2257,11 +2194,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_m_tables.obj \
        $(OBJS)\monolib_winpars.obj \
        $(OBJS)\monolib_htmllbox.obj \
-       $(OBJS)\monolib_db.obj \
-       $(OBJS)\monolib_dbtable.obj \
        $(OBJS)\monolib_debugrpt.obj \
        $(OBJS)\monolib_dbgrptg.obj \
-       $(OBJS)\monolib_dbgrid.obj \
        $(OBJS)\monolib_xh_animatctrl.obj \
        $(OBJS)\monolib_xh_bmp.obj \
        $(OBJS)\monolib_xh_bmpcbox.obj \
@@ -4030,71 +3964,25 @@ ____wxmedia_namedll_DEP = $(__mediadll___depname)
 !if "$(SHARED)" == "0"
 ____wxmedia_namelib_DEP = $(__medialib___depname)
 !endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
-__odbcdll___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_262 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_262 = $(__THREADSFLAG)
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
-__odbclib___depname = \
-       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_275 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_275 = $(__THREADSFLAG)
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-__dbgriddll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_289 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_289 = $(__THREADSFLAG)
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-__dbgridlib___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_302 = D
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_302 = $(__THREADSFLAG)
-!endif
-!if "$(SHARED)" == "1"
-____wxdbgrid_namedll_DEP = $(__dbgriddll___depname)
-!endif
-!if "$(SHARED)" == "0"
-____wxdbgrid_namelib_DEP = $(__dbgridlib___depname)
-!endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
 __htmldll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_316 = D
+__RUNTIME_LIBS_262 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_316 = $(__THREADSFLAG)
+__RUNTIME_LIBS_262 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
 __htmllib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_329 = D
+__RUNTIME_LIBS_275 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_329 = $(__THREADSFLAG)
+__RUNTIME_LIBS_275 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxhtml_namedll_DEP = $(__htmldll___depname)
@@ -4107,20 +3995,20 @@ __qadll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_343 = D
+__RUNTIME_LIBS_289 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_343 = $(__THREADSFLAG)
+__RUNTIME_LIBS_289 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
 __qalib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_356 = D
+__RUNTIME_LIBS_302 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_356 = $(__THREADSFLAG)
+__RUNTIME_LIBS_302 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxqa_namedll_DEP = $(__qadll___depname)
@@ -4133,20 +4021,20 @@ __xmldll___depname = \
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_370 = D
+__RUNTIME_LIBS_316 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_370 = $(__THREADSFLAG)
+__RUNTIME_LIBS_316 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
 __xmllib___depname = \
        $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_383 = D
+__RUNTIME_LIBS_329 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_383 = $(__THREADSFLAG)
+__RUNTIME_LIBS_329 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxxml_namedll_DEP = $(__xmldll___depname)
@@ -4159,20 +4047,20 @@ __xrcdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_397 = D
+__RUNTIME_LIBS_343 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_397 = $(__THREADSFLAG)
+__RUNTIME_LIBS_343 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1"
 __xrclib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_410 = D
+__RUNTIME_LIBS_356 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_410 = $(__THREADSFLAG)
+__RUNTIME_LIBS_356 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxxrc_namedll_DEP = $(__xrcdll___depname)
@@ -4185,20 +4073,20 @@ __auidll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_424 = D
+__RUNTIME_LIBS_370 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_424 = $(__THREADSFLAG)
+__RUNTIME_LIBS_370 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1"
 __auilib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_437 = D
+__RUNTIME_LIBS_383 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_437 = $(__THREADSFLAG)
+__RUNTIME_LIBS_383 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxaui_namedll_DEP = $(__auidll___depname)
@@ -4211,20 +4099,20 @@ __richtextdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_451 = D
+__RUNTIME_LIBS_397 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_451 = $(__THREADSFLAG)
+__RUNTIME_LIBS_397 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RICHTEXT)" == "1"
 __richtextlib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_464 = D
+__RUNTIME_LIBS_410 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_464 = $(__THREADSFLAG)
+__RUNTIME_LIBS_410 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxrichtext_namedll_DEP = $(__richtextdll___depname)
@@ -4237,20 +4125,20 @@ __stcdll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_478 = D
+__RUNTIME_LIBS_424 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_478 = $(__THREADSFLAG)
+__RUNTIME_LIBS_424 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_STC)" == "1"
 __stclib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_491 = D
+__RUNTIME_LIBS_437 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_491 = $(__THREADSFLAG)
+__RUNTIME_LIBS_437 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxstc_namedll_DEP = $(__stcdll___depname)
@@ -4263,10 +4151,10 @@ __gldll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_505 = D
+__RUNTIME_LIBS_451 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_505 = $(__THREADSFLAG)
+__RUNTIME_LIBS_451 = $(__THREADSFLAG)
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIBGLDEP_CORE_p = \
@@ -4285,10 +4173,10 @@ __gllib___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
 !endif
 !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_518 = D
+__RUNTIME_LIBS_464 = D
 !endif
 !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_518 = $(__THREADSFLAG)
+__RUNTIME_LIBS_464 = $(__THREADSFLAG)
 !endif
 !if "$(SHARED)" == "1"
 ____wxgl_namedll_DEP = $(__gldll___depname)
@@ -4331,37 +4219,37 @@ ____DEBUGRUNTIME_4 =
 ____DEBUGRUNTIME_4 = /d _DEBUG
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_68 = /d __NO_VC_CRTDBG__
+__NO_VC_CRTDBG_p_60 = /d __NO_VC_CRTDBG__
 !endif
 !if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_68 = /d __NO_VC_CRTDBG__
+__NO_VC_CRTDBG_p_60 = /d __NO_VC_CRTDBG__
 !endif
 !if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_62 = /d __WXUNIVERSAL__
+__WXUNIV_DEFINE_p_54 = /d __WXUNIVERSAL__
 !endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_61 = /d __WXDEBUG__
+__DEBUG_DEFINE_p_53 = /d __WXDEBUG__
 !endif
 !if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_61 = /d __WXDEBUG__
+__DEBUG_DEFINE_p_53 = /d __WXDEBUG__
 !endif
 !if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_61 = /d wxNO_EXCEPTIONS
+__EXCEPTIONS_DEFINE_p_53 = /d wxNO_EXCEPTIONS
 !endif
 !if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_61 = /d wxNO_RTTI
+__RTTI_DEFINE_p_53 = /d wxNO_RTTI
 !endif
 !if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_61 = /d wxNO_THREADS
+__THREAD_DEFINE_p_53 = /d wxNO_THREADS
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_62 = /d _UNICODE
+__UNICODE_DEFINE_p_54 = /d _UNICODE
 !endif
 !if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_61 = /d wxUSE_UNICODE_MSLU=1
+__MSLU_DEFINE_p_53 = /d wxUSE_UNICODE_MSLU=1
 !endif
 !if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_61 = /d wxUSE_GRAPHICS_CONTEXT=1
+__GFXCTX_DEFINE_p_53 = /d wxUSE_GRAPHICS_CONTEXT=1
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -4485,7 +4373,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
+all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -4528,16 +4416,6 @@ clean:
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).ilk
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).pdb
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).ilk
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb
@@ -4637,7 +4515,7 @@ $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib: $(WXSCINTILLA_OBJECTS)
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(MONODLL_OBJECTS)  $(__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) $(__GDIPLUS_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     $(__wxscintilla) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+       $(MONODLL_OBJECTS)  $(__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) $(__GDIPLUS_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    $(__wxscintilla) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 <<
 !endif
 
@@ -4652,7 +4530,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\basedll_version.res
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(BASEDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_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 /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+       $(BASEDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_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 /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 <<
 !endif
 
@@ -4671,7 +4549,7 @@ wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(NETDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+       $(NETDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
 <<
 !endif
 
@@ -4690,7 +4568,7 @@ wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(COREDLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+       $(COREDLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
 <<
 !endif
 
@@ -4709,7 +4587,7 @@ wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(ADVDLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+       $(ADVDLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
 <<
 !endif
 
@@ -4728,7 +4606,7 @@ wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj  $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(MEDIADLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+       $(MEDIADLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
 <<
 !endif
 
@@ -4744,44 +4622,10 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
 !endif
 
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj  $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\odbcdll_version.res $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(ODBCDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-<<
-!endif
-
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib: $(OBJS)\odbclib_dummy.obj  $(ODBCLIB_OBJECTS)
-       if exist $@ del $@
-       link /LIB /NOLOGO /OUT:$@ @<<
-       $(ODBCLIB_OBJECTS)
-<<
-!endif
-
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG).dll: $(OBJS)\dbgriddll_dummy.obj  $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\dbgriddll_version.res $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(DBGRIDDLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-<<
-!endif
-
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib: $(OBJS)\dbgridlib_dummy.obj  $(DBGRIDLIB_OBJECTS)
-       if exist $@ del $@
-       link /LIB /NOLOGO /OUT:$@ @<<
-       $(DBGRIDLIB_OBJECTS)
-<<
-!endif
-
-!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
-wxdbgrid: $(____wxdbgrid_namedll_DEP) $(____wxdbgrid_namelib_DEP)
-!endif
-
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(HTMLDLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+       $(HTMLDLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
 <<
 !endif
 
@@ -4800,7 +4644,7 @@ wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(QADLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
+       $(QADLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
 <<
 !endif
 
@@ -4819,7 +4663,7 @@ wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(XMLDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+       $(XMLDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
 <<
 !endif
 
@@ -4838,7 +4682,7 @@ wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(XRCDLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
+       $(XRCDLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
 <<
 !endif
 
@@ -4857,7 +4701,7 @@ wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj  $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(AUIDLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+       $(AUIDLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
 <<
 !endif
 
@@ -4876,7 +4720,7 @@ wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj  $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(RICHTEXTDLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+       $(RICHTEXTDLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
 <<
 !endif
 
@@ -4895,7 +4739,7 @@ wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj  $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla) $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(STCDLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
+       $(STCDLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
 <<
 !endif
 
@@ -4914,7 +4758,7 @@ wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP)
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname)
        link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(GLDLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
+       $(GLDLL_OBJECTS)  $(__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) $(__GDIPLUS_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 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
 <<
 !endif
 
@@ -4977,7 +4821,6 @@ build_cfg_file: $(SETUPHDIR)
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
-       @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
        @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
@@ -6159,21 +6002,12 @@ $(OBJS)\monodll_winpars.obj: ..\..\src\html\winpars.cpp
 $(OBJS)\monodll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
-$(OBJS)\monodll_db.obj: ..\..\src\common\db.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
-$(OBJS)\monodll_dbtable.obj: ..\..\src\common\dbtable.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
 $(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
 $(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
-$(OBJS)\monodll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
 $(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
@@ -7678,7 +7512,7 @@ $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
 !endif
 
 $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_BASE=1 /d WXMAKINGDLL /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_BASE=1 /d WXMAKINGDLL /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS $**
 
 $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h $**
@@ -8253,21 +8087,12 @@ $(OBJS)\monolib_winpars.obj: ..\..\src\html\winpars.cpp
 $(OBJS)\monolib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
-$(OBJS)\monolib_db.obj: ..\..\src\common\db.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
-$(OBJS)\monolib_dbtable.obj: ..\..\src\common\dbtable.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
 $(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
 $(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
-$(OBJS)\monolib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
 $(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -9775,7 +9600,7 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
 $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXMAKINGDLL_BASE /d wxUSE_BASE=1 $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXMAKINGDLL_BASE /d wxUSE_BASE=1 $**
 
 $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
@@ -10384,7 +10209,7 @@ $(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
 $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_NET $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_NET $**
 
 $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) $**
@@ -10465,7 +10290,7 @@ $(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
 $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_CORE /d wxUSE_BASE=0 $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_CORE /d wxUSE_BASE=0 $**
 
 $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -13090,7 +12915,7 @@ $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
 $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_ADV $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_ADV $**
 
 $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
@@ -13267,7 +13092,7 @@ $(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
 $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_MEDIA $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_MEDIA $**
 
 $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) $**
@@ -13302,47 +13127,11 @@ $(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
 $(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) $**
 
-$(OBJS)\odbcdll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\odbcdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_ODBC $**
-
-$(OBJS)\odbcdll_db.obj: ..\..\src\common\db.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $**
-
-$(OBJS)\odbcdll_dbtable.obj: ..\..\src\common\dbtable.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ODBCDLL_CXXFLAGS) $**
-
-$(OBJS)\odbclib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\odbclib_db.obj: ..\..\src\common\db.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) $**
-
-$(OBJS)\odbclib_dbtable.obj: ..\..\src\common\dbtable.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ODBCLIB_CXXFLAGS) $**
-
-$(OBJS)\dbgriddll_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\dbgriddll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_DBGRID $**
-
-$(OBJS)\dbgriddll_dbgrid.obj: ..\..\src\common\dbgrid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDDLL_CXXFLAGS) $**
-
-$(OBJS)\dbgridlib_dummy.obj: ..\..\src\common\dummy.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDLIB_CXXFLAGS) /Ycwx/wxprec.h $**
-
-$(OBJS)\dbgridlib_dbgrid.obj: ..\..\src\common\dbgrid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBGRIDLIB_CXXFLAGS) $**
-
 $(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
 $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_HTML $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_HTML $**
 
 $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
@@ -13495,7 +13284,7 @@ $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
 $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_QA $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_QA $**
 
 $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) $**
@@ -13516,7 +13305,7 @@ $(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
 $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_XML $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_XML $**
 
 $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) $**
@@ -13537,7 +13326,7 @@ $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
 $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_XRC $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_XRC $**
 
 $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
@@ -13888,7 +13677,7 @@ $(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
 $(OBJS)\auidll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_AUI $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_AUI $**
 
 $(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) $**
@@ -13927,7 +13716,7 @@ $(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
 $(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RICHTEXT $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RICHTEXT $**
 
 $(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) $**
@@ -13990,7 +13779,7 @@ $(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
 $(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d WXUSINGDLL /d WXMAKINGDLL_STC $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d WXUSINGDLL /d WXMAKINGDLL_STC $**
 
 $(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $**
@@ -14017,7 +13806,7 @@ $(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h $**
 
 $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib  /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_GL $**
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_GL $**
 
 $(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) $**
index fc9ef540fb3e5c00657429e23e1729dbc5c38da0..25b9166584c18c9626b09e488c68de73c7047fff 100644 (file)
@@ -129,11 +129,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_m_tables.obj &
        $(OBJS)\monodll_winpars.obj &
        $(OBJS)\monodll_htmllbox.obj &
-       $(OBJS)\monodll_db.obj &
-       $(OBJS)\monodll_dbtable.obj &
        $(OBJS)\monodll_debugrpt.obj &
        $(OBJS)\monodll_dbgrptg.obj &
-       $(OBJS)\monodll_dbgrid.obj &
        $(OBJS)\monodll_xh_animatctrl.obj &
        $(OBJS)\monodll_xh_bmp.obj &
        $(OBJS)\monodll_xh_bmpcbox.obj &
@@ -781,11 +778,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_m_tables.obj &
        $(OBJS)\monolib_winpars.obj &
        $(OBJS)\monolib_htmllbox.obj &
-       $(OBJS)\monolib_db.obj &
-       $(OBJS)\monolib_dbtable.obj &
        $(OBJS)\monolib_debugrpt.obj &
        $(OBJS)\monolib_dbgrptg.obj &
-       $(OBJS)\monolib_dbgrid.obj &
        $(OBJS)\monolib_xh_animatctrl.obj &
        $(OBJS)\monolib_xh_bmp.obj &
        $(OBJS)\monolib_xh_bmpcbox.obj &
@@ -2568,54 +2562,6 @@ ____wxmedia_namelib_DEP =
 !ifeq SHARED 0
 ____wxmedia_namelib_DEP = $(__medialib___depname)
 !endif
-__odbcdll___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_ODBC 1
-__odbcdll___depname = &
-       $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_wat$(VENDORTAG).dll
-!endif
-!endif
-!endif
-__odbclib___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_ODBC 1
-__odbclib___depname = &
-       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-!endif
-!endif
-!endif
-__dbgriddll___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-!ifeq USE_ODBC 1
-__dbgriddll___depname = &
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_wat$(VENDORTAG).dll
-!endif
-!endif
-!endif
-!endif
-__dbgridlib___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-!ifeq USE_ODBC 1
-__dbgridlib___depname = &
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-!endif
-!endif
-!endif
-!endif
-____wxdbgrid_namedll_DEP =
-!ifeq SHARED 1
-____wxdbgrid_namedll_DEP = $(__dbgriddll___depname)
-!endif
-____wxdbgrid_namelib_DEP =
-!ifeq SHARED 0
-____wxdbgrid_namelib_DEP = $(__dbgridlib___depname)
-!endif
 __htmldll___depname =
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
@@ -3003,7 +2949,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
        USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
        USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
-       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" &
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
        USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &
        OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
@@ -3889,54 +3835,6 @@ MEDIALIB_OBJECTS =  &
        $(OBJS)\medialib_mediactrl_wmp10.obj &
        $(OBJS)\medialib_mediactrl_qt.obj &
        $(OBJS)\medialib_activex.obj
-ODBCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
-       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff &
-       -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_ODBC &
-       /fh=$(OBJS)\wxprec_odbcdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
-ODBCDLL_OBJECTS =  &
-       $(OBJS)\odbcdll_dummy.obj &
-       $(OBJS)\odbcdll_db.obj &
-       $(OBJS)\odbcdll_dbtable.obj
-ODBCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
-       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff &
-       -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-       -i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_odbclib.pch &
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-ODBCLIB_OBJECTS =  &
-       $(OBJS)\odbclib_dummy.obj &
-       $(OBJS)\odbclib_db.obj &
-       $(OBJS)\odbclib_dbtable.obj
-DBGRIDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
-       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff &
-       -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_DBGRID &
-       /fh=$(OBJS)\wxprec_dbgriddll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
-DBGRIDDLL_OBJECTS =  &
-       $(OBJS)\dbgriddll_dummy.obj &
-       $(OBJS)\dbgriddll_dbgrid.obj
-DBGRIDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-       $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
-       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff &
-       -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_dbgridlib.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-DBGRIDLIB_OBJECTS =  &
-       $(OBJS)\dbgridlib_dummy.obj &
-       $(OBJS)\dbgridlib_dbgrid.obj
 HTMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
@@ -4325,7 +4223,7 @@ $(OBJS) :
 
 ### Targets: ###
 
-all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
+all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -4358,12 +4256,6 @@ clean : .SYMBOLIC
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_wat$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
-       -if exist $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_wat$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-       -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_wat$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_wat$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
        -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
@@ -4446,7 +4338,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\monodll.lbc option caseexact
        @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i
-       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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     $(__wxscintilla)) do @%append $(OBJS)\monodll.lbc library %i
+       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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    $(__wxscintilla)) do @%append $(OBJS)\monodll.lbc library %i
        @%append $(OBJS)\monodll.lbc option resource=$(OBJS)\monodll_version.res
        @%append $(OBJS)\monodll.lbc system nt_dll
        wlink @$(OBJS)\monodll.lbc
@@ -4472,7 +4364,7 @@ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
        @%append $(OBJS)\basedll.lbc option caseexact
        @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i
-       @for %i in ( wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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) do @%append $(OBJS)\basedll.lbc library %i
+       @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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) do @%append $(OBJS)\basedll.lbc library %i
        @%append $(OBJS)\basedll.lbc option resource=$(OBJS)\basedll_version.res
        @%append $(OBJS)\basedll.lbc system nt_dll
        wlink @$(OBJS)\basedll.lbc
@@ -4502,7 +4394,7 @@ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
        @%append $(OBJS)\netdll.lbc option caseexact
        @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i
-       @for %i in ( wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\netdll.lbc library %i
+       @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\netdll.lbc library %i
        @%append $(OBJS)\netdll.lbc option resource=$(OBJS)\netdll_version.res
        @%append $(OBJS)\netdll.lbc system nt_dll
        wlink @$(OBJS)\netdll.lbc
@@ -4533,7 +4425,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\coredll.lbc option caseexact
        @%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i
-       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\coredll.lbc library %i
+       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\coredll.lbc library %i
        @%append $(OBJS)\coredll.lbc option resource=$(OBJS)\coredll_version.res
        @%append $(OBJS)\coredll.lbc system nt_dll
        wlink @$(OBJS)\coredll.lbc
@@ -4569,7 +4461,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\advdll.lbc option caseexact
        @%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i
-       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\advdll.lbc library %i
+       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\advdll.lbc library %i
        @%append $(OBJS)\advdll.lbc option resource=$(OBJS)\advdll_version.res
        @%append $(OBJS)\advdll.lbc system nt_dll
        wlink @$(OBJS)\advdll.lbc
@@ -4606,7 +4498,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\mediadll.lbc option caseexact
        @%append $(OBJS)\mediadll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(MEDIADLL_OBJECTS)) do @%append $(OBJS)\mediadll.lbc file %i
-       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\mediadll.lbc library %i
+       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\mediadll.lbc library %i
        @%append $(OBJS)\mediadll.lbc option resource=$(OBJS)\mediadll_version.res
        @%append $(OBJS)\mediadll.lbc system nt_dll
        wlink @$(OBJS)\mediadll.lbc
@@ -4637,78 +4529,6 @@ wxmedia : .SYMBOLIC $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
 !endif
 !endif
 
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_ODBC 1
-$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_wat$(VENDORTAG).dll :  $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\odbcdll_version.res $(__basedll___depname)
-       @%create $(OBJS)\odbcdll.lbc
-       @%append $(OBJS)\odbcdll.lbc option quiet
-       @%append $(OBJS)\odbcdll.lbc name $^@
-       @%append $(OBJS)\odbcdll.lbc option caseexact
-       @%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
-       @for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.lbc file %i
-       @for %i in ( wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\odbcdll.lbc library %i
-       @%append $(OBJS)\odbcdll.lbc option resource=$(OBJS)\odbcdll_version.res
-       @%append $(OBJS)\odbcdll.lbc system nt_dll
-       wlink @$(OBJS)\odbcdll.lbc
-       wlib -q -n -b $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib +$^@
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_ODBC 1
-$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib :  $(ODBCLIB_OBJECTS)
-       @%create $(OBJS)\odbclib.lbc
-       @for %i in ($(ODBCLIB_OBJECTS)) do @%append $(OBJS)\odbclib.lbc +%i
-       wlib -q -p4096 -n -b $^@ @$(OBJS)\odbclib.lbc
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-!ifeq USE_ODBC 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_wat$(VENDORTAG).dll :  $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\dbgriddll_version.res $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
-       @%create $(OBJS)\dbgriddll.lbc
-       @%append $(OBJS)\dbgriddll.lbc option quiet
-       @%append $(OBJS)\dbgriddll.lbc name $^@
-       @%append $(OBJS)\dbgriddll.lbc option caseexact
-       @%append $(OBJS)\dbgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
-       @for %i in ($(DBGRIDDLL_OBJECTS)) do @%append $(OBJS)\dbgriddll.lbc file %i
-       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\dbgriddll.lbc library %i
-       @%append $(OBJS)\dbgriddll.lbc option resource=$(OBJS)\dbgriddll_version.res
-       @%append $(OBJS)\dbgriddll.lbc system nt_dll
-       wlink @$(OBJS)\dbgriddll.lbc
-       wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib +$^@
-!endif
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-!ifeq USE_ODBC 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib :  $(DBGRIDLIB_OBJECTS)
-       @%create $(OBJS)\dbgridlib.lbc
-       @for %i in ($(DBGRIDLIB_OBJECTS)) do @%append $(OBJS)\dbgridlib.lbc +%i
-       wlib -q -p4096 -n -b $^@ @$(OBJS)\dbgridlib.lbc
-!endif
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq USE_GUI 1
-!ifeq USE_ODBC 1
-wxdbgrid : .SYMBOLIC $(____wxdbgrid_namedll_DEP) $(____wxdbgrid_namelib_DEP)
-!endif
-!endif
-!endif
-
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
 !ifeq USE_GUI 1
@@ -4720,7 +4540,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\htmldll.lbc option caseexact
        @%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i
-       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\htmldll.lbc library %i
+       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\htmldll.lbc library %i
        @%append $(OBJS)\htmldll.lbc option resource=$(OBJS)\htmldll_version.res
        @%append $(OBJS)\htmldll.lbc system nt_dll
        wlink @$(OBJS)\htmldll.lbc
@@ -4760,7 +4580,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\qadll.lbc option caseexact
        @%append $(OBJS)\qadll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(QADLL_OBJECTS)) do @%append $(OBJS)\qadll.lbc file %i
-       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib) do @%append $(OBJS)\qadll.lbc library %i
+       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib) do @%append $(OBJS)\qadll.lbc library %i
        @%append $(OBJS)\qadll.lbc option resource=$(OBJS)\qadll_version.res
        @%append $(OBJS)\qadll.lbc system nt_dll
        wlink @$(OBJS)\qadll.lbc
@@ -4798,7 +4618,7 @@ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
        @%append $(OBJS)\xmldll.lbc option caseexact
        @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i
-       @for %i in ( wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\xmldll.lbc library %i
+       @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\xmldll.lbc library %i
        @%append $(OBJS)\xmldll.lbc option resource=$(OBJS)\xmldll_version.res
        @%append $(OBJS)\xmldll.lbc system nt_dll
        wlink @$(OBJS)\xmldll.lbc
@@ -4829,7 +4649,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\xrcdll.lbc option caseexact
        @%append $(OBJS)\xrcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(XRCDLL_OBJECTS)) do @%append $(OBJS)\xrcdll.lbc file %i
-       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\xrcdll.lbc library %i
+       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\xrcdll.lbc library %i
        @%append $(OBJS)\xrcdll.lbc option resource=$(OBJS)\xrcdll_version.res
        @%append $(OBJS)\xrcdll.lbc system nt_dll
        wlink @$(OBJS)\xrcdll.lbc
@@ -4865,7 +4685,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\auidll.lbc option caseexact
        @%append $(OBJS)\auidll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(AUIDLL_OBJECTS)) do @%append $(OBJS)\auidll.lbc file %i
-       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\auidll.lbc library %i
+       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\auidll.lbc library %i
        @%append $(OBJS)\auidll.lbc option resource=$(OBJS)\auidll_version.res
        @%append $(OBJS)\auidll.lbc system nt_dll
        wlink @$(OBJS)\auidll.lbc
@@ -4901,7 +4721,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\richtextdll.lbc option caseexact
        @%append $(OBJS)\richtextdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(RICHTEXTDLL_OBJECTS)) do @%append $(OBJS)\richtextdll.lbc file %i
-       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\richtextdll.lbc library %i
+       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\richtextdll.lbc library %i
        @%append $(OBJS)\richtextdll.lbc option resource=$(OBJS)\richtextdll_version.res
        @%append $(OBJS)\richtextdll.lbc system nt_dll
        wlink @$(OBJS)\richtextdll.lbc
@@ -4937,7 +4757,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\stcdll.lbc option caseexact
        @%append $(OBJS)\stcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(STCDLL_OBJECTS)) do @%append $(OBJS)\stcdll.lbc file %i
-       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\stcdll.lbc library %i
+       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\stcdll.lbc library %i
        @%append $(OBJS)\stcdll.lbc option resource=$(OBJS)\stcdll_version.res
        @%append $(OBJS)\stcdll.lbc system nt_dll
        wlink @$(OBJS)\stcdll.lbc
@@ -4973,7 +4793,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\gldll.lbc option caseexact
        @%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
        @for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i
-       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i
+       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  $(__GDIPLUS_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 $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i
        @%append $(OBJS)\gldll.lbc option resource=$(OBJS)\gldll_version.res
        @%append $(OBJS)\gldll.lbc system nt_dll
        wlink @$(OBJS)\gldll.lbc
@@ -5046,7 +4866,6 @@ build_cfg_file : .SYMBOLIC $(SETUPHDIR)
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
-       @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
        @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
@@ -6228,21 +6047,12 @@ $(OBJS)\monodll_winpars.obj :  .AUTODEPEND ..\..\src\html\winpars.cpp
 $(OBJS)\monodll_htmllbox.obj :  .AUTODEPEND ..\..\src\generic\htmllbox.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_db.obj :  .AUTODEPEND ..\..\src\common\db.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dbtable.obj :  .AUTODEPEND ..\..\src\common\dbtable.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_debugrpt.obj :  .AUTODEPEND ..\..\src\common\debugrpt.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -7847,7 +7657,7 @@ $(OBJS)\monodll_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp
 !endif
 
 $(OBJS)\monodll_version.res :  .AUTODEPEND ..\..\src\msw\version.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib  -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS $<
+       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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS $<
 
 $(OBJS)\monolib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8422,21 +8232,12 @@ $(OBJS)\monolib_winpars.obj :  .AUTODEPEND ..\..\src\html\winpars.cpp
 $(OBJS)\monolib_htmllbox.obj :  .AUTODEPEND ..\..\src\generic\htmllbox.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_db.obj :  .AUTODEPEND ..\..\src\common\db.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dbtable.obj :  .AUTODEPEND ..\..\src\common\dbtable.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_debugrpt.obj :  .AUTODEPEND ..\..\src\common\debugrpt.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -10044,7 +9845,7 @@ $(OBJS)\basedll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
 $(OBJS)\basedll_version.res :  .AUTODEPEND ..\..\src\msw\version.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib  -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 $<
+       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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 $<
 
 $(OBJS)\basedll_appbase.obj :  .AUTODEPEND ..\..\src\common\appbase.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
@@ -10653,7 +10454,7 @@ $(OBJS)\netdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
 
 $(OBJS)\netdll_version.res :  .AUTODEPEND ..\..\src\msw\version.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib  -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET $<
+       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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET $<
 
 $(OBJS)\netdll_fs_inet.obj :  .AUTODEPEND ..\..\src\common\fs_inet.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $<
@@ -10734,7 +10535,7 @@ $(OBJS)\coredll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 
 $(OBJS)\coredll_version.res :  .AUTODEPEND ..\..\src\msw\version.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib  -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 $<
+       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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 $<
 
 $(OBJS)\coredll_event.obj :  .AUTODEPEND ..\..\src\common\event.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -13559,7 +13360,7 @@ $(OBJS)\advdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
 $(OBJS)\advdll_version.res :  .AUTODEPEND ..\..\src\msw\version.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib  -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV $<
+       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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV $<
 
 $(OBJS)\advdll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
@@ -13736,7 +13537,7 @@ $(OBJS)\mediadll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $<
 
 $(OBJS)\mediadll_version.res :  .AUTODEPEND ..\..\src\msw\version.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib  -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA $<
+       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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA $<
 
 $(OBJS)\mediadll_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $<
@@ -13771,47 +13572,11 @@ $(OBJS)\medialib_mediactrl_qt.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_qt.cpp
 $(OBJS)\medialib_activex.obj :  .AUTODEPEND ..\..\src\msw\ole\activex.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\odbcdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $<
-
-$(OBJS)\odbcdll_version.res :  .AUTODEPEND ..\..\src\msw\version.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib  -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_ODBC $<
-
-$(OBJS)\odbcdll_db.obj :  .AUTODEPEND ..\..\src\common\db.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $<
-
-$(OBJS)\odbcdll_dbtable.obj :  .AUTODEPEND ..\..\src\common\dbtable.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $<
-
-$(OBJS)\odbclib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $<
-
-$(OBJS)\odbclib_db.obj :  .AUTODEPEND ..\..\src\common\db.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $<
-
-$(OBJS)\odbclib_dbtable.obj :  .AUTODEPEND ..\..\src\common\dbtable.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $<
-
-$(OBJS)\dbgriddll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(DBGRIDDLL_CXXFLAGS) $<
-
-$(OBJS)\dbgriddll_version.res :  .AUTODEPEND ..\..\src\msw\version.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib  -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_DBGRID $<
-
-$(OBJS)\dbgriddll_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(DBGRIDDLL_CXXFLAGS) $<
-
-$(OBJS)\dbgridlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(DBGRIDLIB_CXXFLAGS) $<
-
-$(OBJS)\dbgridlib_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(DBGRIDLIB_CXXFLAGS) $<
-
 $(OBJS)\htmldll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
 
 $(OBJS)\htmldll_version.res :  .AUTODEPEND ..\..\src\msw\version.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib  -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML $<
+       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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML $<
 
 $(OBJS)\htmldll_helpbest.obj :  .AUTODEPEND ..\..\src\msw\helpbest.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
@@ -13964,7 +13729,7 @@ $(OBJS)\qadll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(QADLL_CXXFLAGS) $<
 
 $(OBJS)\qadll_version.res :  .AUTODEPEND ..\..\src\msw\version.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib  -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA $<
+       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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA $<
 
 $(OBJS)\qadll_debugrpt.obj :  .AUTODEPEND ..\..\src\common\debugrpt.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(QADLL_CXXFLAGS) $<
@@ -13985,7 +13750,7 @@ $(OBJS)\xmldll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(XMLDLL_CXXFLAGS) $<
 
 $(OBJS)\xmldll_version.res :  .AUTODEPEND ..\..\src\msw\version.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib  -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML $<
+       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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML $<
 
 $(OBJS)\xmldll_xml.obj :  .AUTODEPEND ..\..\src\xml\xml.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(XMLDLL_CXXFLAGS) $<
@@ -14006,7 +13771,7 @@ $(OBJS)\xrcdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
 $(OBJS)\xrcdll_version.res :  .AUTODEPEND ..\..\src\msw\version.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib  -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC $<
+       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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC $<
 
 $(OBJS)\xrcdll_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
@@ -14357,7 +14122,7 @@ $(OBJS)\auidll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
 
 $(OBJS)\auidll_version.res :  .AUTODEPEND ..\..\src\msw\version.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib  -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI $<
+       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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI $<
 
 $(OBJS)\auidll_framemanager.obj :  .AUTODEPEND ..\..\src\aui\framemanager.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
@@ -14396,7 +14161,7 @@ $(OBJS)\richtextdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
 
 $(OBJS)\richtextdll_version.res :  .AUTODEPEND ..\..\src\msw\version.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib  -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT $<
+       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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT $<
 
 $(OBJS)\richtextdll_richtextctrl.obj :  .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<
@@ -14459,7 +14224,7 @@ $(OBJS)\stcdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
 
 $(OBJS)\stcdll_version.res :  .AUTODEPEND ..\..\src\msw\version.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib  -i=..\..\src\regex -i=..\..\src\expat\lib -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dWXUSINGDLL -dWXMAKINGDLL_STC $<
+       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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dWXUSINGDLL -dWXMAKINGDLL_STC $<
 
 $(OBJS)\stcdll_stc.obj :  .AUTODEPEND ..\..\src\stc\stc.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
@@ -14486,7 +14251,7 @@ $(OBJS)\gldll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<
 
 $(OBJS)\gldll_version.res :  .AUTODEPEND ..\..\src\msw\version.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib  -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL $<
+       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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_wat$(VENDORTAG)  -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL $<
 
 $(OBJS)\gldll_glcmn.obj :  .AUTODEPEND ..\..\src\common\glcmn.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(GLDLL_CXXFLAGS) $<
index 4d8ec08056874b1bcc83ca5ac9bbe31f42d4c6e9..1d9a241d7d03e04c27774aa7be74d4b9ab51ed74 100644 (file)
@@ -146,30 +146,6 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "odbc"=wx_odbc.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
-Project: "dbgrid"=wx_dbgrid.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
 Project: "html"=wx_html.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
index e8ef4240e2793b7e38eb9e62c69cd2f3991d8743..1180ab333655cf48516b698fa8b8016a4cff72ca 100644 (file)
@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug"\r
 \r
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
 \r
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_adv.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_adv.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_adv.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_adv.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
 \r
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_adv.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_adv.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_adv.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_adv.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Release"\r
 \r
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Unicode Debug"\r
 \r
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
 \r
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_adv.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_adv.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_adv.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_adv.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
 \r
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_adv.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_adv.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_adv.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_adv.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "adv - Win32 Universal Unicode Release"\r
 \r
index d182fb88ff6d42bae3ff820e47e22e2b0f74d340..d2724353ded70089a8372d9a9b19d996f9ed1fff 100644 (file)
@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_aui.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_aui.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_aui.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_aui.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Unicode Debug"\r
 \r
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Release"\r
 \r
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_adv.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_aui.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_adv.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_aui.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_adv.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_aui.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_adv.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_aui.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Universal Debug"\r
 \r
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_adv.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_aui.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_adv.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_aui.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_adv.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_aui.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_adv.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_aui.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Release"\r
 \r
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_aui.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_aui.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_aui.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_aui.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Unicode Debug"\r
 \r
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_aui.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_aui.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_aui.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_aui.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Release"\r
 \r
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29_adv.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_aui.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29_adv.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_aui.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29_adv.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_aui.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29_adv.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_aui.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "aui - Win32 DLL Debug"\r
 \r
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29d_adv.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_aui.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29d_adv.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_aui.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29d_adv.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_aui.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29d_adv.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_aui.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "aui - Win32 Universal Unicode Release"\r
 \r
index dde5777b5d93f04d273e605074e85b4ec6b23ac2..9d66fcc268c33275aff8a0b627c1d95a817ed8f2 100644 (file)
@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib"\r
-# ADD LINK32 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 /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib"\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib"\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Unicode Debug"\r
 \r
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug\r
-# ADD LINK32 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 /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Release"\r
 \r
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29.lib"\r
-# ADD LINK32 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 /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29.lib"\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29.lib"\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Universal Debug"\r
 \r
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d.lib" /debug\r
-# ADD LINK32 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 /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d.lib" /debug\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d.lib" /debug\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Release"\r
 \r
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib"\r
-# ADD LINK32 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 /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib"\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib"\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Unicode Debug"\r
 \r
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug\r
-# ADD LINK32 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 /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Release"\r
 \r
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29.lib"\r
-# ADD LINK32 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 /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29.lib"\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29.lib"\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"\r
 \r
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d.lib" /debug\r
-# ADD LINK32 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 /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d.lib" /debug\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d.lib" /debug\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 Universal Unicode Release"\r
 \r
index 25a30d6a1e9437b487672ebc9dbd55830fd5dbb7..e8f53eb677acf7880bbc78db04c43896e8acabcf 100644 (file)
@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
 \r
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_core.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_core.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_core.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_core.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_core.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_core.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_core.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_core.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
 \r
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
 \r
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_core.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_core.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_core.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_core.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_core.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_core.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_core.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_core.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
 \r
@@ -8904,10 +8904,6 @@ SOURCE=..\..\include\wx\dateevt.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\dbgrid.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\include\wx\dc.h\r
 # End Source File\r
 # Begin Source File\r
diff --git a/build/msw/wx_dbgrid.dsp b/build/msw/wx_dbgrid.dsp
deleted file mode 100644 (file)
index bfa97dd..0000000
+++ /dev/null
@@ -1,986 +0,0 @@
-# Microsoft Developer Studio Project File - Name="wx_dbgrid" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-# TARGTYPE "Win32 (x86) Static Library" 0x0104\r
-\r
-CFG=dbgrid - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "wx_dbgrid.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "wx_dbgrid.mak" CFG="dbgrid - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "dbgrid - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "dbgrid - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "dbgrid - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "dbgrid - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "dbgrid - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "dbgrid - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "dbgrid - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "dbgrid - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "dbgrid - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "dbgrid - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "dbgrid - Win32 Universal Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "dbgrid - Win32 Universal Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "dbgrid - Win32 Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "dbgrid - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "dbgrid - Win32 Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "dbgrid - Win32 Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivudll\dbgrid"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivudll\dbgrid"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290u_dbgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290u_dbgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_dbgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_dbgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxbase29u_odbc.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_dbgrid.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxbase29u_odbc.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_dbgrid.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\dbgrid"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivuddll\dbgrid"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290ud_dbgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290ud_dbgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_dbgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_dbgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxbase29ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_dbgrid.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxbase29ud_odbc.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_dbgrid.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivdll\dbgrid"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivdll\dbgrid"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290_dbgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290_dbgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290_dbgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290_dbgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_adv.lib ..\..\lib\vc_dll\wxbase29_odbc.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_dbgrid.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_adv.lib ..\..\lib\vc_dll\wxbase29_odbc.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_dbgrid.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivddll\dbgrid"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivddll\dbgrid"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290d_dbgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290d_dbgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290d_dbgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290d_dbgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_adv.lib ..\..\lib\vc_dll\wxbase29d_odbc.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_dbgrid.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_adv.lib ..\..\lib\vc_dll\wxbase29d_odbc.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_dbgrid.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswudll\dbgrid"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswudll\dbgrid"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw290u_dbgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw290u_dbgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_dbgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_dbgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxbase29u_odbc.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_dbgrid.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxbase29u_odbc.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_dbgrid.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswuddll\dbgrid"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswuddll\dbgrid"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290ud_dbgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290ud_dbgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_dbgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_dbgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxbase29ud_odbc.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_dbgrid.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxbase29ud_odbc.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_dbgrid.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswdll\dbgrid"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswdll\dbgrid"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw290_dbgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_dbgriddll.pch" /Fd..\..\lib\vc_dll\wxmsw290_dbgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290_dbgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290_dbgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29_adv.lib ..\..\lib\vc_dll\wxbase29_odbc.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_dbgrid.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29_adv.lib ..\..\lib\vc_dll\wxbase29_odbc.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_dbgrid.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswddll\dbgrid"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswddll\dbgrid"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290d_dbgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_dbgriddll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290d_dbgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_DBGRID" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290d_dbgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290d_dbgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_DBGRID\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29d_adv.lib ..\..\lib\vc_dll\wxbase29d_odbc.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_dbgrid.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29d_adv.lib ..\..\lib\vc_dll\wxbase29d_odbc.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_dbgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_dbgrid.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswunivu\dbgrid"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswunivu\dbgrid"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29u_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_dbgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29u_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_dbgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29u_dbgrid.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29u_dbgrid.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswunivud\dbgrid"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswunivud\dbgrid"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29ud_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_dbgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29ud_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_dbgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29ud_dbgrid.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29ud_dbgrid.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswuniv\dbgrid"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswuniv\dbgrid"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_dbgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_dbgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29_dbgrid.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29_dbgrid.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswunivd\dbgrid"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswunivd\dbgrid"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29d_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_dbgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29d_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_dbgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29d_dbgrid.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29d_dbgrid.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswu\dbgrid"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswu\dbgrid"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29u_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_dbgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29u_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_dbgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_dbgrid.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_dbgrid.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswud\dbgrid"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswud\dbgrid"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29ud_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_dbgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29ud_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_dbgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_dbgrid.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_dbgrid.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_msw\dbgrid"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_msw\dbgrid"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_dbgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_dbgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXBUILDING" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29_dbgrid.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29_dbgrid.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswd\dbgrid"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswd\dbgrid"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29d_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_dbgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29d_dbgrid.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_dbgridlib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29d_dbgrid.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29d_dbgrid.lib"\r
-\r
-!ENDIF\r
-\r
-# Begin Target\r
-\r
-# Name "dbgrid - Win32 DLL Universal Unicode Release"\r
-# Name "dbgrid - Win32 DLL Universal Unicode Debug"\r
-# Name "dbgrid - Win32 DLL Universal Release"\r
-# Name "dbgrid - Win32 DLL Universal Debug"\r
-# Name "dbgrid - Win32 DLL Unicode Release"\r
-# Name "dbgrid - Win32 DLL Unicode Debug"\r
-# Name "dbgrid - Win32 DLL Release"\r
-# Name "dbgrid - Win32 DLL Debug"\r
-# Name "dbgrid - Win32 Universal Unicode Release"\r
-# Name "dbgrid - Win32 Universal Unicode Debug"\r
-# Name "dbgrid - Win32 Universal Release"\r
-# Name "dbgrid - Win32 Universal Debug"\r
-# Name "dbgrid - Win32 Unicode Release"\r
-# Name "dbgrid - Win32 Unicode Debug"\r
-# Name "dbgrid - Win32 Release"\r
-# Name "dbgrid - Win32 Debug"\r
-# Begin Group "Common Sources"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\common\dbgrid.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\common\dummy.cpp\r
-# ADD BASE CPP /Yc"wx/wxprec.h"\r
-# ADD CPP /Yc"wx/wxprec.h"\r
-# End Source File\r
-# End Group\r
-# Begin Group "MSW Sources"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\msw\version.rc\r
-\r
-!IF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ENDIF\r
-\r
-# End Source File\r
-# End Group\r
-# Begin Group "Setup Headers"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\univ\setup.h\r
-\r
-!IF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ENDIF\r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\msw\setup.h\r
-\r
-!IF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ENDIF\r
-\r
-# End Source File\r
-# End Group\r
-# Begin Group "MSW Headers"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\msw\genrcdefs.h\r
-\r
-!IF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Universal Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 DLL Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Universal Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Unicode Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "dbgrid - Win32 Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ENDIF\r
-\r
-# End Source File\r
-# End Group\r
-# Begin Group "Common Headers"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\dbgrid.h\r
-# End Source File\r
-# End Group\r
-# End Target\r
-# End Project\r
-\r
index c0d6955705ff2c6baf6e32a62c6d63e725a647ee..9112734703ca358c119468a8baaa30dfb9a6ed80 100644 (file)
@@ -108,33 +108,6 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "dbgrid"=.\wx_dbgrid.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name odbc\r
-    End Project Dependency\r
-    Begin Project Dependency\r
-    Project_Dep_Name wxtiff\r
-    End Project Dependency\r
-    Begin Project Dependency\r
-    Project_Dep_Name wxjpeg\r
-    End Project Dependency\r
-    Begin Project Dependency\r
-    Project_Dep_Name wxpng\r
-    End Project Dependency\r
-    Begin Project Dependency\r
-    Project_Dep_Name adv\r
-    End Project Dependency\r
-}}}\r
-\r
-###############################################################################\r
-\r
 Project: "gl"=.\wx_gl.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
@@ -249,30 +222,6 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "odbc"=.\wx_odbc.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name wxzlib\r
-    End Project Dependency\r
-    Begin Project Dependency\r
-    Project_Dep_Name wxregex\r
-    End Project Dependency\r
-    Begin Project Dependency\r
-    Project_Dep_Name wxexpat\r
-    End Project Dependency\r
-    Begin Project Dependency\r
-    Project_Dep_Name base\r
-    End Project Dependency\r
-}}}\r
-\r
-###############################################################################\r
-\r
 Project: "qa"=.\wx_qa.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
index 46ccb2f3d0d6e11668f19c4ca9ce2c60642ca10f..ad6c9a8803cfb3283920c3a475b328c7d6eecfe8 100644 (file)
@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_gl.lib"\r
-# ADD LINK32 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 wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_gl.lib"\r
+# ADD BASE LINK32 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 wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_gl.lib"\r
+# ADD LINK32 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 wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_gl.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug"\r
 \r
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" /debug\r
-# ADD LINK32 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 wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" /debug\r
+# ADD BASE LINK32 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 wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" /debug\r
+# ADD LINK32 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 wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Release"\r
 \r
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 wxmswuniv29_core.lib wxbase29.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_gl.lib"\r
-# ADD LINK32 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 wxmswuniv29_core.lib wxbase29.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_gl.lib"\r
+# ADD BASE LINK32 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 wxmswuniv29_core.lib wxbase29.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_gl.lib"\r
+# ADD LINK32 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 wxmswuniv29_core.lib wxbase29.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_gl.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Universal Debug"\r
 \r
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 wxmswuniv29d_core.lib wxbase29d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_gl.lib" /debug\r
-# ADD LINK32 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 wxmswuniv29d_core.lib wxbase29d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_gl.lib" /debug\r
+# ADD BASE LINK32 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 wxmswuniv29d_core.lib wxbase29d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_gl.lib" /debug\r
+# ADD LINK32 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 wxmswuniv29d_core.lib wxbase29d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_gl.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Release"\r
 \r
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_gl.lib"\r
-# ADD LINK32 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 wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_gl.lib"\r
+# ADD BASE LINK32 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 wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_gl.lib"\r
+# ADD LINK32 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 wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_gl.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Unicode Debug"\r
 \r
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_gl.lib" /debug\r
-# ADD LINK32 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 wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_gl.lib" /debug\r
+# ADD BASE LINK32 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 wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_gl.lib" /debug\r
+# ADD LINK32 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 wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_gl.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Release"\r
 \r
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 wxmsw29_core.lib wxbase29.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_gl.lib"\r
-# ADD LINK32 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 wxmsw29_core.lib wxbase29.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_gl.lib"\r
+# ADD BASE LINK32 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 wxmsw29_core.lib wxbase29.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_gl.lib"\r
+# ADD LINK32 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 wxmsw29_core.lib wxbase29.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_gl.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "gl - Win32 DLL Debug"\r
 \r
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 wxmsw29d_core.lib wxbase29d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_gl.lib" /debug\r
-# ADD LINK32 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 wxmsw29d_core.lib wxbase29d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_gl.lib" /debug\r
+# ADD BASE LINK32 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 wxmsw29d_core.lib wxbase29d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_gl.lib" /debug\r
+# ADD LINK32 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 wxmsw29d_core.lib wxbase29d.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_gl.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "gl - Win32 Universal Unicode Release"\r
 \r
index 7842e0f36fae2dd0475cbe3a7b43796f61ab1bb1..13b04553714d050e411fe15805d47bed2051d285 100644 (file)
@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_html.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_html.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_html.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_html.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Unicode Debug"\r
 \r
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_html.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_html.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_html.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_html.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Release"\r
 \r
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_html.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_html.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_html.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_html.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Universal Debug"\r
 \r
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_html.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_html.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_html.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_html.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Release"\r
 \r
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_html.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_html.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_html.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_html.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Unicode Debug"\r
 \r
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_html.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_html.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_html.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_html.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Release"\r
 \r
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_html.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_html.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_html.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_html.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "html - Win32 DLL Debug"\r
 \r
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_html.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_html.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_html.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_html.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "html - Win32 Universal Unicode Release"\r
 \r
index a48266f20c7a491a3e2e379bc19c0f9e003a97f0..62e892000e66f40f790540f8c8608a0215e4d405 100644 (file)
@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_media.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_media.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_media.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_media.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Unicode Debug"\r
 \r
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_media.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_media.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_media.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_media.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Release"\r
 \r
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_media.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_media.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_media.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_media.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Universal Debug"\r
 \r
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_media.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_media.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_media.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_media.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Release"\r
 \r
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_media.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_media.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_media.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_media.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Unicode Debug"\r
 \r
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_media.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_media.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_media.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_media.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Release"\r
 \r
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_media.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_media.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_media.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_media.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "media - Win32 DLL Debug"\r
 \r
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_media.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_media.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_media.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_media.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "media - Win32 Universal Unicode Release"\r
 \r
index c7283670ab912533842de3b57f866bc4960b17e5..56d6b7cc0321363481596c37275179f9a14f9704 100644 (file)
@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Unicode Debug"\r
 \r
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Release"\r
 \r
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_net.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_net.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_net.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_net.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Universal Debug"\r
 \r
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_net.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_net.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_net.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_net.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Release"\r
 \r
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Unicode Debug"\r
 \r
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Release"\r
 \r
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_net.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_net.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_net.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_net.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "net - Win32 DLL Debug"\r
 \r
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_net.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_net.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_net.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_net.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "net - Win32 Universal Unicode Release"\r
 \r
diff --git a/build/msw/wx_odbc.dsp b/build/msw/wx_odbc.dsp
deleted file mode 100644 (file)
index 2dad2c0..0000000
+++ /dev/null
@@ -1,998 +0,0 @@
-# Microsoft Developer Studio Project File - Name="wx_odbc" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-# TARGTYPE "Win32 (x86) Static Library" 0x0104\r
-\r
-CFG=odbc - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "wx_odbc.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "wx_odbc.mak" CFG="odbc - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "odbc - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "odbc - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "odbc - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "odbc - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "odbc - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "odbc - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "odbc - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "odbc - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "odbc - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "odbc - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "odbc - Win32 Universal Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "odbc - Win32 Universal Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "odbc - Win32 Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "odbc - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "odbc - Win32 Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "odbc - Win32 Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivudll\odbc"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivudll\odbc"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase290u_odbc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase290u_odbc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290u_odbc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290u_odbc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_odbc.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_odbc.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\odbc"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivuddll\odbc"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase290ud_odbc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase290ud_odbc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290ud_odbc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290ud_odbc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_odbc.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_odbc.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivdll\odbc"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivdll\odbc"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase290_odbc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase290_odbc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290_odbc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290_odbc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_odbc.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_odbc.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivddll\odbc"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivddll\odbc"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase290d_odbc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase290d_odbc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290d_odbc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290d_odbc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_odbc.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_odbc.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswudll\odbc"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswudll\odbc"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase290u_odbc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase290u_odbc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290u_odbc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290u_odbc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_odbc.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_odbc.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswuddll\odbc"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswuddll\odbc"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase290ud_odbc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase290ud_odbc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290ud_odbc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290ud_odbc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_odbc.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_odbc.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswdll\odbc"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswdll\odbc"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase290_odbc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_odbcdll.pch" /Fd..\..\lib\vc_dll\wxbase290_odbc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290_odbc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290_odbc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_odbc.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_odbc.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswddll\odbc"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswddll\odbc"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase290d_odbc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_odbcdll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxbase290d_odbc_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_ODBC" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290d_odbc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase290d_odbc_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_ODBC\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_odbc.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_odbc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_odbc.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswunivu\odbc"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswunivu\odbc"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase29u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_odbclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase29u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_odbclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29u_odbc.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29u_odbc.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswunivud\odbc"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswunivud\odbc"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase29ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase29ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_odbclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29ud_odbc.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29ud_odbc.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswuniv\odbc"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswuniv\odbc"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase29_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase29_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_odbclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29_odbc.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29_odbc.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswunivd\odbc"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswunivd\odbc"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase29d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase29d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_odbclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29d_odbc.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29d_odbc.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswu\odbc"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswu\odbc"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase29u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase29u_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_odbclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29u_odbc.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29u_odbc.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswud\odbc"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswud\odbc"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase29ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_odbclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase29ud_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_odbclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29ud_odbc.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29ud_odbc.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_msw\odbc"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_msw\odbc"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase29_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_odbclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxbase29_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_odbclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29_odbc.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29_odbc.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswd\odbc"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswd\odbc"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase29d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_odbclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxbase29d_odbc.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_odbclib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_GUI=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29d_odbc.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxbase29d_odbc.lib"\r
-\r
-!ENDIF\r
-\r
-# Begin Target\r
-\r
-# Name "odbc - Win32 DLL Universal Unicode Release"\r
-# Name "odbc - Win32 DLL Universal Unicode Debug"\r
-# Name "odbc - Win32 DLL Universal Release"\r
-# Name "odbc - Win32 DLL Universal Debug"\r
-# Name "odbc - Win32 DLL Unicode Release"\r
-# Name "odbc - Win32 DLL Unicode Debug"\r
-# Name "odbc - Win32 DLL Release"\r
-# Name "odbc - Win32 DLL Debug"\r
-# Name "odbc - Win32 Universal Unicode Release"\r
-# Name "odbc - Win32 Universal Unicode Debug"\r
-# Name "odbc - Win32 Universal Release"\r
-# Name "odbc - Win32 Universal Debug"\r
-# Name "odbc - Win32 Unicode Release"\r
-# Name "odbc - Win32 Unicode Debug"\r
-# Name "odbc - Win32 Release"\r
-# Name "odbc - Win32 Debug"\r
-# Begin Group "Common Sources"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\common\db.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\common\dbtable.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\common\dummy.cpp\r
-# ADD BASE CPP /Yc"wx/wxprec.h"\r
-# ADD CPP /Yc"wx/wxprec.h"\r
-# End Source File\r
-# End Group\r
-# Begin Group "MSW Sources"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\msw\version.rc\r
-\r
-!IF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ENDIF\r
-\r
-# End Source File\r
-# End Group\r
-# Begin Group "Setup Headers"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\univ\setup.h\r
-\r
-!IF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ENDIF\r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\msw\setup.h\r
-\r
-!IF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ENDIF\r
-\r
-# End Source File\r
-# End Group\r
-# Begin Group "MSW Headers"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\msw\genrcdefs.h\r
-\r
-!IF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Universal Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Unicode Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 DLL Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Unicode Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Universal Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Unicode Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "odbc - Win32 Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ENDIF\r
-\r
-# End Source File\r
-# End Group\r
-# Begin Group "Common Headers"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\db.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\dbkeyg.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\dbtable.h\r
-# End Source File\r
-# End Group\r
-# End Target\r
-# End Project\r
-\r
index ae7bd024a16bdb66806d650f34616dcfc1aca4fe..e0e5c7ac83c93527787e3ccc3d50c4bb071fa07a 100644 (file)
@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_qa.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_qa.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_qa.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_qa.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug"\r
 \r
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Release"\r
 \r
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib ..\..\lib\vc_dll\wxbase29_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_qa.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib ..\..\lib\vc_dll\wxbase29_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_qa.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib ..\..\lib\vc_dll\wxbase29_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_qa.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib ..\..\lib\vc_dll\wxbase29_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_qa.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Universal Debug"\r
 \r
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib ..\..\lib\vc_dll\wxbase29d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_qa.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib ..\..\lib\vc_dll\wxbase29d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_qa.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib ..\..\lib\vc_dll\wxbase29d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_qa.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib ..\..\lib\vc_dll\wxbase29d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_qa.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Release"\r
 \r
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_qa.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_qa.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_qa.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_qa.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Unicode Debug"\r
 \r
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_qa.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_qa.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_qa.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_qa.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Release"\r
 \r
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib ..\..\lib\vc_dll\wxbase29_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_qa.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib ..\..\lib\vc_dll\wxbase29_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_qa.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib ..\..\lib\vc_dll\wxbase29_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_qa.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib ..\..\lib\vc_dll\wxbase29_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_qa.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "qa - Win32 DLL Debug"\r
 \r
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib ..\..\lib\vc_dll\wxbase29d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_qa.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib ..\..\lib\vc_dll\wxbase29d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_qa.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib ..\..\lib\vc_dll\wxbase29d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_qa.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib ..\..\lib\vc_dll\wxbase29d_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_qa.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "qa - Win32 Universal Unicode Release"\r
 \r
index ad096eca95f0d29f65f6ad1ad99b6a7a6521f63a..9a7af9b73d2ff8f6df266fd009d1edfbc969060c 100644 (file)
@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_richtext.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_richtext.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_richtext.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_richtext.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Universal Unicode Debug"\r
 \r
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_richtext.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Universal Release"\r
 \r
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_adv.lib ..\..\lib\vc_dll\wxmswuniv29_html.lib ..\..\lib\vc_dll\wxbase29_xml.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_richtext.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_adv.lib ..\..\lib\vc_dll\wxmswuniv29_html.lib ..\..\lib\vc_dll\wxbase29_xml.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_richtext.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_adv.lib ..\..\lib\vc_dll\wxmswuniv29_html.lib ..\..\lib\vc_dll\wxbase29_xml.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_richtext.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_adv.lib ..\..\lib\vc_dll\wxmswuniv29_html.lib ..\..\lib\vc_dll\wxbase29_xml.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_richtext.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Universal Debug"\r
 \r
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_adv.lib ..\..\lib\vc_dll\wxmswuniv29d_html.lib ..\..\lib\vc_dll\wxbase29d_xml.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_richtext.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_adv.lib ..\..\lib\vc_dll\wxmswuniv29d_html.lib ..\..\lib\vc_dll\wxbase29d_xml.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_richtext.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_adv.lib ..\..\lib\vc_dll\wxmswuniv29d_html.lib ..\..\lib\vc_dll\wxbase29d_xml.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_richtext.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_adv.lib ..\..\lib\vc_dll\wxmswuniv29d_html.lib ..\..\lib\vc_dll\wxbase29d_xml.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_richtext.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Unicode Release"\r
 \r
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_richtext.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_richtext.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_richtext.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_richtext.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Unicode Debug"\r
 \r
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_richtext.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_richtext.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_richtext.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_richtext.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Release"\r
 \r
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29_adv.lib ..\..\lib\vc_dll\wxmsw29_html.lib ..\..\lib\vc_dll\wxbase29_xml.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_richtext.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29_adv.lib ..\..\lib\vc_dll\wxmsw29_html.lib ..\..\lib\vc_dll\wxbase29_xml.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_richtext.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29_adv.lib ..\..\lib\vc_dll\wxmsw29_html.lib ..\..\lib\vc_dll\wxbase29_xml.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_richtext.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29_adv.lib ..\..\lib\vc_dll\wxmsw29_html.lib ..\..\lib\vc_dll\wxbase29_xml.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_richtext.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "richtext - Win32 DLL Debug"\r
 \r
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29d_adv.lib ..\..\lib\vc_dll\wxmsw29d_html.lib ..\..\lib\vc_dll\wxbase29d_xml.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_richtext.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29d_adv.lib ..\..\lib\vc_dll\wxmsw29d_html.lib ..\..\lib\vc_dll\wxbase29d_xml.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_richtext.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29d_adv.lib ..\..\lib\vc_dll\wxmsw29d_html.lib ..\..\lib\vc_dll\wxbase29d_xml.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_richtext.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29d_adv.lib ..\..\lib\vc_dll\wxmsw29d_html.lib ..\..\lib\vc_dll\wxbase29d_xml.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_richtext_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_richtext.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "richtext - Win32 Universal Unicode Release"\r
 \r
index 2a8f25d4164ca7c49351dd75047236ad743f3ae3..6bc0295a3b31b00897460eb2d656f427067386ac 100644 (file)
@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_stc.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_stc.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_stc.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_stc.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Unicode Debug"\r
 \r
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_stc.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_stc.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_stc.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_stc.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Release"\r
 \r
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_stc.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_stc.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_stc.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_stc.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "stc - Win32 DLL Universal Debug"\r
 \r
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_stc.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_stc.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_stc.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_stc.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "stc - Win32 DLL Unicode Release"\r
 \r
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_stc.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_stc.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_stc.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_stc.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "stc - Win32 DLL Unicode Debug"\r
 \r
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_stc.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_stc.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_stc.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_stc.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "stc - Win32 DLL Release"\r
 \r
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_stc.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_stc.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_stc.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_stc.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "stc - Win32 DLL Debug"\r
 \r
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_stc.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_stc.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_stc.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_stc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_stc.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "stc - Win32 Universal Unicode Release"\r
 \r
index 690dce3594e505ff3e0879bdedcc24677db83556..cbfdea563aeb63f24adbed400d2c87ee96053149 100644 (file)
@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug"\r
 \r
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Release"\r
 \r
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_xml.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_xml.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_xml.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_xml.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Universal Debug"\r
 \r
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_xml.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_xml.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_xml.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_xml.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Release"\r
 \r
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290u_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_xml.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Unicode Debug"\r
 \r
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290ud_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_xml.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Release"\r
 \r
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_xml.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_xml.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_xml.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29_xml.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "xml - Win32 DLL Debug"\r
 \r
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_xml.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_xml.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_xml.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase290d_xml_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29d_xml.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "xml - Win32 Universal Unicode Release"\r
 \r
index e37c6fc9536746b4685b9658cd8c017216da2808..7f7d13631e3c47b76f4e2cde8d712d1a31d3508f 100644 (file)
@@ -65,8 +65,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_xrc.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_xrc.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_xrc.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_xrc.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug"\r
 \r
@@ -90,8 +90,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Release"\r
 \r
@@ -115,8 +115,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_html.lib ..\..\lib\vc_dll\wxmswuniv29_adv.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29_xml.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_xrc.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_html.lib ..\..\lib\vc_dll\wxmswuniv29_adv.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29_xml.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_xrc.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_html.lib ..\..\lib\vc_dll\wxmswuniv29_adv.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29_xml.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_xrc.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29_html.lib ..\..\lib\vc_dll\wxmswuniv29_adv.lib ..\..\lib\vc_dll\wxmswuniv29_core.lib ..\..\lib\vc_dll\wxbase29_xml.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_xrc.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Universal Debug"\r
 \r
@@ -140,8 +140,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_html.lib ..\..\lib\vc_dll\wxmswuniv29d_adv.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d_xml.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_xrc.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_html.lib ..\..\lib\vc_dll\wxmswuniv29d_adv.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d_xml.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_xrc.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_html.lib ..\..\lib\vc_dll\wxmswuniv29d_adv.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d_xml.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_xrc.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmswuniv29d_html.lib ..\..\lib\vc_dll\wxmswuniv29d_adv.lib ..\..\lib\vc_dll\wxmswuniv29d_core.lib ..\..\lib\vc_dll\wxbase29d_xml.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_xrc.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Release"\r
 \r
@@ -165,8 +165,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_xrc.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_xrc.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_xrc.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_xrc.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Unicode Debug"\r
 \r
@@ -190,8 +190,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_xrc.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_xrc.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_xrc.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_xrc.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Release"\r
 \r
@@ -215,8 +215,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29_html.lib ..\..\lib\vc_dll\wxmsw29_adv.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29_xml.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_xrc.lib"\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29_html.lib ..\..\lib\vc_dll\wxmsw29_adv.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29_xml.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_xrc.lib"\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29_html.lib ..\..\lib\vc_dll\wxmsw29_adv.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29_xml.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_xrc.lib"\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29_html.lib ..\..\lib\vc_dll\wxmsw29_adv.lib ..\..\lib\vc_dll\wxmsw29_core.lib ..\..\lib\vc_dll\wxbase29_xml.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_xrc.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "xrc - Win32 DLL Debug"\r
 \r
@@ -240,8 +240,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29d_html.lib ..\..\lib\vc_dll\wxmsw29d_adv.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d_xml.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_xrc.lib" /debug\r
-# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29d_html.lib ..\..\lib\vc_dll\wxmsw29d_adv.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d_xml.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_xrc.lib" /debug\r
+# ADD BASE LINK32 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 ..\..\lib\vc_dll\wxmsw29d_html.lib ..\..\lib\vc_dll\wxmsw29d_adv.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d_xml.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_xrc.lib" /debug\r
+# ADD LINK32 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 ..\..\lib\vc_dll\wxmsw29d_html.lib ..\..\lib\vc_dll\wxmsw29d_adv.lib ..\..\lib\vc_dll\wxmsw29d_core.lib ..\..\lib\vc_dll\wxbase29d_xml.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_xrc_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_xrc.lib" /debug\r
 \r
 !ELSEIF  "$(CFG)" == "xrc - Win32 Universal Unicode Release"\r
 \r
index 2ce90959211f32f9d22a2fc1c107ed88febfdb24..619f3b6fa8f09dcb4b42c2a9a47c6ce4ea373b47 100644 (file)
@@ -86,9 +86,6 @@ USE_STC = 1
 # Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
 USE_OPENGL = 0
 
-# Build ODBC database classes (USE_GUI must be 1)? [0,1]
-USE_ODBC = 0
-
 # Build quality assurance classes library (USE_GUI must be 1)? [0,1]
 USE_QA = 0
 
index a8285090cb4cb1411c948dc62339eff7f081a379..8af23bb053e7610a9dc8d78e4234b1dc4e0360fa 100644 (file)
@@ -117,11 +117,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_m_tables.obj &
        $(OBJS)\monodll_winpars.obj &
        $(OBJS)\monodll_htmllbox.obj &
-       $(OBJS)\monodll_db.obj &
-       $(OBJS)\monodll_dbtable.obj &
        $(OBJS)\monodll_debugrpt.obj &
        $(OBJS)\monodll_dbgrptg.obj &
-       $(OBJS)\monodll_dbgrid.obj &
        $(OBJS)\monodll_xh_animatctrl.obj &
        $(OBJS)\monodll_xh_bmp.obj &
        $(OBJS)\monodll_xh_bmpcbox.obj &
@@ -689,11 +686,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_m_tables.obj &
        $(OBJS)\monolib_winpars.obj &
        $(OBJS)\monolib_htmllbox.obj &
-       $(OBJS)\monolib_db.obj &
-       $(OBJS)\monolib_dbtable.obj &
        $(OBJS)\monolib_debugrpt.obj &
        $(OBJS)\monolib_dbgrptg.obj &
-       $(OBJS)\monolib_dbgrid.obj &
        $(OBJS)\monolib_xh_animatctrl.obj &
        $(OBJS)\monolib_xh_bmp.obj &
        $(OBJS)\monolib_xh_bmpcbox.obj &
@@ -2251,54 +2245,6 @@ ____wxmedia_namelib_DEP =
 !ifeq SHARED 0
 ____wxmedia_namelib_DEP = $(__medialib___depname)
 !endif
-__odbcdll___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_ODBC 1
-__odbcdll___depname = &
-       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.dll
-!endif
-!endif
-!endif
-__odbclib___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_ODBC 1
-__odbclib___depname = &
-       $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-!endif
-!endif
-!endif
-__dbgriddll___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-!ifeq USE_ODBC 1
-__dbgriddll___depname = &
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.dll
-!endif
-!endif
-!endif
-!endif
-__dbgridlib___depname =
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-!ifeq USE_ODBC 1
-__dbgridlib___depname = &
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-!endif
-!endif
-!endif
-!endif
-____wxdbgrid_namedll_DEP =
-!ifeq SHARED 1
-____wxdbgrid_namedll_DEP = $(__dbgriddll___depname)
-!endif
-____wxdbgrid_namelib_DEP =
-!ifeq SHARED 0
-____wxdbgrid_namelib_DEP = $(__dbgridlib___depname)
-!endif
 __htmldll___depname =
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
@@ -2682,7 +2628,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
        USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
        USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
-       USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" &
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
        USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &
        OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
@@ -3487,54 +3433,6 @@ MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
 MEDIALIB_OBJECTS =  &
        $(OBJS)\medialib_dummy.obj &
        $(OBJS)\medialib_mediactrlcmn.obj
-ODBCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-       $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
-       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff &
-       -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-       -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_ODBC &
-       /fh=$(OBJS)\wxprec_odbcdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
-ODBCDLL_OBJECTS =  &
-       $(OBJS)\odbcdll_dummy.obj &
-       $(OBJS)\odbcdll_db.obj &
-       $(OBJS)\odbcdll_dbtable.obj
-ODBCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-       $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
-       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff &
-       -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-       -i=..\..\src\expat\lib -dwxUSE_GUI=0 /fh=$(OBJS)\wxprec_odbclib.pch &
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-ODBCLIB_OBJECTS =  &
-       $(OBJS)\odbclib_dummy.obj &
-       $(OBJS)\odbclib_db.obj &
-       $(OBJS)\odbclib_dbtable.obj
-DBGRIDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-       $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
-       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff &
-       -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-       -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_DBGRID &
-       /fh=$(OBJS)\wxprec_dbgriddll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
-       $(CPPFLAGS) $(CXXFLAGS)
-DBGRIDDLL_OBJECTS =  &
-       $(OBJS)\dbgriddll_dummy.obj &
-       $(OBJS)\dbgriddll_dbgrid.obj
-DBGRIDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
-       $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include &
-       -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXBUILDING -i=..\..\src\tiff\libtiff &
-       -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex &
-       -i=..\..\src\expat\lib /fh=$(OBJS)\wxprec_dbgridlib.pch $(__RTTIFLAG) &
-       $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
-DBGRIDLIB_OBJECTS =  &
-       $(OBJS)\dbgridlib_dummy.obj &
-       $(OBJS)\dbgridlib_dbgrid.obj
 HTMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
        $(__RUNTIME_LIBS) -d__WXPM__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
@@ -3921,7 +3819,7 @@ $(OBJS) :
 
 ### Targets: ###
 
-all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
+all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -3954,12 +3852,6 @@ clean : .SYMBOLIC
        -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.dll
        -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
        -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
-       -del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.dll
-       -del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-       -del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-       -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.dll
-       -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-       -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
        -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.dll
        -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
        -del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
@@ -4233,78 +4125,6 @@ wxmedia : .SYMBOLIC $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
 !endif
 !endif
 
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_ODBC 1
-$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.dll :  $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__basedll___depname)
-       @%create $(OBJS)\odbcdll.lbc
-       @%append $(OBJS)\odbcdll.lbc option quiet
-       @%append $(OBJS)\odbcdll.lbc name $^@
-       @%append $(OBJS)\odbcdll.lbc option caseexact
-       @%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
-       @for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.lbc file %i
-       @for %i in ( wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\odbcdll.lbc library %i
-       @%append $(OBJS)\odbcdll.lbc
-       @%append $(OBJS)\odbcdll.lbc system os2v2 dll
-       wlink @$(OBJS)\odbcdll.lbc
-       wlib -q -n -b $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib +$^@
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_ODBC 1
-$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib :  $(ODBCLIB_OBJECTS)
-       @%create $(OBJS)\odbclib.lbc
-       @for %i in ($(ODBCLIB_OBJECTS)) do @%append $(OBJS)\odbclib.lbc +%i
-       wlib -q -p4096 -n -b $^@ @$(OBJS)\odbclib.lbc
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 1
-!ifeq USE_GUI 1
-!ifeq USE_ODBC 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.dll :  $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
-       @%create $(OBJS)\dbgriddll.lbc
-       @%append $(OBJS)\dbgriddll.lbc option quiet
-       @%append $(OBJS)\dbgriddll.lbc name $^@
-       @%append $(OBJS)\dbgriddll.lbc option caseexact
-       @%append $(OBJS)\dbgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_3)  libpath $(LIBDIRNAME)
-       @for %i in ($(DBGRIDDLL_OBJECTS)) do @%append $(OBJS)\dbgriddll.lbc file %i
-       @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\dbgriddll.lbc library %i
-       @%append $(OBJS)\dbgriddll.lbc
-       @%append $(OBJS)\dbgriddll.lbc system os2v2 dll
-       wlink @$(OBJS)\dbgriddll.lbc
-       wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib +$^@
-!endif
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq SHARED 0
-!ifeq USE_GUI 1
-!ifeq USE_ODBC 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib :  $(DBGRIDLIB_OBJECTS)
-       @%create $(OBJS)\dbgridlib.lbc
-       @for %i in ($(DBGRIDLIB_OBJECTS)) do @%append $(OBJS)\dbgridlib.lbc +%i
-       wlib -q -p4096 -n -b $^@ @$(OBJS)\dbgridlib.lbc
-!endif
-!endif
-!endif
-!endif
-
-!ifeq MONOLITHIC 0
-!ifeq USE_GUI 1
-!ifeq USE_ODBC 1
-wxdbgrid : .SYMBOLIC $(____wxdbgrid_namedll_DEP) $(____wxdbgrid_namelib_DEP)
-!endif
-!endif
-!endif
-
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
 !ifeq USE_GUI 1
@@ -4636,7 +4456,6 @@ build_cfg_file : .SYMBOLIC $(SETUPHDIR)
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
-       @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
        @echo USE_GDIPLUS=$(USE_GDIPLUS) >>$(BUILD_CFG_FILE)
@@ -5806,21 +5625,12 @@ $(OBJS)\monodll_winpars.obj :  .AUTODEPEND ..\..\src\html\winpars.cpp
 $(OBJS)\monodll_htmllbox.obj :  .AUTODEPEND ..\..\src\generic\htmllbox.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_db.obj :  .AUTODEPEND ..\..\src\common\db.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_dbtable.obj :  .AUTODEPEND ..\..\src\common\dbtable.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_debugrpt.obj :  .AUTODEPEND ..\..\src\common\debugrpt.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
 $(OBJS)\monodll_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
 $(OBJS)\monodll_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -7764,21 +7574,12 @@ $(OBJS)\monolib_winpars.obj :  .AUTODEPEND ..\..\src\html\winpars.cpp
 $(OBJS)\monolib_htmllbox.obj :  .AUTODEPEND ..\..\src\generic\htmllbox.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_db.obj :  .AUTODEPEND ..\..\src\common\db.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_dbtable.obj :  .AUTODEPEND ..\..\src\common\dbtable.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_debugrpt.obj :  .AUTODEPEND ..\..\src\common\debugrpt.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
 $(OBJS)\monolib_dbgrptg.obj :  .AUTODEPEND ..\..\src\generic\dbgrptg.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
 $(OBJS)\monolib_xh_animatctrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -12405,36 +12206,6 @@ $(OBJS)\medialib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
 $(OBJS)\medialib_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $<
 
-$(OBJS)\odbcdll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $<
-
-$(OBJS)\odbcdll_db.obj :  .AUTODEPEND ..\..\src\common\db.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $<
-
-$(OBJS)\odbcdll_dbtable.obj :  .AUTODEPEND ..\..\src\common\dbtable.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(ODBCDLL_CXXFLAGS) $<
-
-$(OBJS)\odbclib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $<
-
-$(OBJS)\odbclib_db.obj :  .AUTODEPEND ..\..\src\common\db.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $<
-
-$(OBJS)\odbclib_dbtable.obj :  .AUTODEPEND ..\..\src\common\dbtable.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(ODBCLIB_CXXFLAGS) $<
-
-$(OBJS)\dbgriddll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(DBGRIDDLL_CXXFLAGS) $<
-
-$(OBJS)\dbgriddll_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(DBGRIDDLL_CXXFLAGS) $<
-
-$(OBJS)\dbgridlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(DBGRIDLIB_CXXFLAGS) $<
-
-$(OBJS)\dbgridlib_dbgrid.obj :  .AUTODEPEND ..\..\src\common\dbgrid.cpp
-       $(CXX) -bt=os2 -zq -fo=$^@ $(DBGRIDLIB_CXXFLAGS) $<
-
 $(OBJS)\htmldll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp
        $(CXX) -bt=os2 -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
 
index c1ca81895716b0cfbb32f1481d516ecc537dc953..017766a090318454a66543f1cbd5db197ce1dde0 100644 (file)
@@ -387,13 +387,6 @@ HTML_SRC = \
 ../../src/html/winpars.cpp \
 ../../src/generic/htmllbox.cpp
 
-ODBC_SRC = \
-../../src/common/db.cpp \
-../../src/common/dbtable.cpp
-
-DBGRID_SRC = \
-../../src/common/dbgrid.cpp
-
 XRC_SRC = \
 ../../src/xrc/xh_bmpbt.cpp \
 ../../src/xrc/xh_bmp.cpp \
@@ -453,8 +446,6 @@ $(CORE_SRC) \
 $(ADVANCED_SRC) \
 $(MEDIA_SRC) \
 $(HTML_SRC) \
-$(ODBC_SRC) \
-$(DBGRID_SRC) \
 $(XRC_SRC) \
 $(XML_SRC) \
 $(OPENGL_SRC) \
index aad8e30742e96bce9a06f2aedbfc560d808712a9..c6b885531ff3d3dabd12b2e83bde02f4ebf7bc32 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 49200 2007-10-17 17:55:25Z VZ .
+# From configure.in Id: configure.in 49284 2007-10-21 11:39:33Z MW .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
@@ -723,7 +723,6 @@ STD_GUI_LIBS
 wxUSE_ZLIB
 wxUSE_REGEX
 wxUSE_EXPAT
-wxUSE_ODBC
 wxUSE_LIBJPEG
 wxUSE_LIBPNG
 wxUSE_LIBTIFF
@@ -738,7 +737,6 @@ CXXWARNINGS
 EXTRALIBS
 EXTRALIBS_XML
 EXTRALIBS_HTML
-EXTRALIBS_ODBC
 EXTRALIBS_GUI
 EXTRALIBS_OPENGL
 EXTRALIBS_SDL
@@ -1901,7 +1899,6 @@ Optional Packages:
   --with-sdl              use SDL for audio on Unix
   --with-regex            enable support for wxRegEx class
   --with-zlib             use zlib for LZW compression
-  --with-odbc             use the IODBC and wxODBC classes
   --with-expat            enable XML support using expat parser
   --with-macosx-sdk=PATH  use an OS X SDK at PATH
   --with-macosx-version-min=VER   build binaries which require at least this OS X version
@@ -2944,7 +2941,6 @@ DEFAULT_wxUSE_LIBGNOMEVFS=no
 DEFAULT_wxUSE_LIBHILDON=no
 DEFAULT_wxUSE_LIBMSPACK=no
 DEFAULT_wxUSE_LIBSDL=no
-DEFAULT_wxUSE_ODBC=no
 DEFAULT_wxUSE_OPENGL=no
 
 DEFAULT_wxUSE_ACCESSIBILITY=no
@@ -4400,66 +4396,6 @@ echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or b
           fi
 
 
-          { echo "$as_me:$LINENO: checking for --with-odbc" >&5
-echo $ECHO_N "checking for --with-odbc... $ECHO_C" >&6; }
-
-# Check whether --with-odbc was given.
-if test "${with_odbc+set}" = set; then
-  withval=$with_odbc;
-                        if test "$withval" = yes; then
-                          wx_cv_use_odbc='wxUSE_ODBC=yes'
-                        elif test "$withval" = no; then
-                          wx_cv_use_odbc='wxUSE_ODBC=no'
-                        elif test "$withval" = sys; then
-                          wx_cv_use_odbc='wxUSE_ODBC=sys'
-                        elif test "$withval" = builtin; then
-                          wx_cv_use_odbc='wxUSE_ODBC=builtin'
-                        else
-                          { { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5
-echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;}
-   { (exit 1); exit 1; }; }
-                        fi
-                        cache=yes
-
-else
-
-                        LINE=`grep "^wxUSE_ODBC=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                        else
-                            cache=no
-                        fi
-
-                        wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}"
-
-fi
-
-
-          eval "$wx_cv_use_odbc"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_ODBC=$wxUSE_ODBC" >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_ODBC" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-          elif test "$wxUSE_ODBC" = no; then
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-          elif test "$wxUSE_ODBC" = sys; then
-            { echo "$as_me:$LINENO: result: system version" >&5
-echo "${ECHO_T}system version" >&6; }
-          elif test "$wxUSE_ODBC" = builtin; then
-            { echo "$as_me:$LINENO: result: builtin version" >&5
-echo "${ECHO_T}builtin version" >&6; }
-          else
-            { { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5
-echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;}
-   { (exit 1); exit 1; }; }
-          fi
-
-
           { echo "$as_me:$LINENO: checking for --with-expat" >&5
 echo $ECHO_N "checking for --with-expat... $ECHO_C" >&6; }
 
                         LIBS="$LIBS -lkernel32 -luser32"
     esac
 
-        if test "$wxUSE_ODBC" = "sys" ; then
-        wxUSE_ODBC = "yes"
-    fi
-    if test "$wxUSE_ODBC" = "yes" ; then
-        LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS"
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ODBC 1
-_ACEOF
-
-    fi
-
         RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
 
 
 
 
-IODBC_C_SRC=""
-
-
-if test "$TOOLKIT" != "MSW" ; then
-
-    if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
-
-        { echo "$as_me:$LINENO: checking for sql.h" >&5
-echo $ECHO_N "checking for sql.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sql_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-#include <sql.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_sql_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_sql_h=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5
-echo "${ECHO_T}$ac_cv_header_sql_h" >&6; }
-if test $ac_cv_header_sql_h = yes; then
-  found_sql_h=1
-fi
-
-
-        if test "x$found_sql_h" = "x1" ; then
-            { echo "$as_me:$LINENO: checking for SQLAllocEnv in -liodbc" >&5
-echo $ECHO_N "checking for SQLAllocEnv in -liodbc... $ECHO_C" >&6; }
-if test "${ac_cv_lib_iodbc_SQLAllocEnv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-liodbc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SQLAllocEnv ();
-int
-main ()
-{
-return SQLAllocEnv ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_iodbc_SQLAllocEnv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_lib_iodbc_SQLAllocEnv=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_iodbc_SQLAllocEnv" >&5
-echo "${ECHO_T}$ac_cv_lib_iodbc_SQLAllocEnv" >&6; }
-if test $ac_cv_lib_iodbc_SQLAllocEnv = yes; then
-  ODBC_LINK=" -liodbc"
-else
-
-                { echo "$as_me:$LINENO: checking for SQLAllocEnv in -lunixodbc" >&5
-echo $ECHO_N "checking for SQLAllocEnv in -lunixodbc... $ECHO_C" >&6; }
-if test "${ac_cv_lib_unixodbc_SQLAllocEnv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lunixodbc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SQLAllocEnv ();
-int
-main ()
-{
-return SQLAllocEnv ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_unixodbc_SQLAllocEnv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_lib_unixodbc_SQLAllocEnv=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_unixodbc_SQLAllocEnv" >&5
-echo "${ECHO_T}$ac_cv_lib_unixodbc_SQLAllocEnv" >&6; }
-if test $ac_cv_lib_unixodbc_SQLAllocEnv = yes; then
-  ODBC_LINK=" -lunixodbc"
-else
-
-                    { echo "$as_me:$LINENO: checking for SQLAllocEnv in -lodbc" >&5
-echo $ECHO_N "checking for SQLAllocEnv in -lodbc... $ECHO_C" >&6; }
-if test "${ac_cv_lib_odbc_SQLAllocEnv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lodbc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SQLAllocEnv ();
-int
-main ()
-{
-return SQLAllocEnv ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_odbc_SQLAllocEnv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_lib_odbc_SQLAllocEnv=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_odbc_SQLAllocEnv" >&5
-echo "${ECHO_T}$ac_cv_lib_odbc_SQLAllocEnv" >&6; }
-if test $ac_cv_lib_odbc_SQLAllocEnv = yes; then
-  ODBC_LINK=" -lodbc"
-fi
-
-
-fi
-
-
-fi
-
-        fi
-        if test "x$ODBC_LINK" = "x" ; then
-            if test "$wxUSE_ODBC" = "sys" ; then
-                { { echo "$as_me:$LINENO: error: system ODBC library not found! Use --with-odbc=builtin to use built-in version" >&5
-echo "$as_me: error: system ODBC library not found! Use --with-odbc=builtin to use built-in version" >&2;}
-   { (exit 1); exit 1; }; }
-            else
-                { echo "$as_me:$LINENO: WARNING: system ODBC library not found, will use built-in instead" >&5
-echo "$as_me: WARNING: system ODBC library not found, will use built-in instead" >&2;}
-                wxUSE_ODBC=builtin
-            fi
-        else
-                        wxUSE_ODBC=sys
-        fi
-    fi
-
-    if test "$wxUSE_ODBC" = "builtin" ; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_BUILTIN_IODBC 1
-_ACEOF
-
-    fi
-fi
-
-if test "$wxUSE_ODBC" != "no" ; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ODBC 1
-_ACEOF
-
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
-
-        WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_IODBC_"
-fi
-
-
 if test "$wxUSE_DISPLAY" = "yes"; then
     if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
         { echo "$as_me:$LINENO: checking for Xinerama" >&5
@@ -49461,15 +49093,12 @@ _ACEOF
 STD_BASE_LIBS="base"
 STD_GUI_LIBS=""
 BUILT_WX_LIBS="base"
-ALL_WX_LIBS="xrc stc gl media dbgrid qa html adv core odbc xml net base"
+ALL_WX_LIBS="xrc stc gl media qa html adv core xml net base"
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
     STD_BASE_LIBS="net $STD_BASE_LIBS"
     BUILT_WX_LIBS="net $BUILT_WX_LIBS"
 fi
-if test "$wxUSE_ODBC" != "no" ; then
-    BUILT_WX_LIBS="odbc $BUILT_WX_LIBS"
-fi
 if test "$wxUSE_XML" = "yes" ; then
     STD_BASE_LIBS="xml $STD_BASE_LIBS"
     BUILT_WX_LIBS="xml $BUILT_WX_LIBS"
@@ -49483,9 +49112,6 @@ if test "$wxUSE_GUI" = "yes"; then
         STD_GUI_LIBS="qa $STD_GUI_LIBS"
         BUILT_WX_LIBS="qa $BUILT_WX_LIBS"
     fi
-    if test "$wxUSE_ODBC" != "no" ; then
-        BUILT_WX_LIBS="dbgrid $BUILT_WX_LIBS"
-    fi
     if test "$wxUSE_HTML" = "yes" ; then
         STD_GUI_LIBS="html $STD_GUI_LIBS"
         BUILT_WX_LIBS="html $BUILT_WX_LIBS"
@@ -49606,7 +49232,6 @@ LIBS=`echo $LIBS`
 EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
 EXTRALIBS_XML="$EXPAT_LINK"
 EXTRALIBS_HTML="$MSPACK_LINK"
-EXTRALIBS_ODBC="$ODBC_LINK"
 EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
 if test "$wxUSE_GUI" = "yes"; then
     EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
@@ -49625,9 +49250,6 @@ fi
 if test "$wxUSE_EXPAT" = "builtin" ; then
     wxconfig_3rdparty="expat $wxconfig_3rdparty"
 fi
-if test "$wxUSE_ODBC" = "builtin" ; then
-    wxconfig_3rdparty="odbc $wxconfig_3rdparty"
-fi
 if test "$wxUSE_LIBTIFF" = "builtin" ; then
     wxconfig_3rdparty="tiff $wxconfig_3rdparty"
 fi
@@ -49676,7 +49298,6 @@ fi
 
 
 
-
 if test $wxUSE_MONOLITHIC = "yes" ; then
     MONOLITHIC=1
 else
@@ -49689,12 +49310,6 @@ else
     USE_PLUGINS=0
 fi
 
-if test $wxUSE_ODBC != "no" ; then
-    USE_ODBC=1
-else
-    USE_ODBC=0
-fi
-
 if test "$wxUSE_DEBUGREPORT" = "yes" ; then
     USE_QA=1
 else
@@ -49730,7 +49345,6 @@ fi
 
 
 
-
 
 
 TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"`
@@ -54129,7 +53743,6 @@ STD_GUI_LIBS!$STD_GUI_LIBS$ac_delim
 wxUSE_ZLIB!$wxUSE_ZLIB$ac_delim
 wxUSE_REGEX!$wxUSE_REGEX$ac_delim
 wxUSE_EXPAT!$wxUSE_EXPAT$ac_delim
-wxUSE_ODBC!$wxUSE_ODBC$ac_delim
 wxUSE_LIBJPEG!$wxUSE_LIBJPEG$ac_delim
 wxUSE_LIBPNG!$wxUSE_LIBPNG$ac_delim
 wxUSE_LIBTIFF!$wxUSE_LIBTIFF$ac_delim
@@ -54144,7 +53757,6 @@ CXXWARNINGS!$CXXWARNINGS$ac_delim
 EXTRALIBS!$EXTRALIBS$ac_delim
 EXTRALIBS_XML!$EXTRALIBS_XML$ac_delim
 EXTRALIBS_HTML!$EXTRALIBS_HTML$ac_delim
-EXTRALIBS_ODBC!$EXTRALIBS_ODBC$ac_delim
 EXTRALIBS_GUI!$EXTRALIBS_GUI$ac_delim
 EXTRALIBS_OPENGL!$EXTRALIBS_OPENGL$ac_delim
 EXTRALIBS_SDL!$EXTRALIBS_SDL$ac_delim
@@ -54216,6 +53828,8 @@ GCC_PCH!$GCC_PCH$ac_delim
 ICC_PCH!$ICC_PCH$ac_delim
 BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
 COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
+COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
+COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -54257,8 +53871,6 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
-COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
 COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
 COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim
 COND_BUILD_RELEASE!$COND_BUILD_RELEASE$ac_delim
@@ -54354,6 +53966,8 @@ COND_SHARED_1!$COND_SHARED_1$ac_delim
 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim
 COND_SHARED_1_USE_XRC_1!$COND_SHARED_1_USE_XRC_1$ac_delim
 COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim
+COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
+COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -54395,8 +54009,6 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
-COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
 COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
 COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
 COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
@@ -54492,6 +54104,8 @@ WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim
 WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim
 WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
 GUIDIST!$GUIDIST$ac_delim
+DISTDIR!$DISTDIR$ac_delim
+SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -54533,8 +54147,6 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-DISTDIR!$DISTDIR$ac_delim
-SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
 LDFLAGS_GL!$LDFLAGS_GL$ac_delim
 OPENGL_LIBS!$OPENGL_LIBS$ac_delim
 DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
@@ -54554,7 +54166,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -55212,7 +54824,6 @@ if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
 echo "                                       xpm                ${wxUSE_LIBXPM-none}"
 fi
 echo "                                       zlib               ${wxUSE_ZLIB}"
-echo "                                       odbc               ${wxUSE_ODBC}"
 echo "                                       expat              ${wxUSE_EXPAT}"
 echo "                                       libmspack          ${wxUSE_LIBMSPACK}"
 echo "                                       sdl                ${wxUSE_LIBSDL}"
index 21e6991a784401e59d5cebb148aee581861540e6..fb51528d400757e7842d158ea377d3c5822a6853 100644 (file)
@@ -378,7 +378,6 @@ DEFAULT_wxUSE_LIBGNOMEVFS=no
 DEFAULT_wxUSE_LIBHILDON=no
 DEFAULT_wxUSE_LIBMSPACK=no
 DEFAULT_wxUSE_LIBSDL=no
-DEFAULT_wxUSE_ODBC=no
 DEFAULT_wxUSE_OPENGL=no
 
 dnl features disabled by default
@@ -508,7 +507,6 @@ WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (http:
 WX_ARG_WITH(sdl,           [  --with-sdl              use SDL for audio on Unix], wxUSE_LIBSDL)
 WX_ARG_SYS_WITH(regex,     [  --with-regex            enable support for wxRegEx class], wxUSE_REGEX)
 WX_ARG_SYS_WITH(zlib,      [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
-WX_ARG_SYS_WITH(odbc,      [  --with-odbc             use the IODBC and wxODBC classes], wxUSE_ODBC)
 WX_ARG_SYS_WITH(expat,     [  --with-expat            enable XML support using expat parser], wxUSE_EXPAT)
 
 AC_MSG_CHECKING([for --with-macosx-sdk])
@@ -2676,16 +2674,6 @@ if test "$USE_WIN32" = 1 ; then
             LIBS="$LIBS -lkernel32 -luser32"
     esac
 
-    dnl add extra odbc libs if we have compiled in odbc
-    if test "$wxUSE_ODBC" = "sys" ; then
-        wxUSE_ODBC = "yes"
-    fi
-    if test "$wxUSE_ODBC" = "yes" ; then
-        LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS"
-        AC_DEFINE(wxUSE_ODBC)
-    fi
-    dnl We might want to abort here if wxUSE_ODBC="builtin" isn't supported on msw.
-
     dnl This one is still used by some sample makefiles.
     RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
@@ -3539,56 +3527,6 @@ if test "$wxUSE_GUI" = "yes"; then
 fi
 
 
-dnl ----------------------------------------------------------------
-dnl iODBC support
-dnl ----------------------------------------------------------------
-
-IODBC_C_SRC=""
-
-
-dnl ODBC is handled separately for MSW
-if test "$TOOLKIT" != "MSW" ; then
-
-    if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
-        dnl This is not ideal we really ough to use the unixodbc-config
-        dnl  or iodbc-config if they exist.
-
-        AC_CHECK_HEADER([sql.h], [found_sql_h=1],, [ ])
-        if test "x$found_sql_h" = "x1" ; then
-            AC_CHECK_LIB(iodbc, SQLAllocEnv, ODBC_LINK=" -liodbc",
-            [
-                AC_CHECK_LIB(unixodbc, SQLAllocEnv, ODBC_LINK=" -lunixodbc",
-                [
-                    AC_CHECK_LIB(odbc, SQLAllocEnv, ODBC_LINK=" -lodbc")
-                ])
-            ])
-        fi
-        if test "x$ODBC_LINK" = "x" ; then
-            if test "$wxUSE_ODBC" = "sys" ; then
-                AC_MSG_ERROR([system ODBC library not found! Use --with-odbc=builtin to use built-in version])
-            else
-                AC_MSG_WARN([system ODBC library not found, will use built-in instead])
-                wxUSE_ODBC=builtin
-            fi
-        else
-            dnl we are using the system library
-            wxUSE_ODBC=sys
-        fi
-    fi
-
-    if test "$wxUSE_ODBC" = "builtin" ; then
-        AC_DEFINE(wxUSE_BUILTIN_IODBC)
-    fi
-fi
-
-if test "$wxUSE_ODBC" != "no" ; then
-    AC_DEFINE(wxUSE_ODBC)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
-
-    dnl is this still necessary?
-    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_IODBC_"
-fi
-
 dnl ---------------------------------------------------------------------------
 dnl wxDisplay Sanity checks
 dnl ---------------------------------------------------------------------------
@@ -7213,15 +7151,12 @@ dnl ---------------------------------------------------------------------------
 STD_BASE_LIBS="base"
 STD_GUI_LIBS=""
 BUILT_WX_LIBS="base"
-ALL_WX_LIBS="xrc stc gl media dbgrid qa html adv core odbc xml net base"
+ALL_WX_LIBS="xrc stc gl media qa html adv core xml net base"
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
     STD_BASE_LIBS="net $STD_BASE_LIBS"
     BUILT_WX_LIBS="net $BUILT_WX_LIBS"
 fi
-if test "$wxUSE_ODBC" != "no" ; then
-    BUILT_WX_LIBS="odbc $BUILT_WX_LIBS"
-fi
 if test "$wxUSE_XML" = "yes" ; then
     STD_BASE_LIBS="xml $STD_BASE_LIBS"
     BUILT_WX_LIBS="xml $BUILT_WX_LIBS"
@@ -7235,9 +7170,6 @@ if test "$wxUSE_GUI" = "yes"; then
         STD_GUI_LIBS="qa $STD_GUI_LIBS"
         BUILT_WX_LIBS="qa $BUILT_WX_LIBS"
     fi
-    if test "$wxUSE_ODBC" != "no" ; then
-        BUILT_WX_LIBS="dbgrid $BUILT_WX_LIBS"
-    fi
     if test "$wxUSE_HTML" = "yes" ; then
         STD_GUI_LIBS="html $STD_GUI_LIBS"
         BUILT_WX_LIBS="html $BUILT_WX_LIBS"
@@ -7410,7 +7342,6 @@ LIBS=`echo $LIBS`
 EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
 EXTRALIBS_XML="$EXPAT_LINK"
 EXTRALIBS_HTML="$MSPACK_LINK"
-EXTRALIBS_ODBC="$ODBC_LINK"
 EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
 if test "$wxUSE_GUI" = "yes"; then
     EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
@@ -7430,9 +7361,6 @@ fi
 if test "$wxUSE_EXPAT" = "builtin" ; then
     wxconfig_3rdparty="expat $wxconfig_3rdparty"
 fi
-if test "$wxUSE_ODBC" = "builtin" ; then
-    wxconfig_3rdparty="odbc $wxconfig_3rdparty"
-fi
 if test "$wxUSE_LIBTIFF" = "builtin" ; then
     wxconfig_3rdparty="tiff $wxconfig_3rdparty"
 fi
@@ -7471,7 +7399,6 @@ fi
 AC_SUBST(wxUSE_ZLIB)
 AC_SUBST(wxUSE_REGEX)
 AC_SUBST(wxUSE_EXPAT)
-AC_SUBST(wxUSE_ODBC)
 AC_SUBST(wxUSE_LIBJPEG)
 AC_SUBST(wxUSE_LIBPNG)
 AC_SUBST(wxUSE_LIBTIFF)
@@ -7488,12 +7415,6 @@ else
     USE_PLUGINS=0
 fi
 
-if test $wxUSE_ODBC != "no" ; then
-    USE_ODBC=1
-else
-    USE_ODBC=0
-fi
-
 if test "$wxUSE_DEBUGREPORT" = "yes" ; then
     USE_QA=1
 else
@@ -7519,7 +7440,6 @@ AC_SUBST(CXXWARNINGS)
 AC_SUBST(EXTRALIBS)
 AC_SUBST(EXTRALIBS_XML)
 AC_SUBST(EXTRALIBS_HTML)
-AC_SUBST(EXTRALIBS_ODBC)
 AC_SUBST(EXTRALIBS_GUI)
 AC_SUBST(EXTRALIBS_OPENGL)
 AC_SUBST(EXTRALIBS_SDL)
@@ -8022,7 +7942,6 @@ if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
 echo "                                       xpm                ${wxUSE_LIBXPM-none}"
 fi
 echo "                                       zlib               ${wxUSE_ZLIB}"
-echo "                                       odbc               ${wxUSE_ODBC}"
 echo "                                       expat              ${wxUSE_EXPAT}"
 echo "                                       libmspack          ${wxUSE_LIBMSPACK}"
 echo "                                       sdl                ${wxUSE_LIBSDL}"
diff --git a/demos/dbbrowse/Makefile.in b/demos/dbbrowse/Makefile.in
deleted file mode 100644 (file)
index 8ab0bf8..0000000
+++ /dev/null
@@ -1,266 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (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@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-LIBS = @LIBS@
-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_XML = @EXTRALIBS_XML@
-EXTRALIBS_HTML = @EXTRALIBS_HTML@
-EXTRALIBS_ODBC = @EXTRALIBS_ODBC@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-EXTRALIBS_SDL = @EXTRALIBS_SDL@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR = 
-WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-DBBROWSE_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)
-DBBROWSE_OBJECTS =  \
-       $(__dbbrowse_os2_lib_res) \
-       dbbrowse_dbbrowse.o \
-       dbbrowse_doc.o \
-       dbbrowse_pgmctrl.o \
-       dbbrowse_tabpgwin.o \
-       dbbrowse_browsedb.o \
-       dbbrowse_dbtree.o \
-       dbbrowse_dbgrid.o \
-       dbbrowse_dlguser.o \
-       $(__dbbrowse___win32rc)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
-@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_USE_ODBC_1@__dbbrowse___depname = dbbrowse$(EXEEXT)
-@COND_PLATFORM_MAC_1@__dbbrowse___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@  $(SETFILE) -a C dbbrowse$(EXEEXT)
-@COND_PLATFORM_MAC_1@__dbbrowse___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___dbbrowse___os2_emxbindcmd = $(NM) dbbrowse$(EXEEXT) | if \
-       grep -q pmwin.763 ; then emxbind -ep dbbrowse$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__dbbrowse___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dbbrowse___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_OS2_1@__dbbrowse_os2_lib_res = \
-@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__dbbrowse_bundle___depname = dbbrowse_bundle
-@COND_TOOLKIT_COCOA@____dbbrowse_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@   dbbrowse.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____dbbrowse_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     dbbrowse.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_DBGRID_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_DBGRID_p = $(COND_MONOLITHIC_0___WXLIB_DBGRID_p)
-COND_MONOLITHIC_0___WXLIB_ADV_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
-COND_MONOLITHIC_0_USE_ODBC_1___WXLIB_ODBC_p = \
-       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0_USE_ODBC_1@__WXLIB_ODBC_p = $(COND_MONOLITHIC_0_USE_ODBC_1___WXLIB_ODBC_p)
-COND_MONOLITHIC_0___WXLIB_HTML_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
-COND_MONOLITHIC_0___WXLIB_XML_p = \
-       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
-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_PLATFORM_WIN32_1@__dbbrowse___win32rc = dbbrowse_dbbrowse_rc.o
-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 \
-       dbbrowse$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: $(__dbbrowse___depname) $(__dbbrowse_bundle___depname) data_help_std data_help_png
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-       rm -rf ./.deps ./.pch
-       rm -f ./*.o
-       rm -f dbbrowse$(EXEEXT)
-       rm -rf dbbrowse.app
-
-distclean: clean
-       rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-@COND_USE_ODBC_1@dbbrowse$(EXEEXT): $(DBBROWSE_OBJECTS) $(__dbbrowse___win32rc)
-@COND_USE_ODBC_1@      $(CXX) -o $@ $(DBBROWSE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
-@COND_USE_ODBC_1@      $(__dbbrowse___mac_rezcmd)
-@COND_USE_ODBC_1@      $(__dbbrowse___mac_setfilecmd)
-@COND_USE_ODBC_1@      $(__dbbrowse___os2_emxbindcmd)
-@COND_USE_ODBC_1@      $(SAMPLES_RPATH_POSTLINK)
-
-dbbrowse.app/Contents/PkgInfo: $(__dbbrowse___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-       mkdir -p dbbrowse.app/Contents
-       mkdir -p dbbrowse.app/Contents/MacOS
-       mkdir -p dbbrowse.app/Contents/Resources
-       
-       
-       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-       -e "s/EXECUTABLE/dbbrowse/" \
-       -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/carbon/Info.plist.in >dbbrowse.app/Contents/Info.plist
-       
-       
-       echo -n "APPL????" >dbbrowse.app/Contents/PkgInfo
-       
-       
-       ln -f dbbrowse$(EXEEXT) dbbrowse.app/Contents/MacOS/dbbrowse
-       
-       
-       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dbbrowse.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@dbbrowse_bundle: $(____dbbrowse_BUNDLE_TGT_REF_DEP)
-
-data_help_std: 
-       @mkdir -p ./help.std
-       @for f in compiler.htm dbbrowse.hhc dbbrowse.hhk dbbrowse.hhp dbbrowse.htm getcol.htm getcolsh.htm icons.htm picgrams.htm problems.htm remstar.htm sample.htm startprm.htm todo.htm wxdb.htm wxtable.htm; do \
-       if test ! -f ./help.std/$$f -a ! -d ./help.std/$$f ; \
-       then x=yep ; \
-       else x=`find $(srcdir)/help.std/$$f -newer ./help.std/$$f -print` ; \
-       fi; \
-       case "$$x" in ?*) \
-       cp -pRf $(srcdir)/help.std/$$f ./help.std ;; \
-       esac; \
-       done
-
-data_help_png: 
-       @mkdir -p ./help.png
-       @for f in col.png d_closed.png d_open.png dsn.png dsnclose.png dsnopen.png f_closed.png f_open.png gnu.png gtk.png imbau.png kde.png key.png keyf.png linux.png logo.png motif.png msvc.png odbc.png pgmctrl.png redh.png remstar.png server.png suse.png tab.png view.png winnt.png wins.png; do \
-       if test ! -f ./help.png/$$f -a ! -d ./help.png/$$f ; \
-       then x=yep ; \
-       else x=`find $(srcdir)/help.png/$$f -newer ./help.png/$$f -print` ; \
-       fi; \
-       case "$$x" in ?*) \
-       cp -pRf $(srcdir)/help.png/$$f ./help.png ;; \
-       esac; \
-       done
-
-dbbrowse_dbbrowse.o: $(srcdir)/dbbrowse.cpp
-       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $(srcdir)/dbbrowse.cpp
-
-dbbrowse_doc.o: $(srcdir)/doc.cpp
-       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $(srcdir)/doc.cpp
-
-dbbrowse_pgmctrl.o: $(srcdir)/pgmctrl.cpp
-       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $(srcdir)/pgmctrl.cpp
-
-dbbrowse_tabpgwin.o: $(srcdir)/tabpgwin.cpp
-       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $(srcdir)/tabpgwin.cpp
-
-dbbrowse_browsedb.o: $(srcdir)/browsedb.cpp
-       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $(srcdir)/browsedb.cpp
-
-dbbrowse_dbtree.o: $(srcdir)/dbtree.cpp
-       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $(srcdir)/dbtree.cpp
-
-dbbrowse_dbgrid.o: $(srcdir)/dbgrid.cpp
-       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $(srcdir)/dbgrid.cpp
-
-dbbrowse_dlguser.o: $(srcdir)/dlguser.cpp
-       $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $(srcdir)/dlguser.cpp
-
-dbbrowse_dbbrowse_rc.o: $(srcdir)/dbbrowse.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
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean dbbrowse_bundle data_help_std data_help_png
diff --git a/demos/dbbrowse/bitmaps/col.ico b/demos/dbbrowse/bitmaps/col.ico
deleted file mode 100644 (file)
index 45ac0b7..0000000
Binary files a/demos/dbbrowse/bitmaps/col.ico and /dev/null differ
diff --git a/demos/dbbrowse/bitmaps/col.xpm b/demos/dbbrowse/bitmaps/col.xpm
deleted file mode 100644 (file)
index e3f1157..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char *col_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 4 1",
-"o c Black",
-"X c #FFFFFF",
-". c #808080",
-"  c None",
-/* pixels */
-"                ",
-"................",
-".XXXXXXXoooXXXX.",
-".XXXXXXXoooXXXX.",
-".XXXXXXXoooXXXX.",
-".XXXXXXXoooXXXX.",
-".XXXXXXXoooXXXX.",
-".XXXXXXXoooXXXX.",
-".XXXXXXXoooXXXX.",
-".XXXXXXXoooXXXX.",
-".XXXXXXXoooXXXX.",
-".XXXXXXXoooXXXX.",
-"................",
-"                ",
-"                "
-};
diff --git a/demos/dbbrowse/bitmaps/d_closed.ico b/demos/dbbrowse/bitmaps/d_closed.ico
deleted file mode 100644 (file)
index b7c633c..0000000
Binary files a/demos/dbbrowse/bitmaps/d_closed.ico and /dev/null differ
diff --git a/demos/dbbrowse/bitmaps/d_closed.xpm b/demos/dbbrowse/bitmaps/d_closed.xpm
deleted file mode 100644 (file)
index 0c88399..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * DocClosed_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 4 1",
-/* colors */
-"      s None  c None",
-".     c #000000",
-"&     c #ff0000",
-"+     c #ffffff",
-/* pixels */
-"                ",
-"........        ",
-".++++++..       ",
-".+.+.++.+.      ",
-".++++++....     ",
-".+.+.+++++..    ",
-".+++++++++.&.   ",
-".+.+.+.+.+.&&.  ",
-".+++++++++.&&&. ",
-".+.+.+.+.+.&&&. ",
-".+++++++++.&&.  ",
-".+.+.+.+.+.&.   ",
-".+++++++++..    ",
-"...........     ",
-"                ",
-"                "};
diff --git a/demos/dbbrowse/bitmaps/d_open.ico b/demos/dbbrowse/bitmaps/d_open.ico
deleted file mode 100644 (file)
index 449ccd3..0000000
Binary files a/demos/dbbrowse/bitmaps/d_open.ico and /dev/null differ
diff --git a/demos/dbbrowse/bitmaps/d_open.xpm b/demos/dbbrowse/bitmaps/d_open.xpm
deleted file mode 100644 (file)
index b4af6e5..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * DocOpen_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 4 1",
-/* colors */
-"      s None  c None",
-".     c #000000",
-"&     c #00ff00",
-"+     c #ffffff",
-/* pixels */
-"                ",
-"........        ",
-".++++++..       ",
-".+.+.++.+.      ",
-".++++++....     ",
-".+.+.+++++..    ",
-".+++++++++.&.   ",
-".+.+.+.+.+.&&.  ",
-".+++++++++.&&&. ",
-".+.+.+.+.+.&&&. ",
-".+++++++++.&&.  ",
-".+.+.+.+.+.&.   ",
-".+++++++++..    ",
-"...........     ",
-"                ",
-"                "};
diff --git a/demos/dbbrowse/bitmaps/dsn.ico b/demos/dbbrowse/bitmaps/dsn.ico
deleted file mode 100644 (file)
index 28e5622..0000000
Binary files a/demos/dbbrowse/bitmaps/dsn.ico and /dev/null differ
diff --git a/demos/dbbrowse/bitmaps/dsn.xpm b/demos/dbbrowse/bitmaps/dsn.xpm
deleted file mode 100644 (file)
index a774741..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char *dsn_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 3 1",
-". c Black",
-"X c #FFFFFF",
-"  c None",
-/* pixels */
-"                ",
-"                ",
-"      ..........",
-"    ..XXXXXXX...",
-"  ..XXXXXXX..XX.",
-" ..........XXXX.",
-" .XXXXXXXX.XXXX.",
-" .XXXXXXXX.XXXX.",
-" .XXXXXXXX.XXXX.",
-" .XXXXXXXX.XXXX.",
-" .XXXXXXXX.XXXX.",
-" .XXXXXXXX.XXXX.",
-" .XXXXXXXX.XX.. ",
-" .XXXXXXXX...   ",
-" ..........     ",
-"                "
-};
diff --git a/demos/dbbrowse/bitmaps/dsnclose.ico b/demos/dbbrowse/bitmaps/dsnclose.ico
deleted file mode 100644 (file)
index 7187457..0000000
Binary files a/demos/dbbrowse/bitmaps/dsnclose.ico and /dev/null differ
diff --git a/demos/dbbrowse/bitmaps/dsnclose.xpm b/demos/dbbrowse/bitmaps/dsnclose.xpm
deleted file mode 100644 (file)
index ae052e2..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char *dsnclose_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 4 1",
-"X c Black",
-"o c #FFFFFF",
-"  c None",
-". c #FF0000",
-/* pixels */
-"   .X           ",
-"X. .X.X         ",
-" X...XXXXXXXXXXX",
-".......ooooooXXX",
-"XX...XXooooXXooX",
-" .X.X.XXXXXooooX",
-" Xo.XoooooXooooX",
-" XooooooooXooooX",
-" XooooooooXooooX",
-" XooooooooXooooX",
-" XooooooooXooooX",
-" XooooooooXooooX",
-" XooooooooXooXX ",
-" XooooooooXXX   ",
-" XXXXXXXXXX     ",
-"                "
-};
diff --git a/demos/dbbrowse/bitmaps/dsnopen.ico b/demos/dbbrowse/bitmaps/dsnopen.ico
deleted file mode 100644 (file)
index d9b7630..0000000
Binary files a/demos/dbbrowse/bitmaps/dsnopen.ico and /dev/null differ
diff --git a/demos/dbbrowse/bitmaps/dsnopen.xpm b/demos/dbbrowse/bitmaps/dsnopen.xpm
deleted file mode 100644 (file)
index ee66696..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char *dsnopen_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 4 1",
-"X c Black",
-"o c #FFFFFF",
-"  c None",
-". c #00FF00",
-/* pixels */
-"   .X           ",
-"X. .X.X         ",
-" X...XXXXXXXXXXX",
-".......ooooooXXX",
-"XX...XXooooXXooX",
-" .X.X.XXXXXooooX",
-" Xo.XoooooXooooX",
-" XooooooooXooooX",
-" XooooooooXooooX",
-" XooooooooXooooX",
-" XooooooooXooooX",
-" XooooooooXooooX",
-" XooooooooXooXX ",
-" XooooooooXXX   ",
-" XXXXXXXXXX     ",
-"                "
-};
diff --git a/demos/dbbrowse/bitmaps/f_closed.ico b/demos/dbbrowse/bitmaps/f_closed.ico
deleted file mode 100644 (file)
index 806b900..0000000
Binary files a/demos/dbbrowse/bitmaps/f_closed.ico and /dev/null differ
diff --git a/demos/dbbrowse/bitmaps/f_closed.xpm b/demos/dbbrowse/bitmaps/f_closed.xpm
deleted file mode 100644 (file)
index c0930b4..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-/* XPM */
-static char *FolderClosed_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 112 2",
-"r  c #F7FAFD",
-"%. c #3562AF",
-"=. c #3F6AB2",
-"-  c #4975BE",
-"O. c #A5BDE6",
-"k  c #446EB4",
-"d  c #B9CDEC",
-"5  c #AFC5EA",
-"@  c #6790D4",
-".. c #769CDA",
-"M  c #6787BD",
-"D  c #CDDAF1",
-"F  c #D7E2F5",
-"]  c #99B5E4",
-"%  c #4772B8",
-";. c #476FB3",
-">. c #4C73B5",
-"@. c #5B7FBA",
-"`  c #4F80CF",
-"*. c #3B67B0",
-"O  c #406BB2",
-"N  c #406BB3",
-"R  c #6891D6",
-"j  c #6888BD",
-"(  c #D8E3F5",
-"$  c #3460A9",
-"&  c #4873BA",
-"'  c #5C89D3",
-"-. c #436CB2",
-"u  c #4870B4",
-"[  c #B8CBEC",
-"7  c #C2D3EF",
-"H  c #3C68B1",
-"a  c #A2BBE6",
-"+  c #6E96D8",
-":  c #698FCE",
-"9  c #D4E0F4",
-"t  c #FCFDFE",
-":. c #4971B4",
-"3  c #4E75B6",
-"<  c #6C93D1",
-"6  c #B9CCEC",
-"c  c #C3D4EF",
-"l  c #80A3DD",
-"|  c #4276CC",
-"q  c #E6EDF9",
-"e  c #F0F5FC",
-"#. c #2E5AA6",
-"x  c #A3BCE6",
-"s  c #ADC4E9",
-"B  c #749BDA",
-"1. c #567AB7",
-",  c #6A90D0",
-"#  c #6589C5",
-"G  c #6586BD",
-"8  c #CBD9F1",
-"g  c #D5E1F4",
-"z  c #8DACE0",
-"p  c #97B4E3",
-"   c None",
-"*  c #4A75BC",
-"+. c #C4D5EF",
-"V  c #81A4DD",
-"m  c #ECF2FA",
-"n  c #E7EEF9",
-"Y  c #3966B1",
-"Z  c #A4BDE6",
-"A  c #AEC5E9",
-"o  c #436BAD",
-"T  c #5C88D2",
-"J  c #6690D5",
-"<. c #5277B6",
-")  c #6183BC",
-"f  c #CCDAF1",
-"v  c #D6E2F5",
-"o. c #98B5E3",
-"Q  c #8EADE1",
-" . c #5080CF",
-"=  c #4B76BE",
-"I  c #B6CAEC",
-"S  c #BBCEED",
-"_  c #3563AF",
-"!  c #A5BEE6",
-"/  c #CDDBF2",
-"X. c #8FAEE1",
-"0  c #DFE8F7",
-"$. c #3160AE",
-"}  c #3160AF",
-"4  c #A1BBE5",
-"1  c #6D93D1",
-"{  c #5E81BB",
-"U  c #6385BC",
-"^  c #C4D4EF",
-"2  c #597DBC",
-"K  c #81A3DD",
-"i  c #8BABE0",
-"w  c #ECF1FA",
-"h  c #F1F5FC",
-"&. c #3965B0",
-"X  c #3E69B1",
-"P  c #AEC4E9",
-"~  c #B8CCEC",
-";  c #5C84C6",
-"E  c #759BDA",
-"y  c #6B8ABE",
-"b  c #E0E9F7",
-"C  c #98B4E3",
-".  c #325EA7",
-">  c #6990CE",
-",. c #5076B6",
-"W  c #82A4DD",
-"L  c #8CACE0",
-/* pixels */
-"                                ",
-"                                ",
-"  . X X X o                     ",
-"  O + + + @ #                   ",
-"  $ % & * = - ; : : > , < 1 2   ",
-"  3 4 5 6 7 8 9 0 q w e r t y   ",
-"  u i p a s d 7 f g 0 q w h j   ",
-"  k l z p x 5 6 c f v b n m M   ",
-"  N B V z C Z A S c D F b n G   ",
-"  H J B K L C x P I c f v b U   ",
-"  Y T R E W Q C ! P ~ ^ / ( )   ",
-"  _ ` ' R E W z ] Z P [ ^ / {   ",
-"  } |  .' R ..V X.o.O.P [ +.@.  ",
-"  #.$.%.&.*.=.-.;.:.>.,.<.1.*.  ",
-"                                ",
-"                                "
-};
diff --git a/demos/dbbrowse/bitmaps/f_open.ico b/demos/dbbrowse/bitmaps/f_open.ico
deleted file mode 100644 (file)
index f0f5811..0000000
Binary files a/demos/dbbrowse/bitmaps/f_open.ico and /dev/null differ
diff --git a/demos/dbbrowse/bitmaps/f_open.xpm b/demos/dbbrowse/bitmaps/f_open.xpm
deleted file mode 100644 (file)
index 3603ca3..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-/* XPM */
-static char *FolderOpen_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 57 1",
-"u c #83A5DD",
-"h c #83A5DE",
-"> c #DAE3F2",
-": c #F3F7FC",
-"t c #4A79C6",
-"s c #274E8F",
-"n c #4D71AB",
-"5 c #C2D0E8",
-"9 c #84A6DE",
-"x c #3761A5",
-"p c #ACC3E8",
-"$ c #ACC3E9",
-"= c #D9E4F5",
-"o c #91AFE2",
-"f c #5886D1",
-"2 c #B9CCEC",
-"& c #C3D4EF",
-"; c #EBF1FA",
-"7 c #4270BC",
-"# c #9EB8E5",
-"0 c #ADC4E9",
-"y c #658FD5",
-"  c None",
-"@ c #688DCA",
-"< c #779CDA",
-"r c #2A5498",
-"l c #254A87",
-"g c #6690D5",
-"M c #5778AE",
-"m c #5274AD",
-"a c #D6E2F4",
-", c #4672BA",
-"v c #4168A8",
-"c c #3C64A7",
-". c #416BB2",
-"- c #E3EBF8",
-"z c #305CA3",
-"X c #446CAE",
-"O c #5882C8",
-"N c #5D7DB0",
-"3 c #C3D3EF",
-"b c #476DAA",
-"k c #ADC3E9",
-"e c #E4ECF8",
-"d c #4576C7",
-"q c #C4D4EF",
-"* c #CEDCF2",
-"i c #90AFE1",
-"4 c #ECF1FA",
-"B c #4D72AE",
-"% c #B8CCEC",
-"8 c #759BDA",
-"+ c #617FB1",
-"1 c #9DB8E4",
-"j c #9DB8E5",
-"6 c #3762AA",
-"w c #CFDDF2",
-/* pixels */
-"                ",
-"                ",
-" ....           ",
-" Xooo.          ",
-" Xoooo.......   ",
-" Xoooooooooo.   ",
-" XoOOOOOOOOOOO+ ",
-" Xo@#$%&*=-;:>+ ",
-" X,<o1$23*=-45+ ",
-" 6789o#02qw=e+  ",
-" rty8ui#p%&*a+  ",
-" sdfg8hojk2&+   ",
-" lzxcvbnmMN+B   ",
-"                ",
-"                "
-};
diff --git a/demos/dbbrowse/bitmaps/key.ico b/demos/dbbrowse/bitmaps/key.ico
deleted file mode 100644 (file)
index b8ab347..0000000
Binary files a/demos/dbbrowse/bitmaps/key.ico and /dev/null differ
diff --git a/demos/dbbrowse/bitmaps/key.xpm b/demos/dbbrowse/bitmaps/key.xpm
deleted file mode 100644 (file)
index 5821784..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char *key_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 11 1",
-"O c Black",
-". c #C0C000",
-"+ c #363636",
-"# c #A0A0A0",
-"  c None",
-"% c #404040",
-"& c #757575",
-"o c #C0C0C0",
-"X c #808000",
-"$ c #606060",
-"@ c #959595",
-/* pixels */
-"   .XX          ",
-" .....XX        ",
-" ..   .X        ",
-"..     .X       ",
-"..     .X       ",
-"..     .X       ",
-" ..   ..        ",
-" .....XX        ",
-"   ..X  oOOOO+  ",
-"   .X   oO@o#O$ ",
-"   ..X  oOo  %% ",
-"   .X   oO@o#O& ",
-"   ..X  oOOOO$  ",
-"   .X.  oOo     ",
-"   ..X  oOo     ",
-"   .    oOo     "
-};
diff --git a/demos/dbbrowse/bitmaps/keyf.ico b/demos/dbbrowse/bitmaps/keyf.ico
deleted file mode 100644 (file)
index 230cf30..0000000
Binary files a/demos/dbbrowse/bitmaps/keyf.ico and /dev/null differ
diff --git a/demos/dbbrowse/bitmaps/keyf.xpm b/demos/dbbrowse/bitmaps/keyf.xpm
deleted file mode 100644 (file)
index aba5f46..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char *keyf_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 12 1",
-"O c Black",
-"& c #808080",
-". c #C0C000",
-"$ c #6B6B6B",
-"* c #A0A0A0",
-"  c None",
-"# c #404040",
-"o c #C0C0C0",
-"@ c #2B2B2B",
-"X c #808000",
-"% c #606060",
-"+ c #959595",
-/* pixels */
-"   .XX          ",
-" .....XX        ",
-" ..   .X        ",
-"..     .X       ",
-"..     .X       ",
-"..     .X       ",
-" ..   ..        ",
-" .....XX        ",
-"   ..X   oOOOOO ",
-"   .X    oO+ooo ",
-"   ..X   oOo    ",
-"   .X    oO@##$ ",
-"   ..X   oO%&&* ",
-"   .X.   oOo    ",
-"   ..X   oOo    ",
-"   .     oOo    "
-};
diff --git a/demos/dbbrowse/bitmaps/logo.ico b/demos/dbbrowse/bitmaps/logo.ico
deleted file mode 100644 (file)
index b8135c4..0000000
Binary files a/demos/dbbrowse/bitmaps/logo.ico and /dev/null differ
diff --git a/demos/dbbrowse/bitmaps/logo.xpm b/demos/dbbrowse/bitmaps/logo.xpm
deleted file mode 100644 (file)
index ad94656..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/* XPM */\r
-static char *aLogo_xpm[] = {\r
-/* columns rows colors chars-per-pixel */\r
-"16 16 44 1",\r
-"  c Black",\r
-"p c #D9D9D9",\r
-"1 c #878787",\r
-"e c #B4B4B4",\r
-", c #FFFFFF",\r
-"y c #6A6A6A",\r
-"& c #797979",\r
-"t c #C4C4C4",\r
-"2 c #CCCCCC",\r
-"8 c #898989",\r
-"+ c #989898",\r
-"> c #A7A7A7",\r
-"g c #C5C5C5",\r
-"h c #191919",\r
-"= c #737373",\r
-"6 c #919191",\r
-"< c #A0A0A0",\r
-"f c #CDCDCD",\r
-"q c #DCDCDC",\r
-"% c #7B7B7B",\r
-"d c #C6C6C6",\r
-". c None",\r
-"- c #838383",\r
-"a c #929292",\r
-"r c #B0B0B0",\r
-"@ c #BFBFBF",\r
-"9 c #7C7C7C",\r
-"* c #9A9A9A",\r
-"O c #B8B8B8",\r
-"$ c #C7C7C7",\r
-"i c #FF0000",\r
-"X c #C0C0C0",\r
-"# c #CFCFCF",\r
-"s c #323232",\r
-"0 c #B9B9B9",\r
-"5 c #949494",\r
-"4 c #C1C1C1",\r
-"; c #D0D0D0",\r
-"w c #6F6F6F",\r
-": c #7E7E7E",\r
-"u c #868686",\r
-"7 c #A4A4A4",\r
-"o c #D1D1D1",\r
-"3 c #7F7F7F",\r
-/* pixels */\r
-"            ....",\r
-" XXoO++@#XX ....",\r
-" X$%&**=-$X ....",\r
-" ;:>,,,,<12 ....",\r
-" @3,,,,,,=4 ....",\r
-" 5<,,,,,,67 ....",\r
-" 5<,,,,,,67 ....",\r
-" @8,,,,,,90 ....",\r
-" qwe,,,,r=o ....",\r
-" Xty7,,uii2 ....",\r
-" XXp0a&riiis....",\r
-" XXXdffggiii....",\r
-"         hiii...",\r
-"...........iii..",\r
-"............ii..",\r
-"................"\r
-};\r
diff --git a/demos/dbbrowse/bitmaps/pgmctrl.bmp b/demos/dbbrowse/bitmaps/pgmctrl.bmp
deleted file mode 100644 (file)
index 852c8e0..0000000
Binary files a/demos/dbbrowse/bitmaps/pgmctrl.bmp and /dev/null differ
diff --git a/demos/dbbrowse/bitmaps/pgmctrl.ico b/demos/dbbrowse/bitmaps/pgmctrl.ico
deleted file mode 100644 (file)
index dc8b6f7..0000000
Binary files a/demos/dbbrowse/bitmaps/pgmctrl.ico and /dev/null differ
diff --git a/demos/dbbrowse/bitmaps/pgmctrl.xpm b/demos/dbbrowse/bitmaps/pgmctrl.xpm
deleted file mode 100644 (file)
index a112b8f..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char *pgmctrl_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 4 1",
-". c #FFFFFF",
-"  c None",
-"o c #FF0000",
-"X c #0000FF",
-/* pixels */
-"                ",
-"     .......... ",
-"     .XXXXXXXX. ",
-"     .XXXXXXXX. ",
-"     .XXXXXXXX. ",
-" ............X. ",
-" .oooooooooo.X. ",
-" .oooooooooo... ",
-" .oooooooooo.   ",
-" .oooooooooo.   ",
-" .oooooooooo.   ",
-" .oooooooooo.   ",
-" .oooooooooo.   ",
-" .oooooooooo.   ",
-" ............   ",
-"                "
-};
diff --git a/demos/dbbrowse/bitmaps/tab.ico b/demos/dbbrowse/bitmaps/tab.ico
deleted file mode 100644 (file)
index bd46b6f..0000000
Binary files a/demos/dbbrowse/bitmaps/tab.ico and /dev/null differ
diff --git a/demos/dbbrowse/bitmaps/tab.xpm b/demos/dbbrowse/bitmaps/tab.xpm
deleted file mode 100644 (file)
index d838677..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char *tab_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 5 1",
-". c Black",
-"O c #FFFFFF",
-"o c #808080",
-"  c None",
-"X c #C0C0C0",
-/* pixels */
-"                ",
-"                ",
-"................",
-".XXoXXoXXoXXoXX.",
-".XXoXXoXXoXXoXX.",
-".oooooooooooooo.",
-".OOoOOoOOoOOoOO.",
-".OOoOOoOOoOOoOO.",
-".OOoOOoOOoOOoOO.",
-".oooooooooooooo.",
-".OOoOOoOOoOOoOO.",
-".OOoOOoOOoOOoOO.",
-".OOoOOoOOoOOoOO.",
-"................",
-"                ",
-"                "
-};
diff --git a/demos/dbbrowse/bitmaps/view.ico b/demos/dbbrowse/bitmaps/view.ico
deleted file mode 100644 (file)
index e2d2ef6..0000000
Binary files a/demos/dbbrowse/bitmaps/view.ico and /dev/null differ
diff --git a/demos/dbbrowse/bitmaps/view.xpm b/demos/dbbrowse/bitmaps/view.xpm
deleted file mode 100644 (file)
index b74d652..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char *view_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 15 5 1",
-"  c Black",
-"O c #FFFFFF",
-"o c #808080",
-". c None",
-"X c #C0C0C0",
-/* pixels */
-"              ..",
-" XXoXXoXXoXXo ..",
-" XXoXXoXXoXXo ..",
-" o             .",
-" O XXoXXoXXoXX .",
-" O XXoXXoXXoXX .",
-" O ooooooooooo .",
-" o OOoOOoOOoOO .",
-" O OOoOOoOOoOO .",
-" O OOoOOoOOoOO .",
-" O ooooooooooo .",
-"   OOoOOoOOoOO .",
-".. OOoOOoOOoOO .",
-".. OOoOOoOOoOO .",
-"..             ."
-};
diff --git a/demos/dbbrowse/browsedb.cpp b/demos/dbbrowse/browsedb.cpp
deleted file mode 100644 (file)
index c316d4c..0000000
+++ /dev/null
@@ -1,497 +0,0 @@
-//----------------------------------------------------------------------------------------
-// Name:        BrowserDB.h,cpp
-// Purpose:     a wxDB class
-// Author:      Mark Johnson
-// Modified by:
-// Created:     19991127.mj10777
-// Copyright:   (c) Mark Johnson
-// Licence:     wxWindows license
-// RCS-ID:      $Id$
-//----------------------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-//----------------------------------------------------------------------------------------
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-//----------------------------------------------------------------------------------------
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-//----------------------------------------------------------------------------------------
-#include "std.h"
-//----------------------------------------------------------------------------------------
-// Global structure for holding ODBC connection information
-wxDbConnectInf DbConnectInf;
-
-#if !wxUSE_ODBC
-  #error Demo cannot be compiled unless setup.h has wxUSE_ODBC set to 1
-#endif
-
-//----------------------------------------------------------------------------------------
-extern WXDLLEXPORT_DATA(wxDbList*) PtrBegDbList;    /* from db.cpp, used in getting back error results from db connections */
-
-//----------------------------------------------------------------------------------------
-wxChar *GetExtendedDBErrorMsg(wxChar *ErrFile, int ErrLine)
-{
-    static wxString msg;
-    wxString tStr;
-    if (ErrFile || ErrLine)
-    {
-        msg += _T("File: ");
-        msg += ErrFile;
-        msg += _T("   Line: ");
-        tStr.Printf(_T("%d"),ErrLine);
-        msg += tStr.GetData();
-        // msg += _T("\n");
-    }
-    msg.Append (_T("\nODBC errors:\n"));
-    // msg += _T("\n");
-    /* Scan through each database connection displaying
-    * any ODBC errors that have occurred. */
-    wxDbList *pDbList;
-    for (pDbList = PtrBegDbList; pDbList; pDbList = pDbList->PtrNext)
-    {
-        // Skip over any free connections
-        if (pDbList->Free)
-            continue;
-        // Display errors for this connection
-        for (int i = 0; i < DB_MAX_ERROR_HISTORY; i++)
-        {
-            if (pDbList->PtrDb->errorList[i])
-            {
-                msg.Append(pDbList->PtrDb->errorList[i]);
-                if (wxStrcmp(pDbList->PtrDb->errorList[i],wxEmptyString) != 0)
-                    msg.Append(_T("\n"));
-            }
-        }
-    }
-    msg += _T("\n");
-    return (wxChar*) (const wxChar*) msg;
-}  // GetExtendedDBErrorMsg
-
-//----------------------------------------------------------------------------------------
-BrowserDB::BrowserDB()
-{
-    PointerToNULL(0);
-    ODBCSource = wxEmptyString;  // ODBC data source name (created with ODBC Administrator under Win95/NT)
-    UserName   = wxEmptyString;  // database username - must already exist in the data source
-    Password   = wxEmptyString;  // password database username
-    OnFillSqlTyp();
-    OnFilldbTyp();
-}  // BrowserDB Constructor
-
-//----------------------------------------------------------------------------------------
-BrowserDB::~BrowserDB()
-{
-    PointerToNULL(1);  // Clean up Tables and Databases (Commit, Close and delete)
-}  // BrowserDB destructor
-
-//----------------------------------------------------------------------------------------
-bool BrowserDB::Initialize(int Quiet)
-{
-    if (!OnStartDB(Quiet))
-    {
-        wxLogMessage(_("\n\n-E-> BrowserDB::OnStartDB(%s) : Failed ! "),ODBCSource.c_str());
-        return false;
-    }
-    return true;
-}  // BrowserDB:Initialize
-
-//----------------------------------------------------------------------------------------
-bool BrowserDB::OnStartDB(int Quiet)
-{
-    wxStopWatch sw;
-    if (!Quiet)
-        wxLogMessage(_("\n-I-> BrowserDB::OnStartDB(%s) : Begin "),ODBCSource.c_str());
-    if (db_BrowserDB != NULL)
-    {
-        if (!Quiet)
-            wxLogMessage(_("\n-I-> BrowserDB::OnStartDB() : DB is already open."));
-        return true;
-    }
-
-    DbConnectInf.AllocHenv();
-
-    //---------------------------------------------------------------------------------------
-    // Connect to datasource
-    //---------------------------------------------------------------------------------------
-    DlgUser *p_Dlg;
-    p_Dlg = new DlgUser(pDoc->p_MainFrame,pDoc,wxEmptyString);
-    p_Dlg->s_DSN      = ODBCSource;
-    p_Dlg->s_User     = UserName;
-    p_Dlg->s_Password = Password;
-    p_Dlg->OnInit();
-    p_Dlg->Fit();
-
-    bool OK = false;
-    if (p_Dlg->ShowModal() == wxID_OK)
-    {
-        (pDoc->p_DSN+i_Which)->Usr = p_Dlg->s_User;
-        (pDoc->p_DSN+i_Which)->Pas = p_Dlg->s_Password;
-        UserName  = p_Dlg->s_User;
-        Password  = p_Dlg->s_Password;
-        OK = true;
-    }
-    delete p_Dlg;
-    if (OK)
-    {
-        //--------------------------------------------------------------------------------------
-        DbConnectInf.SetDsn(ODBCSource);         // ODBC data source name (created with ODBC Administrator under Win95/NT)
-        DbConnectInf.SetUserID(UserName);        // database username - must already exist in the data source
-        DbConnectInf.SetPassword(Password);      // password database username
-        db_BrowserDB = wxDbGetConnection(&DbConnectInf);
-        // wxLogMessage(">>>%s<<<>>>%s<<<",UserName.c_str(),Password.c_str());
-        if (db_BrowserDB == NULL)
-        {
-            DbConnectInf.SetDsn(wxEmptyString);
-            DbConnectInf.SetUserID(wxEmptyString);
-            DbConnectInf.SetPassword(wxEmptyString);
-            if (!Quiet)
-            {
-                wxLogMessage(_("\n-E-> BrowserDB::OnConnectDataSource() DB CONNECTION ERROR : Unable to connect to the data source.\n\nCheck the name of your data source to verify it has been correctly entered/spelled.\n\nWith some databases, the user name and password must\nbe created with full rights to the table prior to making a connection\n(using tools provided by the database manufacturer)"));
-                wxLogMessage(_("-I-> BrowserDB::OnStartDB(%s) : End - Time needed : %ld ms"),ODBCSource.c_str(),sw.Time());
-            }
-            DbConnectInf.FreeHenv();
-            return false;
-        }
-        //--------------------------------------------------------------------------------------
-        if (!Quiet)
-        {
-            Temp1 = db_BrowserDB->GetDatabaseName();
-            Temp2 = db_BrowserDB->GetDataSource();
-            wxLogMessage(_("-I-> BrowserDB::OnGetDataSourceODBC() - DatabaseName(%s) ; DataSource(%s)"),Temp1.c_str(),Temp2.c_str());
-            wxLogMessage(_("-I-> BrowserDB::OnStartDB(%s) : End - Time needed : %ld ms"),ODBCSource.c_str(),sw.Time());
-        }
-        return true;
-    }
-    else
-    {
-        DbConnectInf.FreeHenv();
-        return false;
-    }
-}
-
-//----------------------------------------------------------------------------------------
-bool BrowserDB::OnCloseDB(int Quiet)
-{
-    if (!Quiet)
-        wxLogMessage(_("-I-> BrowserDB::OnCloseDB() : Begin "));
-    if (db_BrowserDB)
-    {
-//        db_BrowserDB->Close();
-        wxDbFreeConnection(db_BrowserDB);
-
-        DbConnectInf.FreeHenv();
-
-        db_BrowserDB = NULL;
-    }
-    if (!Quiet)
-        wxLogMessage(_("\n-I-> BrowserDB::OnCloseDB() : End "));
-    return true;
-}
-
-//----------------------------------------------------------------------------------------
-bool BrowserDB::OnGetNext(int Cols,int WXUNUSED(Quiet))
-{
-    SDWORD cb;
-    int i_dbDataType;
-    wxChar s_temp[1024+1];
-    long l_temp;
-    double f_temp;
-    int AnzError=0;
-    TIMESTAMP_STRUCT t_temp;
-    wxString Temp0;
-    //-----------------------------
-    if (!db_BrowserDB->GetNext())
-    {
-#ifdef __WXDEBUG__
-        Temp0.Printf(_("\n-E-> BrowserDB::OnGetNext - ODBC-Error with GetNext \n-E-> "));
-        Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
-        wxLogMessage(Temp0);
-        wxMessageBox(Temp0);
-#endif
-        return false;
-    }
-    else
-    {
-        int i;
-        for (i=0;i<Cols;i++)
-        {
-            wxStrcpy((cl_BrowserDB+i)->tableName,_T("-E->"));
-            i_dbDataType = (cl_BrowserDB+i)->pColFor->i_dbDataType;
-            if (i_dbDataType == 0)         // Filter unsupported dbDataTypes
-            {
-                if (((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_VARCHAR) ||
-                          ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_LONGVARCHAR))
-                    i_dbDataType = DB_DATA_TYPE_VARCHAR;
-                if ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_C_DATE)
-                    i_dbDataType = DB_DATA_TYPE_DATE;
-                if ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_C_BIT)
-                    i_dbDataType = DB_DATA_TYPE_INTEGER;
-                if ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_NUMERIC)
-                    i_dbDataType = DB_DATA_TYPE_VARCHAR;
-                if ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_REAL)
-                    i_dbDataType = DB_DATA_TYPE_FLOAT;
-            }
-            if ((i_dbDataType == DB_DATA_TYPE_INTEGER) &&
-                     ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_C_DOUBLE))
-            {    // DBASE Numeric
-                i_dbDataType = DB_DATA_TYPE_FLOAT;
-            }
-            switch(i_dbDataType)
-            {
-            case DB_DATA_TYPE_VARCHAR:
-                wxStrcpy(s_temp,wxEmptyString);
-                if (!db_BrowserDB->GetData((UWORD)(i+1),(SWORD)((cl_BrowserDB+i)->pColFor->i_dbDataType),&s_temp[0],sizeof(s_temp), &cb))
-                {
-                    Temp0.Printf(_("\n-E-> BrowserDB::OnGetNext - ODBC-Error with GetNext of >%s<.\n-E-> "),(cl_BrowserDB+i)->tableName);
-                    Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
-                    wxLogMessage(Temp0);
-                }
-                Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,s_temp);
-                wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
-                break;
-            case DB_DATA_TYPE_INTEGER:
-                l_temp = 0;
-                if (!db_BrowserDB->GetData((UWORD)(i+1),(SWORD)((cl_BrowserDB+i)->pColFor->i_sqlDataType),&l_temp,sizeof(l_temp), &cb))
-                {
-                    Temp0.Printf(_("\n-E-> BrowserDB::OnGetData - ODBC-Error with GetNext \n-E-> "));
-                    Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
-                }
-                else
-                {
-                    Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,l_temp);
-                    wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
-                }
-                break;
-            case DB_DATA_TYPE_FLOAT:
-                f_temp = 0;
-                if (!db_BrowserDB->GetData((UWORD)(i+1),(SWORD)((cl_BrowserDB+i)->pColFor->i_sqlDataType),&f_temp,sizeof(f_temp), &cb))
-                {
-                    Temp0.Printf(_("\n-E-> BrowserDB::OnGetData - ODBC-Error with GetNext \n-E-> "));
-                    Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
-                    wxMessageBox(Temp0);
-                }
-                else
-                {
-                    Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,f_temp);
-                    wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
-                }
-                break;
-            case DB_DATA_TYPE_DATE:
-                t_temp.day = 0;
-                t_temp.month = 0;
-                t_temp.year = 0;
-                t_temp.hour = 0;
-                t_temp.minute = 0;
-                t_temp.second = 0;
-                t_temp.fraction = 0;
-                if (!db_BrowserDB->GetData((UWORD)(i+1),(SWORD)((cl_BrowserDB+i)->pColFor->i_sqlDataType),&t_temp,sizeof(t_temp), &cb))
-                {
-                    Temp0.Printf(_("\n-E-> BrowserDB::OnGetData - ODBC-Error with GetNext \n-E-> "));
-                    Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
-                }
-                else
-                {
-                    // i_Nation =  0 = timestamp , 1=EU, 2=UK, 3=International, 4=US
-                    if (((cl_BrowserDB+i)->pColFor->i_Nation == 0)    ||    // TS  YYYY-MM-DD
-                        ((cl_BrowserDB+i)->pColFor->i_Nation == 3))     // IT  YYYY-MM-DD
-                    {
-                        Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,t_temp.year,t_temp.month,t_temp.day,
-                            t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);
-                        wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
-                    }
-                    if (((cl_BrowserDB+i)->pColFor->i_Nation == 1) ||  // EU  DD.MM.YYYY
-                        ((cl_BrowserDB+i)->pColFor->i_Nation == 2))   // UK  DD/MM/YYYY
-                    {
-                        Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,t_temp.day,t_temp.month,t_temp.year,
-                            t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);
-                        wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
-                    }
-                    if ((cl_BrowserDB+i)->pColFor->i_Nation == 3)    // US  MM/DD/YYYY
-                    {
-                        Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,t_temp.month,t_temp.day,t_temp.year,
-                            t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);
-                        wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
-                    }
-                }
-                break;
-            default:
-                AnzError++;
-                if (AnzError <= 100)
-                {
-                    Temp0 = (cl_BrowserDB+i)->colName;
-                    wxLogMessage(_("-E-> BrowserDB::OnGetNext - DB_DATA_TYPE_?? (%d) in Col(%s)"),(cl_BrowserDB+i)->pColFor->i_dbDataType,Temp0.c_str());
-                }
-                else
-                    return true;
-                Temp0.Printf(_("-E-> unknown Format(%d) - sql(%d)"),(cl_BrowserDB+i)->pColFor->i_dbDataType,(cl_BrowserDB+i)->pColFor->i_sqlDataType);
-                wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
-                break;
-            };  // switch
-        }  // for
-    }  // else
-
-    return true;
-}
-
-//----------------------------------------------------------------------------------------
-bool BrowserDB::OnSelect(wxString tb_Name, int Quiet)
-{
-    wxStopWatch sw;
-    wxString SQLStmt;
-    i_Records = 0;
-    //---------------------------------------------------------------------------------------
-    wxString tablename = db_BrowserDB->SQLTableName(tb_Name.c_str());
-    SQLStmt.sprintf(_T("SELECT * FROM %s"),tablename.c_str());
-    if (!db_BrowserDB->ExecSql((wxChar *)(SQLStmt.GetData())))
-    {
-        Temp0.Printf(_("\n-E-> BrowserDB::OnSelect - ODBC-Error with ExecSql of >%s<.\n-E-> "),tb_Name.c_str());
-        Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
-        wxLogMessage(Temp0);
-        wxMessageBox(_T("-E-> BrowserDB::OnSelect - GetData()"));
-        return false;
-    }
-    //---------------------------------------------------------------------------------------
-    while (db_BrowserDB->GetNext())
-    {
-        i_Records++;
-    }
-    //---------------------------------------------------------------------------------------
-    if (!db_BrowserDB->ExecSql((wxChar *)(SQLStmt.GetData())))
-    {
-        Temp0.Printf(_("\n-E-> BrowserDB::OnSelect - ODBC-Error with ExecSql of >%s<.\n-E-> "),tb_Name.c_str());
-        Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
-        wxLogMessage(Temp0);
-        return false;
-    }
-    //---------------------------------------------------------------------------------------
-    // SetColDefs ( 0, "NAME", DB_DATA_TYPE_VARCHAR, Name, SQL_C_WXCHAR, sizeof(Name), true, true);  // Primary index
-    //---------------------------------------------------------------------------------------
-    if (!Quiet)
-    {
-        wxLogMessage(_("\n-I-> BrowserDB::OnSelect(%s) Records(%d): End - Time needed : %ld ms"),tb_Name.c_str(),i_Records,sw.Time());
-    }
-    return true;
-}
-
-//----------------------------------------------------------------------------------------
-bool BrowserDB::OnExecSql(wxString SQLStmt, int Quiet)
-{
-    //---------------------------------------------------------------------------------------
-    if (!db_BrowserDB->ExecSql((wxChar *)(SQLStmt.GetData())))
-    {
-        Temp0.Printf(_("\n-E-> BrowserDB::OnExecSQL - ODBC-Error with ExecSql of >%s<.\n-E-> "),SQLStmt.c_str());
-        Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
-        if (!Quiet)
-            wxLogMessage(Temp0);
-        else
-            wxMessageBox(_T("-E-> BrowserDB::OnExecSql - ExecSql()"));
-        return false;
-    }
-    if (!Quiet)
-    {
-        // wxLogMessage(_("\n-I-> BrowserDB::OnExecSql(%s) - End - Time needed : %ld ms"),SQLStmt.c_str(),sw.Time());
-    }
-    return true;
-}
-
-//----------------------------------------------------------------------------------------
-wxDbInf* BrowserDB::OnGetCatalog(int WXUNUSED(Quiet))
-{
-    wxChar UName[255];
-    wxStrcpy(UName,UserName);
-    ct_BrowserDB = db_BrowserDB->GetCatalog(UName);
-    return ct_BrowserDB;
-}
-
-//----------------------------------------------------------------------------------------
-wxDbColInf* BrowserDB::OnGetColumns(wxChar *tableName, UWORD numCols, int WXUNUSED(Quiet))
-{
-    wxChar UName[255];
-    int i;
-    wxStrcpy(UName,UserName);
-    cl_BrowserDB = db_BrowserDB->GetColumns(tableName,&numCols,UName);
-//    cl_BrowserDB->pColFor = new wxDbColFor[numCols];
-    for (i=0;i<numCols;i++)
-    {
-//        (cl_BrowserDB->pColFor+i)->Format(1,(cl_BrowserDB+i)->dbDataType,(cl_BrowserDB+i)->sqlDataType,
-//            (cl_BrowserDB+i)->columnSize, (cl_BrowserDB+i)->decimalDigits);
-        (cl_BrowserDB+i)->pColFor = new wxDbColFor;
-        (cl_BrowserDB+i)->pColFor->Format(1,
-                                        (cl_BrowserDB+i)->dbDataType,
-                                        (cl_BrowserDB+i)->sqlDataType,
-                                        (cl_BrowserDB+i)->columnLength,
-                                        (cl_BrowserDB+i)->decimalDigits);
-    }
-    return cl_BrowserDB;
-}
-
-//----------------------------------------------------------------------------------------
-void BrowserDB::PointerToNULL(int Art)
-{
-    if (Art == 1) // Löschen
-    {
-        if (cl_BrowserDB != NULL)
-        { // Destroy the memory
-            delete [] cl_BrowserDB;
-        }
-        if (ct_BrowserDB != NULL)
-        { // Destroy the memory
-            delete [] ct_BrowserDB;
-        }
-        if (db_BrowserDB != NULL)
-        {
-            db_BrowserDB->CommitTrans();
-            db_BrowserDB->Close();
-            wxDbCloseConnections();
-            delete db_BrowserDB;
-        }
-    }
-    cl_BrowserDB       = NULL;
-    ct_BrowserDB       = NULL;
-    db_BrowserDB       = NULL;
-    p_LogWindow        = NULL;
-}
-
-//----------------------------------------------------------------------------------------
-void BrowserDB::OnFillSqlTyp()
-{
-    i_SqlTyp[1]  = SQL_C_BINARY;    s_SqlTyp[1]  = _T("SQL_C_BINARY");
-    i_SqlTyp[2]  = SQL_C_BIT;       s_SqlTyp[2]  = _T("SQL_C_BIT");
-    i_SqlTyp[3]  = SQL_C_BOOKMARK;  s_SqlTyp[3]  = _T("SQL_C_BOOKMARK");
-    i_SqlTyp[4]  = SQL_C_WXCHAR;    s_SqlTyp[4]  = _T("SQL_C_WXCHAR");
-    i_SqlTyp[5]  = SQL_C_DATE;      s_SqlTyp[5]  = _T("SQL_C_DATE");
-    i_SqlTyp[6]  = SQL_C_DEFAULT;   s_SqlTyp[6]  = _T("SQL_C_DEFAULT");
-    i_SqlTyp[7]  = SQL_C_DOUBLE;    s_SqlTyp[7]  = _T("SQL_C_DOUBLE");
-    i_SqlTyp[8]  = SQL_C_FLOAT;     s_SqlTyp[8]  = _T("SQL_C_FLOAT");
-    i_SqlTyp[9]  = SQL_C_LONG;      s_SqlTyp[9]  = _T("SQL_C_LONG");
-    i_SqlTyp[10] = SQL_C_SHORT;     s_SqlTyp[10] = _T("SQL_C_SHORT");
-    i_SqlTyp[11] = SQL_C_SLONG;     s_SqlTyp[11] = _T("SQL_C_SLONG");
-    i_SqlTyp[12] = SQL_C_SSHORT;    s_SqlTyp[12] = _T("SQL_C_SSHORT");
-    i_SqlTyp[13] = SQL_C_STINYINT;  s_SqlTyp[13] = _T("SQL_C_STINYINT");
-    i_SqlTyp[14] = SQL_C_TIME;      s_SqlTyp[14] = _T("SQL_C_TIME");
-    i_SqlTyp[15] = SQL_C_TIMESTAMP; s_SqlTyp[15] = _T("SQL_C_TIMESTAMP");
-    i_SqlTyp[16] = SQL_C_TINYINT;   s_SqlTyp[16] = _T("SQL_C_TINYINT");
-    i_SqlTyp[17] = SQL_C_ULONG;     s_SqlTyp[17] = _T("SQL_C_ULONG");
-    i_SqlTyp[18] = SQL_C_USHORT;    s_SqlTyp[18] = _T("SQL_C_USHORT");
-    i_SqlTyp[19] = SQL_C_UTINYINT;  s_SqlTyp[19] = _T("SQL_C_UTINYINT");
-    i_SqlTyp[20] = SQL_VARCHAR;     s_SqlTyp[20] = _T("SQL_VARCHAR");
-    i_SqlTyp[21] = SQL_NUMERIC;     s_SqlTyp[21] = _T("SQL_NUMERIC");
-    i_SqlTyp[22] = SQL_LONGVARCHAR; s_SqlTyp[22] = _T("SQL_LONGVARCHAR");
-    i_SqlTyp[23] = SQL_REAL;        s_SqlTyp[23] = _T("SQL_REAL");
-    i_SqlTyp[0]  = 23;              s_SqlTyp[0]  = wxEmptyString;
-}
-
-//----------------------------------------------------------------------------------------
-void BrowserDB::OnFilldbTyp()
-{
-    i_dbTyp[1] = DB_DATA_TYPE_VARCHAR; s_dbTyp[1] = _T("DB_DATA_TYPE_VARCHAR");
-    i_dbTyp[2] = DB_DATA_TYPE_INTEGER; s_dbTyp[2] = _T("DB_DATA_TYPE_INTEGER");
-    i_dbTyp[3] = DB_DATA_TYPE_FLOAT;   s_dbTyp[3] = _T("DB_DATA_TYPE_FLOAT");
-    i_dbTyp[4] = DB_DATA_TYPE_DATE;    s_dbTyp[4] = _T("DB_DATA_TYPE_DATE");
-    i_dbTyp[0] = 4;                    s_dbTyp[0] = wxEmptyString;
-}
-//----------------------------------------------------------------------------------------
diff --git a/demos/dbbrowse/browsedb.h b/demos/dbbrowse/browsedb.h
deleted file mode 100644 (file)
index 5abeb8e..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-//----------------------------------------------------------------------------------------
-// Name:        browsedb.h
-// Purpose:     a wxDb class
-// Author:      Mark Johnson
-// Modified by:
-// Created:     19991127.mj10777
-// Copyright:   (c) Mark Johnson
-// Licence:     wxWindows license
-// RCS-ID:      $Id$
-//----------------------------------------------------------------------------------------
-//-- Zu tun in browsedb.h
-//----------------------------------------------------------------------------------------
-//-- 1)
-//----------------------------------------------------------------------------------------
-// Global structure for holding ODBC connection information
-//----------------------------------------------------------------------------------------
-//extern wxDbConnectInf DbConnectInf;
-class MainDoc;
-
-//----------------------------------------------------------------------------------------
-class BrowserDB
-{
-public:
-    //---------------------------------------------------------------------------------------
-    // Pointer to the main database connection used in the program.  This
-    // pointer would normally be used for doing things as database lookups
-    // for user login names and passwords, getting workstation settings, etc.
-    // ---> IMPORTANT <---
-    //
-    //  For each database object created which uses this wxDb pointer
-    //    connection to the database, when a CommitTrans() or RollBackTrans()
-    //    will commit or rollback EVERY object which uses this wxDb pointer.
-    //
-    //    To allow each table object (those derived from wxDbTable) to be
-    //    individually committed or rolled back, you MUST use a different
-    //    instance of wxDb in the constructor of the table.  Doing so creates
-    //  more overhead, and will use more database connections (some DBs have
-    //    connection limits...), so use connections sparringly.
-    //
-    //  It is recommended that one "main" database connection be created for
-    //  the entire program to use for READ-ONLY database accesses, but for each
-    //  table object which will do a CommitTrans() or RollbackTrans() that a
-    // new wxDb object be created and used for it.
-    //---------------------------------------------------------------------------------------
-    wxDb*          db_BrowserDB;
-    wxDbInf*       ct_BrowserDB;
-    wxDbColInf*    cl_BrowserDB;
-    wxString       ODBCSource, UserName, Password;
-    MainDoc *pDoc;
-    //---------------------------------------------------------------------------------------
-    wxString       Temp0, Temp1, Temp2, Temp3, Temp4, Temp5;
-    wxString       ODBCText;
-    wxTextCtrl*    p_LogWindow;
-    wxString       s_SqlTyp[25];
-    int            i_SqlTyp[25];
-    wxString       s_dbTyp[5];
-    int            i_dbTyp[5];
-    int            i_Which;
-    int            i_Records;
-    int            i_Cols;
-    //---------------------------------------------------------------------------------------
-    BrowserDB();
-    ~BrowserDB();
-    void PointerToNULL(int Art);
-    bool Initialize(int Quiet);
-    //---------------------------------------------------------------------------------------
-    bool           OnStartDB(int Quiet);
-    bool           OnCloseDB(int Quiet);
-    bool           OnSelect(wxString tb_Name,int Quiet);
-    bool           OnExecSql(wxString SQLStmt,int Quiet);
-    bool           OnGetNext(int Cols,int Quiet);
-    wxDbInf*       OnGetCatalog(int Quiet);
-    wxDbColInf*    OnGetColumns(wxChar *tableName, UWORD numCols,int Quiet);
-    void           OnFillSqlTyp();
-    void           OnFilldbTyp();
-    //---------------------------------------------------------------------------------------
-};  // BrowserDB class definition
-    //----------------------------------------------------------------------------------------
diff --git a/demos/dbbrowse/dbbrowse.bkl b/demos/dbbrowse/dbbrowse.bkl
deleted file mode 100644 (file)
index e2bd82d..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-
-    <include file="../../build/bakefiles/common_samples.bkl"/>
-
-    <exe id="dbbrowse" template="wx_sample" template_append="wx_append" cond="USE_ODBC=='1'">
-        <sources>
-            dbbrowse.cpp
-            doc.cpp
-            pgmctrl.cpp
-            tabpgwin.cpp
-            browsedb.cpp
-            dbtree.cpp
-            dbgrid.cpp
-            dlguser.cpp
-        </sources>
-        <wx-lib>dbgrid</wx-lib>
-        <wx-lib>adv</wx-lib>
-        <wx-lib>odbc</wx-lib>
-        <wx-lib>html</wx-lib>
-        <wx-lib>xml</wx-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-        <win32-res>dbbrowse.rc</win32-res>
-    </exe>
-
-    <wx-data id="data_help_std">
-        <dstdir>$(BUILDDIR)/help.std</dstdir>
-        <srcdir>$(SRCDIR)/help.std</srcdir>
-        <files>
-            compiler.htm
-            dbbrowse.hhc
-            dbbrowse.hhk
-            dbbrowse.hhp
-            dbbrowse.htm
-            getcol.htm
-            getcolsh.htm
-            icons.htm
-            picgrams.htm
-            problems.htm
-            remstar.htm
-            sample.htm
-            startprm.htm
-            todo.htm
-            wxdb.htm
-            wxtable.htm
-        </files>
-    </wx-data>
-
-    <wx-data id="data_help_png">
-        <dstdir>$(BUILDDIR)/help.png</dstdir>
-        <srcdir>$(SRCDIR)/help.png</srcdir>
-        <files>
-            col.png
-            d_closed.png
-            d_open.png
-            dsn.png
-            dsnclose.png
-            dsnopen.png
-            f_closed.png
-            f_open.png
-            gnu.png
-            gtk.png
-            imbau.png
-            kde.png
-            key.png
-            keyf.png
-            linux.png
-            logo.png
-            motif.png
-            msvc.png
-            odbc.png
-            pgmctrl.png
-            redh.png
-            remstar.png
-            server.png
-            suse.png
-            tab.png
-            view.png
-            winnt.png
-            wins.png
-        </files>
-    </wx-data>
-
-</makefile>
diff --git a/demos/dbbrowse/dbbrowse.cpp b/demos/dbbrowse/dbbrowse.cpp
deleted file mode 100644 (file)
index 8f19fc8..0000000
+++ /dev/null
@@ -1,322 +0,0 @@
-//----------------------------------------------------------------------------------------
-// Name:        dbbrowse.cpp
-// Purpose:     Through ODBC - Databases Browsen
-// Author:      Mark Johnson
-// Modified by:
-// BJO        : Bart A.M. JOURQUIN
-// Created:     19991127
-// Copyright:   (c) Mark Johnson
-// Licence:     wxWindows license
-// RCS-ID:      $Id$
-//----------------------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-//----------------------------------------------------------------------------------------
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-//----------------------------------------------------------------------------------------
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/stockitem.h"
-//----------------------------------------------------------------------------------------
-#ifndef __WXMSW__
-#include "bitmaps/logo.xpm"
-#endif
-//----------------------------------------------------------------------------------------
-//-- all #includes that every .cpp needs             --- 19990807.mj10777 ----------------
-//----------------------------------------------------------------------------------------
-#include "std.h"    // sorgsam Pflegen !
-// #include <iostream>
-//----------------------------------------------------------------------------------------
-//-- Some Global Vars for this file ------------------------------------------------------
-//----------------------------------------------------------------------------------------
-BEGIN_EVENT_TABLE(MainFrame, wxFrame)
-    EVT_MENU(wxID_EXIT, MainFrame::OnQuit)                  // Program End
-    EVT_MENU(wxID_ABOUT, MainFrame::OnAbout)                // Program Discription
-    EVT_MENU(wxID_HELP, MainFrame::OnHelp)                  // Program Help
-END_EVENT_TABLE()
-
-//----------------------------------------------------------------------------------------
-IMPLEMENT_APP(MainApp)      // This declares wxApp::MainApp as "the" Application
-
-//----------------------------------------------------------------------------------------
-// 'Main program' equivalent, creating windows and returning main app frame
-//----------------------------------------------------------------------------------------
-bool MainApp::OnInit(void)  // Does everything needed for a program start
-{
-    wxString Temp0;            // Use as needed
-    //---------------------------------------------------------------------------------------
-    // set the language to use   // Help.??  (.std = english, .de = german etc.)
-    const wxChar *language = NULL; // czech, german, french, polish
-    const wxChar *langid   = NULL; // std = english , cz, de = german, fr = french, pl = polish
-    wxString   s_LangHelp;       // Directory/Filename.hhp of the Help-Project file
-    wxString   s_LangId, s_Language;
-    s_Language.Empty(); s_LangId.Empty(); s_LangHelp.Empty();
-    //---------------------------------------------------------------------------------------
-    //-- Graphic File suport - use only when needed, otherwise big .exe's
-    //---------------------------------------------------------------------------------------
-#if wxUSE_LIBPNG
-    wxImage::AddHandler( new wxPNGHandler );   // needed for help System
-#endif
-/*
-    #if wxUSE_LIBJPEG
-    wxImage::AddHandler(new wxJPEGHandler );   // use only when needed, otherwise big .exe's
-    #endif
-    wxImage::AddHandler( new wxGIFHandler );   // use only when needed, otherwise big .exe's
-    wxImage::AddHandler( new wxPCXHandler );   // use only when needed, otherwise big .exe's
-    wxImage::AddHandler( new wxPNMHandler );   // use only when needed, otherwise big .exe's
-*/
-#ifdef __WXMSW__
-    // wxBitmap::AddHandler( new wxXPMFileHandler );   // Attempt to use XPS instead of ico
-    // wxBitmap::AddHandler( new wxXPMDataHandler );   // - Attempt failed
-#endif
-    //---------------------------------------------------------------------------------------
-    switch ( argc )
-    {
-    default:
-        // ignore the other args, fall through
-    case 3:
-        language = argv[2];         // czech, english, french, german , polish
-        langid   = argv[1];         // cz, std, fr, de , pl
-        break;
-    case 2:
-        langid   = argv[1];         // cz, std, fr, de , pl
-        break;
-    case 1:
-    case 0:
-        break;
-    };
-    //---------------------------------------------------------------------------------------
-    // Win-Registry : Workplace\HKEY_CURRENT_USERS\Software\%GetVendorName()\%GetAppName()
-    //---------------------------------------------------------------------------------------
-    SetVendorName(_T("mj10777"));           // Needed to get Configuration Information
-    SetAppName(_T("DBBrowse"));             // "" , also needed for s_LangHelp
-    //---------------------------------------------------------------------------------------
-    // we're using wxConfig's "create-on-demand" feature: it will create the
-    // config object when it's used for the first time. It has a number of
-    // advantages compared with explicitly creating our wxConfig:
-    //  1) we don't pay for it if we don't use it
-    //  2) there is no danger to create it twice
-
-    // application and vendor name are used by wxConfig to construct the name
-    // of the config file/registry key and must be set before the first call
-    // to Get() if you want to override the default values (the application
-    // name is the name of the executable and the vendor name is the same)
-    //---------------------------------------------------------------------------------------
-    p_ProgramCfg = wxConfigBase::Get();  // Get Program Configuration from Registry
-    // p_ProgramCfg->DeleteAll();           // This is how the Config can be erased
-    p_ProgramCfg->SetPath(_T("/"));          // Start at root
-    //---------------------------------------------------------------------------------------
-    //-- Set the Language and remember it for the next time. --------------------------------
-    //---------------------------------------------------------------------------------------
-    if (langid == NULL) // No Parameter was given
-    {
-        Temp0.Empty();
-        p_ProgramCfg->Read(_T("/Local/langid"),&Temp0); // >const char *langid< can't be used here
-        if (Temp0.empty())
-            langid = _T("std");  // Standard language is "std" = english
-        else
-            langid = Temp0;
-    }
-    Temp0.Printf(_T("%s"),langid);
-    //---------------------------------------------------------------------------------------
-    // Support the following languages  (std = english)
-    if ((Temp0 == _T("a"))  || (Temp0 == _T("cz")) || (Temp0 == _T("de")) ||
-        (Temp0 == _T("fr")) || (Temp0 == _T("pl")))
-    { // The three-letter language-string codes are only valid in Windows NT and Windows 95.
-        if (Temp0 == _T("cz"))
-            language = _T("czech");  // csy or czech
-        if ((Temp0 == _T("de")) || (Temp0 == _T("a")))
-        {
-            language = _T("german");  // deu or german
-            if (Temp0 == _T("a"))
-            { langid = Temp0 = _T("de"); }  // Austrian = german
-        } // german / austrian
-        if (Temp0 == _T("fr"))
-            language = _T("french");  // fra or french
-        if (Temp0 == _T("pl"))
-            language = _T("polish");  // plk or polish
-        if (!m_locale.Init(language, langid, language)) // Don't do this for english (std)
-        { // You should recieve errors here for cz and pl since there is no cz/ and pl/ directory
-            wxLogMessage(_T("-E-> %s : SetLocale error : langid(%s) ; language(%s)"),GetAppName().c_str(),langid,language);
-            langid = _T("std");
-            language = _T("C");  // english, english-aus , -can , -nz , -uk , -usa
-        }
-        else
-        { // Read in Foreign language's text for GetAppName() and Help
-            Temp0 = GetAppName();
-            Temp0 = Temp0.Lower();
-            m_locale.AddCatalog(Temp0.c_str());
-            m_locale.AddCatalog(_T("help"));
-        }
-    } // Support the following languages  (std = english)
-    else
-    {
-        langid = _T("std");
-        language = _T("C");  // english, english-aus , -can , -nz , -uk , -usa
-    }
-    s_Language.Printf(_T("%s"),language);                       // language is a pointer
-    s_LangId.Printf(_T("%s"),langid);                           // langid   is a pointer
-    p_ProgramCfg->Write(_T("/Local/language"),s_Language);
-    p_ProgramCfg->Write(_T("/Local/langid"),s_LangId);
-    s_LangHelp.Printf(_T("help.%s/%s.hhp"),s_LangId.c_str(),GetAppName().c_str()); // "help.std/Garantie.hhp";
-    s_LangHelp = s_LangHelp.Lower();                       // A must for Linux
-    //---------------------------------------------------------------------------------------
-    Temp0 = _T("NONE");                               // I don't remember why I did this
-    p_ProgramCfg->Write(_T("/NONE"),Temp0);           // I don't remember why I did this
-    p_ProgramCfg->Write(_T("/Paths/NONE"),Temp0);     // I don't remember why I did this
-    p_ProgramCfg->Write(_T("/MainFrame/NONE"),Temp0); // I don't remember why I did this
-    //---------------------------------------------------------------------------------------
-    p_ProgramCfg->Write(_T("/Paths/Work"),wxGetCwd()); // Get current Working Path
-    p_ProgramCfg->SetPath(_T("/"));
-    //---------------------------------------------------------------------------------------
-    // restore frame position and size, if empty start Values (1,1) and (750,600)
-    int x = p_ProgramCfg->Read(_T("/MainFrame/x"), 1), y = p_ProgramCfg->Read(_T("/MainFrame/y"), 1),
-        w = p_ProgramCfg->Read(_T("/MainFrame/w"), 750), h = p_ProgramCfg->Read(_T("/MainFrame/h"), 600);
-    //---------------------------------------------------------------------------------------
-    // Create the main frame window
-    Temp0.Printf(_T("%s - %s"),GetAppName().c_str(),GetVendorName().c_str());
-    frame = new MainFrame((wxFrame *) NULL,(wxChar *) Temp0.c_str(),wxPoint(x,y),wxSize(w,h));
-    //---------------------------------------------------------------------------------------
-    // Set the Backgroundcolour (only needed if you are NOT using wxSYS_COLOUR_BACKGROUND)
-    frame->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BACKGROUND));
-    // frame->SetBackgroundColour(wxColour(255, 255, 255));
-    // frame->SetBackgroundColour(* wxWHITE);
-    //---------------------------------------------------------------------------------------
-    // Give it an icon
-    //---------------------------------------------------------------------------------------
-    // 12.02.2000 - Guillermo Rodriguez Garcia :
-    //---------------------------------------------------------------------------------------
-    // This is different for Win9x and WinNT; one of them takes the first ico
-    // in the .rc file, while the other takes the icon with the lowest name,
-    // so to be sure that it always work, put your icon the first *and* give
-    // it a name such a 'appicon' or something.
-    //---------------------------------------------------------------------------------------
-    // mj10777 : any special rule in Linux ?
-    //---------------------------------------------------------------------------------------
-    frame->SetIcon(wxICON(aLogo));    // lowest name and first entry in RC File
-    //---------------------------------------------------------------------------------------
-    // Make a menubar
-    wxMenu *file_menu = new wxMenu;
-    wxMenu *help_menu = new wxMenu;
-
-    help_menu->Append(wxID_HELP, wxGetStockLabel(wxID_HELP));
-    help_menu->AppendSeparator();
-    help_menu->Append(wxID_ABOUT, _("&About"));
-    file_menu->Append(wxID_EXIT, wxGetStockLabel(wxID_EXIT));
-
-    wxMenuBar *menu_bar = new wxMenuBar;
-    menu_bar->Append(file_menu, _("&File"));
-    menu_bar->Append(help_menu, _("&Help"));
-    frame->SetMenuBar(menu_bar);
-#if wxUSE_STATUSBAR
-    frame->CreateStatusBar(1);
-    Temp0.Printf(_("%s has started !"),p_ProgramCfg->GetAppName().c_str());
-    frame->SetStatusText(Temp0, 0);
-#endif // wxUSE_STATUSBAR
-    //---------------------------------------------------------------------------------------
-    int width, height;
-    frame->GetClientSize(&width, &height);
-    //---------------------------------------------------------------------------------------
-    frame->p_Splitter = new DocSplitterWindow(frame,wxID_ANY);
-    // p_Splitter->SetCursor(wxCursor(wxCURSOR_PENCIL));
-    frame->pDoc                       = new MainDoc();
-    frame->pDoc->p_MainFrame          = frame;
-    frame->pDoc->p_Splitter           = frame->p_Splitter;
-    frame->pDoc->p_Splitter->pDoc     = frame->pDoc;       // ControlBase: saving the Sash
-    //---------------------------------------------------------------------------------------
-    //-- Problem : GetClientSize(Width,Height) are not the same as the values given in the ---
-    //--            construction of the Frame.                                            ---
-    //-- Solved  : GetClientSize is called here and the difference is noted. When the     ---
-    //--           Window is closed the diff. is added to the result of GetClientSize.    ---
-    //---------------------------------------------------------------------------------------
-    frame->GetClientSize(&frame->DiffW, &frame->DiffH); frame->DiffW-=w; frame->DiffH-=h;
-    //----------------------------------------------------------------------------
-    //-- Help    : Load the help.%langid/%GetAppName().hhp (help.std/dbbrowse.hhp) file                                                                       ---
-    //----------------------------------------------------------------------------
-    frame->p_Help = new wxHtmlHelpController();   // construct the Help System
-    frame->p_Help->UseConfig(p_ProgramCfg);       // Don't rember what this was for
-    // You should recieve errors here for fr since there is no help.fr/ directory
-    if (!frame->p_Help->AddBook(s_LangHelp))      // Use the language set
-    { // You should recieve errors here for fr since there is no help.fr/ but a fr/ directory
-        wxLogMessage(_T("-E-> %s : AddBook error : s_LangHelp(%s)"),GetAppName().c_str(),s_LangHelp.c_str());
-    }
-    frame->pDoc->p_Help = frame->p_Help;          // Save the information to the document
-    //---------------------------------------------------------------------------------------
-    frame->Show(true);                            // Show the frame
-    SetTopWindow(frame);                          // At this point the frame can be seen
-    //---------------------------------------------------------------------------------------
-    // If you need a "Splash Screen" because of a long OnNewDocument, do it here
-    if (!frame->pDoc->OnNewDocument())
-        frame->Close(true);
-    // Kill a "Splash Screen" because OnNewDocument, if you have one
-    //---------------------------------------------------------------------------------------
-    p_ProgramCfg->Flush(true);        // save the configuration
-    return true;
-} // bool MainApp::OnInit(void)
-
-//----------------------------------------------------------------------------------------
-// My frame constructor
-//----------------------------------------------------------------------------------------
-MainFrame::MainFrame(wxFrame *frame, wxChar *title,  const wxPoint& pos, const wxSize& size):
-wxFrame(frame, wxID_ANY, title,  pos, size)
-{
-    p_Splitter = NULL; pDoc = NULL; p_Help = NULL;    // Keep the Pointers clean !
-    //--- Everything else is done in MainApp::OnInit() --------------------------------------
-}
-
-//----------------------------------------------------------------------------------------
-MainFrame::~MainFrame(void)
-{
-    // Close the help frame; this will cause the config data to get written.
-    if (p_Help->GetFrame()) // returns NULL if no help frame active
-        p_Help->GetFrame()->Close(true);
-    delete p_Help;  // Memory Leak
-    p_Help = NULL;
-    // save the control's values to the config
-    if (p_ProgramCfg == NULL)
-        return;
-    // save the frame position before it is destroyed
-    int x, y, w, h;
-    GetPosition(&x, &y);
-    GetClientSize(&w, &h); w -= DiffW; h -= DiffH;
-    p_ProgramCfg->Write(_T("/MainFrame/x"), (long) x);
-    p_ProgramCfg->Write(_T("/MainFrame/y"), (long) y);
-    p_ProgramCfg->Write(_T("/MainFrame/w"), (long) w);
-    p_ProgramCfg->Write(_T("/MainFrame/h"), (long) h);
-    p_ProgramCfg->Write(_T("/MainFrame/Sash"), (long) pDoc->Sash);
-    // clean up: Set() returns the active config object as Get() does, but unlike
-    // Get() it doesn't try to create one if there is none (definitely not what
-    // we want here!)
-    // delete wxConfigBase::Set((wxConfigBase *) NULL);
-    p_ProgramCfg->Flush(true);        // saves   Objekt
-    if (pDoc)                         // If we have a Valid Document
-        delete pDoc;                     // Cleanup (MainDoc::~MainDoc)
-} // MainFrame::~MainFrame(void)
-
-//----------------------------------------------------------------------------------------
-void MainFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    Close(true);
-}
-
-//----------------------------------------------------------------------------------------
-void MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-    wxString Temp0, Temp1;
-    Temp0.Printf(_("%s\nMark Johnson\nBerlin, Germany\nwxWindows@mj10777.de\n (c) 2000"),p_ProgramCfg->GetAppName().c_str());
-    Temp1.Printf(_("About %s"),p_ProgramCfg->GetAppName().c_str());
-    wxMessageDialog dialog(this, Temp0,Temp1,wxOK|wxCANCEL);
-    dialog.ShowModal();
-}
-
-//----------------------------------------------------------------------------------------
-void MainFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
-{
-    p_Help->Display(_T("Main page"));
-}
-//----------------------------------------------------------------------------------------
diff --git a/demos/dbbrowse/dbbrowse.dsp b/demos/dbbrowse/dbbrowse.dsp
deleted file mode 100644 (file)
index 3494bea..0000000
+++ /dev/null
@@ -1,508 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dbbrowse" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Application" 0x0101\r
-\r
-CFG=dbbrowse - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "dbbrowse.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "dbbrowse.mak" CFG="dbbrowse - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "dbbrowse - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbbrowse - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbbrowse - Win32 DLL Universal Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbbrowse - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbbrowse - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbbrowse - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbbrowse - Win32 DLL Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbbrowse - Win32 DLL Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbbrowse - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbbrowse - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbbrowse - Win32 Universal Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbbrowse - Win32 Universal Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbbrowse - Win32 Unicode Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbbrowse - Win32 Unicode Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbbrowse - Win32 Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbbrowse - Win32 Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "dbbrowse - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "vc_mswunivudll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivudll\dbbrowse"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "vc_mswunivudll"\r
-# PROP Intermediate_Dir "vc_mswunivudll\dbbrowse"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\dbbrowse.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\r
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\dbbrowse.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# 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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29u_dbgrid.lib wxmswuniv29u_adv.lib wxbase29u_odbc.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.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\dbbrowse.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29u_dbgrid.lib wxmswuniv29u_adv.lib wxbase29u_odbc.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.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\dbbrowse.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbbrowse - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivuddll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\dbbrowse"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivuddll"\r
-# PROP Intermediate_Dir "vc_mswunivuddll\dbbrowse"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dbbrowse.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\r
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dbbrowse.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# 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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29ud_dbgrid.lib wxmswuniv29ud_adv.lib wxbase29ud_odbc.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.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\dbbrowse.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29ud_dbgrid.lib wxmswuniv29ud_adv.lib wxbase29ud_odbc.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.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\dbbrowse.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbbrowse - Win32 DLL Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "vc_mswunivdll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivdll\dbbrowse"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "vc_mswunivdll"\r
-# PROP Intermediate_Dir "vc_mswunivdll\dbbrowse"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\dbbrowse.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\r
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\dbbrowse.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_dll\mswuniv" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29_dbgrid.lib wxmswuniv29_adv.lib wxbase29_odbc.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.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\dbbrowse.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29_dbgrid.lib wxmswuniv29_adv.lib wxbase29_odbc.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.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\dbbrowse.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbbrowse - Win32 DLL Universal Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivddll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivddll\dbbrowse"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivddll"\r
-# PROP Intermediate_Dir "vc_mswunivddll\dbbrowse"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dbbrowse.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\r
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dbbrowse.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# 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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29d_dbgrid.lib wxmswuniv29d_adv.lib wxbase29d_odbc.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.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\dbbrowse.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29d_dbgrid.lib wxmswuniv29d_adv.lib wxbase29d_odbc.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.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\dbbrowse.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbbrowse - Win32 DLL Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "vc_mswudll"\r
-# PROP BASE Intermediate_Dir "vc_mswudll\dbbrowse"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "vc_mswudll"\r
-# PROP Intermediate_Dir "vc_mswudll\dbbrowse"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\dbbrowse.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\r
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\dbbrowse.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29u_dbgrid.lib wxmsw29u_adv.lib wxbase29u_odbc.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.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\dbbrowse.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmsw29u_dbgrid.lib wxmsw29u_adv.lib wxbase29u_odbc.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.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\dbbrowse.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbbrowse - Win32 DLL Unicode Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswuddll"\r
-# PROP BASE Intermediate_Dir "vc_mswuddll\dbbrowse"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswuddll"\r
-# PROP Intermediate_Dir "vc_mswuddll\dbbrowse"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dbbrowse.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\r
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dbbrowse.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# 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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29ud_dbgrid.lib wxmsw29ud_adv.lib wxbase29ud_odbc.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.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\dbbrowse.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmsw29ud_dbgrid.lib wxmsw29ud_adv.lib wxbase29ud_odbc.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.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\dbbrowse.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbbrowse - Win32 DLL Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "vc_mswdll"\r
-# PROP BASE Intermediate_Dir "vc_mswdll\dbbrowse"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "vc_mswdll"\r
-# PROP Intermediate_Dir "vc_mswdll\dbbrowse"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\dbbrowse.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\r
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\dbbrowse.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_dll\msw" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_dll\msw" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29_dbgrid.lib wxmsw29_adv.lib wxbase29_odbc.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.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\dbbrowse.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmsw29_dbgrid.lib wxmsw29_adv.lib wxbase29_odbc.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.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\dbbrowse.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbbrowse - Win32 DLL Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswddll"\r
-# PROP BASE Intermediate_Dir "vc_mswddll\dbbrowse"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswddll"\r
-# PROP Intermediate_Dir "vc_mswddll\dbbrowse"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\dbbrowse.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\r
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\dbbrowse.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# 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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29d_dbgrid.lib wxmsw29d_adv.lib wxbase29d_odbc.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.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\dbbrowse.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmsw29d_dbgrid.lib wxmsw29d_adv.lib wxbase29d_odbc.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.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\dbbrowse.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbbrowse - Win32 Universal Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "vc_mswunivu"\r
-# PROP BASE Intermediate_Dir "vc_mswunivu\dbbrowse"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "vc_mswunivu"\r
-# PROP Intermediate_Dir "vc_mswunivu\dbbrowse"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\dbbrowse.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\r
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\dbbrowse.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29u_dbgrid.lib wxmswuniv29u_adv.lib wxbase29u_odbc.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.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\dbbrowse.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29u_dbgrid.lib wxmswuniv29u_adv.lib wxbase29u_odbc.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.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\dbbrowse.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbbrowse - Win32 Universal Unicode Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivud"\r
-# PROP BASE Intermediate_Dir "vc_mswunivud\dbbrowse"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivud"\r
-# PROP Intermediate_Dir "vc_mswunivud\dbbrowse"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dbbrowse.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\r
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dbbrowse.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# 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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29ud_dbgrid.lib wxmswuniv29ud_adv.lib wxbase29ud_odbc.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.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\dbbrowse.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29ud_dbgrid.lib wxmswuniv29ud_adv.lib wxbase29ud_odbc.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.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\dbbrowse.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbbrowse - Win32 Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "vc_mswuniv"\r
-# PROP BASE Intermediate_Dir "vc_mswuniv\dbbrowse"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "vc_mswuniv"\r
-# PROP Intermediate_Dir "vc_mswuniv\dbbrowse"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\dbbrowse.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\r
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\dbbrowse.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_lib\mswuniv" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_lib\mswuniv" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29_dbgrid.lib wxmswuniv29_adv.lib wxbase29_odbc.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.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\dbbrowse.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29_dbgrid.lib wxmswuniv29_adv.lib wxbase29_odbc.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.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\dbbrowse.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbbrowse - Win32 Universal Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivd"\r
-# PROP BASE Intermediate_Dir "vc_mswunivd\dbbrowse"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivd"\r
-# PROP Intermediate_Dir "vc_mswunivd\dbbrowse"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dbbrowse.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\r
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dbbrowse.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# 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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29d_dbgrid.lib wxmswuniv29d_adv.lib wxbase29d_odbc.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.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\dbbrowse.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29d_dbgrid.lib wxmswuniv29d_adv.lib wxbase29d_odbc.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.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\dbbrowse.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbbrowse - Win32 Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "vc_mswu"\r
-# PROP BASE Intermediate_Dir "vc_mswu\dbbrowse"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "vc_mswu"\r
-# PROP Intermediate_Dir "vc_mswu\dbbrowse"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\dbbrowse.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\r
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\dbbrowse.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29u_dbgrid.lib wxmsw29u_adv.lib wxbase29u_odbc.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.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\dbbrowse.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmsw29u_dbgrid.lib wxmsw29u_adv.lib wxbase29u_odbc.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.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\dbbrowse.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbbrowse - Win32 Unicode Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswud"\r
-# PROP BASE Intermediate_Dir "vc_mswud\dbbrowse"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswud"\r
-# PROP Intermediate_Dir "vc_mswud\dbbrowse"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\dbbrowse.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\r
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\dbbrowse.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# 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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29ud_dbgrid.lib wxmsw29ud_adv.lib wxbase29ud_odbc.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.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\dbbrowse.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmsw29ud_dbgrid.lib wxmsw29ud_adv.lib wxbase29ud_odbc.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.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\dbbrowse.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbbrowse - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "vc_msw"\r
-# PROP BASE Intermediate_Dir "vc_msw\dbbrowse"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "vc_msw"\r
-# PROP Intermediate_Dir "vc_msw\dbbrowse"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\dbbrowse.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Fdvc_msw\dbbrowse.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_lib\msw" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_lib\msw" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29_dbgrid.lib wxmsw29_adv.lib wxbase29_odbc.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.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\dbbrowse.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmsw29_dbgrid.lib wxmsw29_adv.lib wxbase29_odbc.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.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\dbbrowse.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbbrowse - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswd"\r
-# PROP BASE Intermediate_Dir "vc_mswd\dbbrowse"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswd"\r
-# PROP Intermediate_Dir "vc_mswd\dbbrowse"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\dbbrowse.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\r
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\dbbrowse.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_lib\mswd" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29d_dbgrid.lib wxmsw29d_adv.lib wxbase29d_odbc.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.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\dbbrowse.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmsw29d_dbgrid.lib wxmsw29d_adv.lib wxbase29d_odbc.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.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\dbbrowse.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-\r
-!ENDIF\r
-\r
-# Begin Target\r
-\r
-# Name "dbbrowse - Win32 DLL Universal Unicode Release"\r
-# Name "dbbrowse - Win32 DLL Universal Unicode Debug"\r
-# Name "dbbrowse - Win32 DLL Universal Release"\r
-# Name "dbbrowse - Win32 DLL Universal Debug"\r
-# Name "dbbrowse - Win32 DLL Unicode Release"\r
-# Name "dbbrowse - Win32 DLL Unicode Debug"\r
-# Name "dbbrowse - Win32 DLL Release"\r
-# Name "dbbrowse - Win32 DLL Debug"\r
-# Name "dbbrowse - Win32 Universal Unicode Release"\r
-# Name "dbbrowse - Win32 Universal Unicode Debug"\r
-# Name "dbbrowse - Win32 Universal Release"\r
-# Name "dbbrowse - Win32 Universal Debug"\r
-# Name "dbbrowse - Win32 Unicode Release"\r
-# Name "dbbrowse - Win32 Unicode Debug"\r
-# Name "dbbrowse - Win32 Release"\r
-# Name "dbbrowse - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=.\browsedb.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dbbrowse.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dbbrowse.rc\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dbgrid.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dbtree.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dlguser.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\doc.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\pgmctrl.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\tabpgwin.cpp\r
-# End Source File\r
-# End Group\r
-# End Target\r
-# End Project\r
-\r
diff --git a/demos/dbbrowse/dbbrowse.h b/demos/dbbrowse/dbbrowse.h
deleted file mode 100644 (file)
index 34a6f60..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-//----------------------------------------------------------------------------------------
-// Name:        dbbrowse.h
-// Purpose:     Through ODBC - Databases Browsen
-// Author:      Mark Johnson
-// Modified by:
-// Created:     19991127
-// Copyright:   (c) Mark Johnson
-// Licence:     wxWindows license
-// RCS-ID:      $Id$
-//----------------------------------------------------------------------------------------
-// Define a new frame type
-//----------------------------------------------------------------------------------------
-class MainFrame: public wxFrame
-{
-public:
-    MainFrame(wxFrame *frame, wxChar *title,  const wxPoint& pos, const wxSize& size);
-    virtual ~MainFrame(void);
-
-public:
-    // menu callbacks
-    void OnAbout(wxCommandEvent& event);
-    void OnHelp(wxCommandEvent& event);
-    void OnQuit(wxCommandEvent& event);
-    //--------------------------------------------------------------------------------------
-    int DiffW, DiffH;                  // Needed the saving of Frame size
-    //--------------------------------------------------------------------------------------
-    DocSplitterWindow    *p_Splitter;  // for Document Views
-    MainDoc              *pDoc;        // Self made Document
-    wxHtmlHelpController *p_Help;      // Help System
-
-    //--------------------------------------------------------------------------------------
-    DECLARE_EVENT_TABLE()
-};
-
-//----------------------------------------------------------------------------------------
-// Define a new application type
-//----------------------------------------------------------------------------------------
-class MainApp: public wxApp
-{
-public:
-    MainFrame *frame;                           // The one and only MainFrame
-    bool OnInit(void); // Programmstart
-    wxLocale m_locale; // locale we'll be using and language support - MUST be here !
-};
-
-//----------------------------------------------------------------------------------------
-// ID for the menu quit command
-//----------------------------------------------------------------------------------------
-#define TREE_CTRL_PGM                102
-#define GRID_CTRL                    103
-#define TREE_CTRL_DB                 104
-#define GRID_CTRL_DB                 105
-//----------------------------------------------------------------------------------------
diff --git a/demos/dbbrowse/dbbrowse.rc b/demos/dbbrowse/dbbrowse.rc
deleted file mode 100644 (file)
index 1631ac6..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-aLogo                   ICON    "bitmaps\\logo.ico"
-Col                     ICON    "bitmaps\\col.ico"
-DSNClosed               ICON    "bitmaps\\dsnclose.ico"
-DSNOpen                 ICON    "bitmaps\\dsnopen.ico"
-KEY                     ICON    "bitmaps\\key.ico"
-KEYF                    ICON    "bitmaps\\keyf.ico"
-TAB                     ICON    "bitmaps\\tab.ico"
-VIEW                    ICON    "bitmaps\\view.ico"
-DocClosed               ICON    "bitmaps\\d_closed.ico"
-DocOpen                 ICON    "bitmaps\\d_open.ico"
-FolderClosed            ICON    "bitmaps\\f_closed.ico"
-FolderOpen              ICON    "bitmaps\\f_open.ico"
-PgmCtrl                 BITMAP  "bitmaps\\pgmctrl.bmp"
-
-#include "wx/msw/wx.rc"
diff --git a/demos/dbbrowse/dbbrowseM5.xml b/demos/dbbrowse/dbbrowseM5.xml
deleted file mode 100644 (file)
index c5b5a5c..0000000
+++ /dev/null
@@ -1,4063 +0,0 @@
-<?xml version="1.0"?>
-<?codewarrior exportversion="1.0" ideversion="4.0"?>
-<!DOCTYPE PROJECT [
-
-<!ELEMENT PROJECT (TARGETLIST, TARGETORDER, GROUPLIST, DESIGNLIST?)>
-<!ELEMENT TARGETLIST (TARGET+)>
-<!ELEMENT TARGET (NAME, SETTINGLIST, FILELIST?, LINKORDER?, SEGMENTLIST?, OVERLAYGROUPLIST?, SUBTARGETLIST?, SUBPROJECTLIST?)>
-<!ELEMENT NAME (#PCDATA)>
-<!ELEMENT USERSOURCETREETYPE (#PCDATA)>
-<!ELEMENT PATH (#PCDATA)>
-<!ELEMENT FILELIST (FILE*)>
-<!ELEMENT FILE (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?, ROOTFILEREF?, FILEKIND?, FILEFLAGS?)>
-<!ELEMENT PATHTYPE (#PCDATA)>
-<!ELEMENT PATHROOT (#PCDATA)>
-<!ELEMENT ACCESSPATH (#PCDATA)>
-<!ELEMENT PATHFORMAT (#PCDATA)>
-<!ELEMENT ROOTFILEREF (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
-<!ELEMENT FILEKIND (#PCDATA)>
-<!ELEMENT FILEFLAGS (#PCDATA)>
-<!ELEMENT FILEREF (TARGETNAME?, PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
-<!ELEMENT TARGETNAME (#PCDATA)>
-<!ELEMENT SETTINGLIST ((SETTING|PANELDATA)+)>
-<!ELEMENT SETTING (NAME?, (VALUE|(SETTING+)))>
-<!ELEMENT PANELDATA (NAME, VALUE)>
-<!ELEMENT VALUE (#PCDATA)>
-<!ELEMENT LINKORDER (FILEREF*)>
-<!ELEMENT SEGMENTLIST (SEGMENT+)>
-<!ELEMENT SEGMENT (NAME, ATTRIBUTES?, FILEREF*)>
-<!ELEMENT ATTRIBUTES (#PCDATA)>
-<!ELEMENT OVERLAYGROUPLIST (OVERLAYGROUP+)>
-<!ELEMENT OVERLAYGROUP (NAME, BASEADDRESS, OVERLAY*)>
-<!ELEMENT BASEADDRESS (#PCDATA)>
-<!ELEMENT OVERLAY (NAME, FILEREF*)>
-<!ELEMENT SUBTARGETLIST (SUBTARGET+)>
-<!ELEMENT SUBTARGET (TARGETNAME, ATTRIBUTES?)>
-<!ELEMENT SUBPROJECTLIST (SUBPROJECT+)>
-<!ELEMENT SUBPROJECT (FILEREF, SUBPROJECTTARGETLIST)>
-<!ELEMENT SUBPROJECTTARGETLIST (SUBPROJECTTARGET*)>
-<!ELEMENT SUBPROJECTTARGET (TARGETNAME, ATTRIBUTES?)>
-<!ELEMENT TARGETORDER (ORDEREDTARGET|ORDEREDDESIGN)*>
-<!ELEMENT ORDEREDTARGET (NAME)>
-<!ELEMENT ORDEREDDESIGN (NAME, ORDEREDTARGET+)>
-<!ELEMENT GROUPLIST (GROUP|FILEREF)*>
-<!ELEMENT GROUP (NAME, (GROUP|FILEREF)*)>
-<!ELEMENT DESIGNLIST (DESIGN+)>
-<!ELEMENT DESIGN (NAME, DESIGNDATA)>
-<!ELEMENT DESIGNDATA (#PCDATA)>
-]>
-<PROJECT>
-    <TARGETLIST>
-        <TARGET>
-            <NAME>Classic Release</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::include:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::lib:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>MSL</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:MacOS Support:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>MacOS PPC Linker</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>Classic Release</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>Appl</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MMLB</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MPLF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MWCD</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>RSRC</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.exp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.r</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Rez</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>XCOF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>docu</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>rsrc</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>shlb</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>stub</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.doc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ppob</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsrc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>ActivateBrowser</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Compiler" panel -->
-                <SETTING><NAME>MWFrontEnd_C_cplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_checkprotos</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_arm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_trigraphs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>/wx/wx_cw.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enableexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontreusestrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_poolstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_useRTTI</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_multibyteaware</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_unsignedchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_autoinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_booltruefalse</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_inlinelevel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ecplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_objective_c</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_defer_codegen</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedvar</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedarg</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_extracomma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_pedantic</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "MacOS Merge Panel" panel -->
-                <SETTING><NAME>MWMerge_MacOS_projectType</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputName</NAME><VALUE>Merge Out</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputCreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_suppressWarning</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyFragments</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>\b\94\99 </VALUE></SETTING>
-                    <SETTING><VALUE>   =ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>   =Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Disassembler" panel -->
-                <SETTING><NAME>MWDisassembler_PPC_showcode</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_extended</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_mix</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_nohex</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showsym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_shownames</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "PPC Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_PPC_optimizationlevel</NAME><VALUE>Level0</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_PPC_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "PPC Linker" panel -->
-                <SETTING><NAME>MWLinker_PPC_linksym</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_symfullpath</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_permitmultdefs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_initname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_mainname</NAME><VALUE>__start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_termname</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "PPC PEF" panel -->
-                <SETTING><NAME>MWPEF_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_libfolder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_expandbss</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sharedata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_olddefversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWPEF_collapsereloads</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Project" panel -->
-                <SETTING><NAME>MWProject_PPC_type</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_outfile</NAME><VALUE>bombs Classic Release</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_stacksize</NAME><VALUE>64</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flags</NAME><VALUE>22720</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_symfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcheader</NAME><VALUE>Native</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrctype</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcflags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcstore</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcmerge</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPCAsm Panel" panel -->
-                <SETTING><NAME>MWAssembler_PPC_auxheader</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_symmode</NAME><VALUE>Mac</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_dialect</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_prefixfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_typecheck</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_warnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_casesensitive</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Rez Compiler" panel -->
-                <SETTING><NAME>MWRez_Language_maxwidth</NAME><VALUE>80</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_script</NAME><VALUE>Roman</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_alignment</NAME><VALUE>Align1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filtermode</NAME><VALUE>FilterSkip</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_suppresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_escapecontrolchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_prefixname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filteredtypes</NAME><VALUE>'CODE' 'DATA' 'PICT'</VALUE></SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug, WeakImport</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>WeakImport</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>WeakImport</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>WeakImport</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>WeakImport</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>browsedb.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbbrowse.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbtree.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbgrid.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dlguser.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>doc.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>pgmctrl.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tabpgwin.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>browsedb.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbbrowse.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbtree.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbgrid.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dlguser.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>doc.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>pgmctrl.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tabpgwin.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-        <TARGET>
-            <NAME>Classic Debug</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::include:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::lib:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>MSL</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:MacOS Support:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>MacOS PPC Linker</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>Classic Debug</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>Appl</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MMLB</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MPLF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MWCD</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>RSRC</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.exp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.r</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Rez</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>XCOF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>docu</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>rsrc</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>shlb</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>stub</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.doc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ppob</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsrc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>ActivateBrowser</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000E2D755010000000000001000E2D7E60
-                    0002000000000000000000000E2D2DD000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Compiler" panel -->
-                <SETTING><NAME>MWFrontEnd_C_cplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_checkprotos</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_arm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_trigraphs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>/wx/wx_cw_d.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enableexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontreusestrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_poolstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_useRTTI</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_multibyteaware</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_unsignedchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_autoinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_booltruefalse</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_inlinelevel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ecplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_objective_c</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_defer_codegen</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedvar</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedarg</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_extracomma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_pedantic</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "MacOS Merge Panel" panel -->
-                <SETTING><NAME>MWMerge_MacOS_projectType</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputName</NAME><VALUE>Merge Out</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputCreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_suppressWarning</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyFragments</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>\b\94\99 </VALUE></SETTING>
-                    <SETTING><VALUE>   =ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>   =Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>Inline</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Disassembler" panel -->
-                <SETTING><NAME>MWDisassembler_PPC_showcode</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_extended</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_mix</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_nohex</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showsym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_shownames</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "PPC Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_PPC_optimizationlevel</NAME><VALUE>Level0</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_PPC_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "PPC Linker" panel -->
-                <SETTING><NAME>MWLinker_PPC_linksym</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_symfullpath</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_permitmultdefs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_initname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_mainname</NAME><VALUE>__start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_termname</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "PPC PEF" panel -->
-                <SETTING><NAME>MWPEF_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_libfolder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_expandbss</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sharedata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_olddefversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWPEF_collapsereloads</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Project" panel -->
-                <SETTING><NAME>MWProject_PPC_type</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_outfile</NAME><VALUE>bombs Classic Debug</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_stacksize</NAME><VALUE>64</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flags</NAME><VALUE>22720</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_symfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcheader</NAME><VALUE>Native</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrctype</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcflags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcstore</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcmerge</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPCAsm Panel" panel -->
-                <SETTING><NAME>MWAssembler_PPC_auxheader</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_symmode</NAME><VALUE>Mac</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_dialect</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_prefixfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_typecheck</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_warnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_casesensitive</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Rez Compiler" panel -->
-                <SETTING><NAME>MWRez_Language_maxwidth</NAME><VALUE>80</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_script</NAME><VALUE>Roman</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_alignment</NAME><VALUE>Align1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filtermode</NAME><VALUE>FilterSkip</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_suppresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_escapecontrolchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_prefixname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filteredtypes</NAME><VALUE>'CODE' 'DATA' 'PICT'</VALUE></SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug, WeakImport</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug, WeakImport</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug, WeakImport</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug, WeakImport</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug, WeakImport</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>browsedb.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbbrowse.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbtree.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbgrid.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dlguser.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>doc.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>pgmctrl.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tabpgwin.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>browsedb.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbbrowse.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbtree.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbgrid.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dlguser.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>doc.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>pgmctrl.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tabpgwin.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-        <TARGET>
-            <NAME>Carbon Debug</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::include:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::lib:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>MSL</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:MacOS Support:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>MacOS PPC Linker</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>Carbon Debug</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>Appl</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MMLB</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MPLF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MWCD</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>RSRC</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.exp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.r</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Rez</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>XCOF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>docu</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>rsrc</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>shlb</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>stub</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.doc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ppob</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsrc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>ActivateBrowser</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Compiler" panel -->
-                <SETTING><NAME>MWFrontEnd_C_cplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_checkprotos</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_arm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_trigraphs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>/wx/wx_cwc_d.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enableexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontreusestrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_poolstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_useRTTI</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_multibyteaware</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_unsignedchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_autoinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_booltruefalse</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_inlinelevel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ecplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_objective_c</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_defer_codegen</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedvar</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedarg</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_extracomma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_pedantic</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "MacOS Merge Panel" panel -->
-                <SETTING><NAME>MWMerge_MacOS_projectType</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputName</NAME><VALUE>Merge Out</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputCreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_suppressWarning</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyFragments</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>\b\94\99 </VALUE></SETTING>
-                    <SETTING><VALUE>   =ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>   =Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>Inline</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Disassembler" panel -->
-                <SETTING><NAME>MWDisassembler_PPC_showcode</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_extended</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_mix</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_nohex</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showsym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_shownames</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "PPC Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_PPC_optimizationlevel</NAME><VALUE>Level0</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_PPC_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "PPC Linker" panel -->
-                <SETTING><NAME>MWLinker_PPC_linksym</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_symfullpath</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_permitmultdefs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_initname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_mainname</NAME><VALUE>__start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_termname</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "PPC PEF" panel -->
-                <SETTING><NAME>MWPEF_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_libfolder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_expandbss</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sharedata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_olddefversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWPEF_collapsereloads</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Project" panel -->
-                <SETTING><NAME>MWProject_PPC_type</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_outfile</NAME><VALUE>bombs Carbon Debug</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_stacksize</NAME><VALUE>64</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flags</NAME><VALUE>22720</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_symfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcheader</NAME><VALUE>Native</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrctype</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcflags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcstore</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcmerge</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPCAsm Panel" panel -->
-                <SETTING><NAME>MWAssembler_PPC_auxheader</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_symmode</NAME><VALUE>Mac</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_dialect</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_prefixfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_typecheck</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_warnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_casesensitive</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Rez Compiler" panel -->
-                <SETTING><NAME>MWRez_Language_maxwidth</NAME><VALUE>80</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_script</NAME><VALUE>Roman</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_alignment</NAME><VALUE>Align1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filtermode</NAME><VALUE>FilterSkip</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_suppresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_escapecontrolchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_prefixname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filteredtypes</NAME><VALUE>'CODE' 'DATA' 'PICT'</VALUE></SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>browsedb.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbbrowse.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbtree.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbgrid.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dlguser.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>doc.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>pgmctrl.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tabpgwin.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>browsedb.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbbrowse.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbtree.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbgrid.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dlguser.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>doc.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>pgmctrl.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tabpgwin.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-        <TARGET>
-            <NAME>Carbon Release</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::include:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::lib:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>MSL</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:MacOS Support:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>MacOS PPC Linker</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>Carbon Release</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>Appl</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MMLB</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MPLF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MWCD</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>RSRC</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.exp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.r</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Rez</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>XCOF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>docu</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>rsrc</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>shlb</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>stub</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.doc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ppob</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsrc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>ActivateBrowser</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Compiler" panel -->
-                <SETTING><NAME>MWFrontEnd_C_cplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_checkprotos</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_arm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_trigraphs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>/wx/wx_cwc.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enableexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontreusestrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_poolstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_useRTTI</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_multibyteaware</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_unsignedchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_autoinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_booltruefalse</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_inlinelevel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ecplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_objective_c</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_defer_codegen</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedvar</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedarg</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_extracomma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_pedantic</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "MacOS Merge Panel" panel -->
-                <SETTING><NAME>MWMerge_MacOS_projectType</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputName</NAME><VALUE>Merge Out</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputCreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_suppressWarning</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyFragments</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>\b\94\99 </VALUE></SETTING>
-                    <SETTING><VALUE>   =ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>   =Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Disassembler" panel -->
-                <SETTING><NAME>MWDisassembler_PPC_showcode</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_extended</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_mix</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_nohex</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showsym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_shownames</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "PPC Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_PPC_optimizationlevel</NAME><VALUE>Level0</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_PPC_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "PPC Linker" panel -->
-                <SETTING><NAME>MWLinker_PPC_linksym</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_symfullpath</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_permitmultdefs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_initname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_mainname</NAME><VALUE>__start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_termname</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "PPC PEF" panel -->
-                <SETTING><NAME>MWPEF_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_libfolder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_expandbss</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sharedata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_olddefversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWPEF_collapsereloads</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Project" panel -->
-                <SETTING><NAME>MWProject_PPC_type</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_outfile</NAME><VALUE>bombs Carbon Release</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_stacksize</NAME><VALUE>64</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flags</NAME><VALUE>22720</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_symfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcheader</NAME><VALUE>Native</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrctype</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcflags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcstore</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcmerge</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPCAsm Panel" panel -->
-                <SETTING><NAME>MWAssembler_PPC_auxheader</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_symmode</NAME><VALUE>Mac</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_dialect</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_prefixfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_typecheck</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_warnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_casesensitive</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Rez Compiler" panel -->
-                <SETTING><NAME>MWRez_Language_maxwidth</NAME><VALUE>80</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_script</NAME><VALUE>Roman</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_alignment</NAME><VALUE>Align1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filtermode</NAME><VALUE>FilterSkip</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_suppresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_escapecontrolchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_prefixname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filteredtypes</NAME><VALUE>'CODE' 'DATA' 'PICT'</VALUE></SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>browsedb.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbbrowse.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbtree.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbgrid.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dlguser.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>doc.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>pgmctrl.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tabpgwin.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>browsedb.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbbrowse.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbtree.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbgrid.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dlguser.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>doc.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>pgmctrl.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tabpgwin.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-    </TARGETLIST>
-
-    <TARGETORDER>
-        <ORDEREDTARGET><NAME>Classic Release</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>Classic Debug</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>Carbon Debug</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>Carbon Release</NAME></ORDEREDTARGET>
-    </TARGETORDER>
-
-    <GROUPLIST>
-        <FILEREF>
-            <TARGETNAME>Classic Release</TARGETNAME>
-            <PATHTYPE>Name</PATHTYPE>
-            <PATH>browsedb.cpp</PATH>
-            <PATHFORMAT>MacOS</PATHFORMAT>
-        </FILEREF>
-        <FILEREF>
-            <TARGETNAME>Classic Release</TARGETNAME>
-            <PATHTYPE>Name</PATHTYPE>
-            <PATH>dbbrowse.cpp</PATH>
-            <PATHFORMAT>MacOS</PATHFORMAT>
-        </FILEREF>
-        <FILEREF>
-            <TARGETNAME>Classic Release</TARGETNAME>
-            <PATHTYPE>Name</PATHTYPE>
-            <PATH>dbtree.cpp</PATH>
-            <PATHFORMAT>MacOS</PATHFORMAT>
-        </FILEREF>
-        <FILEREF>
-            <TARGETNAME>Classic Release</TARGETNAME>
-            <PATHTYPE>Name</PATHTYPE>
-            <PATH>dbgrid.cpp</PATH>
-            <PATHFORMAT>MacOS</PATHFORMAT>
-        </FILEREF>
-        <FILEREF>
-            <TARGETNAME>Classic Release</TARGETNAME>
-            <PATHTYPE>Name</PATHTYPE>
-            <PATH>dlguser.cpp</PATH>
-            <PATHFORMAT>MacOS</PATHFORMAT>
-        </FILEREF>
-        <FILEREF>
-            <TARGETNAME>Classic Release</TARGETNAME>
-            <PATHTYPE>Name</PATHTYPE>
-            <PATH>doc.cpp</PATH>
-            <PATHFORMAT>MacOS</PATHFORMAT>
-        </FILEREF>
-        <FILEREF>
-            <TARGETNAME>Classic Release</TARGETNAME>
-            <PATHTYPE>Name</PATHTYPE>
-            <PATH>pgmctrl.cpp</PATH>
-            <PATHFORMAT>MacOS</PATHFORMAT>
-        </FILEREF>
-        <FILEREF>
-            <TARGETNAME>Classic Release</TARGETNAME>
-            <PATHTYPE>Name</PATHTYPE>
-            <PATH>tabpgwin.cpp</PATH>
-            <PATHFORMAT>MacOS</PATHFORMAT>
-        </FILEREF>
-        <GROUP><NAME>wx</NAME>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_PPC.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_PPC_d.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Carbon Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_CARBON_d.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Carbon Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_CARBON.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Carbon Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_CARBON.rsrc</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_PPC.rsrc</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>tiff.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>zlib.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>png.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>tiffd.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>jpeg.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-        </GROUP>
-        <GROUP><NAME>MSL ANSI Libraries</NAME>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>console.stubs.c</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL RuntimePPC.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL C++.PPC.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL C.PPC.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Carbon Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL C.CARBON.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-        </GROUP>
-        <GROUP><NAME>Win32 SDK</NAME>
-        </GROUP>
-        <GROUP><NAME>MacOS</NAME>
-            <GROUP><NAME>Carbon</NAME>
-                <FILEREF>
-                    <TARGETNAME>Carbon Debug</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Carbon Debug</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </GROUP>
-            <GROUP><NAME>Classic</NAME>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </GROUP>
-        </GROUP>
-    </GROUPLIST>
-
-</PROJECT>
diff --git a/demos/dbbrowse/dbgrid.cpp b/demos/dbbrowse/dbgrid.cpp
deleted file mode 100644 (file)
index d7a3b76..0000000
+++ /dev/null
@@ -1,424 +0,0 @@
-//----------------------------------------------------------------------------------------
-// Name:        DBGrid.cpp
-// Purpose:     wxGrid sample
-// Author:      Mark Johnson
-// Modified by: 19990929.mj10777 a reuseable DBGrid
-// Created:     19990929
-// Copyright:   (c)
-// Licence:     wxWindows license
-// RCS-ID:      $Id$
-//----------------------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-//----------------------------------------------------------------------------------------
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-//----------------------------------------------------------------------------------------
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-//----------------------------------------------------------------------------------------
-//-- all #includes that every .cpp needs             --- 19990807.mj10777 ----------------
-//----------------------------------------------------------------------------------------
-#include "std.h"    // sorgsam Pflegen !
-//----------------------------------------------------------------------------------------
-BEGIN_EVENT_TABLE(DBGrid, wxGrid)
-    EVT_MOTION (DBGrid::OnMouseMove)
-    // DBGrid
-    // ------------
-    EVT_GRID_CELL_CHANGE( DBGrid::OnCellChange )
-    EVT_GRID_CELL_LEFT_CLICK( DBGrid::OnCellLeftClick )
-    EVT_GRID_CELL_LEFT_DCLICK( DBGrid::OnCellLeftDClick )
-    EVT_GRID_CELL_RIGHT_CLICK( DBGrid::OnCellRightClick )
-    EVT_GRID_CELL_RIGHT_DCLICK( DBGrid::OnCellRightDClick )
-    // EVT_GRID_COL_SIZE( DBGrid::OnColSize )
-    // EVT_GRID_ROW_SIZE( DBGrid::OnRowSize )
-    EVT_GRID_EDITOR_SHOWN( DBGrid::OnEditorShown )
-    EVT_GRID_EDITOR_HIDDEN( DBGrid::OnEditorHidden )
-    EVT_GRID_LABEL_LEFT_CLICK( DBGrid::OnLabelLeftClick )
-    EVT_GRID_LABEL_LEFT_DCLICK( DBGrid::OnLabelLeftDClick )
-    EVT_GRID_LABEL_RIGHT_CLICK( DBGrid::OnLabelRightClick )
-    EVT_GRID_LABEL_RIGHT_DCLICK( DBGrid::OnLabelRightDClick )
-    EVT_GRID_RANGE_SELECT( DBGrid::OnRangeSelected )
-    EVT_GRID_ROW_SIZE( DBGrid::OnRowSize )
-    EVT_GRID_SELECT_CELL( DBGrid::OnSelectCell )
-    EVT_MENU(GRID_EDIT,DBGrid::OnModusEdit)
-    EVT_MENU(GRID_BROWSE,DBGrid::OnModusBrowse)
-END_EVENT_TABLE()
-
-//----------------------------------------------------------------------------------------
-//           wxListCtrl(parent, id, pos, size, style)
-//           wxGrid(parent,wxID_ANY,wxPoint( 0, 0 ), wxSize( 400, 300 ) );
-//----------------------------------------------------------------------------------------
-// DBGrid
-//----------------------------------------------------------------------------------------
-// DBGrid::DBGrid(wxWindow *parent, const wxWindowID id,const wxPoint& pos,const wxSize& size):
-//          wxGrid(parent, id, pos, size)
-DBGrid::DBGrid(wxWindow *parent, const wxWindowID id,const wxPoint& pos,const wxSize& size, long style):
-wxGrid(parent, id, pos, size, style)
-{
-    b_EditModus = false;
-    //---------------------------------------------------------------------------------------
-    popupMenu1 = new wxMenu;
-    popupMenu1->Append(GRID_EDIT, _("Edit Modus"));
-    popupMenu2 = new wxMenu;
-    popupMenu2->Append(GRID_BROWSE, _("Browse Modus"));
-}
-
-//----------------------------------------------------------------------------------------
-DBGrid::~DBGrid()
-{
-    delete popupMenu1;
-    delete popupMenu2;
-}
-
-//----------------------------------------------------------------------------------------
-int  DBGrid::OnTableView(wxString Table)
-{
-    wxStopWatch sw;
-    //---------------------------------------------------------------------------------------
-    int  x,y,z;
-    wxString Temp0;
-    wxBeginBusyCursor();
-    SetDefaultCellFont(* pDoc->ft_Doc);
-    //---------------------------------------------------------------------------------------
-    ct_BrowserDB = (db_Br+i_Which)->ct_BrowserDB;                       // Get the DSN Pointer
-    //---------------------------------------------------------------------------------------
-    if (ct_BrowserDB)                                                   // Valid pointer (!= NULL) ?
-    {      // Pointer is Valid, use the wxDatabase Information
-        for (x=0;x<ct_BrowserDB->numTables;x++)                            // go through the Tables
-        {
-            if (!wxStrcmp((ct_BrowserDB->pTableInf+x)->tableName,Table))      // is this our Table ?
-            {    // Yes, the Data of this Table shall be put into the Grid
-                int ValidTable = x;                                              // Save the Tablenumber
-                (db_Br+i_Which)->OnSelect(Table,false);                          // Select * from "table"
-                // Set the local Pointer to the Column Information we are going to use
-                (db_Br+i_Which)->cl_BrowserDB = (ct_BrowserDB->pTableInf+x)->pColInf;
-                if ((ct_BrowserDB->pTableInf+x)->pColInf)                        // Valid pointer (!= NULL) ?
-                {   // Pointer is Valid, Column Informationen sind Vorhanden
-                    int i = (db_Br+i_Which)->i_Records;                             // How many Records are there
-                    (db_Br+i_Which)->i_Which = ValidTable;                          // Still used ???? mj10777
-                    if (i == 0)     // If the Table is empty, then show one empty row
-                        i++;
-                    // wxLogMessage(_("\n-I-> DBGrid::OnTableView() : Vor CreateGrid"));
-                    CreateGrid(i,(ct_BrowserDB->pTableInf+x)->numCols);             // Records , Columns
-                    for (y=0;y<(ct_BrowserDB->pTableInf+x)->numCols;y++)            // Loop through the Fields
-                    {  // The Field / Column name is used here as Row Titel
-                        SetColLabelValue(y,((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName);
-                        SetColSize(y,95);
-                    }  // for (y=0;y<(ct_BrowserDB->pTableInf+x)->numCols;y++)
-                    SetColSize(((ct_BrowserDB->pTableInf+x)->numCols-1),120);       // Make the last Column Wider
-                    // The Grid has been created, now fill it
-                    for (z=0;z<(db_Br+i_Which)->i_Records;z++)                      // Loop through the Records
-                    {
-                        Temp0.Printf(_T("%06d"),z+1);  SetRowLabelValue(z,Temp0);          // Set Row Lable Value
-                        (db_Br+i_Which)->OnGetNext((ct_BrowserDB->pTableInf+ValidTable)->numCols,false);
-                        for (y=0;y<(ct_BrowserDB->pTableInf+ValidTable)->numCols;y++) // Loop through the Fields
-                        { // BrowserDB::OnGetNext Formats the field Value into tablename
-                            SetCellValue(z, y,((db_Br+i_Which)->cl_BrowserDB+y)->tableName);
-                        }
-#if wxUSE_STATUSBAR
-                        if (z % 50 == 0)
-                        {
-                            Temp0.Printf(_("-I-> DBGrid::OnTableView(%s) - Record %6d (from %d) has been read."),Table.c_str(),z,(db_Br+i_Which)->i_Records);
-                            pDoc->p_MainFrame->SetStatusText(Temp0, 0);
-                        }
-#endif // wxUSE_STATUSBAR
-                    }  // for (z=0;z<(db_Br+i_Which)->i_Records;z++)
-                    Temp0.Printf(_("-I-> DBGrid::OnTableView(%s) - %6d Records have been read. - Time needed : %ld ms"),Table.c_str(),z,sw.Time());
-                    wxLogMessage(Temp0);
-#if wxUSE_STATUSBAR
-                    pDoc->p_MainFrame->SetStatusText(Temp0, 0);
-#endif // wxUSE_STATUSBAR
-                    // The Grid has been filled, now leave
-                    goto Weiter;
-                }   // if ((ct_BrowserDB->pTableInf+x)->pColInf)
-                else
-                    wxLogMessage(_("\n-E-> DBGrid::OnTableView() : Invalid Column Pointer : Failed"));
-            }    // if ((ct_BrowserDB->pTableInf+x)->tableType == "TABLE")
-        }     // for (x=0;x<ct_BrowserDB->numTables;x++)
-    }      // if (ct_BrowserDB)
-    else
-        wxLogMessage(_("\n-E-> DBGrid::OnTableView() : Invalid DSN Pointer : Failed"));
-    //---------------------------------------------------------------------------------------
-Weiter:
-    EnableEditing(b_EditModus);     // Deactivate in-place Editing
-    wxEndBusyCursor();
-    //---------------------------------------------------------------------------------------
-    wxLogMessage(_("-I-> DBGrid::OnTableView() - End"));
-    return 0;
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnModusEdit(wxCommandEvent& WXUNUSED(event))
-{
-    b_EditModus = true;             // Needed by PopupMenu
-    EnableEditing(b_EditModus);     // Activate in-place Editing
-    UpdateDimensions();             // Redraw the Grid
-    // wxLogMessage(_("-I-> DBGrid::OnModusEdit() - End"));
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnModusBrowse(wxCommandEvent& WXUNUSED(event))
-{
-    b_EditModus = false;            // Needed by PopupMenu
-    EnableEditing(b_EditModus);     // Deactivate in-place Editing
-    UpdateDimensions();             // Redraw the Grid
-    // wxLogMessage(_("-I-> DBGrid::OnModusBrowse() - End"));
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnEditorShown( wxGridEvent& ev )
-{
-    // wxLogMessage(_("-I-> DBGrid::OnEditorShown() - End"));
-    ev.Skip();
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnEditorHidden( wxGridEvent& ev )
-{
-    // wxLogMessage(_("-I-> DBGrid::OnEditorHidden() - End"));
-    ev.Skip();
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnSelectCell( wxGridEvent& ev )
-{
-    logBuf = wxEmptyString;
-    logBuf << _T("Selected cell at row ") << ev.GetRow()
-        << _T(" col ") << ev.GetCol();
-    wxLogMessage( _T("%s"), logBuf.c_str() );
-    // you must call Skip() if you want the default processing
-    // to occur in wxGrid
-    ev.Skip();
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnMouseMove(wxMouseEvent &event)
-{
-    MousePos = event.GetPosition();
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnLabelLeftClick( wxGridEvent& ev )
-{
-    logBuf = _T("DBGrid::OnLabelLeftClick : ");
-    if ( ev.GetRow() != -1 )
-    {
-        logBuf << _T("row label ") << ev.GetRow();
-    }
-    else if ( ev.GetCol() != -1 )
-    {
-        logBuf << _T("col label ") << ev.GetCol();
-    }
-    else
-    {
-        logBuf << _T("corner label");
-    }
-    if ( ev.ShiftDown() )
-        logBuf << _T(" (shift down)");
-
-    // wxLogMessage( "%s", logBuf.c_str() );
-    logBuf += _T("\n");
-    wxLogMessage(logBuf.c_str());
-    ev.Skip();
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnLabelRightClick( wxGridEvent& ev )
-{
-    //-------------------------------------------------------
-    if (b_EditModus)
-        PopupMenu(popupMenu2,MousePos.x,MousePos.y);
-    else
-        PopupMenu(popupMenu1,MousePos.x,MousePos.y);
-    //-------------------
-    logBuf = _T("DBGrid::OnLabelRightClick : ");
-    if ( ev.GetRow() != -1 )
-    {
-        logBuf << _T("row label ") << ev.GetRow();
-    }
-    else if ( ev.GetCol() != -1 )
-    {
-        logBuf << _T("col label ") << ev.GetCol();
-    }
-    else
-    {
-        logBuf << _T("corner label");
-    }
-    if ( ev.ShiftDown() )
-        logBuf << _T(" (shift down)");
-
-    // wxLogMessage( "%s", logBuf.c_str() );
-    logBuf += _T("\n");
-    wxLogMessage(logBuf.c_str());
-    ev.Skip();
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnLabelLeftDClick( wxGridEvent& ev )
-{
-    logBuf = _T("DBGrid::OnLabelLeftDClick : ");
-    if ( ev.GetRow() != -1 )
-    {
-        logBuf << _T("row label ") << ev.GetRow();
-    }
-    else if ( ev.GetCol() != -1 )
-    {
-        logBuf << _T("col label ") << ev.GetCol();
-    }
-    else
-    {
-        logBuf << _T("corner label");
-    }
-    if ( ev.ShiftDown() )
-        logBuf << _T(" (shift down)");
-
-    // wxLogMessage( _T("%s"), logBuf.c_str() );
-    logBuf += _T("\n");
-    wxLogMessage(logBuf.c_str());
-    ev.Skip();
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnLabelRightDClick( wxGridEvent& ev )
-{
-    logBuf = _T("DBGrid::OnLabelRightDClick : ");
-    if ( ev.GetRow() != -1 )
-    {
-        logBuf << _T("row label ") << ev.GetRow();
-    }
-    else if ( ev.GetCol() != -1 )
-    {
-        logBuf << _T("col label ") << ev.GetCol();
-    }
-    else
-    {
-        logBuf << _T("corner label");
-    }
-    if ( ev.ShiftDown() )
-        logBuf << _T(" (shift down)");
-    // wxLogMessage( "%s", logBuf.c_str() );
-    logBuf += _T("\n");
-    wxLogMessage(logBuf.c_str());
-    ev.Skip();
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnCellLeftClick( wxGridEvent& ev )
-{
-    logBuf = _T("DBGrid::OnCellLeftClick : ");
-    logBuf << _T("Cell at row ") << ev.GetRow()
-        << _T(" col ") << ev.GetCol();
-    // wxLogMessage( "%s", logBuf.c_str() );
-    // wxMessageBox(logBuf);
-    logBuf += _T("\n");
-    wxLogMessage(logBuf.c_str());
-    // you must call event skip if you want default grid processing
-    // (cell highlighting etc.)
-    //
-    ev.Skip();
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnCellRightClick( wxGridEvent& ev )
-{
-    logBuf = _T("DBGrid::OnCellRightClick : ");
-    logBuf << _T("Cell at row ") << ev.GetRow()
-        << _T(" col ") << ev.GetCol();
-    // wxLogMessage( "%s", logBuf.c_str() );
-    // wxMessageBox(logBuf);
-    logBuf += _T("\n");
-    wxLogMessage(logBuf.c_str());
-    // you must call event skip if you want default grid processing
-    // (cell highlighting etc.)
-    //
-    ev.Skip();
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnCellLeftDClick( wxGridEvent& ev )
-{
-    logBuf = _T("DBGrid::OnCellLeftDClick : ");
-    logBuf << _T("Cell at row ") << ev.GetRow()
-        << _T(" col ") << ev.GetCol();
-    // wxLogMessage( "%s", logBuf.c_str() );
-    // wxMessageBox(logBuf);
-    logBuf += _T("\n");
-    wxLogMessage(logBuf.c_str());
-    // you must call event skip if you want default grid processing
-    // (cell highlighting etc.)
-    //
-    ev.Skip();
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnCellRightDClick( wxGridEvent& ev )
-{
-    logBuf = _T("DBGrid::OnCellRightDClick : ");
-    logBuf << _T("Cell at row ") << ev.GetRow()
-        << _T(" col ") << ev.GetCol();
-    // wxLogMessage( "%s", logBuf.c_str() );
-    // wxMessageBox(logBuf);
-    logBuf += _T("\n");
-    wxLogMessage(logBuf.c_str());
-    // you must call event skip if you want default grid processing
-    // (cell highlighting etc.)
-    //
-    ev.Skip();
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnCellChange( wxGridEvent& ev )
-{
-    logBuf = _T("DBGrid::OnCellChange : ");
-    logBuf << _T("Cell at row ") << ev.GetRow()
-        << _T(" col ") << ev.GetCol();
-    // wxLogMessage( "%s", logBuf.c_str() );
-    // wxMessageBox(logBuf);
-    logBuf += _T("\n");
-    wxLogMessage(logBuf.c_str());
-    // you must call event skip if you want default grid processing
-    // (cell highlighting etc.)
-    //
-    ev.Skip();
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnRowSize( wxGridSizeEvent& ev )
-{
-    logBuf = _T("DBGrid::OnRowSize : ");
-    logBuf << _T("Resized row ") << ev.GetRowOrCol();
-    // wxLogMessage( "%s", logBuf.c_str() );
-    logBuf += _T("\n");
-    wxLogMessage(logBuf.c_str());
-    ev.Skip();
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnColSize( wxGridSizeEvent& ev )
-{
-    logBuf = _T("DBGrid::OnColSize : ");
-    logBuf << _T("Resized col ") << ev.GetRowOrCol();
-    // wxLogMessage( "%s", logBuf.c_str() );
-    logBuf += _T("\n");
-    wxLogMessage(logBuf.c_str());
-    ev.Skip();
-}
-
-//----------------------------------------------------------------------------------------
-void DBGrid::OnRangeSelected( wxGridRangeSelectEvent& ev )
-{
-    logBuf = _T("DBGrid::OnRangeSelected : ");
-    logBuf  << _T("Selected cells from row ") << ev.GetTopRow()
-        << _T(" col ") << ev.GetLeftCol()
-        << _T(" to row ") << ev.GetBottomRow()
-        << _T(" col ") << ev.GetRightCol();
-    logBuf += _T("\n");
-    // wxLogMessage( "%s", logBuf.c_str() );
-    wxLogMessage(logBuf.c_str());
-    ev.Skip();
-}
-//----------------------------------------------------------------------------------------
diff --git a/demos/dbbrowse/dbgrid.h b/demos/dbbrowse/dbgrid.h
deleted file mode 100644 (file)
index 7ff7629..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-//----------------------------------------------------------------------------------------
-// Name:        DBGrid.h
-// Purpose:     shows seleted Table in a Grid
-// Author:      Mark Johnson
-// Modified by: 20000126.mj10777
-// Created:
-// Copyright:   (c) Mark Johnson
-// Licence:     wxWindows license
-// RCS-ID:      $Id$
-//----------------------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------------------
-class MainDoc;
-
-//----------------------------------------------------------------------------------------
-class DBGrid: public wxGrid
-{
-public:
-    DBGrid(wxWindow *parent, const wxWindowID id,const wxPoint& pos,const wxSize& size, long style);
-    virtual ~DBGrid();
-    //---------------------------------------------------------------------------------------
-    int        i_TabArt;   // Tab = 0 ; Page = 1;
-    int        i_ViewNr;   // View Nummer in Tab / Page
-    int        i_Which;    // Which View, Database is this/using
-    //---------------------------------------------------------------------------------------
-    MainDoc*   pDoc;
-    wxDbInf*   ct_BrowserDB;
-    BrowserDB* db_Br;
-    wxMenu   *popupMenu1; // OnDBClass
-    wxMenu   *popupMenu2; // OnDBGrid & OnTableclass
-    bool     b_EditModus;
-    //---------------------------------------------------------------------------------------
-    wxString logBuf,Temp0;
-    wxPoint  MousePos;
-    //---------------------------------------------------------------------------------------
-    void OnModusEdit(wxCommandEvent& event);
-    void OnModusBrowse(wxCommandEvent& event);
-    void OnMouseMove(wxMouseEvent& event);
-    int  OnTableView(wxString Table);
-    //-----
-    void OnCellChange( wxGridEvent& );
-    void OnCellLeftClick( wxGridEvent& );
-    void OnCellLeftDClick( wxGridEvent& );
-    void OnCellRightClick( wxGridEvent& );
-    void OnCellRightDClick( wxGridEvent& );
-    void OnColSize( wxGridSizeEvent& );
-    void OnEditorShown( wxGridEvent& );
-    void OnEditorHidden( wxGridEvent& );
-    void OnLabelLeftClick( wxGridEvent& );
-    void OnLabelLeftDClick( wxGridEvent& );
-    void OnLabelRightClick( wxGridEvent& );
-    void OnLabelRightDClick( wxGridEvent& );
-    void OnRangeSelected( wxGridRangeSelectEvent& );
-    void OnRowSize( wxGridSizeEvent& );
-    void OnSelectCell( wxGridEvent& );
-    //---------------------------------------------------------------------------------------
-    DECLARE_EVENT_TABLE()
-};
-
-//----------------------------------------------------------------------------------------
-#define GRID_01_BEGIN      1200
-#define GRID_BROWSE        1201
-#define GRID_EDIT          1202
-#define GRID_01_END        1203
-//----------------------------------------------------------------------------------------
-
diff --git a/demos/dbbrowse/dbtree.cpp b/demos/dbbrowse/dbtree.cpp
deleted file mode 100644 (file)
index 751e730..0000000
+++ /dev/null
@@ -1,435 +0,0 @@
-//----------------------------------------------------------------------------------------
-// Name:        DBTree.cpp/.h
-// Purpose:     Tree with Table and Views, branches show Field information
-// Author:      Mark Johnson
-// Modified by:
-// Created:     19991129
-// RCS-ID:      $Id$
-// Copyright:   (c) Mark Johnson, Berlin Germany
-// Licence:     wxWindows license
-//----------------------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-//----------------------------------------------------------------------------------------
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-//----------------------------------------------------------------------------------------
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-//----------------------------------------------------------------------------------------
-#ifndef __WXMSW__
-#endif
-//----------------------------------------------------------------------------------------
-//-- all #includes that every .cpp needs             --- 19990807.mj10777 ----------------
-//----------------------------------------------------------------------------------------
-#include "std.h"    // sorgsam Pflegen !
-
-//----------------------------------------------------------------------------------------
-//-- Global functions --------------------------------------------------------------------
-//----------------------------------------------------------------------------------------
-static inline const wxChar *bool2String(bool b)
-{
-    return b ? wxEmptyString : _T("not ");
-}
-
-//----------------------------------------------------------------------------------------
-BEGIN_EVENT_TABLE(DBTree, wxTreeCtrl)
-    EVT_MOTION (DBTree::OnMouseMove)
-    EVT_TREE_SEL_CHANGED(TREE_CTRL_DB, DBTree::OnSelChanged)
-    EVT_TREE_ITEM_RIGHT_CLICK(TREE_CTRL_DB,DBTree::OnRightSelect)
-    EVT_MENU(DATA_SHOW,DBTree::OnDBGrid)
-    EVT_MENU(DATA_DB,DBTree::OnDBClass)
-    EVT_MENU(DATA_TABLE,DBTree::OnTableClass)
-    EVT_MENU(DATA_TABLE_ALL,DBTree::OnTableClassAll)
-END_EVENT_TABLE()
-//----------------------------------------------------------------------------------------
-// DBTree implementation
-//----------------------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(DBTree, wxTreeCtrl)
-
-//----------------------------------------------------------------------------------------
-DBTree::DBTree(wxWindow *parent)  : wxTreeCtrl(parent)
-{
-}
-
-//----------------------------------------------------------------------------------------
-DBTree::DBTree(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const wxSize& size, long style)
-: wxTreeCtrl(parent, id, pos, size, style)
-{
-    const int image_size = 16;
-    // Make an image list containing small icons
-    p_imageListNormal = new wxImageList(image_size, image_size, true);
-    // should correspond to TreeIc_xxx enum
-#if !defined(__WXMSW__)
-#include "bitmaps/logo.xpm"
-#include "bitmaps/dsnclose.xpm"
-#include "bitmaps/dsnopen.xpm"
-#include "bitmaps/tab.xpm"
-#include "bitmaps/view.xpm"
-#include "bitmaps/col.xpm"
-#include "bitmaps/key.xpm"
-#include "bitmaps/keyf.xpm"
-#include "bitmaps/d_open.xpm"
-#include "bitmaps/d_closed.xpm"
-#endif
-    p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(aLogo)).ConvertToImage().Rescale(image_size, image_size)));
-    p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DsnClosed)).ConvertToImage().Rescale(image_size, image_size)));
-    p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DsnOpen)).ConvertToImage().Rescale(image_size, image_size)));
-    p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(TAB)).ConvertToImage().Rescale(image_size, image_size)));
-    p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(VIEW)).ConvertToImage().Rescale(image_size, image_size)));
-    p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(COL)).ConvertToImage().Rescale(image_size, image_size)));
-    p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(KEY)).ConvertToImage().Rescale(image_size, image_size)));
-    p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(KEYF)).ConvertToImage().Rescale(image_size, image_size)));
-    p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DocOpen)).ConvertToImage().Rescale(image_size, image_size)));
-    p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DocOpen)).ConvertToImage().Rescale(image_size, image_size)));
-    SetImageList(p_imageListNormal);
-    ct_BrowserDB = NULL;
-    popupMenu1   = NULL;
-    popupMenu2   = NULL;
-}
-
-//----------------------------------------------------------------------------------------
-DBTree::~DBTree()
-{
-    delete ct_BrowserDB;
-
-    //  delete (pDoc->db_Br+i_Which);
-    // wxLogMessage("DBTree::~DBTree() - Vor  OnCloseDB()");
-    (pDoc->db_Br+i_Which)->OnCloseDB(false);
-    // wxLogMessage("DBTree::~DBTree() - Nach OnCloseDB()");
-    (pDoc->db_Br+i_Which)->db_BrowserDB = NULL;
-    (pDoc->db_Br+i_Which)->ct_BrowserDB = NULL;
-    (pDoc->db_Br+i_Which)->cl_BrowserDB = NULL;
-
-    delete p_imageListNormal;
-    if (popupMenu1)       // If the DSN has no Tables, then no delete should be done !
-        delete popupMenu1;
-    if (popupMenu1)       // If the DSN has no Tables, then no delete should be done !
-        delete popupMenu2;
-}
-
-//----------------------------------------------------------------------------------------
-#undef TREE_EVENT_HANDLER
-
-//----------------------------------------------------------------------------------------
-int DBTree::OnPopulate()
-{
-    wxTreeItemId Root, Folder, Docu, Funkt;
-    int i,x,y,z=0, TableType;
-    wxString SQL_TYPE, DB_TYPE;
-    SetFont(* pDoc->ft_Doc);
-    //---------------------------------------------------------------------------------------
-    if ((pDoc->db_Br+i_Which)->Initialize(false))
-    {
-        wxStopWatch sw;
-        wxBeginBusyCursor();
-        ct_BrowserDB = (pDoc->db_Br+i_Which)->OnGetCatalog(false);
-        if (ct_BrowserDB)
-        { // Use the wxDatabase Information
-            Temp0.Printf(_T("%s - (%s) (%s)"), s_DSN.c_str(),ct_BrowserDB->catalog, ct_BrowserDB->schema);
-            Root = AddRoot(Temp0,TreeIc_DsnOpen,TreeIc_DsnOpen,new DBTreeData(_T("Root")));
-            for (x=0;x<ct_BrowserDB->numTables;x++)
-            {
-                wxYield();
-                TableType = 0; // TABLE = 1 ; VIEW = 2 ; 0 We are not interested in
-                if (!wxStrcmp((ct_BrowserDB->pTableInf+x)->tableType,_T("TABLE")))    // only TABLES
-                    TableType = 1;
-                if (!wxStrcmp((ct_BrowserDB->pTableInf+x)->tableType,_T("VIEW")))     // and  VIEWS
-                    TableType = 2;
-                if (TableType)    // only TABLES or Views
-                {
-                    Temp1.Printf(_T("TN(%s"),(ct_BrowserDB->pTableInf+x)->tableName);
-                    //----
-                    (ct_BrowserDB->pTableInf+x)->pColInf = (pDoc->db_Br+i_Which)->OnGetColumns((ct_BrowserDB->pTableInf+x)->tableName,(ct_BrowserDB->pTableInf+x)->numCols,false);
-                    //----
-                    if ((ct_BrowserDB->pTableInf+x)->pColInf)
-                    {
-                        if (TableType == 1)  // Table
-                        {
-                            Temp0.Printf(_("Table-Name(%s) with (%d)Columns ; Remarks(%s)"),  (ct_BrowserDB->pTableInf+x)->tableName,
-                                (ct_BrowserDB->pTableInf+x)->numCols,(ct_BrowserDB->pTableInf+x)->tableRemarks);
-                            Folder = AppendItem(Root,Temp0,TreeIc_TAB,TreeIc_TAB, new DBTreeData(Temp1));
-                        }
-                        if (TableType == 2)  // View
-                        {
-                            Temp0.Printf(_("View-Name(%s) with (%d)Columns ; Remarks(%s)"),  (ct_BrowserDB->pTableInf+x)->tableName,
-                                (ct_BrowserDB->pTableInf+x)->numCols,(ct_BrowserDB->pTableInf+x)->tableRemarks);
-                            Folder = AppendItem(Root,Temp0,TreeIc_VIEW,TreeIc_VIEW, new DBTreeData(Temp1));
-                        }
-                        for (y=0;y<(ct_BrowserDB->pTableInf+x)->numCols;y++)
-                        {
-                            Temp1.Printf(_T("FN(%s"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName);
-                            // Here is where we find out if the Column is a Primary / Foreign Key
-                            if (((ct_BrowserDB->pTableInf+x)->pColInf+y)->PkCol != 0)  // Primary Key
-                            {
-                                Temp2.Printf(_T("(%d) - %s"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->PkCol,((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName);
-                                Docu = AppendItem(Folder,Temp2,TreeIc_KEY,TreeIc_KEY,new DBTreeData(Temp1));
-                                Temp2 = ((ct_BrowserDB->pTableInf+x)->pColInf+y)->PkTableName;
-                                if (Temp2.empty())
-                                    Temp2 = _("None");
-                                Temp2.Printf(_("This Primary Key is used in the following Tables : %s"),Temp2.c_str());
-                                Funkt = AppendItem(Docu,Temp2,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData(_T("KEY")));
-                            }
-                            else
-                            {
-                                if (((ct_BrowserDB->pTableInf+x)->pColInf+y)->FkCol != 0) // Foreign Key
-                                {
-                                    Temp2.Printf(_T("(%d) - %s"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->FkCol,((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName);
-                                    Docu = AppendItem(Folder,Temp2,TreeIc_KEYF,TreeIc_KEYF,new DBTreeData(Temp1));
-                                    Temp2.Printf(_("This Foreign Key comes from the following Table : %s"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->FkTableName);
-                                    Funkt = AppendItem(Docu,Temp2,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData(_T("KEYF")));
-                                }
-                                else
-                                    Docu = AppendItem(Folder,((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName,TreeIc_COL,TreeIc_COL,new DBTreeData(Temp1));
-                            }
-                            SQL_TYPE.Printf(_T("SQL_C_???? (%d)"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->sqlDataType);
-                            DB_TYPE.Printf(_T("DB_DATA_TYPE_???? (%d)"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->dbDataType);
-                            for (i=1;i<=(pDoc->db_Br+i_Which)->i_SqlTyp[0];i++)
-                            {
-                                if (((ct_BrowserDB->pTableInf+x)->pColInf+y)->sqlDataType == (pDoc->db_Br+i_Which)->i_SqlTyp[i])
-                                {
-                                    SQL_TYPE.Printf(_T("%s(%d) ; "),(pDoc->db_Br+i_Which)->s_SqlTyp[i].c_str(),(pDoc->db_Br+i_Which)->i_SqlTyp[i]);
-                                }
-                            } // for (i=1;i<=i_SqlTyp[0];i++)
-                            wxYield();
-                            for (i=1;i<=(pDoc->db_Br+i_Which)->i_dbTyp[0];i++)
-                            {
-                                if (((ct_BrowserDB->pTableInf+x)->pColInf+y)->dbDataType == (pDoc->db_Br+i_Which)->i_dbTyp[i])
-                                {
-                                    DB_TYPE.Printf(_T("%s(%d)"),(pDoc->db_Br+i_Which)->s_dbTyp[i].c_str(),(pDoc->db_Br+i_Which)->i_dbTyp[i]);
-                                }
-                            } // for (i=1;i<=i_dbTyp[0];i++)
-                            wxYield();
-                            SQL_TYPE += DB_TYPE;
-                            Funkt = AppendItem(Docu,SQL_TYPE,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData(SQL_TYPE));
-                            SQL_TYPE.Printf(_T("%10s %d,%d"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->typeName,
-                                ((ct_BrowserDB->pTableInf+x)->pColInf+y)->columnLength,((ct_BrowserDB->pTableInf+x)->pColInf+y)->decimalDigits);
-                            Funkt = AppendItem(Docu,SQL_TYPE,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData(SQL_TYPE));
-                        }  // for (y=0;y<(ct_BrowserDB->pTableInf+x)->numCols;y++)
-                    }   // if ((ct_BrowserDB->pTableInf+x)->pColInf)
-                    else
-                        Folder = AppendItem(Root,Temp0,TreeIc_FolderClosed,TreeIc_FolderOpen, new DBTreeData(Temp1));
-                    z++;
-//                    if (z % 10 == 0)
-                    {
-#if wxUSE_STATUSBAR
-                        Temp0.Printf(_("-I-> DBTree::OnPopulate(%s) - Table %6d (from %d) has been read."),(ct_BrowserDB->pTableInf+x)->tableName,z,ct_BrowserDB->numTables);
-                        pDoc->p_MainFrame->SetStatusText(Temp0, 0);
-#endif // wxUSE_STATUSBAR
-                    }
-                    wxYield();
-                }    // if ((ct_BrowserDB->pTableInf+x)->tableType == "TABLE" or VIEW)
-                // else
-                //  wxLogMessage(_("\n-I-> if ! TABLE or VIEW  >%s<"),(ct_BrowserDB->pTableInf+x)->tableType);
-            }     // for (x=0;x<ct_BrowserDB->numTables;x++)
-        }      // if (ct_BrowserDB)
-        else
-            wxLogMessage(_("\n-E-> DBTree::OnPopulate() : Invalid Catalog Pointer : Failed"));
-        wxEndBusyCursor();
-        Temp0.Printf(_("-I-> DBTree::OnPopulate() - %6d Tables have been read. - Time needed : %ld ms"),z,sw.Time());
-        wxLogMessage(Temp0);
-#if wxUSE_STATUSBAR
-        pDoc->p_MainFrame->SetStatusText(Temp0, 0);
-#endif // wxUSE_STATUSBAR
-    }       // if((pDoc->db_Br+i_Which)->Initialize(false))
-    else
-    {
-        wxLogMessage(_("\n-E-> DBTree::OnPopulate() : A valid Pointer could not be created : Failed"));
-        return 0;
-    }
-    //---------------------------------------------------------------------------------------
-    Expand(Root);
-    //---------------------------------------------------------------------------------------
-    popupMenu1 = NULL;
-    popupMenu1 = new wxMenu;
-    popupMenu1->Append(DATA_DB, _("Make wxDB.cpp/h "));
-    popupMenu1->AppendSeparator();
-    popupMenu1->Append(DATA_TABLE_ALL, _("Make all wxTable.cpp/h classes"));
-    popupMenu2 = NULL;
-    popupMenu2 = new wxMenu;
-    popupMenu2->Append(DATA_SHOW, _("Show Data"));
-    popupMenu2->AppendSeparator();
-    popupMenu2->Append(DATA_TABLE, _("Make wxTable.cpp/h "));
-    //---------------------------------------------------------------------------------------
-    return 0;
-}  // DBTree::OnPopulate()
-
-//----------------------------------------------------------------------------------------
-void DBTree::OnSelChanged(wxTreeEvent& WXUNUSED(event))
-{
-    int i;
-    Temp0.Empty();
-#if wxUSE_STATUSBAR
-    pDoc->p_MainFrame->SetStatusText(Temp0,0);
-#endif // wxUSE_STATUSBAR
-    // Get the Information that we need
-    wxTreeItemId itemId = GetSelection();
-    DBTreeData *item = (DBTreeData *)GetItemData(itemId);
-    if ( item != NULL )
-    {
-        int Treffer = 0;
-        Temp1.Printf(_T("%s"),item->m_desc.c_str());
-        //-------------------------------------------------------------------------------------
-        if (Temp1.Contains(_T("ODBC-")))
-        {
-            Temp1 = Temp1.Mid(5);
-            for (i=0;i<pDoc->i_DSN;i++)
-            {
-                if (Temp1 == (pDoc->p_DSN+i)->Dsn)
-                {
-                    // pDoc->OnChosenDSN(i);
-                }
-            }
-            Treffer++;
-        }
-        //--------------------------------------------------------------------------------------
-        if (Treffer == 0)
-        {
-            //-------------------------------------------------------------------------------------
-            /*
-            Temp0.Printf(_("Item '%s': %sselected, %sexpanded, %sbold,"
-            "%u children (%u immediately under this item)."),
-            item->m_desc.c_str(),
-            bool2String(IsSelected(itemId)),
-            bool2String(IsExpanded(itemId)),
-            bool2String(IsBold(itemId)),
-            GetChildrenCount(itemId),
-            GetChildrenCount(itemId));
-            LogBuf.Printf("-I-> DBTree::OnSelChanged - %s",Temp0.c_str());
-            wxLogMessage( "%s", LogBuf.c_str() );
-            */
-            //-------------------------------------------------------------------------------------
-        }
-    }
-}
-
-//----------------------------------------------------------------------------------------
-void DBTree::OnRightSelect(wxTreeEvent& WXUNUSED(event))
-{
-    int i;
-    Temp0.Empty();
-    // Get the Information that we need
-    wxTreeItemId itemId = GetSelection();
-    DBTreeData *item = (DBTreeData *)GetItemData(itemId);
-    if ( item != NULL )
-    {
-        int Treffer = 0;
-        Temp1.Printf(_T("%s"),item->m_desc.c_str());
-        //--------------------------------------------------------------------------------------
-        if (!wxStrcmp(_T("Root"),Temp1))
-        {
-            PopupMenu(popupMenu1,TreePos.x,TreePos.y);
-            Treffer++;
-        }
-        for (i=0;i<ct_BrowserDB->numTables;i++)
-        {
-            Temp2.Printf(_T("TN(%s"),(ct_BrowserDB->pTableInf+i)->tableName);
-            if (!wxStrcmp(Temp2,Temp1))
-            {
-                PopupMenu(popupMenu2,TreePos.x,TreePos.y);
-                Treffer++;
-            }
-        }
-        //--------------------------------------------------------------------------------------
-        if (Treffer == 0)
-        {
-            //-------------------------------------------------------------------------------------
-            /*
-            Temp0.Printf(_("Item '%s': %sselected, %sexpanded, %sbold,"
-            "%u children (%u immediately under this item)."),
-            item->m_desc.c_str(),
-            bool2String(IsSelected(itemId)),
-            bool2String(IsExpanded(itemId)),
-            bool2String(IsBold(itemId)),
-            GetChildrenCount(itemId),
-            GetChildrenCount(itemId));
-            LogBuf.Printf("-I-> DBTree::OnSelChanged - %s",Temp0.c_str());
-            wxLogMessage( "%s", LogBuf.c_str() );
-            */
-            //-------------------------------------------------------------------------------------
-        }
-    }
-}
-
-//----------------------------------------------------------------------------------------
-void DBTree::OnDBGrid(wxCommandEvent& WXUNUSED(event))
-{
-    int i;
-    // Get the Information that we need
-    wxTreeItemId itemId = GetSelection();
-    DBTreeData *item = (DBTreeData *)GetItemData(itemId);
-    if ( item != NULL )
-    {
-        Temp1.Printf(_T("%s"),item->m_desc.c_str());
-        for (i=0;i<ct_BrowserDB->numTables;i++)
-        {
-            Temp2.Printf(_T("TN(%s"),(ct_BrowserDB->pTableInf+i)->tableName);
-            if (!wxStrcmp(Temp2,Temp1))
-            {
-                // Temp0.Printf("(%d) Here is where a GridCtrl for >%s< will be called! ",i,(ct_BrowserDB->pTableInf+i)->tableName);
-                pDoc->OnChosenTbl(1,(ct_BrowserDB->pTableInf+i)->tableName);
-                // wxMessageBox(Temp0);
-            }
-        }
-    }
-}
-
-//----------------------------------------------------------------------------------------
-void DBTree::OnDBClass(wxCommandEvent& WXUNUSED(event))
-{
-    // int i;
-    // Get the Information that we need
-    wxTreeItemId itemId = GetSelection();
-    DBTreeData *item = (DBTreeData *)GetItemData(itemId);
-    if ( item != NULL )
-    {
-        Temp0.Printf(_("Here is where a wxDB Class for >%s< will be made! "),s_DSN.c_str());
-        wxMessageBox(Temp0);
-    }
-}
-
-//----------------------------------------------------------------------------------------
-void DBTree::OnTableClass(wxCommandEvent& WXUNUSED(event))
-{
-    int i;
-    // Get the Information that we need
-    wxTreeItemId itemId = GetSelection();
-    DBTreeData *item = (DBTreeData *)GetItemData(itemId);
-    if ( item != NULL )
-    {
-        Temp1.Printf(_T("%s"),item->m_desc.c_str());
-        for (i=0;i<ct_BrowserDB->numTables;i++)
-        {
-            Temp2.Printf(_T("TN(%s"),(ct_BrowserDB->pTableInf+i)->tableName);
-            if (!wxStrcmp(Temp2,Temp1))
-            {
-                Temp0.Printf(_("(%d) Here is where a wxTable Class for >%s< will be made! "),i,(ct_BrowserDB->pTableInf+i)->tableName);
-                wxMessageBox(Temp0);
-            }
-        }
-    }
-}
-
-//----------------------------------------------------------------------------------------
-void DBTree::OnTableClassAll(wxCommandEvent& WXUNUSED(event))
-{
-    // int i;
-    // Get the Information that we need
-    wxTreeItemId itemId = GetSelection();
-    DBTreeData *item = (DBTreeData *)GetItemData(itemId);
-    if ( item != NULL )
-    {
-        Temp0.Printf(_("Here is where all wxTable Classes in >%s< will be made! "),s_DSN.c_str());
-        wxMessageBox(Temp0);
-    }
-}
-
-//----------------------------------------------------------------------------------------
-void DBTree::OnMouseMove(wxMouseEvent &event)
-{
-    TreePos = event.GetPosition();
-}
-//----------------------------------------------------------------------------------------
diff --git a/demos/dbbrowse/dbtree.h b/demos/dbbrowse/dbtree.h
deleted file mode 100644 (file)
index 7f318e3..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-//----------------------------------------------------------------------------------------
-// Name:        dbtree.cpp/.h
-// Purpose:     Tree with Table and Views, branches show Field information
-// Author:      Mark Johnson
-// Modified by: 19991129.mj10777
-// Created:     19991129
-// Copyright:   (c) Mark Johnson
-// Licence:     wxWindows license
-// RCS-ID:      $Id$
-
-//----------------------------------------------------------------------------------------
-class MainDoc;             // Declared in doc.h file
-
-//----------------------------------------------------------------------------------------
-class DBTreeData : public wxTreeItemData
-{
-public:
-    DBTreeData(const wxString& desc) : m_desc(desc) { }
-    void ShowInfo(wxTreeCtrl *tree);
-    wxString m_desc;
-};
-
-//----------------------------------------------------------------------------------------
-class DBTree : public wxTreeCtrl
-{
-public:
-    enum
-    { // The order here must be the same as in m_imageListNormal !
-        TreeIc_Logo,                     // logo.ico
-            TreeIc_DsnClosed,                // dsnclose.ico
-            TreeIc_DsnOpen,                  // dsnopen.ico
-            TreeIc_TAB,                      // tab.ico
-            TreeIc_VIEW,                     // view.ico
-            TreeIc_COL,                      // col.ico
-            TreeIc_KEY,                      // key.ico
-            TreeIc_KEYF,                     // keyf.ico
-            TreeIc_DocOpen,                  // d_open.ico
-            TreeIc_DocClosed,                // d_closed.ico
-            TreeIc_FolderClosed,             // f_closed.ico
-            TreeIc_FolderOpen                // f_open.ico
-    };
-    wxString Temp0, Temp1, Temp2, Temp3, Temp4, Temp5;
-    //----------------------------------------------------------------------------------------
-    DBTree() { }
-    DBTree(wxWindow *parent);
-    DBTree(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const wxSize& size,long style);
-    virtual ~DBTree();
-    MainDoc *pDoc;
-    wxDbInf *ct_BrowserDB;
-    //----------------------------------------------------------------------------------------
-    int       i_TabArt;   // Tab = 0 ; Page = 1;
-    int       i_ViewNr;   // View Nummer in Tab / Page
-    int       i_Which;    // Which View, Database is this/using
-    wxString  s_DSN;      // Name of the Dataset
-    wxMenu   *popupMenu1; // OnDBClass
-    wxMenu   *popupMenu2; // OnDBGrid & OnTableclass
-    wxPoint TreePos;
-    //----------------------------------------------------------------------------------------
-    wxImageList *p_imageListNormal;
-    //----------------------------------------------------------------------------------------
-public:
-    int  OnPopulate();
-    void OnSelChanged(wxTreeEvent& event);
-    void OnRightSelect(wxTreeEvent& event);
-    void OnDBGrid(wxCommandEvent& event);
-    void OnDBClass(wxCommandEvent& event);
-    void OnTableClass(wxCommandEvent& event);
-    void OnTableClassAll(wxCommandEvent& event);
-    void OnMouseEvent(wxMouseEvent& event);
-    void OnMouseMove(wxMouseEvent& event);
-public:
-    //----------------------------------------------------------------------------------------
-    // NB: due to an ugly wxMSW hack you _must_ use DECLARE_DYNAMIC_CLASS()
-    //     if you want your overloaded OnCompareItems() to be called.
-    //     OTOH, if you don't want it you may omit the next line - this will
-    //     make default (alphabetical) sorting much faster under wxMSW.
-    DECLARE_DYNAMIC_CLASS(DBTree)
-        DECLARE_EVENT_TABLE()
-};
-
-//----------------------------------------------------------------------------------------
-#define POPUP_01_BEGIN     1100
-#define DATA_SHOW          1101
-#define DATA_DB            1102
-#define DATA_TABLE         1103
-#define DATA_TABLE_ALL     1104
-#define POPUP_01_END       1117
-//----------------------------------------------------------------------------------------
diff --git a/demos/dbbrowse/de/dbbrowse.mo b/demos/dbbrowse/de/dbbrowse.mo
deleted file mode 100644 (file)
index 22fffa8..0000000
Binary files a/demos/dbbrowse/de/dbbrowse.mo and /dev/null differ
diff --git a/demos/dbbrowse/de/dbbrowse.po b/demos/dbbrowse/de/dbbrowse.po
deleted file mode 100644 (file)
index 1d51759..0000000
+++ /dev/null
@@ -1,934 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#: ../browsedb.cpp:67 ../browsedb.cpp:80 ../browsedb.cpp:81 ../browsedb.cpp:82 ../browsedb.cpp:124 ../browsedb.cpp:151 ../browsedb.cpp:152 ../browsedb.cpp:153 ../browsedb.cpp:240 ../browsedb.cpp:460 ../browsedb.cpp:469 ../dbbrowse.cpp:123 ../dbgrid.cpp:64 ../dbgrid.cpp:66 ../dbtree.cpp:40 ../dbtree.cpp:160 ../dbtree.cpp:229 ../dbtree.cpp:234 ../doc.cpp:149 ../doc.cpp:189 ../doc.cpp:190 ../doc.cpp:234 ../doc.cpp:283 ../doc.cpp:296 ../pgmctrl.cpp:47 ../pgmctrl.cpp:122 ../pgmctrl.cpp:257 ../tabpgwin.h:105
-#, fuzzy
-msgid   ""
-msgstr  "Project-Id-Version: V1\n"
-        "POT-Creation-Date: 2000-02-21 09:49+0100\n"
-        "PO-Revision-Date: 2000-02-22 11:11-1\n"
-        "Last-Translator: Mark Johnson <mj10777@gmx.net>\n"
-        "Language-Team: mj10777 <mj1077@gmx.net>\n"
-        "MIME-Version: 1.0\n"
-        "Content-Type: text/plain; charset=CHARSET\n"
-        "Content-Transfer-Encoding: ENCODING\n"
-
-#: ../browsedb.cpp:68 ../browsedb.cpp:72 ../dbgrid.cpp:184 ../dbgrid.cpp:213 ../dbgrid.cpp:236 ../dbgrid.cpp:259 ../dbgrid.cpp:271 ../dbgrid.cpp:286 ../dbgrid.cpp:301 ../dbgrid.cpp:316 ../dbgrid.cpp:331 ../dbgrid.cpp:344 ../dbgrid.cpp:354 ../dbgrid.cpp:366
-msgid   "\n"
-msgstr  "\n"
-
-#:
-msgid   "Time"
-msgstr  "Zeit"
-
-#: ../browsedb.cpp:96
-#, c-format
-msgid   "\n"
-        "\n"
-        "-E-> BrowserDB::OnStartDB(%s) : Failed ! "
-msgstr  "\n"
-        "\n"
-        "-E-> BrowserDB::OnStartDB(%s) : Gescheitert ! "
-
-#: ../browsedb.cpp:156
-msgid   "\n"
-        "-E-> BrowserDB::OnConnectDataSource() DB CONNECTION ERROR : Unable to connect to the data source.\n"
-        "\n"
-        "Check the name of your data source to verify it has been correctly entered/spelled.\n"
-        "\n"
-        "With some databases, the user name and password must\n"
-        "be created with full rights to the table prior to making a connection\n"
-        "(using tools provided by the database manufacturer)"
-msgstr  "\n"
-        "-E-> BrowserDB::OnConnectDataSource() DB VERBINDUNGSFEHLER : Verbindungsaufbau zur Datenquelle nicht möglich.\n"
-        "\n"
-        "Check the name of your data source to verify it has been correctly entered/spelled.\n"
-        "\n"
-        "With some databases, the user name and password must\n"
-        "be created with full rights to the table prior to making a connection\n"
-        "(using tools provided by the database manufacturer)"
-
-#: ../browsedb.cpp:371
-#, c-format
-msgid   "\n"
-        "-E-> BrowserDB::OnExecSQL - ODBC-Error with ExecSql of >%s<.\n"
-        "-E-> "
-msgstr  "\n"
-        "-E-> BrowserDB::OnSelect - ODBC-Fehler mit ExecSql  >%s<.\n"
-        "-E-> "
-
-#: ../browsedb.cpp:254 ../browsedb.cpp:267 ../browsedb.cpp:281
-msgid   "\n"
-        "-E-> BrowserDB::OnGetData - ODBC-Error with GetNext \n"
-        "-E-> "
-msgstr  "\n"
-        "-E-> BrowserDB::OnGetData - ODBC-Fehler mit GetNext \n"
-        "-E-> "
-
-#: ../browsedb.cpp:209
-msgid   "\n"
-        "-E-> BrowserDB::OnGetNext - ODBC-Error with GetNext \n"
-        "-E-> "
-msgstr  "\n"
-        "-E-> BrowserDB::OnGetNext - ODBC-Fehler mit GetNext \n"
-        "-E-> "
-
-#: ../browsedb.cpp:243
-#, c-format
-msgid   "\n"
-        "-E-> BrowserDB::OnGetNext - ODBC-Error with GetNext of >%s<.\n"
-        "-E-> "
-msgstr  "\n"
-        "-E-> BrowserDB::OnGetNext - ODBC-Fehler mit GetNext bei >%s<.\n"
-        "-E-> "
-
-#: ../browsedb.cpp:337 ../browsedb.cpp:351
-#, c-format
-msgid   "\n"
-        "-E-> BrowserDB::OnSelect - ODBC-Error with ExecSql of >%s<.\n"
-        "-E-> "
-msgstr  "\n"
-        "-E-> BrowserDB::OnSelect - ODBC-Fehler mit ExecSql bei >%s<.\n"
-        "-E-> "
-
-#: ../browsedb.cpp:117
-msgid   "\n"
-        "-E-> BrowserDB::OnStartDB() : DB CONNECTION ERROR : A problem occurred while trying to get a connection to the data source"
-msgstr  "\n"
-        "-E-> BrowserDB::OnStartDB() : DB VERBINDUNGSFEHLER : Verbindungsaufbau zur Datenquelle nicht möglich"
-
-#: ../dbgrid.cpp:131
-msgid   "\n"
-        "-E-> DBGrid::OnTableView() : Invalid Column Pointer : Failed"
-msgstr  "\n"
-        "-E-> DBGrid::OnTableView() : Ungültige Spalten-Zeiger : Gescheitert"
-
-#: ../dbgrid.cpp:136
-msgid   "\n"
-        "-E-> DBGrid::OnTableView() : Invalid DSN Pointer : Failed"
-msgstr  "\n"
-        "-E-> DBGrid::OnTableView() : Ungültige DSN Zeiger : Gescheitert"
-
-#: ../dbtree.cpp:222
-msgid   "\n"
-        "-E-> DBTree::OnPopulate() : A valid Pointer could not be created : Failed"
-msgstr  "\n"
-        "-E-> DBTree::OnPopulate() : Eine gültiger Zeiger konnte nicht erstellt werden : Gescheitert"
-
-#: ../dbtree.cpp:214
-msgid   "\n"
-        "-E-> DBTree::OnPopulate() : Invalid Catalog Pointer : Failed"
-msgstr  "\n"
-        "-E-> DBTree::OnPopulate() : Ungüliter Zeiger auf Katalog : Gescheitert"
-
-#: ../browsedb.cpp:190
-msgid   "\n"
-        "-I-> BrowserDB::OnCloseDB() : End "
-msgstr  "\n"
-        "-I-> BrowserDB::OnCloseDB() : Ende"
-
-#: ../browsedb.cpp:361
-#, c-format
-msgid   "\n"
-        "-I-> BrowserDB::OnSelect(%s) Records(%d): End - Time needed : %ld ms"
-msgstr  "\n"
-        "-I-> BrowserDB::OnSelect(%s) Sätze(%d): Ende - Dauer : %ld ms"
-
-#: ../browsedb.cpp:106
-#, c-format
-msgid   "\n"
-        "-I-> BrowserDB::OnStartDB(%s) : Begin "
-msgstr  "\n"
-        "-I-> BrowserDB::OnStartDB(%s) : Begin "
-
-#: ../browsedb.cpp:110
-msgid   "\n"
-        "-I-> BrowserDB::OnStartDB() : DB is allready open."
-msgstr  "\n"
-        "-I-> BrowserDB::OnStartDB() : DB ist bereits geöffnet."
-
-#: ../doc.cpp:313
-#, c-format
-msgid   "\n"
-        "MainDoc::OnLeer(%s) : even this function will one day be available !"
-msgstr  "\n"
-        "MainDoc::OnLeer(%s) : eines Tages steht auch diese Funktion zur Verfügung !"
-
-#: ../browsedb.cpp:52
-msgid   "\n"
-        "ODBC errors:\n"
-msgstr  "\n"
-        "ODBC fehlern:\n"
-
-#: ../browsedb.cpp:47
-msgid   "   Line: "
-msgstr  "   Zeile: "
-
-#: ../dbgrid.cpp:182 ../dbgrid.cpp:211 ../dbgrid.cpp:234 ../dbgrid.cpp:257
-msgid   " (shift down)"
-msgstr  " (shift down)"
-
-#: ../doc.cpp:240
-msgid   " ? "
-msgstr  " ? "
-
-#: ../dbgrid.cpp:268 ../dbgrid.cpp:283 ../dbgrid.cpp:298 ../dbgrid.cpp:313 ../dbgrid.cpp:328 ../dbgrid.cpp:363 ../dbgrid.cpp:365
-msgid   " col "
-msgstr  " Spalte"
-
-#: ../dbgrid.cpp:364
-msgid   " to row "
-msgstr  "Teile"
-
-#: ../doc.cpp:191
-#, c-format
-msgid   "%02d) Dsn(%s) DsDesc(%s)"
-msgstr  ""
-
-#: ../dbgrid.cpp:112
-#, c-format
-msgid   "%06d"
-msgstr  "%06d"
-
-#: ../dbtree.cpp:195
-#, c-format
-msgid   "%10s %d,%d"
-msgstr  "%10s %d,%d"
-
-#: ../browsedb.cpp:48
-#, c-format
-msgid   "%d"
-msgstr  "%d"
-
-#: ../dbbrowse.cpp:128 ../dbbrowse.cpp:163 ../dbbrowse.cpp:164 ../dbtree.cpp:253 ../dbtree.cpp:298 ../dbtree.cpp:343 ../dbtree.cpp:378 ../pgmctrl.cpp:143 ../pgmctrl.cpp:195 ../pgmctrl.cpp:212
-#, c-format
-msgid   "%s"
-msgstr  "%s"
-
-#: ../dbbrowse.cpp:182
-#, c-format
-msgid   "%s - %s"
-msgstr  "%s - %s"
-
-#: ../dbtree.cpp:121
-#, c-format
-msgid   "%s - (%s) (%s)"
-msgstr  "%s - (%s) (%s)"
-
-#: ../pgmctrl.cpp:102
-#, c-format
-msgid   "%s Functions"
-msgstr  "%s Funktionen"
-
-#: ../dbbrowse.cpp:217
-#, c-format
-msgid   "%s has started !"
-msgstr  "%s wurde gestartet !"
-
-#: ../doc.cpp:170
-#, c-format
-msgid   "%s%c%s"
-msgstr  "%s%c%s"
-
-#: ../dbtree.cpp:190
-#, c-format
-msgid   "%s(%d)"
-msgstr  "%s(%d)"
-
-#: ../dbtree.cpp:183
-#, c-format
-msgid   "%s(%d) ; "
-msgstr  "%s(%d) ; "
-
-#: ../dbbrowse.cpp:209
-msgid   "&About"
-msgstr  "&Info"
-
-#: ../dbbrowse.cpp:213
-msgid   "&File"
-msgstr  "&Datei"
-
-#: ../dbbrowse.cpp:207 ../dbbrowse.cpp:214
-msgid   "&Help"
-msgstr  "&Hilfe"
-
-#: ../dbtree.cpp:157 ../dbtree.cpp:169
-#, c-format
-msgid   "(%d) - %s"
-msgstr  "(%d) - %s"
-
-#: ../dbtree.cpp:384
-#, c-format
-msgid   "(%d) Here is where a wxTable Class for >%s< will be made! "
-msgstr  "(%d) Hier ist wo eine wxTable Klasse für >%s< erstellt wird!"
-
-#: ../browsedb.cpp:218
-msgid   "-E->"
-msgstr  "-E->"
-
-#: ../dbbrowse.cpp:244
-#, c-format
-msgid   "-E-> %s : AddBook error : s_LangHelp(%s)"
-msgstr  "-E-> %s : AddBook fehler : s_LangHelp(%s)"
-
-#: ../dbbrowse.cpp:148
-#, c-format
-msgid   "-E-> %s : SetLocale error : langid(%s) ; language(%s)"
-msgstr  "-E-> %s : SetLocale fehler : langid(%s) ; language(%s)"
-
-#: ../browsedb.cpp:376
-msgid   "-E-> BrowserDB::OnExecSql - ExecSql()"
-msgstr  "-E-> BrowserDB::OnExecSql - ExecSql()"
-
-#: ../browsedb.cpp:314
-#, c-format
-msgid   "-E-> BrowserDB::OnGetNext - DB_DATA_TYPE_?? (%d) in Col(%s)"
-msgstr  "-E-> BrowserDB::OnGetNext - DB_DATA_TYPE_?? (%d) in Col(%s)"
-
-#: ../browsedb.cpp:340
-msgid   "-E-> BrowserDB::OnSelect - GetData()"
-msgstr  "-E-> BrowserDB::OnSelect - GetData()"
-
-#: ../doc.cpp:218
-msgid   "-E-> Fatal situation"
-msgstr  "-E-> Tötliche Situation"
-
-#: ../browsedb.cpp:318
-#, c-format
-msgid   "-E-> unknown Format(%d) - sql(%d)"
-msgstr  "-E-> unbekannte Format(%d) - sql(%d)"
-
-#: ../pgmctrl.cpp:165
-msgid   "-E-> wxConfigBase.p_ProgramCfg->DeleteAll() was not successful !"
-msgstr  "-E-> wxConfigBase.p_ProgramCfg->DeleteAll() war nicht Erfolgreich !"
-
-#: ../pgmctrl.cpp:149
-msgid   "-I-> After a programm restart, the language will be changed to English."
-msgstr  "-I-> Nach ein Programm neustart, wird die Sprache ins Englische geändert."
-
-#: ../pgmctrl.cpp:156
-msgid   "-I-> After a programm restart, the language will be changed to German."
-msgstr  "-I-> Nach ein Programm neustart, wird die Sprache ins Deutsche geändert."
-
-#: ../browsedb.cpp:176
-msgid   "-I-> BrowserDB::OnCloseDB() : Begin "
-msgstr  "-I-> BrowserDB::OnCloseDB() : Begin "
-
-#: ../browsedb.cpp:166
-#, c-format
-msgid   "-I-> BrowserDB::OnGetDataSourceODBC() - DatabaseName(%s) ; DataSource(%s)"
-msgstr  "-I-> BrowserDB::OnGetDataSourceODBC() - DatanbankName(%s) ; DSN(%s)"
-
-#: ../browsedb.cpp:167
-#, c-format
-msgid   "-I-> BrowserDB::OnStartDB(%s) : End - Time needed : %ld ms"
-msgstr  "-I-> BrowserDB::OnStartDB(%s) : Ende - Dauer : %ld ms"
-
-#: ../dbgrid.cpp:124
-#, c-format
-msgid   "-I-> DBGrid::OnTableView(%s) - %6d Records have been read. - Time needed : %ld ms"
-msgstr  "-I-> DBGrid::OnTableView(%s) - %6d Sätze wurde insgesamt gelesen. - Dauer : %ld ms"
-
-#: ../dbgrid.cpp:120
-#, c-format
-msgid   "-I-> DBGrid::OnTableView(%s) - Record %6d has been read."
-msgstr  "-I-> DBGrid::OnTableView(%s) - Satz %6d wurde gelesen."
-
-#: ../dbgrid.cpp:142
-msgid   "-I-> DBGrid::OnTableView() - End"
-msgstr  "-I-> DBGrid::OnTableView() - Ende"
-
-#: ../dbtree.cpp:205
-#, c-format
-msgid   "-I-> DBTree::OnPopulate(%s) - Table %6d has been read."
-msgstr  "-I-> DBTree::OnPopulate(%s) - Tabelle %6d wurde gelesen."
-
-#: ../dbtree.cpp:216
-#, c-format
-msgid   "-I-> DBTree::OnPopulate() - %6d Tables have been read. - Time needed : %ld ms"
-msgstr  "-I-> DBTree::OnPopulate() - %6d Tabellen wurde gelesen. - Dauer : %ld ms"
-
-#: ../doc.cpp:139
-#, c-format
-msgid   "-I-> MainDoc::OnInitView() - End - %d DSN's found"
-msgstr  "-I-> MainDoc::OnInitView() - Ende - %d DSN's gefunden"
-
-#: ../doc.cpp:89
-#, c-format
-msgid   "-I-> MainDoc::OnNewDocument() - End - Time needed : %ld ms"
-msgstr  "-I-> MainDoc::OnNewDocument() - Ende - Dauer : %ld ms"
-
-#: ../pgmctrl.cpp:194
-#, c-format
-msgid   "-I-> PgmCtrl::OnSelChanged - %s"
-msgstr  "-I-> PgmCtrl::OnSelChanged - %s"
-
-#: ../pgmctrl.cpp:163
-msgid   "-I-> wxConfigBase.p_ProgramCfg->DeleteAll() was successful."
-msgstr  "-I-> wxConfigBase.p_ProgramCfg->DeleteAll() war Erfolgreich !"
-
-#: ../dbbrowse.cpp:115 ../dbbrowse.cpp:175
-msgid   "/"
-msgstr  "/"
-
-#: ../dbbrowse.cpp:122 ../dbbrowse.cpp:166 ../pgmctrl.cpp:106 ../pgmctrl.cpp:148 ../pgmctrl.cpp:155
-msgid   "/Local/langid"
-msgstr  ""
-
-#: ../dbbrowse.cpp:165 ../pgmctrl.cpp:106
-msgid   "/Local/language"
-msgstr  ""
-
-#: ../dbbrowse.cpp:172
-msgid   "/MainFrame/NONE"
-msgstr  ""
-
-#: ../dbbrowse.cpp:281 ../doc.cpp:95
-msgid   "/MainFrame/Sash"
-msgstr  ""
-
-#: ../dbbrowse.cpp:179 ../dbbrowse.cpp:280
-msgid   "/MainFrame/h"
-msgstr  ""
-
-#: ../dbbrowse.cpp:179 ../dbbrowse.cpp:279
-msgid   "/MainFrame/w"
-msgstr  ""
-
-#: ../dbbrowse.cpp:178 ../dbbrowse.cpp:277
-msgid   "/MainFrame/x"
-msgstr  ""
-
-#: ../dbbrowse.cpp:178 ../dbbrowse.cpp:278
-msgid   "/MainFrame/y"
-msgstr  ""
-
-#: ../dbbrowse.cpp:170
-msgid   "/NONE"
-msgstr  ""
-
-#: ../dbbrowse.cpp:171
-msgid   "/Paths/NONE"
-msgstr  ""
-
-#: ../dbbrowse.cpp:174 ../pgmctrl.cpp:109
-msgid   "/Paths/Work"
-msgstr  ""
-
-#: ../dbbrowse.cpp:302
-msgid   "About %s"
-msgstr  "Info Ã¼ber %s"
-
-#: ../dbgrid.cpp:67
-msgid   "Browse Modus"
-msgstr  "Anzeige Modus"
-
-#: ../dbbrowse.cpp:150 ../dbbrowse.cpp:161
-msgid   "C"
-msgstr  ""
-
-#: ../dbgrid.cpp:267 ../dbgrid.cpp:282 ../dbgrid.cpp:297 ../dbgrid.cpp:312 ../dbgrid.cpp:327
-msgid   "Cell at row "
-msgstr  ""
-
-#: ../pgmctrl.cpp:111
-msgid   "Change the language to English"
-msgstr  "Sprache ins Englische Ã¤ndern"
-
-#: ../pgmctrl.cpp:112
-msgid   "Change the language to German"
-msgstr  "Sprache ins deutsch Ã¤ndern"
-
-#: ../tabpgwin.cpp:699
-msgid   "Comic Sans MS"
-msgstr  ""
-
-#: ../dbbrowse.cpp:100
-msgid   "DBBrowse"
-msgstr  ""
-
-#: ../dbbrowse.cpp:301
-msgid   "%s\n"
-        "Mark Johnson\n"
-        "Berlin, Germany\n"
-        "mj10777@gmx.net\n"
-        " (c) 2000"
-msgstr  "%s\n"
-        "Mark Johnson\n"
-        "Berlin, Deutschland\n"
-        "mj10777@gmx.net\n"
-        " (c) 2000"
-
-#: ../dbgrid.cpp:326
-msgid   "DBGrid::OnCellChange : "
-msgstr  ""
-
-#: ../dbgrid.cpp:266
-msgid   "DBGrid::OnCellLeftClick : "
-msgstr  ""
-
-#: ../dbgrid.cpp:296
-msgid   "DBGrid::OnCellLeftDClick : "
-msgstr  ""
-
-#: ../dbgrid.cpp:281
-msgid   "DBGrid::OnCellRightClick : "
-msgstr  ""
-
-#: ../dbgrid.cpp:311
-msgid   "DBGrid::OnCellRightDClick : "
-msgstr  ""
-
-#: ../dbgrid.cpp:351
-msgid   "DBGrid::OnColSize : "
-msgstr  ""
-
-#: ../dbgrid.cpp:168
-msgid   "DBGrid::OnLabelLeftClick : "
-msgstr  ""
-
-#: ../dbgrid.cpp:220
-msgid   "DBGrid::OnLabelLeftDClick : "
-msgstr  ""
-
-#: ../dbgrid.cpp:197
-msgid   "DBGrid::OnLabelRightClick : "
-msgstr  ""
-
-#: ../dbgrid.cpp:243
-msgid   "DBGrid::OnLabelRightDClick : "
-msgstr  ""
-
-#: ../dbgrid.cpp:361
-msgid   "DBGrid::OnRangeSelected : "
-msgstr  ""
-
-#: ../dbgrid.cpp:341
-msgid   "DBGrid::OnRowSize : "
-msgstr  ""
-
-#: ../dbtree.cpp:178
-#, c-format
-msgid   "DB_DATA_TYPE_???? (%d)"
-msgstr  ""
-
-#: ../browsedb.cpp:468
-msgid   "DB_DATA_TYPE_DATE"
-msgstr  ""
-
-#: ../browsedb.cpp:467
-msgid   "DB_DATA_TYPE_FLOAT"
-msgstr  ""
-
-#: ../browsedb.cpp:466
-msgid   "DB_DATA_TYPE_INTEGER"
-msgstr  ""
-
-#: ../browsedb.cpp:465
-msgid   "DB_DATA_TYPE_VARCHAR"
-msgstr  ""
-
-#: ../pgmctrl.cpp:113
-msgid   "Delete all wxConfigBase Entry's"
-msgstr  "Lösche alle wxConfigBase Eintragungen"
-
-#: ../dbbrowse.cpp:210
-msgid   "E&xit"
-msgstr  "&Beenden"
-
-#: ../dbgrid.cpp:65
-msgid   "Edit Modus"
-msgstr  "Änderungs Modus"
-
-#: ../dbtree.cpp:153
-#, c-format
-msgid   "FN(%s"
-msgstr  ""
-
-#: ../browsedb.cpp:45
-msgid   "File: "
-msgstr  ""
-
-#: ../dbbrowse.cpp:155
-msgid   "Help"
-msgstr  "Hilfe"
-
-#: ../dbtree.cpp:365
-#, c-format
-msgid   "Here is where a wxDB Class for >%s< will be made! "
-msgstr  "Hier ist wo eine wxDB Klasse für >%s< erstellt wird!"
-
-#: ../dbtree.cpp:399
-#, c-format
-msgid   "Here is where all wxTable Classes in >%s< will be made! "
-msgstr  "Hier ist wo alle wxTable Klassen für >%s< erstellt wird!"
-
-#: ../pgmctrl.cpp:186
-#, c-format
-msgid   "Item '%s': %sselected, %sexpanded, %sbold,%u children (%u immediately under this item)."
-msgstr  "Zweig '%s': %sselektiert %serweitert, %sbold,%u Kinder (%u direkt unter diese Zweig)."
-
-#: ../dbtree.cpp:163
-msgid   "KEY"
-msgstr  ""
-
-#: ../dbtree.cpp:172
-msgid   "KEYF"
-msgstr  ""
-
-#: ../pgmctrl.cpp:111 ../pgmctrl.cpp:145
-msgid   "Language English"
-msgstr  ""
-
-#: ../pgmctrl.cpp:112 ../pgmctrl.cpp:152
-msgid   "Language German"
-msgstr  ""
-
-#: ../doc.cpp:126
-msgid   "LogBook"
-msgstr  "LogBuch"
-
-#: ../tabpgwin.cpp:477
-msgid   "MS Sans Serif"
-msgstr  ""
-
-#: ../dbbrowse.cpp:309
-msgid   "Main page"
-msgstr  ""
-
-#: ../dbtree.cpp:232
-msgid   "Make all wxTable.cpp/h classes"
-msgstr  "Alle wxTable.cpp/h Klassen erstellen"
-
-#: ../dbtree.cpp:230
-msgid   "Make wxDB.cpp/h "
-msgstr  "wxDB.cpp/h Erstellen"
-
-#: ../dbtree.cpp:237
-msgid   "Make wxTable.cpp/h "
-msgstr  "wxTable.cpp/h Erstellen"
-
-#: ../dbbrowse.cpp:169
-msgid   "NONE"
-msgstr  ""
-
-#: ../doc.cpp:216
-msgid   "No Dataset names found in ODBC!\n"
-        "           Program will exit!\n"
-        "\n"
-        "                       Ciao"
-msgstr  "Keine Datenquellen in ODBC gefunden\n"
-        "            Programm wird beendet!\n"
-        "\n"
-        "                       Ciao"
-
-#: ../dbtree.cpp:161
-msgid   "None"
-msgstr  "keine"
-
-#: ../pgmctrl.cpp:114
-msgid   "ODBC DSN"
-msgstr  ""
-
-#: ../dbtree.cpp:255 ../pgmctrl.cpp:170 ../pgmctrl.cpp:214
-msgid   "ODBC-"
-msgstr  ""
-
-#: ../pgmctrl.cpp:117
-#, c-format
-msgid   "ODBC-%s"
-msgstr  ""
-
-#: ../pgmctrl.cpp:114
-msgid   "ODBC-DSN"
-msgstr  ""
-
-#: ../pgmctrl.cpp:110
-msgid   "Path Work"
-msgstr  "Arbeitspfad"
-
-#: ../doc.cpp:108 ../doc.cpp:110
-msgid   "PgmCtrl"
-msgstr  ""
-
-#: ../pgmctrl.cpp:105
-msgid   "Program settings"
-msgstr  "Programm Einstellungen"
-
-#: ../dbgrid.cpp:352
-msgid   "Resized col "
-msgstr  ""
-
-#: ../dbgrid.cpp:342
-msgid   "Resized row "
-msgstr  ""
-
-#: ../dbtree.cpp:122 ../dbtree.cpp:300 ../pgmctrl.cpp:103
-msgid   "Root"
-msgstr  ""
-
-#: ../browsedb.cpp:334
-#, c-format
-msgid   "SELECT * FROM %s"
-msgstr  ""
-
-#: ../dbtree.cpp:177
-#, c-format
-msgid   "SQL_C_???? (%d)"
-msgstr  ""
-
-#: ../browsedb.cpp:437
-msgid   "SQL_C_BINARY"
-msgstr  ""
-
-#: ../browsedb.cpp:438
-msgid   "SQL_C_BIT"
-msgstr  ""
-
-#: ../browsedb.cpp:439
-msgid   "SQL_C_BOOKMARK"
-msgstr  ""
-
-#: ../browsedb.cpp:440
-msgid   "SQL_C_CHAR"
-msgstr  ""
-
-#: ../browsedb.cpp:441
-msgid   "SQL_C_DATE"
-msgstr  ""
-
-#: ../browsedb.cpp:442
-msgid   "SQL_C_DEFAULT"
-msgstr  ""
-
-#: ../browsedb.cpp:443
-msgid   "SQL_C_DOUBLE"
-msgstr  ""
-
-#: ../browsedb.cpp:444
-msgid   "SQL_C_FLOAT"
-msgstr  ""
-
-#: ../browsedb.cpp:445
-msgid   "SQL_C_LONG"
-msgstr  ""
-
-#: ../browsedb.cpp:446
-msgid   "SQL_C_SHORT"
-msgstr  ""
-
-#: ../browsedb.cpp:447
-msgid   "SQL_C_SLONG"
-msgstr  ""
-
-#: ../browsedb.cpp:448
-msgid   "SQL_C_SSHORT"
-msgstr  ""
-
-#: ../browsedb.cpp:449
-msgid   "SQL_C_STINYINT"
-msgstr  ""
-
-#: ../browsedb.cpp:450
-msgid   "SQL_C_TIME"
-msgstr  ""
-
-#: ../browsedb.cpp:451
-msgid   "SQL_C_TIMESTAMP"
-msgstr  ""
-
-#: ../browsedb.cpp:452
-msgid   "SQL_C_TINYINT"
-msgstr  ""
-
-#: ../browsedb.cpp:453
-msgid   "SQL_C_ULONG"
-msgstr  ""
-
-#: ../browsedb.cpp:454
-msgid   "SQL_C_USHORT"
-msgstr  ""
-
-#: ../browsedb.cpp:455
-msgid   "SQL_C_UTINYINT"
-msgstr  ""
-
-#: ../browsedb.cpp:458
-msgid   "SQL_LONGVARCHAR"
-msgstr  ""
-
-#: ../browsedb.cpp:457
-msgid   "SQL_NUMERIC"
-msgstr  ""
-
-#: ../browsedb.cpp:459
-msgid   "SQL_REAL"
-msgstr  ""
-
-#: ../browsedb.cpp:456
-msgid   "SQL_VARCHAR"
-msgstr  ""
-
-#: ../dbgrid.cpp:362
-msgid   "Selected cells from row "
-msgstr  ""
-
-#: ../pgmctrl.cpp:123
-msgid   "Set Username and Password"
-msgstr "Username und Passwort setzen"
-
-#:
-#, c-format
-msgid "User ID:"
-msgstr "User ID:"
-
-#:
-#, c-format
-msgid "Password:"
-msgstr "Passwort:"
-
-#:
-#, c-format
-msgid ">>> %s <<<"
-msgstr ">>> %s <<<"
-
-#: ../pgmctrl.cpp:108
-msgid   "Setting Language"
-msgstr  "Sprache setzen"
-
-#: ../pgmctrl.cpp:105
-msgid   "Settings"
-msgstr  "Einstellungen"
-
-#: ../dbtree.cpp:235
-msgid   "Show Data"
-msgstr  "Daten Zeigen"
-
-#: ../dbtree.cpp:127
-msgid   "TABLE"
-msgstr  ""
-
-#: ../dbtree.cpp:133 ../dbtree.cpp:307 ../dbtree.cpp:46 ../dbtree.cpp:381
-#, c-format
-msgid   "TN(%s"
-msgstr  ""
-
-#: ../dbtree.cpp:141
-#, c-format
-msgid   "Table-Name(%s) with (%d)Columns ; Remarks(%s)"
-msgstr  "Tablename(%s) mit (%d)Spalten ; Bemerkungen(%s)"
-
-#: ../dbtree.cpp:171
-#, c-format
-msgid   "This Foreign Key comes from the following Table : %s"
-msgstr  "Diese Fremd-Schlüssel stammt aus der folgende Tabelle : %s"
-
-#: ../dbtree.cpp:162
-#, c-format
-msgid   "This Primary Key is used in the following Tables : %s"
-msgstr  "Diese Primär-Schlüssel wird in folgende Tabellen Verwendet : %s"
-
-#: ../dbtree.cpp:129
-msgid   "VIEW"
-msgstr  ""
-
-#: ../dbtree.cpp:147
-#, c-format
-msgid   "View-Name(%s) with (%d)Columns ; Remarks(%s)"
-msgstr  "Viewname(%s) mit (%d)Spalten ; Bemerkungen(%s)"
-
-#: ../doc.cpp:57
-msgid   "WHEAT"
-msgstr  ""
-
-#: ../pgmctrl.cpp:109
-#, c-format
-msgid   "Work Path : %s"
-msgstr  "Arbeitspfad : %s"
-
-#: ../dbbrowse.cpp:131 ../dbbrowse.cpp:136 ../dbbrowse.cpp:139
-msgid   "a"
-msgstr  ""
-
-#: ../pgmctrl.cpp:74
-msgid   "bitmap1"
-msgstr  ""
-
-#: ../pgmctrl.cpp:75
-msgid   "bitmap2"
-msgstr  ""
-
-#: ../dbgrid.cpp:175 ../dbgrid.cpp:204 ../dbgrid.cpp:227 ../dbgrid.cpp:250
-msgid   "col label "
-msgstr  ""
-
-#: ../dbgrid.cpp:179 ../dbgrid.cpp:208 ../dbgrid.cpp:231 ../dbgrid.cpp:254
-msgid   "corner label"
-msgstr  ""
-
-#: ../dbbrowse.cpp:131 ../dbbrowse.cpp:134
-msgid   "cz"
-msgstr  ""
-
-#: ../dbbrowse.cpp:135
-msgid   "czech"
-msgstr  ""
-
-#: ../dbbrowse.cpp:131 ../dbbrowse.cpp:136 ../dbbrowse.cpp:140 ../pgmctrl.cpp:154
-msgid   "de"
-msgstr  ""
-
-#: ../dbbrowse.cpp:132 ../dbbrowse.cpp:142
-msgid   "fr"
-msgstr  ""
-
-#: ../dbbrowse.cpp:143
-msgid   "french"
-msgstr  ""
-
-#: ../dbbrowse.cpp:138
-msgid   "german"
-msgstr  ""
-
-#: ../dbbrowse.cpp:167
-#, c-format
-msgid   "help.%s/%s.hhp"
-msgstr  ""
-
-#: ../pgmctrl.cpp:107
-#, c-format
-msgid   "locale (%s) ; Language (%s) ; Number(%2.2f)"
-msgstr  "locale (%s) ; Sprache  (%s) ; Nummer(%2.2f)"
-
-#: ../dbbrowse.cpp:99
-msgid   "mj10777"
-msgstr  ""
-
-#: ../dbtree.cpp:40 ../pgmctrl.cpp:47
-msgid   "not "
-msgstr  "nicht"
-
-#: ../dbbrowse.cpp:132 ../dbbrowse.cpp:144
-msgid   "pl"
-msgstr  ""
-
-#: ../dbbrowse.cpp:145
-msgid   "polish"
-msgstr  ""
-
-#: ../dbgrid.cpp:171 ../dbgrid.cpp:200 ../dbgrid.cpp:223 ../dbgrid.cpp:246
-msgid   "row label "
-msgstr  ""
-
-#: ../dbbrowse.cpp:124 ../dbbrowse.cpp:149 ../dbbrowse.cpp:160 ../pgmctrl.cpp:147
-msgid   "std"
-msgstr  ""
-
-#: ../doc.cpp:126
-msgid   "what is this?"
-msgstr  ""
-
-#: ../pgmctrl.cpp:113 ../pgmctrl.cpp:160
-msgid   "wxConfigBase Delete"
-msgstr  "wxConfigBase Löschen"
diff --git a/demos/dbbrowse/de/de.po b/demos/dbbrowse/de/de.po
deleted file mode 100644 (file)
index c8847bb..0000000
+++ /dev/null
@@ -1,1643 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-05-10 18:29+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: ../src/generic/dirdlgg.cpp:461 ../src/generic/dirdlgg.cpp:489
-#: src/generic/dirdlgg.cpp:461 src/generic/dirdlgg.cpp:489
-msgid ""
-"\n"
-"(Do you have the required permissions?)"
-msgstr ""
-"\n"
-"(Haben Sie die nötigen Zugriffsrechte?)"
-
-#: ../src/generic/dirdlgg.cpp:449 src/generic/dirdlgg.cpp:449
-msgid ""
-"\n"
-"does not exist\n"
-"Create it now?"
-msgstr ""
-"\n"
-"existiert nicht\n"
-"Jetzt anlegen?"
-
-#: ../src/common/log.cpp:223 src/common/log.cpp:209
-#, c-format
-msgid " (error %ld: %s)"
-msgstr " (Fehler %ld: %s)"
-
-#: ../src/common/date.cpp:385 ../src/common/date.cpp:400
-#: src/common/date.cpp:384 src/common/date.cpp:399
-msgid " B.C."
-msgstr " B.C."
-
-#: ../src/common/resourc2.cpp:265 ../src/common/resourc2.cpp:1334
-#: ../src/common/resource.cpp:1630 ../src/common/resource.cpp:2704
-#: src/common/resourc2.cpp:265 src/common/resourc2.cpp:1334
-#: src/common/resource.cpp:1613 src/common/resource.cpp:2682
-#, c-format
-msgid "#define %s must be an integer."
-msgstr "#define %s muß eine ganze Zahl sein"
-
-#: src/common/valtext.cpp:143 src/common/valtext.cpp:154
-#, c-format
-msgid "%s is invalid."
-msgstr "%s ist ungültig"
-
-#: ../src/common/resourc2.cpp:709 ../src/common/resource.cpp:2075
-#: src/common/resourc2.cpp:709 src/common/resource.cpp:2057
-#, c-format
-msgid "%s not a bitmap resource specification."
-msgstr "%s ist keine Bitmap-Resourcenangabe"
-
-#: ../src/common/resourc2.cpp:864 ../src/common/resource.cpp:2230
-#: src/common/resourc2.cpp:864 src/common/resource.cpp:2212
-#, c-format
-msgid "%s not an icon resource specification."
-msgstr "%s ist keine Icon-Resourcenangabe"
-
-#: src/common/valtext.cpp:188
-#, c-format
-msgid "%s should be numeric."
-msgstr "%s sollte numerisch sein"
-
-#: src/common/valtext.cpp:163
-#, c-format
-msgid "%s should only contain ASCII characters."
-msgstr "%s sollte nur ASCII Zeichen enthalten"
-
-#: src/common/valtext.cpp:171
-#, c-format
-msgid "%s should only contain alphabetic characters."
-msgstr "%s sollte nur Buchstaben enthalten"
-
-#: src/common/valtext.cpp:179
-#, c-format
-msgid "%s should only contain alphabetic or numeric characters."
-msgstr "%s sollte nur Buchstaben oder Ziffern enthalten"
-
-#: ../src/common/resourc2.cpp:357 ../src/common/resourc2.cpp:1430
-#: ../src/common/resource.cpp:1723 ../src/common/resource.cpp:2801
-#: src/common/resourc2.cpp:357 src/common/resourc2.cpp:1430
-#: src/common/resource.cpp:1705 src/common/resource.cpp:2778
-#, c-format
-msgid "%s: ill-formed resource file syntax."
-msgstr "%s: falsch formatierte Resourcendatei-Syntax"
-
-#: ../src/common/log.cpp:638 src/common/log.cpp:633
-msgid "&Close"
-msgstr "&Schließen"
-
-#: ../src/common/log.cpp:639 src/common/log.cpp:634
-msgid "&Log"
-msgstr "&Log"
-
-#: ../src/common/docview.cpp:1725 ../src/common/docview.cpp:1736
-#: src/common/docview.cpp:1687 src/common/docview.cpp:1698
-msgid "&Redo"
-msgstr "&Wieder-Ausführen"
-
-#: ../src/common/docview.cpp:1719 ../src/common/docview.cpp:1746
-#: src/common/docview.cpp:1681 src/common/docview.cpp:1708
-msgid "&Redo "
-msgstr "&Wieder-Ausführen "
-
-#: ../src/common/log.cpp:635 src/common/log.cpp:630
-msgid "&Save..."
-msgstr "&Sichern..."
-
-#: ../src/common/docview.cpp:1731 src/common/docview.cpp:1693
-msgid "&Undo"
-msgstr "&Rückgängig"
-
-#: ../src/common/docview.cpp:1706 src/common/docview.cpp:1668
-msgid "&Undo "
-msgstr "&Rückgängig "
-
-#: ../src/common/config.cpp:382 src/common/config.cpp:393
-#, c-format
-msgid "'%s' has extra '..', ignored."
-msgstr "'%s' hat extra '..', ingoriert."
-
-#: ../src/common/intl.cpp:339 src/common/intl.cpp:338
-#, c-format
-msgid "'%s' is not a valid message catalog."
-msgstr "'%s' ist kein gültiger Nachrichtenkatalog."
-
-#: ../src/common/textfile.cpp:133 src/common/textfile.cpp:132
-#, c-format
-msgid "'%s' is probably a binary file."
-msgstr "'%s' ist vermutlich eine Binärdatei."
-
-#: ../src/common/resourc2.cpp:297 ../src/common/resourc2.cpp:1370
-#: ../src/common/resource.cpp:1662 ../src/common/resource.cpp:2740
-#: src/common/resourc2.cpp:297 src/common/resourc2.cpp:1370
-#: src/common/resource.cpp:1645 src/common/resource.cpp:2718
-msgid ""
-", expected static, #include or #define\n"
-"whilst parsing resource."
-msgstr ""
-", erwartete static, #include oder #define\n"
-"beim Lesen der Resource."
-
-#: src/generic/dcpsg.cpp:2389
-msgid "A3 297 x 420 mm"
-msgstr ""
-
-#: src/generic/dcpsg.cpp:1210 src/generic/dcpsg.cpp:1214
-#: src/generic/dcpsg.cpp:1800 src/generic/dcpsg.cpp:1804
-#: src/generic/dcpsg.cpp:2313 src/generic/dcpsg.cpp:2388
-#: src/generic/printps.cpp:239 src/generic/printps.cpp:243
-msgid "A4 210 x 297 mm"
-msgstr ""
-
-#: ../src/generic/fontdlgg.cpp:329 src/generic/fontdlgg.cpp:329
-msgid "ABCDEFGabcdefg12345"
-msgstr ""
-
-#: ../src/generic/colrdlgg.cpp:236 src/generic/colrdlgg.cpp:236
-msgid "Add to custom colours"
-msgstr "Zu Benutzerfarben hinzufügen"
-
-#: ../src/generic/prntdlgg.cpp:140 src/generic/prntdlgg.cpp:83
-msgid "All"
-msgstr "Alle"
-
-#: ../src/common/log.cpp:675 src/common/log.cpp:670
-#, c-format
-msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
-msgstr "An Logdatei '%s' anhängen ([Nein] wird sie ersetzen)?"
-
-#: src/gtk/window.cpp:2716
-msgid "Application Error"
-msgstr "Programmfehler"
-
-#: ../src/common/resourc2.cpp:844 ../src/common/resource.cpp:2210
-#: src/common/resourc2.cpp:844 src/common/resource.cpp:2192
-#, c-format
-msgid "Bitmap resource specification %s not found."
-msgstr "Bitmapresourceangabe %s nicht gefunden."
-
-#: ../src/generic/fontdlgg.cpp:221 src/generic/fontdlgg.cpp:221
-msgid "Bold"
-msgstr "Fett"
-
-#: ../src/generic/prntdlgg.cpp:643 src/generic/prntdlgg.cpp:536
-msgid "Bottom margin (mm):"
-msgstr "Unterer Rand (mm)"
-
-#: ../src/common/log.cpp:636 src/common/log.cpp:631
-msgid "C&lear"
-msgstr "L&öschen"
-
-#: ../src/msw/thread.cpp:183 src/msw/thread.cpp:183
-msgid "Can not create event object."
-msgstr "Kann Eventobjekt nicht erzeugen."
-
-#: ../src/msw/thread.cpp:99 src/msw/thread.cpp:99
-msgid "Can not create mutex."
-msgstr "Kann Mutex nicht anlegen."
-
-#: ../src/msw/tooltip.cpp:199 src/msw/tooltip.cpp:199
-msgid "Can not create tooltip control"
-msgstr "Kann Tooltip nicht erzeugen."
-
-#: ../src/common/filefn.cpp:1179 src/common/filefn.cpp:1168
-#: src/common/filefn.cpp:1282
-#, c-format
-msgid "Can not enumerate files in directory '%s'"
-msgstr "Kann Dateien in Verzeichnis '%s' nicht listen"
-
-#: ../src/msw/clipbrd.cpp:549 src/msw/clipbrd.cpp:549
-#, c-format
-msgid "Can not get data in format '%s' from clipboard."
-msgstr "Kann keine Daten im Format '%s' von der Zwischenablage bekommen."
-
-#: src/gtk/threadpsx.cpp:450
-#, c-format
-msgid "Can not get priority range for scheduling policy %d."
-msgstr "Kann Prioritätsbereich für Schedulingregeln %d nicht bekommen."
-
-#: ../src/msw/clipbrd.cpp:474 src/msw/clipbrd.cpp:474
-#, c-format
-msgid "Can not put data in format '%s' on clipboard."
-msgstr "Kann keine Daten im Fromat '%s' in die Zwischenablage kopieren."
-
-#: ../src/msw/thread.cpp:410 src/msw/thread.cpp:410
-#, c-format
-msgid "Can not resume thread %x"
-msgstr "Kann Thread %x nicht forsetzen."
-
-#: src/gtk/threadpsx.cpp:442
-msgid "Can not retrieve thread scheduling policy."
-msgstr "Kann Schedulingregeln nicht bekommen."
-
-#: ../src/msw/thread.cpp:330 src/gtk/threadpsx.cpp:270 src/msw/thread.cpp:330
-msgid "Can not start thread: error writing TLS."
-msgstr "Kann Thread nicht starten: Fehler beim Schreiben der TLS."
-
-#: ../src/msw/thread.cpp:395 src/msw/thread.cpp:395
-#, c-format
-msgid "Can not suspend thread %x"
-msgstr "Kann Thread %x nicht anhalten."
-
-#: ../src/msw/thread.cpp:547 src/msw/thread.cpp:543
-msgid "Can not wait for thread termination"
-msgstr "Kann nicht auf Threadende warten"
-
-#: ../src/common/docview.cpp:1708 src/common/docview.cpp:1670
-msgid "Can't &Undo "
-msgstr "Kann nicht rückgängig machen "
-
-#: ../src/msw/thread.cpp:359 src/msw/thread.cpp:359
-msgid "Can't create thread"
-msgstr "Kann Thread nicht erzeugen"
-
-#: ../src/msw/iniconf.cpp:453 src/msw/iniconf.cpp:464
-#, c-format
-msgid "Can't delete the INI file '%s'"
-msgstr "Kann INI-Datei '%s' nicht löschen"
-
-#: ../src/unix/utilsunx.cpp:316 src/gtk/utilsgtk.cpp:360
-#, c-format
-msgid "Can't execute '%s'\n"
-msgstr "Kann '%s' nicht ausführen\n"
-
-#: ../src/msw/utilsexc.cpp:208 src/msw/utilsexc.cpp:208
-#, c-format
-msgid "Can't execute command '%s'"
-msgstr "Kann Befehl '%s' nicht ausführen"
-
-#: ../src/common/object.cpp:302 ../src/common/object.cpp:323
-#: src/common/object.cpp:290 src/common/object.cpp:311
-#, c-format
-msgid "Can't find the serialization object '%s' for the object '%s'."
-msgstr "Kann Serialisierungsobjekt '%s' für Object '%s' nicht finden."
-
-#: ../src/common/object.cpp:295 src/common/object.cpp:283
-msgid "Can't load wxSerial dynamic library."
-msgstr "Kann wxSerial DLL nicht laden."
-
-#: ../src/common/log.cpp:722 src/common/log.cpp:717
-msgid "Can't save log contents to file."
-msgstr "Kann Logtexte nicht in Datei sichern."
-
-#: ../src/msw/thread.cpp:384 src/msw/thread.cpp:384
-msgid "Can't set thread priority"
-msgstr "Kann Thread-Priorität nicht setzen"
-
-#: ../src/common/prntbase.cpp:114 ../src/generic/choicdgg.cpp:306
-#: ../src/generic/colrdlgg.cpp:235 ../src/generic/dcpsg.cpp:1918
-#: ../src/generic/dirdlgg.cpp:341 ../src/generic/fontdlgg.cpp:261
-#: ../src/generic/msgdlgg.cpp:123 ../src/generic/prntdlgg.cpp:172
-#: ../src/generic/prntdlgg.cpp:430 ../src/generic/prntdlgg.cpp:580
-#: ../src/generic/progdlgg.cpp:94 ../src/generic/textdlgg.cpp:141
-#: ../src/gtk/filedlg.cpp:154 src/common/prntbase.cpp:113
-#: src/generic/choicdgg.cpp:306 src/generic/colrdlgg.cpp:235
-#: src/generic/dcpsg.cpp:1875 src/generic/dirdlgg.cpp:341
-#: src/generic/fontdlgg.cpp:261 src/generic/msgdlgg.cpp:143
-#: src/generic/prntdlgg.cpp:111 src/generic/prntdlgg.cpp:317
-#: src/generic/prntdlgg.cpp:473 src/generic/textdlgg.cpp:141
-#: src/gtk/filedlg.cpp:131
-msgid "Cancel"
-msgstr "Abbruch"
-
-#: ../src/msw/app.cpp:223 src/msw/app.cpp:192
-msgid "Cannot initialize OLE"
-msgstr "Kann OLE nicht initialisiern"
-
-#: ../src/generic/dcpsg.cpp:1296 src/generic/dcpsg.cpp:1247
-msgid "Cannot open file!"
-msgstr "Kann Datei nicht Ã¶ffnen!"
-
-#: src/common/CVS/Base/fileconf.cpp:614 src/common/fileconf.cpp:614
-#, c-format
-msgid "Character '%c' is invalid in a config entry name."
-msgstr "Zeichen '%c' ist in einem Konfigurationseintragsnamen nicht erlaubt."
-
-#: ../src/common/log.cpp:636 src/common/log.cpp:631
-msgid "Clear the log contents"
-msgstr "Logtexte löschen"
-
-#: ../src/common/prntbase.cpp:343 src/common/prntbase.cpp:342
-msgid "Close"
-msgstr "Schließen"
-
-#: ../src/common/log.cpp:638 src/common/log.cpp:633
-msgid "Close this window"
-msgstr "Fenster schließen"
-
-#: ../src/gtk/filedlg.cpp:71 src/gtk/filedlg.cpp:60
-msgid "Confirm"
-msgstr "Bestätigen"
-
-#: ../src/generic/helpxlp.cpp:242 src/generic/helpxlp.cpp:242
-#, c-format
-msgid "Connection to wxHelp timed out in %d seconds"
-msgstr "Verbindung mit wxHelp nach %d Sekunden abgebrochen"
-
-#: ../src/generic/helpxlp.cpp:242 src/generic/helpxlp.cpp:242
-#, c-format
-msgid "Help: %s"
-msgstr "Hilfe: %s"
-
-#: ../src/generic/prntdlgg.cpp:167 src/generic/prntdlgg.cpp:106
-msgid "Copies:"
-msgstr "Kopien:"
-
-#: ../src/common/resourc2.cpp:287 ../src/common/resource.cpp:1652
-#: src/common/resourc2.cpp:287 src/common/resource.cpp:1635
-#, c-format
-msgid "Could not find resource include file %s."
-msgstr "Konnte Resourcedatei %s nicht finden."
-
-#: ../src/generic/tabg.cpp:1038 src/generic/tabg.cpp:1038
-msgid "Could not find tab for id"
-msgstr "Konnte Seite für Id nicht finden"
-
-#: ../src/common/resource.cpp:753 src/common/resource.cpp:753
-#, c-format
-msgid ""
-"Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"
-" or provide #define (see manual for caveats)"
-msgstr ""
-"Kann keine Kontrollklasse oder Id '%s' finden. Verwenden Sie eine ganze Zahl\n"
-" oder ein #define."
-
-#: ../src/common/resource.cpp:1203 src/common/resource.cpp:1199
-#, c-format
-msgid ""
-"Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
-"or provide #define (see manual for caveats)"
-msgstr ""
-"Kann keine Kontrollklasse oder Id '%s' finden. Verwenden Sie eine ganze Zahl\n"
-" oder ein #define."
-
-#: ../src/common/prntbase.cpp:675 src/common/prntbase.cpp:673
-msgid "Could not start document preview."
-msgstr "Kann Druckvoransicht nicht starten."
-
-#: ../src/generic/printps.cpp:189 ../src/msw/printwin.cpp:228
-#: src/generic/printps.cpp:165
-msgid "Could not start printing."
-msgstr "Kann Ausdruck nicht beginnen."
-
-#: ../src/common/wincmn.cpp:598 src/gtk/window.cpp:2716
-#: src/msw/window.cpp:3756
-msgid "Could not transfer data to window"
-msgstr "Kann Daten nicht ins Fenster Ã¼bertragen."
-
-#: ../src/msw/thread.cpp:127 src/msw/thread.cpp:127
-msgid "Couldn't acquire a mutex lock"
-msgstr "Kann Mutex-Lock nicht bekommen"
-
-#: ../src/msw/dragimag.cpp:88 ../src/msw/dragimag.cpp:116
-#: ../src/msw/imaglist.cpp:96 src/msw/imaglist.cpp:96
-msgid "Couldn't add an image to the image list."
-msgstr "Kann Bild nicht zur Liste hinzufügen."
-
-#: ../src/msw/thread.cpp:231 src/msw/thread.cpp:231
-msgid "Couldn't change the state of event object."
-msgstr "Kann Zustand des Eventobjektes nicht Ã¤ndern."
-
-#: ../src/msw/timer.cpp:109 src/msw/timer.cpp:109
-msgid "Couldn't create a timer"
-msgstr "Kann keinen Wecker anlegen."
-
-#: ../src/msw/thread.cpp:430 src/msw/thread.cpp:430
-msgid "Couldn't get the current thread pointer"
-msgstr "Kann den aktuellen Threadzeiger nicht bekommen."
-
-#: ../src/common/imagpng.cpp:218 src/common/image.cpp:662
-msgid "Couldn't load a PNG image - probably file is corrupted."
-msgstr ""
-
-#: ../src/msw/thread.cpp:159 src/msw/thread.cpp:159
-msgid "Couldn't release a mutex"
-msgstr "Kann Mutex nicht freigeben."
-
-#: ../src/msw/listctrl.cpp:526 src/msw/listctrl.cpp:500
-#, c-format
-msgid "Couldn't retrieve information about list control item %d."
-msgstr "Kann keine Informationen Ã¼ber ListControl %d bekommen."
-
-#: ../src/msw/thread.cpp:612 src/msw/thread.cpp:608
-msgid "Couldn't terminate thread"
-msgstr "Kann Thread nicht beenden"
-
-#: ../src/generic/dirdlgg.cpp:478 src/generic/dirdlgg.cpp:478
-msgid "Create New Directory"
-msgstr "Neues Verzeichnis anlegen"
-
-#: ../src/common/log.cpp:1041 src/common/log.cpp:1022
-msgid "Debug"
-msgstr ""
-
-#: ../src/generic/fontdlgg.cpp:211 src/generic/fontdlgg.cpp:211
-msgid "Decorative"
-msgstr "Dekorativ"
-
-#: ../src/generic/dirdlgg.cpp:450 src/generic/dirdlgg.cpp:450
-msgid "Directory does not exist"
-msgstr "Verzeichnis existiert nicht"
-
-#: ../src/common/docview.cpp:404 src/common/docview.cpp:371
-#, c-format
-msgid "Do you want to save changes to document %s?"
-msgstr "Möchten Sie die Ã„nderungen in Dokument %s sichern?"
-
-#: src/common/log.cpp:368
-msgid "DoLogString must be overrided if it's called."
-msgstr ""
-
-#: ../src/generic/dirdlgg.cpp:477 src/generic/dirdlgg.cpp:477
-msgid "Enter the name of the directory to create"
-msgstr "Geben Sie einen Namen für das neue Verzeichnis ein"
-
-#: ../src/generic/helphtml.cpp:260 src/generic/helphtml.cpp:260
-msgid "Entries found"
-msgstr "Einträge gefunden"
-
-#: src/common/CVS/Base/fileconf.cpp:607 src/common/fileconf.cpp:607
-#, c-format
-msgid "Entry name can't start with '%c'."
-msgstr "Eintragsname kann nicht mit '%c' beginnen."
-
-#: ../src/common/config.cpp:334 src/common/config.cpp:345
-#, c-format
-msgid ""
-"Environment variables expansion failed: missing '%c' at position %d in '%s'."
-msgstr ""
-"Umgebungsvariablenexpansion schlug fehl: fehlendes '%c' an Position %d in '%s'."
-
-#: ../src/common/log.cpp:474 ../src/generic/dcpsg.cpp:1296
-#: ../src/generic/helpxlp.cpp:243 ../src/gtk/filedlg.cpp:79
-#: src/common/log.cpp:474 src/generic/dcpsg.cpp:1247
-#: src/generic/helpxlp.cpp:243
-msgid "Error"
-msgstr "Fehler"
-
-#: ../src/generic/dirdlgg.cpp:462 ../src/generic/dirdlgg.cpp:490
-#: src/generic/dirdlgg.cpp:462 src/generic/dirdlgg.cpp:490
-msgid "Error creating directory"
-msgstr "Fehler beim Anlegen des Verzeichnisses"
-
-#: ../src/common/log.cpp:325 src/common/log.cpp:332
-msgid "Error: "
-msgstr "Fehler: "
-
-#: ../src/generic/dirdlgg.cpp:230 src/generic/dirdlgg.cpp:230
-msgid "Etcetera"
-msgstr "/etc"
-
-#: ../src/msw/utilsexc.cpp:237 src/msw/utilsexc.cpp:237
-#, c-format
-msgid "Execution of command '%s' failed"
-msgstr "Befehlsausführung '%s' schlug fehl"
-
-#: ../src/common/resourc2.cpp:326 ../src/common/resourc2.cpp:1399
-#: ../src/common/resource.cpp:1691 ../src/common/resource.cpp:2769
-#: src/common/resourc2.cpp:326 src/common/resourc2.cpp:1399
-#: src/common/resource.cpp:1674 src/common/resource.cpp:2747
-msgid "Expected '*' whilst parsing resource."
-msgstr "Erwartete '*' beim Lesen der Resource."
-
-#: ../src/common/resourc2.cpp:342 ../src/common/resourc2.cpp:1415
-#: ../src/common/resource.cpp:1708 ../src/common/resource.cpp:2786
-#: src/common/resourc2.cpp:342 src/common/resourc2.cpp:1415
-#: src/common/resource.cpp:1690 src/common/resource.cpp:2763
-msgid "Expected '=' whilst parsing resource."
-msgstr ""
-
-#: ../src/common/resourc2.cpp:312 ../src/common/resourc2.cpp:1385
-#: ../src/common/resource.cpp:1677 ../src/common/resource.cpp:2755
-#: src/common/resourc2.cpp:312 src/common/resourc2.cpp:1385
-#: src/common/resource.cpp:1660 src/common/resource.cpp:2733
-msgid "Expected 'char' whilst parsing resource."
-msgstr ""
-
-#: ../src/msw/clipbrd.cpp:106 src/msw/clipbrd.cpp:106
-msgid "Failed to close the clipboard."
-msgstr "Konnte Zwischenablage nicht schließen."
-
-#: ../src/generic/dirdlgg.cpp:460 ../src/generic/dirdlgg.cpp:488
-#: src/generic/dirdlgg.cpp:460 src/generic/dirdlgg.cpp:488
-msgid "Failed to create directory "
-msgstr "Konnte Verzeichnis nicht anlegen "
-
-#: ../src/msw/tooltip.cpp:260 src/msw/tooltip.cpp:260
-#, c-format
-msgid "Failed to create the tooltip '%s'"
-msgstr ""
-
-#: src/msw/dialog.cpp:143
-msgid "Failed to created dialog."
-msgstr ""
-
-#: ../src/msw/clipbrd.cpp:118 src/msw/clipbrd.cpp:118
-msgid "Failed to empty the clipboard."
-msgstr "Konnte Zwischenablage nicht leeren."
-
-#: ../src/common/resourc2.cpp:808 ../src/common/resource.cpp:2174
-#: src/common/resourc2.cpp:808 src/common/resource.cpp:2156
-#, c-format
-msgid ""
-"Failed to find XBM resource %s.\n"
-"Forgot to use wxResourceLoadBitmapData?"
-msgstr ""
-
-#: ../src/common/resourc2.cpp:963 ../src/common/resource.cpp:2329
-#: src/common/resourc2.cpp:963 src/common/resource.cpp:2311
-#, c-format
-msgid ""
-"Failed to find XBM resource %s.\n"
-"Forgot to use wxResourceLoadIconData?"
-msgstr ""
-
-#: ../src/common/resourc2.cpp:824 ../src/common/resource.cpp:2190
-#: src/common/resourc2.cpp:824 src/common/resource.cpp:2172
-#, c-format
-msgid ""
-"Failed to find XPM resource %s.\n"
-"Forgot to use wxResourceLoadBitmapData?"
-msgstr ""
-
-#: ../src/msw/clipbrd.cpp:86 src/msw/clipbrd.cpp:86
-msgid "Failed to open the clipboard."
-msgstr "Konnte Zwischenablage nicht Ã¶ffnen."
-
-#: ../src/msw/clipbrd.cpp:375 src/msw/clipbrd.cpp:375
-msgid "Failed to retrieve data from the clipboard."
-msgstr "Konnte Daten von der Zwischenablage nicht bekommen."
-
-#: ../src/msw/clipbrd.cpp:262 src/msw/clipbrd.cpp:262
-msgid "Failed to set clipboard data."
-msgstr "Konnte Datein nicht in Zwischenablage kopieren."
-
-#: ../src/unix/threadpsx.cpp:551 src/gtk/threadpsx.cpp:508
-#, c-format
-msgid "Failed to set thread priority %d."
-msgstr ""
-
-#: ../src/unix/threadpsx.cpp:662 src/gtk/threadpsx.cpp:611
-msgid "Failed to terminate a thread."
-msgstr ""
-
-#: ../src/common/log.cpp:545 src/common/log.cpp:543
-msgid "Fatal error"
-msgstr "Nicht-behebbarer Fehler"
-
-#: ../src/common/log.cpp:318 src/common/log.cpp:325
-msgid "Fatal error: "
-msgstr "Nicht-behebbarer Fehler"
-
-#: ../src/gtk/filedlg.cpp:68 src/gtk/filedlg.cpp:57
-#, c-format
-msgid "File '%s' already exists, do you really want to overwrite it?"
-msgstr "Datei '%s' existiert bereits, möchten Sie sie wirklich Ã¼berschreiben?"
-
-#: ../src/common/docview.cpp:280 ../src/common/docview.cpp:311
-#: src/common/docview.cpp:247 src/common/docview.cpp:278
-msgid "File error"
-msgstr "Dateifehler"
-
-#: ../src/msw/filedlg.cpp:259 src/msw/filedlg.cpp:252
-#, c-format
-msgid "Files (%s)|%s"
-msgstr "Dateien (%s)|%s"
-
-#: ../src/generic/fontdlgg.cpp:126 src/generic/fontdlgg.cpp:126
-msgid "Font"
-msgstr "Zeichensatz"
-
-#: ../src/unix/utilsunx.cpp:276 src/gtk/utilsgtk.cpp:327
-msgid "Fork failed"
-msgstr ""
-
-#: ../src/common/resourc2.cpp:295 ../src/common/resourc2.cpp:1368
-#: ../src/common/resource.cpp:1660 ../src/common/resource.cpp:2738
-#: src/common/resourc2.cpp:295 src/common/resourc2.cpp:1368
-#: src/common/resource.cpp:1643 src/common/resource.cpp:2716
-msgid "Found "
-msgstr "Gefunden "
-
-#: ../src/generic/prntdlgg.cpp:158 src/generic/prntdlgg.cpp:97
-msgid "From:"
-msgstr "Von:"
-
-#: ../src/generic/helphtml.cpp:259 ../src/generic/helphtml.cpp:260
-#: src/generic/helphtml.cpp:259 src/generic/helphtml.cpp:260
-msgid "Help Index"
-msgstr "Hilfeindex"
-
-#: ../src/common/resourc2.cpp:997 ../src/common/resourc2.cpp:1008
-#: ../src/common/resource.cpp:2363 ../src/common/resource.cpp:2374
-#: src/common/resourc2.cpp:997 src/common/resourc2.cpp:1008
-#: src/common/resource.cpp:2345 src/common/resource.cpp:2356
-#, c-format
-msgid "Icon resource specification %s not found."
-msgstr ""
-
-#: ../src/common/resource.cpp:234 src/common/resource.cpp:234
-msgid "Ill-formed resource file syntax."
-msgstr ""
-
-#: ../src/common/log.cpp:482 src/common/log.cpp:477
-msgid "Information"
-msgstr "Information"
-
-#: ../src/generic/fontdlgg.cpp:217 src/generic/fontdlgg.cpp:217
-msgid "Italic"
-msgstr "Kursiv"
-
-#: ../src/generic/dcpsg.cpp:1909 ../src/generic/prntdlgg.cpp:403
-#: ../src/generic/prntdlgg.cpp:606 src/generic/dcpsg.cpp:1866
-#: src/generic/prntdlgg.cpp:289 src/generic/prntdlgg.cpp:499
-msgid "Landscape"
-msgstr "Querformat"
-
-#: ../src/generic/prntdlgg.cpp:622 src/generic/prntdlgg.cpp:515
-msgid "Left margin (mm):"
-msgstr "Linker Rand (mm):"
-
-#: src/generic/dcpsg.cpp:2391
-msgid "Legal 8 1/2 x 14 in"
-msgstr ""
-
-#: src/generic/dcpsg.cpp:2390
-msgid "Letter 8 1/2 x 11 in"
-msgstr ""
-
-#: ../src/generic/fontdlgg.cpp:220 src/generic/fontdlgg.cpp:220
-msgid "Light"
-msgstr "Dünn"
-
-#: ../src/gtk/filedlg.cpp:212 ../src/msw/filedlg.cpp:359
-#: src/gtk/filedlg.cpp:177 src/msw/filedlg.cpp:352
-#, c-format
-msgid "Load %s file"
-msgstr "%s-Datei laden"
-
-#: ../src/common/log.cpp:725 src/common/log.cpp:720
-#, c-format
-msgid "Log saved to the file '%s'."
-msgstr "Logtext in Datei '%s' gesichert."
-
-#: ../src/gtk/mdi.cpp:347 src/gtk/mdi.cpp:321
-msgid "MDI child"
-msgstr ""
-
-#: ../src/common/mimetype.cpp:1265 src/common/mimetype.cpp:1203
-#, c-format
-msgid "Mailcap file %s, line %d: incomplete entry ignored."
-msgstr "Mailcap-Datei %s, Zeile %d: unvollständiger Eintrag ignoriert."
-
-#: src/common/mimetype.cpp:968
-#, c-format
-msgid ""
-"Mime.types file %s, line %d: extra characters after the field value ignored."
-msgstr ""
-"Mime.types-Datei %s, Zeile %d: extra Zeichen nach dem Wert ignoriert."
-
-#: ../src/common/mimetype.cpp:979 src/common/mimetype.cpp:941
-#, c-format
-msgid "Mime.types file %s, line %d: unterminated quoted string."
-msgstr "Mime.types-Datei %s, Zeile %d: unterminierter Text"
-
-#: ../src/generic/fontdlgg.cpp:212 src/generic/fontdlgg.cpp:212
-msgid "Modern"
-msgstr ""
-
-#: ../src/generic/dirdlgg.cpp:226 src/generic/dirdlgg.cpp:226
-msgid "Mounted Devices"
-msgstr "Dateisysteme"
-
-#: ../src/generic/dirdlgg.cpp:225 src/generic/dirdlgg.cpp:225
-msgid "My Home"
-msgstr "Mein Verzeichnis"
-
-#: ../src/generic/dirdlgg.cpp:342 src/generic/dirdlgg.cpp:342
-msgid "New..."
-msgstr "Neu..."
-
-#: ../src/generic/msgdlgg.cpp:111 src/generic/msgdlgg.cpp:131
-msgid "No"
-msgstr "Nein"
-
-#: ../src/common/resourc2.cpp:814 ../src/common/resourc2.cpp:969
-#: ../src/common/resource.cpp:2180 ../src/common/resource.cpp:2335
-#: src/common/resourc2.cpp:814 src/common/resourc2.cpp:969
-#: src/common/resource.cpp:2162 src/common/resource.cpp:2317
-msgid "No XBM facility available!"
-msgstr ""
-
-#: ../src/common/resourc2.cpp:830 ../src/common/resource.cpp:2196
-#: src/common/resourc2.cpp:830 src/common/resource.cpp:2178
-msgid "No XPM facility available!"
-msgstr ""
-
-#: ../src/common/resourc2.cpp:991 ../src/common/resource.cpp:2357
-#: src/common/resourc2.cpp:991 src/common/resource.cpp:2339
-msgid "No XPM icon facility available!"
-msgstr ""
-
-#: ../src/generic/helphtml.cpp:254 src/generic/helphtml.cpp:254
-msgid "No entries found."
-msgstr "Keine Einträge gefunden."
-
-#: ../src/generic/fontdlgg.cpp:216 ../src/generic/fontdlgg.cpp:219
-#: src/generic/fontdlgg.cpp:216 src/generic/fontdlgg.cpp:219
-msgid "Normal"
-msgstr ""
-
-#: ../src/generic/choicdgg.cpp:301 ../src/generic/colrdlgg.cpp:231
-#: ../src/generic/dcpsg.cpp:1917 ../src/generic/dirdlgg.cpp:340
-#: ../src/generic/fontdlgg.cpp:260 ../src/generic/msgdlgg.cpp:117
-#: ../src/generic/prntdlgg.cpp:171 ../src/generic/prntdlgg.cpp:429
-#: ../src/generic/prntdlgg.cpp:579 ../src/generic/textdlgg.cpp:136
-#: ../src/gtk/filedlg.cpp:148 src/generic/choicdgg.cpp:301
-#: src/generic/colrdlgg.cpp:231 src/generic/dcpsg.cpp:1874
-#: src/generic/dirdlgg.cpp:340 src/generic/fontdlgg.cpp:260
-#: src/generic/msgdlgg.cpp:138 src/generic/prntdlgg.cpp:110
-#: src/generic/prntdlgg.cpp:316 src/generic/prntdlgg.cpp:472
-#: src/generic/textdlgg.cpp:136 src/gtk/filedlg.cpp:125
-msgid "OK"
-msgstr ""
-
-#: ../src/generic/prntdlgg.cpp:409 src/generic/prntdlgg.cpp:295
-msgid "Options"
-msgstr "Optionen"
-
-#: ../src/generic/prntdlgg.cpp:405 ../src/generic/prntdlgg.cpp:607
-#: src/generic/prntdlgg.cpp:291 src/generic/prntdlgg.cpp:500
-msgid "Orientation"
-msgstr "Orientierung"
-
-#: ../src/common/prntbase.cpp:695 src/common/prntbase.cpp:693
-#, c-format
-msgid "Page %d"
-msgstr "Seite %d"
-
-#: ../src/common/prntbase.cpp:693 src/common/prntbase.cpp:691
-#, c-format
-msgid "Page %d of %d"
-msgstr "Seite %d aus %d"
-
-#: ../src/generic/prntdlgg.cpp:564 src/generic/prntdlgg.cpp:457
-msgid "Page Setup"
-msgstr "Seiteneinstellungen"
-
-#: ../src/generic/prntdlgg.cpp:141 src/generic/prntdlgg.cpp:84
-msgid "Pages"
-msgstr "Seiten"
-
-#: ../src/generic/prntdlgg.cpp:395 ../src/generic/prntdlgg.cpp:756
-#: src/generic/prntdlgg.cpp:281 src/generic/prntdlgg.cpp:629
-msgid "Paper size"
-msgstr "Papierformat"
-
-#: ../src/unix/utilsunx.cpp:259 src/gtk/utilsgtk.cpp:315
-msgid "Pipe creation failed"
-msgstr "Konnte keine Pipe anlegen"
-
-#: ../src/common/prntbase.cpp:112 src/common/prntbase.cpp:111
-msgid "Please wait..."
-msgstr "Bitte warten..."
-
-#: ../src/generic/dcpsg.cpp:1908 ../src/generic/prntdlgg.cpp:402
-#: ../src/generic/prntdlgg.cpp:605 src/generic/dcpsg.cpp:1865
-#: src/generic/prntdlgg.cpp:288 src/generic/prntdlgg.cpp:498
-msgid "Portrait"
-msgstr "Hochformat"
-
-#: ../src/generic/dcpsg.cpp:366 src/generic/dcpsg.cpp:338
-msgid "PostScript"
-msgstr ""
-
-#: ../src/generic/prntdlgg.cpp:234 src/generic/prntdlgg.cpp:159
-msgid "PostScript file"
-msgstr "PostScript-Datei"
-
-#: ../src/generic/dcpsg.cpp:1950 src/generic/dcpsg.cpp:1907
-msgid "PostScript:"
-msgstr ""
-
-#: ../src/generic/dcpsg.cpp:1913 src/generic/dcpsg.cpp:1870
-msgid "Preview Only"
-msgstr "Nur Voransicht"
-
-#: ../src/generic/prntdlgg.cpp:102 ../src/generic/prntdlgg.cpp:116
-#: src/generic/prntdlgg.cpp:71
-msgid "Print"
-msgstr "Drucken"
-
-#: ../src/generic/printps.cpp:189 src/generic/printps.cpp:165
-msgid "Print Error"
-msgstr "Fehler beim Drucken"
-
-#: ../src/common/docview.cpp:831 src/common/docview.cpp:785
-msgid "Print Preview"
-msgstr "Druckvoransicht"
-
-#: ../src/common/prntbase.cpp:636 ../src/common/prntbase.cpp:658
-#: ../src/common/prntbase.cpp:675 src/common/prntbase.cpp:633
-#: src/common/prntbase.cpp:655 src/common/prntbase.cpp:673
-msgid "Print Preview Failure"
-msgstr "Fehler bei Druckvoransicht"
-
-#: ../src/generic/prntdlgg.cpp:149 src/generic/prntdlgg.cpp:90
-msgid "Print Range"
-msgstr "Seitenbereich"
-
-#: ../src/generic/prntdlgg.cpp:370 ../src/generic/prntdlgg.cpp:377
-#: src/generic/prntdlgg.cpp:276
-msgid "Print Setup"
-msgstr "Druckereinstellungen"
-
-#: ../src/generic/prntdlgg.cpp:417 src/generic/prntdlgg.cpp:303
-msgid "Print in colour"
-msgstr "In Farbe drucken"
-
-#: ../src/generic/prntdlgg.cpp:419 src/generic/prntdlgg.cpp:306
-msgid "Print spooling"
-msgstr "Druckersteuerung"
-
-#: ../src/generic/dcpsg.cpp:1912 ../src/generic/prntdlgg.cpp:135
-#: src/generic/dcpsg.cpp:1869 src/generic/prntdlgg.cpp:78
-msgid "Print to File"
-msgstr "In Datei drucken"
-
-#: ../src/common/prntbase.cpp:350 src/common/prntbase.cpp:349
-msgid "Print..."
-msgstr "Drucken..."
-
-#: ../src/generic/dcpsg.cpp:1923 src/generic/dcpsg.cpp:1880
-msgid "Printer Command: "
-msgstr "Druck-Befehl "
-
-#: ../src/generic/dcpsg.cpp:1928 src/generic/dcpsg.cpp:1885
-msgid "Printer Options: "
-msgstr "Befehlsoptionen: "
-
-#: ../src/generic/dcpsg.cpp:335 src/generic/dcpsg.cpp:306
-msgid "Printer Settings"
-msgstr "Druckereinstellungen"
-
-#: ../src/generic/prntdlgg.cpp:421 src/generic/prntdlgg.cpp:308
-msgid "Printer command:"
-msgstr "Druck-Befehl:"
-
-#: ../src/generic/prntdlgg.cpp:133 src/generic/prntdlgg.cpp:76
-msgid "Printer options"
-msgstr "Druckereinstellungen"
-
-#: ../src/generic/prntdlgg.cpp:425 src/generic/prntdlgg.cpp:312
-msgid "Printer options:"
-msgstr "Druckereinstellungen:"
-
-#: ../src/generic/prntdlgg.cpp:582 src/generic/prntdlgg.cpp:475
-msgid "Printer..."
-msgstr "Drucker..."
-
-#: ../src/common/prntbase.cpp:111 ../src/common/prntbase.cpp:153
-#: src/common/prntbase.cpp:110 src/common/prntbase.cpp:152
-msgid "Printing"
-msgstr "Drucke"
-
-#: ../src/common/prntbase.cpp:125 src/common/prntbase.cpp:124
-msgid "Printing Error"
-msgstr "Fehler beim Drucken"
-
-#: ../src/common/log.cpp:319 src/common/log.cpp:326
-msgid "Program aborted."
-msgstr "Programm abgebrochen."
-
-#: ../src/common/log.cpp:677 src/common/log.cpp:672
-msgid "Question"
-msgstr "Frage"
-
-#: ../src/msw/registry.cpp:435 src/msw/registry.cpp:435
-#, c-format
-msgid ""
-"Registry key '%s' is needed for normal system operation,\n"
-"deleting it will leave your system in unusable state:\n"
-"operation aborted."
-msgstr ""
-
-#: ../src/generic/helphtml.cpp:259 src/generic/helphtml.cpp:259
-msgid "Relevant entries:"
-msgstr "Relevante Einträge:"
-
-#: ../src/msw/filedlg.cpp:336 src/msw/filedlg.cpp:329
-#, c-format
-msgid "Replace file '%s'?"
-msgstr "Datei '%s' ersetzen?"
-
-#: ../src/generic/prntdlgg.cpp:628 src/generic/prntdlgg.cpp:521
-msgid "Right margin (mm):"
-msgstr "Rechter Rand (mm):"
-
-#: ../src/generic/fontdlgg.cpp:210 src/generic/fontdlgg.cpp:210
-msgid "Roman"
-msgstr "Römisch"
-
-#: ../src/gtk/filedlg.cpp:228 ../src/msw/filedlg.cpp:359
-#: src/gtk/filedlg.cpp:193 src/msw/filedlg.cpp:352
-#, c-format
-msgid "Save %s file"
-msgstr "Datei %s sichern"
-
-#: ../src/common/docview.cpp:231 src/common/docview.cpp:198
-msgid "Save as"
-msgstr "Sichern als"
-
-#: ../src/common/log.cpp:635 src/common/log.cpp:630
-msgid "Save log contents to file"
-msgstr "Logtexte in Datei sichern"
-
-#: ../src/generic/fontdlgg.cpp:213 src/generic/fontdlgg.cpp:213
-msgid "Script"
-msgstr ""
-
-#: ../src/common/docview.cpp:1268 src/common/docview.cpp:1243
-msgid "Select a document template"
-msgstr ""
-
-#: ../src/common/docview.cpp:1291 src/common/docview.cpp:1266
-msgid "Select a document view"
-msgstr ""
-
-#: ../src/common/docview.cpp:1185 ../src/common/docview.cpp:1223
-#: src/common/docview.cpp:1168 src/common/docview.cpp:1198
-msgid "Select a file"
-msgstr ""
-
-#: ../src/generic/dcpsg.cpp:1911 src/generic/dcpsg.cpp:1868
-msgid "Send to Printer"
-msgstr "Zum Drucker schicken"
-
-#: ../src/generic/prntdlgg.cpp:137 src/generic/prntdlgg.cpp:80
-msgid "Setup..."
-msgstr "Einstellungen..."
-
-#: ../src/common/layout.cpp:1366 src/common/layout.cpp:1326
-msgid "Sizer error"
-msgstr ""
-
-#: ../src/generic/fontdlgg.cpp:218 src/generic/fontdlgg.cpp:218
-msgid "Slant"
-msgstr "Geneigt"
-
-#: ../src/common/docview.cpp:285 src/common/docview.cpp:252
-msgid "Sorry, could not open this file for saving."
-msgstr ""
-
-#: ../src/common/docview.cpp:316 ../src/common/docview.cpp:322
-#: src/common/docview.cpp:283 src/common/docview.cpp:289
-msgid "Sorry, could not open this file."
-msgstr ""
-
-#: ../src/common/docview.cpp:292 src/common/docview.cpp:259
-msgid "Sorry, could not save this file."
-msgstr ""
-
-#: ../src/common/prntbase.cpp:658 src/common/prntbase.cpp:655
-msgid "Sorry, not enough memory to create a preview."
-msgstr "Nicht genug Speicher für Voransicht."
-
-#: ../src/common/log.cpp:787 src/common/log.cpp:781
-msgid "Status: "
-msgstr ""
-
-#: ../src/generic/fontdlgg.cpp:214 src/generic/fontdlgg.cpp:214
-msgid "Swiss"
-msgstr "Schweizer"
-
-#: ../src/generic/fontdlgg.cpp:215 src/generic/fontdlgg.cpp:215
-msgid "Teletype"
-msgstr "Schreibmaschine"
-
-#: ../src/common/docview.cpp:1268 src/common/docview.cpp:1243
-msgid "Templates"
-msgstr ""
-
-#: ../src/generic/dirdlgg.cpp:231 src/generic/dirdlgg.cpp:231
-msgid "Temporary"
-msgstr ""
-
-#: ../src/generic/dirdlgg.cpp:223 src/generic/dirdlgg.cpp:223
-msgid "The Computer"
-msgstr "Der Computer"
-
-#: ../src/generic/dirdlgg.cpp:447 src/generic/dirdlgg.cpp:447
-msgid "The directory "
-msgstr "Das Verzeichnis"
-
-#: ../src/msw/thread.cpp:730 src/msw/thread.cpp:719
-msgid ""
-"Thread module initialization failed: can not store value in thread local "
-"storage"
-msgstr ""
-
-#: src/gtk/threadpsx.cpp:708
-msgid "Thread module initialization failed: failed to create pthread key."
-msgstr ""
-
-#: ../src/msw/thread.cpp:716 src/msw/thread.cpp:705
-msgid ""
-"Thread module initialization failed: impossible to allocate index in thread "
-"local storage"
-msgstr ""
-
-#: ../src/generic/prntdlgg.cpp:162 src/generic/prntdlgg.cpp:101
-msgid "To:"
-msgstr "Bis:"
-
-#: ../src/generic/prntdlgg.cpp:637 src/generic/prntdlgg.cpp:530
-msgid "Top margin (mm):"
-msgstr "Oberer Rand (mm):"
-
-#: ../src/generic/fontdlgg.cpp:246 src/generic/fontdlgg.cpp:246
-msgid "Underline"
-msgstr "Unterstreichen"
-
-#: ../src/common/resourc2.cpp:305 ../src/common/resourc2.cpp:319
-#: ../src/common/resourc2.cpp:335 ../src/common/resourc2.cpp:349
-#: ../src/common/resourc2.cpp:1378 ../src/common/resourc2.cpp:1392
-#: ../src/common/resourc2.cpp:1408 ../src/common/resourc2.cpp:1422
-#: ../src/common/resource.cpp:1670 ../src/common/resource.cpp:1684
-#: ../src/common/resource.cpp:1701 ../src/common/resource.cpp:1715
-#: ../src/common/resource.cpp:2748 ../src/common/resource.cpp:2762
-#: ../src/common/resource.cpp:2779 ../src/common/resource.cpp:2793
-#: src/common/resourc2.cpp:305 src/common/resourc2.cpp:319
-#: src/common/resourc2.cpp:335 src/common/resourc2.cpp:349
-#: src/common/resourc2.cpp:1378 src/common/resourc2.cpp:1392
-#: src/common/resourc2.cpp:1408 src/common/resourc2.cpp:1422
-#: src/common/resource.cpp:1653 src/common/resource.cpp:1667
-#: src/common/resource.cpp:1683 src/common/resource.cpp:1697
-#: src/common/resource.cpp:2726 src/common/resource.cpp:2740
-#: src/common/resource.cpp:2756 src/common/resource.cpp:2770
-msgid "Unexpected end of file whilst parsing resource."
-msgstr ""
-
-#: ../src/common/mimetype.cpp:1021 src/common/mimetype.cpp:985
-#, c-format
-msgid "Unknown field in file %s, line %d: '%s'."
-msgstr "Unbekanntest Feld '%s' in Datei %s, Zeile %d."
-
-#: ../src/common/mimetype.cpp:381 src/common/mimetype.cpp:363
-#, c-format
-msgid "Unmatched '{' in an entry for mime type %s."
-msgstr "Fehlendes '}' in Eintrag für MIME-Typ %s."
-
-#: ../src/common/docview.cpp:1703 ../src/common/docview.cpp:1718
-#: ../src/common/docview.cpp:1745 src/common/docview.cpp:1665
-#: src/common/docview.cpp:1680 src/common/docview.cpp:1707
-msgid "Unnamed command"
-msgstr ""
-
-#: ../src/common/resourc2.cpp:687 ../src/common/resource.cpp:2053
-#: src/common/resourc2.cpp:687 src/common/resource.cpp:2035
-#, c-format
-msgid "Unrecognized style %s whilst parsing resource."
-msgstr ""
-
-#: ../src/msw/clipbrd.cpp:220 ../src/msw/clipbrd.cpp:330
-#: src/msw/clipbrd.cpp:220 src/msw/clipbrd.cpp:330
-msgid "Unsupported clipboard format."
-msgstr "Nicht unterstütztes Format in Zwischenablage."
-
-#: ../src/generic/dirdlgg.cpp:227 src/generic/dirdlgg.cpp:227
-msgid "User"
-msgstr "Benutzer"
-
-#: ../src/generic/dirdlgg.cpp:228 src/generic/dirdlgg.cpp:228
-msgid "User Local"
-msgstr "Lokaler Benutzer"
-
-#: ../src/common/valtext.cpp:188 src/common/valtext.cpp:144
-#: src/common/valtext.cpp:155 src/common/valtext.cpp:164
-#: src/common/valtext.cpp:172 src/common/valtext.cpp:180
-#: src/common/valtext.cpp:189
-msgid "Validation conflict"
-msgstr ""
-
-#: ../src/generic/dirdlgg.cpp:229 src/generic/dirdlgg.cpp:229
-msgid "Variables"
-msgstr "Variablen"
-
-#: ../src/common/docview.cpp:1291 src/common/docview.cpp:1266
-msgid "Views"
-msgstr "Ansichten"
-
-#: ../src/common/docview.cpp:401 ../src/common/log.cpp:478
-#: ../src/common/resource.cpp:121 src/common/docview.cpp:368
-#: src/common/resource.cpp:121
-msgid "Warning"
-msgstr "Warnung"
-
-#: ../src/common/log.cpp:329 src/common/log.cpp:336
-msgid "Warning: "
-msgstr "Warning: "
-
-#: ../src/generic/dcpsg.cpp:1968 src/generic/dcpsg.cpp:1925
-msgid "X Scaling"
-msgstr "X Skalierung"
-
-#: ../src/generic/dcpsg.cpp:1977 src/generic/dcpsg.cpp:1934
-msgid "X Translation"
-msgstr "X Verschiebung"
-
-#: ../src/generic/dcpsg.cpp:1972 src/generic/dcpsg.cpp:1929
-msgid "Y Scaling"
-msgstr "Y Skalierung"
-
-#: ../src/generic/dcpsg.cpp:1981 src/generic/dcpsg.cpp:1938
-msgid "Y Translation"
-msgstr "Y Verschiebung"
-
-#: ../src/generic/msgdlgg.cpp:109 src/generic/msgdlgg.cpp:130
-msgid "Yes"
-msgstr "Ja"
-
-#: ../src/common/docview.cpp:1814 src/common/docview.cpp:1777
-msgid "[EMPTY]"
-msgstr "[leer]"
-
-#: ../src/common/time.cpp:358 src/common/time.cpp:358
-msgid "am"
-msgstr "am"
-
-#: ../src/common/fileconf.cpp:1266 src/common/CVS/Base/fileconf.cpp:1269
-#: src/common/fileconf.cpp:1269
-#, c-format
-msgid "attempt to change immutable key '%s' ignored."
-msgstr "Versuch, Eintrag '%s' zu Ã¤ndern, verweigert. Ist nicht schreibbar."
-
-#: ../src/common/string.cpp:1703 src/common/string.cpp:1430
-msgid "bad index in wxArrayString::Remove"
-msgstr ""
-
-#: ../src/common/file.cpp:273 src/common/file.cpp:268
-#, c-format
-msgid "can't close file descriptor %d"
-msgstr ""
-
-#: ../src/msw/registry.cpp:403 src/msw/registry.cpp:403
-#, c-format
-msgid "can't close registry key '%s'"
-msgstr ""
-
-#: ../src/common/file.cpp:563 src/common/file.cpp:520
-#, c-format
-msgid "can't commit changes to file '%s'"
-msgstr "Kann Ã„nderungen in Datei '%s' nicht sichern."
-
-#: ../src/common/file.cpp:224 src/common/file.cpp:215
-#, c-format
-msgid "can't create file '%s'"
-msgstr "Kann Datei '%s' nicht anlegen."
-
-#: ../src/msw/registry.cpp:386 src/msw/registry.cpp:386
-#, c-format
-msgid "can't create registry key '%s'"
-msgstr ""
-
-#: ../src/msw/registry.cpp:467 src/msw/registry.cpp:467
-#, c-format
-msgid "can't delete key '%s'"
-msgstr ""
-
-#: ../src/common/fileconf.cpp:736 src/common/CVS/Base/fileconf.cpp:742
-#: src/common/fileconf.cpp:742
-#, c-format
-msgid "can't delete user configuration file '%s'"
-msgstr "Kann  Konfigurationsdatei '%s' nicht löschen."
-
-#: ../src/msw/registry.cpp:492 src/msw/registry.cpp:492
-#, c-format
-msgid "can't delete value '%s' from key '%s'"
-msgstr "Kann Wert '%s' von Eintrag '%s' nicht löschen."
-
-#: ../src/msw/registry.cpp:503 src/msw/registry.cpp:503
-#, c-format
-msgid "can't delete value of key '%s'"
-msgstr "Kann Wert von Eintrag '%s' nicht löschen"
-
-#: src/common/file.cpp:447
-#, c-format
-msgid "can't determine if the end of file is reached on descriptor %d"
-msgstr ""
-
-#: ../src/msw/registry.cpp:780 src/msw/registry.cpp:780
-#, c-format
-msgid "can't enumerate subkeys of key '%s'"
-msgstr "Kann Untereinträge von '%s' nicht auflisten"
-
-#: ../src/msw/registry.cpp:735 src/msw/registry.cpp:735
-#, c-format
-msgid "can't enumerate values of key '%s'"
-msgstr "Kann Werte von Eintrag '%s' nicht auflisten"
-
-#: ../src/common/file.cpp:418 src/common/file.cpp:413
-#, c-format
-msgid "can't find length of file on file descriptor %d"
-msgstr ""
-
-#: ../src/msw/utils.cpp:584 src/msw/utils.cpp:561
-msgid "can't find user's HOME, using current directory."
-msgstr "Kann Benutzerverzeichnis nicht finden, verwende aktuelles Verzeichnis."
-
-#: ../src/common/file.cpp:332 src/common/file.cpp:327
-#, c-format
-msgid "can't flush file descriptor %d"
-msgstr ""
-
-#: ../src/msw/registry.cpp:335 src/msw/registry.cpp:335
-#, c-format
-msgid "can't get info about registry key '%s'"
-msgstr ""
-
-#: ../src/common/file.cpp:386 src/common/file.cpp:381
-#, c-format
-msgid "can't get seek position on file descriptor %d"
-msgstr ""
-
-#: ../src/common/file.cpp:259 src/common/file.cpp:254
-#, c-format
-msgid "can't open file '%s'"
-msgstr "Kann Datei '%s' nicht Ã¶ffnen"
-
-#: ../src/common/fileconf.cpp:183 src/common/CVS/Base/fileconf.cpp:186
-#: src/common/fileconf.cpp:186
-#, c-format
-msgid "can't open global configuration file '%s'."
-msgstr "Kann globale Konfigurationsdatei '%s' nicht Ã¶ffnen."
-
-#: ../src/msw/registry.cpp:361 src/msw/registry.cpp:361
-#, c-format
-msgid "can't open registry key '%s'"
-msgstr ""
-
-#: ../src/common/fileconf.cpp:195 src/common/CVS/Base/fileconf.cpp:198
-#: src/common/fileconf.cpp:198
-#, c-format
-msgid "can't open user configuration file '%s'."
-msgstr "Kann Konfigurationsdatei '%s' nicht Ã¶ffnen."
-
-#: ../src/common/fileconf.cpp:642 src/common/CVS/Base/fileconf.cpp:646
-#: src/common/fileconf.cpp:646
-msgid "can't open user configuration file."
-msgstr "Kann Benutzer-Konfigurationsdatei nicht Ã¶ffnen."
-
-#: ../src/common/file.cpp:299 src/common/file.cpp:294
-#, c-format
-msgid "can't read from file descriptor %d"
-msgstr ""
-
-#: ../src/msw/registry.cpp:658 src/msw/registry.cpp:658
-#, c-format
-msgid "can't read value of '%s'"
-msgstr ""
-
-#: ../src/msw/registry.cpp:569 ../src/msw/registry.cpp:608
-#: src/msw/registry.cpp:569 src/msw/registry.cpp:608
-#, c-format
-msgid "can't read value of key '%s'"
-msgstr ""
-
-#: ../src/common/file.cpp:558 src/common/file.cpp:515
-#, c-format
-msgid "can't remove file '%s'"
-msgstr "Kann Datei '%s' nicht löschen."
-
-#: ../src/common/file.cpp:574 src/common/file.cpp:531
-#, c-format
-msgid "can't remove temporary file '%s'"
-msgstr "Kann Temporärdatei '%s' nicht löschen"
-
-#: ../src/common/file.cpp:372 src/common/file.cpp:367
-#, c-format
-msgid "can't seek on file descriptor %d"
-msgstr ""
-
-#: ../src/msw/registry.cpp:594 ../src/msw/registry.cpp:682
-#: src/msw/registry.cpp:594 src/msw/registry.cpp:682
-#, c-format
-msgid "can't set value of '%s'"
-msgstr ""
-
-#: src/common/CVS/Base/fileconf.cpp:594 src/common/fileconf.cpp:594
-msgid "can't set value of a group!"
-msgstr ""
-
-#: ../src/common/textfile.cpp:237 src/common/textfile.cpp:229
-#, c-format
-msgid "can't write file '%s' to disk."
-msgstr "Kann Datei '%s' nicht schreiben."
-
-#: ../src/common/file.cpp:317 src/common/file.cpp:312
-#, c-format
-msgid "can't write to file descriptor %d"
-msgstr ""
-
-#: ../src/common/fileconf.cpp:649 src/common/CVS/Base/fileconf.cpp:653
-#: src/common/fileconf.cpp:653
-msgid "can't write user configuration file."
-msgstr "Kann Benutzers Konfigurationsdatei nicht schreiben."
-
-#: ../src/common/intl.cpp:301 src/common/intl.cpp:300
-#, c-format
-msgid "catalog file for domain '%s' not found."
-msgstr "Nachrichtenkatalog für Sprachbereich '%s' nicht gefunden."
-
-#: ../src/common/filefn.cpp:1527 src/common/filefn.cpp:1497
-msgid "empty file name in wxFindFileInPath"
-msgstr ""
-
-#: ../src/common/fileconf.cpp:1253 src/common/CVS/Base/fileconf.cpp:1256
-#: src/common/fileconf.cpp:1256
-#, c-format
-msgid "entry '%s' appears more than once in group '%s'"
-msgstr "Eintrag '%s' erscheint in Gruppe '%s' mehrfach"
-
-#: ../src/common/fileconf.cpp:335 src/common/CVS/Base/fileconf.cpp:338
-#: src/common/fileconf.cpp:338
-#, c-format
-msgid "file '%s', line %d: '%s' ignored after group header."
-msgstr "Datei '%s', Zeile %d: '%s' hinter Gruppenkopf ignoriert."
-
-#: ../src/common/fileconf.cpp:361 src/common/CVS/Base/fileconf.cpp:357
-#: src/common/fileconf.cpp:357
-#, c-format
-msgid "file '%s', line %d: '=' expected."
-msgstr "Datei '%s', Zeile %d: '=' erwartet."
-
-#: ../src/common/fileconf.cpp:388 src/common/CVS/Base/fileconf.cpp:384
-#: src/common/fileconf.cpp:384
-#, c-format
-msgid "file '%s', line %d: key '%s' was first found at line %d."
-msgstr "Datei '%s', Zeile %d: Eintrag '%s' taucht erstmals in Zeile %d auf."
-
-#: ../src/common/fileconf.cpp:377 src/common/CVS/Base/fileconf.cpp:373
-#: src/common/fileconf.cpp:373
-#, c-format
-msgid "file '%s', line %d: value for immutable key '%s' ignored."
-msgstr "Datei '%s', Zeile %d: Eintrag für nicht-änderbaren Eintrag '%s' ignoriert."
-
-#: ../src/common/fileconf.cpp:303 src/common/CVS/Base/fileconf.cpp:307
-#: src/common/fileconf.cpp:307
-#, c-format
-msgid "file '%s': unexpected character %c at line %d."
-msgstr "Datei '%s': unerwartetes Zeichen %c in Zeile %d."
-
-#: ../src/common/date.cpp:374 ../src/common/date.cpp:392
-#: ../src/common/date.cpp:406 src/common/date.cpp:373 src/common/date.cpp:391
-#: src/common/date.cpp:405
-msgid "invalid date"
-msgstr "ungültiges Datum"
-
-#: ../src/common/date.cpp:356 src/common/date.cpp:355
-msgid "invalid day"
-msgstr "ungültiger Tag"
-
-#: ../src/common/file.cpp:457 src/common/file.cpp:452
-msgid "invalid eof() return value."
-msgstr ""
-
-#: ../src/common/log.cpp:690 src/common/log.cpp:685
-msgid "invalid message box return value"
-msgstr ""
-
-#: ../src/common/date.cpp:364 src/common/date.cpp:363
-msgid "invalid month"
-msgstr "ungültiger Monat"
-
-#: ../src/common/intl.cpp:432 src/common/intl.cpp:431
-#, c-format
-msgid "locale '%s' can not be set."
-msgstr "Lokale Umgebung '%s' kann nicht gesetzt werden."
-
-#: ../src/common/intl.cpp:296 src/common/intl.cpp:295
-#, c-format
-msgid "looking for catalog '%s' in path '%s'."
-msgstr "Suche Nachrichtenkatalog '%s' in Pfad '%s'."
-
-#: ../src/common/time.cpp:360 src/common/time.cpp:360
-msgid "pm"
-msgstr "pm"
-
-#: ../src/common/string.cpp:1719 src/common/string.cpp:1446
-msgid "removing inexistent element in wxArrayString::Remove"
-msgstr ""
-
-#: ../src/common/intl.cpp:521 src/common/intl.cpp:519
-#, c-format
-msgid "string '%s' not found in domain '%s' for locale '%s'."
-msgstr "Text '%s' in Bereich '%s' für Umgebung '%s' nicht gefunden."
-
-#: ../src/common/intl.cpp:526 src/common/intl.cpp:524
-#, c-format
-msgid "string '%s' not found in locale '%s'."
-msgstr "Text '%s' in Umgebung '%s' nicht gefunden."
-
-#: ../src/common/fileconf.cpp:1373 src/common/CVS/Base/fileconf.cpp:1376
-#: src/common/fileconf.cpp:1376
-#, c-format
-msgid "unexpected \" at position %d in '%s'."
-msgstr ""
-
-#: src/common/log.cpp:362
-msgid "unknown log level in wxLog::DoLog"
-msgstr ""
-
-#: src/common/log.cpp:559
-msgid "unknown log level in wxLogGui::DoLog"
-msgstr ""
-
-#: ../src/common/file.cpp:367 src/common/file.cpp:362
-msgid "unknown seek origin"
-msgstr ""
-
-#: ../src/common/docview.cpp:370 src/common/docview.cpp:337
-msgid "unnamed"
-msgstr "Unbenannt"
-
-#: ../src/common/docview.cpp:1055 src/common/docview.cpp:1009
-#, c-format
-msgid "unnamed%d"
-msgstr "Unbenannt"
-
-#: ../src/common/intl.cpp:306 src/common/intl.cpp:305
-#, c-format
-msgid "using catalog '%s' from '%s'."
-msgstr "Verwende Nachrichtenkatalog '%s' von '%s'."
-
-#: ../src/common/layout.cpp:1366 src/common/layout.cpp:1326
-msgid "wxExpandSizer has no parent!"
-msgstr ""
-
-#: ../src/common/prntbase.cpp:635 src/common/prntbase.cpp:632
-msgid ""
-"wxPrintPreviewBase::RenderPage: must use wxPrintPreviewBase::SetCanvas to "
-"let me know about the canvas!"
-msgstr ""
-
-#: ../src/common/filefn.cpp:1134 src/common/filefn.cpp:1123
-msgid "wxWindows: error finding temporary file name.\n"
-msgstr ""
-
-#: ../src/gtk/filedlg.cpp:79
-msgid "Please choose an existing file."
-msgstr "Bitte wählen Sie eine bestehende Datei."
-
-#: ../src/generic/printps.cpp:173
-msgid "Printing..."
-msgstr "Drucke..."
-
-#: ../src/generic/printps.cpp:207
-#, c-format
-msgid "Printing page %d..."
-msgstr "Drucke Seite %d..."
-
-#: ../src/generic/dcpsg.cpp:2189
-msgid "A4 sheet, 210 x 297 mm"
-msgstr ""
-
-#: ../src/common/dynlib.cpp:187
-#, c-format
-msgid "Couldn't find symbol '%s' in a dynamic library"
-msgstr ""
-
-#: ../src/common/dynlib.cpp:274
-#, c-format
-msgid "Failed to load shared library '%s'"
-msgstr ""
-
-#: ../src/common/file.cpp:452
-#, c-format
-msgid ""
-"can't determine if the end of file is reached on                 descriptor "
-"%d"
-msgstr ""
-
-#: ../src/common/fileconf.cpp:611
-#, c-format
-msgid "Config entry name cannot start with '%c'."
-msgstr ""
-
-#: ../src/common/filefn.cpp:1003
-#, c-format
-msgid "Directory '%s' couldn't be created"
-msgstr "Verzeichnis '%s' konnte nicht angelegt werden."
-
-#: ../src/common/string.cpp:1687
-msgid "bad index in wxArrayString::Insert"
-msgstr ""
-
-#: ../src/common/valtext.cpp:140
-#, c-format
-msgid "'%s' is invalid"
-msgstr ""
-
-#: ../src/common/valtext.cpp:160
-#, c-format
-msgid "'%s' should only contain ASCII characters."
-msgstr ""
-
-#: ../src/common/valtext.cpp:166
-#, c-format
-msgid "'%s' should only contain alphabetic characters."
-msgstr ""
-
-#: ../src/common/valtext.cpp:172
-#, c-format
-msgid "'%s' should only contain alphabetic or numeric characters."
-msgstr ""
-
-#: ../src/common/valtext.cpp:178
-#, c-format
-msgid "'%s' should be numeric."
-msgstr ""
-
-#: ../src/common/imagjpeg.cpp:174
-msgid "Couldn't load a JPEG image - probably file is corrupted."
-msgstr ""
-
-#: ../src/common/imagjpeg.cpp:287
-msgid "Couldn't save a JPEG image - probably file is corrupted."
-msgstr ""
-
-#: ../src/motif/app.cpp:559
-#, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr ""
-
-#: ../src/msw/app.cpp:198
-msgid "Could not initialise Rich Edit DLL"
-msgstr ""
-
-#: ../src/msw/app.cpp:698
-msgid "Unrecoverable program error detected:  the application will terminate."
-msgstr ""
-
-#: ../src/msw/app.cpp:700
-msgid "Fatal Error"
-msgstr ""
-
-#: ../src/msw/app.cpp:1165
-msgid "Fatal error: exiting"
-msgstr ""
-
-#: ../src/msw/dialog.cpp:145
-msgid "Failed to create dialog."
-msgstr ""
-
-#: ../src/unix/threadpsx.cpp:296
-msgid "Cannot start thread: error writing TLS"
-msgstr ""
-
-#: ../src/unix/threadpsx.cpp:477
-msgid "Cannot retrieve thread scheduling policy."
-msgstr ""
-
-#: ../src/unix/threadpsx.cpp:485
-#, c-format
-msgid "Cannot get priority range for scheduling policy %d."
-msgstr ""
-
-#: ../src/unix/threadpsx.cpp:768
-msgid "Thread module initialization failed: failed to create thread key"
-msgstr ""
-
-#: ../src/unix/utilsunx.cpp:211
-msgid "Waiting for subprocess termination failed"
-msgstr ""
-
-#: ../src/unix/utilsunx.cpp:449
-msgid "Cannot get the hostname"
-msgstr ""
-
-#: ../src/unix/utilsunx.cpp:485
-msgid "Cannot get the official hostname"
-msgstr ""
-
-#: ../src/unix/utilsunx.cpp:547 ../src/unix/utilsunx.cpp:555
-msgid "Error "
-msgstr ""
-
-#: ../src/unix/utilsunx.cpp:547 ../src/unix/utilsunx.cpp:555
-msgid "noname"
-msgstr "ohnename"
diff --git a/demos/dbbrowse/de/help.mo b/demos/dbbrowse/de/help.mo
deleted file mode 100644 (file)
index 7057f5b..0000000
Binary files a/demos/dbbrowse/de/help.mo and /dev/null differ
diff --git a/demos/dbbrowse/de/help.po b/demos/dbbrowse/de/help.po
deleted file mode 100644 (file)
index 875c13f..0000000
+++ /dev/null
@@ -1,287 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid   ""
-msgstr  "Project-Id-Version: PACKAGE VERSION\n"
-        "POT-Creation-Date: 2000-02-13 16:32+0100\n"
-        "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-        "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-        "Language-Team: LANGUAGE <LL@li.org>\n"
-        "MIME-Version: 1.0\n"
-        "Content-Type: text/plain; charset=CHARSET\n"
-        "Content-Transfer-Encoding: ENCODING\n"
-
-#: helpfrm.cpp:566 helpfrm.cpp:567 helpfrm.cpp:976 helpfrm.cpp:1002
-#, c-format
-msgid   "%i of %i"
-msgstr  "%i von %i"
-
-#: helpfrm.cpp:529
-msgid   "Search in all books"
-msgstr  "Alle Bücher durchsuchen"
-
-#: helpfrm.cpp:529
-msgid   "(Help)"
-msgstr  "(Hilfe)"
-
-#: helpfrm.cpp:529
-msgid   "(Help)"
-msgstr  "(Hilfe)"
-
-#: helpfrm.cpp:606 helpfrm.cpp:660
-msgid   "/"
-msgstr  ""
-
-#: helpfrm.cpp:606 helpfrm.cpp:660
-msgid   "OK"
-msgstr  "OK"
-
-#: helpfrm.cpp:606 helpfrm.cpp:660
-msgid   "Index"
-msgstr  ""
-
-#: helpfrm.cpp:606 helpfrm.cpp:660
-msgid   "Loading:"
-msgstr  "Laden:"
-
-#: helpfrm.cpp:606 helpfrm.cpp:660
-msgid   "text/html"
-msgstr  ""
-
-#: helpfrm.cpp:606 helpfrm.cpp:660
-msgid   "Connecting..."
-msgstr  "baue Verbindung ..."
-
-#: helpfrm.cpp:383 helpfrm.cpp:631 helpfrm.cpp:1024
-msgid   "<bookmarks>"
-msgstr  "<Lesezeichen>"
-
-#: helpfrm.cpp:383 helpfrm.cpp:631 helpfrm.cpp:1024
-msgid   "(bookmarks)"
-msgstr  "<Lesezeichen>"
-
-#: helpfrm.cpp:773
-msgid   "<html><body>Normal face<br>(and <u>underlined</u>. <i>Italic face.</i> <b>Bold face.</b> <b><i>Bold italic face.</i></b><br><font size=-2>font size -2</font><br><font size=-1>font size -1</font><br><font size=+0>font size +0</font><br><font size=+1>font size +1</font><br><font size=+2>font size +2</font><br><font size=+3>font size +3</font><br><font size=+4>font size +4</font><br><p><tt>Fixed size face.<br> <b>bold</b> <i>italic</i> <b><i>bold italic <u>underlined</u></i></b><br><font size=-2>font size -2</font><br><font size=-1>font size -1</font><br><font size=+0>font size +0</font><br><font size=+1>font size +1</font><br><font size=+2>font size +2</font><br><font size=+3>font size +3</font><br><font size=+4>font size +4</font></tt></body></html>"
-msgstr  "<html><body>Normale    <br>(und <u>äöüßÄÖÜ</u>.<i>Italic face.</i> <b>Bold face.</b> <b><i>Bold italic face.</i></b><br><font size=-2>font size -2</font><br><font size=-1>font size -1</font><br><font size=+0>font size +0</font><br><font size=+1>font size +1</font><br><font size=+2>font size +2</font><br><font size=+3>font size +3</font><br><font size=+4>font size +4</font><br><p><tt>Fixed size face.<br> <b>bold</b> <i>italic</i> <b><i>bold italic <u>underlined</u></i></b><br><font size=-2>font size -2</font><br><font size=-1>font size -1</font><br><font size=+0>font size +0</font><br><font size=+1>font size +1</font><br><font size=+2>font size +2</font><br><font size=+3>font size +3</font><br><font size=+4>font size +4</font></tt></body></html>"
-
-#: helpfrm.cpp:393
-msgid   "Add current page to bookmarks"
-msgstr  "Aktuelle HTLM Seite als Lesezeichen hinzufügen"
-
-#: helpfrm.cpp:756
-msgid   "Cancel"
-msgstr  "Abbruch"
-
-#: helpfrm.cpp:302
-msgid   "Case sensitive"
-msgstr  "Groß-/Kleinschreibung"
-
-#: helpfrm.cpp:207
-msgid   "Contents"
-msgstr  "Inhalt"
-
-#: helpfrm.cpp:259
-msgid   "Display all index items that contain given substring. Search is case insensitive."
-msgstr  "Alle Themen im Index nach Suchbegriff durchsuchen. Groß-/Kleinschreibung wird nicht beachtet"
-
-#: helpfrm.cpp:402
-msgid   "Display options dialog"
-msgstr  "Options Dialog anzeigen"
-
-#: helpfrm.cpp:233
-msgid   "Find"
-msgstr  "Suchen"
-
-#: helpfrm.cpp:735
-msgid   "Fixed font:"
-msgstr  ""
-
-#: helpfrm.cpp:745
-msgid   "Font size:"
-msgstr  "Font Größe"
-
-#: helpfrm.cpp:495
-#, c-format
-msgid   "Found %i matches"
-msgstr  "Suchbegriff %i mal gefunden"
-
-#: helpfrm.cpp:374
-msgid   "Go back to the previous HTML page"
-msgstr  "Vorherige HTLM Seite zeigen"
-
-#: helpfrm.cpp:377
-msgid   "Go forward to the next HTML page"
-msgstr  "Nächste HTLM Seite zeigen"
-
-#: helpfrm.cpp:377
-msgid   "Print this page"
-msgstr  "Diese Seite Drücken"
-
-#: helpfrm.cpp:377
-msgid   "Next page"
-msgstr  "Nächste HTLM Seite zeigen"
-
-#: helpfrm.cpp:377
-msgid   "Go back"
-msgstr  "Vorherige HTLM Seite zeigen"
-
-#: helpfrm.cpp:377
-msgid   "Go forward"
-msgstr  "Nächste HTLM Seite zeigen"
-
-#: helpfrm.cpp:377
-msgid   "Go one level up in document hierarchy"
-msgstr  "Ins nächste Dokument-Ebene gehen"
-
-#: helpfrm.cpp:377
-msgid   "Previous page"
-msgstr  "Vorherige HTLM Seite zeigen"
-
-#: helpfrm.cpp:166
-msgid   "Help"
-msgstr  "Hilfe"
-
-#: helpfrm.cpp:718
-msgid   "Help Browser Options"
-msgstr  "Hilfe Browser Optionen"
-
-#: helpfrm.cpp:265
-msgid   "Index"
-msgstr  ""
-
-#: helpfrm.cpp:486
-msgid   "No matching page found yet"
-msgstr  "Passende Seite noch nicht gefunden"
-
-#: helpfrm.cpp:727
-msgid   "Normal font:"
-msgstr  "Normale font:"
-
-#: helpfrm.cpp:755
-msgid   "OK"
-msgstr  ""
-
-#: helpfrm.cpp:749
-msgid   "Preview:"
-msgstr  "Vorschau:"
-
-#: helpfrm.cpp:396
-msgid   "Remove current page from bookmarks"
-msgstr  "Aktuelle HTLM Seite als Lesezeichen entfernen"
-
-#: helpfrm.cpp:282 helpfrm.cpp:327
-msgid   "Search"
-msgstr  "Suchen"
-
-#: helpfrm.cpp:284
-msgid   "Search contents of help book(s) for all occurences of the text you typed above"
-msgstr  "Alle Hilfebücher nach Suchbegriff durchsuchen."
-
-#: helpfrm.cpp:486
-msgid   "Searching..."
-msgstr  "Suchen..."
-
-#: helpfrm.cpp:224
-msgid   "Show all"
-msgstr  "Alles zeigen"
-
-#: helpfrm.cpp:258
-msgid   "Show all items in index"
-msgstr  "Alle Themen im Index anzeigen"
-
-#: helpfrm.cpp:370
-msgid   "Show/hide navigation panel"
-msgstr  "Suchbaum Ein-/Ausschalten"
-
-#: helpfrm.cpp:310
-msgid   "Whole words only"
-msgstr  "Als Wort"
-
-#: helpfrm.cpp:583
-msgid   "all books"
-msgstr  "alle Bücher"
-
-#: helpfrm.cpp:635 helpfrm.cpp:680
-#, c-format
-msgid   "hcBookmark_%i"
-msgstr  ""
-
-#: helpfrm.cpp:639 helpfrm.cpp:682
-#, c-format
-msgid   "hcBookmark_%i_url"
-msgstr  ""
-
-#: helpfrm.cpp:625 helpfrm.cpp:678
-msgid   "hcBookmarksCnt"
-msgstr  ""
-
-#: helpfrm.cpp:616 helpfrm.cpp:669
-msgid   "hcFixedFace"
-msgstr  ""
-
-#: helpfrm.cpp:618 helpfrm.cpp:671
-msgid   "hcFontSize"
-msgstr  ""
-
-#: helpfrm.cpp:614 helpfrm.cpp:668
-msgid   "hcH"
-msgstr  ""
-
-#: helpfrm.cpp:609 helpfrm.cpp:663
-msgid   "hcNavigPanel"
-msgstr  ""
-
-#: helpfrm.cpp:617 helpfrm.cpp:670
-msgid   "hcNormalFace"
-msgstr  ""
-
-#: helpfrm.cpp:610 helpfrm.cpp:664
-msgid   "hcSashPos"
-msgstr  ""
-
-#: helpfrm.cpp:613 helpfrm.cpp:667
-msgid   "hcW"
-msgstr  ""
-
-#: helpfrm.cpp:611 helpfrm.cpp:665
-msgid   "hcX"
-msgstr  ""
-
-#: helpfrm.cpp:612 helpfrm.cpp:666
-msgid   "hcY"
-msgstr  ""
-
-#: helpfrm.cpp:720
-msgid   "very large"
-msgstr  "sehr groß"
-
-#: helpfrm.cpp:720
-msgid   "large"
-msgstr  "groß"
-
-#: helpfrm.cpp:720
-msgid   "medium"
-msgstr  "mittel"
-
-#: helpfrm.cpp:720
-msgid   "small"
-msgstr  "klein"
-
-#: helpfrm.cpp:720
-msgid   "very small"
-msgstr  "sehr klein"
-
-#: helpfrm.cpp:166
-msgid   "wxHtmlHelp"
-msgstr  ""
-#-----------------------------------------------------------
-#: ../Help
-msgid   "Done"
-msgstr  ":-) Ich habe Fertig"
-#-----------------------------------------------------------
-#: ../Help
-msgid   ""
-msgstr  ""
-#-----------------------------------------------------------
diff --git a/demos/dbbrowse/de/mo.cmd b/demos/dbbrowse/de/mo.cmd
deleted file mode 100755 (executable)
index d8ae41c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-msgfmt -o dbbrowse.mo dbbrowse.po
-msgfmt -o help.mo help.po
diff --git a/demos/dbbrowse/de/mo_de.cmd b/demos/dbbrowse/de/mo_de.cmd
deleted file mode 100755 (executable)
index 1e6d197..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/sh
-msgfmt -o wxStd.mo de.po
diff --git a/demos/dbbrowse/de/wxstd.mo b/demos/dbbrowse/de/wxstd.mo
deleted file mode 100644 (file)
index 05be4e9..0000000
Binary files a/demos/dbbrowse/de/wxstd.mo and /dev/null differ
diff --git a/demos/dbbrowse/de/xget.cfg b/demos/dbbrowse/de/xget.cfg
deleted file mode 100644 (file)
index eaad099..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-../browsedb.cpp
-../browsedb.h
-../dbbrowse.cpp
-../dbbrowse.h
-../dbgrid.cpp
-../dbgrid.h
-../dbtree.cpp
-../dbtree.h
-../dlguser.h
-../dlguser.cpp
-../doc.cpp
-../doc.h
-../pgmctrl.cpp
-../pgmctrl.h
-../tabpgwin.cpp
-../tabpgwin.h
diff --git a/demos/dbbrowse/de/xget.cmd b/demos/dbbrowse/de/xget.cmd
deleted file mode 100755 (executable)
index 17edc14..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/sh
-xgettext -C -i -s -j -a -d PgmText -f xget.cfg
diff --git a/demos/dbbrowse/dlguser.cpp b/demos/dbbrowse/dlguser.cpp
deleted file mode 100644 (file)
index f7511a3..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-//----------------------------------------------------------------------------------------
-// Name:        DlgUser.cpp
-// Purpose:     Dialog mit Variable Gestaltung durch DlgUser.wxr
-// Author:      Mark Johnson
-// Modified by: 19991105.mj10777
-// Created:     19991105
-// Copyright:   (c) Mark Johnson
-// Licence:     wxWindows license
-// RCS-ID:      $Id$
-//----------------------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-//----------------------------------------------------------------------------------------
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-//----------------------------------------------------------------------------------------
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-
-//----------------------------------------------------------------------------------------
-//-- all #includes that every .cpp needs             ----19990807.mj10777 ----------------
-//----------------------------------------------------------------------------------------
-#include "std.h"
-
-//----------------------------------------------------------------------------------------
-DlgUser::DlgUser(wxWindow *parent, MainDoc *p_Doc, const wxString& title) :
-                wxDialog(parent, ID_DIALOG_DSN, title)
-{
-    int chSize;                          // Height of Font * 1.4 = Height of wxTextCtrl
-
-    float ratio = (float)1.4;
-#ifdef __WXMOTIF__
-    ratio = (float)2.1;
-#endif
-
-    SetBackgroundColour(_T("wheat"));
-    pDoc = p_Doc;
-    wxLayoutConstraints* layout;
-    SetAutoLayout(true);
-
-    m_Label1 = new wxStaticText(this, wxID_ANY, _("User ID:"));
-    m_Label1->SetFont(* pDoc->ft_Doc);
-    layout = new wxLayoutConstraints;
-    layout->left.SameAs(this, wxLeft, 10);
-    layout->top.SameAs(this, wxTop, 10);
-    layout->height.AsIs();
-    layout->width.Absolute(75);
-    m_Label1->SetConstraints(layout);
-
-    int w;
-    m_Label1->GetSize(&w, &chSize);
-
-    m_UserName = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
-    m_UserName->SetFont(* pDoc->ft_Doc);
-    chSize = (int) (m_UserName->GetCharHeight()*ratio);
-
-    layout = new wxLayoutConstraints;
-    layout->left.SameAs(m_Label1, wxRight, 10);
-    layout->centreY.SameAs(m_Label1,wxCentreY);
-    layout->width.Absolute(200);
-    layout->height.Absolute(chSize);
-    // layout->height.AsIs();
-    m_UserName->SetConstraints(layout);
-
-
-    m_Label2 = new wxStaticText(this, wxID_ANY, _("Password:"));
-    m_Label2->SetFont(* pDoc->ft_Doc);
-    layout = new wxLayoutConstraints;
-    layout->left.SameAs(m_Label1, wxLeft);
-    layout->top.SameAs(m_Label1, wxBottom, 10);
-    layout->height.AsIs();
-    layout->width.SameAs(m_Label1, wxWidth);
-    m_Label2->SetConstraints(layout);
-
-    m_Password = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD);
-    m_Password->SetFont(* pDoc->ft_Doc);
-    layout = new wxLayoutConstraints;
-    layout->left.SameAs(m_UserName, wxLeft);
-    layout->width.SameAs(m_UserName, wxWidth);
-    layout->centreY.SameAs(m_Label2,wxCentreY);
-    layout->height.Absolute(chSize);
-    //layout->height.AsIs();
-    m_Password->SetConstraints(layout);
-
-    m_OK = new wxButton(this, wxID_OK);
-    m_OK->SetFont(* pDoc->ft_Doc);
-    layout = new wxLayoutConstraints;
-    layout->left.SameAs(this, wxLeft, 10);
-    layout->top.SameAs(m_Label2, wxBottom,10);
-    layout->height.AsIs();
-    layout->width.Absolute(75);
-    m_OK->SetConstraints(layout);
-
-    m_Cancel = new wxButton(this, wxID_CANCEL);
-    m_Cancel->SetFont(* pDoc->ft_Doc);
-    layout = new wxLayoutConstraints;
-    layout->left.SameAs(m_OK, wxRight, 10);
-    layout->top.SameAs(m_OK, wxTop);
-    layout->height.AsIs();
-    layout->width.SameAs(m_OK, wxWidth);
-    m_Cancel->SetConstraints(layout);
-
-    m_OK->SetDefault();
-    m_UserName->SetFocus();
-
-    s_User = wxEmptyString;
-    s_Password = wxEmptyString;
-    Layout();
-}
-
-//----------------------------------------------------------------------------------------
-void DlgUser::OnInit()
-{
-    wxString Temp; Temp.Printf(_T(">>> %s <<<"),s_DSN.c_str());
-    SetTitle(Temp);
-    m_UserName->SetLabel(s_User);
-    m_Password->SetLabel(s_Password);
-}
-
-//----------------------------------------------------------------------------------------
-BEGIN_EVENT_TABLE(DlgUser, wxDialog)
-    EVT_BUTTON(wxID_OK, DlgUser::OnOk)
-END_EVENT_TABLE()
-
-//----------------------------------------------------------------------------------------
-void DlgUser::OnOk(wxCommandEvent& WXUNUSED(event) )
-{
-    s_User    = m_UserName->GetValue();
-    s_Password = m_Password->GetValue();
-    EndModal(wxID_OK);
-}
-
diff --git a/demos/dbbrowse/dlguser.h b/demos/dbbrowse/dlguser.h
deleted file mode 100644 (file)
index 35d774b..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-//----------------------------------------------------------------------------------------
-// Name:        DlgUser.h,cpp
-// Purpose:     Dialog mit Variable Gestaltung durch DlgUser.wxr
-// Author:      Mark Johnson
-// Modified by: 19991105.mj10777
-// Created:     19991105
-// Copyright:   (c) Mark Johnson
-// Licence:     wxWindows license
-// RCS-ID:      $Id$
-//----------------------------------------------------------------------------------------
-// DlgUser
-//----------------------------------------------------------------------------------------
-#define ID_DIALOG_DSN   100
-#define ID_DSN          101
-#define ID_USER         102
-#define ID_PASSWORD     103
-#define ID_TEXT         104
-
-//----------------------------------------------------------------------------------------
-class MainDoc;
-
-//----------------------------------------------------------------------------------------
-class DlgUser: public wxDialog
-{
-public:
-    wxString s_DSN, s_User, s_Password;
-    wxStaticText *m_Label1, *m_Label2;
-    wxTextCtrl *m_UserName, *m_Password;
-    wxButton *m_OK, *m_Cancel;
-    MainDoc *pDoc;
-    //---------------------------------------------------------------------------------------
-    DlgUser(wxWindow *parent,MainDoc *pDoc, const wxString& title);
-    void OnInit();
-    void OnOk(wxCommandEvent& event);
-    //---------------------------------------------------------------------------------------
-
-    DECLARE_EVENT_TABLE()
-};
-//----------------------------------------------------------------------------------------
diff --git a/demos/dbbrowse/doc.cpp b/demos/dbbrowse/doc.cpp
deleted file mode 100644 (file)
index d2ef781..0000000
+++ /dev/null
@@ -1,327 +0,0 @@
-//----------------------------------------------------------------------------------------
-// Name:        doc.cpp
-// Purpose:     Holds information for DBBrowser - (a do-it-yourself document)
-// Author:      Mark Johnson
-// Modified by: 19990808.mj10777
-// BJO        : Bart A.M. JOURQUIN
-// Created:     19990808
-// Copyright:   (c) Mark Johnson
-// Licence:     wxWindows license
-// RCS-ID:      $Id$
-//----------------------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-//----------------------------------------------------------------------------------------
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-//----------------------------------------------------------------------------------------
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-//----------------------------------------------------------------------------------------
-//-- all #includes that every .cpp needs             ----19990807.mj10777 ----------------
-//----------------------------------------------------------------------------------------
-#include "std.h"       // sorgsam Pflegen !
-//----------------------------------------------------------------------------------------
-//-- Some Global Vars for all Files (extern in ?.h needed) -------------------------------
-// Global structure for holding ODBC connection information
-extern wxDbConnectInf DbConnectInf;
-
-//----------------------------------------------------------------------------------------
-wxConfigBase   *p_ProgramCfg;       // All Config and Path information
-wxLogTextCtrl  *p_LogBook;          // All Log messages
-wxString        LogBuf;             // String for all Logs
-
-//----------------------------------------------------------------------------------------
-MainDoc::MainDoc()
-{
-    db_Br          = NULL;
-    p_DSN          = NULL;
-    i_DSN          = 0;
-    p_Splitter     = NULL;
-    p_MainFrame    = NULL;
-    p_PgmCtrl      = NULL;               // Is not active
-    p_DBTree       = NULL;
-    p_DBGrid       = NULL;
-    p_LogWin       = NULL;
-    p_TabArea      = NULL;
-    p_PageArea     = NULL;
-    i_TabNr        = 0;
-    i_PageNr       = 0;
-    s_BColour      = _T("WHEAT");
-    ft_Doc         = new wxFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT));
-}
-
-//----------------------------------------------------------------------------------------
-MainDoc::~MainDoc()
-{
-    p_TabArea->Show(false);    // Deactivate the Window
-    p_PageArea->Show(false);    // Deactivate the Window
-
-    // ----------------------------------------------------------
-    // -E-> The Tree Controls take to long to close : Why ??
-    // ----------------------------------------------------------
-    delete ft_Doc;     ft_Doc  = NULL;
-    delete p_PgmCtrl;  p_PgmCtrl = NULL;
-    delete [] p_DSN;
-    delete p_DBTree;
-    delete p_TabArea;  p_TabArea  = NULL;
-    delete p_PageArea; p_PageArea = NULL;
-    delete p_Splitter; p_Splitter = NULL;
-    delete [] db_Br;   db_Br      = NULL;
-    //  wxMessageBox("~MainDoc");
-}
-
-//----------------------------------------------------------------------------------------
-bool MainDoc::OnNewDocument()
-{
-    wxStopWatch sw;
-    //---------------------------------------------------------------------------------------
-    if (!OnInitView())
-        return false;
-    p_PgmCtrl->OnPopulate();
-    //---------------------------------------------------------------------------------------
-    wxLogMessage(_("-I-> MainDoc::OnNewDocument() - End - Time needed : %ld ms"),sw.Time());
-    return true;
-}
-
-//----------------------------------------------------------------------------------------
-bool MainDoc::OnInitView()
-{
-    Sash = p_ProgramCfg->Read(_T("/MainFrame/Sash"), 200);
-    // wxMessageBox("OnInitView() - Begin ","-I->MainDoc::OnInitView");
-    //---------------------------------------------------------------------------------------
-    // create "workplace" window
-    //---------------------------------------------------------------------------------------
-    p_TabArea = new wxTabbedWindow(); // Init the Pointer
-    p_TabArea->Create(p_Splitter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE);
-    //---------------------------------------------------------------------------------------
-    p_PgmCtrl = new PgmCtrl(p_TabArea, TREE_CTRL_PGM,wxDefaultPosition, wxDefaultSize,
-        wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
-    p_PgmCtrl->i_TabArt = 0; // 0 = Tab ; 1 = Page
-    p_PgmCtrl->i_ViewNr = p_TabArea->GetTabCount()-1;
-    //---------------------------------------------------------------------------------------
-    wxBitmap *p_FolderClose = new wxBitmap(_T("PgmCtrl")); //, wxBITMAP_TYPE_BMP_RESOURCE); // BJO20000115
-    //---------------------------------------------------------------------------------------
-    p_TabArea->AddTab(p_PgmCtrl,_T("PgmCtrl"),p_FolderClose);
-    delete p_FolderClose;      // Memory leak
-    p_FolderClose = NULL;
-    wxUnusedVar(p_FolderClose);
-    //---------------------------------------------------------------------------------------
-    // now create "output" window
-    //---------------------------------------------------------------------------------------
-    p_PageArea = new wxPagedWindow();  // Init the Pointer
-    p_PageArea->Create(p_Splitter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE);
-    //---------------------------------------------------------------------------------------
-    p_LogWin = new wxTextCtrl(p_PageArea,wxID_ANY,wxEmptyString,
-        wxDefaultPosition, wxDefaultSize,wxTE_MULTILINE );
-    p_LogWin->SetFont(* ft_Doc);
-    // Don't forget ! This is always : i_TabArt = 0 ; i_ViewNr = 1;
-    //---------------------------------------------------------------------------------------
-    p_LogBook = new wxLogTextCtrl(p_LogWin); // make p_LogWin the LogBook
-    p_LogBook->SetActiveTarget(p_LogBook);
-    p_LogBook->SetTimestamp( NULL );
-    //---------------------------------------------------------------------------------------
-    p_PageArea->AddTab(p_LogWin,_("LogBook"), _T("what is this?") );
-    i_TabNr  = p_TabArea->GetTabCount()-1;  // Add one when a new AddTab is done;
-    i_PageNr = p_PageArea->GetTabCount()-1; // Add one when a new AddTab is done;
-    //---------------------------------------------------------------------------------------
-    p_PgmCtrl->pDoc = this;
-    p_TabArea->SetActiveTab(i_PageNr);
-    //---------------------------------------------------------------------------------------
-    p_Splitter->Initialize(p_TabArea);
-    p_Splitter->SplitHorizontally(p_TabArea,p_PageArea,Sash);
-    //---------------------------------------------------------------------------------------
-    // if (!OnInitODBC())
-    //  return false;
-    OnInitODBC();
-    //---------------------------------------------------------------------------------------
-#if wxUSE_STATUSBAR
-    Temp0.Printf(_("-I-> MainDoc::OnInitView() - End - %d DSN's found"),i_DSN);
-    p_MainFrame->SetStatusText(Temp0, 0);
-    wxLogMessage(Temp0);
-#endif // wxUSE_STATUSBAR
-    return true;
-}
-
-//----------------------------------------------------------------------------------------
-bool MainDoc::OnInitODBC()
-{
-    wxChar Dsn[SQL_MAX_DSN_LENGTH+1];
-    wxChar DsDesc[254+1]; // BJO20002501 instead of 512
-    Temp0 = wxEmptyString;
-    i_DSN = 0;       // Counter
-    int i;
-    //---------------------------------------------------------------------------------------
-    // Initialize the ODBC Environment for Database Operations
-
-    if (!DbConnectInf.AllocHenv())
-    {
-        return false;
-    }
-
-    //---------------------------------------------------------------------------------------
-    const wxChar sep = 3; // separator character used in string between DSN and DsDesc
-    wxSortedArrayString s_SortDSNList, s_SortDsDescList;
-    // BJO-20000127
-    // In order to have same sort result on both Dsn and DsDesc, create a 'keyed' string.
-    // The key will be removed after sorting
-    wxString KeyString;
-    //---------------------------------------------------------------------------------------
-    while (wxDbGetDataSource(DbConnectInf.GetHenv(), Dsn, SQL_MAX_DSN_LENGTH, DsDesc, 254))
-    {
-        i_DSN++;   // How many Dsn have we ?
-        KeyString.Printf(_T("%s%c%s"),Dsn, sep, DsDesc);
-        s_SortDSNList.Add(Dsn);
-        s_SortDsDescList.Add(KeyString);
-    }
-
-    //---------------------------------------------------------------------------------------
-    // Allocate n ODBC-DSN objects to hold the information
-    // Allocate n wxDatabase objects to hold the column information
-    p_DSN = new DSN[i_DSN];  //BJO
-    db_Br = new BrowserDB[i_DSN];
-    for (i=0;i<i_DSN;i++)
-    {
-        KeyString = s_SortDsDescList[i];
-        KeyString = KeyString.AfterFirst(sep);
-
-        // ODBC-DSN object
-        (p_DSN+i)->Dsn = s_SortDSNList[i];
-        (p_DSN+i)->Drv = KeyString;
-        (p_DSN+i)->Usr = wxEmptyString;
-        (p_DSN+i)->Pas = wxEmptyString;
-        Temp0.Printf(_T("%02d) Dsn(%s) DsDesc(%s)"),i,(p_DSN+i)->Dsn.c_str(),(p_DSN+i)->Drv.c_str());
-        wxLogMessage(Temp0);
-
-        // wxDataBase object
-        (db_Br+i)->p_LogWindow = p_LogWin;
-        (db_Br+i)->ODBCSource  = (p_DSN+i)->Dsn;
-        (db_Br+i)->UserName    = (p_DSN+i)->Usr;
-        (db_Br+i)->Password    = (p_DSN+i)->Pas;
-        (db_Br+i)->pDoc        = this;
-        (db_Br+i)->i_Which     = i;
-    }
-
-    DbConnectInf.FreeHenv();
-
-    //---------------------------------------------------------------------------------------
-    if (!i_DSN)
-    {
-        wxString message = _("No Dataset names found in ODBC!\n");
-        message += _("           Program will exit!\n\n");
-        message += _("                       Ciao");
-        wxMessageBox( message,_("-E-> Fatal situation"));
-        return false;
-    }
-    //---------------------------------------------------------------------------------------
-    return true;
-}
-
-//----------------------------------------------------------------------------------------
-bool MainDoc::OnChosenDSN(int Which)
-{
-    // wxLogMessage("OnChosenDSN(%d) - Begin",Which);
-    //---------------------------------------------------------------------------------------
-    if (p_DBTree != NULL)
-    {
-        p_TabArea->Show(false);    // Deactivate the Window
-        p_TabArea->RemoveTab(p_DBTree->i_ViewNr);
-        p_TabArea->Show(true);     // Activate the Window
-        OnChosenTbl(77,wxEmptyString);
-    }
-    //-------------------------
-    p_TabArea->Show(false);    // Deactivate the Window
-    p_DBTree = new DBTree(p_TabArea, TREE_CTRL_DB,wxDefaultPosition, wxDefaultSize,
-        wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
-    p_TabArea->AddTab(p_DBTree,(p_DSN+Which)->Dsn,_T(" ? "));
-    p_DBTree->i_ViewNr = p_TabArea->GetTabCount()-1;
-    p_TabArea->Show(true);    // Deactivate the Window
-    p_DBTree->i_Which  = Which;
-    p_DBTree->s_DSN    = (p_DSN+Which)->Dsn;
-    p_DBTree->i_TabArt = 0;
-    p_DBTree->pDoc     = this;
-    p_DBTree->OnPopulate();
-    p_TabArea->SetActiveTab(p_DBTree->i_ViewNr);
-    //---------------------------------------------------------------------------------------
-    // wxLogMessage("OnChosenDSN(%d) - End",Which);
-    return true;
-}
-
-//----------------------------------------------------------------------------------------
-bool MainDoc::OnChosenTbl(int Tab,wxString Table)
-{
-    // wxLogMessage("OnChosenTbl(%d,%s)",Tab,Table.c_str());
-    //-------------------------
-    if (p_DBGrid != NULL)
-    {
-        if (p_DBGrid->i_TabArt == 0)
-        {
-            p_TabArea->Show(false);    // Deactivate the Window
-            p_TabArea->RemoveTab(p_DBGrid->i_ViewNr);
-            p_TabArea->Show(true);     // Activate the Window
-        }
-        if (p_DBGrid->i_TabArt == 1)
-        {
-            p_PageArea->Show(false);   // Deactivate the Window
-            p_PageArea->RemoveTab(p_DBGrid->i_ViewNr);
-            p_PageArea->Show(true);    // Activate the Window
-        }
-        p_DBGrid = NULL;
-        delete p_DBGrid;
-    }
-    if (Tab == 77)               // Delete only
-        return true;
-    //-------------------------
-    if (Tab == 0)  // Tabview
-    {
-        p_TabArea->Show(false);    // Deactivate the Window
-        p_DBGrid = new DBGrid(p_TabArea,GRID_CTRL_DB,wxDefaultPosition, wxDefaultSize,
-            wxSUNKEN_BORDER);
-        p_TabArea->AddTab(p_DBGrid, Table, wxEmptyString);
-        p_DBGrid->i_ViewNr = p_TabArea->GetTabCount()-1;
-        p_DBGrid->pDoc       = this;
-        p_DBGrid->db_Br      = db_Br;
-        p_DBGrid->OnTableView(Table);
-        p_TabArea->SetActiveTab(p_DBGrid->i_ViewNr);
-        p_TabArea->Show(true);     // Activate the Window
-    }
-    if (Tab == 1)  // Pageview
-    {
-        p_PageArea->Show(false);   // Deactivate the Window
-        p_DBGrid = new DBGrid(p_PageArea,GRID_CTRL_DB,wxDefaultPosition, wxDefaultSize,
-            wxSUNKEN_BORDER);
-        p_PageArea->AddTab(p_DBGrid, Table, wxEmptyString);
-        p_DBGrid->i_ViewNr = p_PageArea->GetTabCount()-1;
-        p_DBGrid->pDoc       = this;
-        p_DBGrid->db_Br      = db_Br;
-        p_DBGrid->i_Which    = p_DBTree->i_Which;
-        p_PageArea->Show(true);    // Activate the Window
-        p_DBGrid->OnTableView(Table);
-        p_PageArea->SetActiveTab(p_DBGrid->i_ViewNr);
-    }
-    p_DBGrid->i_TabArt = Tab;
-    //--------------------------
-    return true;
-}
-
-//----------------------------------------------------------------------------------------
-void MainDoc::OnLeer(wxString Aufrufer)
-{
-    // Temp0.Printf(_("\nMainDoc::OnLeer(%s) : auch diese funktion steht eines Tages zur Verfügung !"),Aufrufer.c_str());
-    Temp0.Printf(_("\nMainDoc::OnLeer(%s) : even this function will one day be available !"),Aufrufer.c_str());
-    wxLogMessage(Temp0);  Temp0.Empty();
-    return;
-}
-
-//----------------------------------------------------------------------------------------
-BEGIN_EVENT_TABLE(DocSplitterWindow, wxSplitterWindow)
-END_EVENT_TABLE()
-
-//----------------------------------------------------------------------------------------
-DocSplitterWindow::DocSplitterWindow(wxWindow *parent, wxWindowID id) : wxSplitterWindow(parent, id)
-{ // Define a constructor for my p_Splitter
-}
-//----------------------------------------------------------------------------------------
diff --git a/demos/dbbrowse/doc.h b/demos/dbbrowse/doc.h
deleted file mode 100644 (file)
index 86672c4..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-//--------------------------------------------------------------------------------------------------
-// Name:        doc.h
-// Purpose:     a non-MFC Document (a do-it-yourself document)
-// Author:      Mark Johnson
-// Modified by: 19990808.mj10777
-// Created:     19990808
-// Copyright:   (c) Mark Johnson
-// Licence:     wxWindows license
-// RCS-ID:      $Id$
-
-//----------------------------------------------------------------------------------------
-//-- Some Global Vars --------------------------------------------------------------------
-//----------------------------------------------------------------------------------------
-class DSN
-{
-public:
-    wxString  Dsn;
-    wxString  Drv;
-    wxString  Pas;
-    wxString  Usr;
-};
-
-//----------------------------------------------------------------------------------------
-// Global structure for holding ODBC connection information
-//extern wxDbConnectInf DbConnectInf;
-
-//----------------------------------------------------------------------------------------
-extern wxConfigBase   *p_ProgramCfg;       // All Config and Path information
-extern wxLogTextCtrl  *p_LogBook;          // All Log messages
-extern wxString        LogBuf;             // String for all Logs
-
-//----------------------------------------------------------------------------------------
-class PgmCtrl;             // Declared in PgmCtrl.h file
-class DocSplitterWindow;   // Declared at the end of the file
-
-//----------------------------------------------------------------------------------------
-class MainDoc
-{
-public:
-    //---------------------------------------------------------------------------------------
-    MainDoc();
-    virtual ~MainDoc();
-    int Sash;
-    //---------------------------------------------------------------------------------------
-    //-- declare document Vars here ---------------------------------------------------------
-    //---------------------------------------------------------------------------------------
-    wxString Temp0, Temp1, Temp2, Temp3, Temp4, Temp5;
-    BrowserDB *db_Br;  // Pointer to wxDB
-    DSN       *p_DSN;
-    int        i_DSN;  // Counter
-    wxString   s_BColour;
-    wxFont    *ft_Doc;
-    //---------------------------------------------------------------------------------------
-    DocSplitterWindow    *p_Splitter;
-    wxHtmlHelpController *p_Help;
-    wxFrame              *p_MainFrame;     // SDI Version
-    PgmCtrl              *p_PgmCtrl;
-    DBTree               *p_DBTree;
-    DBGrid               *p_DBGrid;
-    wxTextCtrl           *p_LogWin;
-    wxTabbedWindow       *p_TabArea;
-    wxPagedWindow        *p_PageArea;
-    int                   i_TabNr;         // Amount of active Views in Tab
-    int                   i_PageNr;        // Amount of active Views in Page
-    //---------------------------------------------------------------------------------------
-    //-- declare document Functions here ----------------------------------------------------
-    //---------------------------------------------------------------------------------------
-    bool OnNewDocument();
-    bool OnInitView();
-    bool OnInitODBC();
-    bool OnChosenDSN(int Which);
-    bool OnChosenTbl(int Tab,wxString Table);
-    //---------------------------------------------------------------------------------------
-    void OnLeer(wxString Aufrufer);  // Dummy Funktion
-    //---------------------------------------------------------------------------------------
-};
-
-//----------------------------------------------------------------------------------------
-class DocSplitterWindow: public wxSplitterWindow
-{
-public:
-    MainDoc *pDoc;
-    DocSplitterWindow(wxWindow *parent, wxWindowID id);
-    virtual bool OnSashPositionChange(int newSashPosition)
-    {
-        if ( !wxSplitterWindow::OnSashPositionChange(newSashPosition) )
-            return false;
-        pDoc->Sash = newSashPosition;
-        return true;
-    }
-    DECLARE_EVENT_TABLE()
-};
-//----------------------------------------------------------------------------------------
diff --git a/demos/dbbrowse/dummy.cpp b/demos/dbbrowse/dummy.cpp
deleted file mode 100644 (file)
index dadde97..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * File:  dummy.cc
- * Purpose:  See below
- * Author:  Julian Smart
- * Created:  1993
- * Updated:
- * Copyright:   (c) Julian Smart
- */
-
-/* A dummy file to include wx.h. If precompiling wx.h, I
- * always start by compiling this and producing the PCH file.
- * Then subsequent source files use the PCH file.
- *
- * If precompiling wx.h for wxWidgets and derived apps,
- * link dummy.obj with your program (the MSC 7 linker complains otherwise).
- *
- * This is the only convenient way I found to use precompiled headers
- * under MSC 7.
- *
- * This will produce a big PCH file.
- */
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/msw/msvcrt.h"
-
diff --git a/demos/dbbrowse/fr/wxstd.mo b/demos/dbbrowse/fr/wxstd.mo
deleted file mode 100644 (file)
index 89c03ea..0000000
Binary files a/demos/dbbrowse/fr/wxstd.mo and /dev/null differ
diff --git a/demos/dbbrowse/fr/xget.cfg b/demos/dbbrowse/fr/xget.cfg
deleted file mode 100644 (file)
index eaad099..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-../browsedb.cpp
-../browsedb.h
-../dbbrowse.cpp
-../dbbrowse.h
-../dbgrid.cpp
-../dbgrid.h
-../dbtree.cpp
-../dbtree.h
-../dlguser.h
-../dlguser.cpp
-../doc.cpp
-../doc.h
-../pgmctrl.cpp
-../pgmctrl.h
-../tabpgwin.cpp
-../tabpgwin.h
diff --git a/demos/dbbrowse/help.cz/wxstd.mo b/demos/dbbrowse/help.cz/wxstd.mo
deleted file mode 100644 (file)
index ebceb33..0000000
Binary files a/demos/dbbrowse/help.cz/wxstd.mo and /dev/null differ
diff --git a/demos/dbbrowse/help.de/compiler.htm b/demos/dbbrowse/help.de/compiler.htm
deleted file mode 100644 (file)
index 5b3945e..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Hilfe : Compiler</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;DBBrowser : Wo wurde DBBrowser Compiliert und mit was ?</H3><BR>(deutsch)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-23.01-mj10777</B><HR>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/winnt.png" WIDTH=35 HEIGHT=30><IMG SRC="../help.png/server.png" WIDTH=35 HEIGHT=26>&nbsp;Windows NT 4.0 Server - SP 4</B></TH><TH BGCOLOR=#FFFFE0><B><IMG SRC="../help.png/msvc.png" WIDTH=45 HEIGHT=26>&nbsp;VC++ 6.0 Compiler</B></TH>
- </TR></TABLE></TBODY>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFFFE0>
-  <TH><B>wxWindows CVS 21.01.2000 18:00</B></TH><TH><B>Statische Bibliothek<BR>nmake -f makefile.vc FINAL=1</B></TH></TR>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFFFE0>
-  <TH><B>Mark Johnson, Berlin Germany</B></TH><TH><B>Kleine .EXE und stable</B></TH></TR>
- </TR></TBODY></TABLE><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/winnt.png" WIDTH=35 HEIGHT=30><IMG SRC="../help.png/server.png" WIDTH=35 HEIGHT=26>&nbsp;Windows NT 4.0 Server - SP 4</B></TH><TH BGCOLOR=#FFFFE0><B><IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;mingw32 gcc-2.95 Compiler</B></TH>
- </TR></TABLE></TBODY>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFFFE0>
-  <TH><B>wxWindows CVS 21.01.2000 18:00</B></TH><TH><B>Statische Bibliothek<BR>make -f makefile.g95</B></TH></TR>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFFFE0>
-  <TH><B>Mark Johnson, Berlin Germany</B></TH><TH><B>Große .EXE und instable</B></TH></TR>
- </TR></TBODY></TABLE><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/linux.png" WIDTH=35 HEIGHT=42><IMG SRC="../help.png/redh.png" WIDTH=35 HEIGHT=38>&nbsp;Linux - Redhat 6.1</B></TH><TH BGCOLOR=#FFFFE0><B><IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;gcc Compiler ? </B></TH>
- </TR></TABLE></TBODY>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFFFE0>
-  <TH><B>wxWindows <IMG SRC="../help.png/gtk.png" WIDTH=35 HEIGHT=46>&nbsp;CVS ??.01.2000 ??:00</B></TH><TH><B>??</B></TH></TR>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFFFE0>
-  <TH><B>??</B></TH><TH><B>??</B></TH></TR>
- </TR></TBODY></TABLE><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/linux.png" WIDTH=35 HEIGHT=42><IMG SRC="../help.png/suse.png" "WIDTH="45" HEIGHT="25"">&nbsp;Linux - SuSE 6.1</B></TH><TH BGCOLOR=#FFFFE0><B><IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;gcc Compiler ? </B></TH>
- </TR></TABLE></TBODY>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFFFE0>
-  <TH><B>wxWindows <IMG SRC="../help.png/gtk.png" WIDTH=35 HEIGHT=46>&nbsp;CVS ??.01.2000 ??:00</B></TH><TH><B>??</B></TH></TR>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFFFE0>
-  <TH><B>??</B></TH><TH><B>??</B></TH></TR>
- </TR></TBODY></TABLE><HR>
-<!----------------------------------------------------------------------------------------------------------->
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.de/dbbrowse.hhc b/demos/dbbrowse/help.de/dbbrowse.hhc
deleted file mode 100644 (file)
index 6cc8649..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML>
-<HEAD>
-<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
-<!-- Sitemap 1.0 -->
-</HEAD><BODY>
-<OBJECT type="text/site properties">
- <param name="ImageType" value="Folder">
-</OBJECT>
-<UL>
- <LI> <OBJECT type="text/sitemap">
-  <param name="Name" value="Pictograms die in diese Hilfe Dateien Verwendung finden">
-   <param name="ID" value=34>
-  <param name="Local" value="picgrams.htm">
-  </OBJECT>
- <LI> <OBJECT type="text/sitemap">
-  <param name="Name" value="DBBrowser">
-   <param name="ID" value=34>
-  <param name="Local" value="dbbrowse.htm">
-  </OBJECT>
- <UL>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="Wo wurde DBBrowser schon mal Compiliert ?">
-   <param name="Local" value="compiler.htm">
-   </OBJECT>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="Icon Verwendung (.ICO / .XPM)">
-   <param name="Local" value="icons.htm">
-   </OBJECT>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="Start Parameter (Sprache/Lokale Unterstützung)">
-   <param name="Local" value="startprm.htm">
-   </OBJECT>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="Was Funktioniert nicht ?">
-   <param name="Local" value="problems.htm">
-   </OBJECT>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="Was für / Wann sind neue Funktionen geplanned ?">
-   <param name="Local" value="todo.htm">
-   </OBJECT>
- </UL>
- <LI> <OBJECT type="text/sitemap">
-  <param name="Name" value="Remstar ODBC">
-  <param name="Local" value="remstar.htm">
-  </OBJECT>
- <UL>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="wxDB Class">
-   <param name="Local" value="wxdb.htm">
-   </OBJECT>
-  <UL>
-   <LI> <OBJECT type="text/sitemap">
-    <param name="Name" value="new wxDB::GetColumns (Beschreibung)">
-    <param name="Local" value="getcol.htm">
-    </OBJECT>
-   <LI> <OBJECT type="text/sitemap">
-    <param name="Name" value="new wxDB::GetColumns (Wie verwendet man es)">
-    <param name="Local" value="getcolsh.htm">
-    </OBJECT>
-  </UL>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="wxTable Class">
-   <param name="Local" value="wxtable.htm">
-   </OBJECT>
- </UL>
-</UL>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.de/dbbrowse.hhk b/demos/dbbrowse/help.de/dbbrowse.hhk
deleted file mode 100644 (file)
index cea1aff..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML>
-<HEAD>
-<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
-<!-- Sitemap 1.0 -->
-</HEAD><BODY>
-<UL>
- <LI> <OBJECT type="text/sitemap">
-  <param name="Name" value="1">
-  <param name="Name" value="DBBrowser">
-  <param name="Local" value="dbbrowse.htm">
-  </OBJECT>
- <LI> <OBJECT type="text/sitemap">
-  <param name="Name" value="2">
-  <param name="Name" value="Remstar ODBC">
-  <param name="Local" value="remstar.htm">
-  </OBJECT>
- <UL>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="3">
-   <param name="Name" value="wxDB Class">
-   <param name="Local" value="wxdb.htm">
-   </OBJECT>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="3">
-   <param name="Name" value="wxTable Class ">
-   <param name="Local" value="wxtable.htm">
-   </OBJECT>
- </UL>
-</UL>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.de/dbbrowse.hhp b/demos/dbbrowse/help.de/dbbrowse.hhp
deleted file mode 100644 (file)
index cd01ae0..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-[OPTIONS]
-Compatibility=1.1
-Compiled file=testing.chm
-Contents file=dbbrowse.hhc
-Display compile progress=No
-Index file=dbbrowse.hhk
-Language=0x405 Hesky
-Title=DBBrowser Handbuch
-Default topic=sample.htm
-
-[FILES]
-dbbrowse.htm
-compiler.htm
-icons.htm
-problems.htm
-startprm.htm
-picgrams.htm
-remstar.htm
-wxdb.htm
-getcol.htm
-getcolsh.htm
-wxtable.htm
diff --git a/demos/dbbrowse/help.de/dbbrowse.htm b/demos/dbbrowse/help.de/dbbrowse.htm
deleted file mode 100644 (file)
index 8d890ed..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Hilfe : &Uuml;bersicht</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;DBBrowser</H3><BR>(deutsch)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-22.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
-  <TABLE border=1><TBODY><TR>
-   <TH BGCOLOR=#FFFFAA><B></B></TH>
-   <TH BGCOLOR=#FFFFE0><B></B></TH>
-  </TR></TBODY></TABLE>
-  <TABLE border=1><TBODY><TR>
-   <TH BGCOLOR=#FFFFAA><B></B></TH>
-   <TH BGCOLOR=#FFFFE0><B></B></TH>
-  </TR></TBODY></TABLE>
-  <TABLE border=1><TBODY><TR>
-   <TH BGCOLOR=#FFFFAA><B></B></TH>
-   <TH BGCOLOR=#FFFFE0><B></B></TH>
-  </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.de/getcol.htm b/demos/dbbrowse/help.de/getcol.htm
deleted file mode 100644 (file)
index 46dd783..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : Remstar ODBC Classes</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/remstar.png" WIDTH=125 HEIGHT=123><BR>Remstar ODBC Classes :<BR>Die neue wxDB::GetColumns() Funktion<BR>Beschreibung</H3><BR>(deutsch)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-23.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>Es gibt 2 neue wxDB Funktionen : </B></TH>
- </TR></TBODY></TABLE>
-<!-------------------------------->
- <A NAME="GETCOLUMNS">
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><A HREF="#GETCOLUMNS">wxColInf *wxDB::GetColumns(char *tableName, int *numCols, const char *userID)</A></B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0><B>Diese Funktion sichert alle (<I><FONT color=#FF0000>int numCols) Informationen aus der Tabelle (<I><FONT color=#FF0000>char *tableName</I>).<BR>Es gibt das Ergebnis in eine <A HREF="#WXCOLINF">wxColInf</A> Stuktur (Klasse)</B></TH>
- </TR></TBODY></TABLE>
-<!-------------------------------->
- <A NAME="GETKEYFIELDS"><P>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><A HREF="#GETKEYFIELDS">int wxDB::GetKeyFields(char *tableName, wxColInf* colInf,int noCols)</A></B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0><B>Versucht herauszufinden ob irgend welche (<I><FONT color=#FF0000>int noCols</I>) Spalten (<I><FONT color=#FF0000>wxColInf* colInf</I>)<BR> aus der Tabelle (<I><FONT color=#FF0000>char *tableName</I>) <IMG SRC="../help.png/key.png" WIDTH=15 HEIGHT=16>&nbsp;Prim&auml;r- oder <IMG SRC="../help.png/keyf.png" WIDTH=15 HEIGHT=16>&nbsp;Fremdschl&uuml;ssel sind.<HR>Diese Funktion wird aus GetColumns() aufgerufen.</B>
- </TR></TBODY></TABLE><HR>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>Es gibt 4 neue wxDB Klassen (Strukturen) : </B></TH>
- </TR></TBODY></TABLE>
-<!-------------------------------->
- <A NAME="WXDBINF"><P>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><A HREF="#WXDBINF">wxDbInf</A></B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0>
-   <B>Diese Klasse speichert alle ODBC-Informationen f&uuml;r einen Datenbank :<HR>
-      Katalogeintrag (<I><FONT color=#FF0000>char catalog[128+1]</I>),<BR>
-      Schema (<I><FONT color=#FF0000>char schema[128+1]</I>)<BR>
-      der Anzahl gefundene Tabellen (<I><FONT color=#FF0000>int numTables</I>)<BR>
-      und eine Zeiger auf der (<I><A HREF="#WXTABLEINF">wxTableInf*</A><FONT color=#FF0000> pTableInf</I>) Struktur.
-   </B></TH>
- </TR></TBODY></TABLE>
-<!-------------------------------->
- <A NAME="WXTABLEINF"><P>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><A HREF="#WXTABLEINF">wxTableInf</A></B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0>
-   <B>Diese Klasse speichert alle ODBC-Informationen f&uuml;r einen Tabelle :<HR>
-      Tabellename (<I><FONT color=#FF0000>char tableName[DB_MAX_TABLE_NAME_LEN+1]</I>),<BR>
-      Tabelletyp  (<I><FONT color=#FF0000>char tableType[254+1]</I>) - "TABLE", "SYSTEM TABLE" etc. ,<BR>
-      Tabellen Bemerkungen (<I><FONT color=#FF0000>char tableRemarks[254+1]</I>),<BR>
-      der Anzahl gefundene Spalten (<I><FONT color=#FF0000>int numCols</I>)<BR>
-      und eine Zeiger auf der (<I><A HREF="#WXCOLINF">wxColInf*</A><FONT color=#FF0000> pColInf</I>) Struktur.
-   </B></TH>
- </TR></TBODY></TABLE>
-<!-------------------------------->
- <A NAME="WXCOLINF"><P>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><A HREF="#WXCOLINF">wxColInf</A></B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0>
-   <B>Diese Klasse speichert alle ODBC-Informationen f&uuml;r einen Spalte :<HR>
-      Katalogeintrag (<I><FONT color=#FF0000>char catalog[128+1]</I>),<BR>
-      Schema (<I><FONT color=#FF0000>char schema[128+1]</I>)<BR>
-      Tabellename (<I><FONT color=#FF0000>char tableName[DB_MAX_TABLE_NAME_LEN+1]</I>),<BR>
-      Spaltenname (<I><FONT color=#FF0000>char colName[DB_MAX_COLUMN_NAME_LEN+1]</I>),<BR>
-      Datentyp (aus SQL) (<I><FONT color=#FF0000>SWORD sqlDataType</I>),<BR>
-      Datatyp-Name(aus SQL) (<I><FONT color=#FF0000>char typeName[128+1]</I>),<BR>
-      Spaltengr&ouml;ße(aus SQL) (<I><FONT color=#FF0000>SWORD columnSize</I>),<BR>
-      Pufferl&auml;nge(aus SQL) (<I><FONT color=#FF0000>SWORD bufferLength</I>),<BR>
-      Dezimalstellen(aus SQL) (<I><FONT color=#FF0000>short decimalDigets</I>),<BR>
-      numPrecRadix (aus SQL) (<I><FONT color=#FF0000>short numPrecRadix</I>),<BR>
-      Null-F&auml;hig (aus SQL) (<I><FONT color=#FF0000>short nullable</I>),<BR>
-      Bemerkungen (<I><FONT color=#FF0000>char remarks[254+1]</I>),<BR>
-      Datatype (from wxDB) (<I><FONT color=#FF0000>int dbDataType</I>),<BR>
-      Prim&auml;rschl&uuml;ssel (<I><FONT color=#FF0000>int PkCol</I>) 0=Nein; 1= Erste Schl&uuml;ssel, 2 = Zweite Schl&uuml;ssel usw.,<BR>
-      Tabllennamen die diese Schl&uuml;ssel als Fremdschl&uuml;ssel verwenden (<I><FONT color=#FF0000>char PkTableName[DB_MAX_TABLE_NAME_LEN+1]</I>),<BR>
-      Foreign-Key (<I><FONT color=#FF0000>int FkCol</I>) 0=Nein; 1= Erste Schl&uuml;ssel, 2 = Zweite Schl&uuml;ssel usw.,<BR>
-      Tabellename wo diese Fremdschl&uuml;ssel als Prim&auml;rschl&uuml;ssel (<I><FONT color=#FF0000>char FkTableName[DB_MAX_TABLE_NAME_LEN+1]</I>),<BR>
-      und eine Zeiger auf der (<I><A HREF="#WXCOLFOR">wxColFor*</A><FONT color=#FF0000> pColFor</I>) Struktur.
-   </B></TH>
- </TR></TBODY></TABLE>
-<!-------------------------------->
- <A NAME="WXCOLFOR"><P>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><A HREF="#WXCOLFOR">wxColFor</A></B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0>
-   <B>Diese Klasse speichert wie diese Spalte als String formatiert werden soll :<HR>
-      Ausgabestring (<I><FONT color=#FF0000>wxString s_Field</I>),<BR>
-      Formatierte Objekten (TIMESTAMP needs 7) (<I><FONT color=#FF0000>wxString s_Format[7]</I>),<BR>
-      Formatierte Objekten (<I><FONT color=#FF0000>wxString s_Menge[7]</I>),<BR>
-      Formatierte Objekten (TT MM YYYY HH MM SS m) (<I><FONT color=#FF0000>int i_Menge[7]</I>),<BR>
-      Nation (0=timestamp,1=EU,2=UK,3=International,4=US)<I><FONT color=#FF0000>int i_Nation</I>),<BR>
-      Datatyp (aus wxDB) (<I><FONT color=#FF0000>int I_dbDataType</I>),<BR>
-      Datatyp (aus SQL) (<I><FONT color=#FF0000>SWORD i_sqlDataType</I>),<HR>
-      int Format(int Nation, int dbDataType,SWORD sqlDataType,short columnSize,short decimalDigits);<BR>
-      Die Formatierte Objekten bekommen Standardwerte und Format() wird aufgerufen.<BR>
-      Die Programmierer k&ouml;nnen, wenn sie was besonderes haben wollen , diese Werte &Auml;ndern und Format() nochmal aufrufen.
-   </B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFBBBB><B>Diese Klasse ist eindeutig unterentwickelt !<BR>Es wurde erstmal zur Verwirklichung von DBGrid erstellt.<BR>&Auml;nderungen sind Wahrscheinlich. (Vorschl&auml;ge sind Willkommen)</B></TH>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFF777><B><A HREF="getcolsh.htm">Damit ist wohl alles klar</A>, oder ?</B></TH>
- </TR></TBODY></TABLE><HR>
-<!----------------------------------------------------------------------------------------------------------->
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.de/getcolsh.htm b/demos/dbbrowse/help.de/getcolsh.htm
deleted file mode 100644 (file)
index 937ffb7..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : Remstar ODBC Classes</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE border=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/remstar.png" WIDTH=125 HEIGHT=123><BR>Remstar ODBC Classes :<BR>The new wxDB::GetColumns() Function<BR>How do you use it ?</H3><BR>(English)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-23.01-mj10777</B><HR>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE border=1><TBODY><TR>
-  <TH BGCOLOR=#FFBBBB><B><IMG SRC="../help.png/imbau.png" WIDTH=144 HEIGHT=50></B></TH>
- </TR></TBODY></TABLE><HR>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE border=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>How does it work ?</B></TH>
- </TR></TBODY></TABLE>
-<!-------------------------------->
- <TABLE border=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>Basicly you use a 3 Dimentional Dynamic Array</B></TH>
- </TR></TBODY></TABLE>
- <TABLE border=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0><B>wxDBInf --> wxTableInf --> wxColInf</B></TH>
- </TR></TBODY></TABLE><P>
-<!-------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>Using DBBrowser as the Example, I will try to explain how it works</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>Sorry, the rest will have to come later !!</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0><B></B></TH>
- </TR></TBODY></TABLE><HR>
-<!-------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B></B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0><B></B></TH>
- </TR></TBODY></TABLE><HR>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFBBBB><B></B></TH>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFF777><B>Well now, <A HREF="getcol.htm">that makes everything clear</A> does't it?</B></TH>
- </TR></TBODY></TABLE><HR>
-<!----------------------------------------------------------------------------------------------------------->
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.de/icons.htm b/demos/dbbrowse/help.de/icons.htm
deleted file mode 100644 (file)
index e684855..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Hilfe : Icons</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;DBBrowser : Icon Verwendung (.ICO / .XPM)</H3><BR>(deutsch)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-22.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>Welche Icons werden f&uuml;r was verwendet ?</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFBBBB><B>*.xpm sind nicht auf <IMG SRC="../help.png/linux.png" WIDTH=35 HEIGHT=42>&nbsp;Linux getestet !</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-<!//--->
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/col.png" WIDTH=16 HEIGHT=15>&nbsp;col.ico / col.xpm</B></TH><TH BGCOLOR=#FFFFE0><B>dbtree.cpp :<BR> ODBC Spalte in eine Tabelle (weder Prim&auml;r- noch Fremdschl&uuml;ssel)</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B><IMG SRC="../help.png/d_closed.png" WIDTH=15 HEIGHT=13>&nbsp;d_closed.ico / d_closed.xpm</B></TH><TH><B>pgmctrl + dbtree.cpp :<BR>letzte Baumzweig (nicht angeklickt)</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/d_open.png" WIDTH=16 HEIGHT=14>&nbsp;d_open.ico / d_open.xpm</B></TH><TH BGCOLOR=#FFFFE0><B>pgmctrl + dbtree.cpp :<BR>letzte Baumzweig (angeklickt)</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B><IMG SRC="../help.png/dsn.png" WIDTH=14 HEIGHT=18>&nbsp;dsn.ico / dsn.xpm</B></TH><TH><B>gute Frage</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/dsnclose.png" WIDTH=14 HEIGHT=17>&nbsp;dsnclose.ico / dsnclose.xpm</B></TH><TH BGCOLOR=#FFFFE0><B>pgmctrl.cpp :<BR>Hauptzweig der ODBC-Datenquellebaum (nicht angeklickt)</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B><IMG SRC="../help.png/dsnopen.png" WIDTH=14 HEIGHT=18>&nbsp;dsnopen.ico / dsnopen.xpm</B></TH><TH><B>pgmctrl.cpp :<BR>Hauptzweig der ODBC-Datenquellebaum (angeklickt)</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/f_closed.png" WIDTH=17 HEIGHT=14>&nbsp;f_closed.ico / f_closed.xpm</B></TH><TH BGCOLOR=#FFFFE0><B>pgmctrl.cpp :<BR>Hauptzweig der Programm-Einstellungsbaum (nicht angeklickt)</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B><IMG SRC="../help.png/f_open.png" WIDTH=17 HEIGHT=15>&nbsp;f_open.ico / f_open.xpm</B></TH><TH><B>pgmctrl.cpp :<BR>Hauptzweig der Programm-Einstellungsbaum (angeklickt)</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/key.png" WIDTH=15 HEIGHT=16>&nbsp;key.ico / key.xpm</B></TH><TH BGCOLOR=#FFFFE0><B>dbtree.cpp :<BR> ODBC Prim&auml;rschl&uuml;ssel-Spalte in eine Tablle</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B><IMG SRC="../help.png/keyf.png" WIDTH=15 HEIGHT=16>&nbsp;keyf.ico / keyf.xpm</B></TH><TH><B>dbtree.cpp :<BR> ODBC Fremdschl&uuml;ssel-Spalte in eine Tablle</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;logo.ico / logo.xpm</B></TH><TH BGCOLOR=#FFFFE0><B>Programm Logo</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B><IMG SRC="../help.png/pgmctrl.png" WIDTH=14 HEIGHT=12>&nbsp;pgmctrl.ico / pgmctrl.xpm / pgmctrl.bmp</B></TH><TH BGCOLOR=#FFFFE0><B>pgmctrl.cpp :<BR> Tab Bitmap</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/tab.png" WIDTH=16 HEIGHT=12>&nbsp;tab.ico / tab.xpm</B></TH><TH><B>dbtree.cpp :<BR> ODBC Table</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B><IMG SRC="../help.png/view.png" WIDTH=16 HEIGHT=15>&nbsp;view.ico / view.xpm</B></TH><TH><B>dbtree.cpp :<BR> ODBC View</B></TH></TR>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFF777>
-  <TH><B><A HREF="icons.htm">Alle andere Pictograms werden nicht in DBBrowser verwendet.<BR>(sind .png Files)</A></B></TH>
- </TR></TBODY></TABLE>
- <P><TABLE BORDER=1><TBODY><TR BGCOLOR=#FFF777>
-  <TH><B>Hoffentlich wird der Zeit bald kommen, wo man auschlie_lich XPM Dateien verwenden darf.</B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.de/picgrams.htm b/demos/dbbrowse/help.de/picgrams.htm
deleted file mode 100644 (file)
index b7a0f7d..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : Pictograms</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;DBBrowser : Verwendete Pictograms (*.png)</H3><BR>(deutsch)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-23.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>Die wahre Bedeutung der verwendete Pictograms in diese Hilfe Dateien</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFF777><B>Alle Pictograms sind .PNG Dateien (Portable Network Graphics)<BR>Ich verwende Paint Shop Pro 5.01 um diese Dateien zuerstellen.</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/imbau.png" WIDTH=144 HEIGHT=50>&nbsp;imbau.png</B></TH><TH BGCOLOR=#FFFFE0><B>Seite ist nicht fertig</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;gnu.png</B></TH><TH BGCOLOR=#FFFFE0><B>GNU Logo : gcc 2.95 Compiler</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/gtk.png" WIDTH=35 HEIGHT=46>&nbsp;gtk.png</B></TH><TH BGCOLOR=#FFFFE0><B>GTK Logo : Grafische Bibliothek in Linux</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/kde.png" WIDTH=35 HEIGHT=33>&nbsp;kde.png</B></TH><TH BGCOLOR=#FFFFE0><B>KDE Logo : Grafische System in Linux</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/linux.png" WIDTH=35 HEIGHT=42>&nbsp;linux.png</B></TH><TH BGCOLOR=#FFFFE0><B>Linux Logo : Linux (Allgemein)</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/motif.png" WIDTH=45 HEIGHT=29>&nbsp;motif.png</B></TH><TH BGCOLOR=#FFFFE0><B>Motif Logo : Grafische Bibliothek in Linux (ist diese Logo korrect ?)</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/msvc.png" WIDTH=45 HEIGHT=26>&nbsp;msvc.png</B></TH><TH BGCOLOR=#FFFFE0><B>Microsoft VC++ Logo : VC++ 6.0 Compiler</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/odbc.png" WIDTH=35 HEIGHT=34>&nbsp;odbc.png</B></TH><TH BGCOLOR=#FFFFE0><B>ODBC Logo </B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/remstar.png" WIDTH=125 HEIGHT=123>&nbsp;remstar.png</B></TH><TH BGCOLOR=#FFFFE0><B>Remstar Logo : Remstar ODBC-Klassen (http://www.remstar.com)</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/redh.png" WIDTH=35 HEIGHT=38>&nbsp;redh.png</B></TH><TH BGCOLOR=#FFFFE0><B>Redhat Logo : Linux Vertreiber (http://www.redhat.com / .de)</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/suse.png" WIDTH=35 HEIGHT=17>&nbsp;suse.png</B></TH><TH BGCOLOR=#FFFFE0><B>SuSE Logo : Linux Vertreiber (http://www.suse.com / .de)</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/server.png" WIDTH=35 HEIGHT=26>&nbsp;server.png</B></TH><TH BGCOLOR=#FFFFE0><B>Server Logo </B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/wins.png" WIDTH=35 HEIGHT=35>&nbsp;wins.png</B></TH><TH BGCOLOR=#FFFFE0><B>Windows Logo : Windows (Allgemein) </B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/winnt.png" WIDTH=35 HEIGHT=30>&nbsp;winnt.png</B></TH><TH BGCOLOR=#FFFFE0><B>Windows-NT Logo : Windows-NT speziefisch</B></TH></TR>
- </TR></TBODY></TABLE>
- <P><TABLE BORDER=1><TBODY><TR BGCOLOR=#FFF777>
-  <TH><B><A HREF="icons.htm">Alle andere Pictograms sind .PNG-Kopien von der DBBrowser-Icons.</A></B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.de/problems.htm b/demos/dbbrowse/help.de/problems.htm
deleted file mode 100644 (file)
index 980f689..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Hilfe : Probleme</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;DBBrowser : Was Funktionert nicht ?</H3><BR>(deutsch)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-02-04.01-mj10777</B>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>Allgemein</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :&nbsp;<IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;</B></TH><TH BGCOLOR=#FFFFE0><B>Nur gcc 2.95 Compiler :<BR>Assert failed in file ../../src/msw/fontutil.cpp at line 238: unknown font slant</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>L&ouml;sung :</B></TH><TH><B>nicht bekannt</B></TH></TR>
- </TR></TBODY></TABLE><P>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :&nbsp;<IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;</B></TH><TH BGCOLOR=#FFFFE0><B>Nur gcc 2.95 Compiler :<BR>Assert failed in file ../../src/msw/fontutil.cpp at line 249: unknown font weight</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>L&ouml;sung :</B></TH><TH><B>nicht bekannt</B></TH></TR>
- </TR></TBODY></TABLE><P>
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>wxHtmlHelpController</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>Problem :</B></TH><TH BGCOLOR=#FFFFE0><B>Wenn der Hilfe geschlossen wird wenn der Voll-HTML-Seite Modus an ist - sieht man nichts wenn Hilfe wieder gestartet wird. (Seite ist Grau)</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFF777><B>Taste Links-Oben dr&uuml;cken um in die geteilte Seitenmodus wiederzugelangen.</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFCC><B>L&ouml;sung :</B></TH><TH><B>unbekannt</B></TH>
- </TR></TBODY></TABLE><P>
-<!-------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :</B></TH><TH BGCOLOR=#FFFFE0><B>Die Rechteseite (HTLM-Seite) bldttert nicht bei der Verwendung der Maus-Mittelrad.<BR>Auf der Linkeseite funktioniert es.</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>L&ouml;sung :</B></TH><TH><B>unbekannt</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!-------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :</B></TH><TH BGCOLOR=#FFFFE0><B>Warum Funktioniert die Aktulisierungs-Taste (F5) nicht?</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Solution :</B></TH><TH><B>pDoc->p_Hilfe-> Display("GUp_Mask_Kunden.htm#Sonstiges");</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!-------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :</B></TH><TH BGCOLOR=#FFFFE0><B>Wie kann die Hilfe Themenbezogen aufgerufen werden ? Eine bestimmte Seite wird ervffnet</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>L&ouml;sung :</B></TH><TH><B>unbekannt</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!-------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>Problem :</B></TH><TH BGCOLOR=#FFFFE0><B>Bilder, die mit HelpView zusehen sind, erscheint nicht wenn OnHelp() aufgerufen wird.</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFBBBB><B>Logbuch : Warning: No handler found for image type.<BR>Warnung: Kein Handler f&uuml;r Bildtyp gefunden<HR>Warum kamm diese Text nicht auf Deutsch ?</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFCC><B>L&ouml;sung :</B></TH><TH><B><BR>Folgende Zeilen in DBBrowser.cpp(MyApp::OnInit()) hinzugef&uuml;gt: <HR>#if wxUSE_LIBPNG<BR>wxImage::AddHandler( new wxPNGHandler );<BR>#endif</B></TH>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>wxGrid (Neue Version)</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :</B></TH><TH BGCOLOR=#FFFFE0><B>Wenn wxGrid in wxPaggedWindows verwendet wird, funktioniert die Scrollbars nicht.</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>L&ouml;sung :</B></TH><TH><B>04.02.2000 : mit neue Grid Version gel&ouml;ßt</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>wxGrid (newe Version) 04.02.2000</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :</B></TH><TH BGCOLOR=#FFFFE0><B>Often : Error: wxGrid::CreateGrid(numRows, numCols) called more than once</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Solution :</B></TH><TH><B>in Arbeit</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>ndchste Problem</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :</B></TH><TH BGCOLOR=#FFFFE0><B>irgend etwas taucht schon auf, wie immer.</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>L&ouml;sung :</B></TH><TH><B>unbekannt</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.de/remstar.htm b/demos/dbbrowse/help.de/remstar.htm
deleted file mode 100644 (file)
index 15e01cb..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : Remstar ODBC Classes</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/remstar.png" WIDTH=125 HEIGHT=123>&nbsp;Remstar ODBC Klassen : </H3><BR>(deutsch)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-22.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>TODO</B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.de/sample.htm b/demos/dbbrowse/help.de/sample.htm
deleted file mode 100644 (file)
index b098686..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Hilfe : Beispiel HTLM Seite</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;DBBrowser : Beispielseite</H3><BR>(deutsch)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-22.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>Blau (CCFFFF)</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Gelb (FFFFAA)</B></TH><TH BGCOLOR=#FFFFE0><B>Hellgelb (FFFFE0)</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Hellgr&uuml;n &lt;TH BGCOLOR=#CCFFCC&gt;<HR>Hintergrundsfarbe f&uuml;r diese teil der Tabelle</B></TH><TH><B>&lt;BODY BGCOLOR=#C6DFC6&gt;<HR>Seitehintergrundsfarbe</B></TH></TR>
- </TR></TBODY></TABLE>
- <P><TABLE BORDER=1><TBODY><TR BGCOLOR=#FFF777>
-  <TH><B>Gold &lt;TR BGCOLOR=#FFF777&gt;<HR>Hintergrundsfarbe f&uuml;r die Gesamte Tabelle</B></TH>
- </TR></TBODY></TABLE>
- <P><TABLE BORDER=1><TBODY><TR BGCOLOR=#FFBBBB>
-  <TH><B>Rosa (FFBBBB)</B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.de/startprm.htm b/demos/dbbrowse/help.de/startprm.htm
deleted file mode 100644 (file)
index 27aa036..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Hilfe : Start parameter</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;DBBrowser : Start Parameter (Internationalizierung)</H3><BR>(deutsch)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-22.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>DBBrowser xx</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>xx = Sprache</B></TH><TH BGCOLOR=#FFFFE0><B>cz, de, fr, pl und std (englisch)</B></TH>
- </TR></TBODY></TABLE>
- <P><TABLE BORDER=1><TBODY><TR BGCOLOR=#FFBBBB>
-  <TH><B>Zur Zeit gibt es f&uuml;r Tschechisch (cz), Franz&ouml;sch (fr) und Polnisch (pl) keine Hilfe Texte<HR>Alles wurde aber daf&uuml;r vorbereitet und der lokale wird gesetzt.</B></TH>
- </TR></TBODY></TABLE>
- <P><TABLE BORDER=1><TBODY><TR BGCOLOR=#FFF777>
-  <TH><B>DBBrowser wird diese Einstellung solange verwenden bis sie ge&auml;ndert werden (also auch nach Programm Neustart). (wxConfigBase)<HR>In "Programm Einstellungen" kann man (zur Zeit nur) zwischen englisch und deutsch hin und her umschalten.</B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.de/todo.htm b/demos/dbbrowse/help.de/todo.htm
deleted file mode 100644 (file)
index 7dbc672..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : Problems</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;DBBrowser : Was f&uuml;r / Wann sind neue Funktionen geplanned ?</H3><BR>(deutsch)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-22.01-mj10777</B>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>Allgemein</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Funktion :</B></TH><TH BGCOLOR=#FFFFE0><B>Wann wird es M&ouml;glich mehr als eine DSN / DBGrid Fenster aufzumachen?</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Zeitplan :</B></TH><TH><B>bald, da es f&uuml;r mich wichtig ist.</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>DBGrid</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Funktion :</B></TH><TH BGCOLOR=#FFFFE0><B>Unterst&uuml;tzung f&uuml;r Neue, L&ouml;schen und &Auml;ndern eines Datensatz.</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Zeitplan :</B></TH><TH><B>Irgenwann W&auml;hrend meine jetztige Projekt.</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>DBGrid</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Funktion :</B></TH><TH BGCOLOR=#FFFFE0><B>Wann werden Datens&auml;tze erst dann eingelesen wenn ben&ouml;tigt wird (Scrolling) ?</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Zeitplan :</B></TH><TH><B>Diese Funktion in f&uuml;r wxGrid geplannt. Ich hoffe bald.</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>DBTree</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Funktion :</B></TH><TH BGCOLOR=#FFFFE0><B>Wann kann DBBrowser eine wxDB und wxTable .cpp/.h Dateien erstellen ?</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Zeitplan :</B></TH><TH><B>Die Funktionen OnDBClass(); OnClass() und OnClassAll(); sind daf&uuml;r vorbereitet..<HR>F&uuml;r mich ist es nicht so wichtig. Irgend jemand wird es schon machen (vielleicht f&uuml;r wxStudio ?)</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>24.01.2000 : George Tasker</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-   <TH BGCOLOR=#FFFFAA><B>Have USER NAME and PASSWORD text widgets, or a menu item to enter them.</B></TH>
-   <TH BGCOLOR=#FFFFE0><B>25.01.2000 - done but must be tested</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>Rather than have the "40 DSN's found" message at the end of the log book, Put that in the status bar of the frame.</B></TH>
-  <TH BGCOLOR=#FFFFE0><B>24.01.2000 - Done</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>Make the grid cells READ-ONLY, since this is a browser (unless you want to make it an editor too -- good idea!)</B></TH>
-  <TH BGCOLOR=#FFFFE0><B>25.01.2000 - done : right mouse click on any grid lable and on popupmenu clicken</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>Sort the DSNs in alphabetical order before putting them in the tree</B></TH>
-  <TH BGCOLOR=#FFFFE0><B>26.01.2000 - done</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>Have program settings available from a TOOLS / OPTIONS menu</B></TH>
-  <TH BGCOLOR=#FFFFE0><B>Willdo</B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#CCFFFF><B>neue Funktion</B></TH></TR>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Funktion :</B></TH><TH BGCOLOR=#FFFFE0><B>irgend etwas taucht schon auf, wie immer.</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Zeitplan :</B></TH><TH><B>unknown</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.de/wxdb.htm b/demos/dbbrowse/help.de/wxdb.htm
deleted file mode 100644 (file)
index 6b080fd..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : Remstar ODBC Classes</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.ng/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/remstar.png" WIDTH=125 HEIGHT=123><BR>Remstar ODBC Classes : wxDB</H3><BR>(deutsch)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-23.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>Es gibt 2 neue wxDB Funktionen : </B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE border=1><TBODY><TR>
-   <TH><B><A HREF="getcol.htm"><B>Beschreibung der neue GetColumns()</B></A></TH>
-   <TH><B>und <A HREF="getcol.htm#GETKEXFIELDS">GetKeyFields()</A><BR><A HREF="getcol.htm#WXDBINF">wxDbInf</A><BR><A HREF="getcol.htm#WXTABLEINF">wxTableInf</A><BR><A HREF="getcol.htm#WXCOLINF">wxColInf</A><BR><A HREF="getcol.htm#WXCOLFOR">wxColFor</A></B></TH>
-  </TR><TR>
-   <TH><B><A HREF="getcolsh.htm"><B>Wie verwendet man die neue GetColumns()</B></A></TH>
-   <TH><B>und GetKeyFields()<BR>wxDbInf<BR>wxTableInf<BR>wxColInf<BR>wxColFor</B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFF777><B>Die andere GetColumns() hat sich nicht ge&Auml;ndert.<BR>Die dort verwendete CcolInf is allerdings, in wirklichkeit, ein wxColInf ! (<I><FONT color=#FF0000>typedef wxColInf CcolInf;</I>)</B></TH>
- </TR></TBODY></TABLE><HR>
-<!----------------------------------------------------------------------------------------------------------->
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.de/wxtable.htm b/demos/dbbrowse/help.de/wxtable.htm
deleted file mode 100644 (file)
index dfd7e58..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Hilfe : Remstar ODBC Klassen</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/remstar.png" WIDTH=125 HEIGHT=123>&nbsp;Remstar ODBC Klassen : wxTable</H3><BR>(deutsch)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-22.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFBBBB><B>Diese Klasse wird in DBBrowser nicht verwendet!</B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.png/col.png b/demos/dbbrowse/help.png/col.png
deleted file mode 100644 (file)
index 9321001..0000000
Binary files a/demos/dbbrowse/help.png/col.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/d_closed.png b/demos/dbbrowse/help.png/d_closed.png
deleted file mode 100644 (file)
index fab0e79..0000000
Binary files a/demos/dbbrowse/help.png/d_closed.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/d_open.png b/demos/dbbrowse/help.png/d_open.png
deleted file mode 100644 (file)
index 7e77c77..0000000
Binary files a/demos/dbbrowse/help.png/d_open.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/dsn.png b/demos/dbbrowse/help.png/dsn.png
deleted file mode 100644 (file)
index 9689cb6..0000000
Binary files a/demos/dbbrowse/help.png/dsn.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/dsnclose.png b/demos/dbbrowse/help.png/dsnclose.png
deleted file mode 100644 (file)
index 912b924..0000000
Binary files a/demos/dbbrowse/help.png/dsnclose.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/dsnopen.png b/demos/dbbrowse/help.png/dsnopen.png
deleted file mode 100644 (file)
index 0a14c4d..0000000
Binary files a/demos/dbbrowse/help.png/dsnopen.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/f_closed.png b/demos/dbbrowse/help.png/f_closed.png
deleted file mode 100644 (file)
index fe1f2cd..0000000
Binary files a/demos/dbbrowse/help.png/f_closed.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/f_open.png b/demos/dbbrowse/help.png/f_open.png
deleted file mode 100644 (file)
index 3ab2b7d..0000000
Binary files a/demos/dbbrowse/help.png/f_open.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/gnu.png b/demos/dbbrowse/help.png/gnu.png
deleted file mode 100644 (file)
index 2a33f2c..0000000
Binary files a/demos/dbbrowse/help.png/gnu.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/gtk.png b/demos/dbbrowse/help.png/gtk.png
deleted file mode 100644 (file)
index 9bb1ae6..0000000
Binary files a/demos/dbbrowse/help.png/gtk.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/imbau.png b/demos/dbbrowse/help.png/imbau.png
deleted file mode 100644 (file)
index 53ed047..0000000
Binary files a/demos/dbbrowse/help.png/imbau.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/kde.png b/demos/dbbrowse/help.png/kde.png
deleted file mode 100644 (file)
index 09b3d71..0000000
Binary files a/demos/dbbrowse/help.png/kde.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/key.png b/demos/dbbrowse/help.png/key.png
deleted file mode 100644 (file)
index d2e112d..0000000
Binary files a/demos/dbbrowse/help.png/key.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/keyf.png b/demos/dbbrowse/help.png/keyf.png
deleted file mode 100644 (file)
index d9df444..0000000
Binary files a/demos/dbbrowse/help.png/keyf.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/linux.png b/demos/dbbrowse/help.png/linux.png
deleted file mode 100644 (file)
index 9396066..0000000
Binary files a/demos/dbbrowse/help.png/linux.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/logo.png b/demos/dbbrowse/help.png/logo.png
deleted file mode 100644 (file)
index 16203f2..0000000
Binary files a/demos/dbbrowse/help.png/logo.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/motif.png b/demos/dbbrowse/help.png/motif.png
deleted file mode 100644 (file)
index 8b551ef..0000000
Binary files a/demos/dbbrowse/help.png/motif.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/msvc.png b/demos/dbbrowse/help.png/msvc.png
deleted file mode 100644 (file)
index b8caf91..0000000
Binary files a/demos/dbbrowse/help.png/msvc.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/odbc.png b/demos/dbbrowse/help.png/odbc.png
deleted file mode 100644 (file)
index 8effdf9..0000000
Binary files a/demos/dbbrowse/help.png/odbc.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/pgmctrl.png b/demos/dbbrowse/help.png/pgmctrl.png
deleted file mode 100644 (file)
index 3a4cad1..0000000
Binary files a/demos/dbbrowse/help.png/pgmctrl.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/redh.png b/demos/dbbrowse/help.png/redh.png
deleted file mode 100644 (file)
index cda2f1e..0000000
Binary files a/demos/dbbrowse/help.png/redh.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/remstar.png b/demos/dbbrowse/help.png/remstar.png
deleted file mode 100644 (file)
index d37a6c8..0000000
Binary files a/demos/dbbrowse/help.png/remstar.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/server.png b/demos/dbbrowse/help.png/server.png
deleted file mode 100644 (file)
index 7fb74df..0000000
Binary files a/demos/dbbrowse/help.png/server.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/suse.png b/demos/dbbrowse/help.png/suse.png
deleted file mode 100644 (file)
index 5e8acba..0000000
Binary files a/demos/dbbrowse/help.png/suse.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/tab.png b/demos/dbbrowse/help.png/tab.png
deleted file mode 100644 (file)
index 3f18486..0000000
Binary files a/demos/dbbrowse/help.png/tab.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/view.png b/demos/dbbrowse/help.png/view.png
deleted file mode 100644 (file)
index aaf2db5..0000000
Binary files a/demos/dbbrowse/help.png/view.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/winnt.png b/demos/dbbrowse/help.png/winnt.png
deleted file mode 100644 (file)
index d4efac9..0000000
Binary files a/demos/dbbrowse/help.png/winnt.png and /dev/null differ
diff --git a/demos/dbbrowse/help.png/wins.png b/demos/dbbrowse/help.png/wins.png
deleted file mode 100644 (file)
index 2eee8fd..0000000
Binary files a/demos/dbbrowse/help.png/wins.png and /dev/null differ
diff --git a/demos/dbbrowse/help.std/compiler.htm b/demos/dbbrowse/help.std/compiler.htm
deleted file mode 100644 (file)
index 7e70b49..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Hilfe : Compiler</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;DBBrowser : Where has DBBrowser been Compilied ?</H3><BR>(English)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-22.01-mj10777</B><HR>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/winnt.png" WIDTH=35 HEIGHT=30><IMG SRC="../help.png/server.png" WIDTH=35 HEIGHT=26>&nbsp;Windows NT 4.0 Server - SP 4</B></TH><TH BGCOLOR=#FFFFE0><B><IMG SRC="../help.png/msvc.png" WIDTH=45 HEIGHT=26>&nbsp;VC++ 6.0 Compiler</B></TH>
- </TR></TABLE></TBODY>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFFFE0>
-  <TH><B>wxWindows CVS 21.01.2000 18:00</B></TH><TH><B>Static Library<BR>nmake -f makefile.vc FINAL=1</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFFFE0>
-  <TH><B>Mark Johnson, Berlin Germany</B></TH><TH><B>Small .EXE and stable</B></TH>
- </TR></TBODY></TABLE><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/winnt.png" WIDTH=35 HEIGHT=30><IMG SRC="../help.png/server.png" WIDTH=35 HEIGHT=26>&nbsp;Windows NT 4.0 Server - SP 4</B></TH><TH BGCOLOR=#FFFFE0><B><IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;mingw32 gcc-2.95 Compiler</B></TH>
- </TR></TABLE></TBODY>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFFFE0>
-  <TH><B>wxWindows CVS 21.01.2000 18:00</B></TH><TH><B>Static Library<BR>make -f makefile.g95</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFFFE0>
-  <TH><B>Mark Johnson, Berlin Germany</B></TH><TH><B>Big .EXE and unstable</B></TH>
- </TR></TBODY></TABLE><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/linux.png" WIDTH=35 HEIGHT=42><IMG SRC="../help.png/redh.png" WIDTH=35 HEIGHT=38>&nbsp;Linux - Redhat 6.1</B></TH><TH BGCOLOR=#FFFFE0><B><IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;gcc Compiler ? </B></TH>
- </TR></TABLE></TBODY>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFFFE0>
-  <TH><B>wxWindows <IMG SRC="../help.png/gtk.png" WIDTH=35 HEIGHT=46>&nbsp;CVS ??.01.2000 ??:00</B></TH><TH><B>??</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFFFE0>
-  <TH><B>??</B></TH><TH><B>??</B></TH>
- </TR></TBODY></TABLE><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/linux.png" WIDTH=35 HEIGHT=42><IMG SRC="../help.png/suse.png" "WIDTH="45" HEIGHT="25"">&nbsp;Linux - SuSE 6.1</B></TH><TH BGCOLOR=#FFFFE0><B><IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;gcc Compiler ? </B></TH>
- </TR></TABLE></TBODY>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFFFE0>
-  <TH><B>wxWindows <IMG SRC="../help.png/gtk.png" WIDTH=35 HEIGHT=46>&nbsp;CVS ??.01.2000 ??:00</B></TH><TH><B>??</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFFFE0>
-  <TH><B>??</B></TH><TH><B>??</B></TH>
- </TR></TBODY></TABLE><HR>
-<!----------------------------------------------------------------------------------------------------------->
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.std/dbbrowse.hhc b/demos/dbbrowse/help.std/dbbrowse.hhc
deleted file mode 100644 (file)
index fc5d29c..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML>
-<HEAD>
-<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
-<!-- Sitemap 1.0 -->
-</HEAD><BODY>
-<OBJECT type="text/site properties">
- <param name="ImageType" value="Folder">
-</OBJECT>
-<UL>
- <LI> <OBJECT type="text/sitemap">
-  <param name="Name" value="Pictograms used in these Help Files">
-   <param name="ID" value=34>
-  <param name="Local" value="picgrams.htm">
-  </OBJECT>
- <LI> <OBJECT type="text/sitemap">
-  <param name="Name" value="DBBrowser">
-   <param name="ID" value=34>
-  <param name="Local" value="dbbrowse.htm">
-  </OBJECT>
- <UL>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="Where has DBBrowser been Compilied ?">
-   <param name="Local" value="compiler.htm">
-   </OBJECT>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="Used Icons (.ICO / .XPM)">
-   <param name="Local" value="icons.htm">
-   </OBJECT>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="Start Parameter (Language/Locale Support)">
-   <param name="Local" value="startprm.htm">
-   </OBJECT>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="What does not Work ?">
-   <param name="Local" value="problems.htm">
-   </OBJECT>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="What / When are new Functions planned ?">
-   <param name="Local" value="todo.htm">
-   </OBJECT>
- </UL>
- <LI> <OBJECT type="text/sitemap">
-  <param name="Name" value="Remstar ODBC">
-  <param name="Local" value="remstar.htm">
-  </OBJECT>
- <UL>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="wxDB Class">
-   <param name="Local" value="wxdb.htm">
-   </OBJECT>
-  <UL>
-   <LI> <OBJECT type="text/sitemap">
-    <param name="Name" value="new wxDB::GetColumns (Discription)">
-    <param name="Local" value="getcol.htm">
-    </OBJECT>
-   <LI> <OBJECT type="text/sitemap">
-    <param name="Name" value="new wxDB::GetColumns (How to Use)">
-    <param name="Local" value="getcolsh.htm">
-    </OBJECT>
-  </UL>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="wxTable Class">
-   <param name="Local" value="wxtable.htm">
-   </OBJECT>
- </UL>
-</UL>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.std/dbbrowse.hhk b/demos/dbbrowse/help.std/dbbrowse.hhk
deleted file mode 100644 (file)
index cea1aff..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML>
-<HEAD>
-<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
-<!-- Sitemap 1.0 -->
-</HEAD><BODY>
-<UL>
- <LI> <OBJECT type="text/sitemap">
-  <param name="Name" value="1">
-  <param name="Name" value="DBBrowser">
-  <param name="Local" value="dbbrowse.htm">
-  </OBJECT>
- <LI> <OBJECT type="text/sitemap">
-  <param name="Name" value="2">
-  <param name="Name" value="Remstar ODBC">
-  <param name="Local" value="remstar.htm">
-  </OBJECT>
- <UL>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="3">
-   <param name="Name" value="wxDB Class">
-   <param name="Local" value="wxdb.htm">
-   </OBJECT>
-  <LI> <OBJECT type="text/sitemap">
-   <param name="Name" value="3">
-   <param name="Name" value="wxTable Class ">
-   <param name="Local" value="wxtable.htm">
-   </OBJECT>
- </UL>
-</UL>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.std/dbbrowse.hhp b/demos/dbbrowse/help.std/dbbrowse.hhp
deleted file mode 100644 (file)
index f5a9fa0..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-[OPTIONS]
-Compatibility=1.1
-Compiled file=testing.chm
-Contents file=dbbrowse.hhc
-Display compile progress=No
-Index file=dbbrowse.hhk
-Language=0x405 Hesky
-Title=DBBrowser Handbook
-Default topic=sample.htm
-
-[FILES]
-dbbrowse.htm
-compiler.htm
-icons.htm
-problems.htm
-startprm.htm
-picgrams.htm
-remstar.htm
-wxdb.htm
-getcol.htm
-getcolsh.htm
-wxtable.htm
diff --git a/demos/dbbrowse/help.std/dbbrowse.htm b/demos/dbbrowse/help.std/dbbrowse.htm
deleted file mode 100644 (file)
index 2473799..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : </TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;DBBrowser</H3><BR>(English)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-22.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
-  <TABLE border=1><TBODY><TR>
-   <TH BGCOLOR=#FFFFAA><B></B></TH>
-   <TH BGCOLOR=#FFFFE0><B></B></TH>
-  </TR></TBODY></TABLE>
-  <TABLE border=1><TBODY><TR>
-   <TH BGCOLOR=#FFFFAA><B></B></TH>
-   <TH BGCOLOR=#FFFFE0><B></B></TH>
-  </TR></TBODY></TABLE>
-  <TABLE border=1><TBODY><TR>
-   <TH BGCOLOR=#FFFFAA><B></B></TH>
-   <TH BGCOLOR=#FFFFE0><B></B></TH>
-  </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.std/getcol.htm b/demos/dbbrowse/help.std/getcol.htm
deleted file mode 100644 (file)
index ac787f8..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : Remstar ODBC Classes</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/remstar.png" WIDTH=125 HEIGHT=123><BR>Remstar ODBC Classes :<BR>The new wxDB::GetColumns() Function<BR>Description</H3><BR>(English)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-23.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>There are 2 new wxDB Functions : </B></TH>
- </TR></TBODY></TABLE>
-<!-------------------------------->
- <A NAME="GETCOLUMNS">
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><A HREF="#GETCOLUMNS">wxColInf *wxDB::GetColumns(char *tableName, int *numCols, const char *userID)</A></B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0><B>This Function stores all (<I><FONT color=#FF0000>int numCols) information from the Table (<I><FONT color=#FF0000>char *tableName</I>).<BR>It returns the result in a <A HREF="#WXCOLINF">wxColInf</A> Stucture (Class)</B></TH>
- </TR></TBODY></TABLE>
-<!-------------------------------->
- <A NAME="GETKEYFIELDS"><P>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><A HREF="#GETKEYFIELDS">int wxDB::GetKeyFields(char *tableName, wxColInf* colInf,int noCols)</A></B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0><B>Tries to find out if any (<I><FONT color=#FF0000>int noCols</I>) of the columns (<I><FONT color=#FF0000>wxColInf* colInf</I>)<BR> in the Table (<I><FONT color=#FF0000>char *tableName</I>) are <IMG SRC="../help.png/key.png" WIDTH=15 HEIGHT=16>&nbsp;Primary or <IMG SRC="../help.png/keyf.png" WIDTH=15 HEIGHT=16>&nbsp;Foreign Keys.<HR>This Function is only called from GetColumns().</B></TH>
- </TR></TBODY></TABLE><HR>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>There are 4 new wxDB Classes (Structures) : </B></TH>
- </TR></TBODY></TABLE>
-<!-------------------------------->
- <A NAME="WXDBINF"><P>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><A HREF="#WXDBINF">wxDbInf</A></B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0>
-   <B>This Class stores all ODBC-Information for a Database :<HR>
-      Catalog Entry (<I><FONT color=#FF0000>char catalog[128+1]</I>),<BR>
-      Schema (<I><FONT color=#FF0000>char schema[128+1]</I>)<BR>
-      the number of Tables found(<I><FONT color=#FF0000>int numTables</I>)<BR>
-      and a Pointer (<I><A HREF="#WXTABLEINF">wxTableInf*</A><FONT color=#FF0000> pTableInf</I>) Structure is stored.
-   </B></TH>
- </TR></TBODY></TABLE>
-<!-------------------------------->
- <A NAME="WXTABLEINF"><P>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><A HREF="#WXTABLEINF">wxTableInf</A></B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0>
-   <B>This Class stores all ODBC-Information about a Table :<HR>
-      Table-Name (<I><FONT color=#FF0000>char tableName[DB_MAX_TABLE_NAME_LEN+1]</I>),<BR>
-      Table-Type (<I><FONT color=#FF0000>char tableType[254+1]</I>) - "TABLE", "SYSTEM TABLE" etc. ,<BR>
-      Table-Remarks (<I><FONT color=#FF0000>char tableRemarks[254+1]</I>),<BR>
-      the number of Columns found(<I><FONT color=#FF0000>int numCols</I>)<BR>
-      and a Pointer (<I><A HREF="#WXCOLINF">wxColInf*</A><FONT color=#FF0000> pColInf</I>) Structure is stored.
-   </B></TH>
- </TR></TBODY></TABLE>
-<!-------------------------------->
- <A NAME="WXCOLINF"><P>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><A HREF="#WXCOLINF">wxColInf</A></B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0>
-   <B>This Class stores all ODBC-Information about a Column :<HR>
-      Catalog Entry (<I><FONT color=#FF0000>char catalog[128+1]</I>),<BR>
-      Schema (<I><FONT color=#FF0000>char schema[128+1]</I>)<BR>
-      Table-Name (<I><FONT color=#FF0000>char tableName[DB_MAX_TABLE_NAME_LEN+1]</I>),<BR>
-      Column-Name (<I><FONT color=#FF0000>char colName[DB_MAX_COLUMN_NAME_LEN+1]</I>),<BR>
-      Datatype (from SQL) (<I><FONT color=#FF0000>SWORD sqlDataType</I>),<BR>
-      Data-Name(from SQL) (<I><FONT color=#FF0000>char typeName[128+1]</I>),<BR>
-      Column size(from SQL) (<I><FONT color=#FF0000>SWORD columnSize</I>),<BR>
-      Buffer length(from SQL) (<I><FONT color=#FF0000>SWORD bufferLength</I>),<BR>
-      Decimal digits(from SQL) (<I><FONT color=#FF0000>short decimalDigits</I>),<BR>
-      numPrecRadix (from SQL) (<I><FONT color=#FF0000>short numPrecRadix</I>),<BR>
-      Nullable (from SQL) (<I><FONT color=#FF0000>short nullable</I>),<BR>
-      Remarks (<I><FONT color=#FF0000>char remarks[254+1]</I>),<BR>
-      Datatype (from wxDB) (<I><FONT color=#FF0000>int dbDataType</I>),<BR>
-      Primary-Key (<I><FONT color=#FF0000>int PkCol</I>) 0=No; 1= First Key, 2 = Second Key etc.,<BR>
-      Tables that use this Key as a Foreign Key(<I><FONT color=#FF0000>char PkTableName[DB_MAX_TABLE_NAME_LEN+1]</I>),<BR>
-      Foreign-Key (<I><FONT color=#FF0000>int FkCol</I>) 0=No; 1= First Key, 2 = Second Key etc.,<BR>
-      Table-Name where this Foreign-Key is Primary Key(<I><FONT color=#FF0000>char FkTableName[DB_MAX_TABLE_NAME_LEN+1]</I>),<BR>
-      and a Pointer (<I><A HREF="#WXCOLFOR">wxColFor*</A><FONT color=#FF0000> pColFor</I>) Structure is stored.
-   </B></TH>
- </TR></TBODY></TABLE>
-<!-------------------------------->
- <A NAME="WXCOLFOR"><P>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B><A HREF="#WXCOLFOR">wxColFor</A></B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0>
-   <B>This Class stores how this Column should be formatted in a String : <HR>
-      Output String (<I><FONT color=#FF0000>wxString s_Field</I>),<BR>
-      Formatted Objects (TIMESTAMP needs 7) (<I><FONT color=#FF0000>wxString s_Format[7]</I>),<BR>
-      Formatted Objects  (<I><FONT color=#FF0000>wxString s_Menge[7]</I>),<BR>
-      Formatted Objects (TT MM YYYY HH MM SS m) (<I><FONT color=#FF0000>int i_Menge[7]</I>),<BR>
-      National (0=timestamp,1=EU,2=UK,3=International,4=US)<I><FONT color=#FF0000>int i_Nation</I>),<BR>
-      Datatype (from wxDB) (<I><FONT color=#FF0000>int I_dbDataType</I>),<BR>
-      Datatype (from SQL) (<I><FONT color=#FF0000>SWORD i_sqlDataType</I>),<HR>
-      int Format(int Nation, int dbDataType,SWORD sqlDataType,short columnSize,short decimalDigits);<BR>
-      The Formatted Objects receive Standard Values and Format() is called.<BR>
-      The Programmers can, if they want something special , change these Values and call Format() again
-   </B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFBBBB><B>This class is most definitely very much underdeveloped !<BR>It was made so that the DBGrid could be realised.<BR>Changes here are probable. (Suggestions welcomed)</B></TH>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFF777><B>Well now, <A HREF="getcolsh.htm">that makes everything clear</A> does't it?</B></TH>
- </TR></TBODY></TABLE><HR>
-<!----------------------------------------------------------------------------------------------------------->
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.std/getcolsh.htm b/demos/dbbrowse/help.std/getcolsh.htm
deleted file mode 100644 (file)
index b99788a..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : Remstar ODBC Classes</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/remstar.png" WIDTH=125 HEIGHT=123><BR>Remstar ODBC Classes :<BR>The new wxDB::GetColumns() Function<BR>How do you use it ?</H3><BR>(English)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-23.01-mj10777</B><HR>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFBBBB><B><IMG SRC="../help.png/imbau.png" WIDTH=144 HEIGHT=50></B></TH>
- </TR></TBODY></TABLE><HR>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>How does it work ?</B></TH>
- </TR></TBODY></TABLE>
-<!-------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>Basicly you use a 3 Dimentional Dynamic Array</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0><B>wxDBInf --> wxTableInf --> wxColInf</B></TH>
- </TR></TBODY></TABLE><P>
-<!-------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>Using DBBrowser as the Example, I will try to explain how it works</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>Sorry, the rest will have to come later !!</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0><B></B></TH>
- </TR></TBODY></TABLE><HR>
-<!-------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B></B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFE0><B></B></TH>
- </TR></TBODY></TABLE><HR>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFBBBB><B></B></TH>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFF777><B>Well now, <A HREF="getcol.htm">that makes everything clear</A> does't it?</B></TH>
- </TR></TBODY></TABLE><HR>
-<!----------------------------------------------------------------------------------------------------------->
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.std/icons.htm b/demos/dbbrowse/help.std/icons.htm
deleted file mode 100644 (file)
index df22c5a..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : Icons useage</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;DBBrowser : Used Icons (.ICO / .XPM)</H3><BR>(English)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-22.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>Which Icons are used for what ?</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFBBBB><B>*.xpm have not been tested with <IMG SRC="../help.png/linux.png" WIDTH=35 HEIGHT=42>&nbsp; Linux as of yet !</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/col.png" WIDTH=16 HEIGHT=15>&nbsp;col.ico / col.xpm</B></TH><TH BGCOLOR=#FFFFE0><B>dbtree.cpp :<BR> ODBC Column in a Table (not a Primary or Foreign Key)</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B><IMG SRC="../help.png/d_closed.png" WIDTH=15 HEIGHT=13>&nbsp;d_closed.ico / d_closed.xpm</B></TH><TH><B>pgmctrl + dbtree.cpp :<BR> last branch of Tree (not selected)</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/d_open.png" WIDTH=16 HEIGHT=14>&nbsp;d_open.ico / d_open.xpm</B></TH><TH BGCOLOR=#FFFFE0><B>pgmctrl + dbtree.cpp :<BR> last Branch of tree (selected)</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B><IMG SRC="../help.png/dsn.png" WIDTH=14 HEIGHT=18>&nbsp;dsn.ico / dsn.xpm</B></TH><TH><B>good question</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/dsnclose.png" WIDTH=14 HEIGHT=17>&nbsp;dsnclose.ico / dsnclose.xpm</B></TH><TH BGCOLOR=#FFFFE0><B>pgmctrl.cpp :<BR> Main Branch of ODBC-DSN Tree (not selected)</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B><IMG SRC="../help.png/dsnopen.png" WIDTH=14 HEIGHT=18>&nbsp;dsnopen.ico / dsnopen.xpm</B></TH><TH><B>pgmctrl.cpp :<BR> Main Branch of ODBC-DSN Tree (selected)</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/f_closed.png" WIDTH=17 HEIGHT=14>&nbsp;f_closed.ico / f_closed.xpm</B></TH><TH BGCOLOR=#FFFFE0><B>pgmctrl.cpp :<BR> Main Branch of Program-Setting-DSN Tree (not selected)</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B><IMG SRC="../help.png/f_open.png" WIDTH=17 HEIGHT=15>&nbsp;f_open.ico / f_open.xpm</B></TH><TH><B>pgmctrl.cpp :<BR> Main Branch of Program-Setting-DSN Tree (not selected)</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/key.png" WIDTH=15 HEIGHT=16>&nbsp;key.ico / key.xpm</B></TH><TH BGCOLOR=#FFFFE0><B>dbtree.cpp :<BR> ODBC Primary-Key Column in a Table</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B><IMG SRC="../help.png/keyf.png" WIDTH=15 HEIGHT=16>&nbsp;keyf.ico / keyf.xpm</B></TH><TH><B>dbtree.cpp :<BR> ODBC Foreign-Key Column in a Table</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;logo.ico / logo.xpm</B></TH><TH BGCOLOR=#FFFFE0><B>Programm Logo</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B><IMG SRC="../help.png/pgmctrl.png" WIDTH=14 HEIGHT=12>&nbsp;pgmctrl.ico / pgmctrl.xpm / pgmctrl.bmp</B></TH><TH BGCOLOR=#FFFFE0><B>pgmctrl.cpp :<BR> Tab Bitmap</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/tab.png" WIDTH=16 HEIGHT=12>&nbsp;tab.ico / tab.xpm</B></TH><TH><B>dbtree.cpp :<BR> ODBC Table</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B><IMG SRC="../help.png/view.png" WIDTH=16 HEIGHT=15>&nbsp;view.ico / view.xpm</B></TH><TH><B>dbtree.cpp :<BR> ODBC View</B></TH></TR>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#FFF777>
-  <TH><B><A HREF="pictograms.htm">All other Pictograms are not used in DBBrowser<BR>(they are .png files)</A></B></TH>
- </TR></TBODY></TABLE>
- <P><TABLE BORDER=1><TBODY><TR BGCOLOR=#FFF777>
-  <TH><B>It will be nice, when the time comes where we can use XPM files for everything.</B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.std/picgrams.htm b/demos/dbbrowse/help.std/picgrams.htm
deleted file mode 100644 (file)
index 3391041..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : Pictograms</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;DBBrowser : Used Pictograms (*.png)</H3><BR>(English)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-23.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>The real meaning of the used Pictograms in these help files</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFF777><B>All Pictograms are .PNG Files (Portable Network Graphics)<BR>I use Paint Shop Pro 5.01 to make them.</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-<!//--->
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/imbau.png" WIDTH=144 HEIGHT=50>&nbsp;imbau.png</B></TH><TH BGCOLOR=#FFFFE0><B>Under construction : Page is not compleated</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;gnu.png</B></TH><TH BGCOLOR=#FFFFE0><B>GNU Logo : gcc 2.95 Compiler</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/gtk.png" WIDTH=35 HEIGHT=46>&nbsp;gtk.png</B></TH><TH BGCOLOR=#FFFFE0><B>GTK Logo : a Graphic Library in Linux </B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/kde.png" WIDTH=35 HEIGHT=33>&nbsp;kde.png</B></TH><TH BGCOLOR=#FFFFE0><B>KDE Logo : Graphic System in Linux</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/linux.png" WIDTH=35 HEIGHT=42>&nbsp;linux.png</B></TH><TH BGCOLOR=#FFFFE0><B>Linux Logo : Linux (in General)</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/motif.png" WIDTH=45 HEIGHT=29>&nbsp;motif.png</B></TH><TH BGCOLOR=#FFFFE0><B>Motif Logo : Graphic Library in Linux (is the Logo correct ?)</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/msvc.png" WIDTH=45 HEIGHT=26>&nbsp;msvc.png</B></TH><TH BGCOLOR=#FFFFE0><B>Microsoft VC++ Logo : VC++ 6.0 Compiler</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/odbc.png" WIDTH=35 HEIGHT=34>&nbsp;odbc.png</B></TH><TH BGCOLOR=#FFFFE0><B>ODBC Logo </B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/remstar.png" WIDTH=125 HEIGHT=123>&nbsp;remstar.png</B></TH><TH BGCOLOR=#FFFFE0><B>Remstar Logo : Remstar ODBC-Classes (http://www.remstar.com)</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/redh.png" WIDTH=35 HEIGHT=38>&nbsp;redh.png</B></TH><TH BGCOLOR=#FFFFE0><B>Redhat Logo : Linux Distribution (http://www.redhat.com / .de)</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/suse.png" WIDTH=35 HEIGHT=17>&nbsp;suse.png</B></TH><TH BGCOLOR=#FFFFE0><B>SuSE Logo : Linux Distribution (http://www.suse.com / .de)</B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/server.png" WIDTH=35 HEIGHT=26>&nbsp;server.png</B></TH><TH BGCOLOR=#FFFFE0><B>Server Logo </B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/wins.png" WIDTH=35 HEIGHT=35>&nbsp;wins.png</B></TH><TH BGCOLOR=#FFFFE0><B>Windows Logo : Windows (in General) </B></TH></TR>
-  <TR><TH BGCOLOR=#FFFFAA><B><IMG SRC="../help.png/winnt.png" WIDTH=35 HEIGHT=30>&nbsp;winnt.png</B></TH><TH BGCOLOR=#FFFFE0><B>Windows-NT Logo : Windows-NT specific </B></TH></TR>
- </TR></TBODY></TABLE>
- <P><TABLE BORDER=1><TBODY><TR BGCOLOR=#FFF777>
-  <TH><B><A HREF="icons.htm">All other Pictograms are PNG-Copies of DBBrowser-Icons.</A></B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.std/problems.htm b/demos/dbbrowse/help.std/problems.htm
deleted file mode 100644 (file)
index c15b8f2..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : Problems</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;DBBrowser : What does not Work ?</H3><BR>(English)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-02-04.01-mj10777</B>
-<!-------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>General</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :&nbsp;<IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;</B></TH><TH BGCOLOR=#FFFFE0><B>Only gcc 2.95 Compiler :<BR>Assert failed in file ../../src/msw/fontutil.cpp at line 238: unknown font slant</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Solution :</B></TH><TH><B>unknown</B></TH></TR>
- </TR></TBODY></TABLE><P>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :&nbsp;<IMG SRC="../help.png/gnu.png" WIDTH=45 HEIGHT=43>&nbsp;</B></TH><TH BGCOLOR=#FFFFE0><B>Only gcc 2.95 Compiler :<BR>Assert failed in file ../../src/msw/fontutil.cpp at line 249: unknown font weight</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Solution :</B></TH><TH><B>unknown</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>wxHtmlHelpController</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>Problem :</B></TH><TH BGCOLOR=#FFFFE0><B>When Help is closed with a Full HTML-View, you see nothing when Help is again started. (Page is Grey)</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFF777><B>Press the Upper left Button, so that the screen is again split.</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFCC><B>Solution :</B></TH><TH><B>unknown</B></TH>
- </TR></TBODY></TABLE><P>
-<!-------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :</B></TH><TH BGCOLOR=#FFFFE0><B>The Middle (Center) Mouse-Wheel does not scroll the HTLM-Page (Rightside)<BR>It does work on the Leftside</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Solution :</B></TH><TH><B>unknown</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!-------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :</B></TH><TH BGCOLOR=#FFFFE0><B>How can Help be called and a certin Page be opened (Context Help)</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Solution :</B></TH><TH><B>p_Help-> Display("GUp_Mask_Kunden.htm#Sonstiges");</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!-------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :</B></TH><TH BGCOLOR=#FFFFE0><B>Why doesn't the Refresh-Button (F5) work?</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>solved :</B></TH><TH><B>unknown</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!-------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>Problem :</B></TH><TH BGCOLOR=#FFFFE0><B>Images that show with HelpView, do not show up when called from OnHelp()</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFBBBB><B>Logbook : Warning: No handler found for image type.<HR>Why wasn't this message translated to German ?</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFCC><B>Solution :</B></TH><TH><B><BR>Added following Code in DBBrowser.cpp(MyApp::OnInit()): <HR>#if wxUSE_LIBPNG<BR>wxImage::AddHandler( new wxPNGHandler );<BR>#endif</B></TH>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>wxGrid (new Version)</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :</B></TH><TH BGCOLOR=#FFFFE0><B>When wxGrid is used in wxPaggedWindows, the Scrollbars do not work.</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Solution :</B></TH><TH><B>04.02.2000 : This has been solved with the new code.</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>wxGrid (new Version) 04.02.2000</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :</B></TH><TH BGCOLOR=#FFFFE0><B>Often : Error: wxGrid::CreateGrid(numRows, numCols) called more than once</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Solution :</B></TH><TH><B>unknown</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>next Problem</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Problem :</B></TH><TH BGCOLOR=#FFFFE0><B>something will turn up, it allways do.</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Solution :</B></TH><TH><B>unknown</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.std/remstar.htm b/demos/dbbrowse/help.std/remstar.htm
deleted file mode 100644 (file)
index 4dae6d2..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : Remstar ODBC Classes</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/remstar.png" WIDTH=125 HEIGHT=123>&nbsp;Remstar ODBC Classes : wxDB</H3><BR>(English)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-22.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>TODO</B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.std/sample.htm b/demos/dbbrowse/help.std/sample.htm
deleted file mode 100644 (file)
index e272b1a..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : Sample HTLM Page</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;DBBrowser : Beispiel HTML Seite</H3><BR>(English)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-22.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>Blau (CCFFFF)</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Gelb (FFFFAA)</B></TH><TH BGCOLOR=#FFFFE0><B>Hellgelb (FFFFE0)</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>hellgr|n &lt;TH BGCOLOR=#CCFFCC&gt;<HR>Hintergrundsfarbe f|r diese Tabellenteil</B></TH><TH><B>&lt;BODY BGCOLOR=#C6DFC6&gt;<HR>Background Colour of Page</B></TH></TR>
- </TR></TBODY></TABLE>
- <P><TABLE BORDER=1><TBODY><TR BGCOLOR=#FFF777>
-  <TH><B>Gold &lt;TR BGCOLOR=#FFF777&gt;<HR>Hintergrundsfarbe f|r den Gesamte Tabelle</B></TH>
- </TR></TBODY></TABLE>
- <P><TABLE BORDER=1><TBODY><TR BGCOLOR=#FFBBBB>
-  <TH><B>Rosa (FFBBBB)</B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.std/startprm.htm b/demos/dbbrowse/help.std/startprm.htm
deleted file mode 100644 (file)
index a5aafb8..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : Start parameter</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;DBBrowser : Start Parameter (Internationalisation)</H3><BR>(English)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-22.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>DBBrowser xx</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>xx = language</B></TH><TH BGCOLOR=#FFFFE0><B>cz, de, fr, pl and std (english)</B></TH>
- </TR></TBODY></TABLE>
- <P><TABLE BORDER=1><TBODY><TR BGCOLOR=#FFBBBB>
-  <TH><B>There are no Help files for Czech (cz), French (fr) and Polish (pl)<HR>Everything has been prepared and the locale will be set.</B></TH>
- </TR></TBODY></TABLE>
- <P><TABLE BORDER=1><TBODY><TR BGCOLOR=#FFF777>
-  <TH><B>DBBrowse will use these setting until it is again changed (even after a Program restart). (wxConfigBase)<HR>In "Program Settings" you can also switch (at the moment) between English and German.</B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.std/todo.htm b/demos/dbbrowse/help.std/todo.htm
deleted file mode 100644 (file)
index dd54826..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : Problems</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18>&nbsp;DBBrowser : What / When are new Functions planned ?</H3><BR>(English)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-22.01-mj10777</B>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>General</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Function :</B></TH><TH BGCOLOR=#FFFFE0><B>When will it be possible to open more than one DSN / DBGrid ?</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Timetable :</B></TH><TH><B>soon, it is high priorty.</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>DBGrid</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Function :</B></TH><TH BGCOLOR=#FFFFE0><B>Support for Adding, Deleting and Changes to Record.</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Timetable :</B></TH><TH><B>Sometime during my present Project.</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>DBGrid</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Function :</B></TH><TH BGCOLOR=#FFFFE0><B>When will Records only be read in when needed (Scrolling)</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Timetable :</B></TH><TH><B>This is a Function that is planned in wxGrid. I too hope it will come soon.</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>DBTree</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Function :</B></TH><TH BGCOLOR=#FFFFE0><B>When can DBBrowser create a wxDB and wxTable .cpp/.h File ?</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Timetable :</B></TH><TH><B>OnDBClass(); OnClass() and OnClassAll(); have been prepaired.<HR>This has for me low priorty. But I am sure somebody will do (for wxStudio ?)</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>24.01.2000 : George Tasker</B></TH>
- <TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-   <TH BGCOLOR=#FFFFAA><B>Have USER NAME and PASSWORD text widgets, or a menu item to enter them.</B></TH>
-   <TH BGCOLOR=#FFFFE0><B>25.01.2000 - should work, please test</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>Rather than have the "40 DSN's found" message at the end of the log book, Put that in the status bar of the frame.</B></TH>
-  <TH BGCOLOR=#FFFFE0><B>24.01.2000 - Done</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>Make the grid cells READ-ONLY, since this is a browser (unless you want to make it an editor too -- good idea!)</B></TH>
-  <TH BGCOLOR=#FFFFE0><B>25.01.2000 - done : right mouse click on any grid lable and on popupmenu clicken</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>Sort the DSNs in alphabetical order before putting them in the tree</B></TH>
-  <TH BGCOLOR=#FFFFE0><B>26.01.2000 - done</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFFFAA><B>Have program settings available from a TOOLS | OPTIONS menu</B></TH>
-  <TH BGCOLOR=#FFFFE0><B>Willdo</B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <HR><TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>new Functions</B></TH>
- </TR></TBODY></TABLE>
- <TABLE BORDER=1><TBODY><TR>
-  <TR><TH BGCOLOR=#FFFFAA><B>Function :</B></TH><TH BGCOLOR=#FFFFE0><B>something will turn up, it allways do.</B></TH></TR>
-  <TR><TH BGCOLOR=#CCFFCC><B>Timetable :</B></TH><TH><B>unknown</B></TH></TR>
- </TR></TBODY></TABLE><P>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.std/wxdb.htm b/demos/dbbrowse/help.std/wxdb.htm
deleted file mode 100644 (file)
index 1cd7ce9..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : Remstar ODBC Classes</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/remstar.png" WIDTH=125 HEIGHT=123><BR>Remstar ODBC Classes : wxDB</H3><BR>(English)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-23.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#CCFFFF><B>There are 2 new wxDB Functions : </B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE border=1><TBODY><TR>
-   <TH><B><A HREF="getcol.htm"><B>Discription of the new GetColumns()</B></A></TH>
-   <TH><B> and <A HREF="getcol.htm#GETKEXFIELDS">GetKeyFields()</A><BR><A HREF="getcol.htm#WXDBINF">wxDbInf</A><BR><A HREF="getcol.htm#WXTABLEINF">wxTableInf</A><BR><A HREF="getcol.htm#WXCOLINF">wxColInf</A><BR><A HREF="getcol.htm#WXCOLFOR">wxColFor</A></B></TH>
-  </TR><TR>
-   <TH><B><A HREF="getcolsh.htm"><B>How to use the new GetColumns()</B></A></TH>
-   <TH><B> and GetKeyFields()<BR>wxDbInf<BR>wxTableInf<BR>wxColInf<BR>wxColFor</B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFF777><B>The other GetColumns() has not changed.<BR>The CcolInf used is, however, really a wxColInf ! (<I><FONT color=#FF0000>typedef wxColInf CcolInf;</I>)</B></TH>
- </TR></TBODY></TABLE><HR>
-<!----------------------------------------------------------------------------------------------------------->
-</BODY></HTML>
diff --git a/demos/dbbrowse/help.std/wxtable.htm b/demos/dbbrowse/help.std/wxtable.htm
deleted file mode 100644 (file)
index d999990..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML><HEAD><TITLE>DBBrowser Help : Remstar ODBC Classes</TITLE></HEAD>
-<BODY BGCOLOR=#C6DFC6><CENTER><IMG SRC="../help.png/logo.png" WIDTH=17 HEIGHT=18></CENTER><BR><CENTER><B>DBBrowser<BR>Mark Johnson, Berlin Germany<BR>mj10777@gmx.net</B><HR></CENTER>
-<!----------------------------------------------------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR BGCOLOR=#CCFFFF>
-  <TH><B><H3><IMG SRC="../help.png/remstar.png" WIDTH=125 HEIGHT=123><BR>Remstar ODBC Classes : wxTable</H3><BR>(English)</B></TH>
- </TR></TBODY></TABLE><P>
- <B>Stand: 2000-01-22.01-mj10777</B><HR>
-<!-------------------------------------------------------------->
- <TABLE BORDER=1><TBODY><TR>
-  <TH BGCOLOR=#FFBBBB><B>This class is not used in DBBrowser !</B></TH>
- </TR></TBODY></TABLE>
-<!----------------------------------------------------------------------------------------------------------->
- <HR>
-</BODY></HTML>
diff --git a/demos/dbbrowse/makefile.bcc b/demos/dbbrowse/makefile.bcc
deleted file mode 100644 (file)
index 348bc47..0000000
+++ /dev/null
@@ -1,295 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (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 = 29
-OBJS = \
-       bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DBBROWSE_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) \
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
-DBBROWSE_OBJECTS =  \
-       $(OBJS)\dbbrowse_dbbrowse.obj \
-       $(OBJS)\dbbrowse_doc.obj \
-       $(OBJS)\dbbrowse_pgmctrl.obj \
-       $(OBJS)\dbbrowse_tabpgwin.obj \
-       $(OBJS)\dbbrowse_browsedb.obj \
-       $(OBJS)\dbbrowse_dbtree.obj \
-       $(OBJS)\dbbrowse_dbgrid.obj \
-       $(OBJS)\dbbrowse_dlguser.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 "$(USE_ODBC)" == "1"
-__dbbrowse___depname = $(OBJS)\dbbrowse.exe
-!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 "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_DBGRID_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_ADV_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(USE_ODBC)" == "1"
-__WXLIB_ODBC_p = \
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!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 "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.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: $(__dbbrowse___depname) data_help_std data_help_png
-
-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)\dbbrowse.exe del $(OBJS)\dbbrowse.exe
-       -if exist $(OBJS)\dbbrowse.tds del $(OBJS)\dbbrowse.tds
-       -if exist $(OBJS)\dbbrowse.ilc del $(OBJS)\dbbrowse.ilc
-       -if exist $(OBJS)\dbbrowse.ild del $(OBJS)\dbbrowse.ild
-       -if exist $(OBJS)\dbbrowse.ilf del $(OBJS)\dbbrowse.ilf
-       -if exist $(OBJS)\dbbrowse.ils del $(OBJS)\dbbrowse.ils
-
-!if "$(USE_ODBC)" == "1"
-$(OBJS)\dbbrowse.exe: $(DBBROWSE_OBJECTS)  $(OBJS)\dbbrowse_dbbrowse.res
-       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-       c0w32.obj $(DBBROWSE_OBJECTS),$@,, $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_ODBC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dbbrowse_dbbrowse.res
-|
-!endif
-
-data_help_std: 
-       if not exist $(OBJS)\help.std mkdir $(OBJS)\help.std
-       for %f in (compiler.htm dbbrowse.hhc dbbrowse.hhk dbbrowse.hhp dbbrowse.htm getcol.htm getcolsh.htm icons.htm picgrams.htm problems.htm remstar.htm sample.htm startprm.htm todo.htm wxdb.htm wxtable.htm) do if not exist $(OBJS)\help.std\%f copy .\help.std\%f $(OBJS)\help.std
-
-data_help_png: 
-       if not exist $(OBJS)\help.png mkdir $(OBJS)\help.png
-       for %f in (col.png d_closed.png d_open.png dsn.png dsnclose.png dsnopen.png f_closed.png f_open.png gnu.png gtk.png imbau.png kde.png key.png keyf.png linux.png logo.png motif.png msvc.png odbc.png pgmctrl.png redh.png remstar.png server.png suse.png tab.png view.png winnt.png wins.png) do if not exist $(OBJS)\help.png\%f copy .\help.png\%f $(OBJS)\help.png
-
-$(OBJS)\dbbrowse_dbbrowse.obj: .\dbbrowse.cpp
-       $(CXX) -q -c -P -o$@ $(DBBROWSE_CXXFLAGS) $**
-
-$(OBJS)\dbbrowse_doc.obj: .\doc.cpp
-       $(CXX) -q -c -P -o$@ $(DBBROWSE_CXXFLAGS) $**
-
-$(OBJS)\dbbrowse_pgmctrl.obj: .\pgmctrl.cpp
-       $(CXX) -q -c -P -o$@ $(DBBROWSE_CXXFLAGS) $**
-
-$(OBJS)\dbbrowse_tabpgwin.obj: .\tabpgwin.cpp
-       $(CXX) -q -c -P -o$@ $(DBBROWSE_CXXFLAGS) $**
-
-$(OBJS)\dbbrowse_browsedb.obj: .\browsedb.cpp
-       $(CXX) -q -c -P -o$@ $(DBBROWSE_CXXFLAGS) $**
-
-$(OBJS)\dbbrowse_dbtree.obj: .\dbtree.cpp
-       $(CXX) -q -c -P -o$@ $(DBBROWSE_CXXFLAGS) $**
-
-$(OBJS)\dbbrowse_dbgrid.obj: .\dbgrid.cpp
-       $(CXX) -q -c -P -o$@ $(DBBROWSE_CXXFLAGS) $**
-
-$(OBJS)\dbbrowse_dlguser.obj: .\dlguser.cpp
-       $(CXX) -q -c -P -o$@ $(DBBROWSE_CXXFLAGS) $**
-
-$(OBJS)\dbbrowse_dbbrowse.res: .\dbbrowse.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) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH $**
-
diff --git a/demos/dbbrowse/makefile.gcc b/demos/dbbrowse/makefile.gcc
deleted file mode 100644 (file)
index 3c4804e..0000000
+++ /dev/null
@@ -1,295 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (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 = 29
-OBJS = \
-       gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DBBROWSE_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) \
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-DBBROWSE_OBJECTS =  \
-       $(OBJS)\dbbrowse_dbbrowse.o \
-       $(OBJS)\dbbrowse_doc.o \
-       $(OBJS)\dbbrowse_pgmctrl.o \
-       $(OBJS)\dbbrowse_tabpgwin.o \
-       $(OBJS)\dbbrowse_browsedb.o \
-       $(OBJS)\dbbrowse_dbtree.o \
-       $(OBJS)\dbbrowse_dbgrid.o \
-       $(OBJS)\dbbrowse_dlguser.o \
-       $(OBJS)\dbbrowse_dbbrowse_rc.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 ($(USE_ODBC),1)
-__dbbrowse___depname = $(OBJS)\dbbrowse.exe
-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 ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_DBGRID_p = \
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_ADV_p = \
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
-endif
-ifeq ($(MONOLITHIC),0)
-ifeq ($(USE_ODBC),1)
-__WXLIB_ODBC_p = \
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc
-endif
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_HTML_p = \
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_XML_p = \
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
-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 ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-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: $(__dbbrowse___depname) data_help_std data_help_png
-
-clean: 
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d
-       -if exist $(OBJS)\dbbrowse.exe del $(OBJS)\dbbrowse.exe
-
-ifeq ($(USE_ODBC),1)
-$(OBJS)\dbbrowse.exe: $(DBBROWSE_OBJECTS) $(OBJS)\dbbrowse_dbbrowse_rc.o
-       $(CXX) -o $@ $(DBBROWSE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_ODBC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__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) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-endif
-
-data_help_std: 
-       if not exist $(OBJS)\help.std mkdir $(OBJS)\help.std
-       for %%f in (compiler.htm dbbrowse.hhc dbbrowse.hhk dbbrowse.hhp dbbrowse.htm getcol.htm getcolsh.htm icons.htm picgrams.htm problems.htm remstar.htm sample.htm startprm.htm todo.htm wxdb.htm wxtable.htm) do if not exist $(OBJS)\help.std\%%f copy .\help.std\%%f $(OBJS)\help.std
-
-data_help_png: 
-       if not exist $(OBJS)\help.png mkdir $(OBJS)\help.png
-       for %%f in (col.png d_closed.png d_open.png dsn.png dsnclose.png dsnopen.png f_closed.png f_open.png gnu.png gtk.png imbau.png kde.png key.png keyf.png linux.png logo.png motif.png msvc.png odbc.png pgmctrl.png redh.png remstar.png server.png suse.png tab.png view.png winnt.png wins.png) do if not exist $(OBJS)\help.png\%%f copy .\help.png\%%f $(OBJS)\help.png
-
-$(OBJS)\dbbrowse_dbbrowse.o: ./dbbrowse.cpp
-       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\dbbrowse_doc.o: ./doc.cpp
-       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\dbbrowse_pgmctrl.o: ./pgmctrl.cpp
-       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\dbbrowse_tabpgwin.o: ./tabpgwin.cpp
-       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\dbbrowse_browsedb.o: ./browsedb.cpp
-       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\dbbrowse_dbtree.o: ./dbtree.cpp
-       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\dbbrowse_dbgrid.o: ./dbgrid.cpp
-       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\dbbrowse_dlguser.o: ./dlguser.cpp
-       $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\dbbrowse_dbbrowse_rc.o: ./dbbrowse.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) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
-.PHONY: all clean data_help_std data_help_png
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/demos/dbbrowse/makefile.gtk b/demos/dbbrowse/makefile.gtk
deleted file mode 100644 (file)
index cd8a960..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# Top dir of wxWindows
-top_builddir = /gtm/bart/wxGTK
-
-PROGRAM=dbbrowser_gtk
-
-
-OBJECTS= dbbrowse.o doc.o pgmctrl.o tabpgwin.o\
-         browsedb.o dbtree.o dbgrid.o  dlguser.o
-       
-
-
-
-include $(top_builddir)/src/makeprog.env
-
diff --git a/demos/dbbrowse/makefile.vc b/demos/dbbrowse/makefile.vc
deleted file mode 100644 (file)
index a6e0723..0000000
+++ /dev/null
@@ -1,370 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (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 = 29
-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)
-DBBROWSE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-       $(__DEBUGINFO_0) /Fd$(OBJS)\dbbrowse.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) \
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \
-       $(CPPFLAGS) $(CXXFLAGS)
-DBBROWSE_OBJECTS =  \
-       $(OBJS)\dbbrowse_dbbrowse.obj \
-       $(OBJS)\dbbrowse_doc.obj \
-       $(OBJS)\dbbrowse_pgmctrl.obj \
-       $(OBJS)\dbbrowse_tabpgwin.obj \
-       $(OBJS)\dbbrowse_browsedb.obj \
-       $(OBJS)\dbbrowse_dbtree.obj \
-       $(OBJS)\dbbrowse_dbgrid.obj \
-       $(OBJS)\dbbrowse_dlguser.obj \
-       $(OBJS)\dbbrowse_dbbrowse.res
-
-### 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 "$(USE_ODBC)" == "1"
-__dbbrowse___depname = $(OBJS)\dbbrowse.exe
-!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 "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_DBGRID_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_ADV_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(USE_ODBC)" == "1"
-__WXLIB_ODBC_p = \
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!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 "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-       -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__dbbrowse___depname) data_help_std data_help_png
-
-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)\dbbrowse.exe del $(OBJS)\dbbrowse.exe
-       -if exist $(OBJS)\dbbrowse.ilk del $(OBJS)\dbbrowse.ilk
-       -if exist $(OBJS)\dbbrowse.pdb del $(OBJS)\dbbrowse.pdb
-
-!if "$(USE_ODBC)" == "1"
-$(OBJS)\dbbrowse.exe: $(DBBROWSE_OBJECTS) $(OBJS)\dbbrowse_dbbrowse.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-       $(DBBROWSE_OBJECTS)  $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_ODBC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__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) $(__GDIPLUS_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
-<<
-!endif
-
-data_help_std: 
-       if not exist $(OBJS)\help.std mkdir $(OBJS)\help.std
-       for %f in (compiler.htm dbbrowse.hhc dbbrowse.hhk dbbrowse.hhp dbbrowse.htm getcol.htm getcolsh.htm icons.htm picgrams.htm problems.htm remstar.htm sample.htm startprm.htm todo.htm wxdb.htm wxtable.htm) do if not exist $(OBJS)\help.std\%f copy .\help.std\%f $(OBJS)\help.std
-
-data_help_png: 
-       if not exist $(OBJS)\help.png mkdir $(OBJS)\help.png
-       for %f in (col.png d_closed.png d_open.png dsn.png dsnclose.png dsnopen.png f_closed.png f_open.png gnu.png gtk.png imbau.png kde.png key.png keyf.png linux.png logo.png motif.png msvc.png odbc.png pgmctrl.png redh.png remstar.png server.png suse.png tab.png view.png winnt.png wins.png) do if not exist $(OBJS)\help.png\%f copy .\help.png\%f $(OBJS)\help.png
-
-$(OBJS)\dbbrowse_dbbrowse.obj: .\dbbrowse.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBBROWSE_CXXFLAGS) $**
-
-$(OBJS)\dbbrowse_doc.obj: .\doc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBBROWSE_CXXFLAGS) $**
-
-$(OBJS)\dbbrowse_pgmctrl.obj: .\pgmctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBBROWSE_CXXFLAGS) $**
-
-$(OBJS)\dbbrowse_tabpgwin.obj: .\tabpgwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBBROWSE_CXXFLAGS) $**
-
-$(OBJS)\dbbrowse_browsedb.obj: .\browsedb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBBROWSE_CXXFLAGS) $**
-
-$(OBJS)\dbbrowse_dbtree.obj: .\dbtree.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBBROWSE_CXXFLAGS) $**
-
-$(OBJS)\dbbrowse_dbgrid.obj: .\dbgrid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBBROWSE_CXXFLAGS) $**
-
-$(OBJS)\dbbrowse_dlguser.obj: .\dlguser.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBBROWSE_CXXFLAGS) $**
-
-$(OBJS)\dbbrowse_dbbrowse.res: .\dbbrowse.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) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH $**
-
diff --git a/demos/dbbrowse/makefile.wat b/demos/dbbrowse/makefile.wat
deleted file mode 100644 (file)
index 4c7b6bd..0000000
+++ /dev/null
@@ -1,331 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.1 (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
-__dbbrowse___depname =
-!ifeq USE_ODBC 1
-__dbbrowse___depname = $(OBJS)\dbbrowse.exe
-!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_DBGRID_p =
-!ifeq MONOLITHIC 0
-__WXLIB_DBGRID_p = &
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-!endif
-__WXLIB_ADV_p =
-!ifeq MONOLITHIC 0
-__WXLIB_ADV_p = &
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-__WXLIB_ODBC_p =
-!ifeq MONOLITHIC 0
-!ifeq USE_ODBC 1
-__WXLIB_ODBC_p = &
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-!endif
-!endif
-__WXLIB_HTML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_HTML_p = &
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-__WXLIB_XML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_XML_p = &
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!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
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.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
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-OBJS = &
-       wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DBBROWSE_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) $(__GFXCTX_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)
-DBBROWSE_OBJECTS =  &
-       $(OBJS)\dbbrowse_dbbrowse.obj &
-       $(OBJS)\dbbrowse_doc.obj &
-       $(OBJS)\dbbrowse_pgmctrl.obj &
-       $(OBJS)\dbbrowse_tabpgwin.obj &
-       $(OBJS)\dbbrowse_browsedb.obj &
-       $(OBJS)\dbbrowse_dbtree.obj &
-       $(OBJS)\dbbrowse_dbgrid.obj &
-       $(OBJS)\dbbrowse_dlguser.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-       -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(__dbbrowse___depname) data_help_std data_help_png
-
-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)\dbbrowse.exe del $(OBJS)\dbbrowse.exe
-
-!ifeq USE_ODBC 1
-$(OBJS)\dbbrowse.exe :  $(DBBROWSE_OBJECTS) $(OBJS)\dbbrowse_dbbrowse.res
-       @%create $(OBJS)\dbbrowse.lbc
-       @%append $(OBJS)\dbbrowse.lbc option quiet
-       @%append $(OBJS)\dbbrowse.lbc name $^@
-       @%append $(OBJS)\dbbrowse.lbc option caseexact
-       @%append $(OBJS)\dbbrowse.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-       @for %i in ($(DBBROWSE_OBJECTS)) do @%append $(OBJS)\dbbrowse.lbc file %i
-       @for %i in ( $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_ODBC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__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)  $(__GDIPLUS_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) do @%append $(OBJS)\dbbrowse.lbc library %i
-       @%append $(OBJS)\dbbrowse.lbc option resource=$(OBJS)\dbbrowse_dbbrowse.res
-       @for %i in () do @%append $(OBJS)\dbbrowse.lbc option stack=%i
-       wlink @$(OBJS)\dbbrowse.lbc
-!endif
-
-data_help_std : .SYMBOLIC 
-       if not exist $(OBJS)\help.std mkdir $(OBJS)\help.std
-       for %f in (compiler.htm dbbrowse.hhc dbbrowse.hhk dbbrowse.hhp dbbrowse.htm getcol.htm getcolsh.htm icons.htm picgrams.htm problems.htm remstar.htm sample.htm startprm.htm todo.htm wxdb.htm wxtable.htm) do if not exist $(OBJS)\help.std\%f copy .\help.std\%f $(OBJS)\help.std
-
-data_help_png : .SYMBOLIC 
-       if not exist $(OBJS)\help.png mkdir $(OBJS)\help.png
-       for %f in (col.png d_closed.png d_open.png dsn.png dsnclose.png dsnopen.png f_closed.png f_open.png gnu.png gtk.png imbau.png kde.png key.png keyf.png linux.png logo.png motif.png msvc.png odbc.png pgmctrl.png redh.png remstar.png server.png suse.png tab.png view.png winnt.png wins.png) do if not exist $(OBJS)\help.png\%f copy .\help.png\%f $(OBJS)\help.png
-
-$(OBJS)\dbbrowse_dbbrowse.obj :  .AUTODEPEND .\dbbrowse.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $<
-
-$(OBJS)\dbbrowse_doc.obj :  .AUTODEPEND .\doc.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $<
-
-$(OBJS)\dbbrowse_pgmctrl.obj :  .AUTODEPEND .\pgmctrl.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $<
-
-$(OBJS)\dbbrowse_tabpgwin.obj :  .AUTODEPEND .\tabpgwin.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $<
-
-$(OBJS)\dbbrowse_browsedb.obj :  .AUTODEPEND .\browsedb.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $<
-
-$(OBJS)\dbbrowse_dbtree.obj :  .AUTODEPEND .\dbtree.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $<
-
-$(OBJS)\dbbrowse_dbgrid.obj :  .AUTODEPEND .\dbgrid.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $<
-
-$(OBJS)\dbbrowse_dlguser.obj :  .AUTODEPEND .\dlguser.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(DBBROWSE_CXXFLAGS) $<
-
-$(OBJS)\dbbrowse_dbbrowse.res :  .AUTODEPEND .\dbbrowse.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
diff --git a/demos/dbbrowse/pgmctrl.cpp b/demos/dbbrowse/pgmctrl.cpp
deleted file mode 100644 (file)
index e64db76..0000000
+++ /dev/null
@@ -1,294 +0,0 @@
-//----------------------------------------------------------------------------------------
-// Name:        pgmctrl.cpp
-// Purpose:     Programm Control with a Tree
-// Author:      Mark Johnson
-// Modified by: 19990806.mj10777
-// Created:     19991010
-// RCS-ID:      $Id$
-// Copyright:   (c) Mark Johnson, Berlin Germany
-// Licence:     wxWindows license
-//----------------------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-//----------------------------------------------------------------------------------------
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-//----------------------------------------------------------------------------------------
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-//----------------------------------------------------------------------------------------
-#ifndef __WXMSW__
-#include "bitmaps/d_closed.xpm"
-#include "bitmaps/d_open.xpm"
-#include "bitmaps/f_closed.xpm"
-#include "bitmaps/f_open.xpm"
-#include "bitmaps/logo.xpm"
-#include "bitmaps/dsnclose.xpm"
-#include "bitmaps/dsnopen.xpm"
-#endif
-//----------------------------------------------------------------------------------------
-//-- all #includes that every .cpp needs             --- 19990807.mj10777 ----------------
-//----------------------------------------------------------------------------------------
-#include "std.h"    // sorgsam Pflegen !
-
-//----------------------------------------------------------------------------------------
-//-- Global functions --------------------------------------------------------------------
-//----------------------------------------------------------------------------------------
-static inline const wxChar *bool2String(bool b)
-{
-    return b ? wxEmptyString : _T("not ");
-}
-
-//----------------------------------------------------------------------------------------
-BEGIN_EVENT_TABLE(PgmCtrl, wxTreeCtrl)
-    EVT_MOTION (PgmCtrl::OnMouseMove)
-    EVT_LEFT_DCLICK(PgmCtrl::OnSelChanged)
-    EVT_TREE_ITEM_RIGHT_CLICK(TREE_CTRL_PGM,PgmCtrl::OnRightSelect)
-    EVT_MENU(PGMCTRL_ODBC_USER,PgmCtrl::OnUserPassword)
-END_EVENT_TABLE()
-
-//----------------------------------------------------------------------------------------
-// PgmCtrl implementation
-//----------------------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(PgmCtrl, wxTreeCtrl)
-
-//----------------------------------------------------------------------------------------
-PgmCtrl::PgmCtrl(wxWindow *parent) : wxTreeCtrl(parent)
-{
-}
-
-//----------------------------------------------------------------------------------------
-PgmCtrl::PgmCtrl(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const wxSize& size, long style)
-: wxTreeCtrl(parent, id, pos, size, style)
-{
-    const int image_size = 16;
-    // Make an image list containing small icons
-    p_imageListNormal = new wxImageList(image_size, image_size, true);
-    // should correspond to TreeIc_xxx enum
-    p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(aLogo)).ConvertToImage().Rescale(image_size, image_size)));
-    p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DsnClosed)).ConvertToImage().Rescale(image_size, image_size)));
-    p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DsnOpen)).ConvertToImage().Rescale(image_size, image_size)));
-    p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DocClosed)).ConvertToImage().Rescale(image_size, image_size)));
-    p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DocOpen)).ConvertToImage().Rescale(image_size, image_size)));
-    p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(FolderClosed)).ConvertToImage().Rescale(image_size, image_size)));
-    p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(FolderOpen)).ConvertToImage().Rescale(image_size, image_size)));
-    SetImageList(p_imageListNormal);
-}
-
-//----------------------------------------------------------------------------------------
-PgmCtrl::~PgmCtrl()
-{
-    delete p_imageListNormal;
-    delete popupMenu1;
-}
-
-//----------------------------------------------------------------------------------------
-#undef TREE_EVENT_HANDLER
-
-//----------------------------------------------------------------------------------------
-int  PgmCtrl::OnPopulate()
-{
-    SetFont(* pDoc->ft_Doc);
-    wxTreeItemId Root, Folder, Docu;
-    //---------------------------------------------------------------------------------------
-    int i;
-    double dTmp = 1234567.89;
-    Temp0.Printf(_("%s Functions"),p_ProgramCfg->GetAppName().c_str());
-    Root   = AddRoot(Temp0,TreeIc_Logo,TreeIc_Logo, new TreeData(_T("Root")));
-    //---------------------------------------------------------------------------------------
-    Folder = AppendItem(Root, _("Program settings")   ,TreeIc_FolderClosed, TreeIc_FolderOpen, new TreeData(_T("Settings")));
-    p_ProgramCfg->Read(_T("/Local/langid"),&Temp0); p_ProgramCfg->Read(_T("/Local/language"),&Temp2);
-    Temp1.Printf(_("locale (%s) ; Language (%s) ; Number(%2.2f)"),Temp0.c_str(), Temp2.c_str(), dTmp); Temp0.Empty();  Temp2.Empty();
-    Docu   = AppendItem(Folder, Temp1,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData(_T("Setting Language")));
-    p_ProgramCfg->Read(_T("/Paths/Work"),&Temp0); Temp1.Printf(_("Work Path : %s"),Temp0.c_str()); Temp0.Empty();
-    Docu   = AppendItem(Folder,Temp1,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData(_T("Path Work")));
-    Docu   = AppendItem(Folder, _("Change the language to English") ,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData(_T("Language English")));
-    Docu   = AppendItem(Folder, _("Change the language to German")  ,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData(_T("Language German")));
-    Docu   = AppendItem(Folder, _("Delete all wxConfigBase Entry's"),TreeIc_DocClosed,TreeIc_DocOpen,new TreeData(_T("wxConfigBase Delete")));
-    Folder = AppendItem(Root, _T("ODBC DSN"),TreeIc_FolderClosed,TreeIc_FolderOpen,new TreeData(_T("ODBC-DSN")));
-    for (i=0;i<pDoc->i_DSN;i++)
-    {
-        Temp0.Printf(_T("ODBC-%s"),(pDoc->p_DSN+i)->Dsn.c_str());
-        Docu   = AppendItem(Folder,(pDoc->p_DSN+i)->Dsn ,TreeIc_DsnClosed,TreeIc_DsnOpen, new TreeData(Temp0));
-    }
-    //---------------------------------------------------------------------------------------
-    popupMenu1 = NULL;
-    popupMenu1 = new wxMenu;
-    popupMenu1->Append(PGMCTRL_ODBC_USER, _("Set Username and Password"));
-    // popupMenu1->AppendSeparator();
-    //---------------------------------------------------------------------------------------
-    Expand(Root);
-    Expand(Folder);
-    //---------------------------------------------------------------------------------------
-    return 0;
-}
-
-//----------------------------------------------------------------------------------------
-void PgmCtrl::OnSelChanged(wxMouseEvent& WXUNUSED(event))
-{
-    int i;
-    Temp0.Empty();   Temp1.Empty();
-#if wxUSE_STATUSBAR
-    pDoc->p_MainFrame->SetStatusText(Temp0,0);
-#endif // wxUSE_STATUSBAR
-    // Get the Information that we need
-    wxTreeItemId itemId = GetSelection();
-    TreeData *item = (TreeData *)GetItemData(itemId);
-    if (item != NULL )
-    {
-        int Treffer = 0;
-        Temp1.Printf(_T("%s"),item->m_desc.c_str());
-        //--------------------------------------------------------------------------------------
-        if (Temp1 == _T("Language English"))
-        {
-            Temp0 = _T("std");
-            p_ProgramCfg->Write(_T("/Local/langid"),Temp0);
-            Temp0 = _("-I-> After a programm restart, the language will be changed to English.");
-            wxMessageBox(Temp0);
-        }
-        if (Temp1 == _T("Language German"))
-        {
-            Temp0 = _T("de");
-            p_ProgramCfg->Write(_T("/Local/langid"),Temp0);
-            Temp0 = _("-I-> After a programm restart, the language will be changed to German.");
-            wxMessageBox(Temp0);
-        }
-        //--------------------------------------------------------------------------------------
-        if (Temp1 == _T("wxConfigBase Delete"))
-        {
-            if (p_ProgramCfg->DeleteAll()) // Default Diretory for wxFileSelector
-                Temp0 = _("-I-> wxConfigBase.p_ProgramCfg->DeleteAll() was successful.");
-            else
-                Temp0 = _("-E-> wxConfigBase.p_ProgramCfg->DeleteAll() was not successful !");
-            wxBell();     // Ding_a_Ling
-            Treffer++;
-        }
-        //--------------------------------------------------------------------------------------
-        if (Temp1.Contains(_T("ODBC-")))
-        {
-            Temp1 = Temp1.Mid(5);
-            for (i=0;i<pDoc->i_DSN;i++)
-            {
-                if (Temp1 == (pDoc->p_DSN+i)->Dsn)
-                {
-                    pDoc->OnChosenDSN(i);
-                }
-            }
-            Treffer++;
-        }
-        //--------------------------------------------------------------------------------------
-        if (Treffer == 0)
-        {
-            //-------------------------------------------------------------------------------------
-            Temp0.Printf(_("Item '%s': %sselected, %sexpanded, %sbold, %u children (%u immediately under this item)."),
-                item->m_desc.c_str(),
-                bool2String(IsSelected(itemId)),
-                bool2String(IsExpanded(itemId)),
-                bool2String(IsBold(itemId)),
-                GetChildrenCount(itemId),
-                GetChildrenCount(itemId));
-            LogBuf.Printf(_T("-I-> PgmCtrl::OnSelChanged - %s"),Temp0.c_str());
-            wxLogMessage( _T("%s"), LogBuf.c_str() );
-            //-------------------------------------------------------------------------------------
-        }
-    }
-}
-
-//----------------------------------------------------------------------------------------
-void PgmCtrl::OnRightSelect(wxTreeEvent& WXUNUSED(event))
-{
-    int i;
-    Temp0.Empty();
-    // Get the Information that we need
-    wxTreeItemId itemId = GetSelection();
-    DBTreeData *item = (DBTreeData *)GetItemData(itemId);
-    SaveDSN.Empty();
-    if ( item != NULL )
-    {
-        int Treffer = 0;
-        Temp1.Printf(_T("%s"),item->m_desc.c_str());
-        //--------------------------------------------------------------------------------------
-        if (Temp1.Contains(_T("ODBC-")))
-        {
-            Temp1 = Temp1.Mid(5);
-            for (i=0;i<pDoc->i_DSN;i++)
-            {
-                if (Temp1 == (pDoc->p_DSN+i)->Dsn)
-                {
-                    SaveDSN = Temp1;
-                    PopupMenu(popupMenu1,TreePos.x,TreePos.y);
-                }
-            }
-            Treffer++;
-        }
-        //--------------------------------------------------------------------------------------
-        if (Treffer == 0)
-        {
-        /*
-        Temp0.Printf(_("Item '%s': %sselected, %sexpanded, %sbold,"
-        "%u children (%u immediately under this item)."),
-        item->m_desc.c_str(),
-        bool2String(IsSelected(itemId)),
-        bool2String(IsExpanded(itemId)),
-        bool2String(IsBold(itemId)),
-        GetChildrenCount(itemId),
-        GetChildrenCount(itemId));
-        LogBuf.Printf("-I-> DBTree::OnSelChanged - %s",Temp0.c_str());
-        wxLogMessage( "%s", LogBuf.c_str() );
-            */
-        }
-        //--------------------------------------------------------------------------------------
-    }
-} // void PgmCtrl::OnRightSelect(wxTreeEvent& WXUNUSED(event))
-
-//----------------------------------------------------------------------------------------
-void PgmCtrl::OnMouseMove(wxMouseEvent &event)
-{
-    TreePos = event.GetPosition();
-}
-
-//----------------------------------------------------------------------------------------
-void PgmCtrl::OnUserPassword(wxCommandEvent& WXUNUSED(event))
-{
-    // wxMessageBox(SaveDSN);
-    int i;
-    //--------------------------------------------
-    DlgUser *p_Dlg = new DlgUser(this,pDoc,wxEmptyString);
-    //-------------------------------------------
-    for (i=0;i<pDoc->i_DSN;i++)
-    {
-        wxYield();
-        if (SaveDSN == (pDoc->p_DSN+i)->Dsn)
-        {
-            p_Dlg->pDoc       = pDoc;
-            p_Dlg->s_DSN      = (pDoc->p_DSN+i)->Dsn;
-            p_Dlg->s_User     = (pDoc->p_DSN+i)->Usr;
-            p_Dlg->s_Password = (pDoc->p_DSN+i)->Pas;
-            p_Dlg->OnInit();
-            p_Dlg->Fit();
-            //--------------------
-            // Temp0.Printf("i(%d) ; s_DSN(%s) ; s_User(%s) ; s_Password(%s)",i,p_Dlg.s_DSN,p_Dlg.s_User,p_Dlg.s_Password);
-            // wxMessageBox(Temp0);
-            bool OK = false;
-            if (p_Dlg->ShowModal() == wxID_OK)
-            {
-                (pDoc->p_DSN+i)->Usr = p_Dlg->s_User;
-                (pDoc->p_DSN+i)->Pas = p_Dlg->s_Password;
-                (pDoc->db_Br+i)->UserName  = (pDoc->p_DSN+i)->Usr;
-                (pDoc->db_Br+i)->Password  = (pDoc->p_DSN+i)->Pas;
-                OK = true;
-            }
-            delete p_Dlg;
-            if (!OK)
-                return;
-            //--------------------
-            break; // We have what we want, leave
-        }
-    }
-    //-------------------------------------------
-    SaveDSN.Empty();
-}
-//----------------------------------------------------------------------------------------
diff --git a/demos/dbbrowse/pgmctrl.h b/demos/dbbrowse/pgmctrl.h
deleted file mode 100644 (file)
index 6bb27f0..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-//----------------------------------------------------------------------------------------
-// Name:        pgmctrl.h
-// Purpose:     Programm Control with a Tree
-// Author:      Mark Johnson
-// Modified by: 19990806.mj10777
-// Created:     19991010
-// RCS-ID:      $Id$
-// Copyright:   (c) Mark Johnson, Berlin Germany
-// Licence:     wxWindows license
-
-//----------------------------------------------------------------------------------------
-class MainDoc;             // Declared in doc.h file
-
-//----------------------------------------------------------------------------------------
-class TreeData : public wxTreeItemData
-{
-public:
-    TreeData(const wxString& desc) : m_desc(desc) { }
-    void ShowInfo(wxTreeCtrl *tree);
-    wxString m_desc;
-};
-
-//----------------------------------------------------------------------------------------
-class PgmCtrl : public wxTreeCtrl
-{
-public:
-    enum
-    { // The order here must be the same as in m_imageListNormal !
-        TreeIc_Logo,                         // logo.ico
-            TreeIc_DsnClosed,                // dsnclose.ico
-            TreeIc_DsnOpen,                  // dsnopen.ico
-            TreeIc_DocClosed,                // d_closed.ico
-            TreeIc_DocOpen,                  // d_open.ico
-            TreeIc_FolderClosed,             // f_closed.ico
-            TreeIc_FolderOpen                // f_open.ico
-    };
-    wxString Temp0, Temp1, Temp2, Temp3, Temp4, Temp5;
-    //----------------------------------------------------------------------------------------
-    PgmCtrl() { }
-    PgmCtrl(wxWindow *parent);
-    PgmCtrl(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const wxSize& size,long style);
-    virtual ~PgmCtrl();
-    MainDoc *pDoc;
-    //----------------------------------------------------------------------------------------
-    int i_TabArt;   // Tab = 0 ; Page = 1;
-    int i_ViewNr;   // View Nummer in Tab / Page
-    //----------------------------------------------------------------------------------------
-    wxImageList *p_imageListNormal;
-    wxMenu   *popupMenu1; // OnDBClass
-    wxPoint  TreePos;
-    wxString SaveDSN;     // Needed for User and Password
-    //----------------------------------------------------------------------------------------
-public:
-    int  OnPopulate();
-    void OnSelChanged(wxMouseEvent& event);
-    void OnRightSelect(wxTreeEvent& event);
-    void OnMouseMove(wxMouseEvent& event);
-    void OnUserPassword(wxCommandEvent& event);
-
-public:
-    //----------------------------------------------------------------------------------------
-    // NB: due to an ugly wxMSW hack you _must_ use DECLARE_DYNAMIC_CLASS()
-    //     if you want your overloaded OnCompareItems() to be called.
-    //     OTOH, if you don't want it you may omit the next line - this will
-    //     make default (alphabetical) sorting much faster under wxMSW.
-    DECLARE_DYNAMIC_CLASS(PgmCtrl)
-        DECLARE_EVENT_TABLE()
-};
-
-//----------------------------------------------------------------------------------------
-#define PGMCTRL_01_BEGIN     1000
-#define PGMCTRL_ODBC_USER    1001
-#define PGMCTRL_01_END       1010
-//----------------------------------------------------------------------------------------
diff --git a/demos/dbbrowse/std.h b/demos/dbbrowse/std.h
deleted file mode 100644 (file)
index e27fecd..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-// RCS-ID:      $Id$
-
-//---------------------------------------------------------------------------
-//-- all #includes that the whole Project needs. ----------------------------
-//---------------------------------------------------------------------------
-
-#include <wx/config.h>
-#include <wx/dbtable.h>
-#include <wx/grid.h>
-#include <wx/file.h>
-#include <wx/wxhtml.h>
-#include <wx/image.h>
-#include <wx/imaglist.h>
-#include <wx/intl.h>
-#include <wx/laywin.h>
-#include <wx/listctrl.h>
-#include <wx/splitter.h>
-#include <wx/textctrl.h>
-#include <wx/toolbar.h>
-#include <wx/treectrl.h>
-
-//---------------------------
-
-#include "tabpgwin.h"
-#include "dlguser.h"
-#include "browsedb.h"
-#include "dbtree.h"
-#include "dbgrid.h"
-#include "pgmctrl.h"
-#include "doc.h"
-#include "dbbrowse.h"
-
-//---------------------------------------------------------------------------
diff --git a/demos/dbbrowse/tabpgwin.cpp b/demos/dbbrowse/tabpgwin.cpp
deleted file mode 100644 (file)
index 5b1c5b0..0000000
+++ /dev/null
@@ -1,1182 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        tabpgwin.cpp
-// Purpose:     Contrib. demo
-// Author:      Aleksandras Gluchovas
-// Modified by: 19990908 : mj
-//              - rename to tabpgwin
-//              - restruction of Variable declaration
-//              - to prevent Warnings under MingW32
-// Modified by: 19990909 : mj
-//              - mNoVertScroll true = no / false = Original Code
-//                the Original Code Paints a Vertical Scroll in wxPagedWindow
-//                which is not needed in this Version. Use true for this.
-// Created:     07/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:    wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-#include "wx/math.h"
-
-#include <stdlib.h>
-
-#include "wx/string.h"
-#include "wx/utils.h"     // import wxMin/wxMax macros and wxFileExist(..)
-
-#include "tabpgwin.h"
-
-//---------------------------------------------------------------------------
-// Implementation for class twTabInfo
-//---------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS( twTabInfo, wxObject )
-
-//---------------------------------------------------------------------------
-twTabInfo::twTabInfo()
-: mpContent( 0 )
-{}
-
-//---------------------------------------------------------------------------
-int twTabInfo::ImgWidth()
-{
-    if ( mBitMap.Ok() ) return mBitMap.GetWidth();
-    else return 0;
-}
-
-//---------------------------------------------------------------------------
-int twTabInfo::ImgHeight()
-{
-    if ( mBitMap.Ok() )
-        return mBitMap.GetHeight();
-    else
-        return 0;
-}
-
-//---------------------------------------------------------------------------
-int twTabInfo::ImageToTxtGap( int prefGap )
-{
-    if ( mBitMap.Ok() )
-        return prefGap;
-    else
-        return 0;
-}
-
-//---------------------------------------------------------------------------
-bool twTabInfo::HasImg()
-{
-    return mBitMap.Ok();
-}
-
-//---------------------------------------------------------------------------
-// bool twTabInfo::HasText();
-unsigned int twTabInfo::HasText()
-{
-    return mText.Length();
-}
-
-//---------------------------------------------------------------------------
-wxBitmap& twTabInfo::GetImg()
-{
-    return mBitMap;
-}
-
-//---------------------------------------------------------------------------
-wxString& twTabInfo::GetText()
-{
-    return mText;
-}
-
-//---------------------------------------------------------------------------
-wxWindow& twTabInfo::GetContent()
-{
-    return *mpContent;
-}
-
-//---------------------------------------------------------------------------
-// Implementation for class wxTabbedWindow
-//---------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS( wxTabbedWindow, wxPanel )
-
-//---------------------------------------------------------------------------
-BEGIN_EVENT_TABLE( wxTabbedWindow, wxPanel )
-    EVT_SIZE ( wxTabbedWindow::OnSize )
-    EVT_PAINT( wxTabbedWindow::OnPaint )
-    EVT_LEFT_DOWN( wxTabbedWindow::OnLButtonDown )
-    // TDB:: filciker reduction
-    // EVT_ERASE_BACKGROUND( wxTabbedWindow::OnBkErase )
-END_EVENT_TABLE()
-
-//---------------------------------------------------------------------------
-wxTabbedWindow::wxTabbedWindow()
-
-:   mpTabScroll  ( NULL ),
-    mpHorizScroll( NULL ),
-    mpVertScroll ( NULL ),
-
-    mVertGap ( 0 ),
-    mHorizGap( 0 ),
-
-    mTitleVertGap ( 3  ),
-    mTitleHorizGap( 4  ),
-    mImageTextGap ( 2  ),
-    mFirstTitleGap( 11 ),
-
-    mBorderOnlyWidth( 8 ),
-
-    mWhitePen( wxColour(255,255,255), 1, wxSOLID ),
-    mGrayPen ( wxColour(192,192,192), 1, wxSOLID ),
-    mDarkPen ( wxColour(128,128,128), 1, wxSOLID ),
-    mBlackPen( wxColour(  0,  0,  0), 1, wxSOLID ),
-
-    // state variables
-    mActiveTab  ( 0 ),
-    mTitleHeight( 0 ),
-    mLayoutType( wxTITLE_IMG_AND_TEXT )
-{}
-
-//---------------------------------------------------------------------------
-wxTabbedWindow::~wxTabbedWindow()
-{
-    wxObjectList::compatibility_iterator pTab = mTabs.GetFirst();
-
-    while( pTab )
-    {
-        delete ((twTabInfo*)pTab->GetData());
-        pTab = pTab->GetNext();
-    }
-}
-
-//---------------------------------------------------------------------------
-void wxTabbedWindow::SizeTabs(int x,int y, int width, int height, bool WXUNUSED(repant))
-{
-    wxObjectList::compatibility_iterator pTabNode = mTabs.GetFirst();
-    size_t n = 0;
-
-    while( pTabNode )
-    {
-        twTabInfo& info = *((twTabInfo*)pTabNode->GetData());
-
-        if ( n == mActiveTab )
-        {
-            //wxSizeEvent evt;
-            //info.mpContent->GetEventHandler()->ProcessEvent( evt );
-
-            info.mpContent->SetSize( x, y, width, height, 0 );
-            info.mpContent->Show(true);
-            info.mpContent->Refresh();
-
-        }
-        else
-        {
-            info.mpContent->Show(false);
-        }
-
-        pTabNode = pTabNode->GetNext();
-        ++n;
-    }
-}
-
-//---------------------------------------------------------------------------
-void wxTabbedWindow::AddTab( wxWindow*   pContent,
-                            wxString     tabText,
-                            wxString     imageFileName,
-                            wxBitmapType imageType )
-{
-    twTabInfo* pTab = new twTabInfo();
-
-    pTab->mpContent = pContent;
-    pTab->mText     = tabText;
-
-    if ( wxFileExists( imageFileName ) &&
-
-        pTab->mBitMap.LoadFile( imageFileName, imageType ) )
-    {
-        pTab->mImageFile = imageFileName;
-        pTab->mImageType = imageType;
-    }
-
-
-    if ( pContent->GetParent() == NULL )
-        pContent->Create( this, wxID_ANY );
-
-    mTabs.Append( (wxObject*)pTab );
-
-    RecalcLayout(true);
-
-    OnTabAdded( pTab );
-}
-
-//---------------------------------------------------------------------------
-void wxTabbedWindow::AddTab( wxWindow* pContent,
-                            wxString  tabText, wxBitmap* pImage   )
-{
-    twTabInfo* pTab = new twTabInfo();
-
-    pTab->mpContent = pContent;
-    pTab->mText     = tabText;
-
-    if ( pImage )
-        pTab->mBitMap = *pImage;
-
-    if ( pContent->GetParent() == NULL )
-        pContent->Create( this, wxID_ANY );
-
-    mTabs.Append( (wxObject*)pTab );
-    RecalcLayout(true);
-    OnTabAdded( pTab );
-}
-
-//---------------------------------------------------------------------------
-void wxTabbedWindow::RemoveTab( int tabNo )
-{
-    twTabInfo* pTab = ((twTabInfo*)(mTabs.Item( tabNo )->GetData()));
-    pTab->mpContent->Destroy();
-    delete pTab;
-    mTabs.Erase( mTabs.Item( tabNo ) );
-    // if ( mActiveTab >= mTabs.GetCount() );
-    if ( mActiveTab >= mTabs.GetCount() )
-        mActiveTab = mTabs.GetCount() - 1;
-    SetActiveTab( mActiveTab );
-}
-
-//---------------------------------------------------------------------------
-int wxTabbedWindow::GetTabCount()
-{
-    return mTabs.GetCount();
-}
-
-//---------------------------------------------------------------------------
-wxWindow* wxTabbedWindow::GetTab( int tabNo )
-{
-    return ((twTabInfo*)(mTabs.Item( tabNo )->GetData()))->mpContent;
-}
-
-//---------------------------------------------------------------------------
-wxWindow* wxTabbedWindow::GetActiveTab()
-{
-    // FIMXE:: this is lame
-    return GetTab( mActiveTab );
-}
-
-//---------------------------------------------------------------------------
-void wxTabbedWindow::SetActiveTab( int tabNo )
-{
-    mActiveTab = tabNo;
-    RecalcLayout(true);
-    Refresh();
-}
-
-//---------------------------------------------------------------------------
-// width of the decorations border (4 shade-lines), should not be changed
-//---------------------------------------------------------------------------
-#define BORDER_SZ 4
-
-//---------------------------------------------------------------------------
-void wxTabbedWindow::DrawShadedRect( int x, int y, int width, int height,
-                                    wxPen& upperPen, wxPen& lowerPen, wxDC& dc
-                                    )
-{
-    // darw the lightened upper-left sides of the rectangle
-
-    dc.SetPen( upperPen );
-    dc.DrawLine( x,y, x, y + height - 1 ); // vert
-    dc.DrawLine( x,y, x + width - 1,  y ); // horiz
-
-    // draw the unenlightened lower-right sides of the rectangle
-
-    dc.SetPen( lowerPen );
-    dc.DrawLine( x + width - 1,  y, x + width - 1, y + height - 1 ); // vert
-    dc.DrawLine( x, y + height - 1, x + width, y + height - 1 );     // horiz
-}
-
-//---------------------------------------------------------------------------
-void wxTabbedWindow::DrawDecorations( wxDC& dc )
-{
-    // Protability NOTE::: DrawLine(..) draws a line from the first position,
-    //                     but not including the point specified by last position.
-    //                     This way Windows draws lines, not sure how Motif and Gtk
-    //                     prots behave...
-
-    int width, height;
-    GetClientSize( &width, &height );
-
-    // check if there's at least a bit of space to draw things
-
-    if ( width  < mHorizGap*2 + BORDER_SZ*2+1 ||
-        height < mVertGap*2  + BORDER_SZ*2+1 + mTitleHeight
-        )
-        return;
-
-    // step #1 - draw border around the tab content area
-
-    // setup position for kind of "pencil"
-    int curX = mHorizGap;
-    int curY = mVertGap;
-
-    int xSize = width  - mHorizGap*2;
-    int ySize = height - mVertGap *2  - mTitleHeight;
-
-    // layer 1 (upper white)
-    DrawShadedRect( curX+0, curY+0, xSize-0, ySize-0,
-        mWhitePen, mBlackPen, dc  );
-
-    // layer 2 (upper gray)
-    DrawShadedRect( curX+1, curY+1, xSize-2-1, ySize-2-1,
-        mGrayPen, mGrayPen, dc  );
-
-    // layer 3 (upper darkGray)
-    DrawShadedRect( curX+2, curY+2, xSize-3-2, ySize-3-2,
-        mDarkPen, mWhitePen, dc  );
-
-    // layer 4 (upper black)
-    DrawShadedRect( curX+3, curY+3, xSize-4-3, ySize-4-3,
-        mBlackPen, mGrayPen, dc  );
-
-    // add non-siemtric layer from the lower-right side (confroming to MFC-look)
-
-    dc.SetPen( mDarkPen );
-    dc.DrawLine( curX+1, curY + ySize - 2, curX + xSize - 1, curY + ySize - 2 );   // horiz
-    dc.DrawLine( curX + xSize - 2, curY + 1, curX + xSize - 2, curY + ySize - 2 ); // vert
-
-    // step #2 - draw tab title bars
-
-    curX = mFirstTitleGap;
-    curY = height - mVertGap - mTitleHeight;
-
-    size_t tabNo = 0;
-    wxObjectList::compatibility_iterator pNode = mTabs.GetFirst();
-
-    while( pNode )
-    {
-        // "hard-coded metafile" for decorations
-
-        twTabInfo& tab = *((twTabInfo*)(pNode->GetData()));
-
-        xSize = tab.mDims.x;
-        ySize = mTitleHeight;
-
-        if ( tabNo == mActiveTab )
-        {
-            dc.SetPen( mGrayPen );
-            dc.DrawLine( curX+1, curY-2, curX+xSize-2, curY-2 );
-            dc.DrawLine( curX+1, curY-1, curX+xSize-2, curY-1 );
-        }
-
-        dc.SetPen( mWhitePen );
-
-        if ( tabNo == mActiveTab )
-            dc.DrawLine( curX, curY-2, curX, curY+ySize-2 );
-        else
-            dc.DrawLine( curX, curY, curX, curY+ySize-2 );
-
-        dc.SetPen( mDarkPen );
-        dc.DrawLine( curX+1, curY+ySize-3, curX+1, curY+ySize-1 ); // to pix down
-        dc.DrawLine( curX+2, curY+ySize-2, curX+xSize-2, curY+ySize-2 );
-        dc.DrawLine( curX+xSize-3, curY+ySize-3, curX+xSize-2, curY+ySize-3 );
-        if ( tabNo == mActiveTab )
-            dc.DrawLine( curX+xSize-2, curY+ySize-3, curX+xSize-2, curY-3 );
-        else
-            dc.DrawLine( curX+xSize-2, curY+ySize-3, curX+xSize-2, curY-1 );
-
-        dc.SetPen( mBlackPen );
-        dc.DrawLine( curX+xSize-1, curY, curX+xSize-1, curY+ySize-2 );
-        dc.DrawLine( curX+xSize-2, curY+ySize-2, curX+xSize-3, curY+ySize-2 );
-        dc.DrawLine( curX+xSize-3, curY+ySize-1, curX+1, curY+ySize-1 );
-
-        pNode = pNode->GetNext();
-        ++tabNo;
-
-        // darw image and (or without) text centered within the
-        // title bar rectangle
-
-        if ( mLayoutType != wxTITLE_BORDER_ONLY && tab.HasImg() )
-        {
-            wxMemoryDC tmpDc;
-            tmpDc.SelectObject( tab.GetImg() );
-
-            dc.Blit( curX + mTitleHorizGap,
-                curY + ( ySize - tab.ImgHeight() ) / 2,
-                tab.ImgWidth(),
-                tab.ImgHeight(),
-                &tmpDc, 0, 0, wxCOPY
-                );
-        }
-
-        if ( mLayoutType == wxTITLE_IMG_AND_TEXT && tab.HasText() )
-        {
-            long x,w,h;
-
-            // set select default font of the window into it's device context
-            //dc.SetFont( GetLabelingFont() );
-
-            dc.SetTextBackground( GetBackgroundColour() );
-
-            dc.GetTextExtent(tab.mText, &w, &h );
-
-            x = curX + mTitleHorizGap +
-                tab.ImgWidth() + tab.ImageToTxtGap(mImageTextGap);
-
-            dc.DrawText( tab.GetText(), x, curY + ( ySize - h ) / 2 );
-        }
-        curX += xSize;
-
-    } // end of `while (pNode)'
-}  // wxTabbedWindow::DrawDecorations()
-
-//---------------------------------------------------------------------------
-int wxTabbedWindow::HitTest( const wxPoint& pos )
-{
-    int width, height;
-    GetClientSize( &width, &height );
-
-    int curX = mFirstTitleGap;
-    int curY = height - mVertGap - mTitleHeight;
-
-    int     tabNo = 0;
-    wxObjectList::compatibility_iterator pNode = mTabs.GetFirst();
-
-    while( pNode )
-    {
-        twTabInfo& tab = *((twTabInfo*)(pNode->GetData()));
-
-        // hit test rectangle of the currnet tab title bar
-        if ( pos.x >= curX && pos.x < curX + tab.mDims.x  &&
-            pos.y >= curY && pos.y < curY + tab.mDims.y
-            )
-        {
-            return tabNo;
-        }
-
-        curX += tab.mDims.x;
-
-        pNode = pNode->GetNext();
-        ++tabNo;
-    }
-
-    return -1;
-}  // wxTabbedWindow::HitTest()
-
-//---------------------------------------------------------------------------
-void wxTabbedWindow::HideInactiveTabs( bool andRepaint )
-{
-    if ( !andRepaint )
-        return;
-
-    wxObjectList::compatibility_iterator pNode = mTabs.GetFirst();
-    size_t  tabNo = 0;
-
-    while( pNode )
-    {
-        if ( tabNo != mActiveTab )
-        {
-            twTabInfo& tab = *((twTabInfo*)(pNode->GetData()));
-            tab.mpContent->Show(false);
-        }
-
-        pNode = pNode->GetNext();
-        ++tabNo;
-    }
-}  // wxTabbedWindow::HideInactiveTabs()
-
-//---------------------------------------------------------------------------
-wxFont wxTabbedWindow::GetLabelingFont()
-{
-    wxFont font;
-#ifdef __WINDOWS__
-    font.SetFaceName(_T("MS Sans Serif"));
-#else
-    font.SetFamily( wxSWISS );
-#endif
-
-    font.SetStyle(40);
-    font.SetWeight(40);
-    font.SetPointSize( 8 );
-
-#ifdef __WINDOWS__
-    font.RealizeResource();
-#endif
-
-    return font;
-}  // wxTabbedWindow::GetLabelingFont()
-
-//---------------------------------------------------------------------------
-void wxTabbedWindow::RecalcLayout(bool andRepaint)
-{
-    HideInactiveTabs(andRepaint);
-
-    // resetup position of the active tab
-
-    int width, height;
-    GetClientSize( &width, &height );
-
-    int curX = mHorizGap + BORDER_SZ;
-    int curY = mVertGap  + BORDER_SZ;
-
-    int xSize = width  - mHorizGap*2 - BORDER_SZ*2-1;
-    int ySize = height - mVertGap*2  - BORDER_SZ*2-1 - mTitleHeight;
-
-    SizeTabs( curX, curY, xSize, ySize, andRepaint );
-
-    // pass #1 - try to layout assuming it's wxTITLE_IMG_AND_TEXT
-
-    mLayoutType = wxTITLE_IMG_AND_TEXT;
-
-    wxObjectList::compatibility_iterator pNode = mTabs.GetFirst();
-
-    curX = mFirstTitleGap; // the left-side gap
-    mTitleHeight = 0;
-
-    while( pNode )
-    {
-        twTabInfo& tab = *((twTabInfo*)(pNode->GetData()));
-
-        wxWindowDC dc(this);
-
-        long w,h;
-
-        // set select default font of the window into it's device context
-        //dc.SetFont( GetLabelingFont() );
-
-        dc.GetTextExtent(tab.mText, &w, &h );
-
-        tab.mDims.x = w + tab.ImageToTxtGap(mImageTextGap) +
-            tab.ImgWidth() + mTitleHorizGap*2;
-
-        tab.mDims.y  = wxMax( h, tab.ImgHeight() ) + mTitleVertGap*2;
-        mTitleHeight = wxMax( mTitleHeight, tab.mDims.y );
-
-        curX += tab.mDims.x;
-
-        pNode = pNode->GetNext();
-    }
-
-    curX += mHorizGap; // the right-side gap
-
-    // make all title bars of equel height
-
-    pNode = mTabs.GetFirst();
-
-    while( pNode )
-    {
-        ((twTabInfo*)(pNode->GetData()))->mDims.y = mTitleHeight;;
-        pNode = pNode->GetNext();
-    }
-
-    // if curX has'nt ran out of bounds, leave TITLE_IMG layout and return
-    if ( curX < width - mHorizGap )
-        return;
-
-    // pass #2 - try to layout assuming wxTITLE_IMG_ONLY
-
-    mLayoutType = wxTITLE_IMG_ONLY;
-
-    pNode = mTabs.GetFirst();
-
-    curX = mFirstTitleGap; // the left-side gap
-
-    int denomiator = mTabs.GetCount();
-    if ( denomiator == 0 )
-        ++denomiator;
-
-    mBorderOnlyWidth = (width - mFirstTitleGap - mHorizGap) / denomiator;
-
-    while( pNode )
-    {
-        twTabInfo& tab = *((twTabInfo*)(pNode->GetData()));
-
-        if ( tab.HasImg() )
-        {
-            tab.mDims.x = tab.ImgWidth()  + mTitleHorizGap*2;
-            tab.mDims.y = tab.ImgHeight() + mTitleVertGap*2;
-        }
-        else
-        {
-            tab.mDims.x = mBorderOnlyWidth;
-            tab.mDims.y = mTitleHeight;
-        }
-
-        curX += tab.mDims.x;
-
-        pNode = pNode->GetNext();
-    }
-
-    curX += mHorizGap; // the right-side gap
-
-    // if curX has'nt ran out of bounds, leave IMG_ONLY layout and return
-    if ( curX < width  - mHorizGap )
-        return;
-
-    // pass #3 - set the narrowest layout wxTITLE_BORDER_ONLY
-
-    mLayoutType = wxTITLE_BORDER_ONLY;
-
-    pNode = mTabs.GetFirst();
-
-    while( pNode )
-    {
-        twTabInfo& tab = *((twTabInfo*)(pNode->GetData()));
-
-        tab.mDims.x = mBorderOnlyWidth;
-        tab.mDims.y = mTitleHeight;
-
-        pNode = pNode->GetNext();
-    }
-}  // wxTabbedWindow::RecalcLayout()
-
-//---------------------------------------------------------------------------
-// wx event handlers
-//---------------------------------------------------------------------------
-void wxTabbedWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
-{
-    wxPaintDC dc(this);
-    DrawDecorations( dc );
-}
-
-//---------------------------------------------------------------------------
-void wxTabbedWindow::OnSize ( wxSizeEvent& WXUNUSED(event) )
-{
-    SetBackgroundColour( wxColour( 192,192,192 ) );
-    RecalcLayout(true);
-}
-
-//---------------------------------------------------------------------------
-void wxTabbedWindow::OnBkErase( wxEraseEvent& WXUNUSED(event) )
-{
-    // do nothing
-}
-
-//---------------------------------------------------------------------------
-void wxTabbedWindow::OnLButtonDown( wxMouseEvent& event )
-{
-    // floats, why?
-    int x = (int)event.m_x;
-    int y = (int)event.m_y;
-
-    int tabNo = HitTest( wxPoint(x,y) );
-
-    if ( tabNo != -1 )
-    {
-        SetActiveTab( tabNo );
-    }
-}
-
-//---------------------------------------------------------------------------
-// Implementation for class wxPagedWindow
-//---------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS( wxPagedWindow, wxTabbedWindow )
-
-//---------------------------------------------------------------------------
-BEGIN_EVENT_TABLE( wxPagedWindow, wxTabbedWindow )
-    EVT_SIZE     ( wxPagedWindow::OnSize        )
-    EVT_PAINT    ( wxPagedWindow::OnPaint       )
-    EVT_LEFT_DOWN( wxPagedWindow::OnLButtonDown )
-    EVT_LEFT_UP  ( wxPagedWindow::OnLButtonUp   )
-    EVT_MOTION   ( wxPagedWindow::OnMouseMove   )
-    EVT_SCROLL   ( wxPagedWindow::OnScroll      )
-END_EVENT_TABLE()
-
-//---------------------------------------------------------------------------
-// border for paged-window is 2 shaded-lines
-//---------------------------------------------------------------------------
-#undef  BORDER_SZ
-#define BORDER_SZ 2
-
-//---------------------------------------------------------------------------
-wxPagedWindow::wxPagedWindow()
-
-:   mScrollEventInProgress( false ),
-    mTabTrianGap(4),
-    mWhiteBrush( wxColour(255,255,255), wxSOLID ),
-    mGrayBrush ( wxColour(192,192,192), wxSOLID ),
-    mCurentRowOfs( 0 ),
-    mAdjustableTitleRowLen( 300 ),
-    mIsDragged    ( false ),
-    mDagOrigin    ( 0 ),
-    mCursorChanged( false ),
-    mResizeCursor ( wxCURSOR_SIZEWE ),
-    mNormalCursor ( wxCURSOR_ARROW  )
-{
-    mTitleVertGap = 2;
-    mTitleHorizGap = 10;
-    mNoVertScroll = true;       // Horizontale Scroll abschalten
-}
-
-//---------------------------------------------------------------------------
-wxFont wxPagedWindow::GetLabelingFont()
-{
-    wxFont font;
-
-#ifdef __WINDOWS__
-    font.SetFaceName(_T("Comic Sans MS"));
-#else
-    font.SetFamily( wxSWISS );
-#endif
-
-    font.SetStyle(40);
-    font.SetWeight(40);
-    font.SetPointSize( 8 );
-
-    return font;
-}
-
-//---------------------------------------------------------------------------
-void wxPagedWindow::OnTabAdded( twTabInfo* WXUNUSED(pInfo) )
-{
-    int units = GetWholeTabRowLen() / 20;
-
-    mpTabScroll->SetScrollbar( 0, 1, units, 1, false );
-}
-
-//---------------------------------------------------------------------------
-wxScrollBar& wxPagedWindow::GetVerticalScrollBar()
-{
-    return *mpVertScroll;
-}
-
-//---------------------------------------------------------------------------
-wxScrollBar& wxPagedWindow::GetHorizontalScrollBar()
-{
-    return *mpHorizScroll;
-}
-
-//---------------------------------------------------------------------------
-int wxPagedWindow::GetWholeTabRowLen()
-{
-    wxObjectList::compatibility_iterator pNode = mTabs.GetFirst();
-
-    int len = 0;
-
-    while( pNode )
-    {
-        twTabInfo& tab = *((twTabInfo*)(pNode->GetData()));
-
-        len += tab.mDims.x;
-        pNode = pNode->GetNext();
-    }
-
-    return len;
-}  // wxPagedWindow::GetWholeTabRowLen()
-
-//---------------------------------------------------------------------------
-void wxPagedWindow::DrawPaperBar( twTabInfo& tab, int x, int y,
-                                  wxBrush& brush, wxPen& pen, wxDC& dc )
-{
-    wxPoint poly[4];
-
-    // draw organizer-style paper outlet
-
-    poly[0].x = x - mTabTrianGap;
-    poly[0].y = y;
-
-    poly[1].x = x + mTabTrianGap;
-    poly[1].y = y + tab.mDims.y-1;
-
-    poly[2].x = x + tab.mDims.x - mTabTrianGap;
-    poly[2].y = y + tab.mDims.y-1;
-
-    poly[3].x = x + tab.mDims.x + mTabTrianGap;
-    poly[3].y = y;
-
-    dc.SetPen( pen );
-    dc.SetBrush( brush );
-
-    dc.DrawPolygon( 4, poly );
-
-    long w,h;
-
-    // set select default font of the window into it's device context
-    //dc.SetFont( GetLabelingFont() );
-
-    dc.SetTextBackground( brush.GetColour() );
-
-    dc.GetTextExtent(tab.mText, &w, &h );
-
-    if ( tab.HasImg() )
-    {
-        wxMemoryDC tmpDc;
-        tmpDc.SelectObject( tab.GetImg() );
-
-        dc.Blit( x + mTitleHorizGap,
-            y + ( tab.mDims.y - tab.ImgHeight() ) / 2,
-            tab.ImgWidth(),
-            tab.ImgHeight(),
-            &tmpDc, 0, 0, wxCOPY
-            );
-    }
-
-    if ( tab.HasText() )
-    {
-        int tx = x + mTitleHorizGap +
-            tab.ImgWidth() + tab.ImageToTxtGap(mImageTextGap);
-
-        dc.DrawText( tab.GetText(), tx, y + ( tab.mDims.y - h ) / 2 );
-    }
-}  // wxPagedWindow::DrawPaperBar()
-
-//---------------------------------------------------------------------------
-void wxPagedWindow::DrawDecorations( wxDC& dc )
-{
-    // FIXME:: the is big body have to be split!
-
-    int width, height;
-    GetClientSize( &width, &height );
-
-    int curX = mHorizGap;
-    int curY = mVertGap;
-
-    int xSize = width  - mHorizGap*2;
-    int ySize = height - mVertGap*2;
-
-    DrawShadedRect( curX, curY, xSize, ySize,
-        mDarkPen, mWhitePen, dc );
-
-    DrawShadedRect( curX+1, curY+1, xSize-2, ySize-2,
-        mBlackPen, mGrayPen, dc );
-
-    // draw inactive tab title bars frist (left-to-right)
-
-    wxObjectList::compatibility_iterator pNode = mTabs.GetFirst();
-    size_t  tabNo = 0;
-
-    /* OLD STUFF::
-    curX = mTitleRowStart;
-    curY = height - mVertGap - BORDER_SZ - mTitleHeight;
-    */
-
-    curX = mTabTrianGap;
-    curY = 0;
-
-    // FOR NOW:: avoid creating bitmap with invalid dimensions
-
-    if ( mTitleRowLen < 1 || mTitleHeight < 1 )
-        return;
-
-    wxMemoryDC tmpDc;
-    wxBitmap   tmpBmp( mTitleRowLen, mTitleHeight );
-
-    tmpDc.SelectObject( tmpBmp );
-    tmpDc.SetPen( mGrayPen );
-    tmpDc.SetBrush( mGrayBrush );
-    tmpDc.DrawRectangle( 0,0, mTitleRowLen, mTitleHeight );
-
-    tmpDc.SetDeviceOrigin( mCurentRowOfs, 0 );
-
-    while( pNode )
-    {
-        twTabInfo& tab = *((twTabInfo*)(pNode->GetData()));
-
-        if ( tabNo != mActiveTab )
-            DrawPaperBar( tab, curX, curY, mGrayBrush, mBlackPen, tmpDc );
-
-        curX += tab.mDims.x;
-
-        pNode = pNode->GetNext();
-        ++tabNo;
-    }
-
-    // finally, draw the active tab (white-filled)
-
-    pNode = mTabs.GetFirst();
-    tabNo = 0;
-
-    curX = mTabTrianGap;
-
-    while( pNode )
-    {
-        twTabInfo& tab = *((twTabInfo*)(pNode->GetData()));
-
-        if ( tabNo == mActiveTab )
-        {
-            DrawPaperBar( tab, curX, curY, mWhiteBrush, mBlackPen, tmpDc );
-
-            tmpDc.SetPen( mWhitePen );
-
-            tmpDc.DrawLine( curX - mTabTrianGap+1, curY,
-                curX + tab.mDims.x + mTabTrianGap, curY );
-            break;
-        }
-        curX += tab.mDims.x;
-
-        pNode = pNode->GetNext();
-        ++tabNo;
-    }
-
-    // back to initial device origin
-
-    tmpDc.SetDeviceOrigin( 0, 0 );
-
-    // draw resize-hint-stick
-
-    curX = mTitleRowLen - 6;
-
-    DrawShadedRect( curX+0, 0+0, 6,   mTitleHeight,   mGrayPen,  mBlackPen, tmpDc );
-    DrawShadedRect( curX+1, 0+1, 6-2, mTitleHeight-2, mWhitePen, mDarkPen,  tmpDc );
-    DrawShadedRect( curX+2, 0+2, 6-4, mTitleHeight-4, mGrayPen,  mGrayPen,  tmpDc );
-
-
-
-    dc.Blit( mTitleRowStart,
-        height - mVertGap - BORDER_SZ - mTitleHeight,
-        mTitleRowLen, mTitleHeight,
-        &tmpDc, 0,0, wxCOPY );
-}  // wxPagedWindow::DrawDecorations()
-
-//---------------------------------------------------------------------------
-int wxPagedWindow::HitTest( const wxPoint& pos )
-{
-    return wxTabbedWindow::HitTest( pos );
-}
-
-//---------------------------------------------------------------------------
-void wxPagedWindow::RecalcLayout(bool andRepaint)
-{
-    mTitleRowLen = mAdjustableTitleRowLen;
-
-    if ( int(mpTabScroll) == -1 ) return;
-
-    // scroll bars should be created after Create() for this window is called
-    if ( !mpTabScroll )
-    {
-        mpTabScroll   =
-            new wxScrollBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSB_HORIZONTAL );
-
-        mpHorizScroll =
-            new wxScrollBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSB_HORIZONTAL );
-        if (!mNoVertScroll)       // Vertical Scroll (Original)
-            mpVertScroll = new wxScrollBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSB_VERTICAL );
-    }
-
-    {
-        int units = GetWholeTabRowLen() / 20;
-
-        mpTabScroll->SetScrollbar( 0, 1, units, 1, false );
-    }
-
-    // resetup position of the active tab
-
-    int thumbLen = 16; // FOR NOW:: hardcoded
-
-    int width, height;
-    GetClientSize( &width, &height );
-
-    mTitleHeight = thumbLen;
-
-    int curX = mHorizGap + BORDER_SZ;
-    int curY = mVertGap  + BORDER_SZ;
-
-    int xSize;
-    if (!mNoVertScroll)       // Vertical Scroll (Original)
-        xSize = width  - mHorizGap*2 - BORDER_SZ*2 - thumbLen;
-    else
-        xSize = width  - mHorizGap*2 - BORDER_SZ*2;
-
-    int ySize = height - mVertGap*2  - BORDER_SZ*2 - mTitleHeight;
-
-    SizeTabs( curX, curY, xSize, ySize, andRepaint );
-
-    // setup title bar LINES's horizontal scroll bar
-
-    curY = height - mVertGap - BORDER_SZ - thumbLen;
-
-    mpTabScroll->SetSize( curX, curY, thumbLen*2, thumbLen );
-
-    // setup view's HORIZONTAL scroll bar
-    curX += thumbLen*2;
-
-    mTitleRowStart = curX;
-    mFirstTitleGap = curX + mCurentRowOfs + mTabTrianGap;
-
-    mTitleRowLen = wxMin( mAdjustableTitleRowLen,
-        width - mHorizGap - BORDER_SZ - thumbLen*4 - curX );
-
-    curX += mTitleRowLen;
-
-    if (!mNoVertScroll)       // Vertical Scroll (Original)
-        mpHorizScroll->SetSize( curX, curY,width - curX - mHorizGap - BORDER_SZ - thumbLen, thumbLen );
-    else
-        mpHorizScroll->SetSize( curX, curY,width - curX - mHorizGap - BORDER_SZ-4, thumbLen );
-
-    // setup view's VERTICAL scroll bar
-    if (!mNoVertScroll)       // Vertical Scroll (Original)
-    {
-        curX = width - mHorizGap - BORDER_SZ - thumbLen;
-        curY = mVertGap  + BORDER_SZ;
-        mpVertScroll->SetSize( curX, curY, thumbLen,height - curY - mVertGap - BORDER_SZ - thumbLen);
-    }
-    // layout tab title bars
-
-    mLayoutType = wxTITLE_IMG_AND_TEXT;
-
-    wxObjectList::compatibility_iterator pNode = mTabs.GetFirst();
-
-    while( pNode )
-    {
-        twTabInfo& tab = *((twTabInfo*)(pNode->GetData()));
-
-        wxWindowDC dc(this);
-
-        long w,h;
-
-        // set select default font of the window into it's device context
-        //dc.SetFont( GetLabelingFont() );
-        dc.GetTextExtent(tab.mText, &w, &h );
-
-        tab.mDims.x = w + tab.ImageToTxtGap(mImageTextGap) +
-            tab.ImgWidth() + mTitleHorizGap*2;
-
-        tab.mDims.y  = mTitleHeight;
-
-        pNode = pNode->GetNext();
-    }
-
-    // disable title-bar scroller if there's nowhere to scroll to
-
-    mpTabScroll->Enable( mTitleRowLen < GetWholeTabRowLen() || mCurentRowOfs < 0  );
-}
-
-//---------------------------------------------------------------------------
-// event handlers
-//---------------------------------------------------------------------------
-void wxPagedWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
-{
-    wxPaintDC dc(this);
-    DrawDecorations( dc );
-}
-
-//---------------------------------------------------------------------------
-void wxPagedWindow::OnSize ( wxSizeEvent& event )
-{
-    wxTabbedWindow::OnSize(event);
-}
-
-//---------------------------------------------------------------------------
-void wxPagedWindow::OnLButtonDown( wxMouseEvent& event )
-{
-    if ( mCursorChanged )
-    {
-        mIsDragged = true;
-        mDagOrigin = event.m_x;
-
-        mOriginalTitleRowLen = mAdjustableTitleRowLen;
-
-        CaptureMouse();
-    }
-    else
-    {
-        wxTabbedWindow::OnLButtonDown( event );
-    }
-}  // wxPagedWindow::OnLButtonDown()
-
-//---------------------------------------------------------------------------
-void wxPagedWindow::OnLButtonUp( wxMouseEvent& WXUNUSED(event) )
-{
-    if ( mIsDragged )
-    {
-        mIsDragged     = false;
-        mCursorChanged = false;
-        SetCursor( mNormalCursor );
-
-        ReleaseMouse();
-    }
-} // wxPagedWindow::OnLButtonUp()
-
-//---------------------------------------------------------------------------
-void wxPagedWindow::OnMouseMove( wxMouseEvent& event )
-{
-    int width, height;
-    GetClientSize( &width, &height );
-
-    if ( !mIsDragged )
-    {
-        int y = height - mVertGap - BORDER_SZ - mTitleHeight;
-        int x = mTitleRowStart + mTitleRowLen - 6;
-
-        if ( event.m_x >= x && event.m_y >= y &&
-            event.m_x <  x + 6               &&
-            event.m_y <  y + mTitleHeight
-            )
-        {
-            if ( !mCursorChanged )
-            {
-                SetCursor( mResizeCursor );
-
-                mCursorChanged = true;
-            }
-        }
-        else
-            if ( mCursorChanged )
-            {
-                SetCursor( mNormalCursor );
-
-                mCursorChanged = false;
-            }
-    }
-    else
-    {
-        if ( mIsDragged )
-        {
-            mAdjustableTitleRowLen = mOriginalTitleRowLen + ( event.m_x - mDagOrigin );
-
-            // FOR NOW:: fixed
-            if ( mAdjustableTitleRowLen < 6 ) mAdjustableTitleRowLen = 6;
-
-            wxWindowDC dc(this);
-            DrawDecorations( dc );
-
-            RecalcLayout(false);
-
-            //Refresh();
-        }
-    }
-}  // wxPagedWindow::OnMouseMove()
-
-//---------------------------------------------------------------------------
-void wxPagedWindow::OnScroll( wxScrollEvent& event )
-{
-    wxScrollBar* pSender = (wxScrollBar*)event.GetEventObject();
-    // wxMessageBox("wxPagedWindow::OnScroll","-I->");
-    if ( pSender == mpTabScroll )
-    {
-
-        int maxUnits = GetWholeTabRowLen() / 20;
-
-        mCurentRowOfs = -event.GetPosition()*maxUnits;
-
-        mFirstTitleGap = mTitleRowStart + mCurentRowOfs + mTabTrianGap;
-
-        // let' it automatically disable itself if it's time
-        mpTabScroll->Enable( mTitleRowLen < GetWholeTabRowLen() || mCurentRowOfs < 0 );
-
-        // repaint title bars
-        wxWindowDC dc(this);
-        DrawDecorations( dc );
-    }
-    else
-    {
-        if ( !mScrollEventInProgress )
-        {
-            mScrollEventInProgress = true;
-
-            GetActiveTab()->GetEventHandler()->ProcessEvent( event );
-        }
-        else
-        {
-            // event bounced back to us, from here we
-            // know that it has traveled the loop - thus it's processed!
-
-            mScrollEventInProgress = false;
-        }
-    }
-}  // wxPagedWindow::OnScroll()
-//---------------------------------------------------------------------------
-
diff --git a/demos/dbbrowse/tabpgwin.h b/demos/dbbrowse/tabpgwin.h
deleted file mode 100644 (file)
index 5be9b27..0000000
+++ /dev/null
@@ -1,268 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        tabpgwin.h
-// Purpose:     Contrib. demo
-// Author:      Aleksandras Gluchovas
-// Modified by: 19990908 : mj
-//              19990909 :
-//              - rename to tabpgwin
-//              - restruction of Variable declaration
-//              - to prevent Warnings under MingGW32
-// Modified by: 19990909 : mj
-//              - mNoVertScroll true = no / false = Original Code
-//                the Original Code Paints a Vertical Scroll in wxPagedWindow
-//                which is not needed in this Version. Use true for this.
-// Created:     07/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Aleksandras Gluchovas
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __TABPGWIN_G__
-#define __TABPGWIN_G__
-
-#include "wx/defs.h"
-#include "wx/window.h"
-#include "wx/string.h"
-
-#define WXCONTROLAREA_VERSION      1.0
-
-// layout types for title bars of the tabs
-// (are selected up by evaluating the available free space )
-
-class twTabInfo; // forward decl.
-
-#define wxTITLE_IMG_AND_TEXT 0
-#define wxTITLE_IMG_ONLY     1
-#define wxTITLE_BORDER_ONLY  2
-
-/*
- * class manages and decorates contained "tab"-windows.
- * Draws decorations similar to those in "Project Workplace"
- * of Microsoft Developer Studio 4.xx
- */
-
-class wxTabbedWindow : public wxPanel
-{
- DECLARE_DYNAMIC_CLASS( wxTabbedWindow )
-
-public:
-
- friend class wxTabbedWindowSerializer;
-
- wxList mTabs;
- void HideInactiveTabs( bool andRepaint );
-
- // overrride,to provide different font for tab-labels
-
- virtual wxFont GetLabelingFont();
-
- // FOR NOW:: scrollbars are actually related to wxPagedWindow
-
- wxScrollBar* mpTabScroll;
- wxScrollBar* mpHorizScroll;
- wxScrollBar* mpVertScroll;
-
-public:
-
- // public properties (invoke ReclaclLayout(true) to apply changes)
-
- int    mVertGap;         // default: 3
- int    mHorizGap;        // default: 5
- int    mTitleVertGap;    // default: 3
- int    mTitleHorizGap;   // default: 4
- int    mImageTextGap;    // default: 2
- int    mFirstTitleGap;   // default: 11
- int    mBorderOnlyWidth; // default: 8
-
- wxPen  mWhitePen;        // default: RGB(255,255,255)
- wxPen  mGrayPen;         // default: RGB(192,192,192)
- wxPen  mDarkPen;         // default: RGB(128,128,128)
- wxPen  mBlackPen;        // default: RGB(  0,  0,  0)
-
- size_t mActiveTab;
- int    mTitleHeight;
- int    mLayoutType;
-
- // notifications (can be handled by derivatives)
-
- virtual void OnTabAdded( twTabInfo* WXUNUSED(pInfo) ) {}
-
- virtual void SizeTabs(int x,int y, int width, int height, bool repant);
-
-public:
- wxTabbedWindow();
- virtual ~wxTabbedWindow();
-
- // tabs can be also added when the window is
- // already displayed - "on the fly"
-
- virtual void AddTab( wxWindow*    pContent,           // contained window
-                      wxString     tabText,            // tab label
-                      wxString     imageFileName = _T(""), // if "", only text label is displayed
-                      wxBitmapType imageType     = wxBITMAP_TYPE_BMP );
-
- // NOTE:: if this AddTab(..) overload is called, the
- //        image bitmap will not be serialized (if performed),
- //        use the above method instead, so that images could
- //        be restored using the given file names
-
- virtual void AddTab( wxWindow* pContent,
-                      wxString  tabText,
-                      wxBitmap* pImage );
-
- virtual void RemoveTab( int tabNo );
-
- /* misc accessors */
-
- virtual int GetTabCount();
- virtual wxWindow* GetTab( int tabNo );
- virtual wxWindow* GetActiveTab();
- virtual void SetActiveTab( int tabNo );
-
- void DrawShadedRect( int x, int y, int width, int height,
-                                          wxPen& upperPen, wxPen& lowerPen, wxDC& dc );
-
- virtual void DrawDecorations( wxDC& dc );
-
- // return -1, if non of the title bars was hitted,
- // otherwise the index of the hitted tab title bar
-
- virtual int HitTest( const wxPoint& pos );
-
- // should be invoked to redisplay window with changed properties
-
- virtual void RecalcLayout( bool andRepaint = true );
-
- // event handlers
-
- void OnPaint( wxPaintEvent& event );
- void OnSize ( wxSizeEvent& event );
-
- void OnBkErase( wxEraseEvent& event );
- void OnLButtonDown( wxMouseEvent& event );
-
- DECLARE_EVENT_TABLE()
-};
-
-/*
- * class manages and decorates contained "sheets" (or pages).
- * Draws decorations similar to those in "Output window"
- * of Microsoft Developer Studio 4.xx
- */
-
-class wxPagedWindow : public wxTabbedWindow
-{
- DECLARE_DYNAMIC_CLASS( wxPagedWindow )
- // the protected: public: changes prevents Warnings in gcc
-protected:
- bool         mScrollEventInProgress;
-public:
- int          mTabTrianGap;
- wxBrush      mWhiteBrush;
- wxBrush      mGrayBrush;
- int          mCurentRowOfs;
- int          mAdjustableTitleRowLen; // setup by dragging mini-sash
-                                      // with the mosue pointer
-protected:
- // drag&drop state variables
- bool         mIsDragged;
- int          mDagOrigin;
- bool         mCursorChanged;
- wxCursor     mResizeCursor;
- wxCursor     mNormalCursor;
- int          mOriginalTitleRowLen;
-
-public:
- int          mTitleRowStart;
- int          mResizeNailGap;
- int          mTitleRowLen;               // actual title row length
- int          mNoVertScroll;              // No Vertical Scroll  true/false
-
- void DrawPaperBar( twTabInfo& tab, int x, int y,
-                                    wxBrush& brush, wxPen& pen, wxDC& dc );
-
- int GetWholeTabRowLen();
-
- // adjusts scorllbars to fit around tabs
-
- virtual void OnTabAdded( twTabInfo* pInfo );
-
- // sets smaller font for page-labels
-
- virtual wxFont GetLabelingFont();
-
-public:
-
-
-public:
- wxPagedWindow();
- ~wxPagedWindow(){};
-
- // NOTE:: use public methods of the base class
- //        to add "pages" to this window
-
- /* misc accessors */
-
- // below two methods should be called after
- // the tabs were added (AddTab(..)). Set up
- // these scrollbars to match the needs of the
- // tabs added into this area
-
- wxScrollBar& GetVerticalScrollBar();
- wxScrollBar& GetHorizontalScrollBar();
-
- virtual void DrawDecorations( wxDC& dc );
-
- // return -1, if non of the title bars was hitted,
- // otherwise the index of the hitted tab title bar
-
- virtual int HitTest( const wxPoint& pos );
-
- virtual void RecalcLayout( bool andRepaint = true );
-
- // event handlers
-
- void OnPaint( wxPaintEvent& event );
- void OnSize ( wxSizeEvent& event );
- void OnLButtonDown( wxMouseEvent& event );
- void OnLButtonUp  ( wxMouseEvent& event );
- void OnMouseMove  ( wxMouseEvent& event );
- void OnScroll     ( wxScrollEvent& event );
-
- DECLARE_EVENT_TABLE()
-};
-
-// helper structure of wxTabbedWindow
-
-class twTabInfo : public wxObject
-{
- DECLARE_DYNAMIC_CLASS( twTabInfo )
-public:
- twTabInfo();
- ~twTabInfo(){};
-
- int ImgWidth();
- int ImgHeight();
- int ImageToTxtGap( int prefGap );
-
- bool HasImg();
- wxBitmap& GetImg();
- // bool HasText();
- unsigned int HasText();
- wxString& GetText();
- wxWindow& GetContent();
-
-public:
- wxWindow* mpContent;
- wxBitmap  mBitMap;
-
- wxString  mText;
- wxSize    mDims;
-
- // used for serialization
- wxString  mImageFile;
- long      mImageType;
-
-};
-
-#endif
index 7eabf9bc39fdef057c4e909080c2350acba73960..ceac161dafb41f18de98410228a0267a15f9acfd 100644 (file)
@@ -39,6 +39,14 @@ changes:
   bit text, the new wxIPC_UTF8TEXT format is used for transferring wxStrings.
 
 
+wxODBC library removal
+----------------------
+
+wxODBC library was unmaintained since several years and we couldn't continue
+supporting it any longer so it was removed. Please use any of the other open
+source ODBC libraries in the future projects.
+
+
 Changes in behaviour not resulting in compilation errors, please read this!
 ---------------------------------------------------------------------------
 
index 8df21326caee31e758d74358a50c58ee0ac4c7c5..c2f872f32da19b82037ae25d89e83c87d047051a 100644 (file)
@@ -686,28 +686,6 @@ from specifications stored in an XML format.
 \twocolitem{\helpref{wxToolTip}{wxtooltip}}{Class implementing tooltips}
 \end{twocollist}
 
-{\large {\bf Database classes}}
-
-\overview{Database classes overview}{odbcoverview}
-
-wxWidgets provides a set of classes for accessing Microsoft's ODBC (Open Database Connectivity)
-product, donated by Remstar. This is known as wxODBC. Note that these classes are deprecated
-and will be removed from wxWidgets.
-
-\twocolwidtha{6cm}
-\begin{twocollist}\itemsep=0pt
-\twocolitem{\helpref{wxDb}{wxdb}}{ODBC database connection}
-\twocolitem{\helpref{wxDbTable}{wxdbtable}}{Provides access to a database table}
-\twocolitem{\helpref{wxDbInf}{wxdbinf}}{}
-\twocolitem{\helpref{wxDbTableInf}{wxdbtableinf}}{}
-\twocolitem{\helpref{wxDbColDef}{wxdbcoldef}}{}
-\twocolitem{\helpref{wxDbColInf}{wxdbcolinf}}{}
-\twocolitem{\helpref{wxDbColDataPtr}{wxdbcoldataptr}}{}
-\twocolitem{\helpref{wxDbColFor}{wxdbcolfor}}{}
-\twocolitem{\helpref{wxDbConnectInf}{wxdbconnectinf}}{}
-\twocolitem{\helpref{wxDbIdxDef}{wxdbidxdef}}{}
-\end{twocollist}
-
 {\large {\bf Miscellaneous}}
 
 \twocolwidtha{6cm}
diff --git a/docs/latex/wx/db.tex b/docs/latex/wx/db.tex
deleted file mode 100644 (file)
index 12cbfd6..0000000
+++ /dev/null
@@ -1,4276 +0,0 @@
-\section{\class{wxDb}}\label{wxdb}
-
-A wxDb instance is a connection to an ODBC datasource which may
-be opened, closed, and re-opened an unlimited number of times.  A
-database connection allows function to be performed directly on the
-datasource, as well as allowing access to any tables/views defined in
-the datasource to which the user has sufficient privileges.
-
-See the \helpref{database classes overview}{odbcoverview} for
-an introduction to using the ODBC classes.
-
-\wxheading{Include files}
-
-<wx/db.h>
-
-\wxheading{Library}
-
-\helpref{wxOdbc}{librarieslist}
-
-\wxheading{Helper classes and data structures}
-
-The following classes and structs are defined in db.cpp/.h for use with the wxDb class.
-
-\begin{itemize}\itemsep=0pt
-\item \helpref{wxDbColFor}{wxdbcolfor}
-\item \helpref{wxDbColInf}{wxdbcolinf}
-\item \helpref{wxDbTableInf}{wxdbtableinf}
-\item \helpref{wxDbInf}{wxdbinf}
-\end{itemize}
-
-\wxheading{Constants}
-
-NOTE: In a future release, all ODBC class constants will be prefaced with 'wx'.
-
-\begin{verbatim}
-    wxDB_PATH_MAX           Maximum path length allowed to be passed to
-                            the ODBC driver to indicate where the data
-                            file(s) are located.
-
-    DB_MAX_COLUMN_NAME_LEN  Maximum supported length for the name of a
-                            column
-
-    DB_MAX_ERROR_HISTORY    Maximum number of error messages retained in
-                            the queue before being overwritten by new
-                            errors.
-
-    DB_MAX_ERROR_MSG_LEN    Maximum supported length of an error message
-                            returned by the ODBC classes
-
-    DB_MAX_STATEMENT_LEN    Maximum supported length for a complete SQL
-                            statement to be passed to the ODBC driver
-
-    DB_MAX_TABLE_NAME_LEN   Maximum supported length for the name of a
-                            table
-
-    DB_MAX_WHERE_CLAUSE_LEN Maximum supported WHERE clause length that
-                            can be passed to the ODBC driver
-
-    DB_TYPE_NAME_LEN        Maximum length of the name of a column's
-                            data type
-\end{verbatim}
-
-\subsection{Enumerated types}\label{wxdbenumeratedtypes}
-
-\wxheading{Enumerated types}
-
-\docparam{enum {\bf wxDbSqlLogState}}{sqlLogOFF, sqlLogON}
-
-{\it enum {\bf wxDBMS}}
-
-These are the databases currently tested and working with the ODBC classes.  A call to \helpref{wxDb::Dbms}{wxdbdbms} will return one of these enumerated values listed below.
-
-\begin{itemize}\itemsep=0pt
-\item DB2
-\item DBase (IV, V)**
-\item Firebird
-\item INFORMIX
-\item Interbase
-\item MS SQL Server (v7 - minimal testing)
-\item MS Access (97, 2000, 2002, and 2003)
-\item MySQL (2.x and 3.5 - use the 2.5x drivers though)
-\item Oracle (v7, v8, v8i)
-\item Pervasive SQL
-\item PostgreSQL
-\item Sybase (ASA and ASE)
-\item XBase Sequiter
-\item VIRTUOSO
-\end{itemize}
-
-See the remarks in \helpref{wxDb::Dbms}{wxdbdbms} for exceptions/issues with each of these database engines.
-
-\wxheading{Public member variables}
-
-\docparam{SWORD {\bf wxDb::cbErrorMsg}}{This member variable is populated as a result of calling \helpref{wxDb::GetNextError}{wxdbgetnexterror}.  Contains the count of bytes in the wxDb::errorMsg string.}
-
-\docparam{int {\bf wxDb::DB\_STATUS}}{The last ODBC error/status that occurred on this data connection.  Possible codes are:}
-
-\begin{verbatim}
-   DB_ERR_GENERAL_WARNING                     // SqlState = '01000'
-   DB_ERR_DISCONNECT_ERROR                    // SqlState = '01002'
-   DB_ERR_DATA_TRUNCATED                      // SqlState = '01004'
-   DB_ERR_PRIV_NOT_REVOKED                    // SqlState = '01006'
-   DB_ERR_INVALID_CONN_STR_ATTR               // SqlState = '01S00'
-   DB_ERR_ERROR_IN_ROW                        // SqlState = '01S01'
-   DB_ERR_OPTION_VALUE_CHANGED                // SqlState = '01S02'
-   DB_ERR_NO_ROWS_UPD_OR_DEL                  // SqlState = '01S03'
-   DB_ERR_MULTI_ROWS_UPD_OR_DEL               // SqlState = '01S04'
-   DB_ERR_WRONG_NO_OF_PARAMS                  // SqlState = '07001'
-   DB_ERR_DATA_TYPE_ATTR_VIOL                 // SqlState = '07006'
-   DB_ERR_UNABLE_TO_CONNECT                   // SqlState = '08001'
-   DB_ERR_CONNECTION_IN_USE                   // SqlState = '08002'
-   DB_ERR_CONNECTION_NOT_OPEN                 // SqlState = '08003'
-   DB_ERR_REJECTED_CONNECTION                 // SqlState = '08004'
-   DB_ERR_CONN_FAIL_IN_TRANS                  // SqlState = '08007'
-   DB_ERR_COMM_LINK_FAILURE                   // SqlState = '08S01'
-   DB_ERR_INSERT_VALUE_LIST_MISMATCH          // SqlState = '21S01'
-   DB_ERR_DERIVED_TABLE_MISMATCH              // SqlState = '21S02'
-   DB_ERR_STRING_RIGHT_TRUNC                  // SqlState = '22001'
-   DB_ERR_NUMERIC_VALUE_OUT_OF_RNG            // SqlState = '22003'
-   DB_ERR_ERROR_IN_ASSIGNMENT                 // SqlState = '22005'
-   DB_ERR_DATETIME_FLD_OVERFLOW               // SqlState = '22008'
-   DB_ERR_DIVIDE_BY_ZERO                      // SqlState = '22012'
-   DB_ERR_STR_DATA_LENGTH_MISMATCH            // SqlState = '22026'
-   DB_ERR_INTEGRITY_CONSTRAINT_VIOL           // SqlState = '23000'
-   DB_ERR_INVALID_CURSOR_STATE                // SqlState = '24000'
-   DB_ERR_INVALID_TRANS_STATE                 // SqlState = '25000'
-   DB_ERR_INVALID_AUTH_SPEC                   // SqlState = '28000'
-   DB_ERR_INVALID_CURSOR_NAME                 // SqlState = '34000'
-   DB_ERR_SYNTAX_ERROR_OR_ACCESS_VIOL         // SqlState = '37000'
-   DB_ERR_DUPLICATE_CURSOR_NAME               // SqlState = '3C000'
-   DB_ERR_SERIALIZATION_FAILURE               // SqlState = '40001'
-   DB_ERR_SYNTAX_ERROR_OR_ACCESS_VIOL2        // SqlState = '42000'
-   DB_ERR_OPERATION_ABORTED                   // SqlState = '70100'
-   DB_ERR_UNSUPPORTED_FUNCTION                // SqlState = 'IM001'
-   DB_ERR_NO_DATA_SOURCE                      // SqlState = 'IM002'
-   DB_ERR_DRIVER_LOAD_ERROR                   // SqlState = 'IM003'
-   DB_ERR_SQLALLOCENV_FAILED                  // SqlState = 'IM004'
-   DB_ERR_SQLALLOCCONNECT_FAILED              // SqlState = 'IM005'
-   DB_ERR_SQLSETCONNECTOPTION_FAILED          // SqlState = 'IM006'
-   DB_ERR_NO_DATA_SOURCE_DLG_PROHIB           // SqlState = 'IM007'
-   DB_ERR_DIALOG_FAILED                       // SqlState = 'IM008'
-   DB_ERR_UNABLE_TO_LOAD_TRANSLATION_DLL      // SqlState = 'IM009'
-   DB_ERR_DATA_SOURCE_NAME_TOO_LONG           // SqlState = 'IM010'
-   DB_ERR_DRIVER_NAME_TOO_LONG                // SqlState = 'IM011'
-   DB_ERR_DRIVER_KEYWORD_SYNTAX_ERROR         // SqlState = 'IM012'
-   DB_ERR_TRACE_FILE_ERROR                    // SqlState = 'IM013'
-   DB_ERR_TABLE_OR_VIEW_ALREADY_EXISTS        // SqlState = 'S0001'
-   DB_ERR_TABLE_NOT_FOUND                     // SqlState = 'S0002'
-   DB_ERR_INDEX_ALREADY_EXISTS                // SqlState = 'S0011'
-   DB_ERR_INDEX_NOT_FOUND                     // SqlState = 'S0012'
-   DB_ERR_COLUMN_ALREADY_EXISTS               // SqlState = 'S0021'
-   DB_ERR_COLUMN_NOT_FOUND                    // SqlState = 'S0022'
-   DB_ERR_NO_DEFAULT_FOR_COLUMN               // SqlState = 'S0023'
-   DB_ERR_GENERAL_ERROR                       // SqlState = 'S1000'
-   DB_ERR_MEMORY_ALLOCATION_FAILURE           // SqlState = 'S1001'
-   DB_ERR_INVALID_COLUMN_NUMBER               // SqlState = 'S1002'
-   DB_ERR_PROGRAM_TYPE_OUT_OF_RANGE           // SqlState = 'S1003'
-   DB_ERR_SQL_DATA_TYPE_OUT_OF_RANGE          // SqlState = 'S1004'
-   DB_ERR_OPERATION_CANCELLED                 // SqlState = 'S1008'
-   DB_ERR_INVALID_ARGUMENT_VALUE              // SqlState = 'S1009'
-   DB_ERR_FUNCTION_SEQUENCE_ERROR             // SqlState = 'S1010'
-   DB_ERR_OPERATION_INVALID_AT_THIS_TIME      // SqlState = 'S1011'
-   DB_ERR_INVALID_TRANS_OPERATION_CODE        // SqlState = 'S1012'
-   DB_ERR_NO_CURSOR_NAME_AVAIL                // SqlState = 'S1015'
-   DB_ERR_INVALID_STR_OR_BUF_LEN              // SqlState = 'S1090'
-   DB_ERR_DESCRIPTOR_TYPE_OUT_OF_RANGE        // SqlState = 'S1091'
-   DB_ERR_OPTION_TYPE_OUT_OF_RANGE            // SqlState = 'S1092'
-   DB_ERR_INVALID_PARAM_NO                    // SqlState = 'S1093'
-   DB_ERR_INVALID_SCALE_VALUE                 // SqlState = 'S1094'
-   DB_ERR_FUNCTION_TYPE_OUT_OF_RANGE          // SqlState = 'S1095'
-   DB_ERR_INF_TYPE_OUT_OF_RANGE               // SqlState = 'S1096'
-   DB_ERR_COLUMN_TYPE_OUT_OF_RANGE            // SqlState = 'S1097'
-   DB_ERR_SCOPE_TYPE_OUT_OF_RANGE             // SqlState = 'S1098'
-   DB_ERR_NULLABLE_TYPE_OUT_OF_RANGE          // SqlState = 'S1099'
-   DB_ERR_UNIQUENESS_OPTION_TYPE_OUT_OF_RANGE // SqlState = 'S1100'
-   DB_ERR_ACCURACY_OPTION_TYPE_OUT_OF_RANGE   // SqlState = 'S1101'
-   DB_ERR_DIRECTION_OPTION_OUT_OF_RANGE       // SqlState = 'S1103'
-   DB_ERR_INVALID_PRECISION_VALUE             // SqlState = 'S1104'
-   DB_ERR_INVALID_PARAM_TYPE                  // SqlState = 'S1105'
-   DB_ERR_FETCH_TYPE_OUT_OF_RANGE             // SqlState = 'S1106'
-   DB_ERR_ROW_VALUE_OUT_OF_RANGE              // SqlState = 'S1107'
-   DB_ERR_CONCURRENCY_OPTION_OUT_OF_RANGE     // SqlState = 'S1108'
-   DB_ERR_INVALID_CURSOR_POSITION             // SqlState = 'S1109'
-   DB_ERR_INVALID_DRIVER_COMPLETION           // SqlState = 'S1110'
-   DB_ERR_INVALID_BOOKMARK_VALUE              // SqlState = 'S1111'
-   DB_ERR_DRIVER_NOT_CAPABLE                  // SqlState = 'S1C00'
-   DB_ERR_TIMEOUT_EXPIRED                     // SqlState = 'S1T00'
-\end{verbatim}
-
-\docparam{struct {\bf wxDb::dbInf}}{This structure is internal to the
-wxDb class and contains details of the ODBC datasource that the current
-instance of the wxDb is connected to in its members.  When the datasource
-is opened, all of the information contained in the dbInf structure is
-queried from the datasource.  This information is used almost exclusively
-within the ODBC class library.  Where there may be a need for particular
-portions of this information outside of the class library, member
-functions (e.g.
-\helpref{wxDbTable::IsCursorClosedOnCommit}{wxdbtableiscursorclosedoncommit})
-have been added for ease of use.}
-
-\begin{verbatim}
-   wxChar dbmsName[40]        - Name of the dbms product
-   wxChar dbmsVer[64]         - Version # of the dbms product
-   wxChar driverName[40]      - Driver name
-   wxChar odbcVer[60]         - ODBC version of the driver
-   wxChar drvMgrOdbcVer[60]   - ODBC version of the driver manager
-   wxChar driverVer[60]       - Driver version
-   wxChar serverName[80]      - Server Name, typically a connect string
-   wxChar databaseName[128]   - Database filename
-   wxChar outerJoins[2]       - Does datasource support outer joins
-   wxChar procedureSupport[2] - Does datasource support stored
-                                procedures
-   UWORD  maxConnections      - Maximum # of connections datasource
-                                supports
-   UWORD  maxStmts            - Maximum # of HSTMTs per HDBC
-   UWORD  apiConfLvl          - ODBC API conformance level
-   UWORD  cliConfLvl          - Is datasource SAG compliant
-   UWORD  sqlConfLvl          - SQL conformance level
-   UWORD  cursorCommitBehavior   - How cursors are affected on db commit
-   UWORD  cursorRollbackBehavior - How cursors are affected on db
-                                   rollback
-   UWORD  supportNotNullClause   - Does datasource support NOT NULL
-                                   clause
-   wxChar supportIEF[2]       - Integrity Enhancement Facility (Ref.
-                                Integrity)
-   UDWORD txnIsolation        - Transaction isolation level supported by
-                                driver
-   UDWORD txnIsolationOptions - Transaction isolation level options
-                                available
-   UDWORD fetchDirections     - Fetch directions supported
-   UDWORD lockTypes           - Lock types supported in SQLSetPos
-   UDWORD posOperations       - Position operations supported in
-                                SQLSetPos
-   UDWORD posStmts            - Position statements supported
-   UDWORD scrollConcurrency   - Scrollable cursor concurrency options
-                                supported
-   UDWORD scrollOptions       - Scrollable cursor options supported
-   UDWORD staticSensitivity   - Can additions/deletions/updates be
-                                detected
-   UWORD  txnCapable          - Indicates if datasource supports
-                                transactions
-   UDWORD loginTimeout        - Number seconds to wait for a login
-                                request
-\end{verbatim}
-
-\docparam{wxChar {\bf wxDb::errorList}[DB\_MAX\_ERROR\_HISTORY][DB\_MAX\_ERROR\_MSG\_LEN]}{The last n ODBC errors that have occurred on this database connection.}
-
-\docparam{wxChar {\bf wxDb::errorMsg}[SQL\_MAX\_MESSAGE\_LENGTH]}{This member variable is populated as a result of calling \helpref{wxDb::GetNextError}{wxdbgetnexterror}.  It contains the ODBC error message text.}
-
-\docparam{SDWORD {\bf wxDb::nativeError}}{Set by wxDb::DispAllErrors,
-wxDb::GetNextError, and wxDb::DispNextError.  It contains the
-datasource-specific error code returned by the datasource to the ODBC driver.
-Used for reporting ODBC errors.}
-
-\docparam{wxChar {\bf wxDb::sqlState}[20]}{Set by wxDb::TranslateSqlState().
-Indicates the error state after a failed ODBC operation.  Used for reporting
-ODBC errors.}
-
-\wxheading{Remarks}
-
-Default cursor scrolling is defined by wxODBC\_FWD\_ONLY\_CURSORS in setup.h
-when the wxWidgets library is built.  This behavior can be overridden when
-an instance of a wxDb is created (see \helpref{wxDb constructor}{wxdbctor}).
-Default setting of this value true, as not all databases/drivers support
-both types of cursors.
-
-\wxheading{See also}
-
-\helpref{wxDbColFor}{wxdbcolfor}, \helpref{wxDbColInf}{wxdbcolinf},
-\helpref{wxDbTable}{wxdbtable}, \helpref{wxDbTableInf}{wxdbtableinf},
-\helpref{wxDbInf}{wxdbinf}
-
-\subsection{Associated non-class functions}\label{wxdbfunctions}
-
-The following functions are used in conjunction with the wxDb class.
-
-\func{void}{wxDbCloseConnections}{\void}
-
-\wxheading{Remarks}
-
-Closes all cached connections that have been made through use of the
-\helpref{wxDbGetConnection}{wxdbfunctions} function.
-
-NOTE: These connections are closed regardless of whether they are in use
-or not.  This function should only be called after the program has
-finished using the connections and all wxDbTable instances that use any of
-the connections have been closed.
-
-This function performs a \helpref{wxDb::CommitTrans}{wxdbcommittrans}
-on the connection before closing it to commit any changes that are still
-pending, as well as to avoid any function sequence errors upon closing
-each connection.
-
-
-\func{int }{wxDbConnectionsInUse}{\void}
-
-\wxheading{Remarks}
-
-Returns a count of how many database connections are currently free ( not
-being used) that have been cached through use of the \helpref{wxDbGetConnection}{wxdbfunctions}
-function.
-
-
-\func{bool}{wxDbFreeConnection}{\param{wxDb *}{pDb}}
-
-\wxheading{Remarks}
-
-Searches the list of cached database connections connection for one matching
-the passed in wxDb instance.  If found, that cached connection is freed.
-
-Freeing a connection means that it is marked as available (free) in the
-cache of connections, so that a call to \helpref{wxDbGetConnection}{wxdbfunctions}
-is able to return a pointer to the wxDb instance for use.  Freeing a
-connection does NOT close the connection, it only makes the connection
-available again.
-
-
-\func{wxDb *}{wxDbGetConnection}{\param{wxDbConnectInf *}{pDbConfig},
-\param{bool }{FwdOnlyCursors=(bool)wxODBC\_FWD\_ONLY\_CURSORS}}
-
-\wxheading{Remarks}
-
-This function is used to request a "new" wxDb instance for use by the program.
-The wxDb instance returned is also opened (see \helpref{wxDb::Open}{wxdbopen}).
-
-This function (along with wxDbFreeConnection() and wxDbCloseConnection())
-maintain a cache of wxDb instances for user/re-use by a program.  When a
-program needs a wxDb instance, it may call this function to obtain a wxDb
-instance.  If there is a wxDb instance in the cache that is currently unused
-that matches the connection requirements specified in {\it'pDbConfig'} then
-that cached connection is marked as no longer being free, and a pointer to
-the wxDb instance is returned.
-
-If there are no connections available in the cache that meet the requirements
-given in {\it'pDbConfig'}, then a new wxDb instance is created to connect
-to the datasource specified in {\it'pDbConfig'} using the userID and password
-given in {\it'pDbConfig'}.
-
-NOTE: The caching routine also uses the \helpref{wxDb::Open}{wxdbopen}
-connection datatype copying code.  If the call to wxDbGetConnection()
-requests a connection to a datasource, and there is not one available in the
-cache, a new connection is created.  But when the connection is opened,
-instead of polling the datasource over again for its datatypes, if a
-connection to the same datasource (using the same userID/password) has already
-been done previously, the new connection skips querying the datasource for
-its datatypes, and uses the same datatypes determined previously by the
-other connection(s) for that same datasource.  This cuts down greatly on
-network traffic, database load, and connection creation time.
-
-When the program is done using a connection created through a call to
-wxDbGetConnection(), the program should call wxDbFreeConnection() to release
-the wxDb instance back to the cache.  DO NOT DELETE THE wxDb INSTANCE!
-Deleting the wxDb instance returned can cause a crash/memory corruption
-later in the program when the cache is cleaned up.
-
-When exiting the program, call wxDbCloseConnections() to close all the
-cached connections created by calls to wxDbGetConnection().
-
-
-\func{const wxChar *}{wxDbLogExtendedErrorMsg}{\param{const wxChar *}{userText}, \param{wxDb *}{pDb}, \param{wxChar *}{ErrFile}, \param{int }{ErrLine}}
-
-Writes a message to the wxLog window (stdout usually) when an internal
-error situation occurs.
-
-\func{bool}{wxDbSqlLog}{\param{wxDbSqlLogState }{state}, \param{const wxString \&}{filename = SQL\_LOG\_FILENAME}}
-
-\wxheading{Remarks}
-
-This function sets the sql log state for all open wxDb objects
-
-\func{bool}{wxDbGetDataSource}{\param{HENV }{henv}, \param{wxChar *}{Dsn}, \param{SWORD }{DsnMax}, \param{wxChar *}{DsDesc}, \param{SWORD }{DsDescMax}, \param{UWORD }{direction = SQL\_FETCH\_NEXT}}
-
-\wxheading{Remarks}
-
-This routine queries the ODBC driver manager for a list of available
-datasources.  Repeatedly call this function to obtain all the datasources
-available through the ODBC driver manager on the current workstation.
-
-\begin{verbatim}
-    wxArrayString strArray;
-
-    while (wxDbGetDataSource(DbConnectInf.GetHenv(), Dsn, SQL_MAX_DSN_LENGTH+1, DsDesc, 255))
-        strArray.Add(Dsn);
-\end{verbatim}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxDb::wxDb}\label{wxdbctor}
-
-\func{}{wxDb}{\void}
-
-Default constructor.
-
-\func{}{wxDb}{\param{const HENV \&}{aHenv}, \param{bool }{FwdOnlyCursors=(bool)wxODBC\_FWD\_ONLY\_CURSORS}}
-
-Constructor, used to create an ODBC connection to a datasource.
-
-\wxheading{Parameters}
-
-\docparam{aHenv}{Environment handle used for this connection.  See
-\helpref{wxDConnectInf::AllocHenv}{wxdbconnectinfallochenv}}
-
-\docparam{FwdOnlyCursors}{Will cursors created for use with this datasource
-connection only allow forward scrolling cursors.}
-
-\wxheading{Remarks}
-
-This is the constructor for the wxDb class.  The wxDb object must
-be created and opened before any database activity can occur.
-
-\wxheading{Example}
-
-\begin{verbatim}
-   wxDbConnectInf ConnectInf;
-   ....Set values for member variables of ConnectInf here
-
-   wxDb sampleDB(ConnectInf.GetHenv());
-   if (!sampleDB.Open(ConnectInf.GetDsn(), ConnectInf.GetUserID(),
-                          ConnectInf.GetPassword()))
-   {
-      // Error opening datasource
-   }
-\end{verbatim}
-
-\wxheading{See also}
-
-\helpref{wxDbGetConnection}{wxdbfunctions}
-
-\membersection{wxDb::Catalog}\label{wxdbcatalog}
-
-\func{bool}{Catalog}{\param{wxChar *}{ userID}, \param{const wxString \&}{fileName =
-SQL\_CATALOG\_FILENAME}}
-
-Allows a data "dictionary" of the datasource to be created, dumping pertinent
-information about all data tables to which the user specified in userID has
-access.
-
-\wxheading{Parameters}
-
-\docparam{userID}{Database user name to use in accessing the database.  All
-tables to which this user has rights will be evaluated in the catalog.}
-
-\docparam{fileName}{{\it OPTIONAL}.  Name of the text file to create and write
-the DB catalog to.  Default is SQL\_CATALOG\_FILENAME.}
-
-\wxheading{Return value}
-
-Returns true if the catalog request was successful, or false if there was some
-reason that the catalog could not be generated.
-
-\wxheading{Example}
-
-\begin{verbatim}
-============== ============== ================ ========= =======
-TABLE NAME     COLUMN NAME    DATA TYPE        PRECISION  LENGTH
-============== ============== ================ ========= =======
-EMPLOYEE       RECID          (0008)NUMBER            15       8
-EMPLOYEE       USER_ID        (0012)VARCHAR2          13      13
-EMPLOYEE       FULL_NAME      (0012)VARCHAR2          26      26
-EMPLOYEE       PASSWORD       (0012)VARCHAR2          26      26
-EMPLOYEE       START_DATE     (0011)DATE              19      16
-\end{verbatim}
-
-
-\membersection{wxDb::Close}\label{wxdbclose}
-
-\func{void}{Close}{\void}
-
-Closes the database connection.
-
-\wxheading{Remarks}
-
-At the end of your program, when you have finished all of your database work,
-you must close the ODBC connection to the datasource.  There are actually
-four steps involved in doing this as illustrated in the example.
-
-Any wxDbTable instances which use this connection must be deleted before
-closing the database connection.
-
-\wxheading{Example}
-
-\begin{verbatim}
-   // Commit any open transactions on the datasource
-   sampleDB.CommitTrans();
-
-   // Delete any remaining wxDbTable objects allocated with new
-   delete parts;
-
-   // Close the wxDb connection when finished with it
-   sampleDB.Close();
-\end{verbatim}
-
-
-\membersection{wxDb::CommitTrans}\label{wxdbcommittrans}
-
-\func{bool}{CommitTrans}{\void}
-
-Permanently "commits" changes (insertions/deletions/updates) to the database.
-
-\wxheading{Return value}
-
-Returns true if the commit was successful, or false if the commit failed.
-
-\wxheading{Remarks}
-
-Transactions begin implicitly as soon as you make a change to the database
-with an insert/update/delete, or any other direct SQL command that performs
-one of these operations against the datasource.
-At any time thereafter, to save the changes to disk permanently, "commit"
-them by calling this function.
-
-Calling this member function commits ALL open transactions on this ODBC
-connection.  For example, if three different wxDbTable instances used the
-same connection to the datasource, committing changes made on one of those
-wxDbTable instances commits any pending transactions on all three wxDbTable
-instances.
-
-Until a call to wxDb::CommitTrans() is made, no other user or cursor is able
-to see any changes made to the row(s) that have been inserted/modified/deleted.
-
-
-\wxheading{Special Note : {\it Cursors} }
-
-\normalbox{It is important to understand that different database/ODBC driver
-combinations handle transactions differently.  One thing in particular that
-you must pay attention to is cursors, in regard to transactions.  Cursors are
-what allow you to scroll through records forward and backward and to
-manipulate records as you scroll through them.  When you issue a query, a
-cursor is created behind the scenes.  The cursor keeps track of the query and
-keeps track of the current record pointer.  After you commit or rollback a
-transaction, the cursor may be closed automatically.  This is database
-dependent, and with some databases this behavior can be controlled through
-management functions.  This means you would need to requery the datasource
-before you can perform any additional work using this cursor.  This is only
-necessary however if the datasource closes the cursor after a commit or
-rollback.  Use the
-\helpref{wxDbTable::IsCursorClosedOnCommit}{wxdbtableiscursorclosedoncommit}
-member function to determine the datasource's transaction behavior.  Note, in
-many situations it is very inefficient to assume the cursor is closed and
-always requery.  This could put a significant, unnecessary load on datasources
-that leave the cursors open after a transaction.}
-
-
-\membersection{wxDb::CreateView}\label{wxdbcreateviews}
-
-\func{bool}{CreateView}{\param{const wxString \&}{ viewName},
-\param{const wxString \&}{ colList}, \param{const wxString \&}{pSqlStmt}}
-
-Creates a SQL VIEW of one or more tables in a single datasource.  Note that
-this function will only work against databases which support views (currently
-only Oracle as of November 21 2000).
-
-\wxheading{Parameters}
-
-\docparam{viewName}{The name of the view.  e.g. PARTS\_V}
-
-\docparam{colList}{{\it OPTIONAL} Pass in a comma delimited list of column
-names if you wish to explicitly name each column in the result set.  If not
-desired, pass in an empty string and the column names from the associated
-table(s) will be used.}
-
-\docparam{pSqlStmt}{Pointer to the select statement portion of the CREATE
-VIEW statement.  Must be a complete, valid SQL SELECT statement.}
-
-\wxheading{Remarks}
-
-A 'view' is a logical table that derives columns from one or more other
-tables or views.  Once the view is created, it can be queried exactly like
-any other table in the database.
-
-NOTE: Views are not available with all datasources.  Oracle is one example
-of a datasource which does support views.
-
-\wxheading{Example}
-
-\begin{verbatim}
-   // Incomplete code sample
-   db.CreateView("PARTS_SD1", "PN, PD, QTY",
-                 "SELECT PART_NUM, PART_DESC, QTY_ON_HAND * 1.1 FROM PARTS \
-                  WHERE STORAGE_DEVICE = 1");
-
-   // PARTS_SD1 can now be queried just as if it were a data table.
-   // e.g. SELECT PN, PD, QTY FROM PARTS_SD1
-\end{verbatim}
-
-
-\membersection{wxDb::Dbms}\label{wxdbdbms}
-
-\func{wxDBMS }{Dbms}{\void}
-
-\wxheading{Remarks}
-
-The return value will be of the enumerated type wxDBMS.  This enumerated
-type contains a list of all the currently tested and supported databases.
-
-Additional databases may work with these classes, but the databases
-returned by this function have been tested and confirmed to work with
-these ODBC classes.
-
-Possible values returned by this function can be viewed in the
-\helpref{Enumerated types}{wxdbenumeratedtypes} section of wxDb.
-
-There are known issues with conformance to the ODBC standards with several
-datasources supported by the wxWidgets ODBC classes.  Please see the overview
-for specific details on which datasource have which issues.
-
-\wxheading{Return value}
-
-The return value will indicate which of the supported datasources is
-currently connected to by this connection.  In the event that the
-datasource is not recognized, a value of 'dbmsUNIDENTIFIED' is returned.
-
-
-\membersection{wxDb::DispAllErrors}\label{wxdbdispallerrors}
-
-\func{bool}{DispAllErrors}{\param{HENV}{ aHenv}, \param{HDBC}{ aHdbc = SQL\_NULL\_HDBC}, \param{HSTMT}{ aHstmt = SQL\_NULL\_HSTMT}}
-
-Used to log all database errors that occurred as a result of an executed
-database command.  This logging is automatic and also includes debug logging
-when compiled in debug mode via \helpref{wxLogDebug}{wxlogdebug}.  If logging
-is turned on via \helpref{wxDb::SetSqlLogging}{wxdbsetsqllogging}, then an
-entry is also logged to the defined log file.
-
-\wxheading{Parameters}
-
-\docparam{aHenv}{Handle to the ODBC environment.}
-
-\docparam{aHdbc}{Handle to the ODBC connection.  Pass this in if the ODBC
-function call that erred required a hdbc or hstmt argument.}
-
-\docparam{aHstmt}{Handle to the ODBC statement being executed against.  Pass
-this in if the ODBC function call that failed required a hstmt argument.}
-
-\wxheading{Remarks}
-
-This member function will log all of the ODBC error messages for the last
-ODBC function call that was made.  This function is normally used internally
-within the ODBC class library, but can be used programmatically after calling
-ODBC functions directly (i.e. SQLFreeEnv()).
-
-\wxheading{Return value}
-
-The function always returns false, so a call to this function can be made
-in the return statement of a code block in the event of a failure to
-perform an action (see the example below).
-
-\wxheading{See also}
-
-\helpref{wxDb::SetSqlLogging}{wxdbsetsqllogging}, wxDbSqlLog
-
-\wxheading{Example}
-
-\begin{verbatim}
-   if (SQLExecDirect(hstmt, (UCHAR FAR *) pSqlStmt, SQL_NTS) != SQL_SUCCESS)
-      // Display all ODBC errors for this stmt
-      return(db.DispAllErrors(db.henv, db.hdbc, hstmt));
-\end{verbatim}
-
-\membersection{wxDb::DispNextError}\label{wxdbdispnexterror}
-
-\func{void}{DispNextError}{\void}
-
-\wxheading{Remarks}
-
-This function is normally used internally within the ODBC class library.
-It could be used programmatically after calling ODBC functions directly.  This
-function works in conjunction with \helpref{wxDb::GetNextError}{wxdbgetnexterror} when errors (or
-sometimes informational messages)  returned from ODBC need to be analyzed
-rather than simply displaying them as an error.  GetNextError() retrieves
-the next ODBC error from the ODBC error queue.  The wxDb member variables
-"sqlState", "nativeError" and "errorMsg" could then be evaluated.  To
-display the error retrieved, DispNextError() could then be called.
-The combination of GetNextError() and DispNextError() can be used to
-iteratively step through the errors returned from ODBC evaluating each
-one in context and displaying the ones you choose.
-
-\wxheading{Example}
-
-\begin{verbatim}
-   // Drop the table before attempting to create it
-   sprintf(sqlStmt, "DROP TABLE %s", tableName);
-   // Execute the drop table statement
-   if (SQLExecDirect(hstmt,(UCHAR FAR *)sqlStmt,SQL_NTS) != SQL_SUCCESS)
-   {
-      // Check for sqlState = S0002, "Table or view not found".
-      // Ignore this error, bomb out on any other error.
-      pDb->GetNextError(henv, hdbc, hstmt);
-      if (wxStrcmp(pDb->sqlState, "S0002"))
-      {
-         pDb->DispNextError();   // Displayed error retrieved
-         pDb->DispAllErrors(henv, hdbc, hstmt); // Display all other errors, if any
-         pDb->RollbackTrans();   // Rollback the transaction
-         CloseCursor();          // Close the cursor
-         return(false);          // Return Failure
-      }
-   }
-\end{verbatim}
-
-
-\membersection{wxDb::DropView}\label{wxdbdropview}
-
-\func{bool}{DropView}{\param{const wxString \&}{viewName}}
-
-Drops the data table view named in 'viewName'.
-
-\wxheading{Parameters}
-
-\docparam{viewName}{Name of the view to be dropped.}
-
-\wxheading{Remarks}
-
-If the view does not exist, this function will return true.  Note that views are not supported with all datasources.
-
-\membersection{wxDb::EscapeSqlChars}\label{wxdbescapesqlchars}
-
-\func{wxString}{EscapeSqlChars}{\param{const wxString\& }{value}}
-
-This function is used internally by wxWidgets while building SQL statements.
-It has been provided to help users who wish to explicity construct SQL
-statements to be sent to the server.  The function takes the value passed and
-returns it with any special characters escaped.  Which characters are
-considered special depends on what type of datasource the object is connected
-to.  For example, most database servers use a backslash as the escape
-character; if the value passed contains a backlash it will be replaced with a
-double backslash before it is passed to the server.  This function can be used
-to avoid passing statements with syntax errors to the server as well as prevent
-SQL injection attacks.
-
-\wxheading{Parameters}
-
-\docparam{value}{The value to be escaped.}
-
-\membersection{wxDb::ExecSql}\label{wxdbexecsql}
-
-\func{bool}{ExecSql}{\param{const wxString \&}{pSqlStmt}}
-
-\func{bool}{ExecSql}{\param{const wxString \&}{pSqlStmt}, \param{wxDbColInf **}{columns}, \param{short \&}{numcols}}
-
-Allows a native SQL command to be executed directly against the datasource.  In addition to being able to run any standard SQL command, use of this function allows a user to (potentially) utilize features specific to the datasource they are connected to that may not be available through ODBC.  The ODBC driver will pass the specified command directly to the datasource.
-
-To get column amount and column names or other information about returned columns, pass {\it 'columns'} and {\it 'numcols'} parameters to the function also.
-
-\wxheading{Parameters}
-
-\docparam{pSqlStmt}{Pointer to the SQL statement to be executed.}
-
-\docparam{columns}{On success, this function will set this pointer to point to array of \helpref{wxDbColInf}{wxdbcolinf} objects, holding information about columns returned by the query. You need to call delete[] for the pointer you pass here after you don't use it anymore to prevent memory leak.}
-
-\docparam{numcols}{Reference to variable where amount of objects in {\it 'columns'}-parameter will be set.}
-
-\wxheading{Remarks}
-
-This member extends the wxDb class and allows you to build and execute ANY VALID
-SQL statement against the datasource.  This allows you to extend the class
-library by being able to issue any SQL statement that the datasource is capable
-of processing.
-
-\wxheading{See also}
-
-\helpref{wxDb::GetData}{wxdbgetdata}, \helpref{wxDb::GetNext}{wxdbgetnext}
-
-\membersection{wxDb::FwdOnlyCursors}\label{wxdbfwdonlycursors}
-
-\func{bool}{IsFwdOnlyCursors}{\void}
-
-Older form (pre-2.3/2.4 of wxWidgets) of the
-\helpref{wxDb::IsFwdOnlyCursors}{wxdbisfwdonlycursors}.  This method is
-provided for backward compatibility only.  The method
-\helpref{wxDb::IsFwdOnlyCursors}{wxdbisfwdonlycursors} should be
-used in place of this method.
-
-
-\func{wxDbInf *}{GetCatalog}{\param{const wxChar *}{userID}}
-
-\membersection{wxDb::GetCatalog}\label{wxdbgetcatalog}
-
-\func{wxDbInf *}{GetCatalog}{\param{const wxChar *}{userID}}
-
-Returns a \helpref{wxDbInf}{wxdbinf} pointer that points to the catalog
-(datasource) name, schema, number of tables accessible to the current user,
-and a wxDbTableInf pointer to all data pertaining to all tables in the users
-catalog.
-
-\wxheading{Parameters}
-
-\docparam{userID}{Owner/Schema of the table.  Specify a userID when the datasource you are connected to allows multiple unique tables with the same name to be owned by different users.  {\it userID} is evaluated as follows:}
-
-\begin{verbatim}
-         userID == NULL  ... UserID is ignored (DEFAULT)
-         userID == ""    ... UserID set equal to 'this->uid'
-         userID != ""    ... UserID set equal to 'userID'
-\end{verbatim}
-
-\wxheading{Remarks}
-
-The returned catalog will only contain catalog entries for tables to which the user specified in 'userID' has sufficient privileges.  If no user is specified (NULL passed in), a catalog pertaining to all tables in the datasource accessible to the connected user (permissions apply) via this connection will be returned.
-
-\membersection{wxDb::GetColumnCount}\label{wxdbgetcolumncount}
-
-\func{int }{GetColumnCount}{\param{const wxString \&}{tableName}, \param{const wxChar *}{userID}}
-
-\wxheading{Parameters}
-
-\docparam{tableName}{The table name you wish to obtain column information about.}
-
-\docparam{userID}{Name of the user that owns the table(s) (also referred to as schema).
-Required for some datasources for situations where there may be multiple tables with the
-same name in the datasource, but owned by different users. {\it userID } is
-evaluated in the following manner:}
-
-\begin{verbatim}
-         userID == NULL  ... UserID is ignored (DEFAULT)
-         userID == ""    ... UserID set equal to 'this->uid'
-         userID != ""    ... UserID set equal to 'userID'
-\end{verbatim}
-
-\wxheading{Return value}
-
-Returns a count of how many columns are in the specified table.  If an error
-occurs retrieving the number of columns, this function will return a -1.
-
-\membersection{wxDb::GetColumns}\label{wxdbgetcolumns}
-
-\func{wxDbColInf *}{GetColumns}{\param{const wxString \&}{tableName}, \param{UWORD *}{numCols}, \param{const wxChar *}{userID=NULL}}
-
-\func{wxDbColInf *}{GetColumns}{\param{wxChar *}{tableName[]}, \param{const wxChar *}{userID}}
-
-\wxheading{Parameters}
-
-\docparam{tableName}{The table name you wish to obtain column information about.}
-\docparam{numCols}{Pointer to a UWORD which will hold a count of the number of columns returned by this function}
-\docparam{tableName[]}{An array of pointers to table names you wish to obtain column information about.  The last element of this array must be a NULL string.}
-\docparam{userID}{Name of the user that owns the table(s) (also referred to as schema).  Required for some datasources for situations where there may be multiple tables with the same name in the datasource, but owned by different users. {\it userID} is evaluated in the following manner:}
-
-\begin{verbatim}
-         userID == NULL  ... UserID is ignored (DEFAULT)
-         userID == ""    ... UserID set equal to 'this->uid'
-         userID != ""    ... UserID set equal to 'userID'
-\end{verbatim}
-
-\wxheading{Return value}
-
-This function returns a pointer to an array of \helpref{wxDbColInf}{wxdbcolinf}
-structures, allowing you to obtain information regarding the columns of the
-named table(s).  If no columns were found, or an error occurred, this pointer
-will be NULL.
-
-THE CALLING FUNCTION IS RESPONSIBLE FOR DELETING THE {\it wxDbColInf} MEMORY WHEN IT IS
-FINISHED WITH IT.
-
-\normalbox{ALL column bindings associated with this wxDb instance are unbound
-by this function, including those used by any wxDbTable instances that use
-this wxDb instance.  This function should use its own wxDb instance
-to avoid undesired unbinding of columns.}
-
-\wxheading{See also}
-
-\helpref{wxDbColInf}{wxdbcolinf}
-
-\wxheading{Example}
-
-\begin{verbatim}
-   wxChar *tableList[] = {"PARTS", 0};
-   wxDbColInf *colInf = pDb->GetColumns(tableList);
-   if (colInf)
-   {
-      // Use the column inf
-      .......
-      // Destroy the memory
-      delete [] colInf;
-   }
-\end{verbatim}
-
-\membersection{wxDb::GetData}\label{wxdbgetdata}
-
-\func{bool}{GetData}{\param{UWORD}{ colNumber}, \param{SWORD}{ cType},
-\param{PTR}{ pData}, \param{SDWORD}{ maxLen}, \param{SDWORD FAR *}{ cbReturned} }
-
-Used to retrieve result set data without binding column values to memory
-variables (i.e. not using a wxDbTable instance to access table data).
-
-\wxheading{Parameters}
-
-\docparam{colNumber}{Ordinal number of the desired column in the result set to be
-returned.}
-\docparam{cType}{The C data type that is to be returned.  See a partial list
-in \helpref{wxDbTable::SetColDefs}{wxdbtablesetcoldefs}}
-\docparam{pData}{Memory buffer which will hold the data returned by the call
-to this function.}
-\docparam{maxLen}{Maximum size of the buffer {\it 'pData'} in characters.
-NOTE: Not UNICODE safe.  If this is a numeric field, a value of 0 may be
-passed for this parameter, as the API knows the size of the expected return
-value.}
-\docparam{cbReturned}{Pointer to the buffer containing the length of the
-actual data returned.  If this value comes back as SQL\_NULL\_DATA, then the
-\helpref{wxDb::GetData}{wxdbgetdata} call has failed.}
-
-\wxheading{See also}
-
-\helpref{wxDb::GetNext}{wxdbgetnext}, \helpref{wxDb::ExecSql}{wxdbexecsql}
-
-\wxheading{Example}
-
-\begin{verbatim}
-    SDWORD cb;
-    ULONG reqQty;
-    wxString sqlStmt;
-    sqlStmt = "SELECT SUM(REQUIRED_QTY - PICKED_QTY) FROM ORDER_TABLE WHERE \
-                 PART_RECID = 1450 AND REQUIRED_QTY > PICKED_QTY";
-
-    // Perform the query
-    if (!pDb->ExecSql(sqlStmt.c_str()))
-    {
-        // ERROR
-        return(0);
-    }
-
-    // Request the first row of the result set
-    if (!pDb->GetNext())
-    {
-        // ERROR
-        return(0);
-    }
-
-    // Read column #1 of the row returned by the call to ::GetNext()
-    // and return the value in 'reqQty'
-    if (!pDb->GetData(1, SQL_C_ULONG, &reqQty, 0, &cb))
-    {
-        // ERROR
-        return(0);
-    }
-
-    // Check for a NULL result
-    if (cb == SQL_NULL_DATA)
-        return(0);
-\end{verbatim}
-
-\wxheading{Remarks}
-
-When requesting multiple columns to be returned from the result set (for example, the SQL query
-requested 3 columns be returned), the calls to this function must request the columns in ordinal
-sequence (1,2,3 or 1,3 or 2,3).
-
-\membersection{wxDb::GetDatabaseName}\label{wxdbgetdatabasename}
-
-\func{const wxChar *}{GetDatabaseName}{\void}
-
-Returns the name of the database engine.
-
-\membersection{wxDb::GetDatasourceName}\label{wxdbgetdatasourcename}
-
-\func{const wxString \&}{GetDatasourceName}{\void}
-
-Returns the ODBC datasource name.
-
-\membersection{wxDb::GetHDBC}\label{wxdbgethdbc}
-
-\func{HDBC}{GetHDBC}{\void}
-
-Returns the ODBC handle to the database connection.
-
-\membersection{wxDb::GetHENV}\label{wxdbgethenv}
-
-\func{HENV}{GetHENV}{\void}
-
-Returns the ODBC environment handle.
-
-\membersection{wxDb::GetHSTMT}\label{wxdbgethstmt}
-
-\func{HSTMT}{GetHSTMT}{\void}
-
-Returns the ODBC statement handle associated with this database connection.
-
-\membersection{wxDb::GetKeyFields}\label{wxdbgetkeyfields}
-
-\func{int }{GetKeyFields}{\param{const wxString \&}{tableName}, \param{wxDbColInf *}{colInf}, \param{UWORD }{numColumns}}
-
-Used to determine which columns are members of primary or non-primary indexes on the specified table.  If a column is a member of a foreign key for some other table, that information is detected also.
-
-This function is primarily for use by the \helpref{wxDb::GetColumns}{wxdbgetcolumns} function, but may be called if desired from the client application.
-
-\wxheading{Parameters}
-
-\docparam{tableName}{Name of the table for which the columns will be evaluated as to their inclusion in any indexes.}
-\docparam{colInf}{Data structure containing the column definitions (obtained with \helpref{wxDb::GetColumns}{wxdbgetcolumns}).  This function populates the PkCol, PkTableName, and FkTableName members of the colInf structure.}
-\docparam{numColumns}{Number of columns defined in the instance of colInf.}
-
-\wxheading{Return value}
-
-Currently always returns true.
-
-\wxheading{See also}
-
-\helpref{wxDbColInf}{wxdbcolinf}, \helpref{wxDb::GetColumns}{wxdbgetcolumns}
-
-\membersection{wxDb::GetNext}\label{wxdbgetnext}
-
-\func{bool}{GetNext}{\void}
-
-Called after executing a query, this function requests the next row
-in the result set after the current position of the cursor.
-
-\wxheading{See also}
-
-\helpref{wxDb::ExecSql}{wxdbexecsql}, \helpref{wxDb::GetData}{wxdbgetdata}
-
-\membersection{wxDb::GetNextError}\label{wxdbgetnexterror}
-
-\func{bool}{GetNextError}{\param{HENV}{ aHenv},
-\param{HDBC}{ aHdbc = SQL\_NULL\_HDBC}, \param{HSTMT}{ aHstmt = SQL\_NULL\_HSTMT}}
-
-\wxheading{Parameters}
-
-\docparam{aHenv}{A handle to the ODBC environment.}
-\docparam{aHdbc}{{\it OPTIONAL.}  A handle to the ODBC connection.  Pass this
-in if the ODBC function call that failed required a hdbc or hstmt argument.}
-\docparam{AHstmt}{{\it OPTIONAL.}A handle to the ODBC statement being executed
-against.  Pass this in if the ODBC function call that failed requires a
-hstmt argument.}
-
-\wxheading{Example}
-
-\begin{verbatim}
-   if (SQLExecDirect(hstmt, (UCHAR FAR *) pSqlStmt, SQL_NTS) != SQL_SUCCESS)
-   {
-      return(db.GetNextError(db.henv, db.hdbc, hstmt));
-   }
-\end{verbatim}
-
-\wxheading{See also}
-
-\helpref{wxDb::DispNextError}{wxdbdispnexterror},
-\helpref{wxDb::DispAllErrors}{wxdbdispallerrors}
-
-
-\membersection{wxDb::GetPassword}\label{wxdbgetpassword}
-
-\func{const wxString \&}{GetPassword}{\void}
-
-Returns the password used to establish this connection to the datasource.
-
-
-\membersection{wxDb::GetTableCount}\label{wxdbgettablecount}
-
-\func{int }{GetTableCount}{\void}
-
-Returns the number of wxDbTable() instances currently using this datasource
-connection.
-
-
-\membersection{wxDb::GetUsername}\label{wxdbgetusername}
-
-\func{const wxString \&}{GetUsername}{\void}
-
-Returns the user name (uid) used to establish this connection to the
-datasource.
-
-
-\membersection{wxDb::Grant}\label{wxdbgrant}
-
-\func{bool}{Grant}{\param{int }{privileges}, \param{const wxString \&}{tableName},
-\param{const wxString \&}{userList = "PUBLIC"}}
-
-Use this member function to GRANT privileges to users for accessing tables in
-the datasource.
-
-\wxheading{Parameters}
-
-\docparam{privileges}{Use this argument to select which privileges you want to
-grant.  Pass DB\_GRANT\_ALL to grant all privileges.  To grant individual
-privileges pass one or more of the following OR'd together:}
-
-\begin{verbatim}
-         DB_GRANT_SELECT  = 1
-         DB_GRANT_INSERT  = 2
-         DB_GRANT_UPDATE  = 4
-         DB_GRANT_DELETE  = 8
-         DB_GRANT_ALL     = DB_GRANT_SELECT | DB_GRANT_INSERT |
-                            DB_GRANT_UPDATE | DB_GRANT_DELETE
-\end{verbatim}
-
-\docparam{tableName}{The name of the table you wish to grant privileges on.}
-\docparam{userList}{{\it OPTIONAL.}  A comma delimited list of users to grant the privileges to.  If this argument is not passed in, the privileges will be given to the general PUBLIC.}
-
-\wxheading{Remarks}
-
-Some databases require user names to be specified in all capital letters (i.e. Oracle).  This function does not automatically capitalize the user names passed in the comma-separated list.  This is the responsibility of the calling routine.
-
-The currently logged in user must have sufficient grantor privileges for this
-function to be able to successfully grant the indicated privileges.
-
-\wxheading{Example}
-
-\begin{verbatim}
-   db.Grant(DB_GRANT_SELECT | DB_GRANT_INSERT, "PARTS", "mary, sue");
-\end{verbatim}
-
-\membersection{wxDb::IsFwdOnlyCursors}\label{wxdbisfwdonlycursors}
-
-\func{bool}{IsFwdOnlyCursors}{\void}
-
-This setting indicates whether this database connection was created
-as being capable of using only forward scrolling cursors.
-
-This function does NOT indicate if the ODBC driver or datasource supports
-backward scrolling cursors.  There is no standard way of detecting if the
-driver or datasource can support backward scrolling cursors.
-
-If a wxDb instance was created as being capable of only forward scrolling
-cursors, then even if the datasource and ODBC driver support backward
-scrolling cursors, tables using this database connection would only be able
-to use forward scrolling cursors.
-
-The default setting of whether a wxDb connection to a database allows
-forward-only or also backward scrolling cursors is defined in setup.h by the
-value of wxODBC\_FWD\_ONLY\_CURSORS.  This default setting can be overridden
-when the wxDb connection is initially created (see
-\helpref{wxDb constructor}{wxdbctor} and \helpref{wxDbGetConnection}{wxdbfunctions}).
-
-\wxheading{Return value}
-
-Returns true if this datasource connection is defined as using only forward
-scrolling cursors, or false if the connection is defined as being allowed to
-use backward scrolling cursors and their associated functions (see note above).
-
-\wxheading{Remarks}
-
-Added as of wxWidgets v2.4 release, this function is a renamed version of
-wxDb::FwdOnlyCursors() to match the normal wxWidgets naming conventions for
-class member functions.
-
-This function is not available in versions prior to v2.4.  You should
-use \helpref{wxDb::FwdOnlyCursors}{wxdbfwdonlycursors} for wxWidgets
-versions prior to 2.4.
-
-\wxheading{See also}
-
-\helpref{wxDb constructor}{wxdbctor}, \helpref{wxDbGetConnection}{wxdbfunctions}
-
-\membersection{wxDb::IsOpen}\label{wxdbisopen}
-
-\func{bool}{IsOpen}{\void}
-
-Indicates whether the database connection to the datasource is currently
-opened.
-
-\wxheading{Remarks}
-
-This function may indicate that the database connection is open, even if
-the call to \helpref{wxDb::Open}{wxdbopen} may have failed to fully
-initialize the connection correctly.  The connection to the database
-{\it is} open and can be used via the direct SQL commands, if this
-function returns true.  Other functions which depend on the
-\helpref{wxDb::Open}{wxdbopen} to have completed correctly may not function
-as expected.  The return result from \helpref{wxDb::Open}{wxdbopen} is the
-only way to know if complete initialization of this wxDb connection was
-successful or not.  See \helpref{wxDb::Open}{wxdbopen} for more details on
-partial failures to open a connection instance.
-
-\membersection{wxDb::LogError}\label{wxdblogerror}
-
-\func{void}{LogError}{\param{const wxString \&}{errMsg} \param{const wxString \&}{SQLState=""}}
-
-\docparam{errMsg}{Free-form text to display describing the error/text to be logged.}
-\docparam{SQLState}{{\it OPTIONAL.}  Native SQL state error.  Default is 0.}
-
-\wxheading{Remarks}
-
-Calling this function will enter a log message in the error list maintained
-for the database connection.  This log message is free form and can be
-anything the programmer wants to enter in the error list.
-
-If SQL logging is turned on, the call to this function will also log the
-text into the SQL log file.
-
-\wxheading{See also}
-
-\helpref{wxDb::WriteSqlLog}{wxdbwritesqllog}
-
-\membersection{wxDb::ModifyColumn}\label{wxdbmodifycolumn}
-
-\func{void}{ModifyColumn}{\param{const wxString \&}{tableName} \param{const wxString \&}{ColumnName}
-\param{int }{dataType} \param{ULONG }{columnLength=0} \param{const wxString \&}{optionalParam=""}}
-
-Used to change certain properties of a column such as the length, or whether a column
-allows NULLs or not.
-
-\docparam{tableName}{Name of the table that the column to be modified is in.}
-\docparam{columnName}{Name of the column to be modified.  NOTE: Name of column cannot
-be changed with this function.}
-\docparam{dataType}{Any one of DB\_DATA\_TYPE\_VARCHAR, DB\_DATA\_TYPE\_INTEGER,
-DB\_DATA\_TYPE\_FLOAT, DB\_DATA\_TYPE\_DATE.}
-\docparam{columnLength}{New size of the column.  Valid only for DB\_DATA\_TYPE\_VARCHAR
-dataType fields.  Default is 0.}
-\docparam{optionalParam}{Default is "".}
-
-\wxheading{Remarks}
-
-Cannot be used to modify the precision of a numeric column, therefore 'columnLength'
-is ignored unless the dataType is DB\_DATA\_TYPE\_VARCHAR.
-
-Some datasources do not allow certain properties of a column to be changed if any rows
-currently have data stored in that column.  Those datasources that do allow columns
-to be changed with data in the rows many handle truncation and/or expansion in
-different ways.  Please refer to the reference material for the datasource being
-used for behavioral descriptions.
-
-\wxheading{Example}
-
-\begin{verbatim}
-    ok = pDb->ModifyColumn("CONTACTS", "ADDRESS2",
-                            DB_, colDefs[j].SzDataObj,
-                            wxT("NOT NULL"));
-\end{verbatim}
-
-
-\membersection{wxDb::Open}\label{wxdbopen}
-
-\func{bool}{Open}{\param{const wxString \&}{Dsn}, \param{const wxString \&}{Uid},
-\param{const wxString \&}{AuthStr}, \param{bool }{failOnDataTypeUnsupported}}
-
-\func{bool}{Open}{\param{const wxString \&}{inConnectStr}, 
-\param{bool }{failOnDataTypeUnsupported}}
-
-\func{bool}{Open}{\param{wxDbConnectInf *}{dbConnectInf}, 
-\param{bool }{failOnDataTypeUnsupported}}
-
-\func{bool}{Open}{\param{wxDb *}{copyDb}}
-
-Opens a connection to the datasource, sets certain behaviors of the datasource
-to confirm to the accepted behaviors (e.g. cursor position maintained on
-commits), and queries the datasource for its representations of the basic
-datatypes to determine the form in which the data going to/from columns in
-the data tables are to be handled.
-
-The second form of this function, which accepts a "wxDb *" as a parameter,
-can be used to avoid the overhead (execution time, database load, network
-traffic) which are needed to determine the data types and representations
-of data that are necessary for cross-datasource support by these classes.
-
-Normally the first form of the wxDb::Open() function will open the connection
-and then send a series of queries to the datasource asking it for its
-representation of data types, and all the features it supports.  If one
-connection to the datasource has already been made previously, the information
-gathered when that connection was created can just be copied to any new
-connections to the same datasource by passing a pointer to the first
-connection in as a parameter to the wxDb::Open() function.  Note that this
-new connection created from the first connections information will use the
-same Dsn/Uid/AuthStr as the first connection used.
-
-\wxheading{Parameters}
-
-\docparam{Dsn}{datasource name.  The name of the ODBC datasource as
-assigned when the datasource is initially set up through the ODBC data
-source manager.}
-\docparam{Uid}{User ID.  The name (ID) of the user you wish to connect as
-to the datasource.  The user name (ID) determines what objects you
-have access to in the datasource and what datasource privileges you have.
-Privileges include being able to create new objects, update objects, delete
-objects and so on.  Users and privileges are normally administered by the
-database administrator.}
-\docparam{AuthStr}{The password associated with the Uid.}
-\docparam{failOnDataTypeUnsupporte}{As part of connecting to a database, the 
-wxDb::Open() function will query the database to find out the native types 
-that it supports.  With some databases, some data types may not be supported,
-or not sufficiently supported, for use with the wxODBC classes.  Normally
-a program should fail in this case, so as not to try to use a data type
-that is not supported.  This parameter allows the programmer to override the
-failure if they wish and continue on using the connection.}
-\docparam{dbConnectInf}{Contains a DSN, Uid, Password, or a connection string 
-to be used in opening a new connection to the database.  If a connection
-string is present, then the connection string will be used.  If there is no 
-connection string present, then the DSN, Uid, and Password are used.}
-\docparam{inConnectStr}{A valid ODBC connection string used to connect to a 
-database}
-\docparam{copyDb}{Already completely configured and opened datasource 
-connection from which all Dsn, Uid, AuthStr, connection string, and data 
-typing information is to be copied from for use by this datasource 
-connection.  If 'copyDb' used a connection string to create its connection 
-originally, then the connection being made by this call to wxDb::Open() will 
-use that same connection string.}
-
-\wxheading{Remarks}
-
-After a wxDb instance is created, it must then be opened.  When opening a
-datasource, there must be three pieces of information passed.  The data
-source name, user name (ID) and the password for the user.  No database
-activity on the datasource can be performed until the connection is opened.
-This is normally done at program startup and the datasource remains
-open for the duration of the program/module run.
-
-It is possible to have connections to multiple datasources open at the same
-time to support distributed database connections by having separate instances
-of wxDb objects that use either the same or different Dsn/Uid/AuthStr settings.
-
-If this function returns a value of false, it does not necessarily mean that
-the connection to the datasource was not opened.  It may mean that some
-portion of the initialization of the connection failed (such as a datatype not
-being able to be determined how the datasource represents it).  To determine
-if the connection to the database failed, use the \helpref{wxDb::IsOpen}{wxdbisopen}
-function after receiving a false result back from this function to determine if
-the connection was opened or not.  If this function returns false, but \helpref{wxDb::IsOpen}{wxdbisopen}
-returns true, then direct SQL commands may be passed to the database
-connection and can be successfully executed, but use of the datatypes (such as
-by a wxDbTable instance) that are normally determined during open will not be
-possible.
-
-\normalbox{The {\it Dsn}, {\it Uid}, and {\it AuthStr} string pointers that are passed in
-are copied.  NOT the strings themselves, only the pointers.  The calling routine
-must maintain the memory for these three strings for the life of the wxDb instance.}
-
-\wxheading{Example}
-
-\begin{verbatim}
-   wxDb sampleDB(DbConnectInf.GetHenv());
-   if (!sampleDB.Open("Oracle 7.1 HP/UX", "gtasker", "myPassword"))
-   {
-      if (sampleDb.IsOpen())
-      {
-        // Connection is open, but the initialization of
-        // datatypes and parameter settings failed
-      }
-      else
-      {
-        // Error opening datasource
-      }
-   }
-\end{verbatim}
-
-\membersection{wxDb::RollbackTrans}\label{wxdbrollbacktrans}
-
-\func{bool}{RollbackTrans}{\void}
-
-Function to "undo" changes made to the database.  After an insert/update/delete, the operation may be "undone" by issuing this command any time before a \helpref{wxDb::CommitTrans}{wxdbcommittrans} is called on the database connection.
-
-\wxheading{Remarks}
-
-Transactions begin implicitly as soon as you make a change to the database.  The
-transaction continues until either a commit or rollback is executed.  Calling
-wxDb::RollbackTrans() will result in ALL changes done using this database
-connection that have not already been committed to be "undone" back to the last
-commit/rollback that was successfully executed.
-
-\normalbox{Calling this member function rolls back ALL open (uncommitted)
-transactions on this ODBC connection, including all wxDbTable instances that
-use this connection.}
-
-\wxheading{See also}
-
-\helpref{wxDb::CommitTrans}{wxdbcommittrans} for a special note on cursors
-
-\membersection{wxDb::SetDebugErrorMessages}\label{wxdbsetdebugerrormessages}
-
-\func{void}{SetDebugErrorMessages}{\param{bool }{state}}
-
-\docparam{state}{Either true (debug messages are logged) or false (debug
-messages are not logged).}
-
-\wxheading{Remarks}
-
-Turns on/off debug error messages from the ODBC class library.  When
-this function is passed true, errors are reported to the user/logged automatically
-in a text or pop-up dialog when an ODBC error occurs.  When passed false,
-errors are silently handled.
-
-When compiled in release mode (FINAL=1), this setting has no affect.
-
-\wxheading{See also}
-
-\helpref{wxDb constructor}{wxdbctor}
-
-\membersection{wxDb::SetSqlLogging}\label{wxdbsetsqllogging}
-
-\func{bool}{SetSqlLogging}{\param{wxDbSqlLogState}{ state}, \param{const wxString \&}{filename = SQL\_LOG\_FILENAME}, \param{bool }{ append = false}}
-
-\wxheading{Parameters}
-
-\docparam{state}{Either sqlLogOFF or sqlLogON (see \helpref{enum wxDbSqlLogState}{wxdbcolfor}). Turns logging of SQL commands sent to the datasource OFF or ON.}
-\docparam{filename}{{\it OPTIONAL}.  Name of the file to which the log text is to be written.  Default is SQL\_LOG\_FILENAME.}
-\docparam{append}{{\it OPTIONAL}. Whether the file is appended to or overwritten.  Default is false.}
-
-\wxheading{Remarks}
-
-When called with {\it sqlLogON}, all commands sent to the datasource engine are logged to the file specified by {\it filename}.  Logging is done by embedded \helpref{wxDb::WriteSqlLog}{wxdbwritesqllog} calls in the database member functions, or may be manually logged by adding calls to \helpref{wxDb::WriteSqlLog}{wxdbwritesqllog} in your own source code.
-
-When called with {\it sqlLogOFF}, the logging file is closed, and any calls to \helpref{wxDb::WriteSqlLog}{wxdbwritesqllog} are ignored.
-
-\membersection{wxDb::SQLColumnName}\label{wxdbsqlcolumnname}
-
-\func{const wxString}{SQLColumnName}{\param{const wxChar *}{ colName}}
-
-Returns the column name in a form ready for use in SQL statements.
-In most cases, the column name is returned verbatim.  But some databases
-(e.g. MS Access, SQL Server, MSDE) allow for spaces in column names, which
-must be specially quoted.  For example, if the datasource allows spaces
-in the column name, the returned string will have the correct enclosing
-marks around the name to allow it to be properly included in a SQL statement
-for the DBMS that is currently connected to with this connection.
-
-\wxheading{Parameters}
-
-\docparam{colName}{Native name of the column in the table that is to be
-evaluated to determine if any special quoting marks needed to be added to it
-before including the column name in a SQL statement}
-
-\wxheading{See also}
-
-\helpref{wxDb::SQLTableName}{wxdbsqltablename}
-
-\membersection{wxDb::SQLTableName}\label{wxdbsqltablename}
-
-\func{const wxString}{SQLTableName}{\param{const wxChar *}{ tableName}}
-
-Returns the table name in a form ready for use in SQL statements.
-In most cases, the table name is returned verbatim.  But some databases
-(e.g. MS Access, SQL Server, MSDE) allow for spaces in table names, which
-must be specially quoted.  For example, if the datasource allows spaces
-in the table name, the returned string will have the correct enclosing
-marks around the name to allow it to be properly included in a SQL statement
-for the data source that is currently connected to with this connection.
-
-\wxheading{Parameters}
-
-\docparam{tableName}{Native name of the table that is to be evaluated to
-determine if any special quoting marks needed to be added to it
-before including the table name in a SQL statement}
-
-\wxheading{See also}
-
-\helpref{wxDb::SQLColumnName}{wxdbsqlcolumnname}
-
-\membersection{wxDb::TableExists}\label{wxdbtableexists}
-
-\func{bool}{TableExists}{\param{const wxString \&}{tableName}, \param{const wxChar *}{userID=NULL}, \param{const wxString \&}{path=""}}
-
-Checks the ODBC datasource for the existence of a table.  If a {\it userID}
-is specified, then the table must be accessible by that user (user must have
-at least minimal privileges to the table).
-
-\wxheading{Parameters}
-
-\docparam{tableName}{Name of the table to check for the existence of.}
-\docparam{userID}{Owner of the table (also referred to as schema).  Specify a userID when the datasource you are connected
-to allows multiple unique tables with the same name to be owned by different users.  {\it userID}
-is evaluated as follows:}
-
-\begin{verbatim}
-         userID == NULL  ... UserID is ignored (DEFAULT)
-         userID == ""    ... UserID set equal to 'this->uid'
-         userID != ""    ... UserID set equal to 'userID'
-\end{verbatim}
-
-\wxheading{Remarks}
-
-{\it tableName} may refer to a table, view, alias or synonym.
-
-This function does not indicate whether or not the user has privileges to query or perform other functions on the table.  Use the \helpref{wxDb::TablePrivileges}{wxdbtableprivileges} to determine if the user has sufficient privileges or not.
-
-\wxheading{See also}
-
-\helpref{wxDb::TablePrivileges}{wxdbtableprivileges}
-
-\membersection{wxDb::TablePrivileges}\label{wxdbtableprivileges}
-
-\func{bool}{TablePrivileges}{\param{const wxString \&}{tableName}, \param{const wxString \&}{priv},
-\param{const wxChar *}{userID=NULL}, \param{const wxChar *}{schema=NULL},
-\param{const wxString \&}{path=""}}
-
-Checks the ODBC datasource for the existence of a table.  If a {\it userID}
-is specified, then the table must be accessible by that user (user must have
-at least minimal privileges to the table).
-
-\wxheading{Parameters}
-
-\docparam{tableName}{Name of the table on which to check privileges.
-{\it tableName} may refer to a table, view, alias or synonym.}
-\docparam{priv}{The table privilege being evaluated. May be one of the
-following (or a datasource specific privilege):}
-
-\begin{verbatim}
-    SELECT      : The connected user is permitted to retrieve data for
-                  one or more columns of the table.
-
-    INSERT      : The connected user is permitted to insert new rows
-                  containing data for one or more columns into the
-                  table.
-
-    UPDATE      : The connected user is permitted to update the data in
-                  one or more columns of the table.
-
-    DELETE      : The connected user is permitted to delete rows of
-                  data from the table.
-
-    REFERENCES  : Is the connected user permitted to refer to one or
-                  more columns of the table within a constraint (for
-                  example, a unique, referential, or table check
-                  constraint).
-\end{verbatim}
-
-\docparam{userID}{{\it OPTIONAL.}  User for which to determine if the privilege
-specified to be checked is granted or not.  Default is "".
-{\it userID} is evaluated as follows:}
-
-\begin{verbatim}
-         userID == NULL  ... NOT ALLOWED!
-         userID == ""    ... UserID set equal to 'this->uid'
-         userID != ""    ... UserID set equal to 'userID'
-\end{verbatim}
-
-\docparam{schema}{{\it OPTIONAL.}  Owner of the table.  Specify a userID when the datasource
-you are connected to allows multiple unique tables with the same name to be
-owned by different users.  Specifying the table owner makes determination of the
-users privileges MUCH faster.  Default is NULL.  {\it userID} is
-evaluated as follows:}
-
-\begin{verbatim}
-         schema == NULL  ... Any owner (DEFAULT)
-         schema == ""    ... Owned by 'this->uid'
-         schema != ""    ... Owned by userID specified in 'schema'
-\end{verbatim}
-
-\docparam{path}{{\it OPTIONAL.}  Path to the table.  Default is "".
-Currently unused.}
-
-\wxheading{Remarks}
-
-The scope of privilege allowed to the connected user by a given table
-privilege is datasource dependent.
-
-For example, the privilege UPDATE might allow the connected user to update
-all columns in a table on one datasource, but only those columns for
-which the grantor (the user that granted the connected user) has the UPDATE
-privilege on another datasource.
-
-Looking up a user's privileges to a table can be time consuming depending on the
-datasource and ODBC driver.  This time can be minimized by passing a {\it schema}
-as a parameter.  With some datasources/drivers, the difference can be several
-seconds of time difference.
-
-
-\membersection{wxDb::TranslateSqlState}\label{wxdbtranslatesqlstate}
-
-\func{int }{TranslateSqlState}{\param{const wxString \&}{SQLState}}
-
-Converts an ODBC sqlstate to an internal error code.
-
-\wxheading{Parameters}
-
-\docparam{SQLState}{State to be converted.}
-
-\wxheading{Return value}
-
-Returns the internal class DB\_ERR code.  See \helpref{wxDb::DB\_STATUS}{wxdb} definition.
-
-\membersection{wxDb::WriteSqlLog}\label{wxdbwritesqllog}
-
-\func{bool}{WriteSqlLog}{\param{const wxString \&}{logMsg}}
-
-\wxheading{Parameters}
-
-\docparam{logMsg}{Free form string to be written to the log file.}
-
-\wxheading{Remarks}
-
-Very useful debugging tool that may be turned on/off during run time (see
-(see \helpref{wxDb::SetSqlLogging}{wxdbsetsqllogging} for details on
-turning logging on/off).  The passed in string {\it logMsg} will be written to
-a log file if SQL logging is turned on.
-
-\wxheading{Return value}
-
-If SQL logging is off when a call to WriteSqlLog() is made, or there is a
-failure to write the log message to the log file, the function returns
-false without performing the requested log, otherwise true is returned.
-
-\wxheading{See also}
-
-\helpref{wxDb::SetSqlLogging}{wxdbsetsqllogging}
-
-\section{\class{wxDbColDataPtr}}\label{wxdbcoldataptr}
-
-Pointer to dynamic column definitions for use with a wxDbTable instance.
-Currently there are no member functions for this class.
-
-See the \helpref{database classes overview}{odbcoverview} for
-an introduction to using the ODBC classes.
-
-\begin{verbatim}
-    void   *PtrDataObj;
-    int     SzDataObj;
-    SWORD   SqlCtype;
-\end{verbatim}
-
-\section{\class{wxDbColDef}}\label{wxdbcoldef}
-
-This class is used to hold information about the columns bound to an
-instance of a wxDbTable object.
-
-Each instance of this class describes one column in the wxDbTable
-object.  When calling the \helpref{wxDb constructor}{wxdbctor}, a
-parameter passed in indicates the number of columns that will be defined for
-the wxDbTable object.  The constructor uses this information to allocate
-adequate memory for all of the column descriptions in your wxDbTable object.
-Private member wxDbTable::colDefs is a pointer to this chunk of memory
-maintained by the wxDbTable class (and can be retrieved using the
-\helpref{wxDbTable::GetColDefs}{wxdbtablegetcoldefs} function).
-To access the nth column definition of your wxDbTable object, just reference
-wxDbColDefs element [n - 1].
-
-Typically, \helpref{wxDbTable::SetColDefs}{wxdbtablesetcoldefs} is used to
-populate an array of these data structures for the wxDbTable instance.
-
-Currently there are no accessor functions for this class, so all members are
-public.
-
-\begin{verbatim}
-    wxChar  ColName[DB_MAX_COLUMN_NAME_LEN+1];  // Column Name
-    int     DbDataType;    - Logical Data Type;
-                             e.g. DB_DATA_TYPE_INTEGER
-    SWORD   SqlCtype;      - C data type; e.g. SQL_C_LONG
-    void   *PtrDataObj;    - Address of the data object
-    int     SzDataObj;     - Size, in bytes, of the data object
-    bool    KeyField;      - Is column part of the PRIMARY KEY for the
-                             table? -- Date fields should NOT be
-                             KeyFields
-    bool    Updateable;    - Column is updateable?
-    bool    InsertAllowed; - Column included in INSERT statements?
-    bool    DerivedCol;    - Column is a derived value?
-    SDWORD  CbValue;       - !!!Internal use only!!!
-    bool    Null;          - NOT FULLY IMPLEMENTED
-                             Allows NULL values in Inserts and Updates
-\end{verbatim}
-
-\wxheading{See also}
-
-\helpref{database classes overview}{odbcoverview},
-\helpref{wxDbTable::GetColDefs}{wxdbtablegetcoldefs}, \helpref{wxDb constructor}{wxdbctor}
-
-\wxheading{Include files}
-
-<wx/db.h>
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxDbColDef::Initialize}\label{wxdbcoldefinitialize}
-
-Simply initializes all member variables to a cleared state.  Called by
-the constructor automatically.
-
-\section{\class{wxDbColFor}}\label{wxdbcolfor}
-
-Beginning support for handling international formatting specifically on dates
-and floats.
-
-\begin{verbatim}
-    wxString       s_Field;       // Formatted String for Output
-    wxString       s_Format[7];   // Formatted Objects - TIMESTAMP has
-                                     the biggest (7)
-    wxString       s_Amount[7];   // Formatted Objects - amount of
-                                     things that can be formatted
-    int            i_Amount[7];   // Formatted Objects -
-                                        TT MM YYYY HH MM SS m
-    int            i_Nation;      // 0 = timestamp
-                                     1 = EU
-                                     2 = UK
-                                     3 = International
-                                     4 = US
-    int            i_dbDataType;  // conversion of the 'sqlDataType'
-                                     to the generic data type used by
-                                     these classes
-    SWORD          i_sqlDataType;
-\end{verbatim}
-
-The constructor for this class initializes all the values to zero or NULL.
-
-The destructor does nothing at this time.
-
-Only one function is provided with this class currently.
-
-See the \helpref{database classes overview}{odbcoverview} for
-an introduction to using the ODBC classes.
-
-\wxheading{Include files}
-
-<wx/db.h>
-
-\wxheading{Library}
-
-\helpref{wxOdbc}{librarieslist}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxDbColFor::Format}\label{wxdbcolforformat}
-
-\func{int }{Format}{\param{int }{Nation}, \param{int }{dbDataType},
-\param{SWORD }{sqlDataType}, \param{short }{columnSize},
-\param{short }{decimalDigits}}\label{wxdbcolforformat}
-
-Work in progress, and should be inter-related with wxLocale eventually.
-
-\membersection{wxDbColFor::Initialize}\label{wxdbcolforinitialize}
-
-Simply initializes all member variables to a cleared state.  Called by
-the constructor automatically.
-
-\section{\class{wxDbColInf}}\label{wxdbcolinf}
-
-Used with the \helpref{wxDb::GetColumns}{wxdbgetcolumns} functions for obtaining all retrievable information about a column's definition.
-
-\begin{verbatim}
-    wxChar       catalog[128+1];
-    wxChar       schema[128+1];
-    wxChar       tableName[DB_MAX_TABLE_NAME_LEN+1];
-    wxChar       colName[DB_MAX_COLUMN_NAME_LEN+1];
-    SWORD        sqlDataType;
-    wxChar       typeName[128+1];
-    SWORD        columnSize;
-    SWORD        bufferLength;
-    short        decimalDigits;
-    short        numPrecRadix;
-    short        nullable;
-    wxChar       remarks[254+1];
-    int          dbDataType;  // conversion of the 'sqlDataType'
-                              // to the generic data type used by
-                              // these classes
-    int          PkCol;       // Primary key column
-                                    0 = No
-                                    1 = First Key
-                                    2 = Second Key, etc...
-    wxChar       PkTableName[DB_MAX_TABLE_NAME_LEN+1];
-                              // Tables that use this PKey as a FKey
-    int          FkCol;       // Foreign key column
-                                    0 = No
-                                    1 = First Key
-                                    2 = Second Key, etc...
-    wxChar       FkTableName[DB_MAX_TABLE_NAME_LEN+1];
-                              // Foreign key table name
-    wxDbColFor  *pColFor;     // How should this column be formatted
-\end{verbatim}
-
-The constructor for this class initializes all the values to zero, "", or NULL.
-
-The destructor for this class takes care of deleting the pColFor member if
-it is non-NULL.
-
-See the \helpref{database classes overview}{odbcoverview} for
-an introduction to using the ODBC classes.
-
-\wxheading{Include files}
-
-<wx/db.h>
-
-\wxheading{Library}
-
-\helpref{wxOdbc}{librarieslist}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxDbColInf::Initialize}\label{wxdbcolinfinitialize}
-
-Simply initializes all member variables to a cleared state.  Called by
-the constructor automatically.
-
-\section{\class{wxDbConnectInf}}\label{wxdbconnectinf}
-
-This class is used for holding the data necessary for connecting to the ODBC
-datasource.  That information includes: SQL environment handle, datasource
-name, user ID, password and default directory path (used with dBase).  Other
-optional fields held in this class are and file type, both for future
-functions planned to be added for creating/manipulating datasource definitions.
-
-\membersection{wxDbConnectInf::wxDbConnectInf}\label{wxdbconnectinfctor}
-
-\func{}{wxDbConnectInf}{\void}
-
-Default constructor.
-
-\func{}{wxDbConnectInf}{\param{HENV }{henv}, \param{const wxString \&}{dsn},
-\param{const wxString \&}{userID=""}, \param{const wxString \&}{password},
-\param{const wxString \&}{defaultDir=""}, \param{const wxString \&}{description=""},
-\param{const wxString \&}{fileType=""}}
-
-Constructor which allows initial settings of all the classes member variables.
-
-See the special note below on the henv parameter for forcing this constructor
-to create a SQL environment handle automatically, rather than needing to pass
-one in to the function.
-
-\wxheading{Parameters}
-
-\docparam{henv}{Environment handle used for this connection.  See\rtfsp
-\helpref{wxDConnectInf::AllocHenv}{wxdbconnectinfallochenv} for how to create
-an SQL environment handle.  NOTE: Passing in a NULL for this parameter will
-inform the constructor that it should create its own SQL environment handle.
-If NULL is passed for this parameter, the constructor will call\rtfsp
-\helpref{wxDConnectInf::AllocHenv}{wxdbconnectinfallochenv} internally.  A
-flag is set internally also to indicate that the HENV was created by the
-constructor so that when the default class destructor is called, the
-destructor will call \helpref{wxDConnectInf::FreeHenv}{wxdbconnectinffreehenv}\rtfsp
-to free the environment handle automatically.}
-\docparam{dsn}{Name of the datasource to be used in creating wxDb instances
-for creating connection(s) to a datasource.}
-\docparam{userID}{{\it OPTIONAL} Many datasources allow (or even require)
-use of a username to determine privileges that connecting user is allowed
-to have when accessing the datasource or the data tables.  Default is "".}
-\docparam{password}{{\it OPTIONAL} Password to be associated with the user
-ID specified in 'userID'.  Default is "".}
-\docparam{defaultDir}{{\it OPTIONAL} Used for datasources which require the
-path to where the data file is stored to be specified.  dBase is one example
-of the type of datasource which requires this information.  Default is "".}
-\docparam{description}{{\it OPTIONAL} {\bf FUTURE USE} Default is "".}
-\docparam{fileType}{{\it OPTIONAL} {\bf FUTURE USE} Default is "".}
-
-\wxheading{Remarks}
-
-It is strongly recommended that programs use the longer form of the
-constructor and allow the constructor to create the SQL environment handle
-automatically, and manage the destruction of the handle.
-
-\wxheading{Example}
-
-\begin{verbatim}
-   wxDbConnectInf *DbConnectInf;
-
-       DbConnectInf = new wxDbConnectInf(0,"MY_DSN", "MY_USER", "MY_PASSWORD");
-
-       ....the rest of the program
-
-       delete DbConnectInf;
-\end{verbatim}
-
-\wxheading{See also}
-
-\helpref{wxDConnectInf::AllocHenv}{wxdbconnectinfallochenv},
-\helpref{wxDConnectInf::FreeHenv}{wxdbconnectinffreehenv}
-
-\membersection{wxDbConnectInf::\destruct{wxDbConnectInf}}\label{wxdbconnectinfdestr}
-
-\func{}{\destruct{wxDbConnectInf}}{}
-
-Handles the default destruction of the instance of the class.  If the long form
-of the \helpref{wxDConnectInf}{wxdbconnectinf} was used, then this destructor
-also takes care of calling\rtfsp
-\helpref{wxDConnectInf::FreeHenv}{wxdbconnectinffreehenv} to free the
-SQL environment handle.
-
-\membersection{wxDbConnectInf::AllocHenv}\label{wxdbconnectinfallochenv}
-
-\func{bool }{AllocHenv}{\void}
-
-Allocates a SQL environment handle that will be used to interface with
-an ODBC datasource.
-
-\wxheading{Remarks}
-
-This function can be automatically called by the long from of the
-\helpref{wxDbConnectInf}{wxdbconnectinf} constructor.
-
-\membersection{wxDbConnectInf::FreeHenv}\label{wxdbconnectinffreehenv}
-
-\func{void}{FreeHenv}{\void}
-
-Frees the SQL environment handle being managed by the instance of this class.
-
-\wxheading{Remarks}
-
-If the SQL environment handle was created using the long form of the\rtfsp
-\helpref{wxDbConnectInf}{wxdbconnectinf} constructor, then the flag indicating
-that the HENV should be destroyed when the classes destructor is called
-is reset to be false, so that any future handles created using the\rtfsp
-\helpref{wxDbConnectInf::AllocHenv}{wxdbconnectinfallochenv} function
-must be manually released with a call to this function.
-
-\membersection{wxDbConnectInf::Initialize}\label{wxdbconnectinfinitialize}
-
-Simply initializes all member variables to a cleared state.  Called by
-the constructor automatically.
-
-\membersection{wxDbConnectInf::GetAuthStr}\label{wxdbconnectinfgetauthstr}
-
-\func{const wxChar *}{GetAuthStr}{\void}
-
-Accessor function to return the password assigned for this class
-instance that will be used with the user ID.
-
-Synonymous with \helpref{wxDbConnectInf::GetPassword}{wxdbconnectinfgetpassword}
-
-\membersection{wxDbConnectInf::GetDefaultDir}\label{wxdbconnectinfgetdefaultdir}
-
-\func{const wxChar *}{GetDefaultDir}{\void}
-
-Accessor function to return the default directory in which the datasource's data
-table is stored.  This directory is only used for file based datasources like
-dBase.  MS-Access does not require this to be set, as the path is set in the
-ODBC Administrator for MS-Access.
-
-\membersection{wxDbConnectInf::GetDescription}\label{wxdbconnectinfgetdescription}
-
-\func{const wxChar *}{GetDescription}{\void}
-
-Accessor function to return the description assigned for this class
-instance.
-
-NOTE: Description is a FUTURE USE item and is unused currently.
-
-\membersection{wxDbConnectInf::GetDsn}\label{wxdbconnectinfgetdsn}
-
-\func{const wxChar *}{GetDsn}{\void}
-
-Accessor function to return the datasource name assigned for this class
-instance.
-
-\membersection{wxDbConnectInf::GetFileType}\label{wxdbconnectinfgetfiletype}
-
-\func{const wxChar *}{GetFileType}{\void}
-
-Accessor function to return the filetype of the ODBC datasource assigned for
-this class instance.
-
-NOTE: FileType is a FUTURE USE item and is unused currently.
-
-\membersection{wxDbConnectInf::GetHenv}\label{wxdbconnectinfgethenv}
-
-\func{const HENV}{GetHenv}{\void}
-
-Accessor function to return the SQL environment handle being managed
-by this class instance.
-
-\membersection{wxDbConnectInf::GetPassword}\label{wxdbconnectinfgetpassword}
-
-\func{const wxChar *}{GetPassword}{\void}
-
-Accessor function to return the password assigned for this class
-instance that will be used with the user ID.
-
-Synonymous with \helpref{wxDbConnectInf::GetAuthStr}{wxdbconnectinfgetauthstr}
-
-\membersection{wxDbConnectInf::GetUid}\label{wxdbconnectinfgetuid}
-
-\func{const wxChar *}{GetUid}{\void}
-
-Accessor function to return the user ID assigned for this class
-instance.
-
-\membersection{wxDbConnectInf::GetUserID}\label{wxdbconnectinfgetuserid}
-
-\func{const wxChar *}{GetUserID}{\void}
-
-Accessor function to return the user ID assigned for this class
-instance.
-
-\membersection{wxDbConnectInf::SetAuthStr}\label{wxdbconnectinfsetauthstr}
-
-\func{\void}{SetAuthStr}{const wxString \&authstr}
-
-Accessor function to assign the password for this class
-instance that will be used with the user ID.
-
-Synonymous with \helpref{wxDbConnectInf::SetPassword}{wxdbconnectinfsetpassword}
-
-\membersection{wxDbConnectInf::SetDefaultDir}\label{wxdbconnectinfsetdefaultdir}
-
-\func{\void}{SetDefaultDir}{const wxString \&defDir}
-
-Accessor function to assign the default directory in which the datasource's data
-table is stored.  This directory is only used for file based datasources like
-dBase.  MS-Access does not require this to be set, as the path is set in the
-ODBC Administrator for MS-Access.
-
-\membersection{wxDbConnectInf::SetDescription}\label{wxdbconnectinfsetdescription}
-
-\func{\void}{SetDescription}{const wxString \&desc}
-
-Accessor function to assign the description assigned for this class
-instance.
-
-NOTE: Description is a FUTURE USE item and is unused currently.
-
-\membersection{wxDbConnectInf::SetDsn}\label{wxdbconnectinfsetdsn}
-
-\func{\void}{SetDsn}{const wxString \&dsn}
-
-Accessor function to assign the datasource name for this class instance.
-
-\membersection{wxDbConnectInf::SetFileType}\label{wxdbconnectinfsetfiletype}
-
-\func{\void}{SetFileType}{const wxString \&}
-
-Accessor function to return the filetype of the ODBC datasource assigned for
-this class instance.
-
-NOTE: FileType is a FUTURE USE item and is unused currently.
-
-\membersection{wxDbConnectInf::SetHenv}\label{wxdbconnectinfsethenv}
-
-\func{void}{SetHenv}{\param{const HENV }{henv}}
-
-Accessor function to set the SQL environment handle for this class instance.
-
-\membersection{wxDbConnectInf::SetPassword}\label{wxdbconnectinfsetpassword}
-
-\func{\void}{SetPassword}{const wxString \&password}
-
-Accessor function to assign the password for this class
-instance that will be used with the user ID.
-
-Synonymous with \helpref{wxDbConnectInf::SetAuthStr}{wxdbconnectinfsetauthstr}
-
-\membersection{wxDbConnectInf::SetUid}\label{wxdbconnectinfsetuid}
-
-\func{\void}{SetUid}{const wxString \&uid}
-
-Accessor function to set the user ID for this class instance.
-
-\membersection{wxDbConnectInf::SetUserID}\label{wxdbconnectinfsetuserid}
-
-\func{\void}{SetUserID}{const wxString \&userID}
-
-Accessor function to assign the user ID for this class instance.
-
-\section{\class{wxDbIdxDef}}\label{wxdbidxdef}
-
-Used in creation of non-primary indexes.  Currently there are no member
-functions for this class.
-
-\begin{verbatim}
-        wxChar  ColName[DB_MAX_COLUMN_NAME_LEN+1]
-                                  // Name of column
-        bool    Ascending         // Is index maintained in
-                                     ASCENDING sequence?
-\end{verbatim}
-
-There are no constructors/destructors as of this time, and no member functions.
-
-See the \helpref{database classes overview}{odbcoverview} for
-an introduction to using the ODBC classes.
-
-
-\wxheading{Include files}
-
-<wx/db.h>
-
-\wxheading{Library}
-
-\helpref{wxOdbc}{librarieslist}
-
-\section{\class{wxDbInf}}\label{wxdbinf}
-
-Contains information regarding the database connection (datasource name,
-number of tables, etc).  A pointer to a wxDbTableInf is included in this
-class so a program can create a wxDbTableInf array instance to maintain all
-information about all tables in the datasource to have all the datasource's
-information in one memory structure.
-
-Primarily, this class is used internally by the wxWidgets ODBC classes.
-
-\begin{verbatim}
-    wxChar        catalog[128+1];
-    wxChar        schema[128+1];  // typically means owner of table(s)
-    int           numTables;      // How many tables does this
-                                     datasource have
-    wxDbTableInf *pTableInf;      // Equals a new
-                                     wxDbTableInf[numTables];
-\end{verbatim}
-
-The constructor for this class initializes all the values to zero, "", or NULL.
-
-The destructor for this class takes care of deleting the pTableInf member if
-it is non-NULL.
-
-See the \helpref{database classes overview}{odbcoverview} for
-an introduction to using the ODBC classes.
-
-\wxheading{Include files}
-
-<wx/db.h>
-
-\wxheading{Library}
-
-\helpref{wxOdbc}{librarieslist}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxDbInf::Initialize}\label{wxdbinfinitialize}
-
-Simply initializes all member variables to a cleared state.  Called by
-the constructor automatically.
-
-\section{\class{wxDbTable}}\label{wxdbtable}
-
-A wxDbTable instance provides re-usable access to rows of data in
-a table contained within the associated ODBC datasource
-
-See the \helpref{database classes overview}{odbcoverview} for
-an introduction to using the ODBC classes.
-
-\wxheading{Include files}
-
-<wx/dbtable.h>\\
-<wx/db.h>
-\wxheading{Library}
-
-\helpref{wxOdbc}{librarieslist}
-
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-\wxheading{Helper classes and data structures}
-
-The following classes and structs are defined in dbtable.cpp/.h for use
-with the wxDbTable class.
-
-\begin{itemize}\itemsep=0pt
-\item \helpref{wxDbColDef}{wxdbcoldef}
-\item \helpref{wxDbColDataPtr}{wxdbcoldataptr}
-\item \helpref{wxDbIdxDef}{wxdbidxdef}
-\end{itemize}
-
-\wxheading{Constants}
-
-\begin{verbatim}
-    wxDB_DEFAULT_CURSOR  Primary cursor normally used for cursor based
-                         operations.
-
-    wxDB_QUERY_ONLY      Used to indicate whether a table that is opened
-                         is for query only, or if insert/update/deletes
-                         will be performed on the table.  Less overhead
-                         (cursors and memory) are allocated for query
-                         only tables, plus read access times are faster
-                         with some datasources.
-
-    wxDB_ROWID_LEN       [Oracle only] - Used when CanUpdateByRowID()
-                         is true.  Optimizes updates so they are faster
-                         by updating on the Oracle-specific ROWID column
-                         rather than some other index.
-
-
-    wxDB_DISABLE_VIEW    Use to indicate when a database view should not
-                         be if a table is normally set up to use a view.
-                         [Currently unsupported.]
-
-\end{verbatim}
-
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxDbTable::wxDbTable}\label{wxdbtableconstr}
-
-\func{}{wxDbTable}{\param{wxDb *}{pwxDb}, \param{const wxString \&}{tblName},
-  \param{const UWORD }{numColumns}, \param{const wxString \&}{qryTblName = ""},
-  \param{bool }{qryOnly = !wxDB\_QUERY\_ONLY}, \param{const wxString \&}{tblPath = ""}}
-
-Default constructor.
-
-\wxheading{Parameters}
-
-\docparam{pwxDb}{Pointer to the wxDb instance to be used by this wxDbTable
-instance.}
-\docparam{tblName}{The name of the table in the RDBMS.}
-\docparam{numColumns}{The number of columns in the table.  (Do NOT include the ROWID
-column in the count if using Oracle).}
-\docparam{qryTblName}{{\it OPTIONAL}.  The name of the table or view to base
-your queries on.  This argument allows you to specify a table/view other than
-the base table for this object to base your queries on.  This allows you to
-query on a view for example, but all of the INSERT, UPDATE and DELETES will
-still be performed on the base table for this wxDbTable object.  Basing your
-queries on a view can provide a substantial performance increase in cases where
-your queries involve many tables with multiple joins.  Default is "".}
-\docparam{qryOnly}{{\it OPTIONAL}.  Indicates whether the table will be
-accessible for query purposes only, or should the table create the necessary
-cursors to be able to insert, update, and delete data from the table.
-Default is !wxDB\_QUERY\_ONLY.}
-\docparam{tblPath}{{\it OPTIONAL}.  Some datasources (such as dBase)
-require a path to where the table is stored on the system.  Default is "".}
-
-\membersection{wxDbTable::wxDbTable}\label{wxdbtabledestr}
-
-\func{virtual}{\destruct{wxDbTable}}{}
-
-Virtual default destructor.
-
-\membersection{wxDbTable::BuildDeleteStmt}\label{wxdbtablebuilddeletestmt}
-
-\func{void}{BuildDeleteStmt}{\param{wxString \&}{pSqlStmt},
-\param{int }{typeOfDel}, \param{const wxString \&}{pWhereClause=""}}
-
-Constructs the full SQL statement that can be used to delete all rows matching
-the criteria in the pWhereClause.
-
-\wxheading{Parameters}
-
-\docparam{pSqlStmt}{Pointer to buffer for the SQL statement retrieved.  To be
-sure you have adequate space allocated for the SQL statement, allocate
-DB\_MAX\_STATEMENT\_LEN bytes.}
-\docparam{typeOfDel}{The type of delete statement being performed.  Can be one
-of three values: DB\_DEL\_KEYFIELDS, DB\_DEL\_WHERE or DB\_DEL\_MATCHING}
-\docparam{pWhereClause}{{\it OPTIONAL}.  If the typeOfDel is DB\_DEL\_WHERE,
-then you must also pass in a SQL WHERE clause in this argument.  Default
-is "".}
-
-\wxheading{Remarks}
-
-This member function constructs a SQL DELETE statement.  This can be used for
-debugging purposes if you are having problems executing your SQL statement.
-
-WHERE and FROM clauses specified using \helpref{wxDbTable::SetWhereClause}{wxdbtablesetwhereclause}
-and \helpref{wxDbTable::SetFromClause}{wxdbtablesetfromclause} are ignored by
-this function.
-
-\membersection{wxDbTable::BuildSelectStmt}\label{wxdbtablebuildselectstmt}
-
-\func{void}{BuildSelectStmt}{\param{wxString \&}{pSqlStmt},
-\param{int }{typeOfSelect}, \param{bool }{distinct}}
-
-Constructs the full SQL statement that can be used to select all rows matching
-the criteria in the pWhereClause.  This function is called internally in the
-wxDbTable class whenever the function \helpref{wxDbTable::Query}{wxdbtablequery}
-is called.
-
-NOTE: Only the columns specified in \helpref{wxDbTable::SetColDefs}{wxdbtablesetcoldefs}
-statements are included in the list of columns returned by the SQL statement
-created by a call to this function.
-
-\wxheading{Parameters}
-
-\docparam{pSqlStmt}{Pointer to storage for the SQL statement retrieved.  To be
-sure you have adequate space allocated for the SQL statement, allocate
-DB\_MAX\_STATEMENT\_LEN bytes.}
-\docparam{typeOfSelect}{The type of select statement being performed.  Can be
-one of four values: DB\_SELECT\_KEYFIELDS, DB\_SELECT\_WHERE, DB\_SELECT\_MATCHING
-or DB\_SELECT\_STATEMENT.}
-\docparam{distinct}{Whether to select distinct records only.}
-
-\wxheading{Remarks}
-
-This member function constructs a SQL SELECT statement.  This can be used for
-debugging purposes if you are having problems executing your SQL statement.
-
-WHERE and FROM clauses specified using
-\helpref{wxDbTable::SetWhereClause}{wxdbtablesetwhereclause}
-and \helpref{wxDbTable::SetFromClause}{wxdbtablesetfromclause} are ignored by
-this function.
-
-\membersection{wxDbTable::BuildUpdateStmt}\label{wxdbtablebuildupdatestmt}
-
-\func{void}{BuildUpdateStmt}{\param{wxString \&}{pSqlStmt}, \param{int }{typeOfUpd},
-\param{const wxString \&}{pWhereClause=""}}
-
-Constructs the full SQL statement that can be used to update all rows matching
-the criteria in the pWhereClause.
-
-If typeOfUpdate is DB\_UPD\_KEYFIELDS, then the current values in the bound columns
-are used to determine which row(s) in the table are to be updated. The
-exception to this is when a datasource supports ROW IDs (Oracle).  The ROW ID
-column is used for efficiency purposes when available.
-
-NOTE: Only the columns specified in \helpref{wxDbTable::SetColDefs}{wxdbtablesetcoldefs}
-statements are included in the list of columns updated by the SQL statement
-created by a call to this function.  Any column definitions that were defined
-as being non-updateable will be excluded from the SQL UPDATE statement created
-by this function.
-
-\wxheading{Parameters}
-
-\docparam{pSqlStmt}{Pointer to storage for the SQL statement retrieved.  To be
-sure you have adequate space allocated for the SQL statement, allocate
-DB\_MAX\_STATEMENT\_LEN bytes.}
-\docparam{typeOfUpdate}{The type of update statement being performed.  Can be one
-of two values: DB\_UPD\_KEYFIELDS or DB\_UPD\_WHERE.}
-\docparam{pWhereClause}{{\it OPTIONAL}.  If the typeOfUpdate is DB\_UPD\_WHERE,
-then you must also pass in a SQL WHERE clause in this argument. Default is "".}
-
-\wxheading{Remarks}
-
-This member function allows you to see what the SQL UPDATE statement looks like
-that the ODBC class library builds.  This can be used for debugging purposes if
-you are having problems executing your SQL statement.
-
-WHERE and FROM clauses specified using \helpref{wxDbTable::SetWhereClause}{wxdbtablesetwhereclause}
-and \helpref{wxDbTable::SetFromClause}{wxdbtablesetfromclause} are ignored by
-this function.
-
-
-\membersection{wxDbTable::BuildWhereClause}\label{wxdbtablebuildwhereclause}
-\func{void}{BuildWhereClause}{\param{wxString \&}{pWhereClause},
-\param{int }{typeOfWhere}, \param{const wxString \&}{qualTableName=""},
-\param{bool }{useLikeComparison=false}}
-
-Constructs the portion of a SQL statement which would follow the word 'WHERE'
-in a SQL statement to be passed to the datasource.  The returned string
-does NOT include the word 'WHERE'.
-
-\wxheading{Parameters}
-
-\docparam{pWhereClause}{Pointer to storage for the SQL statement retrieved.
-To be sure you have adequate space allocated for the SQL statement, allocate
-DB\_MAX\_STATEMENT\_LEN bytes.}
-\docparam{typeOfWhere}{The type of where clause to generate.  Can be one of
-two values:  DB\_WHERE\_KEYFIELDS or DB\_WHERE\_MATCHING.}
-\docparam{qualTableName}{{\it OPTIONAL}.  Prepended to all base table
-column names.  For use when a FROM clause has been specified with the
-\helpref{wxDbTable::SetFromClause}{wxdbtablesetfromclause},
-to clarify which table a column name reference belongs to.  Default is "".}
-\docparam{useLikeComparison}{{\it OPTIONAL}.  Should the constructed WHERE
-clause utilize the LIKE comparison operator.  If false, then the '='
-operator is used.  Default is false.}
-
-\wxheading{Remarks}
-
-This member function allows you to see what the SQL WHERE clause looks like
-that the ODBC class library builds.  This can be used for debugging purposes
-if you are having problems executing your own SQL statements.
-
-If using 'typeOfWhere' set to DB\_WHERE\_MATCHING, any bound columns currently
-containing a NULL value are not included in the WHERE clause's list of
-columns to use in the comparison.
-
-
-\membersection{wxDbTable::CanSelectForUpdate}\label{wxdbtablecanselectforupdate}
-
-\func{bool}{CanSelectForUpdate}{\void}
-
-Use this function to determine if the datasource supports SELECT ... FOR UPDATE.
-When the keywords "FOR UPDATE" are included as part of your SQL SELECT statement,
-all records {\it retrieved} (not just queried, but actually retrieved using
-\helpref{wxDbTable::GetNext}{wxdbtablegetnext}, etc) from the result set are
-locked.
-
-\wxheading{Remarks}
-
-Not all datasources support the "FOR UPDATE" clause, so you must use this
-member function to determine if the datasource currently connected to supports
-this behavior or not before trying to select using "FOR UPDATE".
-
-If the wxDbTable instance was created with the parameter wxDB\_QUERY\_ONLY, then
-this function will return false.  For all known databases which do not support
-the FOR UPDATE clause, this function will return false also.
-
-\membersection{wxDbTable::CanUpdateByROWID}\label{wxdbtablecanupdatebyrowid}
-
-\func{bool}{CanUpdateByROWID}{\void}
-
-CURRENTLY ONLY POSSIBLE IF USING ORACLE.
-
---- CURRENTLY DISABLED FOR *ALL* DATASOURCES --- NOV 1 2000 - gt
-
-Every Oracle table has a hidden column named ROWID.  This is a pointer to the
-physical location of the record in the datasource and allows for very fast
-updates and deletes.  The key is to retrieve this ROWID during your query so
-it is available during an update or delete operation.
-
-Use of the ROWID feature is always handled by the class library except in the
-case of \helpref{wxDbTable::QueryBySqlStmt}{wxdbtablequerybysqlstmt}.  Since
-you are passing in the SQL SELECT statement,
-it is up to you to include the ROWID column in your query.  If you do not,
-the application will still work, but may not be as optimized.  The ROWID is
-always the last column in the column list in your SQL SELECT statement.
-The ROWID is not a column in the normal sense and should not be considered
-part of the column definitions for the wxDbTable object.
-
-\wxheading{Remarks}
-
-The decision to include the ROWID in your SQL SELECT statement must be
-deferred until runtime since it depends on whether you are connected
-to an Oracle datasource or not.
-
-\wxheading{Example}
-
-\begin{verbatim}
-    // Incomplete code sample
-    wxDbTable parts;
-    .....
-    if (parts.CanUpdateByROWID())
-    {
-        // Note that the ROWID column must always be the last column selected
-        sqlStmt = "SELECT PART_NUM, PART_DESC, ROWID" FROM PARTS";
-    }
-    else
-        sqlStmt = "SELECT PART_NUM, PART_DESC FROM PARTS";
-\end{verbatim}
-
-
-\membersection{wxDbTable::ClearMemberVar}\label{wxdbtableclearmembervar}
-
-\func{void}{ClearMemberVar}{\param{UWORD }{colNumber}, \param{bool }{setToNull=false}}
-
-Same as \helpref{wxDbTable::ClearMemberVars}{wxdbtableclearmembervars} except
-that this function clears only the specified column of its values, and
-optionally sets the column to be a NULL column.
-
-\docparam{colNumber}{Column number that is to be cleared.  This number (between 0
-and (numColumns-1)) is the index of the column definition created using the
-\helpref{wxDbTable::SetColDefs}{wxdbtablesetcoldefs} function.}
-\docparam{setToNull}{{\it OPTIONAL}.  Indicates whether the column should be
-flagged as being a NULL value stored in the bound memory variable.  If true,
-then any value stored in the bound member variable is cleared.  Default is
-false.}
-
-\membersection{wxDbTable::ClearMemberVars}\label{wxdbtableclearmembervars}
-
-\func{void}{ClearMemberVars}{\param{bool }{setToNull=false}}
-
-Initializes all bound columns of the wxDbTable instance to zero.  In the case
-of a string, zero is copied to the first byte of the string.
-
-\docparam{setToNull}{{\it OPTIONAL}.  Indicates whether all columns should be
-flagged as having a NULL value stored in the bound memory variable.  If true,
-then any value stored in the bound member variable is cleared.  Default is
-false.}
-
-\wxheading{Remarks}
-
-This is useful before calling functions such as
-\helpref{wxDbTable::QueryMatching}{wxdbtablequerymatching} or
-\helpref{wxDbTable::DeleteMatching}{wxdbtabledeletematching} since these
-functions build their WHERE clauses from non-zero columns.  To call either
-\helpref{wxDbTable::QueryMatching}{wxdbtablequerymatching} or
-\helpref{wxDbTable::DeleteMatching}{wxdbtabledeletematching} use this sequence:
-
-\begin{verbatim}
-1)  ClearMemberVars()
-2)  Assign columns values you wish to match on
-3)  Call wxDbTable::QueryMatching() or wxDbTable::DeleteMatching()
-\end{verbatim}
-
-\membersection{wxDbTable::CloseCursor}\label{wxdbtableclosecursor}
-
-\func{bool}{CloseCursor}{\param{HSTMT}{cursor}}
-
-Closes the specified cursor associated with the wxDbTable object.
-
-\wxheading{Parameters}
-
-\docparam{cursor}{The cursor to be closed.}
-
-\wxheading{Remarks}
-
-Typically handled internally by the ODBC class library, but may be used by the
-programmer if desired.
-
-\normalbox{DO NOT CLOSE THE wxDB\_DEFAULT\_CURSOR!}
-
-\membersection{wxDbTable::Count}\label{wxdbtablecount}
-
-\func{ULONG }{Count}{\param{const wxString \&}{args="*"}}
-
-Returns the number of records which would be in the result set using the
-current query parameters specified in the WHERE and FROM clauses.
-
-\wxheading{Parameters}
-
-\docparam{args}{{\it OPTIONAL}.  This argument allows the use of the
-DISTINCT keyword against a column name to cause the returned count to
-only indicate the number of rows in the result set that have a unique
-value in the specified column.  An example is shown below.  Default is "*",
-meaning a count of the total number of rows matching is returned, regardless
-of uniqueness.}
-
-\wxheading{Remarks}
-
-This function can be called before or after an actual query to obtain the
-count of records in the result set.  Count() uses its own cursor, so result
-set cursor positioning is not affected by calls to Count().
-
-WHERE and FROM clauses specified using
-\helpref{wxDbTable::SetWhereClause}{wxdbtablesetwhereclause}
-and \helpref{wxDbTable::SetFromClause}{wxdbtablesetfromclause} ARE used by
-this function.
-
-\wxheading{Example}
-
-\begin{verbatim}
-
-    USERS TABLE
-
-    FIRST_NAME      LAST_NAME
-    -----------     ----------
-    John            Doe
-    Richard         Smith
-    Michael         Jones
-    John            Carpenter
-
-    // Incomplete code sample
-    wxDbTable users;
-    .....
-    users.SetWhereClause("");
-
-    // This Count() will return 4, as there are four users listed above
-    // that match the query parameters
-    totalNumberOfUsers = users.Count();
-
-    // This Count() will return 3, as there are only 3 unique first names
-    // in the table above - John, Richard, Michael.
-    totalNumberOfUniqueFirstNames = users.Count("DISTINCT FIRST_NAME");
-\end{verbatim}
-
-\membersection{wxDbTable::CreateIndex}\label{wxdbtablecreateindex}
-
-\func{bool}{CreateIndex}{\param{const wxString \&}{IndexName}, \param{bool }{unique},
-\param{UWORD }{numIndexColumns}, \param{wxDbIdxDef *}{pIndexDefs},
-\param{bool }{attemptDrop=true}}
-
-This member function allows you to create secondary (non-primary) indexes on
-your tables.  You first create your table, normally specifying a primary
-index, and then create any secondary indexes on the table.  Indexes in
-relational model are not required.  You do not need indexes to look up records
-in a table or to join two tables together.  In the relational model, indexes,
-if available, provide a quicker means to look up data in a table.  To enjoy
-the performance benefits of indexes, the indexes must be defined on the
-appropriate columns and your SQL code must be written in such a way as to
-take advantage of those indexes.
-
-\wxheading{Parameters}
-
-\docparam{IndexName}{Name of the Index.  Name must be unique within the table
-space of the datasource.}
-\docparam{unique}{Indicates if this index is unique.}
-\docparam{numIndexColumns}{Number of columns in the index.}
-\docparam{pIndexDefs}{A pointer to an array \helpref{wxDbIdxDef}{wxdbidxdef} structures. }
-\docparam{attemptDrop}{{\it OPTIONAL}.  Indicates if the function should try
-to execute a \helpref{wxDbTable::DropIndex}{wxdbtabledropindex} on the index
-name provided before trying to create the index name.  Default is true.}
-
-\wxheading{Remarks}
-
-The first parameter, index name, must be unique and should be given a
-meaningful name.  Common practice is to include the table name as a prefix
-in the index name (e.g. For table PARTS, you might want to call your index
-PARTS\_Index1).  This will allow you to easily view all
-of the indexes defined for a given table grouped together alphabetically.
-
-The second parameter indicates if the index is unique or not.  Uniqueness
-is enforced at the RDBMS level preventing rows which would have duplicate
-indexes from being inserted into the table when violating a unique index's
-uniqueness.
-
-In the third parameter, specify how many columns are in your index.  This
-number must match the number of columns defined in the 'pIndexDefs' parameter.
-
-The fourth parameter specifies which columns make up the index using the
-\helpref{wxDbIdxDef}{wxdbidxdef} structure.  For each column in the index, you must specify two
-things, the column name and the sort order (ascending / descending).  See
-the example below to see how to build and pass in the \helpref{wxDbIdxDef}{wxdbidxdef} structure.
-
-The fifth parameter is provided to handle the differences in datasources as
-to whether they will automatically overwrite existing indexes with the same
-name or not.  Some datasources require that the existing index must be dropped
-first, so this is the default behavior.
-
-Some datasources (MySQL, and possibly others) require columns which are to be
-part of an index to be defined as NOT NULL.  When this function is called, if
-a column is not defined to be NOT NULL, a call to this function will modify
-the column definition to change any columns included in the index to be
-NOT NULL.  In this situation, if a NULL value already exists in one of the
-columns that is being modified, creation of the index will fail.
-
-PostGres is unable to handle index definitions which specify whether the index
-is ascending or descending, and defaults to the system default when the index
-is created.
-
-It is not necessary to call \helpref{wxDb::CommitTrans}{wxdbcommittrans}
-after executing this function.
-
-\wxheading{Example}
-
-\begin{verbatim}
-    // Create a secondary index on the PARTS table
-    wxDbIdxDef  IndexDef[2];  // 2 columns make up the index
-
-    wxStrcpy(IndexDef[0].ColName, "PART_DESC");  // Column 1
-    IndexDef[0].Ascending = true;
-
-    wxStrcpy(IndexDef[1].ColName, "SERIAL_NO");  // Column 2
-    IndexDef[1].Ascending = false;
-
-    // Create a name for the index based on the table's name
-    wxString indexName;
-    indexName.Printf("%s_Index1",parts->GetTableName());
-    parts->CreateIndex(indexName, true, 2, IndexDef);
-\end{verbatim}
-
-\membersection{wxDbTable::CreateTable}\label{wxdbtablecreatetable}
-
-\func{bool}{CreateTable}{\param{bool }{attemptDrop=true}}
-
-Creates a table based on the definitions previously defined for this
-wxDbTable instance.
-
-\wxheading{Parameters}
-
-\docparam{attemptDrop}{{\it OPTIONAL}.  Indicates whether the driver should
-attempt to drop the table before trying to create it.  Some datasources will
-not allow creation of a table if the table already exists in the table space
-being used.  Default is true.}
-
-\wxheading{Remarks}
-
-This function creates the table and primary index (if any) in the table space
-associated with the connected datasource.  The owner of these objects will
-be the user id that was given when \helpref{wxDb::Open}{wxdbopen} was called.
-The objects will be created in the default schema/table space for that user.
-
-In your derived wxDbTable object constructor, the columns and primary index
-of the table are described through the \helpref{wxDbColDef}{wxdbcoldef} structure.
-\helpref{wxDbTable::CreateTable}{wxdbtablecreatetable} uses this information
-to create the table and to add the primary index.  See
-\helpref{wxDbTable}{wxdbtable} ctor and wxDbColDef description for additional
-information on describing the columns of the table.
-
-It is not necessary to call \helpref{wxDb::CommitTrans}{wxdbcommittrans}
-after executing this function.
-
-\membersection{wxDbTable::DB\_STATUS}\label{wxdbtabledbstatus}
-
-\func{bool}{DB\_STATUS}{\void}
-
-Accessor function that returns the wxDb private member variable DB\_STATUS for
-the database connection used by this instance of wxDbTable.
-
-\membersection{wxDbTable::Delete}\label{wxdbtabledelete}
-
-\func{bool}{Delete}{\void}
-
-Deletes the row from the table indicated by the current cursor.
-
-\wxheading{Remarks}
-
-Use \helpref{wxDbTable::GetFirst}{wxdbtablegetfirst},
-\helpref{wxDbTable::GetLast}{wxdbtablegetlast},
-\helpref{wxDbTable::GetNext}{wxdbtablegetnext} or
-\helpref{wxDbTable::GetPrev}{wxdbtablegetprev} to position the cursor to
-a valid record.  Once positioned on a record, call this function to delete
-the row from the table.
-
-A \helpref{wxDb::CommitTrans}{wxdbcommittrans} or
-\helpref{wxDb::RollbackTrans}{wxdbrollbacktrans} must be called after use of
-this function to commit or rollback the deletion.
-
-NOTE: Most datasources have a limited size "rollback" segment.  This means
-that it is only possible to insert/update/delete a finite number of rows
-without performing a \helpref{wxDb::CommitTrans}{wxdbcommittrans} or
-\helpref{wxDb::RollbackTrans}{wxdbrollbacktrans}.  Size of the rollback
-segment varies from database to database, and is user configurable in
-most databases.  Therefore it is usually best to try to perform a commit
-or rollback at relatively small intervals when processing a larger number
-of actions that insert/update/delete rows in a table.
-
-\membersection{wxDbTable::DeleteCursor}\label{wxdbtabledeletecursor}
-
-\func{bool}{DeleteCursor}{\param{HSTMT *}{hstmtDel}}
-
-Allows a program to delete a cursor.
-
-\wxheading{Parameters}
-
-\docparam{hstmtDel}{Handle of the cursor to delete.}
-
-\wxheading{Remarks}
-
-For default cursors associated with the instance of wxDbTable, it is not
-necessary to specifically delete the cursors.  This is automatically done
-in the wxDbTable destructor.
-
-NOTE: If the cursor could not be deleted for some reason, an error is logged
-indicating the reason.  Even if the cursor could not be deleted, the HSTMT
-that is passed in is deleted, and the pointer is set to NULL.
-
-\normalbox{DO NOT DELETE THE wxDB\_DEFAULT\_CURSOR!}
-
-\membersection{wxDbTable::DeleteMatching}\label{wxdbtabledeletematching}
-
-\func{bool}{DeleteMatching}{\void}
-
-This member function allows you to delete records from your wxDbTable object
-by specifying the data in the columns to match on.
-
-\wxheading{Remarks}
-
-To delete all users with a first name of "JOHN", do the following:
-
-\begin{enumerate}\itemsep=0pt
-\item Clear all "columns" using wxDbTable::ClearMemberVars().
-\item Set the FIRST\_NAME column equal to "JOHN".
-\item Call wxDbTable::DeleteMatching().
-\end{enumerate}
-
-The WHERE clause is built by the ODBC class library based on all non-NULL
-columns.  This allows deletion of records by matching on any column(s) in
-your wxDbTable instance, without having to write the SQL WHERE clause.
-
-A \helpref{wxDb::CommitTrans}{wxdbcommittrans} or
-\helpref{wxDb::RollbackTrans}{wxdbrollbacktrans} must be called after use of
-this function to commit or rollback the deletion.
-
-NOTE: Row(s) should be locked before deleting them to make sure they are
-not already in use.  This can be achieved by calling
-\helpref{wxDbTable::QueryMatching}{wxdbtablequerymatching},
-and then retrieving the records, locking each as you go (assuming FOR UPDATE
-is allowed on the datasource).  After the row(s) have been successfully locked,
-call this function.
-
-NOTE: Most datasources have a limited "rollback" segment.  This means
-that it is only possible to insert/update/delete a finite number of rows
-without performing a \helpref{wxDb::CommitTrans}{wxdbcommittrans} or
-\helpref{wxDb::RollbackTrans}{wxdbrollbacktrans}.  Size of the rollback
-segment varies from database to database, and is user configurable in
-most databases.  Therefore it is usually best to try to perform a commit
-or rollback at relatively small intervals when processing a larger number
-of actions that insert/update/delete rows in a table.
-
-\wxheading{Example}
-
-\begin{verbatim}
-    // Incomplete code sample to delete all users with a first name
-    // of "JOHN"
-    users.ClearMemberVars();
-    wxStrcpy(users.FirstName,"JOHN");
-    users.DeleteMatching();
-\end{verbatim}
-
-
-\membersection{wxDbTable::DeleteWhere}\label{wxdbtabledeletewhere}
-
-\func{bool}{DeleteWhere}{\param{const wxString \&}{pWhereClause}}
-
-Deletes all rows from the table which match the criteria specified in the
-WHERE clause that is passed in.
-
-\wxheading{Parameters}
-
-\docparam{pWhereClause}{SQL WHERE clause.  This WHERE clause determines which
-records will be deleted from the table interfaced through the wxDbTable
-instance.  The WHERE clause passed in must be compliant with the SQL 92
-grammar.  Do not include the keyword 'WHERE'
-}
-
-\wxheading{Remarks}
-
-This is the most powerful form of the wxDbTable delete functions.  This
-function gives access to the full power of SQL.  This function can be used
-to delete records by passing a valid SQL WHERE clause.  Sophisticated
-deletions can be performed based on multiple criteria using the full
-functionality of the SQL language.
-
-A \helpref{wxDb::CommitTrans}{wxdbcommittrans} must be called after use of
-this function to commit the deletions.
-
-Note: This function is limited to deleting records from the table associated
-with this wxDbTable object only.  Deletions on joined tables is not possible.
-
-NOTE: Most datasources have a limited size "rollback" segment.  This means
-that it is only possible to insert/update/delete a finite number of rows
-without performing a \helpref{wxDb::CommitTrans}{wxdbcommittrans} or
-\helpref{wxDb::RollbackTrans}{wxdbrollbacktrans}.  Size of the rollback
-segment varies from database to database, and is user configurable in
-most databases.  Therefore it is usually best to try to perform a commit
-or rollback at relatively small intervals when processing a larger number
-of actions that insert/update/delete rows in a table.
-
-WHERE and FROM clauses specified using \helpref{wxDbTable::SetWhereClause}{wxdbtablesetwhereclause}
-and \helpref{wxDbTable::SetFromClause}{wxdbtablesetfromclause} are ignored by
-this function.
-
-\wxheading{Example}
-
-\begin{verbatim}
-    // Delete parts 1 thru 10 from containers 'X', 'Y' and 'Z' that
-    // are magenta in color
-    parts.DeleteWhere("(PART_NUMBER BETWEEN 1 AND 10) AND \
-                        CONTAINER IN ('X', 'Y', 'Z') AND \
-                        UPPER(COLOR) = 'MAGENTA'");
-\end{verbatim}
-
-
-\membersection{wxDbTable::DropIndex}\label{wxdbtabledropindex}
-
-\func{bool}{DropIndex}{\param{const wxString \&}{IndexName}}
-
-Allows an index on the associated table to be dropped (deleted) if the user
-login has sufficient privileges to do so.
-
-\wxheading{Parameters}
-
-\docparam{IndexName}{Name of the index to be dropped.}
-
-\wxheading{Remarks}
-
-If the index specified in the 'IndexName' parameter does not exist, an error
-will be logged, and the function will return a result of false.
-
-It is not necessary to call \helpref{wxDb::CommitTrans}{wxdbcommittrans}
-after executing this function.
-
-\membersection{wxDbTable::DropTable}\label{wxdbtabledroptable}
-
-\func{bool}{DropTable}{\void}
-
-Deletes the associated table if the user has sufficient privileges to do so.
-
-\wxheading{Remarks}
-
-This function returns true if the table does not exist, but only for
-supported databases (see \helpref{wxDb::Dbms}{wxdbdbms}).  If a datasource
-is not specifically supported, and this function is called, the function
-will return false.
-
-Most datasources/ODBC drivers will delete any indexes associated with the
-table automatically, and others may not.  Check the documentation for your
-database to determine the behavior.
-
-It is not necessary to call \helpref{wxDb::CommitTrans}{wxdbcommittrans}
-after executing this function.
-
-\membersection{wxDbTable::From}\label{wxdbtablefrom}
-
-\func{const wxString \&}{From}{}
-
-\func{void}{From}{\param{const wxString \&}{From}}
-
-Accessor function for the private class member wxDbTable::from.  Can be used
-as a synonym for \helpref{wxDbTable::GetFromClause}{wxdbtablegetfromclause}
-(the first form of this function) or
-\helpref{wxDbTable::SetFromClause}{wxdbtablesetfromclause} (the second form
-of this function).
-
-\wxheading{Parameters}
-
-\docparam{From}{A comma separated list of table names that are to be inner
-joined with the base table's columns so that the joined table's columns
-may be returned in the result set or used as a portion of a comparison with
-the base table's columns.  NOTE that the base tables name must NOT be included
-in the FROM clause, as it is automatically included by the wxDbTable class
-in constructing query statements.}
-
-\wxheading{Return value}
-
-The first form of this function returns the current value of the wxDbTable
-member variable ::from.
-
-The second form of the function has no return value, as it will always set
-the from clause successfully.
-
-\wxheading{See also}
-
-\helpref{wxDbTable::GetFromClause}{wxdbtablegetfromclause},
-\helpref{wxDbTable::SetFromClause}{wxdbtablesetfromclause}
-
-
-\membersection{wxDbTable::GetColDefs}\label{wxdbtablegetcoldefs}
-
-\func{wxDbColDef *}{GetColDefs}{}
-
-Accessor function that returns a pointer to the array of column definitions
-that are bound to the columns that this wxDbTable instance is associated
-with.
-
-To determine the number of elements pointed to by the returned
-\helpref{wxDbColDef}{wxdbcoldef} pointer, use the
-\helpref{wxDbTable::GetNumberOfColumns}{wxdbtablegetnumberofcolumns} function.
-
-\wxheading{Remarks}
-
-These column definitions must not be manually redefined after they have been
-set.
-
-\membersection{wxDbTable::GetCursor}\label{wxdbtablegetcursor}
-
-\func{HSTMT}{GetCursor}{\void}
-
-Returns the HSTMT value of the current cursor for this wxDbTable object.
-
-\wxheading{Remarks}
-
-This function is typically used just before changing to use a different cursor
-so that after the program is finished using the other cursor, the current
-cursor can be set back to being the cursor in use.
-
-\wxheading{See also}
-
-\helpref{wxDbTable::SetCursor}{wxdbtablesetcursor}, \helpref{wxDbTable::GetNewCursor}{wxdbtablegetnewcursor}
-
-\membersection{wxDbTable::GetDb}\label{wxdbtablegetdb}
-
-\func{wxDb *}{GetDb}{}
-
-Accessor function for the private member variable pDb which is a pointer to
-the datasource connection that this wxDbTable instance uses.
-
-\membersection{wxDbTable::GetFirst}\label{wxdbtablegetfirst}
-
-\func{bool}{GetFirst}{\void}
-
-Retrieves the FIRST row in the record set as defined by the current query.
-Before retrieving records, a query must be performed using
-\helpref{wxDbTable::Query}{wxdbtablequery},
-\helpref{wxDbTable::QueryOnKeyFields}{wxdbtablequeryonkeyfields},
-\helpref{wxDbTable::QueryMatching}{wxdbtablequerymatching} or
-\helpref{wxDbTable::QueryBySqlStmt}{wxdbtablequerybysqlstmt}.
-
-\wxheading{Remarks}
-
-This function can only be used if the datasource connection used by the
-wxDbTable instance was created with FwdOnlyCursors set to false.  If the
-connection does not allow backward scrolling cursors, this function will
-return false, and the data contained in the bound columns will be undefined.
-
-\wxheading{See also}
-
-\helpref{wxDb::IsFwdOnlyCursors}{wxdbisfwdonlycursors}
-
-\membersection{wxDbTable::GetFromClause}\label{wxdbtablegetfromclause}
-
-\func{const wxString \&}{GetFromClause}{}
-
-Accessor function that returns the current FROM setting assigned with the
-\helpref{wxDbTable::SetFromClause}{wxdbtablesetfromclause}.
-
-\wxheading{See also}
-
-\helpref{wxDbTable::From}{wxdbtablefrom}
-
-\membersection{wxDbTable::GetLast}\label{wxdbtablegetlast}
-
-\func{bool}{GetLast}{\void}
-
-Retrieves the LAST row in the record set as defined by the current query.
-Before retrieving records, a query must be performed using
-\helpref{wxDbTable::Query}{wxdbtablequery},
-\helpref{wxDbTable::QueryOnKeyFields}{wxdbtablequeryonkeyfields},
-\helpref{wxDbTable::QueryMatching}{wxdbtablequerymatching} or
-\helpref{wxDbTable::QueryBySqlStmt}{wxdbtablequerybysqlstmt}.
-
-\wxheading{Remarks}
-
-This function can only be used if the datasource connection used by the
-wxDbTable instance was created with FwdOnlyCursors set to false.  If the
-connection does not allow backward scrolling cursors, this function will
-return false, and the data contained in the bound columns will be undefined.
-
-\wxheading{See also}
-
-\helpref{wxDb::IsFwdOnlyCursors}{wxdbisfwdonlycursors}
-
-\membersection{wxDbTable::GetNewCursor}\label{wxdbtablegetnewcursor}
-
-\func{HSTMT *}{GetNewCursor}{\param{bool }{setCursor=false},
-\param{bool }{bindColumns=true}}
-
-This function will create a new cursor that can be used to access the table
-being referenced by this wxDbTable instance, or to execute direct SQL commands
-on without affecting the cursors that are already defined and possibly
-positioned.
-
-\wxheading{Parameters}
-
-\docparam{setCursor}{{\it OPTIONAL}.  Should this new cursor be set to be the
-current cursor after successfully creating the new cursor.  Default is false.}
-\docparam{bindColumns}{{\it OPTIONAL}.  Should this new cursor be bound to all
-the memory variables that the default cursor is bound to.  Default is true.}
-
-\wxheading{Remarks}
-
-This new cursor must be closed using
-\helpref{wxDbTable::DeleteCursor}{wxdbtabledeletecursor}
-by the calling program before the wxDbTable instance is deleted, or both
-memory and resource leaks will occur.
-
-\membersection{wxDbTable::GetNext}\label{wxdbtablegetnext}
-
-\func{bool}{GetNext}{\void}
-
-Retrieves the NEXT row in the record set after the current cursor position
-as defined by the current query.  Before retrieving records, a query must be
-performed using \helpref{wxDbTable::Query}{wxdbtablequery},
-\helpref{wxDbTable::QueryOnKeyFields}{wxdbtablequeryonkeyfields},
-\helpref{wxDbTable::QueryMatching}{wxdbtablequerymatching} or
-\helpref{wxDbTable::QueryBySqlStmt}{wxdbtablequerybysqlstmt}.
-
-\wxheading{Return value}
-
-This function returns false when the current cursor has reached the end of
-the result set.  When false is returned, data in the bound columns is
-undefined.
-
-\wxheading{Remarks}
-
-This function works with both forward and backward scrolling cursors.
-
-\wxheading{See also}
-\helpref{wxDbTable::++}{wxdbtableplusplus}
-
-\membersection{wxDbTable::GetNumberOfColumns}\label{wxdbtablegetnumberofcolumns}
-
-\func{UWORD }{GetNumberOfColumns}{}
-
-Accessor function that returns the number of columns that are statically
-bound for access by the wxDbTable instance.
-
-\membersection{wxDbTable::GetOrderByClause}\label{wxdbtablegetorderbyclause}
-
-\func{const wxString \&}{GetOrderByClause}{}
-
-Accessor function that returns the current ORDER BY setting assigned with
-the \helpref{wxDbTable::SetOrderByClause}{wxdbtablesetorderbyclause}.
-
-\wxheading{See also}
-
-\helpref{wxDbTable::OrderBy}{wxdbtableorderby}
-
-\membersection{wxDbTable::GetPrev}\label{wxdbtablegetprev}
-
-\func{bool}{GetPrev}{\void}
-
-Retrieves the PREVIOUS row in the record set before the current cursor
-position as defined by the current query.  Before retrieving records, a
-query must be performed using \helpref{wxDbTable::Query}{wxdbtablequery},
-\helpref{wxDbTable::QueryOnKeyFields}{wxdbtablequeryonkeyfields},
-\helpref{wxDbTable::QueryMatching}{wxdbtablequerymatching} or
-\helpref{wxDbTable::QueryBySqlStmt}{wxdbtablequerybysqlstmt}.
-
-\wxheading{Return value}
-
-This function returns false when the current cursor has reached the beginning
-of the result set and there are now other rows prior to the cursors current
-position.  When false is returned, data in the bound columns is undefined.
-
-\wxheading{Remarks}
-
-This function can only be used if the datasource connection used by the
-wxDbTable instance was created with FwdOnlyCursors set to false.  If the
-connection does not allow backward scrolling cursors, this function will
-return false, and the data contained in the bound columns will be undefined.
-
-\wxheading{See also}
-
-\helpref{wxDb::IsFwdOnlyCursors}{wxdbisfwdonlycursors},
-\helpref{wxDbTable::--}{wxdbtableminusminus}
-
-\membersection{wxDbTable::GetQueryTableName}\label{wxdbtablegetquerytablename}
-
-\func{const wxString \&}{GetQueryTableName}{}
-
-Accessor function that returns the name of the table/view that was indicated
-as being the table/view to query against when this wxDbTable instance was
-created.
-
-\wxheading{See also}
-
-\helpref{wxDbTable constructor}{wxdbtableconstr}
-
-\membersection{wxDbTable::GetRowNum}\label{wxdbtablegetrownum}
-
-\func{UWORD}{GetRowNum}{\void}
-
-Returns the ODBC row number for performing positioned updates and deletes.
-
-\wxheading{Remarks}
-
-This function is not being used within the ODBC class library and may be a
-candidate for removal if no use is found for it.
-
-Row number with some datasources/ODBC drivers is the position in the result set,
-while in others it may be a physical position in the database.  Check your
-database documentation to find out which behavior is supported.
-
-\membersection{wxDbTable::GetTableName}\label{wxdbtablegettablename}
-
-\func{const wxString \&}{GetTableName}{}
-
-Accessor function that returns the name of the table that was indicated
-as being the table that this wxDbTable instance was associated with.
-
-\membersection{wxDbTable::GetTablePath}\label{wxdbtablegettablepath}
-
-\func{const wxString \&}{GetTablePath}{}
-
-Accessor function that returns the path to the data table that was indicated
-during creation of this wxDbTable instance.
-
-\wxheading{Remarks}
-
-Currently only applicable to dBase and MS-Access datasources.
-
-\membersection{wxDbTable::GetWhereClause}\label{wxdbtablegetwhereclause}
-
-\func{const wxString \&}{GetWhereClause}{}
-
-Accessor function that returns the current WHERE setting assigned with the
-\helpref{wxDbTable::SetWhereClause}{wxdbtablesetwhereclause}
-
-\wxheading{See also}
-
-\helpref{wxDbTable::Where}{wxdbtablewhere}
-
-\membersection{wxDbTable::Insert}\label{wxdbtableinsert}
-
-\func{int }{Insert}{\void}
-
-Inserts a new record into the table being referenced by this wxDbTable
-instance.  The values in the member variables of the wxDbTable instance are
-inserted into the columns of the new row in the database.
-
-\wxheading{Return value}
-
-\begin{verbatim}
-    DB_SUCCESS              Record inserted successfully (value = 1)
-
-    DB_FAILURE              Insert failed (value = 0)
-
-    DB_ERR_INTEGRITY_CONSTRAINT_VIOL
-                            The insert failed due to an integrity
-                            constraint violation (duplicate non-unique
-                            index entry) is attempted.
-\end{verbatim}
-
-\wxheading{Remarks}
-
-A \helpref{wxDb::CommitTrans}{wxdbcommittrans} or
-\helpref{wxDb::RollbackTrans}{wxdbrollbacktrans} must be called after use of
-this function to commit or rollback the insertion.
-
-\wxheading{Example}
-
-\begin{verbatim}
-    // Incomplete code snippet
-    wxStrcpy(parts->PartName, "10");
-    wxStrcpy(parts->PartDesc, "Part #10");
-    parts->Qty = 1000;
-    RETCODE retcode = parts->Insert();
-    switch(retcode)
-    {
-        case DB_SUCCESS:
-            parts->GetDb()->CommitTrans();
-            return(true);
-        case DB_ERR_INTEGRITY_CONSTRAINT_VIOL:
-            // Current data would result in a duplicate key
-            // on one or more indexes that do not allow duplicates
-            parts->GetDb()->RollbackTrans();
-            return(false);
-        default:
-            // Insert failed for some unexpected reason
-            parts->GetDb()->RollbackTrans();
-            return(false);
-    }
-\end{verbatim}
-
-\membersection{wxDbTable::IsColNull}\label{wxdbtableiscolnull}
-
-\func{bool }{IsColNull}{\param{UWORD }{colNumber}} const
-
-Used primarily in the ODBC class library to determine if a column value is
-set to "NULL".  Works for all data types supported by the ODBC class library.
-
-\wxheading{Parameters}
-
-\docparam{colNumber}{The column number of the bound column as defined by the
-\helpref{wxDbTable::SetColDefs}{wxdbtablesetcoldefs}
-calls which defined the columns accessible to this wxDbTable instance.}
-
-\wxheading{Remarks}
-
-NULL column support is currently not fully implemented as of wxWidgets 2.4.
-
-\membersection{wxDbTable::IsCursorClosedOnCommit}\label{wxdbtableiscursorclosedoncommit}
-
-\func{bool }{IsCursorClosedOnCommit}{\void}
-
-Accessor function to return information collected during the opening of the
-datasource connection that is used by this wxDbTable instance.  The result
-returned by this function indicates whether an implicit closing of the cursor is
-done after a commit on the database connection.
-
-\wxheading{Return value}
-
-Returns true if the cursor associated with this wxDbTable object is closed
-after a commit or rollback operation.  Returns false otherwise.
-
-\wxheading{Remarks}
-
-If more than one wxDbTable instance used the same database connection, all cursors
-which use the database connection are closed on the commit if this function
-indicates true.
-
-\membersection{wxDbTable::IsQueryOnly}\label{wxdbtableisqueryonly}
-
-\func{bool }{IsQueryOnly}{}
-
-Accessor function that returns a value indicating if this wxDbTable instance
-was created to allow only queries to be performed on the bound columns.  If
-this function returns true, then no actions may be performed using this
-wxDbTable instance that would modify (insert/delete/update) the table's data.
-
-\membersection{wxDbTable::Open}\label{wxdbtableopen}
-
-\func{bool }{Open}{\param{bool }{checkPrivileges=false}, \param{bool }{checkTableExists=true}}
-
-Every wxDbTable instance must be opened before it can be used.  This function
-checks for the existence of the requested table, binds columns, creates required
-cursors, (insert/select and update if connection is not wxDB\_QUERY\_ONLY) and
-constructs the insert statement that is to be used for inserting data as a new
-row in the datasource.
-
-NOTE: To retrieve data into an opened table, the of the table must be bound
-to the variables in the program via call(s) to 
-\helpref{wxDbTable::SetColDefs}{wxdbtablesetcoldefs} before calling Open().
-
-See the \helpref{database classes overview}{odbcoverview} for
-an introduction to using the ODBC classes.
-
-\wxheading{Parameters}
-
-\docparam{checkPrivileges}{Indicates whether the Open() function should check
-whether the current connected user has at least SELECT privileges to access the
-table to which they are trying to open.  Default is false.}
-
-\docparam{checkTableExists}{Indicates whether the Open() function should check
-whether the table exists in the database or not before opening it.  Default is true.}
-
-\wxheading{Remarks}
-
-If the function returns a false value due to the table not existing, a log
-entry is recorded for the datasource connection indicating the problem
-that was detected when checking for table existence.  Note that it is usually
-best for the calling routine to check for the existence of the table and for
-sufficient user privileges to access the table in the mode (wxDB\_QUERY\_ONLY or
-!wxDB\_QUERY\_ONLY) before trying to open the table for the best possible
-explanation as to why a table cannot be opened.
-
-Checking the user's privileges on a table can be quite time consuming during
-the open phase.  With most applications, the programmer already knows that the
-user has sufficient privileges to access the table, so this check is normally
-not required.
-
-For best performance, open the table, and then use the
-\helpref{wxDb::TablePrivileges}{wxdbtableprivileges} function
-to check the users privileges.  Passing a schema to the TablePrivileges()
-function can significantly speed up the privileges checks.
-
-\wxheading{See also}
-
-\helpref{wxDb::TableExists}{wxdbtableexists},
-\helpref{wxDb::TablePrivileges}{wxdbtableprivileges}
-\helpref{wxDbTable::SetColDefs}{wxdbtablesetcoldefs}
-
-\membersection{wxDbTable::OrderBy}\label{wxdbtableorderby}
-
-\func{const wxString \&}{OrderBy}{}
-
-\func{void}{OrderBy}{\param{const wxString \&}{OrderBy}}
-
-Accessor function for the private class member wxDbTable::orderBy.  Can be
-used as a synonym for
-\helpref{wxDbTable::GetOrderByClause}{wxdbtablegetorderbyclause}
-(the first form of this function) or
-\helpref{wxDbTable::SetOrderByClause}{wxdbtablesetorderbyclause}
-(the second form of this function).
-
-\wxheading{Parameters}
-
-\docparam{OrderBy}{A comma separated list of column names that indicate the
-alphabetized/numeric sorting sequence that the result set is to be returned
-in.  If a FROM clause has also been specified, each column name specified in
-the ORDER BY clause should be prefaced with the table name to which the column
-belongs using DOT notation (TABLE\_NAME.COLUMN\_NAME).}
-
-\wxheading{Return value}
-
-The first form of this function returns the current value of the wxDbTable
-member variable ::orderBy.
-
-The second form of the function has no return value.
-
-\wxheading{See also}
-
-\helpref{wxDbTable::GetOrderByClause}{wxdbtablegetorderbyclause},
-\helpref{wxDbTable::SetFromClause}{wxdbtablesetfromclause}
-
-\membersection{wxDbTable::Query}\label{wxdbtablequery}
-
-\func{virtual bool }{Query}{\param{bool }{forUpdate=false}, \param{bool }{distinct=false}}
-
-\wxheading{Parameters}
-
-\docparam{forUpdate}{{\it OPTIONAL}.  Gives you the option of locking records
-as they are retrieved.  If the RDBMS is not capable of the FOR UPDATE clause,
-this argument is ignored.  See
-\helpref{wxDbTable::CanSelectForUpdate}{wxdbtablecanselectforupdate} for
-additional information regarding this argument.  Default is false.}
-\docparam{distinct}{{\it OPTIONAL}.  Allows selection of only distinct values
-from the query (SELECT DISTINCT ... FROM ...).  The notion of DISTINCT
-applies to all columns returned in the result set, not individual columns.
-Default is false.}
-
-\wxheading{Remarks}
-
-This function queries records from the datasource based on the three
-wxDbTable members: "where", "orderBy", and "from".  Use
-\helpref{wxDbTable::SetWhereClause}{wxdbtablesetwhereclause} to filter on
-records to be retrieved (e.g. All users with a first name of "JOHN").
-Use \helpref{wxDbTable::SetOrderByClause}{wxdbtablesetorderbyclause} to
-change the sequence in which records are returned in the result set from
-the datasource (e.g. Ordered by LAST\_NAME).  Use
-\helpref{wxDbTable::SetFromClause}{wxdbtablesetfromclause} to allow inner
-joining of the base table (the one being associated with this instance of
-wxDbTable) with other tables which share a related field.
-
-After each of these clauses are set/cleared, call wxDbTable::Query() to
-fetch the result set from the datasource.
-
-This scheme has an advantage if you have to requery your record set
-frequently in that you only have to set your WHERE, ORDER BY, and FROM
-clauses once.  Then to refresh the record set, simply call wxDbTable::Query()
-as frequently as needed.
-
-Note that repeated calls to wxDbTable::Query() may tax the database
-server and make your application sluggish if done too frequently or
-unnecessarily.
-
-The base table name is automatically prepended to the base column names in
-the event that the FROM clause has been set (is non-null) using
-\helpref{wxDbTable::SetFromClause}{wxdbtablesetfromclause}.
-
-The cursor for the result set is positioned {\it before} the first record in
-the result set after the query.  To retrieve the first record, call either
-\helpref{wxDbTable::GetFirst}{wxdbtablegetfirst} (only if backward scrolling
-cursors are available) or
-\helpref{wxDbTable::GetNext}{wxdbtablegetnext}.  Typically, no data from the
-result set is returned to the client driver until a request such as
-\helpref{wxDbTable::GetNext}{wxdbtablegetnext} is performed, so network
-traffic and database load are not overwhelmed transmitting data until the
-data is actually requested by the client.  This behavior is solely dependent
-on the ODBC driver though, so refer to the ODBC driver's reference material
-for information on its behaviors.
-
-Values in the bound columns' memory variables are undefined after executing a
-call to this function and remain that way until a row in the result set is
-requested to be returned.
-
-The wxDbTable::Query() function is defined as "virtual" so that it may be
-overridden for application specific purposes.
-
-\normalbox{Be sure to set the wxDbTable's "where", "orderBy", and "from"
-member variables to "" if they are not to be used in the query.  Otherwise,
-the results returned may have unexpected results (or no results) due to
-improper or incorrect query parameters constructed from the uninitialized
-clauses.}
-
-\wxheading{Example}
-
-\begin{verbatim}
-    // Incomplete code sample
-    parts->SetWhereClause("DESCRIPTION = 'FOOD'");
-    parts->SetOrderByClause("EXPIRATION_DATE");
-    parts->SetFromClause("");
-    // Query the records based on the where, orderBy and from clauses
-    // specified above
-    parts->Query();
-    // Display all records queried
-    while(parts->GetNext())
-        dispPart(parts);  // user defined function
-\end{verbatim}
-
-\membersection{wxDbTable::QueryBySqlStmt}\label{wxdbtablequerybysqlstmt}
-
-\func{bool}{QueryBySqlStmt}{\param{const wxString \&}{pSqlStmt}}
-
-Performs a query against the datasource by accepting and passing verbatim the
-SQL SELECT statement passed to the function.
-
-\wxheading{Parameters}
-
-\docparam{pSqlStmt}{Pointer to the SQL SELECT statement to be executed.}
-
-\wxheading{Remarks}
-
-This is the most powerful form of the query functions available.  This member
-function allows a programmer to write their own custom SQL SELECT statement
-for requesting data from the datasource.  This gives the programmer access
-to the full power of SQL for performing operations such as scalar functions,
-aggregate functions, table joins, and sub-queries, as well as datasource
-specific function calls.
-
-The requirements of the SELECT statement are the following:
-
-\begin{enumerate}
-\item Must return the correct number of columns.  In the derived
-wxDbTable constructor, it is specified how many columns are in
-the wxDbTable object. The SELECT statement must return exactly
-that many columns.
-\item The columns must be returned in the same sequence as specified
-when defining the bounds columns \helpref{wxDbTable::SetColDefs}{wxdbtablesetcoldefs},
-and the columns returned must be of the proper data type.  For
-example, if column 3 is defined in the wxDbTable bound column
-definitions to be a float, the SELECT statement must return a
-float for column 3 (e.g. PRICE * 1.10 to increase the price by
-10%).
-\item The ROWID can be included in your SELECT statement as the {\bf last}
-column selected, if the datasource supports it.  Use
-wxDbTable::CanUpdateByROWID() to determine if the ROWID can be
-selected from the datasource.  If it can, much better
-performance can be achieved on updates and deletes by including
-the ROWID in the SELECT statement.
-\end{enumerate}
-
-Even though data can be selected from multiple tables (joins) in your select
-statement, only the base table associated with this wxDbTable object
-is automatically updated through the ODBC class library.  Data from multiple
-tables can be selected for display purposes however.  Include columns in
-the wxDbTable object and mark them as non-updateable (See
-\helpref{wxDbColDef}{wxdbcoldef} for details).  This way columns can be
-selected and displayed from other tables, but only the base table will be
-updated automatically when performed through the
-\helpref{wxDbTable::Update}{wxdbtableupdate} function after using this type of
-query.  To update tables other than the base table, use the
-\helpref{wxDbTable::Update}{wxdbtableupdate} function passing a SQL statement.
-
-After this function has been called, the cursor is positioned before the
-first record in the record set.  To retrieve the first record, call
-either \helpref{wxDbTable::GetFirst}{wxdbtablegetfirst} or
-\helpref{wxDbTable::GetNext}{wxdbtablegetnext}.
-
-\wxheading{Example}
-
-\begin{verbatim}
-    // Incomplete code samples
-        wxString sqlStmt;
-    sqlStmt = "SELECT * FROM PARTS WHERE STORAGE_DEVICE = 'SD98' \
-               AND CONTAINER = 12";
-    // Query the records using the SQL SELECT statement above
-    parts->QueryBySqlStmt(sqlStmt);
-    // Display all records queried
-    while(parts->GetNext())
-        dispPart(&parts);
-
-    Example SQL statements
-    ----------------------
-
-    // Table Join returning 3 columns
-    SELECT PART_NUM, part_desc, sd_name
-        from parts, storage_devices
-        where parts.storage_device_id =
-              storage_devices.storage_device_id
-
-    // Aggregate function returning total number of
-    // parts in container 99
-    SELECT count(*) from PARTS where container = 99
-
-    // Order by clause; ROWID, scalar function
-    SELECT PART_NUM, substring(part_desc, 1, 10), qty_on_hand + 1, ROWID
-        from parts
-        where warehouse = 10
-        order by PART_NUM desc           // descending order
-
-    // Subquery
-    SELECT * from parts
-        where container in (select container
-        from storage_devices
-            where device_id = 12)
-\end{verbatim}
-
-\membersection{wxDbTable::QueryMatching}\label{wxdbtablequerymatching}
-
-\func{virtual bool }{QueryMatching}{\param{bool }{forUpdate=false},
-\param{bool }{distinct=false}}
-
-QueryMatching allows querying of records from the table associated with
-the wxDbTable object by matching "columns" to values.
-
-For example: To query the datasource for the row with a PART\_NUMBER column
-value of "32", clear all column variables of the wxDbTable object, set the
-PartNumber variable that is bound to the PART\_NUMBER column in the wxDbTable
-object to "32", and then call wxDbTable::QueryMatching().
-
-\wxheading{Parameters}
-
-\docparam{forUpdate}{{\it OPTIONAL}.  Gives you the option of locking records
-as they are queried (SELECT ... FOR UPDATE).  If the RDBMS is not capable of
-the FOR UPDATE clause, this argument is ignored.  See
-\helpref{wxDbTable::CanSelectForUpdate}{wxdbtablecanselectforupdate} for
-additional information regarding this argument.  Default is false.}
-\docparam{distinct}{{\it OPTIONAL}.  Allows selection of only distinct values
-from the query (SELECT DISTINCT ... FROM ...).  The notion of DISTINCT
-applies to all columns returned in the result set, not individual columns.
-Default is false.}
-
-\wxheading{Remarks}
-
-The SQL WHERE clause is built by the ODBC class library based on all
-non-zero/non-NULL columns in your wxDbTable object.  Matches can be on one,
-many or all of the wxDbTable's columns.  The base table name is prepended
-to the column names in the event that the wxDbTable's FROM clause is non-null.
-
-This function cannot be used to perform queries which will check for
-columns that are 0 or NULL, as the automatically constructed WHERE clause
-only will contain comparisons on column member variables that are
-non-zero/non-NULL.
-
-The primary difference between this function and \helpref{wxDbTable::QueryOnKeyFields}{wxdbtablequeryonkeyfields}
-is that this function can query on any column(s) in the wxDbTable object.
-Note however that this may not always be very efficient.  Searching on
-non-indexed columns will always require a full table scan.
-
-The cursor is positioned before the first record in the record set after
-the query is performed.  To retrieve the first record, the program must call
-either \helpref{wxDbTable::GetFirst}{wxdbtablegetfirst} or
-\helpref{wxDbTable::GetNext}{wxdbtablegetnext}.
-
-WHERE and FROM clauses specified using \helpref{wxDbTable::SetWhereClause}{wxdbtablesetwhereclause}
-and \helpref{wxDbTable::SetFromClause}{wxdbtablesetfromclause} are ignored by
-this function.
-
-\wxheading{Example}
-
-\begin{verbatim}
-    // Incomplete code sample
-    parts->ClearMemberVars();           // Set all columns to zero
-    wxStrcpy(parts->PartNumber,"32");   // Set columns to query on
-    parts->OnHold = true;
-    parts->QueryMatching();             // Query
-    // Display all records queried
-    while(parts->GetNext())
-        dispPart(parts);  // Some application defined function
-\end{verbatim}
-
-\membersection{wxDbTable::QueryOnKeyFields}\label{wxdbtablequeryonkeyfields}
-
-\func{bool }{QueryOnKeyFields}{\param{bool }{forUpdate=false},
-\param{bool }{distinct=false}}
-
-QueryOnKeyFields provides an easy mechanism to query records in the table
-associated with the wxDbTable object by the primary index column(s).  Simply
-assign the primary index column(s) values and then call this member function
-to retrieve the record.
-
-Note that since primary indexes are always unique, this function implicitly
-always returns a single record from the database. The base table name is
-prepended to the column names in the event that the wxDbTable's FROM clause
-is non-null.
-
-\wxheading{Parameters}
-
-\docparam{forUpdate}{{\it OPTIONAL}.  Gives you the option of locking records
-as they are queried (SELECT ... FOR UPDATE).  If the RDBMS is not capable of
-the FOR UPDATE clause, this argument is ignored.  See
-\helpref{wxDbTable::CanSelectForUpdate}{wxdbtablecanselectforupdate} for
-additional information regarding this argument.  Default is false.}
-\docparam{distinct}{{\it OPTIONAL}.  Allows selection of only distinct values
-from the query (SELECT DISTINCT ... FROM ...).  The notion of DISTINCT
-applies to all columns returned in the result set, not individual columns.
-Default is false.}
-
-\wxheading{Remarks}
-
-The cursor is positioned before the first record in the record set after
-the query is performed.  To retrieve the first record, the program must call
-either \helpref{wxDbTable::GetFirst}{wxdbtablegetfirst} or
-\helpref{wxDbTable::GetNext}{wxdbtablegetnext}.
-
-WHERE and FROM clauses specified using \helpref{wxDbTable::SetWhereClause}{wxdbtablesetwhereclause}
-and \helpref{wxDbTable::SetFromClause}{wxdbtablesetfromclause} are ignored by
-this function.
-
-\wxheading{Example}
-
-\begin{verbatim}
-    // Incomplete code sample
-    wxStrcpy(parts->PartNumber, "32");
-    parts->QueryOnKeyFields();
-    // Display all records queried
-    while(parts->GetNext())
-        dispPart(parts);  // Some application defined function
-\end{verbatim}
-
-\membersection{wxDbTable::Refresh}\label{wxdbtablerefresh}
-
-\func{bool}{Refresh}{\void}
-
-This function re-reads the bound columns into the memory variables, setting
-them to the current values stored on the disk.
-
-The cursor position and result set are unaffected by calls to this function.
-(The one exception is in the case where the record to be refreshed has been
-deleted by some other user or transaction since it was originally retrieved
-as part of the result set.  For most datasources, the default behavior in
-this situation is to return the value that was originally queried for the
-result set, even though it has been deleted from the database.  But this is
-datasource dependent, and should be tested before relying on this behavior.)
-
-\wxheading{Remarks}
-
-This routine is only guaranteed to work if the table has a unique primary
-index defined for it.  Otherwise, more than one record may be fetched and
-there is no guarantee that the correct record will be refreshed.  The
-table's columns are refreshed to reflect the current data in the database.
-
-\membersection{wxDbTable::SetColDefs}\label{wxdbtablesetcoldefs}
-
-\func{bool}{SetColDefs}{\param{UWORD }{index}, \param{const wxString \&}{fieldName},
-\param{int }{dataType}, \param{void *}{pData}, \param{SWORD }{cType},
-\param{int }{size}, \param{bool }{keyField = false}, \param{bool }{updateable = true},
-\param{bool }{insertAllowed = true}, \param{bool }{derivedColumn = false}}
-
-\func{wxDbColDataPtr *}{SetColDefs}{\param{wxDbColInf *}{colInfs}, \param{UWORD }{numCols}}
-
-\wxheading{Parameters}
-
-\docparam{index}{Column number (0 to n-1, where n is the number of columns
-specified as being defined for this wxDbTable instance when the
-wxDbTable constructor was called.}
-\docparam{fieldName}{Column name from the associated data table.}
-\docparam{dataType}{Logical data type.  Valid logical types include:}
-
-\begin{verbatim}
-    DB_DATA_TYPE_VARCHAR        : strings
-    DB_DATA_TYPE_INTEGER        : non-floating point numbers
-    DB_DATA_TYPE_FLOAT          : floating point numbers
-    DB_DATA_TYPE_DATE           : dates
-    DB_DATA_TYPE_BLOB           : binary large objects
-    DB_DATA_TYPE_MEMO           : large strings
-\end{verbatim}
-
-\docparam{pData}{Pointer to the data object that will hold the column's
-value when a row of data is returned from the datasource.}
-\docparam{cType}{SQL C Type.  This defines the data type that the SQL
-representation of the data is converted to to be stored in {\it pData}.
-Other valid types are available also, but these are the most common ones:}
-
-\begin{verbatim}
-    SQL_C_CHAR      // string - deprecated: use SQL_C_WXCHAR
-    SQL_C_WXCHAR    // string - Used transparently in unicode or non-unicode builds
-    SQL_C_LONG
-    SQL_C_ULONG
-    SQL_C_SHORT
-    SQL_C_USHORT
-    SQL_C_FLOAT
-    SQL_C_DOUBLE
-    SQL_C_NUMERIC
-    SQL_C_TIMESTAMP
-
-    SQL_C_BOOLEAN   // defined in db.h
-    SQL_C_ENUM      // defined in db.h
-\end{verbatim}
-
-\docparam{size}{Maximum size in bytes of the {\it pData} object.}
-\docparam{keyField}{{\it OPTIONAL}.  Indicates if this column is part of the
-primary index.  Default is false.}
-\docparam{updateable}{{\it OPTIONAL}.  Are updates allowed on this column?
-Default is true.}
-\docparam{insertAllowed}{{\it OPTIONAL}.  Inserts allowed on this column?
-Default is true.}
-\docparam{derivedColumn}{{\it OPTIONAL}.  Is this a derived column (non-base
-table column for query only)?  Default is false.}
-
-\docparam{colInfs}{Pointer to an array of wxDbColInf instances which contains
-all the information necessary to create {\it numCols} column definitions.}
-\docparam{numCols}{Number of elements of wxDbColInf type that are pointed
-to by {\it colInfs}, which are to have column definitions created from them.}
-
-\wxheading{Remarks}
-
-If {\it pData} is to hold a string of characters, be sure to include enough
-space for the NULL terminator in pData and in the byte count of {\it size}.
-
-Using the first form of this function, if the column definition is not able 
-to be created, a value of false is returned.  If the specified index of the 
-column exceeds the number of columns defined in the wxDbTable instance, an
-assert is thrown and logged (in debug builds) and a false is returned.
-
-A failure to create the column definition in the second form results in a 
-value of NULL being returned.
-
-Both forms of this function provide a shortcut for defining the columns in
-your wxDbTable object.  Use this function in any derived wxDbTable
-constructor when describing the column/columns in the wxDbTable object.
-
-The second form of this function is primarily used when the
-\helpref{wxDb::GetColumns}{wxdbgetcolumns} function was used to query the
-datasource for the column definitions, so that the column definitions are
-already stored in wxDbColInf form.  One example use of using
-\helpref{wxDb::GetColumns}{wxdbgetcolumns} then using this function is if
-a data table existed in one datasource, and the table's column definitions
-were to be copied over to another datasource or table.
-
-\wxheading{Example}
-
-\begin{verbatim}
-    // Long way not using this function
-    wxStrcpy(colDefs[0].ColName, "PART_NUM");
-    colDefs[0].DbDataType   = DB_DATA_TYPE_VARCHAR;
-    colDefs[0].PtrDataObj   = PartNumber;
-    colDefs[0].SqlCtype     = SQL_C_WXCHAR;
-    colDefs[0].SzDataObj    = PART_NUMBER_LEN;
-    colDefs[0].KeyField     = true;
-    colDefs[0].Updateable   = false;
-    colDefs[0].InsertAllowed= true;
-    colDefs[0].DerivedCol   = false;
-
-    // Shortcut using this function
-    SetColDefs(0, "PART_NUM", DB_DATA_TYPE_VARCHAR, PartNumber,
-               SQL_C_WXCHAR, PART_NUMBER_LEN, true, false, true, false);
-\end{verbatim}
-
-\membersection{wxDbTable::SetCursor}\label{wxdbtablesetcursor}
-
-\func{void}{SetCursor}{\param{HSTMT *}{hstmtActivate = (void **) wxDB\_DEFAULT\_CURSOR}}
-
-\wxheading{Parameters}
-
-\docparam{hstmtActivate}{{\it OPTIONAL}.  Pointer to the cursor that is to
-become the current cursor.  Passing no cursor handle will reset the cursor
-back to the wxDbTable's default (original) cursor that was created when the
-wxDbTable instance was first created.  Default is wxDB\_DEFAULT\_CURSOR.}
-
-\wxheading{Remarks}
-
-When swapping between cursors, the member variables of the wxDbTable object
-are automatically refreshed with the column values of the row that the
-current cursor is positioned at (if any).  If the cursor is not positioned,
-then the data in member variables is undefined.
-
-The only way to return back to the cursor that was in use before this
-function was called is to programmatically determine the current cursor's HSTMT
-{\bf BEFORE} calling this function using \helpref{wxDbTable::GetCursor}{wxdbtablegetcursor}
-and saving a pointer to that cursor.
-
-\wxheading{See also}
-
-\helpref{wxDbTable::GetNewCursor}{wxdbtablegetnewcursor},
-\helpref{wxDbTable::GetCursor}{wxdbtablegetcursor},
-\helpref{wxDbTable::SetCursor}{wxdbtablesetcursor}
-
-\membersection{wxDbTable::SetFromClause}\label{wxdbtablesetfromclause}
-
-\func{void}{SetFromClause}{\param{const wxString \&}{From}}
-
-Accessor function for setting the private class member wxDbTable::from
-that indicates what other tables should be inner joined with the wxDbTable's
-base table for access to the columns in those other tables.
-
-Synonym to this function is one form of \helpref{wxDbTable::From}{wxdbtablefrom}
-
-\wxheading{Parameters}
-
-\docparam{From}{A comma separated list of table names that are to be inner
-joined with the base table's columns so that the joined table's columns
-may be returned in the result set or used as a portion of a comparison with
-the base table's columns.  NOTE that the base tables name must NOT be included
-in the FROM clause, as it is automatically included by the wxDbTable class
-in constructing query statements.}
-
-\wxheading{Remarks}
-
-Used by the \helpref{wxDbTable::Query}{wxdbtablequery} and
-\helpref{wxDbTable::Count}{wxdbtablecount} member functions to allow inner
-joining of records from multiple tables.
-
-Do {\bf not} include the keyword "FROM" when setting the FROM clause.
-
-If using the FROM clause when performing a query, be certain to include in
-the corresponding WHERE clause a comparison of a column from either the base
-table or one of the other joined tables to each other joined table to ensure
-the datasource knows on which column values the tables should be joined on.
-
-\wxheading{Example}
-
-\begin{verbatim}
-    ...
-    // Base table is the "LOCATION" table, and it is being
-    // inner joined to the "PART" table via the field "PART_NUMBER"
-    // that can be related between the two tables.
-    location->SetWhereClause("LOCATION.PART_NUMBER = PART.PART_NUMBER")
-    location->SetFromClause("PART");
-    ...
-\end{verbatim}
-
-\wxheading{See also}
-
-\helpref{wxDbTable::From}{wxdbtablefrom},
-\helpref{wxDbTable::GetFromClause}{wxdbtablegetfromclause}
-
-\membersection{wxDbTable::SetColNull}\label{wxdbtablesetcolnull}
-
-\func{bool}{SetColNull}{\param{UWORD }{colNumber}, \param{bool }{set=true}}
-
-\func{bool}{SetColNull}{\param{const wxString \&}{colName},
-\param{bool }{set=true}}
-
-Both forms of this function allow a member variable representing a column
-in the table associated with this wxDbTable object to be set to NULL.
-
-The first form allows the column to be set by the index into the column
-definitions used to create the wxDbTable instance, while the second allows
-the actual column name to be specified.
-
-\wxheading{Parameters}
-
-\docparam{colNumber}{Index into the column definitions used when first defining
-this wxDbTable object.}
-\docparam{colName}{Actual data table column name that is to be set to NULL.}
-\docparam{set}{Whether the column is set to NULL or not.  Passing true sets
-the column to NULL, passing false sets the column to be non-NULL.  Default is
-true.}
-
-\wxheading{Remarks}
-
-No database updates are done by this function.  It only operates on the
-member variables in memory.  Use and insert or update function to store this
-value to disk.
-
-\membersection{wxDbTable::SetOrderByClause}\label{wxdbtablesetorderbyclause}
-
-\func{void}{SetOrderByClause}{\param{const wxString \&}{OrderBy}}
-
-Accessor function for setting the private class member wxDbTable::orderBy
-which determines sequence/ordering of the rows returned in the result set
-of a query.
-
-A synonym to this function is one form of the function \helpref{wxDbTable::OrderBy}{wxdbtableorderby}
-
-\wxheading{Parameters}
-
-\docparam{OrderBy}{A comma separated list of column names that indicate the
-alphabetized sorting sequence that the result set is to be returned in.  If
-a FROM clause has also been specified, each column name specified in the
-ORDER BY clause should be prefaced with the table name to which the column
-belongs using DOT notation (TABLE\_NAME.COLUMN\_NAME).}
-
-\wxheading{Remarks}
-
-Do {\bf not} include the keywords "ORDER BY" when setting the ORDER BY clause.
-
-\wxheading{Example}
-
-\begin{verbatim}
-    ...
-    parts->SetOrderByClause("PART_DESCRIP, QUANTITY");
-    ...
-
-    ...
-    location->SetOrderByClause("LOCATION.POSITION, PART.PART_NUMBER);
-    ...
-\end{verbatim}
-
-\wxheading{See also}
-
-\helpref{wxDbTable::OrderBy}{wxdbtableorderby},
-\helpref{wxDbTable::GetOrderByClause}{wxdbtablegetorderbyclause}
-
-\membersection{wxDbTable::SetQueryTimeout}\label{wxdbtablesetquerytimeout}
-
-\func{bool}{SetQueryTimeout}{\param{UDWORD }{nSeconds}}
-
-Allows a time period to be set as the timeout period for queries.
-
-\wxheading{Parameters}
-
-\docparam{nSeconds}{The number of seconds to wait for the query to complete
-before timing out.}
-
-\wxheading{Remarks}
-
-Neither Oracle or Access support this function as of yet.  Other databases
-should be evaluated for support before depending on this function working
-correctly.
-
-\membersection{wxDbTable::SetWhereClause}\label{wxdbtablesetwhereclause}
-
-\func{void}{SetWhereClause}{\param{const wxString \&}{Where}}
-
-Accessor function for setting the private class member wxDbTable::where
-that determines which rows are returned in the result set by the datasource.
-
-A synonym to this function is one form of the function \helpref{wxDbTable::Where}{wxdbtablewhere}
-
-\wxheading{Parameters}
-
-\docparam{Where}{SQL "where" clause.  This clause can contain any SQL language
-that is legal in standard where clauses.  If a FROM clause has also been
-specified, each column name specified in the ORDER BY clause should be
-prefaced with the table name to which the column belongs using DOT notation
-(TABLE\_NAME.COLUMN\_NAME).}
-
-\wxheading{Remarks}
-
-Do {\bf not} include the keywords "WHERE" when setting the WHERE clause.
-
-\wxheading{Example}
-
-\begin{verbatim}
-    ...
-    // Simple where clause
-    parts->SetWhereClause("PART_NUMBER = '32'");
-    ...
-    // Any comparison operators
-    parts->SetWhereClause("PART_DESCRIP LIKE 'HAMMER%'");
-    ...
-    // Multiple comparisons, including a function call
-    parts->Where("QTY > 0 AND {fn UCASE(PART_DESCRIP)} LIKE '%DRILL%'");
-    ...
-    // Using parameters and multiple logical combinations
-    parts->Where("((QTY > 10) OR (ON_ORDER > 0)) AND ON_HOLD = 0");
-    ...
-    // This query uses an inner join (requiring a FROM clause also)
-    // that joins the PART and LOCATION table on he common field
-    // PART_NUMBER.
-    parts->Where("PART.ON_HOLD = 0 AND \
-                  PART.PART_NUMBER = LOCATION.PART_NUMBER AND \
-                  LOCATION.PART_NUMBER > 0");
-\end{verbatim}
-
-\wxheading{See also}
-
-\helpref{wxDbTable::Where}{wxdbtablewhere},
-\helpref{wxDbTable::GetWhereClause}{wxdbtablegetwhereclause}
-
-\membersection{wxDbTable::Update}\label{wxdbtableupdate}
-
-\func{bool }{Update}{\void}
-
-\func{bool }{Update}{\param{const wxString \&}{pSqlStmt}}
-
-The first form of this function will update the row that the current cursor
-is currently positioned at with the values in the memory variables that
-are bound to the columns.  The actual SQL statement to perform the update
-is automatically created by the ODBC class, and then executed.
-
-The second form of the function allows full access through SQL statements for
-updating records in the database.  Write any valid SQL UPDATE statement and
-submit it to this function for execution.  Sophisticated updates can be
-performed using the full power of the SQL dialect. The full SQL statement
-must have  the exact syntax required by the driver/datasource for performing
-the update.  This usually is in the form of:
-
-\begin{verbatim}
-    UPDATE tablename SET col1=X, col2=Y, ... where ...
-\end{verbatim}
-
-\wxheading{Parameters}
-
-\docparam{pSqlStmt}{Pointer to SQL UPDATE statement to be executed.}
-
-\wxheading{Remarks}
-
-A \helpref{wxDb::CommitTrans}{wxdbcommittrans} or
-\helpref{wxDb::RollbackTrans}{wxdbrollbacktrans} must be called after use of
-this function to commit or rollback the update.
-
-\wxheading{Example}
-
-\begin{verbatim}
-        wxString sqlStmt;
-    sqlStmt = "update PART set QTY = 0 where PART_NUMBER = '32'";
-\end{verbatim}
-
-\membersection{wxDbTable::UpdateWhere}\label{wxdbtableupdatewhere}
-
-\func{bool}{UpdateWhere}{\param{const wxString \&}{pWhereClause}}
-
-Performs updates to the base table of the wxDbTable object, updating only the
-rows which match the criteria specified in the {\it pWhereClause}.
-
-All columns that are bound to member variables for this wxDbTable instance
-that were defined with the "updateable" parameter set to true will be updated
-with the information currently held in the memory variable.
-
-\wxheading{Parameters}
-
-\docparam{pWhereClause}{Pointer to a valid SQL WHERE clause.  Do not
-include the keyword 'WHERE'.}
-
-\wxheading{Remarks}
-
-Care should be used when updating columns that are part of indexes with
-this function so as not to violate an unique key constraints.
-
-A \helpref{wxDb::CommitTrans}{wxdbcommittrans} or
-\helpref{wxDb::RollbackTrans}{wxdbrollbacktrans} must be called after use of
-this function to commit or rollback the update(s).
-
-\membersection{wxDbTable::Where}\label{wxdbtablewhere}
-
-\func{const wxString \&}{Where}{}
-
-\func{void}{Where}{\param{const wxString\& }{Where}}
-
-Accessor function for the private class member wxDbTable::where.  Can be used
-as a synonym for \helpref{wxDbTable::GetWhereClause}{wxdbtablegetwhereclause}
-(the first form of this function) to return the current where clause or
-\helpref{wxDbTable::SetWhereClause}{wxdbtablesetwhereclause} (the second form
-of this function) to set the where clause for this table instance.
-
-\wxheading{Parameters}
-
-\docparam{Where}{A valid SQL WHERE clause.  Do not include the keyword 'WHERE'.}
-
-\wxheading{Return value}
-
-The first form of this function returns the current value of the wxDbTable
-member variable ::where.
-
-The second form of the function has no return value, as it will always set
-the where clause successfully.
-
-\wxheading{See also}
-
-\helpref{wxDbTable::GetWhereClause}{wxdbtablegetwhereclause},
-\helpref{wxDbTable::SetWhereClause}{wxdbtablesetwhereclause}
-
-\membersection{wxDbTable::operator $++$}\label{wxdbtableplusplus}
-
-\func{bool}{operator $++$}{\void}
-
-Synonym for \helpref{wxDbTable::GetNext}{wxdbtablegetnext}
-
-\wxheading{See also}
-
-\helpref{wxDbTable::GetNext}{wxdbtablegetnext}
-
-\membersection{wxDbTable::operator $--$}\label{wxdbtableminusminus}
-
-\func{bool}{operator $--$}{\void}
-
-Synonym for \helpref{wxDbTable::GetPrev}{wxdbtablegetprev}
-
-\wxheading{See also}
-
-\helpref{wxDbTable::GetPrev}{wxdbtablegetprev}
-
-\section{\class{wxDbTableInf}}\label{wxdbtableinf}
-
-\begin{verbatim}
-    tableName[0]    = 0;
-    tableType[0]    = 0;
-    tableRemarks[0] = 0;
-    numCols         = 0;
-    pColInf         = NULL;
-\end{verbatim}
-
-Currently only used by \helpref{wxDb::GetCatalog}{wxdbgetcatalog} internally
-and \helpref{wxDbInf}{wxdbinf} class, but may be used in future releases for
-user functions.  Contains information describing the table (Name, type, etc).
-A pointer to a wxDbColInf array instance is included so a program can create a
-\helpref{wxDbColInf}{wxdbcolinf} array instance (using
-\helpref{wxDb::GetColumns}{wxdbgetcolumns})
-to maintain all information about the columns of a table in one memory
-structure.
-
-Eventually, accessor functions will be added for this class
-
-See the \helpref{database classes overview}{odbcoverview} for
-an introduction to using the ODBC classes.
-
-\wxheading{Include files}
-
-<wx/db.h>
-
-\wxheading{Library}
-
-\helpref{wxOdbc}{librarieslist}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxDbTableInf::Initialize}\label{wxdbtableinfinitialize}
-
-Simply initializes all member variables to a cleared state.  Called by
-the constructor automatically.
-
-\section{\class{wxDbGridColInfo}}\label{wxdbgridcolinfo}
-
-This class is used  to define columns to be shown, names of the columns,
-order and type of data, when using \helpref{wxdbGridTableBase}{wxdbgridtablebase} to display
-a Table or query in a \helpref{wxGrid}{wxgrid}
-
-See the database grid example in \helpref{wxDbGridTableBase}{wxdbgridtablebase} for
-an introduction to using the wxDbGrid classes.
-
-\wxheading{Include files}
-
-<wx/dbgrid.h>
-
-\wxheading{Library}
-
-\helpref{wxDbgrid}{librarieslist}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxDbGridColInfo::wxDbGridColInfo}\label{wxdbgridcolinfoctor}
-
-\func{}{wxDbGridColInfo}{\param{int }{colNumber}, \param{wxString }{type},
-  \param{wxString }{title}, \param{wxDbGridColInfo *}{next}}
-
-Default constructor. See the database grid example in \helpref{wxDbGridTableBase}{wxdbgridtablebase} to
-see two different ways for adding columns.
-
-
-\wxheading{Parameters}
-
-\docparam{colNumber}{Column number in the \helpref{wxDbTable}{wxdbtable} instance to be used (first column is 0).}
-\docparam{type}{Column type ,wxString specifying the grid name for the datatype in this column, or
- use wxGRID\_VALUE\_DBAUTO to determine the type automatically from the \helpref{wxDbColDef}{wxdbcoldef} definition}
-\docparam{title}{The column label to be used in the grid display}
-\docparam{next}{A pointer to the next wxDbGridColInfo structure if using one-step
-construction, NULL  terminates the list. Use Null also if using two step construction.}
-See the database grid example in \helpref{wxDbGridTableBase}{wxdbgridtablebase} to
-see two different ways for adding columns.
-
-\membersection{wxDbGridColInfo::\destruct{wxDbGridColInfo}}\label{wxdbgridcolinfodtor}
-
-\func{}{\destruct{wxDbGridColInfo}}{}
-
-Destructor.
-
-\membersection{wxDbGridColInfo::AddColInfo}\label{wxdbgridcolinfoaddcolinfo}
-
-\func{void}{AddColInfo}{\param{int }{colNumber},
-\param{wxString }{type}, \param{wxString }{title}}
-
-Use this member function for adding columns. See the database
-grid example in \helpref{wxDbGridTableBase}{wxdbgridtablebase} to
-see two different ways for adding columns.
-
-It is important to note that this class is merely a specifier to the \helpref{wxDbGridTableBase}{wxdbgridtablebase} 
-constructor. Changes made to this datatype after the \helpref{wxDbGridTableBase}{wxdbgridtablebase} is called will
-not have any effect.
-
-\wxheading{Parameters}
-\docparam{colNumber}{Column number in the \helpref{wxDbTable}{wxdbtable} instance to be used (first column is 0).}
-\docparam{type}{Column type ,wxString specifying the grid name for the datatype in this column, or
- use wxGRID\_VALUE\_DBAUTO to determine the type automatically from the \helpref{wxDbColDef}{wxdbcoldef} definition}
-\docparam{title}{The column label to be used in the grid display}
-
-\wxheading{Remarks}
-
-As wxDbTable must be defined with to have columns which match those  to by a wxDbGridColInfo
-info structure as this is the structure which informs the grid of how you want to display your 
-\helpref{wxDbTable}{wxdbtable}. If no datatype conversion or the referenced column number does not exist the
-the behavior is undefined.
-
-See the example at \helpref{wxDbGridColInfo::wxDbGridColInfo}{wxdbgridcolinfoctor}.
-
-\section{\class{wxDbGridTableBase}}\label{wxdbgridtablebase}
-
-You can view a database table in a grid using this class.
-
-If you are deriving your own wxDbTable subclass for your table , then you may consider
-overriding GetCol() and SetCol() to provide calculated fields. This does work but care should
-be taken when using wxDbGridTableBase in this way.
-
-The constructor and AssignDbTable() call allows you to specify the ownership if the wxDbTable
-object pointer. If you tell wxGridTableBase to take ownership , it will delete the passed wxDbTable
-when an new on is assigned or wxGridTableBase's destructor is called.
-However no checks for aliasing are done so Assign(table,..,true); Assign(table,..,true); 
-is  an error. If you need to requery an table object the preferred way is
-that the client keeps ownership.
-
-\wxheading{Derived From}
-
-\helpref{wxGridTableBase}{wxgridtablebase}
-
-\wxheading{Include files}
-
-<wx/dbgrid.h>
-
-\wxheading{Library}
-
-\helpref{wxDbgrid}{librarieslist}
-
-
-\wxheading{Example}
-
-\begin{verbatim}
-       // First step, let's define wxDbTable
-       int numColumns = 2;
-       wxDbTable *table = new wxDbTable (db, tblName, numColumns);
-       int int_var;
-       wxChar string_name[255];
-       table->SetColDef (0, "column 0", DB_DATA_TYPE_INTEGER, &int_var,
-                       SQL_C_LONG, sizeof(int_var), true);
-       table->SetColDef (1, "column 1", DB_DATA_TYPE_VARCHAR, &string_name,
-                       SQL_C_LONG, sizeof(string_name), false);
-
-    // now let's define columns in the grid
-
-    // first way to do it
-    wxDbGridColInfo *columns;
-    columns = new wxDbGridColInfo(0, wxGRID_VALUE_LONG, "first column",
-              new wxDbGridColInfo(1, wxGRID_VALUE_STRING, "second column",
-              NULL);
-
-    // second way to do it
-    wxDbGridColInfo *columns;
-    // first column is special
-    columns = new wxDbGridColInfo(0, wxGRID_VALUE_LONG, "first column", NULL);
-    // all the rest
-    columns->AddColInfo (1, wxGRID_VALUE_STRING, "second column");
-
-    // second way may be better when columns are not known at compile time
-
-    // now, let's open the table and make a Query()
-    table->Open();
-    // this step is very important
-    table->SetRowMode (wxDbTable::WX_ROW_MODE_QUERY);
-    // in the grid we will see only the rows of the result query
-    m_dbTable->Query();
-
-    wxDbGridTableBase *dbgrid = new wxDbGridTableBase(table, columns, wxUSE_QUERY, true);
-    delete columns;  // not needed anymore
-    wxGrid *grid = new wxGrid ( ... );
-    grid->SetTable(dbgrid, true);
-    grid->Fit();
-\end{verbatim}
-
-
-\wxheading{Include files}
-
-<wx/dbgrid.h>
-
-\wxheading{Helper classes and data structures}
-
-\membersection{wxDbGridTableBase::wxDbGridTableBase}\label{wxdbgridtablebaseconstr}
-
-\func{}{wxDbGridTableBase}{\param{wxDbTable *}{tab}, \param{wxDbGridColInfo *}{ColInfo},
-  \param{int }{count = wxUSE\_QUERY}, \param{bool }{takeOwnership = true}}
-
-Constructor.
-
-\wxheading{Parameters}
-
-\docparam{tab}{ The database table you want to display. Must be opened and queried before display the grid.
-See the example \helpref{above}{wxdbgridtablebase}.}
-\docparam{ColInfo}{ Columns titles, and other values. See \helpref{wxDbGridColInfo}{wxdbgridcolinfo}.}
-\docparam{count}{You can use a query result set (wxUSE\_QUERY, to use wxDbTable::Count(wxDbTable::Count() 
- or you can fix the total number of rows (count >= 0) to display, or specify it if you already know the size in avoid calling }
-
-\docparam{takeOwnership}{ If true, this class deletes wxDbTable when it stops
-referring to it, if false application must
-take care of deleting it.  }
-
-\membersection{wxDbGridTableBase::ValidateRow}\label{wxdbgridtablebasevalidate}
-
-\func{void}{ValidateRow}{\param{int }{row}}
-
-It ensures that the row data is fetched from the database, and it the wxDbTable local buffer,
-the row number passed should be the grid row.
-
-\wxheading{Parameters}
-
-\docparam{row}{ Row where validation must be done. }
-
-\membersection{wxDbGridTableBase::UpdateRow}\label{wxdbgridtablebaseupdaterow}
-
-\func{bool}{UpdateRow}{\param{int }{row}}
-
-If row has changed it forces that row to be written back to the database, however support
-for detecting whether insert/update is required is currently not in wxDbTable, so this 
-function is currently unsupported.
-
-\wxheading{Parameters}
-
-\docparam{row}{ Row you want to update. }
-
-\membersection{wxDbGridTableBase::AssignDbTable}\label{wxdbgridtablebaseassigndbtable}
-
-\func{bool}{AssignDbTable}{\param{wxDbTable *}{tab},\param{int }{count = wxUSE\_QUERY},
-\param{bool }{takeOwnership = true}}
-
-Resets the grid for using with a new database table, but using the same columns definition.
-This can be useful when re-querying the database and want to see the changes. 
-
-\wxheading{Parameters}
-
-\docparam{tab}{ Database table you want to assign to the grid. }
-\docparam{count}{ Number of rows you want to show or wxUSE\_QUERY for using a query. }
-\docparam{takeOwnership}{ If false, user must take care of deleting tab after deleting
-the wxDbGridTableBase. If true, deletion is made by destructor class. }
-
index 4da3b2a772fb7b219fae8047ad384ba76d2d0aee..f3a3f90385393979f60ad025067887f667276722 100644 (file)
@@ -117,10 +117,6 @@ contained in this library, as well as
 
 Requires wxCore and wxBase.
 
-{\large {\bf wxODBC}}
-
-\helpref{Database classes}{odbcoverview}. Requires wxBase.
-
 {\large {\bf wxQA}}
 
 This is the library containing extra classes for quality assurance. Currently
@@ -129,13 +125,6 @@ but more will be added to it in the future.
 
 Requires wxXML, wxCore, wxBase.
 
-{\large {\bf wxDbGrid}}
-
-\helpref{wxDbGridTableBase}{wxdbgridtablebase} class which combines 
- \helpref{wxGrid}{wxgrid} and \helpref{wxDbTable}{wxdbtable}. 
-
-Requires wxODBC, wxAdvanced, wxCore, wxBase.
-
 {\large {\bf wxXRC}}
 
 This library contains \helpref{wxXmlResource}{wxxmlresource} class that
diff --git a/docs/latex/wx/table.tex b/docs/latex/wx/table.tex
deleted file mode 100644 (file)
index 4ee1d30..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-\section{\class{wxDbTable}}\label{wxDbTable}
-
-A wxDbTable instance provides re-usable access to rows of data in
-a table contained within the associated ODBC data source
-
-\wxheading{Include files}
-
-<wx/version.h>
-<wx/dbtable.h>
-<wx/db.h>
-
-\wxheading{Data structures}
-
-\wxheading{Remarks}
-
-\wxheading{See also}
-
-\helpref{wxDbTable}{wxDbTable}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-\membersection{wxDbTable::wxDbTable}\label{wxDbTableconstr}
-
-\func{}{wxDbTable}{\void}
-
-Default constructor.
-
-
-NOTE THAT THIS SECTION IS NOT COMPLETED YET
diff --git a/docs/latex/wx/tdb.tex b/docs/latex/wx/tdb.tex
deleted file mode 100644 (file)
index 71a470d..0000000
+++ /dev/null
@@ -1,1229 +0,0 @@
-\section{Database classes overview}\label{odbcoverview}
-
-Following is a detailed overview of how to use the wxWidgets ODBC classes - \helpref{wxDb}{wxdb} 
-and \helpref{wxDbTable}{wxdbtable} and their associated functions. These are 
-the ODBC classes donated by Remstar International, and are collectively 
-referred to herein as the wxODBC classes.
-
-\subsection{wxDb/wxDbTable wxODBC Overview}\label{wxodbcoverview}
-
-Classes: \helpref{wxDb}{wxdb}, \helpref{wxDbTable}{wxdbtable}
-
-The wxODBC classes were designed for database independence. Although SQL and 
-ODBC both have standards which define the minimum requirements they must 
-support to be in compliance with specifications, different database vendors 
-may implement things slightly differently. One example of this is that Oracle 
-requires all user names for the datasources to be supplied in uppercase 
-characters. In situations like this, the wxODBC classes have been written 
-to make this transparent to the programmer when using functions that require 
-database-specific syntax.
-
-Currently several major databases, along with other widely used databases, 
-have been tested and supported through the wxODBC classes. The list of 
-supported databases is certain to grow as more users start implementing 
-software with these classes, but at the time of the writing of this document, 
-users have successfully used the classes with the following datasources:
-
-\begin{itemize}\itemsep=0pt
-\item DB2
-\item DBase (IV, V)**
-\item Firebird
-\item INFORMIX
-\item Interbase
-\item MS SQL Server (v7 - minimal testing)
-\item MS Access (97, 2000, 2002, and 2003)
-\item MySQL (2.x and 3.5 - use the 2.5x drivers though)
-\item Oracle (v7, v8, v8i)
-\item Pervasive SQL
-\item PostgreSQL
-\item Sybase (ASA and ASE)
-\item XBase Sequiter
-\item VIRTUOSO
-\end{itemize}
-
-An up-to-date list can be obtained by looking in the comments of the function 
-\helpref{wxDb::Dbms}{wxdbdbms} in db.cpp, or in the enumerated type 
-\helpref{wxDBMS}{wxdbenumeratedtypes} in db.h.
-
-**dBase is not truly an ODBC datasource, but there are drivers which can 
-emulate much of the functionality of an ODBC connection to a dBase table. 
-See the \helpref{wxODBC Known Issues}{wxodbcknownissues} section of this 
-overview for details.
-
-
-\subsection{wxODBC Where To Start}\label{wxodbcwheretostart}
-
-First, if you are not familiar with SQL and ODBC, go to your local bookstore 
-and pick up a good book on each. This documentation is not meant to teach 
-you many details about SQL or ODBC, though you may learn some just from 
-immersion in the subject.
-
-If you have worked with non-SQL/ODBC datasources before, there are some 
-things you will need to un-learn. First some terminology as these phrases will 
-be used heavily in this section of the manual.
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{Datasource}{(usually a database) that contains the data that will be 
-accessed by the wxODBC classes.}
-\twocolitem{Data table}{The section of the datasource that contains the rows and 
-columns of data.}
-\twocolitem{ODBC driver}{The middle-ware software that interprets the ODBC 
-commands sent by your application and converts them to the SQL format expected 
-by the target datasource.}
-\twocolitem{Datasource connection}{An open pipe between your application and 
-the ODBC driver which in turn has a connection to the target datasource. 
-Datasource connections can have a virtually unlimited number of wxDbTable 
-instances using the same connect (dependent on the ODBC driver). A separate 
-connection is not needed for each table (the exception is for isolating 
-commits/rollbacks on different tables from affecting more than the desired 
-table. See the class documentation on 
-\helpref{wxDb::CommitTrans}{wxdbcommittrans} and 
-\helpref{wxDb::RollbackTrans}{wxdbrollbacktrans}.)}
-\twocolitem{Rows}{Similar to records in old relational databases, a row is a 
-collection of one instance of each column of the data table that are all 
-associated with each other.}
-\twocolitem{Columns}{Individual fields associated with each row of a data 
-table.}
-\twocolitem{Query}{Request from the client to the datasource asking for 
-the data that matches the requirements specified in the users request. When 
-a query is performed, the datasource performs the lookup of the rows with 
-satisfy the query, and creates a result set.}
-\twocolitem{Result set}{The data which matches the requirements specified 
-in a query sent to the datasource. Dependent on drivers, a result set 
-typically remains at the datasource (no data is transmitted to the ODBC driver) 
-until the client actually instructs the ODBC driver to retrieve it.}
-\twocolitem{Cursor}{A logical pointer into the result set that a query 
-generates, indicating the next record that will be returned to the client 
-when a request for the next record is made.}
-\twocolitem{Scrolling cursors}{Scrolling refers to the movement of cursors 
-through the result set. Cursors can always scroll forward sequentially in 
-the result set (FORWARD ONLY scrolling cursors). With Forward only scrolling 
-cursors, once a row in the result set has been returned to the ODBC driver 
-and on to the client, there is no way to have the cursor move backward in 
-the result set to look at the row that is previous to the current row in 
-the result set. If BACKWARD scrolling cursors are supported by both the 
-ODBC driver and the datasource that are being used, then backward 
-scrolling cursor functions may be used (
-\helpref{wxDbTable::GetPrev}{wxdbtablegetprev}, 
-\helpref{wxDbTable::GetFirst}{wxdbtablegetfirst}, and 
-\helpref{wxDbTable::GetLast}{wxdbtablegetlast}). If the datasource or the 
-ODBC driver only support forward scrolling cursors, your program and logic 
-must take this in to account.}
-\twocolitem{Commit/Rollback}{Commit will physically save 
-insertions/deletions/updates, while rollback basically does an undo of 
-everything done against the datasource connection that has not been 
-previously committed. Note that Commit and Rollbacks are done on a 
-connection, not on individual tables. All tables which use a shared 
-connection to the datasource are all committed/rolled back at the same 
-time when a call to 
-\helpref{wxDb::CommitTrans}{wxdbcommittrans} or 
-\helpref{wxDb::RollbackTrans}{wxdbrollbacktrans} is made.}
-\twocolitem{Index}{Indexes are datasource-maintained lookup structures 
-that allow the datasource to quickly locate data rows based on the values 
-of certain columns. Without indexes, the datasource would need to do a 
-sequential search of a table every time a query request is made. Proper 
-unique key index construction can make datasource queries nearly instantaneous.}
-\end{twocollist}
-
-Before you are able to read data from a data table in a datasource, you must 
-have a connection to the datasource. Each datasource connection may be used 
-to open multiple tables all on the same connection (number of tables open are 
-dependent on the driver, datasource configuration and the amount of memory on 
-the client workstation). Multiple connections can be opened to the same 
-datasource by the same client (number of concurrent connections is dependent 
-on the driver and datasource configuration).
-
-When a query is performed, the client passes the query to the ODBC driver, 
-and the driver then translates it and passes it along to the datasource. The 
-database engine (in most cases - exceptions are text and dBase files) running 
-on the machine hosting the database does all the work of performing the search 
-for the requested data. The client simply waits for a status to come back 
-through the ODBC driver from the datasource. 
-
-Depending on the ODBC driver, the result set either remains "queued" on the 
-database server side, or is transferred to the machine that the driver is 
-queued on. The client does not receive this data. The client must request 
-some or all of the result set to be returned before any data rows are 
-returned to the client application.
-
-Result sets do not need to include all columns of every row matching the 
-query. In fact, result sets can actually be joinings of columns from two 
-or more data tables, may have derived column values, or calculated values 
-returned.
-
-For each result set, a cursor is maintained (typically by the database) 
-which keeps track of where in the result set the user currently is. 
-Depending on the database, ODBC driver, and how you configured the 
-wxWidgets ODBC settings in setup.h (see \helpref{wxODBC - Compiling}{wxodbccompiling}), cursors can be 
-either forward or backward scrolling. At a minimum, cursors must scroll 
-forward. For example, if a query resulted in a result set with 100 rows, 
-as the data is read by the client application, it will read row 1, then 2, 
-then 3, etc. With forward only cursors, once the cursor has moved to 
-the next row, the previous row cannot be accessed again without re-querying 
-the datasource for the result set over again. Backward scrolling cursors 
-allow you to request the previous row from the result set, actually 
-scrolling the cursor backward.
-
-Backward scrolling cursors are not supported on all database/driver 
-combinations. For this reason, forward-only cursors are the default in 
-the wxODBC classes. If your datasource does support backward scrolling 
-cursors and you wish to use them, make the appropriate changes in setup.h 
-to enable them (see \helpref{wxODBC - Compiling}{wxodbccompiling}). For greatest portability between 
-datasources, writing your program in such a way that it only requires 
-forward scrolling cursors is your best bet. On the other hand, if you are 
-focusing on using only datasources that support backward scrolling cursors, 
-potentially large performance benefits can be gained from using them.
-
-There is a limit to the number of cursors that can be open on each connection 
-to the datasource, and usually a maximum number of cursors for the datasource 
-itself. This is all dependent on the database. Each connection that is 
-opened (each instance of a wxDb) opens a minimum of 5 cursors on creation 
-that are required for things such as updates/deletions/rollbacks/queries. 
-Cursors are a limited resource, so use care in creating large numbers of 
-cursors.
-
-Additional cursors can be created if necessary with the 
-\helpref{wxDbTable::GetNewCursor}{wxdbtablegetnewcursor} function. One example 
-use for additional cursors is to track multiple scroll points in result 
-sets. By creating a new cursor, a program could request a second result set 
-from the datasource while still maintaining the original cursor position in 
-the first result set.
-
-Different than non-SQL/ODBC datasources, when a program performs an 
-insertion, deletion, or update (or other SQL functions like altering 
-tables, etc) through ODBC, the program must issue a "commit" to the 
-datasource to tell the datasource that the action(s) it has been told to 
-perform are to be recorded as permanent. Until a commit is performed, 
-any other programs that query the datasource will not see the changes that 
-have been made (although there are databases that can be configured to 
-auto-commit). NOTE: With most datasources, until the commit is 
-performed, any cursor that is open on that same datasource connection 
-will be able to see the changes that are uncommitted. Check your 
-database's documentation/configuration to verify this before relying on it 
-though.
-
-A rollback is basically an UNDO command on the datasource connection. When 
-a rollback is issued, the datasource will flush all commands it has been told 
-to do since the last commit that was performed.
-
-NOTE: Commits/Rollbacks are done on datasource connections (wxDb instances) 
-not on the wxDbTable instances. This means that if more than one table 
-shares the same connection, and a commit or rollback is done on that 
-connection, all pending changes for ALL tables using that connection are 
-committed/rolled back.
-
-\subsection{wxODBC - Configuring your system for ODBC use}\label{wxodbcconfiguringyoursystem}
-
-Before you are able to access a datasource, you must have installed and 
-configured an ODBC driver. Doing this is system specific, so it will not be 
-covered in detail here. But here are a few details to get you started.
-
-Most database vendors provide at least a minimal ODBC driver with their 
-database product. In practice, many of these drivers have proven to be slow 
-and/or incomplete. Rumour has it that this is because the vendors do not want 
-you using the ODBC interface to their products; they want you to use their 
-applications to access the data. 
-
-Whatever the reason, for database-intensive applications, you may want to 
-consider using a third-party ODBC driver for your needs. One example of a 
-third-party set of ODBC drivers that has been heavily tested and used is 
-Rogue Wave's drivers. Rogue Wave has drivers available for many different 
-platforms and databases.
-Under Microsoft Windows, install the ODBC driver you are planning to use. You 
-will then use the ODBC Administrator in the Control Panel to configure an 
-instance of the driver for your intended datasource. Note that with all 
-flavors of NT, this configuration can be set up as a System or User DSN 
-(datasource name). Configuring it as a system resource will make it 
-available to all users (if you are logged in as 'administrator'), otherwise 
-the datasource will only be available to the user who configured the DSN.
-
-Under Unix, iODBC is used for implementation of the ODBC API. To compile the 
-wxODBC classes, you must first obtain iODBC from \urlref{http://www.iodbc.org}{www.iodbc.org} and install it. 
-(Note: wxWidgets currently includes a version of iODBC.) Then you must create the file "~/.odbc.ini" (or optionally create 
-"/etc/odbc.ini" for access for all users on the system). This file contains 
-the settings for your system/datasource. Below is an example section of a 
-odbc.ini file for use with the "samples/db" sample program using MySQL:
-
-\begin{verbatim}
-        [contacts]
-        Trace    = Off
-        TraceFile= stderr
-        Driver   = /usr/local/lib/libmyodbc.so
-        DSN      = contacts
-        SERVER   = 192.168.1.13
-        USER     = qet
-        PASSWORD = 
-        PORT     = 3306
-\end{verbatim}
-
-\subsection{wxODBC - Compiling}\label{wxodbccompiling}
-
-The wxWidgets setup.h file has several settings in it pertaining to compiling 
-the wxODBC classes.
-
-\begin{twocollist}\itemsep=0pt
-\twocolitem{wxUSE\_ODBC}{This must be set to 1 in order for the compiler to 
-compile the wxODBC classes. Without setting this to 1, there will be no 
-access to any of the wxODBC classes. The default is 0.}
-\twocolitem{wxODBC\_FWD\_ONLY\_CURSORS}{When a new database connection is 
-requested, this setting controls the default of whether the connection allows 
-only forward scrolling cursors, or forward and backward scrolling cursors 
-(see the section in "WHERE TO START" on cursors for more information on 
-cursors). This default can be overridden by passing a second parameter to 
-either the \helpref{wxDbGetConnection}{wxdbfunctions} or 
-\helpref{wxDb constructor}{wxdbctor}. The default is 1.}
-\twocolitem{wxODBC\_BACKWARD\_COMPATABILITY}{Between v2.0 and 2.2, massive 
-renaming efforts were done to the ODBC classes to get naming conventions 
-similar to those used throughout wxWidgets, as well as to preface all wxODBC 
-classes names and functions with a wxDb preface. Because this renaming would 
-affect applications written using the v2.0 names, this compile-time directive 
-was added to allow those programs written for v2.0 to still compile using the 
-old naming conventions.  These deprecated names are all {\tt\#}define'd to their 
-corresponding new function names at the end of the db.cpp/dbtable.cpp source 
-files. These deprecated class/function names should not be used in future 
-development, as at some point in the future they will be removed. The default 
-is 0.}
-\end{twocollist}
-
-{\it Under MS Windows}
-
-You are required to include the "odbc32.lib" provided by your compiler vendor 
-in the list of external libraries to be linked in. If using the makefiles 
-supplied with wxWidgets, this library should already be included for use with 
-makefile.b32, makefile.vc, and makefile.g95. 
-
-\normalbox{MORE TO COME}
-
-{\it Under Unix}
---with-odbc flag for configure
-
-\normalbox{MORE TO COME}
-
-\subsection{wxODBC - Basic Step-By-Step Guide}\label{wxodbcstepbystep}
-
-To use the classes in an application, there are eight basic steps:
-
-\begin{itemize}\itemsep=0pt
-\item Define datasource connection information
-\item Get a datasource connection
-\item Create table definition
-\item Open the table
-\item Use the table
-\item Close the table
-\item Close the datasource connection
-\item Release the ODBC environment handle
-\end{itemize}
-
-Following each of these steps is detailed to explain the step, and to 
-hopefully mention as many of the pitfalls that beginning users fall in 
-to when first starting to use the classes. Throughout the steps, small 
-snippets of code are provided to show the syntax of performing the step. A 
-complete code snippet is provided at the end of this overview that shows a 
-complete working flow of all these steps (see 
-\helpref{wxODBC - Sample Code}{wxodbcsamplecode1}).
-
-{\bf Define datasource connection information}
-
-To be able to connect to a datasource through the ODBC driver, a program must 
-supply a minimum of three pieces of information: Datasource name, User ID, and 
-Authorization string (password). A fourth piece of information, a default 
-directory indicating where the data file is stored, is required for Text and 
-dBase drivers for ODBC.
-
-The wxWidgets data class wxDbConnectInf exists for holding all of these 
-values, plus some others that may be desired.
-
-The 'Henv' member is the environment handle used to access memory for use by the 
-ODBC driver. Use of this member is described below in the "Getting a Connection 
-to the Datasource" section.
-
-The 'Dsn' must exactly match the datasource name used to configure the ODBC 
-datasource (in the ODBC Administrator (MSW only) or in the .odbc.ini file).
-
-The 'Uid' is the User ID that is to be used to log in to the datasource. This 
-User ID must already have been created and assigned rights within the 
-datasource to which you are connecting. The user that the connection is 
-establish by will determine what rights and privileges the datasource 
-connection will allow the program to have when using the connection that 
-this connection information was used to establish. Some datasources are 
-case sensitive for User IDs, and though the wxODBC classes attempt to hide 
-this from you by manipulating whatever data you pass in to match the 
-datasource's needs, it is always best to pass the 'Uid' in the case that 
-the datasource requires.
-
-The 'AuthStr' is the password for the User ID specified in the 'Uid' member. 
-As with the 'Uid', some datasources are case sensitive (in fact most are). 
-The wxODBC classes do NOT try to manage the case of the 'AuthStr' at all. 
-It is passed verbatim to the datasource, so you must use the case that the 
-datasource is expecting.
-
-The 'defaultDir' member is used with file based datasources (i.e. dBase, 
-FoxPro, text files). It contains a full path to the location where the 
-data table or file is located. When setting this value, use forward 
-slashes '/' rather than backslashes '\' to avoid compatibility differences 
-between ODBC drivers.
-
-The other fields are currently unused. The intent of these fields are that 
-they will be used to write our own ODBC Administrator type program that will 
-work on both MSW and Un*x systems, regardless of the datasource. Very little 
-work has been done on this to date.
-
-{\bf Get a Datasource Connection}
-
-There are two methods of establishing a connection to a datasource. You 
-may either manually create your own wxDb instance and open the connection, 
-or you may use the caching functions provided with the wxODBC classes to 
-create/maintain/delete the connections.
-
-Regardless of which method you use, you must first have a fully populated 
-wxDbConnectInf object. In the wxDbConnectInf instance, provide a valid 
-Dns, Uid, and AuthStr (along with a 'defaultDir' if necessary). Before 
-using this though, you must allocate an environment handle to the 'Henv' 
-member.
-
-\begin{verbatim}
-    wxDbConnectInf DbConnectInf;
-    DbConnectInf.SetDsn("MyDSN");
-    DbConnectInf.SetUserID("MyUserName");
-    DbConnectInf.SetPassword("MyPassword");
-    DbConnectInf.SetDefaultDir("");
-\end{verbatim}
-
-To allocate an environment handle for the ODBC connection to use, the 
-wxDbConnectInf class has a datasource independent method for creating 
-the necessary handle:
-
-\begin{verbatim}
-    if (DbConnectInf.AllocHenv())
-    {
-        wxMessageBox("Unable to allocate an ODBC environment handle",
-                     "DB CONNECTION ERROR", wxOK | wxICON_EXCLAMATION);
-        return;
-    } 
-\end{verbatim}
-
-When the wxDbConnectInf::AllocHenv() function is called successfully, a 
-value of true will be returned. A value of false means allocation failed, 
-and the handle will be undefined.
-
-A shorter form of doing the above steps is encapsulated into the 
-long form of the constructor for wxDbConnectInf.
-
-\begin{verbatim}
-    wxDbConnectInf *DbConnectInf;
-
-        DbConnectInf = new wxDbConnectInf(NULL, "MyDSN", "MyUserName",
-                                          "MyPassword", "");
-\end{verbatim}
-
-This shorthand form of initializing the constructor passes a NULL for the SQL 
-environment handle, telling the constructor to allocate a handle during 
-construction. This handle is also managed for the life of wxDbConnectInf 
-instance, and is freed automatically upon destruction of the instance.
-
-Once the wxDbConnectInf instance is initialized, you are ready to 
-connect to the datasource.
-
-To manually create datasource connections, you must create a wxDb 
-instance, and then open it.
-
-\begin{verbatim}
-    wxDb *db = new wxDb(DbConnectInf->GetHenv());
-
-    opened = db->Open(DbConnectInf);
-\end{verbatim}
-
-The first line does the house keeping needed to initialize all 
-the members of the wxDb class. The second line actually sends the request 
-to the ODBC driver to open a connection to its associated datasource using 
-the parameters supplied in the call to \helpref{wxDb::Open}{wxdbopen}.
-
-A more advanced form of opening a connection is to use the connection 
-caching functions that are included with the wxODBC classes. The caching 
-mechanisms perform the same functions as the manual approach to opening a 
-connection, but they also manage each connection they have created, 
-re-using them and cleaning them up when they are closed, without you 
-needing to do the coding.
-
-To use the caching function \helpref{wxDbGetConnection}{wxdbfunctions} to get 
-a connection to a datasource, simply call it with a single parameter of the 
-type wxDbConnectInf:
-
-\begin{verbatim}
-    db = wxDbGetConnection(DbConnectInf);
-\end{verbatim}
-
-The wxDb pointer that is returned is both initialized and opened. If 
-something failed in creating or opening the connection, the return value 
-from \helpref{wxDbGetConnection}{wxdbfunctions} will be NULL.
-
-The connection that is returned is either a new connection, or it is a 
-"free" connection from the cache of connections that the class maintains 
-that was no longer in use. Any wxDb instance created with a call to 
-\helpref{wxDbGetConnection}{wxdbfunctions} is recorded in a linked list of established 
-connections. When a program is finished with a connection, a call to 
-\helpref{wxDbFreeConnection}{wxdbfunctions} is made, and the datasource 
-connection will then be tagged as FREE, making it available for the next 
-call to \helpref{wxDbGetConnection}{wxdbfunctions} that needs a connection 
-using the same connection information (Dsn, Uid, AuthStr). The cached 
-connections remain cached until a call to \helpref{wxDbCloseConnections}{wxdbfunctions} is made, 
-at which time all cached connections are closed and deleted.
-
-Besides the obvious advantage of using the single command caching routine to 
-obtain a datasource connection, using cached connections can be quite a 
-performance boost as well. Each time that a new connection is created 
-(not retrieved from the cache of free connections), the wxODBC classes 
-perform many queries against the datasource to determine the datasource's 
-datatypes and other fundamental behaviours. Depending on the hardware, 
-network bandwidth, and datasource speed, this can in some cases take a 
-few seconds to establish the new connection (with well-balanced systems, 
-it should only be a fraction of a second). Re-using already established 
-datasource connections rather than creating/deleting, creating/deleting 
-connections can be quite a time-saver.
-
-Another time-saver is the "copy connection" features of both 
-\helpref{wxDb::Open}{wxdbopen} and \helpref{wxDbGetConnection}{wxdbfunctions}. 
-If manually creating a wxDb instance and opening it, you must pass an existing 
-connection to the \helpref{wxDb::Open}{wxdbopen} function yourself to gain the performance 
-benefit of copying existing connection settings. The 
-\helpref{wxDbGetConnection}{wxdbfunctions} function automatically does this 
-for you, checking the Dsn, Uid, and AuthStr parameters when you request 
-a connection for any existing connections that use those same settings. 
-If one is found, \helpref{wxDbGetConnection}{wxdbfunctions} copies the datasource settings for 
-datatypes and other datasource specific information that was previously 
-queried, rather than re-querying the datasource for all those same settings.
-
-One final note on creating a connection. When a connection is created, it 
-will default to only allowing cursor scrolling to be either forward only, 
-or both backward and forward scrolling. The default behavior is 
-determined by the setting {\tt wxODBC\_FWD\_ONLY\_CURSORS} in setup.h when you 
-compile the wxWidgets library. The library default is to only support 
-forward scrolling cursors only, though this can be overridden by parameters 
-for wxDb() constructor or the \helpref{wxDbGetConnection}{wxdbfunctions} 
-function. All datasources and ODBC drivers must support forward scrolling 
-cursors. Many datasources support backward scrolling cursors, and many 
-ODBC drivers support backward scrolling cursors. Before planning on using 
-backward scrolling cursors, you must be certain that both your datasource 
-and ODBC driver fully support backward scrolling cursors. See the small 
-blurb about "Scrolling cursors" in the definitions at the beginning of 
-this overview, or other details of setting the cursor behavior in the wxDb 
-class documentation.
-
-{\bf Create Table Definition}
-
-Data can be accessed in a datasource's tables directly through various 
-functions of the wxDb class (see \helpref{wxDb::GetData}{wxdbgetdata}). But to make life much 
-simpler, the wxDbTable class encapsulates all of the SQL specific API calls 
-that would be necessary to do this, wrapping it in an intuitive class of APIs.
-
-The first step in accessing data in a datasource's tables via the wxDbTable 
-class is to create a wxDbTable instance.
-
-\begin{verbatim}
-    table = new wxDbTable(db, tableName, numTableColumns, "", 
-                          !wxDB_QUERY_ONLY, "");
-\end{verbatim}
-
-When you create the instance, you indicate the previously established 
-datasource connection to be used to access the table, the name of the 
-primary table that is to be accessed with the datasource's tables, how many 
-columns of each row are going to be returned, the name of the view of the 
-table that will actually be used to query against (works with Oracle only 
-at this time), whether the data returned is for query purposes only, and 
-finally the path to the table, if different than the path specified when 
-connecting to the datasource.
-
-Each of the above parameters are described in detail in the wxDbTable 
-class' description, but one special note here about the fifth 
-parameter - the queryOnly setting. If a wxDbTable instance is created as 
-{\tt wxDB\_QUERY\_ONLY}, then no inserts/deletes/updates can be performed 
-using this instance of the wxDbTable. Any calls to \helpref{wxDb::CommitTrans}{wxdbcommittrans} 
-or \helpref{wxDb::RollbackTrans}{wxdbrollbacktrans} against the datasource 
-connection used by this wxDbTable instance are ignored by this instance. If 
-the wxDbTable instance is created with {\tt !wxDB\_QUERY\_ONLY} as shown above, 
-then all the cursors and other overhead associated with being able to 
-insert/update/delete data in the table are created, and thereby those 
-operations can then be performed against the associated table with this 
-wxDbTable instance.
-
-If a table is to be accessed via a wxDbTable instance, and the table will 
-only be read from, not written to, there is a performance benefit (not as 
-many cursors need to be maintained/updated, hence speeding up access times), 
-as well as a resource savings due to fewer cursors being created for the 
-wxDbTable instance. Also, with some datasources, the number of 
-simultaneous cursors is limited. 
-
-When defining the columns to be retrievable by the wxDbTable instance, you 
-can specify anywhere from one column up to all columns in the table. 
-
-\begin{verbatim}
-    table->SetColDefs(0, "FIRST_NAME", DB_DATA_TYPE_VARCHAR, FirstName,
-                      SQL_C_WXCHAR, sizeof(FirstName), true, true);
-    table->SetColDefs(1, "LAST_NAME", DB_DATA_TYPE_VARCHAR, LastName,
-                      SQL_C_WXCHAR, sizeof(LastName), true, true);
-\end{verbatim}
-
-Notice that column definitions start at index 0 and go up to one less than 
-the number of columns specified when the wxDbTable instance was created 
-(in this example, two columns - one with index 0, one with index 1).
-
-The above lines of code "bind" the datasource columns specified to the 
-memory variables in the client application. So when the application 
-makes a call to \helpref{wxDbTable::GetNext}{wxdbtablegetnext} (or any other function that retrieves 
-data from the result set), the variables that are bound to the columns will 
-have the column value stored into them. See the 
-\helpref{wxDbTable::SetColDefs}{wxdbtablesetcoldefs} 
-class documentation for more details on all the parameters for this function.
-
-The bound memory variables have undefined data in them until a call to a 
-function that retrieves data from a result set is made 
-(e.g. \helpref{wxDbTable::GetNext}{wxdbtablegetnext},
-\helpref{wxDbTable::GetPrev}{wxdbtablegetprev}, etc). The variables are not 
-initialized to any data by the wxODBC classes, and they still contain 
-undefined data after a call to \helpref{wxDbTable::Query}{wxdbtablequery}. Only 
-after a successful call to one of the ::GetXxxx() functions is made do the 
-variables contain valid data.
-
-It is not necessary to define column definitions for columns whose data is 
-not going to be returned to the client. For example, if you want to query 
-the datasource for all users with a first name of 'GEORGE', but you only want 
-the list of last names associated with those rows (why return the FIRST\_NAME 
-column every time when you already know it is 'GEORGE'), you would only have 
-needed to define one column above.
-
-You may have as many wxDbTable instances accessing the same table using the 
-same wxDb instance as you desire. There is no limit imposed by the classes 
-on this. All datasources supported (so far) also have no limitations on this.
-
-{\bf Open the table}
-
-Opening the table is not technically doing anything with the datasource 
-itself. Calling \helpref{wxDbTable::Open}{wxdbtableopen} simply does all the 
-housekeeping of checking that the specified table exists, that the current 
-connected user has at least SELECT privileges for accessing the table, 
-setting up the requisite cursors, binding columns and cursors, and 
-constructing the default INSERT statement that is used when a new row is 
-inserted into the table (non-wxDB\_QUERY\_ONLY tables only).
-
-\begin{verbatim}
-    if (!table->Open())
-    {
-        // An error occurred opening (setting up) the table
-    }
-\end{verbatim}
-
-The only reason that a call to \helpref{wxDbTable::Open}{wxdbtableopen} is likely to fail is if the 
-user has insufficient privileges to even SELECT the table. Other problems 
-could occur, such as being unable to bind columns, but these other reason 
-point to some lack of resource (like memory). Any errors generated 
-internally in the \helpref{wxDbTable::Open}{wxdbtableopen} function are logged to the error log 
-if SQL logging is turned on for the classes.
-
-{\bf Use the table}
-
-To use the table and the definitions that are now set up, we must first 
-define what data we want the datasource to collect in to a result set, tell 
-it where to get the data from, and in which sequence we want the data returned.
-
-\begin{verbatim}
-    // the WHERE clause limits/specifies which rows in the table
-    // are to be returned in the result set
-    table->SetWhereClause("FIRST_NAME = 'GEORGE'");
-
-    // Result set will be sorted in ascending alphabetical 
-    // order on the data in the 'LAST_NAME' column of each row
-    // If the same last name is in the table for two rows, 
-    // sub-sort on the 'AGE' column
-    table->SetOrderByClause("LAST_NAME, AGE");
-
-    // No other tables (joins) are used for this query
-    table->SetFromClause("");
-\end{verbatim}
-
-The above lines will be used to tell the datasource to return in the result 
-all the rows in the table whose column "FIRST\_NAME" contains the name 
-'GEORGE' (note the required use of the single quote around the string 
-literal) and that the result set will return the rows sorted by ascending 
-last names (ascending is the default, and can be overridden with the 
-"DESC" keyword for datasources that support it - "LAST\_NAME DESC").
-
-Specifying a blank WHERE clause will result in the result set containing 
-all rows in the datasource.
-
-Specifying a blank ORDERBY clause means that the datasource will return 
-the result set in whatever sequence it encounters rows which match the 
-selection criteria. What this sequence is can be hard to determine. 
-Typically it depends on the index that the datasource used to find the 
-rows which match the WHERE criteria. BEWARE - relying on the datasource 
-to return data in a certain sequence when you have not provided an ORDERBY 
-clause will eventually cause a problem for your program. Databases can be 
-tuned to be COST-based, SPEED-based, or some other basis for how it gets 
-your result set. In short, if you need your result set returned in a 
-specific sequence, ask for it that way by providing an ORDERBY clause.
-
-Using an ORDERBY clause can be a performance hit, as the database must 
-sort the items before making the result set available to the client. 
-Creating efficient indexes that cause the data to be "found" in the correct 
-ORDERBY sequence can be a big performance benefit. Also, in the large 
-majority of cases, the database will be able to sort the records faster 
-than your application can read all the records in (unsorted) and then sort 
-them. Let the database do the work for you!
-
-Notice in the example above, a column that is not included in the bound 
-data columns ('AGE') will be used to sub-sort the result set. 
-
-The FROM clause in this example is blanked, as we are not going to be 
-performing any table joins with this simple query. When the FROM clause 
-is blank, it is assumed that all columns referenced are coming from 
-the default table for the wxDbTable instance.
-
-After the selection criteria have been specified, the program can now 
-ask the datasource to perform the search and create a result set that 
-can be retrieved:
-
-\begin{verbatim}
-    // Instruct the datasource to perform a query based on the 
-    // criteria specified above in the where/orderBy/from clauses.
-    if (!table->Query())
-    {
-        // An error occurred performing the query
-    }
-\end{verbatim}
-
-Typically, when an error occurs when calling \helpref{wxDbTable::Query}{wxdbtablequery}, it is a 
-syntax problem in the WHERE clause that was specified. The exact SQL 
-(datasource-specific) reason for what caused the failure of \helpref{wxDbTable::Query}{wxdbtablequery} 
-(and all other operations against the datasource can be found by 
-parsing the table's database connection's "errorList[]" array member for 
-the stored text of the error.
-
-When the \helpref{wxDbTable::Query}{wxdbtablequery} returns true, the 
-database was able to successfully complete the requested query using the 
-provided criteria. This does not mean that there are any rows in the 
-result set, it just mean that the query was successful.
-
-\normalbox{IMPORTANT: The result created by the call to 
-\helpref{wxDbTable::Query}{wxdbtablequery} can take one of two forms. It is 
-either a snapshot of the data at the exact moment that the database 
-determined the record matched the search criteria, or it is a pointer to 
-the row that matched the selection criteria. Which form of behavior is 
-datasource dependent. If it is a snapshot, the data may have changed 
-since the result set was constructed, so beware if your datasource 
-uses snapshots and call \helpref{wxDbTable::Refresh}{wxdbtablerefresh}. Most larger brand databases 
-do not use snapshots, but it is important to mention so that your application 
-can handle it properly if your datasource does.}
-
-To retrieve the data, one of the data fetching routines must be used to 
-request a row from the result set, and to store the data from the result 
-set into the bound memory variables. After \helpref{wxDbTable::Query}{wxdbtablequery} 
-has completed successfully, the default/current cursor is placed so it 
-is pointing just before the first record in the result set. If the 
-result set is empty (no rows matched the criteria), then any calls to 
-retrieve data from the result set will return false.
-
-\begin{verbatim}
-    wxString msg;
-
-    while (table->GetNext())
-    {
-        msg.Printf("Row #%lu -- First Name : %s  Last Name is %s",
-                  table->GetRowNum(), FirstName, LastName);
-        wxMessageBox(msg, "Data", wxOK | wxICON_INFORMATION, NULL);
-    }
-\end{verbatim}
-
-The sample code above will read the next record in the result set repeatedly 
-until the end of the result set has been reached. The first time that 
-\helpref{wxDbTable::GetNext}{wxdbtablegetnext} is called right after the successful 
-call to \helpref{wxDbTable::Query}{wxdbtablequery}, it actually returns the first record 
-in the result set. 
-
-When \helpref{wxDbTable::GetNext}{wxdbtablegetnext} is called and there are 
-no rows remaining in the result set after the current cursor position, 
-\helpref{wxDbTable::GetNext}{wxdbtablegetnext} (as well as all the other 
-wxDbTable::GetXxxxx() functions) will return false.
-
-{\bf Close the table}
-
-When the program is done using a wxDbTable instance, it is as simple as 
-deleting the table pointer (or if declared statically, letting the 
-variable go out of scope). Typically the default destructor will take 
-care of all that is required for cleaning up the wxDbTable instance.
-
-\begin{verbatim}
-    if (table)
-    {
-        delete table;
-        table = NULL;
-    }
-\end{verbatim}
-
-Deleting a wxDbTable instance releases all of its cursors, deletes the 
-column definitions and frees the SQL environment handles used by the 
-table (but not the environment handle used by the datasource connection 
-that the wxDbTable instance was using).
-
-{\bf Close the datasource connection}
-
-After all tables that have been using a datasource connection have been 
-closed (this can be verified by calling \helpref{wxDb::GetTableCount}{wxdbgettablecount} 
-and checking that it returns 0), then you may close the datasource 
-connection. The method of doing this is dependent on whether the 
-non-caching or caching method was used to obtain the datasource connection.
-
-If the datasource connection was created manually (non-cached), closing the 
-connection is done like this:
-
-\begin{verbatim}
-    if (db)
-    {
-        db->Close();
-        delete db;
-        db = NULL;
-    }
-\end{verbatim}
-
-If the program used the \helpref{wxDbGetConnection}{wxdbfunctions} function to get a datasource 
-connection, the following is the code that should be used to free the 
-connection(s):
-
-\begin{verbatim}
-    if (db)
-    {
-        wxDbFreeConnection(db);
-        db = NULL;
-    }
-\end{verbatim}
-
-Note that the above code just frees the connection so that it can be 
-re-used on the next call the \helpref{wxDbGetConnection}{wxdbfunctions}. To actually dispose 
-of the connection, releasing all of its resources (other than the 
-environment handle), do the following:
-
-\begin{verbatim}
-    wxDbCloseConnections();
-\end{verbatim}
-
-{\bf Release the ODBC environment handle}
-
-Once all of the connections that used the ODBC environment handle (in 
-this example it was stored in "DbConnectInf.Henv") have been closed, then 
-it is safe to release the environment handle:
-
-\begin{verbatim}
-    DbConnectInf->FreeHenv();
-\end{verbatim}
-
-Or, if the long form of the constructor was used and the constructor was allowed 
-to allocate its own SQL environment handle, leaving scope or destruction of the 
-wxDbConnectInf will free the handle automatically.
-
-\begin{verbatim}
-    delete DbConnectInf;
-\end{verbatim}
-
-\normalbox{Remember to never release this environment handle if there are any 
-connections still using the handle.}
-
-\subsection{wxODBC - Known Issues}\label{wxodbcknownissues}
-
-As with creating wxWidgets, writing the wxODBC classes was not the simple 
-task of writing an application to run on a single type of computer system. 
-The classes need to be cross-platform for different operating systems, and 
-they also needed to take in to account different database manufacturers and 
-different ODBC driver manufacturers. Because of all the possible combinations 
-of OS/database/drivers, it is impossible to say that these classes will work 
-perfectly with datasource ABC, ODBC driver XYZ, on platform LMN. You may run 
-into some incompatibilities or unsupported features when moving your 
-application from one environment to another. But that is what makes 
-cross-platform programming fun. It also pinpoints one of the great 
-things about open source software. It can evolve!
-
-The most common difference between different database/ODBC driver 
-manufacturers in regards to these wxODBC classes is the lack of 
-standard error codes being returned to the calling program. Sometimes 
-manufacturers have even changed the error codes between versions of 
-their databases/drivers. 
-
-In all the tested databases, every effort has been made to determine 
-the correct error codes and handle them in the class members that need 
-to check for specific error codes (such as TABLE DOES NOT EXIST when 
-you try to open a table that has not been created yet). Adding support 
-for additional databases in the future requires adding an entry for the 
-database in the \helpref{wxDb::Dbms}{wxdbdbms} function, and then handling any error codes 
-returned by the datasource that do not match the expected values.
-
-{\bf Databases}
-
-Following is a list of known issues and incompatibilities that the 
-wxODBC classes have between different datasources. An up to date 
-listing of known issues can be seen in the comments of the source 
-for \helpref{wxDb::Dbms}{wxdbdbms}.
-
-{\it ORACLE}
-\begin{itemize}\itemsep=0pt
-\item Currently the only database supported by the wxODBC classes to support VIEWS
-\end{itemize}
-
-{\it DBASE}
-
-NOTE: dBase is not a true ODBC datasource. You only have access to as much 
-functionality as the driver can emulate.
-
-\begin{itemize}\itemsep=0pt
-\item Does not support the SQL\_TIMESTAMP structure
-\item Supports only one cursor and one connect (apparently? with Microsoft driver only?)
-\item Does not automatically create the primary index if the 'keyField' param of SetColDef is true. The user must create ALL indexes from their program with calls to \helpref{wxDbTable::CreateIndex}{wxdbtablecreateindex}
-\item Table names can only be 8 characters long
-\item Column names can only be 10 characters long
-\item Currently cannot CREATE a dBase table - bug or limitation of the drivers used??
-\item Currently cannot insert rows that have integer columns - bug??
-\end{itemize}
-
-{\it SYBASE (all)}
-\begin{itemize}\itemsep=0pt
-\item To lock a record during QUERY functions, the reserved word 'HOLDLOCK' must be added after every table name involved in the query/join if that table's matching record(s) are to be locked
-\item Ignores the keywords 'FOR UPDATE'. Use the HOLDLOCK functionality described above
-\end{itemize}
-
-{\it SYBASE (Enterprise)}
-\begin{itemize}\itemsep=0pt
-\item If a column is part of the Primary Key, the column cannot be NULL
-\item Maximum row size is somewhere in the neighborhood of 1920 bytes
-\end{itemize}
-
-{\it mySQL}
-\begin{itemize}\itemsep=0pt
-\item If a column is part of the Primary Key, the column cannot be NULL.
-\item Cannot support selecting for update [\helpref{wxDbTable::CanSelectForUpdate}{wxdbtablecanselectforupdate}]. Always returns false.
-\item Columns that are part of primary or secondary keys must be defined as being NOT NULL when they are created. Some code is added in \helpref{wxDbTable::CreateIndex}{wxdbtablecreateindex} to try to adjust the column definition if it is not defined correctly, but it is experimental (as of wxWidgets v2.2.1)
-\item Does not support sub-queries in SQL statements
-\end{itemize}
-
-{\it POSTGRES}
-\begin{itemize}\itemsep=0pt
-\item Does not support the keywords 'ASC' or 'DESC' as of release v6.5.0
-\item Does not support sub-queries in SQL statements
-\end{itemize}
-
-{\it DB2}
-\begin{itemize}\itemsep=0pt
-\item Columns which are part of a primary key must be declared as NOT NULL
-\end{itemize}
-
-{\bf UNICODE with wxODBC classes}
-
-As of v2.6 of wxWidgets, the wxODBC classes now fully support the compilation 
-and use of the classes in a Unicode build of wxWidgets, assuming the compiler 
-and OS on which the program will be compiled/run is Unicode capable.
-
-The one major difference in writing code that can be compiled in either 
-unicode or non-unicode builds that is specific to the wxODBC classes is to 
-use the SQL\_C\_WXCHAR datatype for string columns rather than SQL\_C\_CHAR or 
-SQL\_C\_WCHAR.
-
-\subsection{wxODBC - Sample Code}\label{wxodbcsamplecode1}
-
-Simplest example of establishing/opening a connection to an ODBC datasource, 
-binding variables to the columns for read/write usage, opening an 
-existing table in the datasource, inserting a record, setting query parameters 
-(where/orderBy/from), querying the datasource, reading each row of the 
-result set, deleting a record, releasing the connection, then cleaning up.
-
-NOTE: Very basic error handling is shown here, to reduce the size of the 
-code and to make it more easily readable.  The HandleError() function uses the wxDbLogExtendedErrorMsg() function for retrieving database error messages.
-
-\begin{verbatim}
-// ----------------------------------------------------------------------------
-// HEADERS
-// ----------------------------------------------------------------------------
-#include "wx/log.h"         // #included to enable output of messages only
-#include "wx/dbtable.h"
-
-// ----------------------------------------------------------------------------
-// FUNCTION USED FOR HANDLING/DISPLAYING ERRORS
-// ----------------------------------------------------------------------------
-// Very generic error handling function.  
-// If a connection to the database is passed in, then we retrieve all the 
-// database errors for the connection and add them to the displayed message
-int HandleError(wxString errmsg, wxDb *pDb=NULL)
-{
-    // Retrieve all the error message for the errors that occurred
-    wxString allErrors;
-    if (!pDb == NULL)
-        // Get the database errors and append them to the error message
-        allErrors = wxDbLogExtendedErrorMsg(errmsg.c_str(), pDb, 0, 0);
-    else
-        allErrors = errmsg;
-
-    // Do whatever you wish with the error message here
-    // wxLogDebug() is called inside wxDbLogExtendedErrorMsg() so this
-    // console program will show the errors in the console window,
-    // but these lines will show the errors in RELEASE builds also
-    wxFprintf(stderr, wxT("\n%s\n"), allErrors.c_str());
-    fflush(stderr);
-
-    return 1;
-}
-
-
-// ----------------------------------------------------------------------------
-// entry point
-// ----------------------------------------------------------------------------
-int main(int argc, char **argv)
-{
-wxDbConnectInf  *DbConnectInf    = NULL;    // DB connection information
-
-wxDb            *db              = NULL;    // Database connection
-
-wxDbTable       *table           = NULL;    // Data table to access
-const wxChar     tableName[]     = wxT("USERS"); // Name of database table
-const UWORD      numTableColumns = 2;       // Number table columns
-wxChar           FirstName[50+1];           // column data: "FIRST_NAME"
-wxChar           LastName[50+1];            // column data: "LAST_NAME"
-
-wxString         msg;                       // Used for display messages
-
-// -----------------------------------------------------------------------
-// DEFINE THE CONNECTION HANDLE FOR THE DATABASE
-// -----------------------------------------------------------------------
-DbConnectInf = new wxDbConnectInf(NULL, 
-                                    wxT("CONTACTS-SqlServer"),
-                                    wxT("sa"),
-                                    wxT("abk"));
-
-// Error checking....
-if (!DbConnectInf || !DbConnectInf->GetHenv())
-{
-    return HandleError(wxT("DB ENV ERROR: Cannot allocate ODBC env handle"));
-}
-
-
-// -----------------------------------------------------------------------
-// GET A DATABASE CONNECTION
-// -----------------------------------------------------------------------
-db = wxDbGetConnection(DbConnectInf);
-
-if (!db)
-{
-    return HandleError(wxT("CONNECTION ERROR - Cannot get DB connection"));
-}
-
-
-// -----------------------------------------------------------------------
-// DEFINE THE TABLE, AND THE COLUMNS THAT WILL BE ACCESSED
-// -----------------------------------------------------------------------
-table = new wxDbTable(db, tableName, numTableColumns, wxT(""), 
-                    !wxDB_QUERY_ONLY, wxT(""));
-//
-// Bind the columns that you wish to retrieve. Note that there must be
-// 'numTableColumns' calls to SetColDefs(), to match the wxDbTable def
-//
-// Not all columns need to be bound, only columns whose values are to be 
-// returned back to the client.
-//
-table->SetColDefs(0, wxT("FIRST_NAME"), DB_DATA_TYPE_VARCHAR, FirstName,
-                SQL_C_WXCHAR, sizeof(FirstName), true, true);
-table->SetColDefs(1, wxT("LAST_NAME"), DB_DATA_TYPE_VARCHAR, LastName,
-                SQL_C_WXCHAR, sizeof(LastName), true, true);
-
-
-// -----------------------------------------------------------------------
-// CREATE (or RECREATE) THE TABLE IN THE DATABASE
-// -----------------------------------------------------------------------
-if (!table->CreateTable(true))  //NOTE: No CommitTrans is required
-{
-    return HandleError(wxT("TABLE CREATION ERROR: "), table->GetDb());
-}
-
-
-// -----------------------------------------------------------------------
-// OPEN THE TABLE FOR ACCESS
-// -----------------------------------------------------------------------
-if (!table->Open())
-{
-    return HandleError(wxT("TABLE OPEN ERROR: "), table->GetDb());
-}
-
-
-// -----------------------------------------------------------------------
-// INSERT A NEW ROW INTO THE TABLE
-// -----------------------------------------------------------------------
-wxStrcpy(FirstName, wxT("JULIAN"));
-wxStrcpy(LastName, wxT("SMART"));
-if (!table->Insert())
-{
-    return HandleError(wxT("INSERTION ERROR: "), table->GetDb());
-}
-
-// Must commit the insert to write the data to the DB
-table->GetDb()->CommitTrans();
-
-
-// -----------------------------------------------------------------------
-// RETRIEVE ROWS FROM THE TABLE BASED ON SUPPLIED CRITERIA
-// -----------------------------------------------------------------------
-// Set the WHERE clause to limit the result set to return
-// all rows that have a value of 'JULIAN' in the FIRST_NAME
-// column of the table.
-table->SetWhereClause(wxT("FIRST_NAME = 'JULIAN'"));
-
-// Result set will be sorted in ascending alphabetical 
-// order on the data in the 'LAST_NAME' column of each row
-table->SetOrderByClause(wxT("LAST_NAME"));
-
-// No other tables (joins) are used for this query
-table->SetFromClause(wxT(""));
-
-// Instruct the datasource to perform a query based on the 
-// criteria specified above in the where/orderBy/from clauses.
-if (!table->Query())
-{
-    return HandleError(wxT("QUERY ERROR: "), table->GetDb());
-}
-
-// Loop through all rows matching the query criteria until
-// there are no more records to read
-while (table->GetNext())
-{
-    msg.Printf(wxT("Row #%lu -- First Name : %s  Last Name is %s"),
-            table->GetRowNum(), FirstName, LastName);
-
-    // Code to display 'msg' here
-    wxLogMessage(wxT("\n%s\n"), msg.c_str());
-}
-
-
-// -----------------------------------------------------------------------
-// DELETE A ROW FROM THE TABLE
-// -----------------------------------------------------------------------
-// Select the row which has FIRST_NAME of 'JULIAN' and LAST_NAME
-// of 'SMART', then delete the retrieved row
-//
-if (!table->DeleteWhere(wxT("FIRST_NAME = 'JULIAN' and LAST_NAME = 'SMART'")))
-{
-    return HandleError(wxT("DELETION ERROR: "), table->GetDb());
-}
-    
-// Must commit the deletion to the database
-table->GetDb()->CommitTrans();
-
-
-// -----------------------------------------------------------------------
-// TAKE CARE OF THE ODBC CLASS INSTANCES THAT WERE BEING USED
-// -----------------------------------------------------------------------
-// If the wxDbTable instance was successfully created
-// then delete it as we are done with it now.
-wxDELETE(table);
-
-// Free the cached connection
-// (meaning release it back in to the cache of datasource
-// connections) for the next time a call to wxDbGetConnection()
-// is made.
-wxDbFreeConnection(db);
-db = NULL;
-
-
-// -----------------------------------------------------------------------
-// CLEANUP BEFORE EXITING APP
-// -----------------------------------------------------------------------
-// The program is now ending, so we need to close
-// any cached connections that are still being 
-// maintained.
-wxDbCloseConnections();
-
-// Release the environment handle that was created
-// for use with the ODBC datasource connections
-wxDELETE(DbConnectInf);
-
-wxUnusedVar(argc);  // Here just to prevent compiler warnings
-wxUnusedVar(argv);  // Here just to prevent compiler warnings
-
-return 0;
-}
-\end{verbatim}
-
-\subsection{A selection of SQL commands}\label{sqlcommands}
-
-The following is a very brief description of some common SQL commands, with
-examples.
-
-\wxheading{See also}
-
-\helpref{Database classes overview}{odbcoverview}
-
-\subsubsection{Create}\label{odbccreateexample}
-
-Creates a table.
-
-Example:
-
-\begin{verbatim}
-CREATE TABLE Book
- (BookNumber     INTEGER     PRIMARY KEY
- , CategoryCode  CHAR(2)     DEFAULT 'RO' NOT NULL
- , Title         VARCHAR(100) UNIQUE
- , NumberOfPages SMALLINT
- , RetailPriceAmount NUMERIC(5,2)
- )
-\end{verbatim}
-
-\subsubsection{Insert}\label{odbcinsertexample}
-
-Inserts records into a table.
-
-Example:
-
-\begin{verbatim}
-INSERT INTO Book
-  (BookNumber, CategoryCode, Title)
-  VALUES(5, 'HR', 'The Lark Ascending')
-\end{verbatim}
-
-\subsubsection{Select}\label{odbcselectexample}
-
-The Select operation retrieves rows and columns from a table. The criteria
-for selection and the columns returned may be specified.
-
-Examples:
-
-{\tt SELECT * FROM Book}
-
-Selects all rows and columns from table Book.
-
-{\tt SELECT Title, RetailPriceAmount FROM Book WHERE RetailPriceAmount > 20.0}
-
-Selects columns Title and RetailPriceAmount from table Book, returning only
-the rows that match the WHERE clause.
-
-{\tt SELECT * FROM Book WHERE CatCode = 'LL' OR CatCode = 'RR'}
-
-Selects all columns from table Book, returning only
-the rows that match the WHERE clause.
-
-{\tt SELECT * FROM Book WHERE CatCode IS NULL}
-
-Selects all columns from table Book, returning only rows where the CatCode column
-is NULL.
-
-{\tt SELECT * FROM Book ORDER BY Title}
-
-Selects all columns from table Book, ordering by Title, in ascending order. To specify
-descending order, add DESC after the ORDER BY Title clause.
-
-{\tt SELECT Title FROM Book WHERE RetailPriceAmount >= 20.0 AND RetailPriceAmount <= 35.0}
-
-Selects records where RetailPriceAmount conforms to the WHERE expression.
-
-\subsubsection{Update}\label{odbcupdateexample}
-
-Updates records in a table.
-
-Example:
-
-{\tt UPDATE Incident SET X = 123 WHERE ASSET = 'BD34'}
-
-This example sets a field in column `X' to the number 123, for the record
-where the column ASSET has the value `BD34'.
-
index b779b0495a86c189fc876f17d928a60b94fdd2e9..da4f1c7222feafdbc79f27707de242c489bc9dee 100644 (file)
@@ -45,7 +45,6 @@ This chapter contains a selection of topic overviews.
 \helpref{Syntax of the built-in regular expression library}{wxresyn}\\
 \helpref{Archive formats such as zip}{wxarc}\\
 \helpref{Interprocess communication}{ipcoverview}\\
-\helpref{ODBC Database classes}{odbcoverview}
 
 {\large {\bf Drawing related classes}}
 
index 5068d20e1cf48f832763bfae1ceea1e32b45cc45..002e3757569ebf045badd7453d7e64e97be7168b 100644 (file)
@@ -118,13 +118,6 @@ The various controls tested are listed here:
 \end{twocollist}
 
 
-\subsection{Database sample}\label{sampledb}
-
-The database sample is a small test program showing how to use the ODBC
-classes written by Remstar Intl.  Obviously, this sample requires a
-database with ODBC support to be correctly installed on your system.
-
-
 \subsection{DebugRpt sample}\label{sampledebugrpt}
 
 This sample shows how to use \helpref{wxDebugReport}{wxdebugreport} class to
index db82e17c9ecc8b1c80df22dbdb4062d04368879a..3bf09e16f77eeff9f2ecabd5d912ac3f09bf88b5 100644 (file)
@@ -162,15 +162,15 @@ Construction from an array of strings.  This constructor copies {\it value} and
 
 \func{}{wxVariant}{\param{DATE\_STRUCT*}{ val}, \param{const wxString\& }{name = ``"}}
 
-Construction from a odbc date value.  Represented internally by a \helpref{wxDateTime}{wxdatetime} value.
+Construction from a ODBC date value.  Represented internally by a \helpref{wxDateTime}{wxdatetime} value.
 
 \func{}{wxVariant}{\param{TIME\_STRUCT*}{ val}, \param{const wxString\& }{name = ``"}}
 
-Construction from a odbc time value.  Represented internally by a \helpref{wxDateTime}{wxdatetime} value.
+Construction from a ODBC time value.  Represented internally by a \helpref{wxDateTime}{wxdatetime} value.
 
 \func{}{wxVariant}{\param{TIMESTAMP\_STRUCT*}{ val}, \param{const wxString\& }{name = ``"}}
 
-Construction from a odbc timestamp value.  Represented internally by a \helpref{wxDateTime}{wxdatetime} value.
+Construction from a ODBC timestamp value.  Represented internally by a \helpref{wxDateTime}{wxdatetime} value.
 
 \membersection{wxVariant::\destruct{wxVariant}}\label{wxvariantdtor}
 
index 3bc56fee99b9e418ed4585db162cd2e603e7a05a..8c13706b1e14bca93916e447fc878bc624cd0ef0 100644 (file)
@@ -137,7 +137,6 @@ using \texttt{#if} and not \texttt{#ifdef}.
 \twocolitem{wxUSE\_NATIVE\_STATUSBAR}{Use native \helpref{wxStatusBar}{wxstatusbar} class.}
 \twocolitem{wxUSE\_NOTEBOOK}{Use \helpref{wxNotebook}{wxnotebook} and related classes.}
 \twocolitem{wxUSE\_NUMBERDLG}{Use wxNumberEntryDialog class.}
-\twocolitem{wxUSE\_ODBC}{Use ODBC classes.}
 \twocolitem{wxUSE\_ODCOMBOBOX}{Use \helpref{wxOwnerDrawnComboBox}{wxownerdrawncombobox} class.}
 \twocolitem{wxUSE\_ON\_FATAL\_EXCEPTION}{Catch signals in \helpref{wxApp::OnFatalException}{wxapponfatalexception} method.}
 \twocolitem{wxUSE\_OPENGL}{Please use wxUSE\_GLCANVAS to test for enabled OpenGL support instead.}
index 8afc686067d1d9ac21289a4463c411c410b4336b..0738e43cc7f415127fcffca7484388a4673a2485 100644 (file)
 #   endif
 #endif /* wxUSE_MIMETYPE */
 
-#if wxUSE_ODBC
-#   if !wxUSE_DATETIME
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxODBC requires wxUSE_DATETIME"
-#       else
-#           undef wxUSE_ODBC
-#           define wxUSE_ODBC 0
-#       endif
-#   endif
-#endif /* wxUSE_ODBC */
-
 #if wxUSE_TEXTFILE && !wxUSE_TEXTBUFFER
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_TEXTFILE requires wxUSE_TEXTBUFFER"
 #           define wxUSE_DATAVIEWCTRL 0
 #       endif
 #   endif
-
-#   if wxUSE_ODBC
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxUSE_ODBC requires wxVariant"
-#       else
-#           undef wxUSE_ODBC
-#           define wxUSE_ODBC 0
-#       endif
-#   endif
 #endif /* wxUSE_VARIANT */
 
 #endif /* wxUSE_GUI */
diff --git a/include/wx/db.h b/include/wx/db.h
deleted file mode 100644 (file)
index 0c9b196..0000000
+++ /dev/null
@@ -1,848 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/db.h
-// Purpose:     Header file wxDb class.  The wxDb class represents a connection
-//              to an ODBC data source.  The wxDb class allows operations on the data
-//              source such as opening and closing the data source.
-// Author:      Doug Card
-// Modified by: George Tasker
-//              Bart Jourquin
-//              Mark Johnson, wxWindows@mj10777.de
-// Mods:        Dec, 1998:
-//                -Added support for SQL statement logging and database cataloging
-//                     April, 1999
-//                -Added QUERY_ONLY mode support to reduce default number of cursors
-//                -Added additional SQL logging code
-//                -Added DEBUG-ONLY tracking of Ctable objects to detect orphaned DB connections
-//                -Set ODBC option to only read committed writes to the DB so all
-//                     databases operate the same in that respect
-//
-// Created:     9.96
-// RCS-ID:      $Id$
-// Copyright:   (c) 1996 Remstar International, Inc.
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DB_H_
-#define _WX_DB_H_
-
-
-// BJO 20000503: introduce new GetColumns members which are more database independent and
-//               return columns in the order they were created
-#define OLD_GETCOLUMNS 1
-#define EXPERIMENTAL_WXDB_FUNCTIONS 1
-
-#include "wx/defs.h"
-#include "wx/string.h"
-
-#if defined(__VISUALC__)
-    // we need to include standard Windows headers but we can't include
-    // <windows.h> directly when using MFC because it includes it itself in a
-    // different manner
-    #if wxUSE_MFC
-        #include <afxwin.h>
-    #else // !wxUSE_MFC
-        #include "wx/msw/wrapwin.h"
-    #endif // wxUSE_MFC/!wxUSE_MFC
-
-    // If you use the wxDbCreateDataSource() function with MSW/VC6,
-    // you cannot use the iODBC headers, you must use the VC headers,
-    // plus the odbcinst.h header - gt Nov 2 2000
-    //
-    // Must add "odbccp32.lib" in \wx2\wxWidgets\src\makevc.env to the WINLIBS= line
-    //
-    #include "sql.h"
-    #include "sqlext.h"
-    //#if wxUSE_UNICODE
-    //    #include <sqlucode.h>
-    //#endif
-    #include "odbcinst.h"
-#else
-    #if defined(__WINDOWS__) && ( defined(HAVE_W32API_H) || defined(__BORLANDC__)  || defined (__DMC__))
-        #include "wx/msw/wrapwin.h"
-    #endif
-    extern "C" {
-    #if defined(wxUSE_BUILTIN_IODBC) && wxUSE_BUILTIN_IODBC
-        // Use the ones from the library
-        #include "wx/isql.h"
-        #include "wx/isqlext.h"
-        // Not available in v2.x of iODBC
-        #ifndef __WXMSW__
-          #if wxUSE_UNICODE
-          typedef wxChar SQLTCHAR;
-          #else
-          typedef UCHAR SQLTCHAR;
-          #endif
-        #endif
-    #else // !wxUSE_BUILTIN_IODBC
-        // SQL headers define BOOL if it's not defined yet but BOOL is also
-        // defined in many other places on other systems (Motif, at least on
-        // OpenVMS; Cocoa and X11) so prevent the problem by defining it before
-        // including these headers
-        #define BOOL int
-        #include <sql.h>
-        #include <sqlext.h>
-        #undef BOOL
-    #endif // wxUSE_BUILTIN_IODBC/!wxUSE_BUILTIN_IODBC
-    }
-#endif
-
-#if wxUSE_UNICODE
-#define SQL_C_WXCHAR SQL_C_WCHAR
-#else
-#define SQL_C_WXCHAR SQL_C_CHAR
-#endif
-
-#ifdef __DIGITALMARS__
-#if wxUSE_UNICODE
-typedef wxChar SQLTCHAR;
-#else
-typedef UCHAR SQLTCHAR;
-#endif
-#endif
-
-typedef float SFLOAT;
-typedef double SDOUBLE;
-typedef unsigned int UINT;
-#define ULONG UDWORD
-
-#ifndef wxODBC_FWD_ONLY_CURSORS
-#define wxODBC_FWD_ONLY_CURSORS 1
-#endif
-
-enum enumDummy {enumDum1};
-
-#ifndef SQL_C_BOOLEAN
-    #define SQL_C_BOOLEAN(datatype) (sizeof(datatype) == 1 ? SQL_C_UTINYINT : (sizeof(datatype) == 2 ? SQL_C_USHORT : SQL_C_ULONG))
-#endif
-
-#ifndef SQL_C_ENUM
-    #define SQL_C_ENUM (sizeof(enumDummy) == 2 ? SQL_C_USHORT : SQL_C_ULONG)
-#endif
-
-// NOTE: If SQL_C_BLOB is defined, and it is not SQL_C_BINARY, iODBC 2.x
-//       may not function correctly.  Likely best to use SQL_C_BINARY direct
-#ifndef SQL_C_BLOB
-    #ifdef SQL_C_BINARY
-        #define SQL_C_BLOB SQL_C_BINARY
-    #endif
-#endif
-
-#ifndef _WIN64
-#ifndef SQLLEN
-#define SQLLEN SQLINTEGER
-#endif
-#ifndef SQLULEN
-#define SQLULEN SQLUINTEGER
-#endif
-#endif
-
-const int wxDB_PATH_MAX                 = 254;
-
-extern WXDLLIMPEXP_DATA_ODBC(wxChar const *) SQL_LOG_FILENAME;
-extern WXDLLIMPEXP_DATA_ODBC(wxChar const *) SQL_CATALOG_FILENAME;
-
-// Database Globals
-const int DB_TYPE_NAME_LEN            = 40;
-const int DB_MAX_STATEMENT_LEN        = 4096;
-const int DB_MAX_WHERE_CLAUSE_LEN     = 2048;
-const int DB_MAX_ERROR_MSG_LEN        = 512;
-const int DB_MAX_ERROR_HISTORY        = 5;
-const int DB_MAX_TABLE_NAME_LEN       = 128;
-const int DB_MAX_COLUMN_NAME_LEN      = 128;
-
-const int DB_DATA_TYPE_VARCHAR        = 1;
-const int DB_DATA_TYPE_INTEGER        = 2;
-const int DB_DATA_TYPE_FLOAT          = 3;
-const int DB_DATA_TYPE_DATE           = 4;
-const int DB_DATA_TYPE_BLOB           = 5;
-const int DB_DATA_TYPE_MEMO           = 6;
-
-const int DB_SELECT_KEYFIELDS         = 1;
-const int DB_SELECT_WHERE             = 2;
-const int DB_SELECT_MATCHING          = 3;
-const int DB_SELECT_STATEMENT         = 4;
-
-const int DB_UPD_KEYFIELDS            = 1;
-const int DB_UPD_WHERE                = 2;
-
-const int DB_DEL_KEYFIELDS            = 1;
-const int DB_DEL_WHERE                = 2;
-const int DB_DEL_MATCHING             = 3;
-
-const int DB_WHERE_KEYFIELDS          = 1;
-const int DB_WHERE_MATCHING           = 2;
-
-const int DB_GRANT_SELECT             = 1;
-const int DB_GRANT_INSERT             = 2;
-const int DB_GRANT_UPDATE             = 4;
-const int DB_GRANT_DELETE             = 8;
-const int DB_GRANT_ALL                = DB_GRANT_SELECT | DB_GRANT_INSERT | DB_GRANT_UPDATE | DB_GRANT_DELETE;
-
-// ODBC Error codes (derived from ODBC SqlState codes)
-enum wxODBC_ERRORS
-{
-    DB_FAILURE                        = 0,
-    DB_SUCCESS                        = 1,
-    DB_ERR_NOT_IN_USE,
-    DB_ERR_GENERAL_WARNING,                            // SqlState = '01000'
-    DB_ERR_DISCONNECT_ERROR,                           // SqlState = '01002'
-    DB_ERR_DATA_TRUNCATED,                             // SqlState = '01004'
-    DB_ERR_PRIV_NOT_REVOKED,                           // SqlState = '01006'
-    DB_ERR_INVALID_CONN_STR_ATTR,                      // SqlState = '01S00'
-    DB_ERR_ERROR_IN_ROW,                               // SqlState = '01S01'
-    DB_ERR_OPTION_VALUE_CHANGED,                       // SqlState = '01S02'
-    DB_ERR_NO_ROWS_UPD_OR_DEL,                         // SqlState = '01S03'
-    DB_ERR_MULTI_ROWS_UPD_OR_DEL,                      // SqlState = '01S04'
-    DB_ERR_WRONG_NO_OF_PARAMS,                         // SqlState = '07001'
-    DB_ERR_DATA_TYPE_ATTR_VIOL,                        // SqlState = '07006'
-    DB_ERR_UNABLE_TO_CONNECT,                          // SqlState = '08001'
-    DB_ERR_CONNECTION_IN_USE,                          // SqlState = '08002'
-    DB_ERR_CONNECTION_NOT_OPEN,                        // SqlState = '08003'
-    DB_ERR_REJECTED_CONNECTION,                        // SqlState = '08004'
-    DB_ERR_CONN_FAIL_IN_TRANS,                         // SqlState = '08007'
-    DB_ERR_COMM_LINK_FAILURE,                          // SqlState = '08S01'
-    DB_ERR_INSERT_VALUE_LIST_MISMATCH,                 // SqlState = '21S01'
-    DB_ERR_DERIVED_TABLE_MISMATCH,                     // SqlState = '21S02'
-    DB_ERR_STRING_RIGHT_TRUNC,                         // SqlState = '22001'
-    DB_ERR_NUMERIC_VALUE_OUT_OF_RNG,                   // SqlState = '22003'
-    DB_ERR_ERROR_IN_ASSIGNMENT,                        // SqlState = '22005'
-    DB_ERR_DATETIME_FLD_OVERFLOW,                      // SqlState = '22008'
-    DB_ERR_DIVIDE_BY_ZERO,                             // SqlState = '22012'
-    DB_ERR_STR_DATA_LENGTH_MISMATCH,                   // SqlState = '22026'
-    DB_ERR_INTEGRITY_CONSTRAINT_VIOL,                  // SqlState = '23000'
-    DB_ERR_INVALID_CURSOR_STATE,                       // SqlState = '24000'
-    DB_ERR_INVALID_TRANS_STATE,                        // SqlState = '25000'
-    DB_ERR_INVALID_AUTH_SPEC,                          // SqlState = '28000'
-    DB_ERR_INVALID_CURSOR_NAME,                        // SqlState = '34000'
-    DB_ERR_SYNTAX_ERROR_OR_ACCESS_VIOL,                // SqlState = '37000'
-    DB_ERR_DUPLICATE_CURSOR_NAME,                      // SqlState = '3C000'
-    DB_ERR_SERIALIZATION_FAILURE,                      // SqlState = '40001'
-    DB_ERR_SYNTAX_ERROR_OR_ACCESS_VIOL2,               // SqlState = '42000'
-    DB_ERR_OPERATION_ABORTED,                          // SqlState = '70100'
-    DB_ERR_UNSUPPORTED_FUNCTION,                       // SqlState = 'IM001'
-    DB_ERR_NO_DATA_SOURCE,                             // SqlState = 'IM002'
-    DB_ERR_DRIVER_LOAD_ERROR,                          // SqlState = 'IM003'
-    DB_ERR_SQLALLOCENV_FAILED,                         // SqlState = 'IM004'
-    DB_ERR_SQLALLOCCONNECT_FAILED,                     // SqlState = 'IM005'
-    DB_ERR_SQLSETCONNECTOPTION_FAILED,                 // SqlState = 'IM006'
-    DB_ERR_NO_DATA_SOURCE_DLG_PROHIB,                  // SqlState = 'IM007'
-    DB_ERR_DIALOG_FAILED,                              // SqlState = 'IM008'
-    DB_ERR_UNABLE_TO_LOAD_TRANSLATION_DLL,             // SqlState = 'IM009'
-    DB_ERR_DATA_SOURCE_NAME_TOO_LONG,                  // SqlState = 'IM010'
-    DB_ERR_DRIVER_NAME_TOO_LONG,                       // SqlState = 'IM011'
-    DB_ERR_DRIVER_KEYWORD_SYNTAX_ERROR,                // SqlState = 'IM012'
-    DB_ERR_TRACE_FILE_ERROR,                           // SqlState = 'IM013'
-    DB_ERR_TABLE_OR_VIEW_ALREADY_EXISTS,               // SqlState = 'S0001'
-    DB_ERR_TABLE_NOT_FOUND,                            // SqlState = 'S0002'
-    DB_ERR_INDEX_ALREADY_EXISTS,                       // SqlState = 'S0011'
-    DB_ERR_INDEX_NOT_FOUND,                            // SqlState = 'S0012'
-    DB_ERR_COLUMN_ALREADY_EXISTS,                      // SqlState = 'S0021'
-    DB_ERR_COLUMN_NOT_FOUND,                           // SqlState = 'S0022'
-    DB_ERR_NO_DEFAULT_FOR_COLUMN,                      // SqlState = 'S0023'
-    DB_ERR_GENERAL_ERROR,                              // SqlState = 'S1000'
-    DB_ERR_MEMORY_ALLOCATION_FAILURE,                  // SqlState = 'S1001'
-    DB_ERR_INVALID_COLUMN_NUMBER,                      // SqlState = 'S1002'
-    DB_ERR_PROGRAM_TYPE_OUT_OF_RANGE,                  // SqlState = 'S1003'
-    DB_ERR_SQL_DATA_TYPE_OUT_OF_RANGE,                 // SqlState = 'S1004'
-    DB_ERR_OPERATION_CANCELLED,                        // SqlState = 'S1008'
-    DB_ERR_INVALID_ARGUMENT_VALUE,                     // SqlState = 'S1009'
-    DB_ERR_FUNCTION_SEQUENCE_ERROR,                    // SqlState = 'S1010'
-    DB_ERR_OPERATION_INVALID_AT_THIS_TIME,             // SqlState = 'S1011'
-    DB_ERR_INVALID_TRANS_OPERATION_CODE,               // SqlState = 'S1012'
-    DB_ERR_NO_CURSOR_NAME_AVAIL,                       // SqlState = 'S1015'
-    DB_ERR_INVALID_STR_OR_BUF_LEN,                     // SqlState = 'S1090'
-    DB_ERR_DESCRIPTOR_TYPE_OUT_OF_RANGE,               // SqlState = 'S1091'
-    DB_ERR_OPTION_TYPE_OUT_OF_RANGE,                   // SqlState = 'S1092'
-    DB_ERR_INVALID_PARAM_NO,                           // SqlState = 'S1093'
-    DB_ERR_INVALID_SCALE_VALUE,                        // SqlState = 'S1094'
-    DB_ERR_FUNCTION_TYPE_OUT_OF_RANGE,                 // SqlState = 'S1095'
-    DB_ERR_INF_TYPE_OUT_OF_RANGE,                      // SqlState = 'S1096'
-    DB_ERR_COLUMN_TYPE_OUT_OF_RANGE,                   // SqlState = 'S1097'
-    DB_ERR_SCOPE_TYPE_OUT_OF_RANGE,                    // SqlState = 'S1098'
-    DB_ERR_NULLABLE_TYPE_OUT_OF_RANGE,                 // SqlState = 'S1099'
-    DB_ERR_UNIQUENESS_OPTION_TYPE_OUT_OF_RANGE,        // SqlState = 'S1100'
-    DB_ERR_ACCURACY_OPTION_TYPE_OUT_OF_RANGE,          // SqlState = 'S1101'
-    DB_ERR_DIRECTION_OPTION_OUT_OF_RANGE,              // SqlState = 'S1103'
-    DB_ERR_INVALID_PRECISION_VALUE,                    // SqlState = 'S1104'
-    DB_ERR_INVALID_PARAM_TYPE,                         // SqlState = 'S1105'
-    DB_ERR_FETCH_TYPE_OUT_OF_RANGE,                    // SqlState = 'S1106'
-    DB_ERR_ROW_VALUE_OUT_OF_RANGE,                     // SqlState = 'S1107'
-    DB_ERR_CONCURRENCY_OPTION_OUT_OF_RANGE,            // SqlState = 'S1108'
-    DB_ERR_INVALID_CURSOR_POSITION,                    // SqlState = 'S1109'
-    DB_ERR_INVALID_DRIVER_COMPLETION,                  // SqlState = 'S1110'
-    DB_ERR_INVALID_BOOKMARK_VALUE,                     // SqlState = 'S1111'
-    DB_ERR_DRIVER_NOT_CAPABLE,                         // SqlState = 'S1C00'
-    DB_ERR_TIMEOUT_EXPIRED                             // SqlState = 'S1T00'
-};
-
-#ifndef MAXNAME
-    #define MAXNAME         31
-#endif
-
-#ifndef SQL_MAX_AUTHSTR_LEN
-    // There does not seem to be a standard for this, so I am
-    // defaulting to the value that MS uses
-    #define SQL_MAX_AUTHSTR_LEN MAXNAME
-#endif
-
-#ifndef SQL_MAX_CONNECTSTR_LEN
-    // There does not seem to be a standard for this, so I am
-    // defaulting to the value that MS recommends
-    #define SQL_MAX_CONNECTSTR_LEN 1024
-#endif
-
-
-class WXDLLIMPEXP_ODBC wxDbConnectInf
-{
-    private:
-        bool freeHenvOnDestroy;
-        bool useConnectionStr;
-
-    public:
-        HENV Henv;
-        wxChar Dsn[SQL_MAX_DSN_LENGTH+1];                  // Data Source Name
-        wxChar Uid[SQL_MAX_USER_NAME_LEN+1];               // User ID
-        wxChar AuthStr[SQL_MAX_AUTHSTR_LEN+1];             // Authorization string (password)
-        wxChar ConnectionStr[SQL_MAX_CONNECTSTR_LEN+1];    // Connection string (password)
-
-        wxString Description;                              // Not sure what the max length is
-        wxString FileType;                                 // Not sure what the max length is
-
-        // Optionals needed for some databases like dBase
-        wxString DefaultDir;                               // Directory that db file resides in
-
-    public:
-
-        wxDbConnectInf();
-        wxDbConnectInf(HENV henv, const wxString &dsn, const wxString &userID=wxEmptyString,
-                       const wxString &password=wxEmptyString, const wxString &defaultDir=wxEmptyString,
-                       const wxString &description=wxEmptyString, const wxString &fileType=wxEmptyString);
-
-        ~wxDbConnectInf();
-
-        bool             Initialize();
-
-        bool             AllocHenv();
-        void             FreeHenv();
-
-        // Accessors
-        const HENV       &GetHenv()          { return Henv; }
-
-        const wxChar    *GetDsn()           { return Dsn; }
-
-        const wxChar    *GetUid()           { return Uid; }
-        const wxChar    *GetUserID()        { return Uid; }
-
-        const wxChar    *GetAuthStr()       { return AuthStr; }
-        const wxChar    *GetPassword()      { return AuthStr; }
-
-        const wxChar    *GetConnectionStr() { return ConnectionStr; }
-        bool             UseConnectionStr() { return useConnectionStr; }
-
-        const wxChar    *GetDescription()   { return Description; }
-        const wxChar    *GetFileType()      { return FileType; }
-        const wxChar    *GetDefaultDir()    { return DefaultDir; }
-
-        void             SetHenv(const HENV henv)               { Henv = henv; }
-
-        void             SetDsn(const wxString &dsn);
-
-        void             SetUserID(const wxString &userID);
-        void             SetUid(const wxString &uid)            { SetUserID(uid); }
-
-        void             SetPassword(const wxString &password);
-        void             SetAuthStr(const wxString &authstr)    { SetPassword(authstr); }
-
-        void             SetConnectionStr(const wxString &connectStr);
-
-        void             SetDescription(const wxString &desc)   { Description   = desc;     }
-        void             SetFileType(const wxString &fileType)  { FileType      = fileType; }
-        void             SetDefaultDir(const wxString &defDir)  { DefaultDir    = defDir;   }
-};  // class wxDbConnectInf
-
-
-struct WXDLLIMPEXP_ODBC wxDbSqlTypeInfo
-{
-    wxString    TypeName;
-    SWORD       FsqlType;
-    long        Precision;
-    short       CaseSensitive;
-    short       MaximumScale;
-};
-
-
-class WXDLLIMPEXP_ODBC wxDbColFor
-{
-public:
-    wxString       s_Field;              // Formatted String for Output
-    wxString       s_Format[7];          // Formatted Objects - TIMESTAMP has the biggest (7)
-    wxString       s_Amount[7];          // Formatted Objects - amount of things that can be formatted
-    int            i_Amount[7];          // Formatted Objects - TT MM YYYY HH MM SS m
-    int            i_Nation;             // 0 = timestamp , 1=EU, 2=UK, 3=International, 4=US
-    int            i_dbDataType;         // conversion of the 'sqlDataType' to the generic data type used by these classes
-    SWORD          i_sqlDataType;
-
-    wxDbColFor();
-    ~wxDbColFor(){}
-
-    void           Initialize();
-    int            Format(int Nation, int dbDataType, SWORD sqlDataType, short columnLength, short decimalDigits);
-};
-
-
-class WXDLLIMPEXP_ODBC wxDbColInf
-{
-public:
-    wxChar       catalog[128+1];
-    wxChar       schema[128+1];
-    wxChar       tableName[DB_MAX_TABLE_NAME_LEN+1];
-    wxChar       colName[DB_MAX_COLUMN_NAME_LEN+1];
-    SWORD        sqlDataType;
-    wxChar       typeName[128+1];
-    SWORD        columnLength;
-    SWORD        bufferSize;
-    short        decimalDigits;
-    short        numPrecRadix;
-    short        nullable;
-    wxChar       remarks[254+1];
-    int          dbDataType;  // conversion of the 'sqlDataType' to the generic data type used by these classes
- // mj10777.19991224 : new
-    int          PkCol;       // Primary key column       0=No; 1= First Key, 2 = Second Key etc.
-    wxChar       PkTableName[DB_MAX_TABLE_NAME_LEN+1]; // Tables that use this PKey as a FKey
-    int          FkCol;       // Foreign key column       0=No; 1= First Key, 2 = Second Key etc.
-    wxChar       FkTableName[DB_MAX_TABLE_NAME_LEN+1]; // Foreign key table name
-    wxDbColFor  *pColFor;                              // How should this columns be formatted
-
-    wxDbColInf();
-    ~wxDbColInf();
-
-    bool Initialize();
-};
-
-
-class WXDLLIMPEXP_ODBC wxDbTableInf        // Description of a Table
-{
-public:
-    wxChar      tableName[DB_MAX_TABLE_NAME_LEN+1];
-    wxChar      tableType[254+1];           // "TABLE" or "SYSTEM TABLE" etc.
-    wxChar      tableRemarks[254+1];
-    UWORD       numCols;                    // How many Columns does this Table have: GetColumnCount(..);
-    wxDbColInf *pColInf;                    // pColInf = NULL ; User can later call GetColumns(..);
-
-    wxDbTableInf();
-    ~wxDbTableInf();
-
-    bool             Initialize();
-};
-
-
-class WXDLLIMPEXP_ODBC wxDbInf     // Description of a Database
-{
-public:
-    wxChar        catalog[128+1];
-    wxChar        schema[128+1];
-    int           numTables;           // How many tables does this database have
-    wxDbTableInf *pTableInf;           // pTableInf = new wxDbTableInf[numTables];
-
-    wxDbInf();
-    ~wxDbInf();
-
-    bool          Initialize();
-};
-
-
-enum wxDbSqlLogState
-{
-    sqlLogOFF,
-    sqlLogON
-};
-
-// These are the databases currently tested and working with these classes
-// See the comments in wxDb::Dbms() for exceptions/issues with
-// each of these database engines
-enum wxDBMS
-{
-    dbmsUNIDENTIFIED,
-    dbmsORACLE,
-    dbmsSYBASE_ASA,        // Adaptive Server Anywhere
-    dbmsSYBASE_ASE,        // Adaptive Server Enterprise
-    dbmsMS_SQL_SERVER,
-    dbmsMY_SQL,
-    dbmsPOSTGRES,
-    dbmsACCESS,
-    dbmsDBASE,
-    dbmsINFORMIX,
-    dbmsVIRTUOSO,
-    dbmsDB2,
-    dbmsINTERBASE,
-    dbmsPERVASIVE_SQL,
-    dbmsXBASE_SEQUITER,
-    dbmsFIREBIRD,
-    dbmsMAXDB,
-    dbmsFuture1,
-    dbmsFuture2,
-    dbmsFuture3,
-    dbmsFuture4,
-    dbmsFuture5,
-    dbmsFuture6,
-    dbmsFuture7,
-    dbmsFuture8,
-    dbmsFuture9,
-    dbmsFuture10
-};
-
-
-// The wxDb::errorList is copied to this variable when the wxDb object
-// is closed.  This way, the error list is still available after the
-// database object is closed.  This is necessary if the database
-// connection fails so the calling application can show the operator
-// why the connection failed.  Note: as each wxDb object is closed, it
-// will overwrite the errors of the previously destroyed wxDb object in
-// this variable.
-
-extern WXDLLIMPEXP_DATA_ODBC(wxChar)
-    DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN+1];
-
-
-class WXDLLIMPEXP_ODBC wxDb
-{
-private:
-    bool             dbIsOpen;
-    bool             dbIsCached;      // Was connection created by caching functions
-    bool             dbOpenedWithConnectionString;  // Was the database connection opened with a connection string
-    wxString         dsn;             // Data source name
-    wxString         uid;             // User ID
-    wxString         authStr;         // Authorization string (password)
-    wxString         inConnectionStr; // Connection string used to connect to the database
-    wxString         outConnectionStr;// Connection string returned by the database when a connection is successfully opened
-    FILE            *fpSqlLog;        // Sql Log file pointer
-    wxDbSqlLogState  sqlLogState;     // On or Off
-    bool             fwdOnlyCursors;
-    wxDBMS           dbmsType;        // Type of datasource - i.e. Oracle, dBase, SQLServer, etc
-
-    // Private member functions
-    bool             getDbInfo(bool failOnDataTypeUnsupported=true);
-    bool             getDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo);
-    bool             setConnectionOptions(void);
-    void             logError(const wxString &errMsg, const wxString &SQLState);
-    void             convertUserID(const wxChar *userID, wxString &UserID);
-    bool             determineDataTypes(bool failOnDataTypeUnsupported);
-    void             initialize();
-    bool             open(bool failOnDataTypeUnsupported=true);
-
-#if !wxODBC_BACKWARD_COMPATABILITY
-    // ODBC handles
-    HENV  henv;        // ODBC Environment handle
-    HDBC  hdbc;        // ODBC DB Connection handle
-    HSTMT hstmt;       // ODBC Statement handle
-
-    //Error reporting mode
-    bool silent;
-
-    // Number of Ctable objects connected to this db object.  FOR INTERNAL USE ONLY!!!
-    unsigned int nTables;
-
-    // Information about logical data types VARCHAR, INTEGER, FLOAT and DATE.
-     //
-    // This information is obtained from the ODBC driver by use of the
-    // SQLGetTypeInfo() function.  The key piece of information is the
-    // type name the data source uses for each logical data type.
-    // e.g. VARCHAR; Oracle calls it VARCHAR2.
-    wxDbSqlTypeInfo typeInfVarchar;
-    wxDbSqlTypeInfo typeInfInteger;
-    wxDbSqlTypeInfo typeInfFloat;
-    wxDbSqlTypeInfo typeInfDate;
-    wxDbSqlTypeInfo typeInfBlob;
-    wxDbSqlTypeInfo typeInfMemo;
-#endif
-
-public:
-
-    void             setCached(bool cached)  { dbIsCached = cached; }  // This function must only be called by wxDbGetConnection() and wxDbCloseConnections!!!
-    bool             IsCached() { return dbIsCached; }
-
-    bool             GetDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo)
-                            { return getDataTypeInfo(fSqlType, structSQLTypeInfo); }
-
-#if wxODBC_BACKWARD_COMPATABILITY
-    // ODBC handles
-    HENV  henv;        // ODBC Environment handle
-    HDBC  hdbc;        // ODBC DB Connection handle
-    HSTMT hstmt;       // ODBC Statement handle
-
-    //Error reporting mode
-    bool silent;
-
-    // Number of Ctable objects connected to this db object.  FOR INTERNAL USE ONLY!!!
-    unsigned int nTables;
-#endif
-
-    // The following structure contains database information gathered from the
-    // datasource when the datasource is first opened.
-    struct
-    {
-        wxChar dbmsName[40];                             // Name of the dbms product
-        wxChar dbmsVer[64];                              // Version # of the dbms product
-        wxChar driverName[40];                           // Driver name
-        wxChar odbcVer[60];                              // ODBC version of the driver
-        wxChar drvMgrOdbcVer[60];                        // ODBC version of the driver manager
-        wxChar driverVer[60];                            // Driver version
-        wxChar serverName[80];                           // Server Name, typically a connect string
-        wxChar databaseName[128];                        // Database filename
-        wxChar outerJoins[2];                            // Indicates whether the data source supports outer joins
-        wxChar procedureSupport[2];                      // Indicates whether the data source supports stored procedures
-        wxChar accessibleTables[2];                      // Indicates whether the data source only reports accessible tables in SQLTables.
-        UWORD  maxConnections;                           // Maximum # of connections the data source supports
-        UWORD  maxStmts;                                 // Maximum # of HSTMTs per HDBC
-        UWORD  apiConfLvl;                               // ODBC API conformance level
-        UWORD  cliConfLvl;                               // Indicates whether the data source is SAG compliant
-        UWORD  sqlConfLvl;                               // SQL conformance level
-        UWORD  cursorCommitBehavior;                     // Indicates how cursors are affected by a db commit
-        UWORD  cursorRollbackBehavior;                   // Indicates how cursors are affected by a db rollback
-        UWORD  supportNotNullClause;                     // Indicates if data source supports NOT NULL clause
-        wxChar supportIEF[2];                            // Integrity Enhancement Facility (Referential Integrity)
-        UDWORD txnIsolation;                             // Default transaction isolation level supported by the driver
-        UDWORD txnIsolationOptions;                      // Transaction isolation level options available
-        UDWORD fetchDirections;                          // Fetch directions supported
-        UDWORD lockTypes;                                // Lock types supported in SQLSetPos
-        UDWORD posOperations;                            // Position operations supported in SQLSetPos
-        UDWORD posStmts;                                 // Position statements supported
-        UDWORD scrollConcurrency;                        // Concurrency control options supported for scrollable cursors
-        UDWORD scrollOptions;                            // Scroll Options supported for scrollable cursors
-        UDWORD staticSensitivity;                        // Indicates if additions, deletions and updates can be detected
-        UWORD  txnCapable;                               // Indicates if the data source supports transactions
-        UDWORD loginTimeout;                             // Number seconds to wait for a login request
-    } dbInf;
-
-    // ODBC Error Inf.
-    SWORD  cbErrorMsg;
-    int    DB_STATUS;
-#ifdef __VMS
-   // The DECC compiler chokes when in db.cpp the array is accessed outside
-   // its bounds. Maybe this change should also applied for other platforms.
-    wxChar errorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN+1];
-#else
-    wxChar errorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
-#endif
-    wxChar errorMsg[SQL_MAX_MESSAGE_LENGTH];
-    SQLINTEGER nativeError;
-    wxChar sqlState[20];
-
-#if wxODBC_BACKWARD_COMPATABILITY
-    // Information about logical data types VARCHAR, INTEGER, FLOAT and DATE.
-     //
-    // This information is obtained from the ODBC driver by use of the
-    // SQLGetTypeInfo() function.  The key piece of information is the
-    // type name the data source uses for each logical data type.
-    // e.g. VARCHAR; Oracle calls it VARCHAR2.
-    wxDbSqlTypeInfo typeInfVarchar;
-    wxDbSqlTypeInfo typeInfInteger;
-    wxDbSqlTypeInfo typeInfFloat;
-    wxDbSqlTypeInfo typeInfDate;
-    wxDbSqlTypeInfo typeInfBlob;
-#endif
-
-    // Public member functions
-    wxDb(const HENV &aHenv, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS);
-    ~wxDb();
-
-    // Data Source Name, User ID, Password and whether open should fail on data type not supported
-    bool         Open(const wxString& inConnectStr, bool failOnDataTypeUnsupported=true);
-                    ///This version of Open will open the odbc source selection dialog. Cast a wxWindow::GetHandle() to SQLHWND to use.
-    bool         Open(const wxString& inConnectStr, SQLHWND parentWnd, bool failOnDataTypeUnsupported=true);
-    bool         Open(const wxString &Dsn, const wxString &Uid, const wxString &AuthStr, bool failOnDataTypeUnsupported=true);
-    bool         Open(wxDbConnectInf *dbConnectInf, bool failOnDataTypeUnsupported=true);
-    bool         Open(wxDb *copyDb);  // pointer to a wxDb whose connection info should be copied rather than re-queried
-    void         Close(void);
-    bool         CommitTrans(void);
-    bool         RollbackTrans(void);
-    bool         DispAllErrors(HENV aHenv, HDBC aHdbc = SQL_NULL_HDBC, HSTMT aHstmt = SQL_NULL_HSTMT);
-    bool         GetNextError(HENV aHenv, HDBC aHdbc = SQL_NULL_HDBC, HSTMT aHstmt = SQL_NULL_HSTMT);
-    void         DispNextError(void);
-    bool         CreateView(const wxString &viewName, const wxString &colList, const wxString &pSqlStmt, bool attemptDrop=true);
-    bool         DropView(const wxString &viewName);
-    bool         ExecSql(const wxString &pSqlStmt);
-    bool         ExecSql(const wxString &pSqlStmt, wxDbColInf** columns, short& numcols);
-    bool         GetNext(void);
-    bool         GetData(UWORD colNo, SWORD cType, PTR pData, SDWORD maxLen, SQLLEN FAR *cbReturned);
-    bool         Grant(int privileges, const wxString &tableName, const wxString &userList = wxT("PUBLIC"));
-    int          TranslateSqlState(const wxString &SQLState);
-    wxDbInf     *GetCatalog(const wxChar *userID=NULL);
-    bool         Catalog(const wxChar *userID=NULL, const wxString &fileName=SQL_CATALOG_FILENAME);
-    int          GetKeyFields(const wxString &tableName, wxDbColInf* colInf, UWORD noCols);
-
-    wxDbColInf  *GetColumns(wxChar *tableName[], const wxChar *userID=NULL);
-    wxDbColInf  *GetColumns(const wxString &tableName, UWORD *numCols, const wxChar *userID=NULL);
-
-    int             GetColumnCount(const wxString &tableName, const wxChar *userID=NULL);
-    const wxChar   *GetDatabaseName(void)  {return dbInf.dbmsName;}
-    const wxString &GetDataSource(void)    {return dsn;}
-    const wxString &GetDatasourceName(void){return dsn;}
-    const wxString &GetUsername(void)      {return uid;}
-    const wxString &GetPassword(void)      {return authStr;}
-    const wxString &GetConnectionInStr(void)  {return inConnectionStr;}
-    const wxString &GetConnectionOutStr(void) {return outConnectionStr;}
-    bool            IsOpen(void)           {return dbIsOpen;}
-    bool            OpenedWithConnectionString(void) {return dbOpenedWithConnectionString;}
-    HENV            GetHENV(void)          {return henv;}
-    HDBC            GetHDBC(void)          {return hdbc;}
-    HSTMT           GetHSTMT(void)         {return hstmt;}
-    int             GetTableCount()        {return nTables;}  // number of tables using this connection
-    wxDbSqlTypeInfo GetTypeInfVarchar()    {return typeInfVarchar;}
-    wxDbSqlTypeInfo GetTypeInfInteger()    {return typeInfInteger;}
-    wxDbSqlTypeInfo GetTypeInfFloat()      {return typeInfFloat;}
-    wxDbSqlTypeInfo GetTypeInfDate()       {return typeInfDate;}
-    wxDbSqlTypeInfo GetTypeInfBlob()       {return typeInfBlob;}
-    wxDbSqlTypeInfo GetTypeInfMemo()       {return typeInfMemo;}
-
-    // tableName can refer to a table, view, alias or synonym
-    bool         TableExists(const wxString &tableName, const wxChar *userID=NULL,
-                             const wxString &tablePath=wxEmptyString);
-    bool         TablePrivileges(const wxString &tableName, const wxString &priv,
-                                 const wxChar *userID=NULL, const wxChar *schema=NULL,
-                                 const wxString &path=wxEmptyString);
-
-    // These two functions return the table name or column name in a form ready
-    // for use in SQL statements.  For example, if the datasource allows spaces
-    // in the table name or column name, the returned string will have the
-    // correct enclosing marks around the name to allow it to be properly
-    // included in a SQL statement
-    const wxString  SQLTableName(const wxChar *tableName);
-    const wxString  SQLColumnName(const wxChar *colName);
-
-    void         LogError(const wxString &errMsg, const wxString &SQLState = wxEmptyString)
-                        { logError(errMsg, SQLState); }
-    void         SetDebugErrorMessages(bool state) { silent = !state; }
-    bool         SetSqlLogging(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME,
-                               bool append = false);
-    bool         WriteSqlLog(const wxString &logMsg);
-
-    wxDBMS       Dbms(void);
-    bool         ModifyColumn(const wxString &tableName, const wxString &columnName,
-                              int dataType, ULONG columnLength=0,
-                              const wxString &optionalParam=wxEmptyString);
-
-    bool         FwdOnlyCursors(void)  {return fwdOnlyCursors;}
-
-    // return the string with all special SQL characters escaped
-    wxString     EscapeSqlChars(const wxString& value);
-
-    // These two functions are provided strictly for use by wxDbTable.
-    // DO NOT USE THESE FUNCTIONS, OR MEMORY LEAKS MAY OCCUR
-    void         incrementTableCount() { nTables++; return; }
-    void         decrementTableCount() { nTables--; return; }
-
-};  // wxDb
-
-
-// This structure forms a node in a linked list.  The linked list of "DbList" objects
-// keeps track of allocated database connections.  This allows the application to
-// open more than one database connection through ODBC for multiple transaction support
-// or for multiple database support.
-struct wxDbList
-{
-    wxDbList *PtrPrev;       // Pointer to previous item in the list
-    wxString  Dsn;           // Data Source Name
-    wxString  Uid;           // User ID
-    wxString  AuthStr;       // Authorization string (password)
-    wxString  ConnectionStr; // Connection string used instead of DSN
-    wxDb     *PtrDb;         // Pointer to the wxDb object
-    bool      Free;          // Is item free or in use?
-    wxDbList *PtrNext;       // Pointer to next item in the list
-};
-
-
-#ifdef __WXDEBUG__
-#include "wx/object.h"
-class wxTablesInUse : public wxObject
-{
-    public:
-        const wxChar  *tableName;
-        ULONG          tableID;
-        class wxDb    *pDb;
-};  // wxTablesInUse
-#endif
-
-
-// The following routines allow a user to get new database connections, free them
-// for other code segments to use, or close all of them when the application has
-// completed.
-wxDb  WXDLLIMPEXP_ODBC *wxDbGetConnection(wxDbConnectInf *pDbConfig, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS);
-bool  WXDLLIMPEXP_ODBC  wxDbFreeConnection(wxDb *pDb);
-void  WXDLLIMPEXP_ODBC  wxDbCloseConnections(void);
-int   WXDLLIMPEXP_ODBC  wxDbConnectionsInUse(void);
-
-
-// Writes a message to the wxLog window (stdout usually) when an internal error
-// situation occurs.  This function only works in DEBUG builds
-const wxChar WXDLLIMPEXP_ODBC *
-wxDbLogExtendedErrorMsg(const wxChar *userText,
-                        wxDb *pDb,
-                        const wxChar *ErrFile,
-                        int ErrLine);
-
-
-// This function sets the sql log state for all open wxDb objects
-bool WXDLLIMPEXP_ODBC
-wxDbSqlLog(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME);
-
-
-#if 0
-// MSW/VC6 ONLY!!!  Experimental
-int WXDLLEXPORT wxDbCreateDataSource(const wxString &driverName, const wxString &dsn, const wxString &description=wxEmptyString,
-                                     bool sysDSN=false, const wxString &defDir=wxEmptyString, wxWindow *parent=NULL);
-#endif
-
-// This routine allows you to query a driver manager
-// for a list of available datasources.  Call this routine
-// the first time using SQL_FETCH_FIRST.  Continue to call it
-// using SQL_FETCH_NEXT until you've exhausted the list.
-bool WXDLLIMPEXP_ODBC
-wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMaxLength, wxChar *DsDesc,
-                  SWORD DsDescMaxLength, UWORD direction = SQL_FETCH_NEXT);
-
-
-// Change this to 0 to remove use of all deprecated functions
-#if wxODBC_BACKWARD_COMPATABILITY
-//#################################################################################
-//############### DEPRECATED functions for backward compatibility #################
-//#################################################################################
-
-// Backward compability structures/classes.  This will eventually go away
-const int DB_PATH_MAX      = wxDB_PATH_MAX;
-
-typedef wxDb                 wxDB;
-typedef wxDbTableInf         wxTableInf;
-typedef wxDbColInf           wxColInf;
-typedef wxDbColInf           CcolInf;
-typedef wxDbColFor           wxColFor;
-typedef wxDbSqlTypeInfo      SqlTypeInfo;
-typedef wxDbSqlTypeInfo      wxSqlTypeInfo;
-typedef enum wxDbSqlLogState sqlLog;
-typedef enum wxDbSqlLogState wxSqlLogState;
-typedef enum wxDBMS          dbms;
-typedef enum wxDBMS          DBMS;
-typedef wxODBC_ERRORS        ODBC_ERRORS;
-typedef wxDbConnectInf       DbStuff;
-typedef wxDbList             DbList;
-#ifdef __WXDEBUG__
-typedef wxTablesInUse        CstructTablesInUse;
-#endif
-
-// Deprecated function names that are replaced by the function names listed above
-wxDB  WXDLLIMPEXP_ODBC
-*GetDbConnection(DbStuff *pDbStuff, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS);
-bool  WXDLLIMPEXP_ODBC  FreeDbConnection(wxDB *pDb);
-void  WXDLLIMPEXP_ODBC  CloseDbConnections(void);
-int   WXDLLIMPEXP_ODBC  NumberDbConnectionsInUse(void);
-
-bool SqlLog(sqlLog state, const wxChar *filename = SQL_LOG_FILENAME);
-
-bool WXDLLIMPEXP_ODBC
-GetDataSource(HENV henv, char *Dsn, SWORD DsnMaxLength, char *DsDesc, SWORD DsDescMaxLength,
-              UWORD direction = SQL_FETCH_NEXT);
-
-#endif  // Deprecated structures/classes/functions
-
-#endif // _WX_DB_H_
-
diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h
deleted file mode 100644 (file)
index b08f2c6..0000000
+++ /dev/null
@@ -1,177 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        dbgrid.h
-// Purpose:     Displays a wxDbTable in a wxGrid.
-// Author:      Roger Gammans, Paul Gammans
-// Modified by:
-// Created:
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999 The Computer Surgery (roger@computer-surgery.co.uk)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-// Branched From : dbgrid.h,v 1.19 2001/03/28 11:16:01
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GENERIC_DBGRID_H_
-#define _WX_GENERIC_DBGRID_H_
-
-#if wxUSE_ODBC
-#if wxUSE_GRID
-
-#include "wx/log.h"
-#include "wx/dbtable.h"
-#include "wx/dynarray.h"
-#include "wx/grid.h"
-#include "wx/dbkeyg.h"
-
-#define wxGRID_VALUE_DBAUTO     _T("dbauto")
-
-WX_DECLARE_USER_EXPORTED_OBJARRAY(GenericKey,keyarray,WXDLLIMPEXP_DBGRID);
-
-static const int wxUSE_QUERY = -1;
-
-class WXDLLIMPEXP_DBGRID wxDbGridColInfoBase
-{
-public:
-    //Default ctor
-    wxDbGridColInfoBase() { }
-    wxDbGridColInfoBase(int colNo,
-                        wxString type, wxString title) :
-                        DbCol(colNo),
-                        wxtypename(type),
-                        Title(title)
-                        { }
-    //Copy Ctor
-    wxDbGridColInfoBase(const wxDbGridColInfoBase& ref)
-    {
-        DbCol       = ref.DbCol;
-        wxtypename  = ref.wxtypename;
-        Title       = ref.Title;
-    }
-    //Empty destructor for member obj's
-    ~wxDbGridColInfoBase() {}
-
-    int        DbCol;
-    wxString   wxtypename;
-    wxString   Title;
-};
-
-
-class WXDLLIMPEXP_DBGRID wxDbGridColInfo
-{
-public:
-    wxDbGridColInfo(int colNo,
-                    wxString type,
-                    wxString title,
-                    wxDbGridColInfo *next) :
-        m_data(colNo,type,title)
-    {
-        m_next=next;
-    }
-
-    //Empty List
-    ~wxDbGridColInfo() { delete m_next; }
-
-    //Recurse to find length.
-    int Length() { return (m_next ? m_next->Length() +1 :  1); }
-
-    // Adds a new column info (2 step creation)
-    void AddColInfo (int colNo,
-                    wxString type,
-                    wxString title)
-    {
-        GetLast()->m_next = new wxDbGridColInfo (colNo, type, title, NULL);
-    }
-
-    // Searches last
-    wxDbGridColInfo *GetLast() { return (m_next ? m_next->GetLast() : this); }
-
-
-    protected:
-    wxDbGridColInfoBase  m_data;
-    wxDbGridColInfo     *m_next;
-
-    friend class wxDbGridTableBase;
-};
-
-
-class WXDLLIMPEXP_DBGRID wxDbGridCellAttrProvider : public wxGridCellAttrProvider
-{
-public:
-    wxDbGridCellAttrProvider();
-    wxDbGridCellAttrProvider(wxDbTable *tab, wxDbGridColInfoBase* ColInfo);
-    virtual ~wxDbGridCellAttrProvider();
-
-    virtual wxGridCellAttr *GetAttr(int row, int col,
-                                    wxGridCellAttr::wxAttrKind kind) const;
-    virtual void AssignDbTable(wxDbTable *tab);
-private:
-    wxDbTable           *m_data;
-    wxDbGridColInfoBase *m_ColInfo;
-};
-
-
-class WXDLLIMPEXP_DBGRID wxDbGridTableBase : public wxGridTableBase
-{
-public:
-    wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo *ColInfo,
-              int count = wxUSE_QUERY, bool takeOwnership = true);
-    virtual ~wxDbGridTableBase();
-
-    virtual int GetNumberRows()
-    {
-        wxLogDebug(_T(" GetNumberRows() = %i"),m_rowtotal);
-        return m_rowtotal;
-    }
-    virtual int GetNumberCols()
-    {
-        wxLogDebug(_T(" GetNumberCols() = %i"),m_nocols);
-        return m_nocols;
-    }
-    virtual bool     IsEmptyCell(int row, int col) ;
-    virtual wxString GetValue(int row, int col) ;
-    virtual void     SetValue(int row, int col, const wxString& value);
-    virtual bool     CanHaveAttributes();
-    virtual wxString GetTypeName(int row, int col);
-    virtual bool     CanGetValueAs(int row, int col, const wxString& typeName);
-    virtual bool     CanSetValueAs(int row, int col, const wxString& typeName);
-    virtual long     GetValueAsLong(int row, int col);
-    virtual double   GetValueAsDouble(int row, int col);
-    virtual bool     GetValueAsBool(int row, int col);
-    virtual void     SetValueAsLong(int row, int col, long value);
-    virtual void     SetValueAsDouble(int row, int col, double value);
-    virtual void     SetValueAsBool(int row, int col, bool value);
-    virtual void    *GetValueAsCustom(int row, int col, const wxString& typeName);
-    virtual void     SetValueAsCustom(int row, int col, const wxString& typeName, void* value);
-
-
-    virtual wxString GetColLabelValue(int col);
-
-    virtual bool     AssignDbTable(wxDbTable *tab, int count = wxUSE_QUERY, bool takeOwnership=true);
-    virtual void     ValidateRow(int row);
-    virtual bool     UpdateRow(int row) const
-    {
-        if (m_row != row)
-            return true;
-        else
-            return Writeback();
-    }
-
-private:
-    //Operates on the current row
-    bool Writeback() const;
-
-    typedef wxGridTableBase inherited;
-    keyarray     m_keys;
-    wxDbTable   *m_data;
-    bool         m_dbowner;
-    int          m_rowtotal;
-    int          m_nocols;
-    int          m_row;
-    wxDbGridColInfoBase *m_ColInfo;
-    bool         m_rowmodified;
-};
-
-#endif  // #if wxUSE_GRID
-#endif  // #if wxUSE_ODBC
-
-#endif  // _WX_GENERIC_DBGRID_H_
diff --git a/include/wx/dbkeyg.h b/include/wx/dbkeyg.h
deleted file mode 100644 (file)
index 1c6f8da..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        dbkeyg.h
-// Purpose:     Generic key support for wxDbTable
-// Author:      Roger Gammans
-// Modified by:
-// Created:
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999 The Computer Surgery (roger@computer-surgery.co.uk)
-// Licence:     wxWindows licence
-//
-// NOTE : There is no CPP file to go along with this
-//
-///////////////////////////////////////////////////////////////////////////////
-// Branched From : gkey.h,v 1.3 2001/06/01 10:31:41
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DBGKEY_H_
-#define _WX_DBGKEY_H_
-
-class GenericKey
-{
-public:
-    GenericKey(void *blk, size_t sz)    { clone(blk,sz); }
-    GenericKey(const GenericKey &ref)   { clone(ref.m_data,ref.m_sz); }
-    ~GenericKey()                       { free(m_data); }
-
-    void *GetBlk(void) const { return m_data; }
-
-private:
-    void clone(void *blk, size_t sz)
-    {
-        m_data = malloc(sz);
-        memcpy(m_data,blk,sz);
-        m_sz = sz;
-    }
-
-    void   *m_data;
-    size_t  m_sz;
-};
-
-#endif // _WX_DBGKEY_H_
diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h
deleted file mode 100644 (file)
index 8d7de73..0000000
+++ /dev/null
@@ -1,370 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        dbtable.h
-// Purpose:     Declaration of the wxDbTable class.
-// Author:      Doug Card
-// Modified by: George Tasker
-//              Bart Jourquin
-//              Mark Johnson
-// Created:     9.96
-// RCS-ID:      $Id$
-// Copyright:   (c) 1996 Remstar International, Inc.
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-/*
-// SYNOPSIS START
-// SYNOPSIS STOP
-*/
-
-#ifndef DBTABLE_DOT_H
-#define DBTABLE_DOT_H
-
-#include "wx/defs.h"
-
-#include "wx/db.h"
-
-#include "wx/variant.h"
-#include "wx/dbkeyg.h"
-
-const int   wxDB_ROWID_LEN       = 24;  // 18 is the max, 24 is in case it gets larger
-const int   wxDB_DEFAULT_CURSOR  = 0;
-const bool  wxDB_QUERY_ONLY      = true;
-const bool  wxDB_DISABLE_VIEW    = true;
-
-// Used to indicate end of a variable length list of
-// column numbers passed to member functions
-const int   wxDB_NO_MORE_COLUMN_NUMBERS = -1;
-
-// The following class is used to define a column of a table.
-// The wxDbTable constructor will dynamically allocate as many of
-// these as there are columns in the table.  The class derived
-// from wxDbTable must initialize these column definitions in it's
-// constructor.  These column definitions provide inf. to the
-// wxDbTable class which allows it to create a table in the data
-// source, exchange data between the data source and the C++
-// object, and so on.
-class WXDLLIMPEXP_ODBC wxDbColDef
-{
-public:
-    wxChar  ColName[DB_MAX_COLUMN_NAME_LEN+1];  // Column Name
-    int     DbDataType;                         // Logical Data Type; e.g. DB_DATA_TYPE_INTEGER
-    SWORD   SqlCtype;                           // C data type; e.g. SQL_C_LONG
-    void   *PtrDataObj;                         // Address of the data object
-    int     SzDataObj;                          // Size, in bytes, of the data object
-    bool    KeyField;                           // true if this column is part of the PRIMARY KEY to the table; Date fields should NOT be KeyFields.
-    bool    Updateable;                         // Specifies whether this column is updateable
-    bool    InsertAllowed;                      // Specifies whether this column should be included in an INSERT statement
-    bool    DerivedCol;                         // Specifies whether this column is a derived value
-    SQLLEN  CbValue;                            // Internal use only!!! For parameter bindings
-    bool    Null;                               // NOT FULLY IMPLEMENTED - Allows NULL values in Inserts and Updates
-    SQLLEN  CbValueCol;                         // Internal use only!!! For column bindings
-
-    wxDbColDef();
-
-    bool    Initialize();
-};  // wxDbColDef
-
-
-class WXDLLIMPEXP_ODBC wxDbColDataPtr
-{
-public:
-    void    *PtrDataObj;
-    int      SzDataObj;
-    SWORD    SqlCtype;
-};  // wxDbColDataPtr
-
-
-// This structure is used when creating secondary indexes.
-class WXDLLIMPEXP_ODBC wxDbIdxDef
-{
-public:
-    wxChar  ColName[DB_MAX_COLUMN_NAME_LEN+1];
-    bool    Ascending;
-};  // wxDbIdxDef
-
-
-class WXDLLIMPEXP_ODBC wxDbTable
-{
-private:
-    ULONG       tableID;  // Used for debugging.  This can help to match up mismatched constructors/destructors
-
-    // Private member variables
-    UDWORD      cursorType;
-    bool        insertable;
-
-    // Private member functions
-    bool        initialize(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns,
-                       const wxString &qryTblName, bool qryOnly, const wxString &tblPath);
-    void        cleanup();
-
-    void        setCbValueForColumn(int columnIndex);
-    bool        bindParams(bool forUpdate);  // called by the other 'bind' functions
-    bool        bindInsertParams(void);
-    bool        bindUpdateParams(void);
-
-    bool        bindCols(HSTMT cursor);
-    bool        getRec(UWORD fetchType);
-    bool        execDelete(const wxString &pSqlStmt);
-    bool        execUpdate(const wxString &pSqlStmt);
-    bool        query(int queryType, bool forUpdate, bool distinct, const wxString &pSqlStmt=wxEmptyString);
-
-#if !wxODBC_BACKWARD_COMPATABILITY
-// these were public
-    // Where, Order By and From clauses
-    wxString    where;               // Standard SQL where clause, minus the word WHERE
-    wxString    orderBy;             // Standard SQL order by clause, minus the ORDER BY
-    wxString    from;                // Allows for joins in a wxDbTable::Query().  Format: ",tbl,tbl..."
-
-    // ODBC Handles
-    HENV        henv;           // ODBC Environment handle
-    HDBC        hdbc;           // ODBC DB Connection handle
-    HSTMT       hstmt;          // ODBC Statement handle
-    HSTMT      *hstmtDefault;   // Default cursor
-    HSTMT       hstmtInsert;    // ODBC Statement handle used specifically for inserts
-    HSTMT       hstmtDelete;    // ODBC Statement handle used specifically for deletes
-    HSTMT       hstmtUpdate;    // ODBC Statement handle used specifically for updates
-    HSTMT       hstmtInternal;  // ODBC Statement handle used internally only
-    HSTMT      *hstmtCount;     // ODBC Statement handle used by Count() function (No binding of columns)
-
-    // Flags
-    bool        selectForUpdate;
-
-    // Pointer to the database object this table belongs to
-    wxDb       *pDb;
-
-    // Table Inf.
-    wxString    tablePath;                                 // needed for dBase tables
-    wxString    tableName;                                 // Table name
-    wxString    queryTableName;                            // Query Table Name
-    UWORD       m_numCols;                               // # of columns in the table
-    bool        queryOnly;                                 // Query Only, no inserts, updates or deletes
-
-    // Column Definitions
-    wxDbColDef *colDefs;         // Array of wxDbColDef structures
-#endif
-public:
-#if wxODBC_BACKWARD_COMPATABILITY
-    // Where, Order By and From clauses
-    char       *where;          // Standard SQL where clause, minus the word WHERE
-    char       *orderBy;        // Standard SQL order by clause, minus the ORDER BY
-    char       *from;           // Allows for joins in a wxDbTable::Query().  Format: ",tbl,tbl..."
-
-    // ODBC Handles
-    HENV        henv;           // ODBC Environment handle
-    HDBC        hdbc;           // ODBC DB Connection handle
-    HSTMT       hstmt;          // ODBC Statement handle
-    HSTMT      *hstmtDefault;   // Default cursor
-    HSTMT       hstmtInsert;    // ODBC Statement handle used specifically for inserts
-    HSTMT       hstmtDelete;    // ODBC Statement handle used specifically for deletes
-    HSTMT       hstmtUpdate;    // ODBC Statement handle used specifically for updates
-    HSTMT       hstmtInternal;  // ODBC Statement handle used internally only
-    HSTMT      *hstmtCount;     // ODBC Statement handle used by Count() function (No binding of columns)
-
-    // Flags
-    bool        selectForUpdate;
-
-    // Pointer to the database object this table belongs to
-    wxDb       *pDb;
-
-    // Table Inf.
-    char        tablePath[wxDB_PATH_MAX];                  // needed for dBase tables
-    char        tableName[DB_MAX_TABLE_NAME_LEN+1];        // Table name
-    char        queryTableName[DB_MAX_TABLE_NAME_LEN+1];   // Query Table Name
-    UWORD       m_numCols;                               // # of columns in the table
-    bool        queryOnly;                                 // Query Only, no inserts, updates or deletes
-
-    // Column Definitions
-    wxDbColDef *colDefs;         // Array of wxDbColDef structures
-#endif
-    // Public member functions
-    wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns,
-              const wxString &qryTblName=wxEmptyString, bool qryOnly = !wxDB_QUERY_ONLY,
-              const wxString &tblPath=wxEmptyString);
-
-    virtual ~wxDbTable();
-
-    bool            Open(bool checkPrivileges=false, bool checkTableExists=true);
-    bool            CreateTable(bool attemptDrop=true);
-    bool            DropTable(void);
-    bool            CreateIndex(const wxString &indexName, bool unique, UWORD numIndexColumns,
-                                wxDbIdxDef *pIndexDefs, bool attemptDrop=true);
-    bool            DropIndex(const wxString &indexName);
-
-    // Accessors
-
-    // The member variables returned by these accessors are all
-    // set when the wxDbTable instance is created and cannot be
-    // changed, hence there is no corresponding SetXxxx function
-    wxDb           *GetDb()              { return pDb; }
-    const wxString &GetTableName()       { return tableName; }
-    const wxString &GetQueryTableName()  { return queryTableName; }
-    const wxString &GetTablePath()       { return tablePath; }
-
-    UWORD           GetNumberOfColumns() { return m_numCols; }  // number of "defined" columns for this wxDbTable instance
-
-    const wxString &GetFromClause()      { return from; }
-    const wxString &GetOrderByClause()   { return orderBy; }
-    const wxString &GetWhereClause()     { return where; }
-
-    bool            IsQueryOnly()        { return queryOnly; }
-#if wxODBC_BACKWARD_COMPATABILITY
-    void            SetFromClause(const char *From) { from = (char *)From; }
-    void            SetOrderByClause(const char *OrderBy) { orderBy = (char *)OrderBy; }
-    void            SetWhereClause(const char *Where) { where = (char *)Where; }
-#else
-    void            SetFromClause(const wxString &From) { from = From; }
-    void            SetOrderByClause(const wxString &OrderBy) { orderBy = OrderBy; }
-    bool            SetOrderByColNums(UWORD first, ...);
-    void            SetWhereClause(const wxString &Where) { where = Where; }
-    void            From(const wxString &From) { from = From; }
-    void            OrderBy(const wxString &OrderBy) { orderBy = OrderBy; }
-    void            Where(const wxString &Where) { where = Where; }
-    const wxString &Where()   { return where; }
-    const wxString &OrderBy() { return orderBy; }
-    const wxString &From()    { return from; }
-#endif
-    int             Insert(void);
-    bool            Update(void);
-    bool            Update(const wxString &pSqlStmt);
-    bool            UpdateWhere(const wxString &pWhereClause);
-    bool            Delete(void);
-    bool            DeleteWhere(const wxString &pWhereClause);
-    bool            DeleteMatching(void);
-    virtual bool    Query(bool forUpdate = false, bool distinct = false);
-    bool            QueryBySqlStmt(const wxString &pSqlStmt);
-    bool            QueryMatching(bool forUpdate = false, bool distinct = false);
-    bool            QueryOnKeyFields(bool forUpdate = false, bool distinct = false);
-    bool            Refresh(void);
-    bool            GetNext(void)   { return(getRec(SQL_FETCH_NEXT));  }
-    bool            operator++(int) { return(getRec(SQL_FETCH_NEXT));  }
-
-    /***** These four functions only work with wxDb instances that are defined  *****
-     ***** as not being FwdOnlyCursors                                          *****/
-    bool            GetPrev(void);
-    bool            operator--(int);
-    bool            GetFirst(void);
-    bool            GetLast(void);
-
-    bool            IsCursorClosedOnCommit(void);
-    UWORD           GetRowNum(void);
-
-    void            BuildSelectStmt(wxString &pSqlStmt, int typeOfSelect, bool distinct);
-    void            BuildSelectStmt(wxChar *pSqlStmt, int typeOfSelect, bool distinct);
-
-    void            BuildDeleteStmt(wxString &pSqlStmt, int typeOfDel, const wxString &pWhereClause=wxEmptyString);
-    void            BuildDeleteStmt(wxChar *pSqlStmt, int typeOfDel, const wxString &pWhereClause=wxEmptyString);
-
-    void            BuildUpdateStmt(wxString &pSqlStmt, int typeOfUpdate, const wxString &pWhereClause=wxEmptyString);
-    void            BuildUpdateStmt(wxChar *pSqlStmt, int typeOfUpdate, const wxString &pWhereClause=wxEmptyString);
-
-    void            BuildWhereClause(wxString &pWhereClause, int typeOfWhere, const wxString &qualTableName=wxEmptyString, bool useLikeComparison=false);
-    void            BuildWhereClause(wxChar *pWhereClause, int typeOfWhere, const wxString &qualTableName=wxEmptyString, bool useLikeComparison=false);
-
-#if wxODBC_BACKWARD_COMPATABILITY
-// The following member functions are deprecated.  You should use the BuildXxxxxStmt functions (above)
-    void            GetSelectStmt(char *pSqlStmt, int typeOfSelect, bool distinct)
-                           { BuildSelectStmt(pSqlStmt,typeOfSelect,distinct); }
-    void            GetDeleteStmt(char *pSqlStmt, int typeOfDel, const char *pWhereClause = NULL)
-                           { BuildDeleteStmt(pSqlStmt,typeOfDel,pWhereClause); }
-    void            GetUpdateStmt(char *pSqlStmt, int typeOfUpdate, const char *pWhereClause = NULL)
-                           { BuildUpdateStmt(pSqlStmt,typeOfUpdate,pWhereClause); }
-    void            GetWhereClause(char *pWhereClause, int typeOfWhere,
-                                   const char *qualTableName = NULL, bool useLikeComparison=false)
-                           { BuildWhereClause(pWhereClause,typeOfWhere,qualTableName,useLikeComparison); }
-#endif
-    bool            CanSelectForUpdate(void);
-#if wxODBC_BACKWARD_COMPATABILITY
-    bool            CanUpdByROWID(void) { return CanUpdateByRowID(); };
-#endif
-    bool            CanUpdateByROWID(void);
-    void            ClearMemberVar(UWORD colNumber, bool setToNull=false);
-    void            ClearMemberVars(bool setToNull=false);
-    bool            SetQueryTimeout(UDWORD nSeconds);
-
-    wxDbColDef     *GetColDefs() { return colDefs; }
-    bool            SetColDefs(UWORD index, const wxString &fieldName, int dataType,
-                               void *pData, SWORD cType,
-                               int size, bool keyField = false, bool updateable = true,
-                               bool insertAllowed = true, bool derivedColumn = false);
-    wxDbColDataPtr *SetColDefs(wxDbColInf *colInfs, UWORD numCols);
-
-    bool            CloseCursor(HSTMT cursor);
-    bool            DeleteCursor(HSTMT *hstmtDel);
-    void            SetCursor(HSTMT *hstmtActivate = (void **) wxDB_DEFAULT_CURSOR);
-    HSTMT           GetCursor(void) { return(hstmt); }
-    HSTMT          *GetNewCursor(bool setCursor = false, bool bindColumns = true);
-#if wxODBC_BACKWARD_COMPATABILITY
-// The following member function is deprecated.  You should use the GetNewCursor
-    HSTMT          *NewCursor(bool setCursor = false, bool bindColumns = true) {  return GetNewCursor(setCursor,bindColumns); }
-#endif
-
-    ULONG           Count(const wxString &args=_T("*"));
-    int             DB_STATUS(void) { return(pDb->DB_STATUS); }
-
-    bool            IsColNull(UWORD colNumber) const;
-    bool            SetColNull(UWORD colNumber, bool set=true);
-    bool            SetColNull(const wxString &colName, bool set=true);
-#if wxODBC_BACKWARD_COMPATABILITY
-// The following member functions are deprecated.  You should use the SetColNull()
-    bool            SetNull(int colNumber, bool set=true) { return (SetNull(colNumber,set)); }
-    bool            SetNull(const char *colName, bool set=true) { return (SetNull(colName,set)); }
-#endif
-#ifdef __WXDEBUG__
-    ULONG           GetTableID() { return tableID; }
-#endif
-
-//TODO: Need to Document
-    typedef     enum  { WX_ROW_MODE_QUERY , WX_ROW_MODE_INDIVIDUAL } rowmode_t;
-    virtual     void         SetRowMode(const rowmode_t rowmode);
-#if wxODBC_BACKWARD_COMPATABILITY
-    virtual     wxVariant    GetCol(const int colNumber) const { return GetColumn(colNumber); };
-    virtual     void         SetCol(const int colNumber, const wxVariant value)  { return SetColumn(colNumber, value); };
-#endif
-    virtual     wxVariant    GetColumn(const int colNumber) const ;
-    virtual     void         SetColumn(const int colNumber, const wxVariant value);
-    virtual     GenericKey   GetKey(void);
-    virtual     void         SetKey(const GenericKey &key);
-
-    private:
-        HSTMT      *m_hstmtGridQuery;
-        rowmode_t   m_rowmode;
-        size_t      m_keysize;
-
-//      typedef enum {unmodified=0, UpdatePending, InsertPending } recStatus;
-
-//      recStatus  get_ModifiedStatus() { return m_recstatus; }
-
-//      void modify() {
-//          if (m_recstatus==unmodified)
-//              m_recstatus=UpdatePending;
-//      }
-//  protected:
-//      void insertify() {m_recstatus=InsertPending; }
-//      void unmodify() {m_recstatus=unmodified; }
-//      recStatus m_recstatus;
-//TODO: Need to Document
-};  // wxDbTable
-
-
-// Change this to 0 to remove use of all deprecated functions
-#if wxODBC_BACKWARD_COMPATABILITY
-//#################################################################################
-//############### DEPRECATED functions for backward compatibility #################
-//#################################################################################
-
-// Backward compability.  These will eventually go away
-typedef wxDbTable       wxTable;
-typedef wxDbIdxDef      wxIdxDef;
-typedef wxDbIdxDef      CidxDef;
-typedef wxDbColDef      wxColDef;
-typedef wxDbColDef      CcolDef;
-typedef wxDbColDataPtr  wxColDataPtr;
-typedef wxDbColDataPtr  CcolDataPtr;
-
-const int   ROWID           = wxDB_ROWID_LEN;
-const int   DEFAULT_CURSOR  = wxDB_DEFAULT_CURSOR;
-const bool  QUERY_ONLY      = wxDB_QUERY_ONLY;
-const bool  DISABLE_VIEW    = wxDB_DISABLE_VIEW;
-#endif
-
-#endif
index b429d2d938647ff75ea1949e357669898848fff4..13078ba56349ea0fc72eef08715a8e7e4c218d3c 100644 (file)
@@ -81,8 +81,6 @@
 #    define WXMAKINGDLL_CORE
 #    define WXMAKINGDLL_ADV
 #    define WXMAKINGDLL_QA
-#    define WXMAKINGDLL_ODBC
-#    define WXMAKINGDLL_DBGRID
 #    define WXMAKINGDLL_HTML
 #    define WXMAKINGDLL_GL
 #    define WXMAKINGDLL_XML
 #    define WXDLLIMPEXP_DATA_ADV(type) type
 #endif
 
-#ifdef WXMAKINGDLL_ODBC
-#    define WXDLLIMPEXP_ODBC WXEXPORT
-#    define WXDLLIMPEXP_DATA_ODBC(type) WXEXPORT type
-#elif defined(WXUSINGDLL)
-#    define WXDLLIMPEXP_ODBC WXIMPORT
-#    define WXDLLIMPEXP_DATA_ODBC(type) WXIMPORT type
-#else /* not making nor using DLL */
-#    define WXDLLIMPEXP_ODBC
-#    define WXDLLIMPEXP_DATA_ODBC(type) type
-#endif
-
 #ifdef WXMAKINGDLL_QA
 #    define WXDLLIMPEXP_QA WXEXPORT
 #    define WXDLLIMPEXP_DATA_QA(type) WXEXPORT type
 #    define WXDLLIMPEXP_DATA_QA(type) type
 #endif
 
-#ifdef WXMAKINGDLL_DBGRID
-#    define WXDLLIMPEXP_DBGRID WXEXPORT
-#    define WXDLLIMPEXP_DATA_DBGRID(type) WXEXPORT type
-#elif defined(WXUSINGDLL)
-#    define WXDLLIMPEXP_DBGRID WXIMPORT
-#    define WXDLLIMPEXP_DATA_DBGRID(type) WXIMPORT type
-#else /* not making nor using DLL */
-#    define WXDLLIMPEXP_DBGRID
-#    define WXDLLIMPEXP_DATA_DBGRID(type) type
-#endif
-
 #ifdef WXMAKINGDLL_HTML
 #    define WXDLLIMPEXP_HTML WXEXPORT
 #    define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type
     #define WXDLLIMPEXP_FWD_CORE
     #define WXDLLIMPEXP_FWD_ADV
     #define WXDLLIMPEXP_FWD_QA
-    #define WXDLLIMPEXP_FWD_ODBC
-    #define WXDLLIMPEXP_FWD_DBGRID
     #define WXDLLIMPEXP_FWD_HTML
     #define WXDLLIMPEXP_FWD_GL
     #define WXDLLIMPEXP_FWD_XML
     #define WXDLLIMPEXP_FWD_CORE      WXDLLIMPEXP_CORE
     #define WXDLLIMPEXP_FWD_ADV       WXDLLIMPEXP_ADV
     #define WXDLLIMPEXP_FWD_QA        WXDLLIMPEXP_QA
-    #define WXDLLIMPEXP_FWD_ODBC      WXDLLIMPEXP_ODBC
-    #define WXDLLIMPEXP_FWD_DBGRID    WXDLLIMPEXP_DBGRID
     #define WXDLLIMPEXP_FWD_HTML      WXDLLIMPEXP_HTML
     #define WXDLLIMPEXP_FWD_GL        WXDLLIMPEXP_GL
     #define WXDLLIMPEXP_FWD_XML       WXDLLIMPEXP_XML
diff --git a/include/wx/isql.h b/include/wx/isql.h
deleted file mode 100644 (file)
index 3ddfdaf..0000000
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- *  isql.h
- *
- *  $Id$
- *
- *  iODBC defines
- *
- *  The iODBC driver manager.
- *
- *  Copyright (C) 1995 by Ke Jin <kejin@empress.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the Free
- *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#ifndef _ISQL_H
-#define _ISQL_H
-
-#if defined(WIN32)
-#define SQL_API                 __stdcall
-
-#ifndef FAR
-#define FAR
-#endif
-
-#elif defined(__OS2__)
-#define SQL_API                 _Optlink
-
-#ifndef FAR
-#define FAR
-#define EXPORT
-#define CALLBACK
-#endif
-
-#else
-#define FAR
-#define EXPORT
-#define CALLBACK
-#define SQL_API                 EXPORT CALLBACK
-
-#ifndef __EMX__
-typedef void *HWND;
-#endif
-#endif
-
-typedef void *SQLHWND;
-
-typedef unsigned char UCHAR;
-typedef long int SDWORD;
-typedef short int SWORD;
-typedef unsigned long int UDWORD;
-typedef unsigned short int UWORD;
-typedef long SQLINTEGER;
-typedef UDWORD SQLUINTEGER;
-
-typedef void FAR *PTR;
-typedef void FAR *HENV;
-typedef void FAR *HDBC;
-typedef void FAR *HSTMT;
-
-typedef signed short RETCODE;
-#define SQLRETURN RETCODE
-
-
-#define ODBCVER                 0x0250
-
-#define SQL_MAX_MESSAGE_LENGTH  512
-#define SQL_MAX_DSN_LENGTH      32
-
-/*
- *  Function return codes
- */
-#define SQL_INVALID_HANDLE      (-2)
-#define SQL_ERROR               (-1)
-#define SQL_SUCCESS             0
-#define SQL_SUCCESS_WITH_INFO   1
-#define SQL_NO_DATA_FOUND       100
-
-/*
- *  Standard SQL datatypes, using ANSI type numbering
- */
-#define SQL_CHAR                1
-#define SQL_NUMERIC             2
-#define SQL_DECIMAL             3
-#define SQL_INTEGER             4
-#define SQL_SMALLINT            5
-#define SQL_FLOAT               6
-#define SQL_REAL                7
-#define SQL_DOUBLE              8
-#define SQL_VARCHAR             12
-
-#define SQL_TYPE_MIN            SQL_CHAR
-#define SQL_TYPE_NULL           0
-#define SQL_TYPE_MAX            SQL_VARCHAR
-
-/*
- *  C datatype to SQL datatype mapping
- */
-#define SQL_C_CHAR              SQL_CHAR
-#define SQL_C_LONG              SQL_INTEGER
-#define SQL_C_SHORT             SQL_SMALLINT
-#define SQL_C_FLOAT             SQL_REAL
-#define SQL_C_DOUBLE            SQL_DOUBLE
-#define SQL_C_DEFAULT           99
-
-/*
- *  NULL status constants.
- */
-#define SQL_NO_NULLS            0
-#define SQL_NULLABLE            1
-#define SQL_NULLABLE_UNKNOWN    2
-
-/*
- *  Special length values
- */
-#define SQL_NULL_DATA           (-1)
-#define SQL_DATA_AT_EXEC        (-2)
-#define SQL_NTS                 (-3)
-
-/*
- *  SQLFreeStmt
- */
-#define SQL_CLOSE               0
-#define SQL_DROP                1
-#define SQL_UNBIND              2
-#define SQL_RESET_PARAMS        3
-
-/*
- *  SQLTransact
- */
-#define SQL_COMMIT              0
-#define SQL_ROLLBACK            1
-
-/*
- *  SQLColAttributes
- */
-#define SQL_COLUMN_COUNT                0
-#define SQL_COLUMN_NAME                 1
-#define SQL_COLUMN_TYPE                 2
-#define SQL_COLUMN_LENGTH               3
-#define SQL_COLUMN_PRECISION            4
-#define SQL_COLUMN_SCALE                5
-#define SQL_COLUMN_DISPLAY_SIZE         6
-#define SQL_COLUMN_NULLABLE             7
-#define SQL_COLUMN_UNSIGNED             8
-#define SQL_COLUMN_MONEY                9
-#define SQL_COLUMN_UPDATABLE            10
-#define SQL_COLUMN_AUTO_INCREMENT       11
-#define SQL_COLUMN_CASE_SENSITIVE       12
-#define SQL_COLUMN_SEARCHABLE           13
-#define SQL_COLUMN_TYPE_NAME            14
-#define SQL_COLUMN_TABLE_NAME           15
-#define SQL_COLUMN_OWNER_NAME           16
-#define SQL_COLUMN_QUALIFIER_NAME       17
-#define SQL_COLUMN_LABEL                18
-
-#define SQL_COLATT_OPT_MAX      SQL_COLUMN_LABEL
-#define SQL_COLATT_OPT_MIN      SQL_COLUMN_COUNT
-#define SQL_COLUMN_DRIVER_START 1000
-
-/*
- *  SQLColAttributes : SQL_COLUMN_UPDATABLE
- */
-#define SQL_ATTR_READONLY           0
-#define SQL_ATTR_WRITE              1
-#define SQL_ATTR_READWRITE_UNKNOWN  2
-
-/*
- *  SQLColAttributes : SQL_COLUMN_SEARCHABLE
- */
-#define SQL_UNSEARCHABLE        0
-#define SQL_LIKE_ONLY           1
-#define SQL_ALL_EXCEPT_LIKE     2
-#define SQL_SEARCHABLE          3
-
-/*
- *  NULL Handles
- */
-#define SQL_NULL_HENV           0
-#define SQL_NULL_HDBC           0
-#define SQL_NULL_HSTMT          0
-
-
-/*
- *  Function Prototypes
- */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-  RETCODE SQL_API SQLAllocConnect (HENV henv, HDBC FAR * phdbc);
-  RETCODE SQL_API SQLAllocEnv (HENV FAR * phenv);
-  RETCODE SQL_API SQLAllocStmt (HDBC hdbc, HSTMT FAR * phstmt);
-  RETCODE SQL_API SQLBindCol (HSTMT hstmt, UWORD icol, SWORD fCType,
-      PTR rgbValue, SDWORD cbValueMax, SDWORD FAR * pcbValue);
-  RETCODE SQL_API SQLCancel (HSTMT hstmt);
-  RETCODE SQL_API SQLColAttributes (HSTMT hstmt, UWORD icol, UWORD fDescType,
-      PTR rgbDesc, SWORD cbDescMax, SWORD FAR * pcbDesc, SDWORD FAR * pfDesc);
-  RETCODE SQL_API SQLConnect (HDBC hdbc, UCHAR FAR * szDSN, SWORD cbDSN,
-      UCHAR FAR * szUID, SWORD cbUID, UCHAR FAR * szAuthStr, SWORD cbAuthStr);
-  RETCODE SQL_API SQLDescribeCol (HSTMT hstmt, UWORD icol,
-      UCHAR FAR * szColName, SWORD cbColNameMax, SWORD FAR * pcbColName,
-      SWORD FAR * pfSqlType, UDWORD FAR * pcbColDef, SWORD FAR * pibScale,
-      SWORD FAR * pfNullable);
-  RETCODE SQL_API SQLDisconnect (HDBC hdbc);
-  RETCODE SQL_API SQLError (HENV henv, HDBC hdbc, HSTMT hstmt,
-      UCHAR FAR * szSqlState, SDWORD FAR * pfNativeError, UCHAR FAR * szErrorMsg,
-      SWORD cbErrorMsgMax, SWORD FAR * pcbErrorMsg);
-  RETCODE SQL_API SQLExecDirect (HSTMT hstmt, UCHAR FAR * szSqlStr,
-      SDWORD cbSqlStr);
-  RETCODE SQL_API SQLExecute (HSTMT hstmt);
-  RETCODE SQL_API SQLFetch (HSTMT hstmt);
-  RETCODE SQL_API SQLFreeConnect (HDBC hdbc);
-  RETCODE SQL_API SQLFreeEnv (HENV henv);
-  RETCODE SQL_API SQLFreeStmt (HSTMT hstmt, UWORD fOption);
-  RETCODE SQL_API SQLGetCursorName (HSTMT hstmt, UCHAR FAR * szCursor,
-      SWORD cbCursorMax, SWORD FAR * pcbCursor);
-  RETCODE SQL_API SQLNumResultCols (HSTMT hstmt, SWORD FAR * pccol);
-  RETCODE SQL_API SQLPrepare (HSTMT hstmt, UCHAR FAR * szSqlStr,
-      SDWORD cbSqlStr);
-  RETCODE SQL_API SQLRowCount (HSTMT hstmt, SDWORD FAR * pcrow);
-  RETCODE SQL_API SQLSetCursorName (HSTMT hstmt, UCHAR FAR * szCursor,
-      SWORD cbCursor);
-  RETCODE SQL_API SQLTransact (HENV henv, HDBC hdbc, UWORD fType);
-
-/*
- *  Deprecated ODBC 1.0 function - Use SQLBindParameter
- */
-  RETCODE SQL_API SQLSetParam (HSTMT hstmt, UWORD ipar, SWORD fCType,
-      SWORD fSqlType, UDWORD cbColDef, SWORD ibScale, PTR rgbValue,
-      SDWORD FAR * pcbValue);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/wx/isqlext.h b/include/wx/isqlext.h
deleted file mode 100644 (file)
index 1e96045..0000000
+++ /dev/null
@@ -1,1178 +0,0 @@
-/*
- *
- *  isqlext.h
- *
- *  $Id$
- *
- *  iODBC defines (ext)
- *
- *  The iODBC driver manager.
- *
- *  Copyright (C) 1995 by Ke Jin <kejin@empress.com>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the Free
- *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#ifndef _ISQLEXT_H
-#define _ISQLEXT_H
-
-#include "wx/isql.h"
-
-/*
- *  Generic constants
- */
-#define SQL_MAX_OPTION_STRING_LENGTH 256
-
-/*
- *  Additional return codes
- */
-#define SQL_STILL_EXECUTING         2
-#define SQL_NEED_DATA               99
-
-/*
- *  SQL extended datatypes
- */
-#define SQL_DATE                        9
-#define SQL_TIME                        10
-#define SQL_TIMESTAMP                   11
-#define SQL_LONGVARCHAR                 (-1)
-#define SQL_BINARY                      (-2)
-#define SQL_VARBINARY                   (-3)
-#define SQL_LONGVARBINARY               (-4)
-#define SQL_BIGINT                      (-5)
-#define SQL_TINYINT                     (-6)
-#define SQL_BIT                         (-7)
-
-#define SQL_INTERVAL_YEAR               (-80)
-#define SQL_INTERVAL_MONTH              (-81)
-#define SQL_INTERVAL_YEAR_TO_MONTH      (-82)
-#define SQL_INTERVAL_DAY                (-83)
-#define SQL_INTERVAL_HOUR               (-84)
-#define SQL_INTERVAL_MINUTE             (-85)
-#define SQL_INTERVAL_SECOND             (-86)
-#define SQL_INTERVAL_DAY_TO_HOUR        (-87)
-#define SQL_INTERVAL_DAY_TO_MINUTE      (-88)
-#define SQL_INTERVAL_DAY_TO_SECOND      (-89)
-#define SQL_INTERVAL_HOUR_TO_MINUTE     (-90)
-#define SQL_INTERVAL_HOUR_TO_SECOND     (-91)
-#define SQL_INTERVAL_MINUTE_TO_SECOND   (-92)
-#define SQL_UNICODE                     (-95)
-
-#define SQL_TYPE_DRIVER_START   SQL_INTERVAL_YEAR
-#define SQL_TYPE_DRIVER_END     SQL_UNICODE
-
-#define SQL_SIGNED_OFFSET       (-20)
-#define SQL_UNSIGNED_OFFSET     (-22)
-
-/*
- *  C datatype to SQL datatype mapping
- */
-#define SQL_C_DATE              SQL_DATE
-#define SQL_C_TIME              SQL_TIME
-#define SQL_C_TIMESTAMP         SQL_TIMESTAMP
-#define SQL_C_BINARY            SQL_BINARY
-#define SQL_C_BIT               SQL_BIT
-#define SQL_C_TINYINT           SQL_TINYINT
-#define SQL_C_SLONG             SQL_C_LONG+SQL_SIGNED_OFFSET
-#define SQL_C_SSHORT            SQL_C_SHORT+SQL_SIGNED_OFFSET
-#define SQL_C_STINYINT          SQL_TINYINT+SQL_SIGNED_OFFSET
-#define SQL_C_ULONG             SQL_C_LONG+SQL_UNSIGNED_OFFSET
-#define SQL_C_USHORT            SQL_C_SHORT+SQL_UNSIGNED_OFFSET
-#define SQL_C_UTINYINT          SQL_TINYINT+SQL_UNSIGNED_OFFSET
-#define SQL_C_BOOKMARK          SQL_C_ULONG
-
-/*
- *  Extended data types override sql.h defined
- */
-#undef SQL_TYPE_MIN
-#define SQL_TYPE_MIN SQL_BIT
-#define SQL_ALL_TYPES 0
-
-/*
- *  SQL portable types for C - DATE, TIME, TIMESTAMP
- */
-typedef struct _DATE_STRUCT
-  {
-    SWORD year;
-    UWORD month;
-    UWORD day;
-  }
-DATE_STRUCT;
-
-typedef struct _TIME_STRUCT
-  {
-    UWORD hour;
-    UWORD minute;
-    UWORD second;
-  }
-TIME_STRUCT;
-
-typedef struct _TIMESTAMP_STRUCT
-  {
-    SWORD year;
-    UWORD month;
-    UWORD day;
-    UWORD hour;
-    UWORD minute;
-    UWORD second;
-    UDWORD fraction;
-  }
-TIMESTAMP_STRUCT;
-
-typedef unsigned long int BOOKMARK;
-
-/*
- * ----------------------------------------------------------------------
- *  Level 1 Functions
- * ----------------------------------------------------------------------
- */
-
-/*
- *  SQLDriverConnect
- */
-#define SQL_DRIVER_NOPROMPT             0
-#define SQL_DRIVER_COMPLETE             1
-#define SQL_DRIVER_PROMPT               2
-#define SQL_DRIVER_COMPLETE_REQUIRED    3
-
-/*
- *  SQLGetData
- */
-#define SQL_NO_TOTAL                    (-4)
-
-/*
- *  SQLBindParameter
- */
-#define SQL_DEFAULT_PARAM               (-5)
-#define SQL_IGNORE                      (-6)
-#define SQL_LEN_DATA_AT_EXEC_OFFSET     (-100)
-#define SQL_LEN_DATA_AT_EXEC(length)    (-length+SQL_LEN_DATA_AT_EXEC_OFFSET)
-
-/*
- *  SQLGetFunctions
- */
-#define SQL_API_SQLALLOCCONNECT         1 /* Core Functions */
-#define SQL_API_SQLALLOCENV             2
-#define SQL_API_SQLALLOCSTMT            3
-#define SQL_API_SQLBINDCOL              4
-#define SQL_API_SQLCANCEL               5
-#define SQL_API_SQLCOLATTRIBUTES        6
-#define SQL_API_SQLCONNECT              7
-#define SQL_API_SQLDESCRIBECOL          8
-#define SQL_API_SQLDISCONNECT           9
-#define SQL_API_SQLERROR                10
-#define SQL_API_SQLEXECDIRECT           11
-#define SQL_API_SQLEXECUTE              12
-#define SQL_API_SQLFETCH                13
-#define SQL_API_SQLFREECONNECT          14
-#define SQL_API_SQLFREEENV              15
-#define SQL_API_SQLFREESTMT             16
-#define SQL_API_SQLGETCURSORNAME        17
-#define SQL_API_SQLNUMRESULTCOLS        18
-#define SQL_API_SQLPREPARE              19
-#define SQL_API_SQLROWCOUNT             20
-#define SQL_API_SQLSETCURSORNAME        21
-#define SQL_API_SQLSETPARAM             22
-#define SQL_API_SQLTRANSACT             23
-
-#define SQL_NUM_FUNCTIONS               23
-
-#define SQL_EXT_API_START               40
-
-#define SQL_API_SQLCOLUMNS              40 /* Level 1 Functions */
-#define SQL_API_SQLDRIVERCONNECT        41
-#define SQL_API_SQLGETCONNECTOPTION     42
-#define SQL_API_SQLGETDATA              43
-#define SQL_API_SQLGETFUNCTIONS         44
-#define SQL_API_SQLGETINFO              45
-#define SQL_API_SQLGETSTMTOPTION        46
-#define SQL_API_SQLGETTYPEINFO          47
-#define SQL_API_SQLPARAMDATA            48
-#define SQL_API_SQLPUTDATA              49
-#define SQL_API_SQLSETCONNECTOPTION     50
-#define SQL_API_SQLSETSTMTOPTION        51
-#define SQL_API_SQLSPECIALCOLUMNS       52
-#define SQL_API_SQLSTATISTICS           53
-#define SQL_API_SQLTABLES               54
-
-#define SQL_API_SQLBROWSECONNECT        55 /* Level 2 Functions */
-#define SQL_API_SQLCOLUMNPRIVILEGES     56
-#define SQL_API_SQLDATASOURCES          57
-#define SQL_API_SQLDESCRIBEPARAM        58
-#define SQL_API_SQLEXTENDEDFETCH        59
-#define SQL_API_SQLFOREIGNKEYS          60
-#define SQL_API_SQLMORERESULTS          61
-#define SQL_API_SQLNATIVESQL            62
-#define SQL_API_SQLNUMPARAMS            63
-#define SQL_API_SQLPARAMOPTIONS         64
-#define SQL_API_SQLPRIMARYKEYS          65
-#define SQL_API_SQLPROCEDURECOLUMNS     66
-#define SQL_API_SQLPROCEDURES           67
-#define SQL_API_SQLSETPOS               68
-#define SQL_API_SQLSETSCROLLOPTIONS     69
-#define SQL_API_SQLTABLEPRIVILEGES      70
-
-#define SQL_API_SQLDRIVERS              71
-#define SQL_API_SQLBINDPARAMETER        72
-#define SQL_EXT_API_LAST                SQL_API_SQLBINDPARAMETER
-
-#define SQL_API_ALL_FUNCTIONS           0
-
-#define SQL_NUM_EXTENSIONS (SQL_EXT_API_LAST-SQL_EXT_API_START+1)
-
-/*
- *  SQLGetInfo
- */
-#define SQL_INFO_FIRST                  0
-#define SQL_ACTIVE_CONNECTIONS          0
-#define SQL_ACTIVE_STATEMENTS           1
-#define SQL_DATA_SOURCE_NAME            2
-#define SQL_DRIVER_HDBC                 3
-#define SQL_DRIVER_HENV                 4
-#define SQL_DRIVER_HSTMT                5
-#define SQL_DRIVER_NAME                 6
-#define SQL_DRIVER_VER                  7
-#define SQL_FETCH_DIRECTION             8
-#define SQL_ODBC_API_CONFORMANCE        9
-#define SQL_ODBC_VER                    10
-#define SQL_ROW_UPDATES                 11
-#define SQL_ODBC_SAG_CLI_CONFORMANCE    12
-#define SQL_SERVER_NAME                 13
-#define SQL_SEARCH_PATTERN_ESCAPE       14
-#define SQL_ODBC_SQL_CONFORMANCE        15
-#define SQL_DBMS_NAME                   17
-#define SQL_DBMS_VER                    18
-#define SQL_ACCESSIBLE_TABLES           19
-#define SQL_ACCESSIBLE_PROCEDURES       20
-#define SQL_PROCEDURES                  21
-#define SQL_CONCAT_NULL_BEHAVIOR        22
-#define SQL_CURSOR_COMMIT_BEHAVIOR      23
-#define SQL_CURSOR_ROLLBACK_BEHAVIOR    24
-#define SQL_DATA_SOURCE_READ_ONLY       25
-#define SQL_DEFAULT_TXN_ISOLATION       26
-#define SQL_EXPRESSIONS_IN_ORDERBY      27
-#define SQL_IDENTIFIER_CASE             28
-#define SQL_IDENTIFIER_QUOTE_CHAR       29
-#define SQL_MAX_COLUMN_NAME_LEN         30
-#define SQL_MAX_CURSOR_NAME_LEN         31
-#define SQL_MAX_OWNER_NAME_LEN          32
-#define SQL_MAX_PROCEDURE_NAME_LEN      33
-#define SQL_MAX_QUALIFIER_NAME_LEN      34
-#define SQL_MAX_TABLE_NAME_LEN          35
-#define SQL_MULT_RESULT_SETS            36
-#define SQL_MULTIPLE_ACTIVE_TXN         37
-#define SQL_OUTER_JOINS                 38
-#define SQL_OWNER_TERM                  39
-#define SQL_PROCEDURE_TERM              40
-#define SQL_QUALIFIER_NAME_SEPARATOR    41
-#define SQL_QUALIFIER_TERM              42
-#define SQL_SCROLL_CONCURRENCY          43
-#define SQL_SCROLL_OPTIONS              44
-#define SQL_TABLE_TERM                  45
-#define SQL_TXN_CAPABLE                 46
-#define SQL_USER_NAME                   47
-#define SQL_CONVERT_FUNCTIONS           48
-#define SQL_NUMERIC_FUNCTIONS           49
-#define SQL_STRING_FUNCTIONS            50
-#define SQL_SYSTEM_FUNCTIONS            51
-#define SQL_TIMEDATE_FUNCTIONS          52
-#define SQL_CONVERT_BIGINT              53
-#define SQL_CONVERT_BINARY              54
-#define SQL_CONVERT_BIT                 55
-#define SQL_CONVERT_CHAR                56
-#define SQL_CONVERT_DATE                57
-#define SQL_CONVERT_DECIMAL             58
-#define SQL_CONVERT_DOUBLE              59
-#define SQL_CONVERT_FLOAT               60
-#define SQL_CONVERT_INTEGER             61
-#define SQL_CONVERT_LONGVARCHAR         62
-#define SQL_CONVERT_NUMERIC             63
-#define SQL_CONVERT_REAL                64
-#define SQL_CONVERT_SMALLINT            65
-#define SQL_CONVERT_TIME                66
-#define SQL_CONVERT_TIMESTAMP           67
-#define SQL_CONVERT_TINYINT             68
-#define SQL_CONVERT_VARBINARY           69
-#define SQL_CONVERT_VARCHAR             70
-#define SQL_CONVERT_LONGVARBINARY       71
-#define SQL_TXN_ISOLATION_OPTION        72
-#define SQL_ODBC_SQL_OPT_IEF            73
-
-/*
- *  ODBC SDK 1.0 Additions
- */
-#define SQL_CORRELATION_NAME            74
-#define SQL_NON_NULLABLE_COLUMNS        75
-
-/*
- *  ODBC SDK 2.0 Additions
- */
-#define SQL_DRIVER_HLIB                 76
-#define SQL_DRIVER_ODBC_VER             77
-#define SQL_LOCK_TYPES                  78
-#define SQL_POS_OPERATIONS              79
-#define SQL_POSITIONED_STATEMENTS       80
-#define SQL_GETDATA_EXTENSIONS          81
-#define SQL_BOOKMARK_PERSISTENCE        82
-#define SQL_STATIC_SENSITIVITY          83
-#define SQL_FILE_USAGE                  84
-#define SQL_NULL_COLLATION              85
-#define SQL_ALTER_TABLE                 86
-#define SQL_COLUMN_ALIAS                87
-#define SQL_GROUP_BY                    88
-#define SQL_KEYWORDS                    89
-#define SQL_ORDER_BY_COLUMNS_IN_SELECT  90
-#define SQL_OWNER_USAGE                 91
-#define SQL_QUALIFIER_USAGE             92
-#define SQL_QUOTED_IDENTIFIER_CASE      93
-#define SQL_SPECIAL_CHARACTERS          94
-#define SQL_SUBQUERIES                  95
-#define SQL_UNION                       96
-#define SQL_MAX_COLUMNS_IN_GROUP_BY     97
-#define SQL_MAX_COLUMNS_IN_INDEX        98
-#define SQL_MAX_COLUMNS_IN_ORDER_BY     99
-#define SQL_MAX_COLUMNS_IN_SELECT       100
-#define SQL_MAX_COLUMNS_IN_TABLE        101
-#define SQL_MAX_INDEX_SIZE              102
-#define SQL_MAX_ROW_SIZE_INCLUDES_LONG  103
-#define SQL_MAX_ROW_SIZE                104
-#define SQL_MAX_STATEMENT_LEN           105
-#define SQL_MAX_TABLES_IN_SELECT        106
-#define SQL_MAX_USER_NAME_LEN           107
-#define SQL_MAX_CHAR_LITERAL_LEN        108
-#define SQL_TIMEDATE_ADD_INTERVALS      109
-#define SQL_TIMEDATE_DIFF_INTERVALS     110
-#define SQL_NEED_LONG_DATA_LEN          111
-#define SQL_MAX_BINARY_LITERAL_LEN      112
-#define SQL_LIKE_ESCAPE_CLAUSE          113
-#define SQL_QUALIFIER_LOCATION          114
-
-/*
- *  ODBC SDK 2.01 Additions
- */
-#define SQL_OJ_CAPABILITIES             65003 /* Temp value until ODBC 3.0 */
-
-#define SQL_INFO_LAST                   SQL_QUALIFIER_LOCATION
-#define SQL_INFO_DRIVER_START           1000
-
-
-/*
- *  SQL_CONVERT_* bitmask values
- */
-#define SQL_CVT_CHAR            0x00000001L
-#define SQL_CVT_NUMERIC         0x00000002L
-#define SQL_CVT_DECIMAL         0x00000004L
-#define SQL_CVT_INTEGER         0x00000008L
-#define SQL_CVT_SMALLINT        0x00000010L
-#define SQL_CVT_FLOAT           0x00000020L
-#define SQL_CVT_REAL            0x00000040L
-#define SQL_CVT_DOUBLE          0x00000080L
-#define SQL_CVT_VARCHAR         0x00000100L
-#define SQL_CVT_LONGVARCHAR     0x00000200L
-#define SQL_CVT_BINARY          0x00000400L
-#define SQL_CVT_VARBINARY       0x00000800L
-#define SQL_CVT_BIT             0x00001000L
-#define SQL_CVT_TINYINT         0x00002000L
-#define SQL_CVT_BIGINT          0x00004000L
-#define SQL_CVT_DATE            0x00008000L
-#define SQL_CVT_TIME            0x00010000L
-#define SQL_CVT_TIMESTAMP       0x00020000L
-#define SQL_CVT_LONGVARBINARY   0x00040000L
-
-/*
- *  SQL_CONVERT_FUNCTIONS
- */
-#define SQL_FN_CVT_CONVERT      0x00000001L
-
-/*
- *  SQL_STRING_FUNCTIONS
- */
-#define SQL_FN_STR_CONCAT       0x00000001L
-#define SQL_FN_STR_INSERT       0x00000002L
-#define SQL_FN_STR_LEFT         0x00000004L
-#define SQL_FN_STR_LTRIM        0x00000008L
-#define SQL_FN_STR_LENGTH       0x00000010L
-#define SQL_FN_STR_LOCATE       0x00000020L
-#define SQL_FN_STR_LCASE        0x00000040L
-#define SQL_FN_STR_REPEAT       0x00000080L
-#define SQL_FN_STR_REPLACE      0x00000100L
-#define SQL_FN_STR_RIGHT        0x00000200L
-#define SQL_FN_STR_RTRIM        0x00000400L
-#define SQL_FN_STR_SUBSTRING    0x00000800L
-#define SQL_FN_STR_UCASE        0x00001000L
-#define SQL_FN_STR_ASCII        0x00002000L
-#define SQL_FN_STR_CHAR         0x00004000L
-#define SQL_FN_STR_DIFFERENCE   0x00008000L
-#define SQL_FN_STR_LOCATE_2     0x00010000L
-#define SQL_FN_STR_SOUNDEX      0x00020000L
-#define SQL_FN_STR_SPACE        0x00040000L
-
-/*
- *  SQL_NUMERIC_FUNCTIONS
- */
-#define SQL_FN_NUM_ABS          0x00000001L
-#define SQL_FN_NUM_ACOS         0x00000002L
-#define SQL_FN_NUM_ASIN         0x00000004L
-#define SQL_FN_NUM_ATAN         0x00000008L
-#define SQL_FN_NUM_ATAN2        0x00000010L
-#define SQL_FN_NUM_CEILING      0x00000020L
-#define SQL_FN_NUM_COS          0x00000040L
-#define SQL_FN_NUM_COT          0x00000080L
-#define SQL_FN_NUM_EXP          0x00000100L
-#define SQL_FN_NUM_FLOOR        0x00000200L
-#define SQL_FN_NUM_LOG          0x00000400L
-#define SQL_FN_NUM_MOD          0x00000800L
-#define SQL_FN_NUM_SIGN         0x00001000L
-#define SQL_FN_NUM_SIN          0x00002000L
-#define SQL_FN_NUM_SQRT         0x00004000L
-#define SQL_FN_NUM_TAN          0x00008000L
-#define SQL_FN_NUM_PI           0x00010000L
-#define SQL_FN_NUM_RAND         0x00020000L
-#define SQL_FN_NUM_DEGREES      0x00040000L
-#define SQL_FN_NUM_LOG10        0x00080000L
-#define SQL_FN_NUM_POWER        0x00100000L
-#define SQL_FN_NUM_RADIANS      0x00200000L
-#define SQL_FN_NUM_ROUND        0x00400000L
-#define SQL_FN_NUM_TRUNCATE     0x00800000L
-
-/*
- *  SQL_TIMEDATE_FUNCTIONS
- */
-#define SQL_FN_TD_NOW           0x00000001L
-#define SQL_FN_TD_CURDATE       0x00000002L
-#define SQL_FN_TD_DAYOFMONTH    0x00000004L
-#define SQL_FN_TD_DAYOFWEEK     0x00000008L
-#define SQL_FN_TD_DAYOFYEAR     0x00000010L
-#define SQL_FN_TD_MONTH         0x00000020L
-#define SQL_FN_TD_QUARTER       0x00000040L
-#define SQL_FN_TD_WEEK          0x00000080L
-#define SQL_FN_TD_YEAR          0x00000100L
-#define SQL_FN_TD_CURTIME       0x00000200L
-#define SQL_FN_TD_HOUR          0x00000400L
-#define SQL_FN_TD_MINUTE        0x00000800L
-#define SQL_FN_TD_SECOND        0x00001000L
-#define SQL_FN_TD_TIMESTAMPADD  0x00002000L
-#define SQL_FN_TD_TIMESTAMPDIFF 0x00004000L
-#define SQL_FN_TD_DAYNAME       0x00008000L
-#define SQL_FN_TD_MONTHNAME     0x00010000L
-
-/*
- *  SQL_SYSTEM_FUNCTIONS
- */
-#define SQL_FN_SYS_USERNAME     0x00000001L
-#define SQL_FN_SYS_DBNAME       0x00000002L
-#define SQL_FN_SYS_IFNULL       0x00000004L
-
-/*
- *  SQL_TIMEDATE_ADD_INTERVALS
- *  SQL_TIMEDATE_DIFF_INTERVALS
- */
-#define SQL_FN_TSI_FRAC_SECOND  0x00000001L
-#define SQL_FN_TSI_SECOND       0x00000002L
-#define SQL_FN_TSI_MINUTE       0x00000004L
-#define SQL_FN_TSI_HOUR         0x00000008L
-#define SQL_FN_TSI_DAY          0x00000010L
-#define SQL_FN_TSI_WEEK         0x00000020L
-#define SQL_FN_TSI_MONTH        0x00000040L
-#define SQL_FN_TSI_QUARTER      0x00000080L
-#define SQL_FN_TSI_YEAR         0x00000100L
-
-/*
- *  SQL_ODBC_API_CONFORMANCE
- */
-#define SQL_OAC_NONE            0x0000
-#define SQL_OAC_LEVEL1          0x0001
-#define SQL_OAC_LEVEL2          0x0002
-
-/*
- * SQL_ODBC_SAG_CLI_CONFORMANCE
- */
-#define SQL_OSCC_NOT_COMPLIANT  0x0000
-#define SQL_OSCC_COMPLIANT      0x0001
-
-/*
- *  SQL_ODBC_SQL_CONFORMANCE
- */
-#define SQL_OSC_MINIMUM         0x0000
-#define SQL_OSC_CORE            0x0001
-#define SQL_OSC_EXTENDED        0x0002
-
-/*
- *  SQL_CONCAT_NULL_BEHAVIOR
- */
-#define SQL_CB_NULL             0x0000
-#define SQL_CB_NON_NULL         0x0001
-
-/*
- *  SQL_CURSOR_COMMIT_BEHAVIOR
- *  SQL_CURSOR_ROLLBACK_BEHAVIOR
- */
-#define SQL_CB_DELETE           0x0000
-#define SQL_CB_CLOSE            0x0001
-#define SQL_CB_PRESERVE         0x0002
-
-/*
- *  SQL_IDENTIFIER_CASE
- */
-#define SQL_IC_UPPER            0x0001
-#define SQL_IC_LOWER            0x0002
-#define SQL_IC_SENSITIVE        0x0003
-#define SQL_IC_MIXED            0x0004
-
-/*
- *  SQL_TXN_CAPABLE
- */
-#define SQL_TC_NONE             0x0000
-#define SQL_TC_DML              0x0001
-#define SQL_TC_ALL              0x0002
-#define SQL_TC_DDL_COMMIT       0x0003
-#define SQL_TC_DDL_IGNORE       0x0004
-
-/*
- *  SQL_SCROLL_OPTIONS
- */
-#define SQL_SO_FORWARD_ONLY     0x00000001L
-#define SQL_SO_KEYSET_DRIVEN    0x00000002L
-#define SQL_SO_DYNAMIC          0x00000004L
-#define SQL_SO_MIXED            0x00000008L
-#define SQL_SO_STATIC           0x00000010L
-
-/*
- * SQL_SCROLL_CONCURRENCY
- */
-#define SQL_SCCO_READ_ONLY      0x00000001L
-#define SQL_SCCO_LOCK           0x00000002L
-#define SQL_SCCO_OPT_ROWVER     0x00000004L
-#define SQL_SCCO_OPT_VALUES     0x00000008L
-
-/*
- *  SQL_FETCH_DIRECTION
- */
-#define SQL_FD_FETCH_NEXT       0x00000001L
-#define SQL_FD_FETCH_FIRST      0x00000002L
-#define SQL_FD_FETCH_LAST       0x00000004L
-#define SQL_FD_FETCH_PRIOR      0x00000008L
-#define SQL_FD_FETCH_ABSOLUTE   0x00000010L
-#define SQL_FD_FETCH_RELATIVE   0x00000020L
-#define SQL_FD_FETCH_RESUME     0x00000040L
-#define SQL_FD_FETCH_BOOKMARK   0x00000080L
-
-/*
- *  SQL_TXN_ISOLATION_OPTION
- */
-#define SQL_TXN_READ_UNCOMMITTED    0x00000001L
-#define SQL_TXN_READ_COMMITTED      0x00000002L
-#define SQL_TXN_REPEATABLE_READ     0x00000004L
-#define SQL_TXN_SERIALIZABLE        0x00000008L
-#define SQL_TXN_VERSIONING          0x00000010L
-
-/*
- *  SQL_CORRELATION_NAME
- */
-#define SQL_CN_NONE             0x0000
-#define SQL_CN_DIFFERENT        0x0001
-#define SQL_CN_ANY              0x0002
-
-/*
- * SQL_NON_NULLABLE_COLUMNS
- */
-#define SQL_NNC_NULL            0x0000
-#define SQL_NNC_NON_NULL        0x0001
-
-/*
- *  SQL_NULL_COLLATION
- */
-#define SQL_NC_HIGH             0x0000
-#define SQL_NC_LOW              0x0001
-#define SQL_NC_START            0x0002
-#define SQL_NC_END              0x0004
-
-/*
- * SQL_FILE_USAGE
- */
-#define SQL_FILE_NOT_SUPPORTED  0x0000
-#define SQL_FILE_TABLE          0x0001
-#define SQL_FILE_QUALIFIER      0x0002
-
-/*
- *  SQL_GETDATA_EXTENSIONS
- */
-#define SQL_GD_ANY_COLUMN       0x00000001L
-#define SQL_GD_ANY_ORDER        0x00000002L
-#define SQL_GD_BLOCK            0x00000004L
-#define SQL_GD_BOUND            0x00000008L
-
-/*
- * SQL_ALTER_TABLE
- */
-#define SQL_AT_ADD_COLUMN       0x00000001L
-#define SQL_AT_DROP_COLUMN      0x00000002L
-
-/*
- *  SQL_POSITIONED_STATEMENTS
- */
-#define SQL_PS_POSITIONED_DELETE    0x00000001L
-#define SQL_PS_POSITIONED_UPDATE    0x00000002L
-#define SQL_PS_SELECT_FOR_UPDATE    0x00000004L
-
-/*
- *  SQL_GROUP_BY
- */
-#define SQL_GB_NOT_SUPPORTED            0x0000
-#define SQL_GB_GROUP_BY_EQUALS_SELECT   0x0001
-#define SQL_GB_GROUP_BY_CONTAINS_SELECT 0x0002
-#define SQL_GB_NO_RELATION              0x0003
-
-/*
- *  SQL_OWNER_USAGE
- */
-#define SQL_OU_DML_STATEMENTS       0x00000001L
-#define SQL_OU_PROCEDURE_INVOCATION 0x00000002L
-#define SQL_OU_TABLE_DEFINITION     0x00000004L
-#define SQL_OU_INDEX_DEFINITION     0x00000008L
-#define SQL_OU_PRIVILEGE_DEFINITION 0x00000010L
-
-/*
- * SQL_QUALIFIER_USAGE
- */
-#define SQL_QU_DML_STATEMENTS       0x00000001L
-#define SQL_QU_PROCEDURE_INVOCATION 0x00000002L
-#define SQL_QU_TABLE_DEFINITION     0x00000004L
-#define SQL_QU_INDEX_DEFINITION     0x00000008L
-#define SQL_QU_PRIVILEGE_DEFINITION 0x00000010L
-
-/*
- *  SQL_SUBQUERIES
- */
-#define SQL_SQ_COMPARISON               0x00000001L
-#define SQL_SQ_EXISTS                   0x00000002L
-#define SQL_SQ_IN                       0x00000004L
-#define SQL_SQ_QUANTIFIED               0x00000008L
-#define SQL_SQ_CORRELATED_SUBQUERIES    0x00000010L
-
-/*
- *  SQL_UNION
- */
-#define SQL_U_UNION         0x00000001L
-#define SQL_U_UNION_ALL     0x00000002L
-
-/*
- *  SQL_BOOKMARK_PERSISTENCE
- */
-#define SQL_BP_CLOSE        0x00000001L
-#define SQL_BP_DELETE       0x00000002L
-#define SQL_BP_DROP         0x00000004L
-#define SQL_BP_TRANSACTION  0x00000008L
-#define SQL_BP_UPDATE       0x00000010L
-#define SQL_BP_OTHER_HSTMT  0x00000020L
-#define SQL_BP_SCROLL       0x00000040L
-
-/*
- * SQL_STATIC_SENSITIVITY
- */
-#define SQL_SS_ADDITIONS    0x00000001L
-#define SQL_SS_DELETIONS    0x00000002L
-#define SQL_SS_UPDATES      0x00000004L
-
-/*
- *  SQL_LOCK_TYPES
- */
-#define SQL_LCK_NO_CHANGE   0x00000001L
-#define SQL_LCK_EXCLUSIVE   0x00000002L
-#define SQL_LCK_UNLOCK      0x00000004L
-
-/*
- *  SQL_POS_OPERATIONS
- */
-#define SQL_POS_POSITION    0x00000001L
-#define SQL_POS_REFRESH     0x00000002L
-#define SQL_POS_UPDATE      0x00000004L
-#define SQL_POS_DELETE      0x00000008L
-#define SQL_POS_ADD         0x00000010L
-
-/*
- *  SQL_QUALIFIER_LOCATION
- */
-#define SQL_QL_START        0x0001L
-#define SQL_QL_END          0x0002L
-
-/*
- *  SQL_OJ_CAPABILITIES
- */
-#define SQL_OJ_LEFT                 0x00000001L
-#define SQL_OJ_RIGHT                0x00000002L
-#define SQL_OJ_FULL                 0x00000004L
-#define SQL_OJ_NESTED               0x00000008L
-#define SQL_OJ_NOT_ORDERED          0x00000010L
-#define SQL_OJ_INNER                0x00000020L
-#define SQL_OJ_ALL_COMPARISON_OPS   0x00000040L
-
-/*
- *  SQLGetStmtOption/SQLSetStmtOption
- */
-#define SQL_QUERY_TIMEOUT   0
-#define SQL_MAX_ROWS        1
-#define SQL_NOSCAN          2
-#define SQL_MAX_LENGTH      3
-#define SQL_ASYNC_ENABLE    4
-#define SQL_BIND_TYPE       5
-#define SQL_CURSOR_TYPE     6
-#define SQL_CONCURRENCY     7
-#define SQL_KEYSET_SIZE     8
-#define SQL_ROWSET_SIZE     9
-#define SQL_SIMULATE_CURSOR 10
-#define SQL_RETRIEVE_DATA   11
-#define SQL_USE_BOOKMARKS   12
-#define SQL_GET_BOOKMARK    13
-#define SQL_ROW_NUMBER      14
-
-#define SQL_STMT_OPT_MIN    SQL_QUERY_TIMEOUT
-#define SQL_STMT_OPT_MAX    SQL_ROW_NUMBER
-
-
-/*
- * SQL_QUERY_TIMEOUT
- */
-#define SQL_QUERY_TIMEOUT_DEFAULT 0UL
-
-/*
- *  SQL_MAX_ROWS
- */
-#define SQL_MAX_ROWS_DEFAULT 0UL
-
-/*
- *  SQL_NOSCAN
- */
-#define SQL_NOSCAN_OFF      0UL /* 1.0 FALSE */
-#define SQL_NOSCAN_ON       1UL /* 1.0 TRUE */
-#define SQL_NOSCAN_DEFAULT  SQL_NOSCAN_OFF
-
-/*
- *  SQL_MAX_LENGTH
- */
-#define SQL_MAX_LENGTH_DEFAULT      0UL
-
-/*
- *  SQL_ASYNC_ENABLE
- */
-#define SQL_ASYNC_ENABLE_OFF        0UL
-#define SQL_ASYNC_ENABLE_ON         1UL
-#define SQL_ASYNC_ENABLE_DEFAULT    SQL_ASYNC_ENABLE_OFF
-
-/*
- *  SQL_BIND_TYPE
- */
-#define SQL_BIND_BY_COLUMN          0UL
-#define SQL_BIND_TYPE_DEFAULT       SQL_BIND_BY_COLUMN
-
-/*
- *  SQL_CONCURRENCY
- */
-#define SQL_CONCUR_READ_ONLY        1
-#define SQL_CONCUR_LOCK             2
-#define SQL_CONCUR_ROWVER           3
-#define SQL_CONCUR_VALUES           4
-#define SQL_CONCUR_DEFAULT          SQL_CONCUR_READ_ONLY
-
-/*
- *  SQL_CURSOR_TYPE
- */
-#define SQL_CURSOR_FORWARD_ONLY     0UL
-#define SQL_CURSOR_KEYSET_DRIVEN    1UL
-#define SQL_CURSOR_DYNAMIC          2UL
-#define SQL_CURSOR_STATIC           3UL
-#define SQL_CURSOR_TYPE_DEFAULT     SQL_CURSOR_FORWARD_ONLY
-
-/*
- *  SQL_ROWSET_SIZE
- */
-#define SQL_ROWSET_SIZE_DEFAULT     1UL
-
-/*
- *  SQL_KEYSET_SIZE
- */
-#define SQL_KEYSET_SIZE_DEFAULT     0UL
-
-/*
- *  SQL_SIMULATE_CURSOR
- */
-#define SQL_SC_NON_UNIQUE           0UL
-#define SQL_SC_TRY_UNIQUE           1UL
-#define SQL_SC_UNIQUE               2UL
-
-/*
- *  SQL_RETRIEVE_DATA
- */
-#define SQL_RD_OFF                  0UL
-#define SQL_RD_ON                   1UL
-#define SQL_RD_DEFAULT              SQL_RD_ON
-
-/*
- *  SQL_USE_BOOKMARKS
- */
-#define SQL_UB_OFF                  0UL
-#define SQL_UB_ON                   1UL
-#define SQL_UB_DEFAULT              SQL_UB_OFF
-
-/*
- *  SQLSetConnectOption/SQLGetConnectOption
- */
-#define SQL_ACCESS_MODE             101
-#define SQL_AUTOCOMMIT              102
-#define SQL_LOGIN_TIMEOUT           103
-#define SQL_OPT_TRACE               104
-#define SQL_OPT_TRACEFILE           105
-#define SQL_TRANSLATE_DLL           106
-#define SQL_TRANSLATE_OPTION        107
-#define SQL_TXN_ISOLATION           108
-#define SQL_CURRENT_QUALIFIER       109
-#define SQL_ODBC_CURSORS            110
-#define SQL_QUIET_MODE              111
-#define SQL_PACKET_SIZE             112
-
-#define SQL_CONN_OPT_MIN            SQL_ACCESS_MODE
-#define SQL_CONN_OPT_MAX            SQL_PACKET_SIZE
-#define SQL_CONNECT_OPT_DRVR_START  1000
-
-
-/*
- *  SQL_ACCESS_MODE
- */
-#define SQL_MODE_READ_WRITE         0UL
-#define SQL_MODE_READ_ONLY          1UL
-#define SQL_MODE_DEFAULT            SQL_MODE_READ_WRITE
-
-/*
- *  SQL_AUTOCOMMIT
- */
-#define SQL_AUTOCOMMIT_OFF          0UL
-#define SQL_AUTOCOMMIT_ON           1UL
-#define SQL_AUTOCOMMIT_DEFAULT      SQL_AUTOCOMMIT_ON
-
-/*
- *  SQL_LOGIN_TIMEOUT
- */
-#define SQL_LOGIN_TIMEOUT_DEFAULT   15UL
-
-/*
- *  SQL_OPT_TRACE
- */
-#define SQL_OPT_TRACE_OFF           0UL
-#define SQL_OPT_TRACE_ON            1UL
-#define SQL_OPT_TRACE_DEFAULT       SQL_OPT_TRACE_OFF
-#define SQL_OPT_TRACE_FILE_DEFAULT  "odbc.log"
-
-/*
- *  SQL_ODBC_CURSORS
- */
-#define SQL_CUR_USE_IF_NEEDED       0UL
-#define SQL_CUR_USE_ODBC            1UL
-#define SQL_CUR_USE_DRIVER          2UL
-#define SQL_CUR_DEFAULT             SQL_CUR_USE_DRIVER
-
-/*
- *  SQLSpecialColumns - Column types and scopes
- */
-#define SQL_BEST_ROWID              1
-#define SQL_ROWVER                  2
-
-#define SQL_SCOPE_CURROW            0
-#define SQL_SCOPE_TRANSACTION       1
-#define SQL_SCOPE_SESSION           2
-
-/*
- *  SQLSetPos
- */
-#define SQL_ENTIRE_ROWSET           0
-
-/*
- *  SQLSetPos
- */
-#define SQL_POSITION                0
-#define SQL_REFRESH                 1
-#define SQL_UPDATE                  2
-#define SQL_DELETE                  3
-#define SQL_ADD                     4
-
-/*
- *  SQLSetPos
- */
-#define SQL_LOCK_NO_CHANGE          0
-#define SQL_LOCK_EXCLUSIVE          1
-#define SQL_LOCK_UNLOCK             2
-
-/*
- *  SQLSetPos
- */
-#define SQL_POSITION_TO(hstmt,irow) \
-    SQLSetPos(hstmt,irow,SQL_POSITION,SQL_LOCK_NO_CHANGE)
-#define SQL_LOCK_RECORD(hstmt,irow,fLock) \
-    SQLSetPos(hstmt,irow,SQL_POSITION,fLock)
-#define SQL_REFRESH_RECORD(hstmt,irow,fLock) \
-    SQLSetPos(hstmt,irow,SQL_REFRESH,fLock)
-#define SQL_UPDATE_RECORD(hstmt,irow) \
-    SQLSetPos(hstmt,irow,SQL_UPDATE,SQL_LOCK_NO_CHANGE)
-#define SQL_DELETE_RECORD(hstmt,irow) \
-    SQLSetPos(hstmt,irow,SQL_DELETE,SQL_LOCK_NO_CHANGE)
-#define SQL_ADD_RECORD(hstmt,irow) \
-    SQLSetPos(hstmt,irow,SQL_ADD,SQL_LOCK_NO_CHANGE)
-
-/*
- *  All the ODBC keywords
- */
-#define SQL_ODBC_KEYWORDS \
-"ABSOLUTE,ACTION,ADA,ADD,ALL,ALLOCATE,ALTER,AND,ANY,ARE,AS,"\
-"ASC,ASSERTION,AT,AUTHORIZATION,AVG,"\
-"BEGIN,BETWEEN,BIT,BIT_LENGTH,BOTH,BY,CASCADE,CASCADED,CASE,CAST,CATALOG,"\
-"CHAR,CHAR_LENGTH,CHARACTER,CHARACTER_LENGTH,CHECK,CLOSE,COALESCE,"\
-"COBOL,COLLATE,COLLATION,COLUMN,COMMIT,CONNECT,CONNECTION,CONSTRAINT,"\
-"CONSTRAINTS,CONTINUE,CONVERT,CORRESPONDING,COUNT,CREATE,CROSS,CURRENT,"\
-"CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,"\
-"DATE,DAY,DEALLOCATE,DEC,DECIMAL,DECLARE,DEFAULT,DEFERRABLE,"\
-"DEFERRED,DELETE,DESC,DESCRIBE,DESCRIPTOR,DIAGNOSTICS,DISCONNECT,"\
-"DISTINCT,DOMAIN,DOUBLE,DROP,"\
-"ELSE,END,END-EXEC,ESCAPE,EXCEPT,EXCEPTION,EXEC,EXECUTE,"\
-"EXISTS,EXTERNAL,EXTRACT,"\
-"FALSE,FETCH,FIRST,FLOAT,FOR,FOREIGN,FORTRAN,FOUND,FROM,FULL,"\
-"GET,GLOBAL,GO,GOTO,GRANT,GROUP,HAVING,HOUR,"\
-"IDENTITY,IMMEDIATE,IN,INCLUDE,INDEX,INDICATOR,INITIALLY,INNER,"\
-"INPUT,INSENSITIVE,INSERT,INTEGER,INTERSECT,INTERVAL,INTO,IS,ISOLATION,"\
-"JOIN,KEY,LANGUAGE,LAST,LEADING,LEFT,LEVEL,LIKE,LOCAL,LOWER,"\
-"MATCH,MAX,MIN,MINUTE,MODULE,MONTH,MUMPS,"\
-"NAMES,NATIONAL,NATURAL,NCHAR,NEXT,NO,NONE,NOT,NULL,NULLIF,NUMERIC,"\
-"OCTET_LENGTH,OF,ON,ONLY,OPEN,OPTION,OR,ORDER,OUTER,OUTPUT,OVERLAPS,"\
-"PAD,PARTIAL,PASCAL,PLI,POSITION,PRECISION,PREPARE,PRESERVE,"\
-"PRIMARY,PRIOR,PRIVILEGES,PROCEDURE,PUBLIC,"\
-"REFERENCES,RELATIVE,RESTRICT,REVOKE,RIGHT,ROLLBACK,ROWS,"\
-"SCHEMA,SCROLL,SECOND,SECTION,SELECT,SEQUENCE,SESSION,SESSION_USER,SET,SIZE,"\
-"SMALLINT,SOME,SPACE,SQL,SQLCA,SQLCODE,SQLERROR,SQLSTATE,SQLWARNING,"\
-"SUBSTRING,SUM,SYSTEM_USER,"\
-"TABLE,TEMPORARY,THEN,TIME,TIMESTAMP,TIMEZONE_HOUR,TIMEZONE_MINUTE,"\
-"TO,TRAILING,TRANSACTION,TRANSLATE,TRANSLATION,TRIM,TRUE,"\
-"UNION,UNIQUE,UNKNOWN,UPDATE,UPPER,USAGE,USER,USING,"\
-"VALUE,,VARCHAR,VARYING,VIEW,WHEN,WHENEVER,WHERE,WITH,WORK,YEAR"
-
-/*
- * ----------------------------------------------------------------------
- *  Level 2 Functions
- * ----------------------------------------------------------------------
- */
-
-/*
- *  SQLExtendedFetch - fFetchType
- */
-#define SQL_FETCH_NEXT          1
-#define SQL_FETCH_FIRST         2
-#define SQL_FETCH_LAST          3
-#define SQL_FETCH_PRIOR         4
-#define SQL_FETCH_ABSOLUTE      5
-#define SQL_FETCH_RELATIVE      6
-#define SQL_FETCH_BOOKMARK      8
-
-/*
- *  SQLExtendedFetch - rgfRowStatus
- */
-#define SQL_ROW_SUCCESS         0
-#define SQL_ROW_DELETED         1
-#define SQL_ROW_UPDATED         2
-#define SQL_ROW_NOROW           3
-#define SQL_ROW_ADDED           4
-#define SQL_ROW_ERROR           5
-
-/*
- *  SQLForeignKeys - UPDATE_RULE/DELETE_RULE
- */
-#define SQL_CASCADE             0
-#define SQL_RESTRICT            1
-#define SQL_SET_NULL            2
-
-/*
- *  SQLBindParameter - fParamType
- *  SQLProcedureColumns - COLUMN_TYPE
- */
-#define SQL_PARAM_TYPE_UNKNOWN  0
-#define SQL_PARAM_INPUT         1
-#define SQL_PARAM_INPUT_OUTPUT  2
-#define SQL_RESULT_COL          3
-#define SQL_PARAM_OUTPUT        4
-#define SQL_RETURN_VALUE        5
-
-/*
- *  SQLSetParam to SQLBindParameter conversion
- */
-#define SQL_PARAM_TYPE_DEFAULT  SQL_PARAM_INPUT_OUTPUT
-#define SQL_SETPARAM_VALUE_MAX  (-1L)
-
-/*
- *  SQLStatistics - fUnique
- */
-#define SQL_INDEX_UNIQUE        0
-#define SQL_INDEX_ALL           1
-
-/*
- *  SQLStatistics - fAccuracy
- */
-#define SQL_QUICK               0
-#define SQL_ENSURE              1
-
-/*
- *  SQLStatistics - TYPE
- */
-#define SQL_TABLE_STAT          0
-#define SQL_INDEX_CLUSTERED     1
-#define SQL_INDEX_HASHED        2
-#define SQL_INDEX_OTHER         3
-
-/*
- *  SQLProcedures - PROCEDURE_TYPE
- */
-#define SQL_PT_UNKNOWN          0
-#define SQL_PT_PROCEDURE        1
-#define SQL_PT_FUNCTION         2
-
-/*
- *  SQLSpecialColumns - PSEUDO_COLUMN
- */
-#define SQL_PC_UNKNOWN          0
-#define SQL_PC_NOT_PSEUDO       1
-#define SQL_PC_PSEUDO           2
-
-/*
- *  Deprecated defines from prior versions of ODBC
- */
-#define SQL_DATABASE_NAME           16
-#define SQL_FD_FETCH_PREV           SQL_FD_FETCH_PRIOR
-#define SQL_FETCH_PREV              SQL_FETCH_PRIOR
-#define SQL_CONCUR_TIMESTAMP        SQL_CONCUR_ROWVER
-#define SQL_SCCO_OPT_TIMESTAMP      SQL_SCCO_OPT_ROWVER
-#define SQL_CC_DELETE               SQL_CB_DELETE
-#define SQL_CR_DELETE               SQL_CB_DELETE
-#define SQL_CC_CLOSE                SQL_CB_CLOSE
-#define SQL_CR_CLOSE                SQL_CB_CLOSE
-#define SQL_CC_PRESERVE             SQL_CB_PRESERVE
-#define SQL_CR_PRESERVE             SQL_CB_PRESERVE
-#define SQL_FETCH_RESUME            7
-#define SQL_SCROLL_FORWARD_ONLY     0L
-#define SQL_SCROLL_KEYSET_DRIVEN    (-1L)
-#define SQL_SCROLL_DYNAMIC          (-2L)
-#define SQL_SCROLL_STATIC           (-3L)
-#define SQL_PC_NON_PSEUDO           SQL_PC_NOT_PSEUDO
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- *  Level 1 function prototypes
- */
-RETCODE SQL_API SQLColumns (HSTMT hstmt, UCHAR FAR * szTableQualifier,
-    SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner,
-    UCHAR FAR * szTableName, SWORD cbTableName, UCHAR FAR * szColumnName,
-    SWORD cbColumnName);
-/* glt - Changed HWND to SQLHWND to match MSW header typing */
-RETCODE SQL_API SQLDriverConnect (HDBC hdbc, SQLHWND hwnd,
-    UCHAR FAR * szConnStrIn, SWORD cbConnStrIn, UCHAR FAR * szConnStrOut,
-    SWORD cbConnStrOutMax, SWORD FAR * pcbConnStrOut, UWORD fDriverCompletion);
-RETCODE SQL_API SQLGetConnectOption (HDBC hdbc, UWORD fOption, PTR pvParam);
-RETCODE SQL_API SQLGetData (HSTMT hstmt, UWORD icol, SWORD fCType,
-    PTR rgbValue, SDWORD cbValueMax, SDWORD FAR * pcbValue);
-RETCODE SQL_API SQLGetFunctions (HDBC hdbc, UWORD fFunction,
-    UWORD FAR * pfExists);
-RETCODE SQL_API SQLGetInfo (HDBC hdbc, UWORD fInfoType, PTR rgbInfoValue,
-    SWORD cbInfoValueMax, SWORD FAR * pcbInfoValue);
-RETCODE SQL_API SQLGetStmtOption (HSTMT hstmt, UWORD fOption, PTR pvParam);
-RETCODE SQL_API SQLGetTypeInfo (HSTMT hstmt, SWORD fSqlType);
-RETCODE SQL_API SQLParamData (HSTMT hstmt, PTR FAR * prgbValue);
-RETCODE SQL_API SQLPutData (HSTMT hstmt, PTR rgbValue, SDWORD cbValue);
-RETCODE SQL_API SQLSetConnectOption (HDBC hdbc, UWORD fOption, UDWORD vParam);
-RETCODE SQL_API SQLSetStmtOption (HSTMT hstmt, UWORD fOption, UDWORD vParam);
-RETCODE SQL_API SQLSpecialColumns (HSTMT hstmt, UWORD fColType,
-    UCHAR FAR * szTableQualifier, SWORD cbTableQualifier,
-    UCHAR FAR * szTableOwner, SWORD cbTableOwner, UCHAR FAR * szTableName,
-    SWORD cbTableName, UWORD fScope, UWORD fNullable);
-RETCODE SQL_API SQLStatistics (HSTMT hstmt, UCHAR FAR * szTableQualifier,
-    SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner,
-    UCHAR FAR * szTableName, SWORD cbTableName, UWORD fUnique, UWORD fAccuracy);
-RETCODE SQL_API SQLTables (HSTMT hstmt, UCHAR FAR * szTableQualifier,
-    SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner,
-    UCHAR FAR * szTableName, SWORD cbTableName, UCHAR FAR * szTableType,
-    SWORD cbTableType);
-
-/*
- *  Level 2 function prototypes
- */
-RETCODE SQL_API SQLBrowseConnect (HDBC hdbc,
-    UCHAR FAR * szConnStrIn, SWORD cbConnStrIn, UCHAR FAR * szConnStrOut,
-    SWORD cbConnStrOutMax, SWORD FAR * pcbConnStrOut);
-RETCODE SQL_API SQLColumnPrivileges (HSTMT hstmt,
-    UCHAR FAR * szTableQualifier, SWORD cbTableQualifier,
-    UCHAR FAR * szTableOwner, SWORD cbTableOwner, UCHAR FAR * szTableName,
-    SWORD cbTableName, UCHAR FAR * szColumnName, SWORD cbColumnName);
-RETCODE SQL_API SQLDataSources (HENV henv, UWORD fDirection,
-    UCHAR FAR * szDSN, SWORD cbDSNMax, SWORD FAR * pcbDSN,
-    UCHAR FAR * szDescription, SWORD cbDescriptionMax,
-    SWORD FAR * pcbDescription);
-RETCODE SQL_API SQLDescribeParam (HSTMT hstmt, UWORD ipar,
-    SWORD FAR * pfSqlType, UDWORD FAR * pcbColDef, SWORD FAR * pibScale,
-    SWORD FAR * pfNullable);
-RETCODE SQL_API SQLExtendedFetch (HSTMT hstmt, UWORD fFetchType, SDWORD irow,
-    UDWORD FAR * pcrow, UWORD FAR * rgfRowStatus);
-RETCODE SQL_API SQLForeignKeys (HSTMT hstmt, UCHAR FAR * szPkTableQualifier,
-    SWORD cbPkTableQualifier, UCHAR FAR * szPkTableOwner, SWORD cbPkTableOwner,
-    UCHAR FAR * szPkTableName, SWORD cbPkTableName,
-    UCHAR FAR * szFkTableQualifier, SWORD cbFkTableQualifier,
-    UCHAR FAR * szFkTableOwner, SWORD cbFkTableOwner, UCHAR FAR * szFkTableName,
-    SWORD cbFkTableName);
-RETCODE SQL_API SQLMoreResults (HSTMT hstmt);
-RETCODE SQL_API SQLNativeSql (HDBC hdbc, UCHAR FAR * szSqlStrIn,
-    SDWORD cbSqlStrIn, UCHAR FAR * szSqlStr, SDWORD cbSqlStrMax,
-    SDWORD FAR * pcbSqlStr);
-RETCODE SQL_API SQLNumParams (HSTMT hstmt, SWORD FAR * pcpar);
-RETCODE SQL_API SQLParamOptions (HSTMT hstmt, UDWORD crow, UDWORD FAR * pirow);
-RETCODE SQL_API SQLPrimaryKeys (HSTMT hstmt, UCHAR FAR * szTableQualifier,
-    SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner,
-    UCHAR FAR * szTableName, SWORD cbTableName);
-RETCODE SQL_API SQLProcedureColumns (HSTMT hstmt, UCHAR FAR * szProcQualifier,
-    SWORD cbProcQualifier, UCHAR FAR * szProcOwner, SWORD cbProcOwner,
-    UCHAR FAR * szProcName, SWORD cbProcName, UCHAR FAR * szColumnName,
-    SWORD cbColumnName);
-RETCODE SQL_API SQLProcedures (HSTMT hstmt, UCHAR FAR * szProcQualifier,
-    SWORD cbProcQualifier, UCHAR FAR * szProcOwner, SWORD cbProcOwner,
-    UCHAR FAR * szProcName, SWORD cbProcName);
-RETCODE SQL_API SQLSetPos (HSTMT hstmt, UWORD irow, UWORD fOption, UWORD fLock);
-RETCODE SQL_API SQLTablePrivileges (HSTMT hstmt, UCHAR FAR * szTableQualifier,
-    SWORD cbTableQualifier, UCHAR FAR * szTableOwner, SWORD cbTableOwner,
-    UCHAR FAR * szTableName, SWORD cbTableName);
-
-/*
- *  SDK 2.0 Additional function prototypes
- */
-RETCODE SQL_API SQLDrivers (HENV henv, UWORD fDirection,
-    UCHAR FAR * szDriverDesc, SWORD cbDriverDescMax, SWORD FAR * pcbDriverDesc,
-    UCHAR FAR * szDriverAttributes, SWORD cbDrvrAttrMax,
-    SWORD FAR * pcbDrvrAttr);
-RETCODE SQL_API SQLBindParameter (HSTMT hstmt, UWORD ipar, SWORD fParamType,
-    SWORD fCType, SWORD fSqlType, UDWORD cbColDef, SWORD ibScale, PTR rgbValue,
-    SDWORD cbValueMax, SDWORD FAR * pcbValue);
-
-/*
- *  Deprecated - use SQLSetStmtOptions
- */
-RETCODE SQL_API SQLSetScrollOptions (HSTMT hstmt, UWORD fConcurrency,
-    SDWORD crowKeyset, UWORD crowRowset);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
index 8f36bb660a5b207145c44237da381d6945291e87..3212dfa83e0c82f0ae90f837eed38a65d32c2284 100644 (file)
 // to create fiels in SVG (Scalable Vector Graphics) format.
 #define wxUSE_SVG 1
 
-// ----------------------------------------------------------------------------
-// database classes
-// ----------------------------------------------------------------------------
-
-// Define 1 to use ODBC classes
-#define wxUSE_ODBC          0
-
-// For backward compatibility reasons, this parameter now only controls the
-// default scrolling method used by cursors.  This default behavior can be
-// overriden by setting the second param of wxDB::wxDbGetConnection() or
-// wxDb() constructor to indicate whether the connection (and any wxDbTable()s
-// that use the connection) should support forward only scrolling of cursors,
-// or both forward and backward support for backward scrolling cursors is
-// dependent on the data source as well as the ODBC driver being used.
-#define wxODBC_FWD_ONLY_CURSORS         1
-
-// Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatibility with the
-// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
-// as future development will be done only on the non-deprecated
-// functions/classes/member variables/etc.
-#define wxODBC_BACKWARD_COMPATABILITY 0
-
 // ----------------------------------------------------------------------------
 // other compiler (mis)features
 // ----------------------------------------------------------------------------
index 85136cfe9996f14b5d14678edb30541a7e97f8de..12ebd70cde6c0784799a12b9c145de3c96590352 100644 (file)
 #   define wxUSE_DYNAMIC_LOADER 0
 #endif /* wxUSE_DYNAMIC_LOADER */
 
-#if wxUSE_ODBC
-#   undef wxUSE_ODBC
-#   define wxUSE_ODBC 0
-#endif /* wxUSE_ODBC */
-
 #if wxUSE_DATAOBJ
 #   undef wxUSE_DATAOBJ
 #   define wxUSE_DATAOBJ 0
index 29aaf9008dbc28c305a2eca599064d3970f84c8a..838430120ba9ded5ff9c3b6c6fa671a07991790f 100644 (file)
 // to create fiels in SVG (Scalable Vector Graphics) format.
 #define wxUSE_SVG 1
 
-// ----------------------------------------------------------------------------
-// database classes
-// ----------------------------------------------------------------------------
-
-// Define 1 to use ODBC classes
-#define wxUSE_ODBC          0
-
-// For backward compatibility reasons, this parameter now only controls the
-// default scrolling method used by cursors.  This default behavior can be
-// overriden by setting the second param of wxDB::wxDbGetConnection() or
-// wxDb() constructor to indicate whether the connection (and any wxDbTable()s
-// that use the connection) should support forward only scrolling of cursors,
-// or both forward and backward support for backward scrolling cursors is
-// dependent on the data source as well as the ODBC driver being used.
-#define wxODBC_FWD_ONLY_CURSORS         1
-
-// Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatibility with the
-// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
-// as future development will be done only on the non-deprecated
-// functions/classes/member variables/etc.
-#define wxODBC_BACKWARD_COMPATABILITY 0
-
 // ----------------------------------------------------------------------------
 // other compiler (mis)features
 // ----------------------------------------------------------------------------
index 40f33fe03593730cada92f6df77bbfc22a278209..2bac203e0ce601210d53c9a84b04176c53dfc5c1 100644 (file)
 // to create fiels in SVG (Scalable Vector Graphics) format.
 #define wxUSE_SVG 1
 
-// ----------------------------------------------------------------------------
-// database classes
-// ----------------------------------------------------------------------------
-
-// Define 1 to use ODBC classes
-#define wxUSE_ODBC          0
-
-// For backward compatibility reasons, this parameter now only controls the
-// default scrolling method used by cursors.  This default behavior can be
-// overriden by setting the second param of wxDB::wxDbGetConnection() or
-// wxDb() constructor to indicate whether the connection (and any wxDbTable()s
-// that use the connection) should support forward only scrolling of cursors,
-// or both forward and backward support for backward scrolling cursors is
-// dependent on the data source as well as the ODBC driver being used.
-#define wxODBC_FWD_ONLY_CURSORS         1
-
-// Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatibility with the
-// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
-// as future development will be done only on the non-deprecated
-// functions/classes/member variables/etc.
-#define wxODBC_BACKWARD_COMPATABILITY 0
-
 // ----------------------------------------------------------------------------
 // other compiler (mis)features
 // ----------------------------------------------------------------------------
index bae40aacc1debbf30ebe14327b89887bd9c2de06..c2b1de3118e87f086d7992111dc02e24d927d9f5 100644 (file)
 // to create fiels in SVG (Scalable Vector Graphics) format.
 #define wxUSE_SVG 1
 
-// ----------------------------------------------------------------------------
-// database classes
-// ----------------------------------------------------------------------------
-
-// Define 1 to use ODBC classes
-#define wxUSE_ODBC          0
-
-// For backward compatibility reasons, this parameter now only controls the
-// default scrolling method used by cursors.  This default behavior can be
-// overriden by setting the second param of wxDB::wxDbGetConnection() or
-// wxDb() constructor to indicate whether the connection (and any wxDbTable()s
-// that use the connection) should support forward only scrolling of cursors,
-// or both forward and backward support for backward scrolling cursors is
-// dependent on the data source as well as the ODBC driver being used.
-#define wxODBC_FWD_ONLY_CURSORS         1
-
-// Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatibility with the
-// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
-// as future development will be done only on the non-deprecated
-// functions/classes/member variables/etc.
-#define wxODBC_BACKWARD_COMPATABILITY 0
-
 // ----------------------------------------------------------------------------
 // other compiler (mis)features
 // ----------------------------------------------------------------------------
index a81bb1229c0efd437e29f9e54d54c8ecc5339381..f54f986b5c278db77f19ba774ee4dd3eec305038 100644 (file)
 // to create fiels in SVG (Scalable Vector Graphics) format.
 #define wxUSE_SVG 1
 
-// ----------------------------------------------------------------------------
-// database classes
-// ----------------------------------------------------------------------------
-
-// Define 1 to use ODBC classes
-#define wxUSE_ODBC          0
-
-// For backward compatibility reasons, this parameter now only controls the
-// default scrolling method used by cursors.  This default behavior can be
-// overriden by setting the second param of wxDB::wxDbGetConnection() or
-// wxDb() constructor to indicate whether the connection (and any wxDbTable()s
-// that use the connection) should support forward only scrolling of cursors,
-// or both forward and backward support for backward scrolling cursors is
-// dependent on the data source as well as the ODBC driver being used.
-#define wxODBC_FWD_ONLY_CURSORS         1
-
-// Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatibility with the
-// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
-// as future development will be done only on the non-deprecated
-// functions/classes/member variables/etc.
-#define wxODBC_BACKWARD_COMPATABILITY 0
-
 // ----------------------------------------------------------------------------
 // other compiler (mis)features
 // ----------------------------------------------------------------------------
index 7ee9e83a7760367f1fd6f71c2149c78e66ceb46e..310d413456254192a1d563e0c689b5385124194c 100644 (file)
 // to create fiels in SVG (Scalable Vector Graphics) format.
 #define wxUSE_SVG 1
 
-// ----------------------------------------------------------------------------
-// database classes
-// ----------------------------------------------------------------------------
-
-// Define 1 to use ODBC classes
-#define wxUSE_ODBC          0
-
-// For backward compatibility reasons, this parameter now only controls the
-// default scrolling method used by cursors.  This default behavior can be
-// overriden by setting the second param of wxDB::wxDbGetConnection() or
-// wxDb() constructor to indicate whether the connection (and any wxDbTable()s
-// that use the connection) should support forward only scrolling of cursors,
-// or both forward and backward support for backward scrolling cursors is
-// dependent on the data source as well as the ODBC driver being used.
-#define wxODBC_FWD_ONLY_CURSORS         1
-
-// Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatibility with the
-// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
-// as future development will be done only on the non-deprecated
-// functions/classes/member variables/etc.
-#define wxODBC_BACKWARD_COMPATABILITY 0
-
 // ----------------------------------------------------------------------------
 // other compiler (mis)features
 // ----------------------------------------------------------------------------
index c3fc0d76e5256a9079832e6d3b0423c9d98e8345..aad1179e160966b3e673479eeff1a91083b6cf76 100644 (file)
 // to create fiels in SVG (Scalable Vector Graphics) format.
 #define wxUSE_SVG 1
 
-// ----------------------------------------------------------------------------
-// database classes
-// ----------------------------------------------------------------------------
-
-// Define 1 to use ODBC classes
-#define wxUSE_ODBC          0
-
-// For backward compatibility reasons, this parameter now only controls the
-// default scrolling method used by cursors.  This default behavior can be
-// overriden by setting the second param of wxDB::wxDbGetConnection() or
-// wxDb() constructor to indicate whether the connection (and any wxDbTable()s
-// that use the connection) should support forward only scrolling of cursors,
-// or both forward and backward support for backward scrolling cursors is
-// dependent on the data source as well as the ODBC driver being used.
-#define wxODBC_FWD_ONLY_CURSORS         1
-
-// Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatibility with the
-// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
-// as future development will be done only on the non-deprecated
-// functions/classes/member variables/etc.
-#define wxODBC_BACKWARD_COMPATABILITY 0
-
 // ----------------------------------------------------------------------------
 // other compiler (mis)features
 // ----------------------------------------------------------------------------
index d1a2da89ab9b173d681c7bf3848840838975c647..5009c9f2e9d100d14984b0f06d4678982374f784 100644 (file)
 // to create fiels in SVG (Scalable Vector Graphics) format.
 #define wxUSE_SVG 1
 
-// ----------------------------------------------------------------------------
-// database classes
-// ----------------------------------------------------------------------------
-
-// Define 1 to use ODBC classes
-#define wxUSE_ODBC          0
-
-// For backward compatibility reasons, this parameter now only controls the
-// default scrolling method used by cursors.  This default behavior can be
-// overriden by setting the second param of wxDB::wxDbGetConnection() or
-// wxDb() constructor to indicate whether the connection (and any wxDbTable()s
-// that use the connection) should support forward only scrolling of cursors,
-// or both forward and backward support for backward scrolling cursors is
-// dependent on the data source as well as the ODBC driver being used.
-#define wxODBC_FWD_ONLY_CURSORS         1
-
-// Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatibility with the
-// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
-// as future development will be done only on the non-deprecated
-// functions/classes/member variables/etc.
-#define wxODBC_BACKWARD_COMPATABILITY 0
-
 // ----------------------------------------------------------------------------
 // other compiler (mis)features
 // ----------------------------------------------------------------------------
 // to create fiels in SVG (Scalable Vector Graphics) format.
 #define wxUSE_SVG 1
 
-// ----------------------------------------------------------------------------
-// database classes
-// ----------------------------------------------------------------------------
-
-// Define 1 to use ODBC classes
-#define wxUSE_ODBC          0
-
-// For backward compatibility reasons, this parameter now only controls the
-// default scrolling method used by cursors.  This default behavior can be
-// overriden by setting the second param of wxDB::wxDbGetConnection() or
-// wxDb() constructor to indicate whether the connection (and any wxDbTable()s
-// that use the connection) should support forward only scrolling of cursors,
-// or both forward and backward support for backward scrolling cursors is
-// dependent on the data source as well as the ODBC driver being used.
-#define wxODBC_FWD_ONLY_CURSORS         1
-
-// Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatibility with the
-// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
-// as future development will be done only on the non-deprecated
-// functions/classes/member variables/etc.
-#define wxODBC_BACKWARD_COMPATABILITY 0
-
 // ----------------------------------------------------------------------------
 // other compiler (mis)features
 // ----------------------------------------------------------------------------
index 31fbbc8acb01c3ab01678dc8f3d05673b96a6688..89cb6c437d73444f1e307e751efd4796007227d1 100644 (file)
     #include "wx/datetime.h"
 #endif // wxUSE_DATETIME
 
-#if wxUSE_ODBC
-    #include "wx/db.h"  // will #include sqltypes.h
-#endif //ODBC
-
 #include "wx/iosfwrap.h"
 
 /*
@@ -202,19 +198,9 @@ public:
     // wxDateTime
 #if wxUSE_DATETIME
     wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString);
-#if wxUSE_ODBC
-    wxVariant(const DATE_STRUCT* valptr, const wxString& name = wxEmptyString);
-    wxVariant(const TIME_STRUCT* valptr, const wxString& name = wxEmptyString);
-    wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name = wxEmptyString);
-#endif
     bool operator== (const wxDateTime& value) const;
     bool operator!= (const wxDateTime& value) const;
     void operator= (const wxDateTime& value) ;
-#if wxUSE_ODBC
-    void operator= (const DATE_STRUCT* value) ;
-    void operator= (const TIME_STRUCT* value) ;
-    void operator= (const TIMESTAMP_STRUCT* value) ;
-#endif
     inline operator wxDateTime () const { return GetDateTime(); }
     wxDateTime GetDateTime() const;
 #endif
index 9a25429c30eacfc7ffffe600e9ab957e91d1e6be..7921752aa4fbc6dd8e9a5b64156c329f5a23c4ad 100644 (file)
@@ -70,7 +70,6 @@
     #define TEST_MIME
     #define TEST_MODULE
     #define TEST_PATHLIST
-    #define TEST_ODBC
     #define TEST_PRINTF
     #define TEST_REGCONF
     #define TEST_REGEX
@@ -1659,26 +1658,6 @@ static void TestRegExInteractive()
 
 #endif // TEST_REGEX
 
-// ----------------------------------------------------------------------------
-// database
-// ----------------------------------------------------------------------------
-
-#if !wxUSE_ODBC
-    #undef TEST_ODBC
-#endif
-
-#ifdef TEST_ODBC
-
-#include "wx/db.h"
-
-static void TestDbOpen()
-{
-    HENV henv;
-    wxDb db(henv);
-}
-
-#endif // TEST_ODBC
-
 // ----------------------------------------------------------------------------
 // printf() tests
 // ----------------------------------------------------------------------------
@@ -4435,10 +4414,6 @@ int main(int argc, char **argv)
     TestPathList();
 #endif // TEST_PATHLIST
 
-#ifdef TEST_ODBC
-    TestDbOpen();
-#endif // TEST_ODBC
-
 #ifdef TEST_PRINTF
     TestPrintf();
 #endif // TEST_PRINTF
diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in
deleted file mode 100644 (file)
index beaadbf..0000000
+++ /dev/null
@@ -1,220 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.2 (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@
-BK_DEPS = @BK_DEPS@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-LIBS = @LIBS@
-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_XML = @EXTRALIBS_XML@
-EXTRALIBS_HTML = @EXTRALIBS_HTML@
-EXTRALIBS_ODBC = @EXTRALIBS_ODBC@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-EXTRALIBS_SDL = @EXTRALIBS_SDL@
-CXXWARNINGS = @CXXWARNINGS@
-HOST_SUFFIX = @HOST_SUFFIX@
-SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
-wx_top_builddir = @wx_top_builddir@
-
-### Variables: ###
-
-DESTDIR = 
-WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).0
-LIBDIRNAME = $(wx_top_builddir)/lib
-DBTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
-       $(CPPFLAGS) $(CXXFLAGS)
-DBTEST_OBJECTS =  \
-       $(__dbtest_os2_lib_res) \
-       dbtest_dbtest.o \
-       dbtest_listdb.o \
-       $(__dbtest___win32rc)
-
-### Conditionally set variables: ###
-
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
-@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
-@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_USE_ODBC_1@__dbtest___depname = dbtest$(EXEEXT)
-@COND_PLATFORM_MAC_1@__dbtest___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@  $(SETFILE) -a C dbtest$(EXEEXT)
-@COND_PLATFORM_MAC_1@__dbtest___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___dbtest___os2_emxbindcmd = $(NM) dbtest$(EXEEXT) | if grep \
-       -q pmwin.763 ; then emxbind -ep dbtest$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__dbtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dbtest___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_OS2_1@__dbtest_os2_lib_res = \
-@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
-@COND_PLATFORM_MACOSX_1@__dbtest_bundle___depname = dbtest_bundle
-@COND_TOOLKIT_COCOA@____dbtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@   dbtest.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____dbtest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     dbtest.app/Contents/PkgInfo
-COND_MONOLITHIC_0___WXLIB_DBGRID_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_DBGRID_p = $(COND_MONOLITHIC_0___WXLIB_DBGRID_p)
-COND_MONOLITHIC_0_USE_ODBC_1___WXLIB_ODBC_p = \
-       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0_USE_ODBC_1@__WXLIB_ODBC_p = $(COND_MONOLITHIC_0_USE_ODBC_1___WXLIB_ODBC_p)
-COND_MONOLITHIC_0___WXLIB_ADV_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
-COND_MONOLITHIC_0___WXLIB_HTML_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
-COND_MONOLITHIC_0___WXLIB_XML_p = \
-       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
-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_PLATFORM_WIN32_1@__dbtest___win32rc = dbtest_dbtest_rc.o
-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 \
-       dbtest$(EXEEXT) Carbon.r sample.r
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
-
-### Targets: ###
-
-all: $(__dbtest___depname) $(__dbtest_bundle___depname)
-
-install: all
-
-uninstall: 
-
-install-strip: install
-
-clean: 
-       rm -rf ./.deps ./.pch
-       rm -f ./*.o
-       rm -f dbtest$(EXEEXT)
-       rm -rf dbtest.app
-
-distclean: clean
-       rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-
-@COND_USE_ODBC_1@dbtest$(EXEEXT): $(DBTEST_OBJECTS) $(__dbtest___win32rc)
-@COND_USE_ODBC_1@      $(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_DBGRID_p)  $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
-@COND_USE_ODBC_1@      $(__dbtest___mac_rezcmd)
-@COND_USE_ODBC_1@      $(__dbtest___mac_setfilecmd)
-@COND_USE_ODBC_1@      $(__dbtest___os2_emxbindcmd)
-@COND_USE_ODBC_1@      $(SAMPLES_RPATH_POSTLINK)
-
-dbtest.app/Contents/PkgInfo: $(__dbtest___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-       mkdir -p dbtest.app/Contents
-       mkdir -p dbtest.app/Contents/MacOS
-       mkdir -p dbtest.app/Contents/Resources
-       
-       
-       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-       -e "s/EXECUTABLE/dbtest/" \
-       -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/carbon/Info.plist.in >dbtest.app/Contents/Info.plist
-       
-       
-       echo -n "APPL????" >dbtest.app/Contents/PkgInfo
-       
-       
-       ln -f dbtest$(EXEEXT) dbtest.app/Contents/MacOS/dbtest
-       
-       
-       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dbtest.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@dbtest_bundle: $(____dbtest_BUNDLE_TGT_REF_DEP)
-
-dbtest_dbtest.o: $(srcdir)/dbtest.cpp
-       $(CXXC) -c -o $@ $(DBTEST_CXXFLAGS) $(srcdir)/dbtest.cpp
-
-dbtest_listdb.o: $(srcdir)/listdb.cpp
-       $(CXXC) -c -o $@ $(DBTEST_CXXFLAGS) $(srcdir)/listdb.cpp
-
-dbtest_dbtest_rc.o: $(srcdir)/dbtest.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
-
-
-# Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean dbtest_bundle
diff --git a/samples/db/db.bkl b/samples/db/db.bkl
deleted file mode 100644 (file)
index 22d5c33..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-
-    <include file="../../build/bakefiles/common_samples.bkl"/>
-
-    <if cond="OUT_OF_TREE_MAKEFILES=='1'">
-        <set var="USE_ODBC">1</set>
-    </if>
-
-    <exe id="dbtest" 
-         cond="USE_ODBC=='1'"
-         template="wx_sample" template_append="wx_append">
-        <sources>dbtest.cpp listdb.cpp</sources>
-        <wx-lib>dbgrid</wx-lib>
-        <wx-lib>odbc</wx-lib>
-        <wx-lib>adv</wx-lib>
-        <wx-lib>html</wx-lib>
-        <wx-lib>xml</wx-lib>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-        <win32-res>dbtest.rc</win32-res>
-    </exe>
-
-</makefile>
diff --git a/samples/db/db.dsp b/samples/db/db.dsp
deleted file mode 100644 (file)
index 38b2d87..0000000
+++ /dev/null
@@ -1,484 +0,0 @@
-# Microsoft Developer Studio Project File - Name="db" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Application" 0x0101\r
-\r
-CFG=dbtest - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "db.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "db.mak" CFG="dbtest - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "dbtest - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbtest - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbtest - Win32 DLL Universal Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbtest - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbtest - Win32 DLL Unicode Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbtest - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbtest - Win32 DLL Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbtest - Win32 DLL Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbtest - Win32 Universal Unicode Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbtest - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbtest - Win32 Universal Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbtest - Win32 Universal Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbtest - Win32 Unicode Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbtest - Win32 Unicode Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbtest - Win32 Release" (based on "Win32 (x86) Application")\r
-!MESSAGE "dbtest - Win32 Debug" (based on "Win32 (x86) Application")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "dbtest - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "vc_mswunivudll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivudll\dbtest"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "vc_mswunivudll"\r
-# PROP Intermediate_Dir "vc_mswunivudll\dbtest"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\dbtest.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\r
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\dbtest.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# 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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29u_dbgrid.lib wxbase29u_odbc.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.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\dbtest.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29u_dbgrid.lib wxbase29u_odbc.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.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\dbtest.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbtest - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivuddll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\dbtest"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivuddll"\r
-# PROP Intermediate_Dir "vc_mswunivuddll\dbtest"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dbtest.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\r
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\dbtest.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# 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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29ud_dbgrid.lib wxbase29ud_odbc.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.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\dbtest.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29ud_dbgrid.lib wxbase29ud_odbc.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.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\dbtest.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbtest - Win32 DLL Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "vc_mswunivdll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivdll\dbtest"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "vc_mswunivdll"\r
-# PROP Intermediate_Dir "vc_mswunivdll\dbtest"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\dbtest.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\r
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\dbtest.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_dll\mswuniv" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29_dbgrid.lib wxbase29_odbc.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.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\dbtest.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29_dbgrid.lib wxbase29_odbc.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.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\dbtest.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbtest - Win32 DLL Universal Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivddll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivddll\dbtest"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivddll"\r
-# PROP Intermediate_Dir "vc_mswunivddll\dbtest"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dbtest.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\r
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\dbtest.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# 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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29d_dbgrid.lib wxbase29d_odbc.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.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\dbtest.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29d_dbgrid.lib wxbase29d_odbc.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.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\dbtest.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbtest - Win32 DLL Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "vc_mswudll"\r
-# PROP BASE Intermediate_Dir "vc_mswudll\dbtest"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "vc_mswudll"\r
-# PROP Intermediate_Dir "vc_mswudll\dbtest"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\dbtest.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\r
-# ADD CPP /nologo /FD /MD /Fdvc_mswudll\dbtest.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29u_dbgrid.lib wxbase29u_odbc.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.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\dbtest.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmsw29u_dbgrid.lib wxbase29u_odbc.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.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\dbtest.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbtest - Win32 DLL Unicode Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswuddll"\r
-# PROP BASE Intermediate_Dir "vc_mswuddll\dbtest"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswuddll"\r
-# PROP Intermediate_Dir "vc_mswuddll\dbtest"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dbtest.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\r
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\dbtest.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# 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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29ud_dbgrid.lib wxbase29ud_odbc.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.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\dbtest.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmsw29ud_dbgrid.lib wxbase29ud_odbc.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.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\dbtest.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbtest - Win32 DLL Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "vc_mswdll"\r
-# PROP BASE Intermediate_Dir "vc_mswdll\dbtest"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "vc_mswdll"\r
-# PROP Intermediate_Dir "vc_mswdll\dbtest"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\dbtest.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\r
-# ADD CPP /nologo /FD /MD /Fdvc_mswdll\dbtest.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_dll\msw" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_dll\msw" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29_dbgrid.lib wxbase29_odbc.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.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\dbtest.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmsw29_dbgrid.lib wxbase29_odbc.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.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\dbtest.exe" /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbtest - Win32 DLL Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswddll"\r
-# PROP BASE Intermediate_Dir "vc_mswddll\dbtest"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswddll"\r
-# PROP Intermediate_Dir "vc_mswddll\dbtest"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\dbtest.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\r
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\dbtest.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# 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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29d_dbgrid.lib wxbase29d_odbc.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.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\dbtest.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-# ADD LINK32 wxmsw29d_dbgrid.lib wxbase29d_odbc.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.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\dbtest.exe" /debug /libpath:".\..\..\lib\vc_dll" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbtest - Win32 Universal Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "vc_mswunivu"\r
-# PROP BASE Intermediate_Dir "vc_mswunivu\dbtest"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "vc_mswunivu"\r
-# PROP Intermediate_Dir "vc_mswunivu\dbtest"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\dbtest.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\r
-# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\dbtest.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29u_dbgrid.lib wxbase29u_odbc.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.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\dbtest.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29u_dbgrid.lib wxbase29u_odbc.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.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\dbtest.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbtest - Win32 Universal Unicode Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivud"\r
-# PROP BASE Intermediate_Dir "vc_mswunivud\dbtest"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivud"\r
-# PROP Intermediate_Dir "vc_mswunivud\dbtest"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dbtest.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\r
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\dbtest.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# 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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29ud_dbgrid.lib wxbase29ud_odbc.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.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\dbtest.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29ud_dbgrid.lib wxbase29ud_odbc.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_html.lib wxbase29ud_xml.lib wxmswuniv29ud_core.lib wxbase29ud.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\dbtest.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbtest - Win32 Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "vc_mswuniv"\r
-# PROP BASE Intermediate_Dir "vc_mswuniv\dbtest"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "vc_mswuniv"\r
-# PROP Intermediate_Dir "vc_mswuniv\dbtest"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\dbtest.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\r
-# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\dbtest.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_lib\mswuniv" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\lib\vc_lib\mswuniv" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29_dbgrid.lib wxbase29_odbc.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.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\dbtest.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29_dbgrid.lib wxbase29_odbc.lib wxmswuniv29_adv.lib wxmswuniv29_html.lib wxbase29_xml.lib wxmswuniv29_core.lib wxbase29.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\dbtest.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbtest - Win32 Universal Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswunivd"\r
-# PROP BASE Intermediate_Dir "vc_mswunivd\dbtest"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswunivd"\r
-# PROP Intermediate_Dir "vc_mswunivd\dbtest"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dbtest.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\r
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\dbtest.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# 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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmswuniv29d_dbgrid.lib wxbase29d_odbc.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.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\dbtest.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmswuniv29d_dbgrid.lib wxbase29d_odbc.lib wxmswuniv29d_adv.lib wxmswuniv29d_html.lib wxbase29d_xml.lib wxmswuniv29d_core.lib wxbase29d.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\dbtest.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbtest - Win32 Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "vc_mswu"\r
-# PROP BASE Intermediate_Dir "vc_mswu\dbtest"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "vc_mswu"\r
-# PROP Intermediate_Dir "vc_mswu\dbtest"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\dbtest.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\r
-# ADD CPP /nologo /FD /MD /Fdvc_mswu\dbtest.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29u_dbgrid.lib wxbase29u_odbc.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.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\dbtest.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmsw29u_dbgrid.lib wxbase29u_odbc.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.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\dbtest.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbtest - Win32 Unicode Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswud"\r
-# PROP BASE Intermediate_Dir "vc_mswud\dbtest"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswud"\r
-# PROP Intermediate_Dir "vc_mswud\dbtest"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\dbtest.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\r
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\dbtest.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# 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\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29ud_dbgrid.lib wxbase29ud_odbc.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.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\dbtest.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmsw29ud_dbgrid.lib wxbase29ud_odbc.lib wxmsw29ud_adv.lib wxmsw29ud_html.lib wxbase29ud_xml.lib wxmsw29ud_core.lib wxbase29ud.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\dbtest.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbtest - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "vc_msw"\r
-# PROP BASE Intermediate_Dir "vc_msw\dbtest"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "vc_msw"\r
-# PROP Intermediate_Dir "vc_msw\dbtest"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\dbtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD CPP /nologo /FD /MD /Fdvc_msw\dbtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\msw" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_lib\msw" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /i ".\..\..\lib\vc_lib\msw" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29_dbgrid.lib wxbase29_odbc.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.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\dbtest.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmsw29_dbgrid.lib wxbase29_odbc.lib wxmsw29_adv.lib wxmsw29_html.lib wxbase29_xml.lib wxmsw29_core.lib wxbase29.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\dbtest.exe" /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-\r
-!ELSEIF  "$(CFG)" == "dbtest - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "vc_mswd"\r
-# PROP BASE Intermediate_Dir "vc_mswd\dbtest"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "vc_mswd"\r
-# PROP Intermediate_Dir "vc_mswd\dbtest"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\dbtest.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\r
-# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\dbtest.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\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32\r
-# 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\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\lib\vc_lib\mswd" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxmsw29d_dbgrid.lib wxbase29d_odbc.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.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\dbtest.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-# ADD LINK32 wxmsw29d_dbgrid.lib wxbase29d_odbc.lib wxmsw29d_adv.lib wxmsw29d_html.lib wxbase29d_xml.lib wxmsw29d_core.lib wxbase29d.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\dbtest.exe" /debug /libpath:".\..\..\lib\vc_lib" /subsystem:windows\r
-\r
-!ENDIF\r
-\r
-# Begin Target\r
-\r
-# Name "dbtest - Win32 DLL Universal Unicode Release"\r
-# Name "dbtest - Win32 DLL Universal Unicode Debug"\r
-# Name "dbtest - Win32 DLL Universal Release"\r
-# Name "dbtest - Win32 DLL Universal Debug"\r
-# Name "dbtest - Win32 DLL Unicode Release"\r
-# Name "dbtest - Win32 DLL Unicode Debug"\r
-# Name "dbtest - Win32 DLL Release"\r
-# Name "dbtest - Win32 DLL Debug"\r
-# Name "dbtest - Win32 Universal Unicode Release"\r
-# Name "dbtest - Win32 Universal Unicode Debug"\r
-# Name "dbtest - Win32 Universal Release"\r
-# Name "dbtest - Win32 Universal Debug"\r
-# Name "dbtest - Win32 Unicode Release"\r
-# Name "dbtest - Win32 Unicode Debug"\r
-# Name "dbtest - Win32 Release"\r
-# Name "dbtest - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=.\dbtest.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dbtest.rc\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\listdb.cpp\r
-# End Source File\r
-# End Group\r
-# End Target\r
-# End Project\r
-\r
diff --git a/samples/db/db.xpm b/samples/db/db.xpm
deleted file mode 100644 (file)
index 3d54cd4..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/* XPM */
-static char * db_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"32 32 10 1",
-/* colors */
-"      s None  c None",
-".     c #000000",
-"+     c #800000",
-"@     c #008000",
-"#     c #808000",
-"$     c #c0c0c0",
-"%     c #808080",
-"&     c #ffff00",
-"*     c #0000ff",
-"=     c #ffffff",
-/* pixels */
-"                                ",
-" .............................. ",
-" .****************************. ",
-" .*==$=$==$====***************. ",
-" .****************************. ",
-" .............................. ",
-" .%%%%%%%%%%%%%%%%%%%%%%%%%%%%. ",
-" .%+++%===%===%===%===%===%===. ",
-" .%+++%===%===%===%===%===%===. ",
-" .%$$&&&$$$$$$$$$$$$$$$$$$$$$$. ",
-" .%===&&&&&===%===%===%===%===. ",
-" .%===%=&&&&&=%===%===%===%===. ",
-" .%$$$$$$&&&&&&$$$$$$$$$$$$$$$. ",
-" .%===%===&&&=&&&&%===%===%===. ",
-" .%===%===%&&&&=&&&&==%.....==. ",
-" .%$$$$$$$$$$&&&&$&&&&.#####.$. ",
-" .%===%===%===&&&&%=&.###.###.. ",
-" .%===%===%===%&=&&&=@.#####... ",
-" .%$$$$$$$$$$$$$&$&&&@.......@. ",
-" .%===%===%===%==&&=&.###.###.. ",
-" .%===%===%===%===%&=@.#####.@. ",
-" .%$$$$$$$$$$$$$$$$$&@.......@. ",
-" .%===%===%===%===%==.###.###.. ",
-" .%===%===%===%===%===.#####.=. ",
-" .%$$$$$$$$$$$$$$$$$$$$.....$$. ",
-" .%===%===%===%===%===%===%===. ",
-" .%===%===%===%===%===%===%===. ",
-" .%$$$$$$$$$$$$$$$$$$$$$$$$$$$. ",
-" .%===%===%===%===%===%===%===. ",
-" .%%%%%%%%%%%%%%%%%%%%%%%%%%%%. ",
-" .............................. ",
-"                                "};
diff --git a/samples/db/dbM5.xml b/samples/db/dbM5.xml
deleted file mode 100644 (file)
index ed597c4..0000000
+++ /dev/null
@@ -1,3727 +0,0 @@
-<?xml version="1.0"?>
-<?codewarrior exportversion="1.0" ideversion="4.0"?>
-<!DOCTYPE PROJECT [
-
-<!ELEMENT PROJECT (TARGETLIST, TARGETORDER, GROUPLIST, DESIGNLIST?)>
-<!ELEMENT TARGETLIST (TARGET+)>
-<!ELEMENT TARGET (NAME, SETTINGLIST, FILELIST?, LINKORDER?, SEGMENTLIST?, OVERLAYGROUPLIST?, SUBTARGETLIST?, SUBPROJECTLIST?)>
-<!ELEMENT NAME (#PCDATA)>
-<!ELEMENT USERSOURCETREETYPE (#PCDATA)>
-<!ELEMENT PATH (#PCDATA)>
-<!ELEMENT FILELIST (FILE*)>
-<!ELEMENT FILE (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?, ROOTFILEREF?, FILEKIND?, FILEFLAGS?)>
-<!ELEMENT PATHTYPE (#PCDATA)>
-<!ELEMENT PATHROOT (#PCDATA)>
-<!ELEMENT ACCESSPATH (#PCDATA)>
-<!ELEMENT PATHFORMAT (#PCDATA)>
-<!ELEMENT ROOTFILEREF (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
-<!ELEMENT FILEKIND (#PCDATA)>
-<!ELEMENT FILEFLAGS (#PCDATA)>
-<!ELEMENT FILEREF (TARGETNAME?, PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)>
-<!ELEMENT TARGETNAME (#PCDATA)>
-<!ELEMENT SETTINGLIST ((SETTING|PANELDATA)+)>
-<!ELEMENT SETTING (NAME?, (VALUE|(SETTING+)))>
-<!ELEMENT PANELDATA (NAME, VALUE)>
-<!ELEMENT VALUE (#PCDATA)>
-<!ELEMENT LINKORDER (FILEREF*)>
-<!ELEMENT SEGMENTLIST (SEGMENT+)>
-<!ELEMENT SEGMENT (NAME, ATTRIBUTES?, FILEREF*)>
-<!ELEMENT ATTRIBUTES (#PCDATA)>
-<!ELEMENT OVERLAYGROUPLIST (OVERLAYGROUP+)>
-<!ELEMENT OVERLAYGROUP (NAME, BASEADDRESS, OVERLAY*)>
-<!ELEMENT BASEADDRESS (#PCDATA)>
-<!ELEMENT OVERLAY (NAME, FILEREF*)>
-<!ELEMENT SUBTARGETLIST (SUBTARGET+)>
-<!ELEMENT SUBTARGET (TARGETNAME, ATTRIBUTES?)>
-<!ELEMENT SUBPROJECTLIST (SUBPROJECT+)>
-<!ELEMENT SUBPROJECT (FILEREF, SUBPROJECTTARGETLIST)>
-<!ELEMENT SUBPROJECTTARGETLIST (SUBPROJECTTARGET*)>
-<!ELEMENT SUBPROJECTTARGET (TARGETNAME, ATTRIBUTES?)>
-<!ELEMENT TARGETORDER (ORDEREDTARGET|ORDEREDDESIGN)*>
-<!ELEMENT ORDEREDTARGET (NAME)>
-<!ELEMENT ORDEREDDESIGN (NAME, ORDEREDTARGET+)>
-<!ELEMENT GROUPLIST (GROUP|FILEREF)*>
-<!ELEMENT GROUP (NAME, (GROUP|FILEREF)*)>
-<!ELEMENT DESIGNLIST (DESIGN+)>
-<!ELEMENT DESIGN (NAME, DESIGNDATA)>
-<!ELEMENT DESIGNDATA (#PCDATA)>
-]>
-<PROJECT>
-    <TARGETLIST>
-        <TARGET>
-            <NAME>Classic Release</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::include:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::lib:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>MSL</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:MacOS Support:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>MacOS PPC Linker</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>Classic Release</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>Appl</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MMLB</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MPLF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MWCD</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>RSRC</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.exp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.r</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Rez</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>XCOF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>docu</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>rsrc</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>shlb</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>stub</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.doc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ppob</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsrc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>ActivateBrowser</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Compiler" panel -->
-                <SETTING><NAME>MWFrontEnd_C_cplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_checkprotos</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_arm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_trigraphs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>/wx/wx_cw.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enableexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontreusestrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_poolstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_useRTTI</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_multibyteaware</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_unsignedchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_autoinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_booltruefalse</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_inlinelevel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ecplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_objective_c</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_defer_codegen</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedvar</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedarg</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_extracomma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_pedantic</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "MacOS Merge Panel" panel -->
-                <SETTING><NAME>MWMerge_MacOS_projectType</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputName</NAME><VALUE>Merge Out</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputCreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_suppressWarning</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyFragments</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>\b\94ß°</VALUE></SETTING>
-                    <SETTING><VALUE>   =ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>   =Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Disassembler" panel -->
-                <SETTING><NAME>MWDisassembler_PPC_showcode</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_extended</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_mix</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_nohex</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showsym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_shownames</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "PPC Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_PPC_optimizationlevel</NAME><VALUE>Level0</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_PPC_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "PPC Linker" panel -->
-                <SETTING><NAME>MWLinker_PPC_linksym</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_symfullpath</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_permitmultdefs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_initname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_mainname</NAME><VALUE>__start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_termname</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "PPC PEF" panel -->
-                <SETTING><NAME>MWPEF_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_libfolder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_expandbss</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sharedata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_olddefversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWPEF_collapsereloads</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Project" panel -->
-                <SETTING><NAME>MWProject_PPC_type</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_outfile</NAME><VALUE>db Classic Release</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_stacksize</NAME><VALUE>64</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flags</NAME><VALUE>22720</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_symfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcheader</NAME><VALUE>Native</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrctype</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcflags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcstore</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcmerge</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPCAsm Panel" panel -->
-                <SETTING><NAME>MWAssembler_PPC_auxheader</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_symmode</NAME><VALUE>Mac</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_dialect</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_prefixfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_typecheck</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_warnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_casesensitive</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Rez Compiler" panel -->
-                <SETTING><NAME>MWRez_Language_maxwidth</NAME><VALUE>80</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_script</NAME><VALUE>Roman</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_alignment</NAME><VALUE>Align1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filtermode</NAME><VALUE>FilterSkip</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_suppresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_escapecontrolchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_prefixname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filteredtypes</NAME><VALUE>'CODE' 'DATA' 'PICT'</VALUE></SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbtest.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>listdb.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbtest.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>listdb.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-        <TARGET>
-            <NAME>Classic Debug</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::include:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::lib:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>MSL</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:MacOS Support:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>MacOS PPC Linker</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>Classic Debug</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>Appl</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MMLB</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MPLF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MWCD</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>RSRC</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.exp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.r</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Rez</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>XCOF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>docu</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>rsrc</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>shlb</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>stub</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.doc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ppob</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsrc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>ActivateBrowser</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000E2D755010000000000001000E2D7E60
-                    0002000000000000000000000E2D2DD000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Compiler" panel -->
-                <SETTING><NAME>MWFrontEnd_C_cplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_checkprotos</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_arm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_trigraphs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>/wx/wx_cw_d.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enableexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontreusestrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_poolstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_useRTTI</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_multibyteaware</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_unsignedchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_autoinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_booltruefalse</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_inlinelevel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ecplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_objective_c</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_defer_codegen</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedvar</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedarg</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_extracomma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_pedantic</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "MacOS Merge Panel" panel -->
-                <SETTING><NAME>MWMerge_MacOS_projectType</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputName</NAME><VALUE>Merge Out</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputCreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_suppressWarning</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyFragments</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>\b\94ß°</VALUE></SETTING>
-                    <SETTING><VALUE>   =ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>   =Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>Inline</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Disassembler" panel -->
-                <SETTING><NAME>MWDisassembler_PPC_showcode</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_extended</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_mix</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_nohex</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showsym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_shownames</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "PPC Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_PPC_optimizationlevel</NAME><VALUE>Level0</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_PPC_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "PPC Linker" panel -->
-                <SETTING><NAME>MWLinker_PPC_linksym</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_symfullpath</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_permitmultdefs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_initname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_mainname</NAME><VALUE>__start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_termname</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "PPC PEF" panel -->
-                <SETTING><NAME>MWPEF_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_libfolder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_expandbss</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sharedata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_olddefversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWPEF_collapsereloads</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Project" panel -->
-                <SETTING><NAME>MWProject_PPC_type</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_outfile</NAME><VALUE>db Classic Debug</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_stacksize</NAME><VALUE>64</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flags</NAME><VALUE>22720</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_symfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcheader</NAME><VALUE>Native</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrctype</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcflags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcstore</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcmerge</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPCAsm Panel" panel -->
-                <SETTING><NAME>MWAssembler_PPC_auxheader</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_symmode</NAME><VALUE>Mac</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_dialect</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_prefixfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_typecheck</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_warnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_casesensitive</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Rez Compiler" panel -->
-                <SETTING><NAME>MWRez_Language_maxwidth</NAME><VALUE>80</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_script</NAME><VALUE>Roman</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_alignment</NAME><VALUE>Align1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filtermode</NAME><VALUE>FilterSkip</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_suppresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_escapecontrolchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_prefixname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filteredtypes</NAME><VALUE>'CODE' 'DATA' 'PICT'</VALUE></SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbtest.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>listdb.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_PPC.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbtest.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>listdb.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-        <TARGET>
-            <NAME>Carbon Debug</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::include:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::lib:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>MSL</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:MacOS Support:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>MacOS PPC Linker</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>Carbon Debug</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>Appl</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MMLB</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MPLF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MWCD</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>RSRC</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.exp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.r</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Rez</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>XCOF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>docu</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>rsrc</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>shlb</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>stub</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.doc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ppob</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsrc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>ActivateBrowser</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Compiler" panel -->
-                <SETTING><NAME>MWFrontEnd_C_cplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_checkprotos</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_arm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_trigraphs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>/wx/wx_cwc_d.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enableexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontreusestrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_poolstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_useRTTI</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_multibyteaware</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_unsignedchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_autoinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_booltruefalse</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_inlinelevel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ecplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_objective_c</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_defer_codegen</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedvar</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedarg</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_extracomma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_pedantic</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "MacOS Merge Panel" panel -->
-                <SETTING><NAME>MWMerge_MacOS_projectType</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputName</NAME><VALUE>Merge Out</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputCreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_suppressWarning</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyFragments</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>\b\94ß°</VALUE></SETTING>
-                    <SETTING><VALUE>   =ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>   =Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>Inline</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Disassembler" panel -->
-                <SETTING><NAME>MWDisassembler_PPC_showcode</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_extended</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_mix</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_nohex</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showsym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_shownames</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "PPC Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_PPC_optimizationlevel</NAME><VALUE>Level0</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_PPC_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "PPC Linker" panel -->
-                <SETTING><NAME>MWLinker_PPC_linksym</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_symfullpath</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_permitmultdefs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_initname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_mainname</NAME><VALUE>__start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_termname</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "PPC PEF" panel -->
-                <SETTING><NAME>MWPEF_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_libfolder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_expandbss</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sharedata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_olddefversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWPEF_collapsereloads</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Project" panel -->
-                <SETTING><NAME>MWProject_PPC_type</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_outfile</NAME><VALUE>db Carbon Debug</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_stacksize</NAME><VALUE>64</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flags</NAME><VALUE>22720</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_symfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcheader</NAME><VALUE>Native</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrctype</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcflags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcstore</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcmerge</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPCAsm Panel" panel -->
-                <SETTING><NAME>MWAssembler_PPC_auxheader</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_symmode</NAME><VALUE>Mac</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_dialect</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_prefixfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_typecheck</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_warnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_casesensitive</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Rez Compiler" panel -->
-                <SETTING><NAME>MWRez_Language_maxwidth</NAME><VALUE>80</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_script</NAME><VALUE>Roman</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_alignment</NAME><VALUE>Align1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filtermode</NAME><VALUE>FilterSkip</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_suppresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_escapecontrolchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_prefixname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filteredtypes</NAME><VALUE>'CODE' 'DATA' 'PICT'</VALUE></SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbtest.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>listdb.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON_d.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>png.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>zlib.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbtest.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>listdb.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-        <TARGET>
-            <NAME>Carbon Release</NAME>
-            <SETTINGLIST>
-
-                <!-- Settings for "Source Trees" panel -->
-                <SETTING><NAME>UserSourceTrees</NAME><VALUE></VALUE></SETTING>
-
-                <!-- Settings for "Custom Keywords" panel -->
-                <SETTING><NAME>CustomColor1</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor2</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor3</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>CustomColor4</NAME>
-                    <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING>
-                    <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING>
-                    <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "Access Paths" panel -->
-                <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UserSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::include:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:::lib:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-                <SETTING><NAME>SystemSearchPaths</NAME>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>MSL</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>:MacOS Support:</VALUE></SETTING>
-                            <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                            <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>
-                        </SETTING>
-                        <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Target Settings" panel -->
-                <SETTING><NAME>Linker</NAME><VALUE>MacOS PPC Linker</VALUE></SETTING>
-                <SETTING><NAME>PreLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>PostLinker</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>Targetname</NAME><VALUE>Carbon Release</VALUE></SETTING>
-                <SETTING><NAME>OutputDirectory</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "File Mappings" panel -->
-                <SETTING><NAME>FileMappings</NAME>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>APPL</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>Appl</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MMLB</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MPLF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Lib Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>MWCD</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>RSRC</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.c++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.exp</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.r</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>Rez</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>XCOF</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>docu</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>rsrc</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>shlb</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileType</NAME><VALUE>stub</VALUE></SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.doc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.o</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE>XCOFF Import PPC</VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.ppob</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                    <SETTING>
-                        <SETTING><NAME>FileExtension</NAME><VALUE>.rsrc</VALUE></SETTING>
-                        <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING>
-                        <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING>
-                        <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING>
-                        <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING>
-                    </SETTING>
-                </SETTING>
-
-                <!-- Settings for "Build Extras" panel -->
-                <SETTING><NAME>CacheModDates</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>ActivateBrowser</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>DebuggerCommandLine</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>Debugger Runtime</NAME><VALUE>
-                    0002000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000000000000000000000000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "Debugger Target" panel -->
-                <SETTING><NAME>LogSystemMessages</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>AutoTargetDLLs</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING>
-                <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING>
-                <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>AltExePath</NAME>
-                    <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING>
-                    <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING>
-                    <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING>
-                </SETTING>
-                <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING>
-                <SETTING><NAME>TempBPFunctionName</NAME><VALUE>main</VALUE></SETTING>
-                <SETTING><NAME>TempBPType</NAME><VALUE>false</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Compiler" panel -->
-                <SETTING><NAME>MWFrontEnd_C_cplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_checkprotos</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_arm</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_trigraphs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>/wx/wx_cwc.h</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_enableexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontreusestrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_poolstrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_dontinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_useRTTI</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_multibyteaware</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_unsignedchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_autoinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_booltruefalse</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_direct_to_som</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_inlinelevel</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_ecplusplus</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_objective_c</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWFrontEnd_C_defer_codegen</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "C/C++ Warnings" panel -->
-                <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedvar</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_unusedarg</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_extracomma</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_pedantic</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "MacOS Merge Panel" panel -->
-                <SETTING><NAME>MWMerge_MacOS_projectType</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputName</NAME><VALUE>Merge Out</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputCreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_suppressWarning</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyFragments</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWMerge_MacOS_skipResources</NAME>
-                    <SETTING><VALUE></VALUE></SETTING>
-                    <SETTING><VALUE>\b\94ß°</VALUE></SETTING>
-                    <SETTING><VALUE>   =ÃH</VALUE></SETTING>
-                    <SETTING><VALUE>   =Ø:</VALUE></SETTING>
-                </SETTING>
-
-                <!-- Settings for "PPC CodeGen" panel -->
-                <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWCodeGen_PPC_vrsave</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Disassembler" panel -->
-                <SETTING><NAME>MWDisassembler_PPC_showcode</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_extended</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_mix</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_nohex</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showdata</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showexceptions</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_showsym</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWDisassembler_PPC_shownames</NAME><VALUE>1</VALUE></SETTING>
-
-                <!-- Settings for "PPC Global Optimizer" panel -->
-                <SETTING><NAME>GlobalOptimizer_PPC_optimizationlevel</NAME><VALUE>Level0</VALUE></SETTING>
-                <SETTING><NAME>GlobalOptimizer_PPC_optfor</NAME><VALUE>Speed</VALUE></SETTING>
-
-                <!-- Settings for "PPC Linker" panel -->
-                <SETTING><NAME>MWLinker_PPC_linksym</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_symfullpath</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmap</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_permitmultdefs</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_linkmode</NAME><VALUE>Fast</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_initname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_mainname</NAME><VALUE>__start</VALUE></SETTING>
-                <SETTING><NAME>MWLinker_PPC_termname</NAME><VALUE></VALUE></SETTING>
-                <PANELDATA><NAME>PPC Mach-O CodeGen</NAME><VALUE>
-                    0001000001010000010000000001010101000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Linker</NAME><VALUE>
-                    0001000000000100000100000000000000000000000000000000000000007374
-                    6172740000000000000000000000000000000000000000000000000000000000
-                    000000000000000000000000000000000000000000000000000000000000
-                </VALUE></PANELDATA>
-                <PANELDATA><NAME>PPC Mach-O Target</NAME><VALUE>
-                    0001000005612E6F757400000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    0000000000000000000000000000000000000000000000000000000000000000
-                    00000000
-                </VALUE></PANELDATA>
-
-                <!-- Settings for "PPC PEF" panel -->
-                <SETTING><NAME>MWPEF_exports</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_libfolder</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sortcode</NAME><VALUE>None</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_expandbss</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_sharedata</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_olddefversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_oldimpversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_currentversion</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWPEF_collapsereloads</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPC Project" panel -->
-                <SETTING><NAME>MWProject_PPC_type</NAME><VALUE>Application</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_outfile</NAME><VALUE>db Carbon Release</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>1095782476</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>3840</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_stacksize</NAME><VALUE>64</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_flags</NAME><VALUE>22720</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_symfilename</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcheader</NAME><VALUE>Native</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrctype</NAME><VALUE>1061109567</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcid</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcflags</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcstore</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWProject_PPC_rsrcmerge</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "PPCAsm Panel" panel -->
-                <SETTING><NAME>MWAssembler_PPC_auxheader</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_symmode</NAME><VALUE>Mac</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_dialect</NAME><VALUE>PPC</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_prefixfile</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_typecheck</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_warnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWAssembler_PPC_casesensitive</NAME><VALUE>0</VALUE></SETTING>
-
-                <!-- Settings for "Rez Compiler" panel -->
-                <SETTING><NAME>MWRez_Language_maxwidth</NAME><VALUE>80</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_script</NAME><VALUE>Roman</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_alignment</NAME><VALUE>Align1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filtermode</NAME><VALUE>FilterSkip</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_suppresswarnings</NAME><VALUE>0</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_escapecontrolchars</NAME><VALUE>1</VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_prefixname</NAME><VALUE></VALUE></SETTING>
-                <SETTING><NAME>MWRez_Language_filteredtypes</NAME><VALUE>'CODE' 'DATA' 'PICT'</VALUE></SETTING>
-            </SETTINGLIST>
-            <FILELIST>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS>Debug</FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Resource</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbtest.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>listdb.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Text</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-                <FILE>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                    <FILEKIND>Library</FILEKIND>
-                    <FILEFLAGS></FILEFLAGS>
-                </FILE>
-            </FILELIST>
-            <LINKORDER>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C++.PPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>console.stubs.c</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL RuntimePPC.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MSL C.CARBON.Lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>wx_CARBON.rsrc</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiff.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>tiffd.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>jpeg.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>dbtest.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>listdb.cpp</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </LINKORDER>
-        </TARGET>
-    </TARGETLIST>
-
-    <TARGETORDER>
-        <ORDEREDTARGET><NAME>Classic Release</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>Classic Debug</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>Carbon Debug</NAME></ORDEREDTARGET>
-        <ORDEREDTARGET><NAME>Carbon Release</NAME></ORDEREDTARGET>
-    </TARGETORDER>
-
-    <GROUPLIST>
-        <FILEREF>
-            <TARGETNAME>Classic Release</TARGETNAME>
-            <PATHTYPE>Name</PATHTYPE>
-            <PATH>dbtest.cpp</PATH>
-            <PATHFORMAT>MacOS</PATHFORMAT>
-        </FILEREF>
-        <FILEREF>
-            <TARGETNAME>Classic Release</TARGETNAME>
-            <PATHTYPE>Name</PATHTYPE>
-            <PATH>listdb.cpp</PATH>
-            <PATHFORMAT>MacOS</PATHFORMAT>
-        </FILEREF>
-        <GROUP><NAME>wx</NAME>
-            <FILEREF>
-                <TARGETNAME>Carbon Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_CARBON.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Carbon Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_CARBON_d.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Carbon Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_CARBON.rsrc</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_PPC.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_PPC_d.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>wx_PPC.rsrc</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>tiff.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>zlib.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>png.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>tiffd.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>jpeg.lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-        </GROUP>
-        <GROUP><NAME>MSL ANSI Libraries</NAME>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>console.stubs.c</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL RuntimePPC.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL C++.PPC.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Classic Release</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL C.PPC.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-            <FILEREF>
-                <TARGETNAME>Carbon Debug</TARGETNAME>
-                <PATHTYPE>Name</PATHTYPE>
-                <PATH>MSL C.CARBON.Lib</PATH>
-                <PATHFORMAT>MacOS</PATHFORMAT>
-            </FILEREF>
-        </GROUP>
-        <GROUP><NAME>Win32 SDK</NAME>
-        </GROUP>
-        <GROUP><NAME>MacOS</NAME>
-            <GROUP><NAME>Carbon</NAME>
-                <FILEREF>
-                    <TARGETNAME>Carbon Debug</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Carbon Debug</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonFrameworkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </GROUP>
-            <GROUP><NAME>Classic</NAME>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>AppearanceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ATSUnicodeLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CarbonAccessors.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ControlsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>CursorDevicesGlue.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DialogsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>DragLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InterfaceLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>InternetConfigLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>WindowsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MathLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>MenusLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>NavigationLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptAppleTalkLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptATalkPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInetPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTptInternetLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>OpenTransportAppPPC.o</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>PLStringFuncsPPC.lib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>TextEncodingConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>Textension</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>ThreadsLib</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-                <FILEREF>
-                    <TARGETNAME>Classic Release</TARGETNAME>
-                    <PATHTYPE>Name</PATHTYPE>
-                    <PATH>UnicodeConverter</PATH>
-                    <PATHFORMAT>MacOS</PATHFORMAT>
-                </FILEREF>
-            </GROUP>
-        </GROUP>
-    </GROUPLIST>
-
-</PROJECT>
diff --git a/samples/db/dbtest.cpp b/samples/db/dbtest.cpp
deleted file mode 100644 (file)
index 6db3347..0000000
+++ /dev/null
@@ -1,3436 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        dbtest.cpp
-// Purpose:     wxWidgets database demo app
-// Author:      George Tasker
-// Modified by:
-// Created:     1998
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Remstar International, Inc.
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-/*
- *  SYNOPSIS START
-
-    This sample program demonstrates the cross-platform ODBC database classes
-    donated by the development team at Remstar International.
-
-    The table this sample is based on is developer contact table, and shows
-    some of the simple uses of the database classes wxDb and wxDbTable.
-
- *  SYNOPSIS END
- */
-
-#include  "wx/wxprec.h"
-
-#ifdef    __BORLANDC__
-#pragma hdrstop
-#endif  //__BORLANDC__
-
-#ifndef WX_PRECOMP
-#include  "wx/wx.h"
-#endif //WX_PRECOMP
-
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMAC__)
-#include "db.xpm"
-#endif
-
-#include <stdio.h>                  /* Included strictly for reading the text file with the database parameters */
-
-//#include "wx/db.h"                  /* Required in the file which will get the data source connection */
-//#include "wx/dbtable.h"             /* Has the wxDbTable object from which all data objects will inherit their data table functionality */
-
-//extern wxDbList WXDLLEXPORT *PtrBegDbList;    /* from db.cpp, used in getting back error results from db connections */
-
-#if wxUSE_GRID
-#include "wx/grid.h"
-#include "wx/generic/gridctrl.h"
-#include "wx/dbgrid.h"
-
-#define CHOICEINT
-#endif
-
-#include "dbtest.h"                 /* Header file for this demonstration program */
-#include "listdb.h"                 /* Code to support the "Lookup" button on the editor dialog */
-
-IMPLEMENT_APP(DatabaseDemoApp)
-
-extern wxChar ListDB_Selection[];   /* Used to return the first column value for the selected line from the listDB routines */
-extern wxChar ListDB_Selection2[];  /* Used to return the second column value for the selected line from the listDB routines */
-
-#ifdef wxODBC_BLOB_SUPPORT
-    #include "wx/file.h"
-    #include "wx/mstream.h"
-    #include "wx/image.h"
-    #include "wx/bitmap.h"
-    #include "wx/statbmp.h"
-#endif
-
-#if !wxUSE_ODBC
-  #error Sample cannot be compiled unless setup.h has wxUSE_ODBC set to 1
-#endif
-
-
-bool DataTypeSupported(wxDb *pDb, SWORD datatype, wxString *nativeDataTypeName)
-{
-    wxDbSqlTypeInfo sqlTypeInfo;
-
-    bool breakpoint = false;
-
-    *nativeDataTypeName = wxEmptyString;
-    if (pDb->GetDataTypeInfo(datatype, sqlTypeInfo))
-    {
-        *nativeDataTypeName = sqlTypeInfo.TypeName;
-        breakpoint = true;
-    }
-
-    return breakpoint;
-
-}  // GetDataTypesSupported();
-
-
-
-void CheckSupportForAllDataTypes(wxDb *pDb)
-{
-    wxString nativeDataTypeName;
-
-    wxLogMessage(wxT("\nThe following datatypes are supported by the\ndatabase you are currently connected to:"));
-#ifdef SQL_C_BINARY
-    if (DataTypeSupported(pDb,SQL_C_BINARY, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_BINARY (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_BIT
-    if (DataTypeSupported(pDb,SQL_C_BIT, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_BIT (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_BOOKMARK
-    if (DataTypeSupported(pDb,SQL_C_BOOKMARK, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_BOOKMARK (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_CHAR
-    if (DataTypeSupported(pDb,SQL_C_CHAR, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_CHAR (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_DATE
-    if (DataTypeSupported(pDb,SQL_C_DATE, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_DATE (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_DEFAULT
-    if (DataTypeSupported(pDb,SQL_C_DEFAULT, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_DEFAULT (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_DOUBLE
-    if (DataTypeSupported(pDb,SQL_C_DOUBLE, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_DOUBLE (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_FLOAT
-    if (DataTypeSupported(pDb,SQL_C_FLOAT, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_FLOAT (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_GUID
-    if (DataTypeSupported(pDb,SQL_C_GUID, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_GUID (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_INTERVAL_DAY
-    if (DataTypeSupported(pDb,SQL_C_INTERVAL_DAY, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_INTERVAL_DAY (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_INTERVAL_DAY_TO_HOUR
-    if (DataTypeSupported(pDb,SQL_C_INTERVAL_DAY_TO_HOUR, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_INTERVAL_DAY_TO_HOUR (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_INTERVAL_DAY_TO_MINUTE
-    if (DataTypeSupported(pDb,SQL_C_INTERVAL_DAY_TO_MINUTE, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_INTERVAL_DAY_TO_MINUTE (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_INTERVAL_DAY_TO_SECOND
-    if (DataTypeSupported(pDb,SQL_C_INTERVAL_DAY_TO_SECOND, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_INTERVAL_DAY_TO_SECOND (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_INTERVAL_HOUR
-    if (DataTypeSupported(pDb,SQL_C_INTERVAL_HOUR, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_INTERVAL_HOUR (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_INTERVAL_HOUR_TO_MINUTE
-    if (DataTypeSupported(pDb,SQL_C_INTERVAL_HOUR_TO_MINUTE, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_INTERVAL_HOUR_TO_MINUTE (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_INTERVAL_HOUR_TO_SECOND
-    if (DataTypeSupported(pDb,SQL_C_INTERVAL_HOUR_TO_SECOND, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_INTERVAL_HOUR_TO_SECOND (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_INTERVAL_MINUTE
-    if (DataTypeSupported(pDb,SQL_C_INTERVAL_MINUTE, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_INTERVAL_MINUTE (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_INTERVAL_MINUTE_TO_SECOND
-    if (DataTypeSupported(pDb,SQL_C_INTERVAL_MINUTE_TO_SECOND, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_INTERVAL_MINUTE_TO_SECOND (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_INTERVAL_MONTH
-    if (DataTypeSupported(pDb,SQL_C_INTERVAL_MONTH, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_INTERVAL_MONTH (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_INTERVAL_SECOND
-    if (DataTypeSupported(pDb,SQL_C_INTERVAL_SECOND, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_INTERVAL_SECOND (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_INTERVAL_YEAR
-    if (DataTypeSupported(pDb,SQL_C_INTERVAL_YEAR, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_INTERVAL_YEAR (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_INTERVAL_YEAR_TO_MONTH
-    if (DataTypeSupported(pDb,SQL_C_INTERVAL_YEAR_TO_MONTH, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_INTERVAL_YEAR_TO_MONTH (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_LONG
-    if (DataTypeSupported(pDb,SQL_C_LONG, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_LONG (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_NUMERIC
-    if (DataTypeSupported(pDb,SQL_C_NUMERIC, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_NUMERIC (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_SBIGINT
-    if (DataTypeSupported(pDb,SQL_C_SBIGINT, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_SBIGINT (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_SHORT
-    if (DataTypeSupported(pDb,SQL_C_SHORT, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_SHORT (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_SLONG
-    if (DataTypeSupported(pDb,SQL_C_SLONG, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_SLONG (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_SSHORT
-    if (DataTypeSupported(pDb,SQL_C_SSHORT, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_SSHORT (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_STINYINT
-    if (DataTypeSupported(pDb,SQL_C_STINYINT, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_STINYINT (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_TIME
-    if (DataTypeSupported(pDb,SQL_C_TIME, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_TIME (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_TIMESTAMP
-    if (DataTypeSupported(pDb,SQL_C_TIMESTAMP, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_TIMESTAMP (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_TINYINT
-    if (DataTypeSupported(pDb,SQL_C_TINYINT, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_TINYINT (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_TYPE_DATE
-    if (DataTypeSupported(pDb,SQL_C_TYPE_DATE, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_TYPE_DATE (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_TYPE_TIME
-    if (DataTypeSupported(pDb,SQL_C_TYPE_TIME, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_TYPE_TIME (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_TYPE_TIMESTAMP
-    if (DataTypeSupported(pDb,SQL_C_TYPE_TIMESTAMP, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_TYPE_TIMESTAMP (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_UBIGINT
-    if (DataTypeSupported(pDb,SQL_C_UBIGINT, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_UBIGINT (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_ULONG
-    if (DataTypeSupported(pDb,SQL_C_ULONG, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_ULONG (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_USHORT
-    if (DataTypeSupported(pDb,SQL_C_USHORT, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_USHORT (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_UTINYINT
-    if (DataTypeSupported(pDb,SQL_C_UTINYINT, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_UTINYINT (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_VARBOOKMARK
-    if (DataTypeSupported(pDb,SQL_C_VARBOOKMARK, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_VARBOOKMARK (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_C_WXCHAR
-    if (DataTypeSupported(pDb,SQL_C_WXCHAR, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_WXCHAR (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-
-// Extended SQL types
-#ifdef SQL_DATE
-    if (DataTypeSupported(pDb,SQL_DATE, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_DATE (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_INTERVAL
-    if (DataTypeSupported(pDb,SQL_INTERVAL, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_INTERVAL (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_TIME
-    if (DataTypeSupported(pDb,SQL_TIME, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_TIME (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_TIMESTAMP
-    if (DataTypeSupported(pDb,SQL_TIMESTAMP, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_TIMESTAMP (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_LONGVARCHAR
-    if (DataTypeSupported(pDb,SQL_LONGVARCHAR, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_LONGVARCHAR (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_BINARY
-    if (DataTypeSupported(pDb,SQL_BINARY, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_BINARY (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_VARBINARY
-    if (DataTypeSupported(pDb,SQL_VARBINARY, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_VARBINARY (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_LONGVARBINARY
-    if (DataTypeSupported(pDb,SQL_LONGVARBINARY, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_LOGVARBINARY (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_BIGINT
-    if (DataTypeSupported(pDb,SQL_BIGINT, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_BIGINT (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_TINYINT
-    if (DataTypeSupported(pDb,SQL_TINYINT, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_TINYINT (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_BIT
-    if (DataTypeSupported(pDb,SQL_BIT, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_BIT (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_GUID
-    if (DataTypeSupported(pDb,SQL_GUID, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_GUID (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-
-#ifdef SQL_CHAR
-    if (DataTypeSupported(pDb,SQL_CHAR, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_CHAR (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_INTEGER
-    if (DataTypeSupported(pDb,SQL_INTEGER, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_INTEGER (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_SMALLINT
-    if (DataTypeSupported(pDb,SQL_SMALLINT, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_SAMLLINT (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_REAL
-    if (DataTypeSupported(pDb,SQL_REAL, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_REAL (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_DOUBLE
-    if (DataTypeSupported(pDb,SQL_DOUBLE, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_DOUBLE (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_NUMERIC
-    if (DataTypeSupported(pDb,SQL_NUMERIC, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_NUMERIC (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_DATE
-    if (DataTypeSupported(pDb,SQL_DATE, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_DATE (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_TIME
-    if (DataTypeSupported(pDb,SQL_TIME, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_TIME (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_TIMESTAMP
-    if (DataTypeSupported(pDb,SQL_TIMESTAMP, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_TIMESTAMP (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_VARCHAR
-    if (DataTypeSupported(pDb,SQL_VARCHAR, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_VARCHAR (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-
-// UNICODE
-#ifdef SQL_C_TCHAR
-    if (DataTypeSupported(pDb,SQL_C_TCHAR, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_C_TCHAR (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_WVARCHAR
-    if (DataTypeSupported(pDb,SQL_WVARCHAR, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_WVARCHAR (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-#ifdef SQL_WCHAR
-    if (DataTypeSupported(pDb,SQL_WCHAR, &nativeDataTypeName))
-    {
-        nativeDataTypeName = wxT("SQL_WCHAR (") + nativeDataTypeName;
-        nativeDataTypeName += wxT(")\n");
-        wxLogMessage(nativeDataTypeName);
-    }
-#endif
-
-    wxLogMessage(wxT("Done\n"));
-}  // CheckSupportForAllDataTypes()
-
-
-bool DatabaseDemoApp::OnInit()
-{
-    if ( !wxApp::OnInit() )
-        return false;
-
-    DbConnectInf    = NULL;
-    Contact         = NULL;
-
-    // Create the main frame window
-    DemoFrame = new DatabaseDemoFrame(NULL, wxT("wxWidgets Database Demo"), wxPoint(50, 50), wxSize(537, 530));
-
-    // Give it an icon
-    DemoFrame->SetIcon(wxICON(db));
-
-    // Make a menubar
-    wxMenu *file_menu = new wxMenu;
-    file_menu->Append(FILE_CREATE_ID, wxT("&Create CONTACT table"));
-    file_menu->Append(FILE_RECREATE_TABLE, wxT("&Recreate CONTACT table"));
-    file_menu->Append(FILE_RECREATE_INDEXES, wxT("&Recreate CONTACT indexes"));
-#if wxUSE_GRID
-    file_menu->Append(FILE_DBGRID_TABLE,  wxT("&Open DB Grid example"));
-#endif
-    file_menu->Append(FILE_EXIT, wxT("E&xit"));
-
-    wxMenu *edit_menu = new wxMenu;
-    edit_menu->Append(EDIT_PARAMETERS, wxT("&Parameters..."));
-
-    wxMenu *help_menu = new wxMenu;
-    help_menu->Append(HELP_ABOUT, wxT("&About"));
-
-    wxMenuBar *menu_bar = new wxMenuBar;
-    menu_bar->Append(file_menu, wxT("&File"));
-    menu_bar->Append(edit_menu, wxT("&Edit"));
-    menu_bar->Append(help_menu, wxT("&Help"));
-    DemoFrame->SetMenuBar(menu_bar);
-
-    params.ODBCSource[0] = 0;
-    params.UserName[0]   = 0;
-    params.Password[0]   = 0;
-    params.DirPath[0]    = 0;
-
-#ifdef wxODBC_BLOB_SUPPORT
-    wxInitAllImageHandlers();
-    wxImage::InitStandardHandlers();
-    wxBitmap::InitStandardHandlers();
-#endif
-
-    // Show the frame
-    DemoFrame->Show(true);
-
-    // Passing NULL for the SQL environment handle causes
-    // the wxDbConnectInf constructor to obtain a handle
-    // for you.
-    //
-    // WARNING: Be certain that you do not free this handle
-    //          directly with SQLFreeEnv().  Use either the
-    //          method ::FreeHenv() or delete the DbConnectInf.
-    DbConnectInf = new wxDbConnectInf(NULL, params.ODBCSource, params.UserName,
-                                      params.Password, params.DirPath);
-
-    if (!DbConnectInf || !DbConnectInf->GetHenv())
-    {
-        wxMessageBox(wxT("Unable to define data source connection info."), wxT("DB CONNECTION ERROR..."),wxOK | wxICON_EXCLAMATION);
-        wxDELETE(DbConnectInf);
-    }
-
-    if (!ReadParamFile(params))
-        DemoFrame->BuildParameterDialog(NULL);
-
-    if (!wxStrlen(params.ODBCSource))
-    {
-        wxDELETE(DbConnectInf);
-        return(false);
-    }
-
-    DbConnectInf->SetDsn(params.ODBCSource);
-    DbConnectInf->SetUserID(params.UserName);
-    DbConnectInf->SetPassword(params.Password);
-    DbConnectInf->SetDefaultDir(params.DirPath);
-
-    READONLY_DB = wxDbGetConnection(DbConnectInf);
-    if (READONLY_DB == 0)
-    {
-        wxMessageBox(wxT("Unable to connect to the data source.\n\nCheck the name of your data source to verify it has been correctly entered/spelled.\n\nWith some databases, the user name and password must\nbe created with full rights to the CONTACT table prior to making a connection\n(using tools provided by the database manufacturer)"), wxT("DB CONNECTION ERROR..."),wxOK | wxICON_EXCLAMATION);
-        DemoFrame->BuildParameterDialog(NULL);
-        wxDELETE(DbConnectInf);
-        wxMessageBox(wxT("Now exiting program.\n\nRestart program to try any new settings."),wxT("Notice..."),wxOK | wxICON_INFORMATION);
-        return(false);
-    }
-
-    DemoFrame->BuildEditorDialog();
-
-    // Show the frame
-    DemoFrame->Refresh();
-
-    return true;
-}  // DatabaseDemoApp::OnInit()
-
-
-/*
-* Remove CR or CR/LF from a character string.
-*/
-wxChar* wxRemoveLineTerminator(wxChar* aString)
-{
-    int len = wxStrlen(aString);
-    while (len > 0 && (aString[len-1] == wxT('\r') || aString[len-1] == wxT('\n'))) {
-        aString[len-1] = wxT('\0');
-        len--;
-    }
-    return aString;
-}
-
-
-bool DatabaseDemoApp::ReadParamFile(Cparameters &params)
-{
-    FILE *paramFile;
-    if ((paramFile = wxFopen(PARAM_FILENAME, wxT("r"))) == NULL)
-    {
-        wxString tStr;
-        tStr.Printf(wxT("Unable to open the parameter file '%s' for reading.\n\nYou must specify the data source, user name, and\npassword that will be used and save those settings."),PARAM_FILENAME.c_str());
-        wxMessageBox(tStr,wxT("File I/O Error..."),wxOK | wxICON_EXCLAMATION);
-
-        return false;
-    }
-
-    wxChar buffer[1000+1];
-    wxFgets(buffer, sizeof(params.ODBCSource), paramFile);
-    wxRemoveLineTerminator(buffer);
-    wxStrcpy(params.ODBCSource,buffer);
-
-    wxFgets(buffer, sizeof(params.UserName), paramFile);
-    wxRemoveLineTerminator(buffer);
-    wxStrcpy(params.UserName,buffer);
-
-    wxFgets(buffer, sizeof(params.Password), paramFile);
-    wxRemoveLineTerminator(buffer);
-    wxStrcpy(params.Password,buffer);
-
-    wxFgets(buffer, sizeof(params.DirPath), paramFile);
-    wxRemoveLineTerminator(buffer);
-    wxStrcpy(params.DirPath,buffer);
-
-    fclose(paramFile);
-
-    return true;
-}  // DatabaseDemoApp::ReadParamFile()
-
-
-bool DatabaseDemoApp::WriteParamFile(Cparameters &WXUNUSED(params))
-{
-    FILE *paramFile;
-    if ((paramFile = wxFopen(PARAM_FILENAME, wxT("wt"))) == NULL)
-    {
-        wxString tStr;
-        tStr.Printf(wxT("Unable to write/overwrite '%s'."),PARAM_FILENAME.c_str());
-        wxMessageBox(tStr,wxT("File I/O Error..."),wxOK | wxICON_EXCLAMATION);
-        return false;
-    }
-
-    wxFputs(wxGetApp().params.ODBCSource, paramFile);
-    wxFputc(wxT('\n'), paramFile);
-    wxFputs(wxGetApp().params.UserName, paramFile);
-    wxFputc(wxT('\n'), paramFile);
-    wxFputs(wxGetApp().params.Password, paramFile);
-    wxFputc(wxT('\n'), paramFile);
-    wxFputs(wxGetApp().params.DirPath, paramFile);
-    wxFputc(wxT('\n'), paramFile);
-    fclose(paramFile);
-
-    return true;
-}  // DatabaseDemoApp::WriteParamFile()
-
-
-void DatabaseDemoApp::CreateDataTable(bool recreate)
-{
-    bool Ok = true;
-    if (recreate)
-       Ok = (wxMessageBox(wxT("Any data currently residing in the table will be erased.\n\nAre you sure?"),wxT("Confirm"),wxYES_NO|wxICON_QUESTION) == wxYES);
-
-    if (!Ok)
-        return;
-
-    wxBeginBusyCursor();
-
-    bool success = true;
-
-    Contact->GetDb()->RollbackTrans();  // Make sure the current cursor is in a known/stable state
-
-    if (!Contact->CreateTable(recreate))
-    {
-        wxEndBusyCursor();
-        wxString tStr;
-        tStr = wxT("Error creating CONTACTS table.\nTable was not created.\n\n");
-        wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),Contact->GetDb(),__TFILE__,__LINE__),
-                     wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-
-        success = false;
-    }
-    else
-    {
-        if (!Contact->CreateIndexes(recreate))
-        {
-            wxEndBusyCursor();
-            wxString tStr;
-            tStr = wxT("Error creating CONTACTS indexes.\nIndexes will be unavailable.\n\n");
-            wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),Contact->GetDb(),__TFILE__,__LINE__),
-                         wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-
-            success = false;
-        }
-    }
-    while (wxIsBusy())
-        wxEndBusyCursor();
-
-    if (success)
-        wxMessageBox(wxT("Table and index(es) were successfully created."),wxT("Notice..."),wxOK | wxICON_INFORMATION);
-}  // DatabaseDemoApp::CreateDataTable()
-
-
-BEGIN_EVENT_TABLE(DatabaseDemoFrame, wxFrame)
-    EVT_MENU(FILE_CREATE_ID, DatabaseDemoFrame::OnCreate)
-    EVT_MENU(FILE_RECREATE_TABLE, DatabaseDemoFrame::OnRecreateTable)
-    EVT_MENU(FILE_RECREATE_INDEXES, DatabaseDemoFrame::OnRecreateIndexes)
-#if wxUSE_GRID
-    EVT_MENU(FILE_DBGRID_TABLE, DatabaseDemoFrame::OnDbGridTable)
-#endif
-    EVT_MENU(FILE_EXIT, DatabaseDemoFrame::OnExit)
-    EVT_MENU(EDIT_PARAMETERS, DatabaseDemoFrame::OnEditParameters)
-    EVT_MENU(HELP_ABOUT, DatabaseDemoFrame::OnAbout)
-    EVT_CLOSE(DatabaseDemoFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-
-// DatabaseDemoFrame constructor
-DatabaseDemoFrame::DatabaseDemoFrame(wxFrame *frame, const wxString& title,
-                                     const wxPoint& pos, const wxSize& size):
-                                        wxFrame(frame, wxID_ANY, title, pos, size)
-{
-    // Put any code in necessary for initializing the main frame here
-    pEditorDlg = NULL;
-    pParamDlg  = NULL;
-
-#if wxUSE_LOG
-    delete wxLog::SetActiveTarget(new wxLogStderr);
-#endif // wxUSE_LOG
-
-}  // DatabaseDemoFrame constructor
-
-DatabaseDemoFrame::~DatabaseDemoFrame()
-{
-#if wxUSE_LOG
-    delete wxLog::SetActiveTarget(NULL);
-#endif // wxUSE_LOG
-}  // DatabaseDemoFrame destructor
-
-
-void DatabaseDemoFrame::OnCreate(wxCommandEvent& WXUNUSED(event))
-{
-    wxGetApp().CreateDataTable(false);
-}  // DatabaseDemoFrame::OnCreate()
-
-
-void DatabaseDemoFrame::OnRecreateTable(wxCommandEvent& WXUNUSED(event))
-{
-    wxGetApp().CreateDataTable(true);
-}  // DatabaseDemoFrame::OnRecreate()
-
-
-void DatabaseDemoFrame::OnRecreateIndexes(wxCommandEvent& WXUNUSED(event))
-{
-    wxGetApp().Contact->GetDb()->RollbackTrans();  // Make sure the current cursor is in a known/stable state
-
-    if (!wxGetApp().Contact->CreateIndexes(true))
-    {
-        while (wxIsBusy())
-            wxEndBusyCursor();
-        wxString tStr;
-        tStr = wxT("Error creating CONTACTS indexes.\nNew indexes will be unavailable.\n\n");
-        wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),wxGetApp().Contact->GetDb(),__TFILE__,__LINE__),
-                     wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-
-    }
-     else
-        wxMessageBox(wxT("Index(es) were successfully recreated."),wxT("Notice..."),wxOK | wxICON_INFORMATION);
-
-}  // DatabaseDemoFrame::OnRecreateIndexes()
-
-
-#if wxUSE_GRID
-void DatabaseDemoFrame::OnDbGridTable(wxCommandEvent& WXUNUSED(event))
-{
-    DbGridFrame *frame = new DbGridFrame(this);
-    if (frame->Initialize())
-    {
-        frame->Show();
-    }
-}
-#endif
-
-void DatabaseDemoFrame::OnExit(wxCommandEvent& WXUNUSED(event))
-{
-    Close();
-}  // DatabaseDemoFrame::OnExit()
-
-
-void DatabaseDemoFrame::OnEditParameters(wxCommandEvent& WXUNUSED(event))
-{
-    if ((pEditorDlg->mode != mCreate) && (pEditorDlg->mode != mEdit))
-        BuildParameterDialog(this);
-    else
-        wxMessageBox(wxT("Cannot change database parameters while creating or editing a record"),wxT("Notice..."),wxOK | wxICON_INFORMATION);
-}  // DatabaseDemoFrame::OnEditParameters()
-
-
-void DatabaseDemoFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-    wxMessageBox(wxT("wxWidgets sample program for database classes\n\nContributed on 27 July 1998"),wxT("About..."),wxOK | wxICON_INFORMATION);
-}  // DatabaseDemoFrame::OnAbout()
-
-
-// Put any additional checking necessary to make certain it is alright
-// to close the program here that is not done elsewhere
-void DatabaseDemoFrame::OnCloseWindow(wxCloseEvent& event)
-{
-    // Clean up time
-    if (pEditorDlg && pEditorDlg->Close())
-        pEditorDlg = NULL;
-    else
-    {
-        if (pEditorDlg)
-        {
-            event.Veto();
-            return;
-        }
-    }
-
-    wxDELETE(wxGetApp().Contact);
-
-    // This function will close all the connections to the database that have been
-    // previously cached.
-    wxDbCloseConnections();
-
-    // Deletion of the wxDbConnectInf instance must be the LAST thing done that
-    // has anything to do with the database.  Deleting this before disconnecting,
-    // freeing/closing connections, etc will result in a crash!
-    wxDELETE(wxGetApp().DbConnectInf);
-
-    this->Destroy();
-
-}  // DatabaseDemoFrame::OnCloseWindow()
-
-
-void DatabaseDemoFrame::BuildEditorDialog()
-{
-    pEditorDlg = NULL;
-    pEditorDlg = new CeditorDlg(this);
-    if (pEditorDlg)
-    {
-        pEditorDlg->Initialize();
-        if (!pEditorDlg->initialized)
-        {
-            pEditorDlg->Close();
-            pEditorDlg = NULL;
-            wxMessageBox(wxT("Unable to initialize the editor dialog for some reason"),wxT("Error..."),wxOK | wxICON_EXCLAMATION);
-            Close();
-        }
-    }
-    else
-    {
-        wxMessageBox(wxT("Unable to create the editor dialog for some reason"),wxT("Error..."),wxOK | wxICON_EXCLAMATION);
-        Close();
-    }
-}  // DatabaseDemoFrame::BuildEditorDialog()
-
-
-void DatabaseDemoFrame::BuildParameterDialog(wxWindow *parent)
-{
-    pParamDlg = new CparameterDlg(parent);
-
-    if (!pParamDlg)
-        wxMessageBox(wxT("Unable to create the parameter dialog for some reason"),wxT("Error..."),wxOK | wxICON_EXCLAMATION);
-}  // DatabaseDemoFrame::BuildParameterDialog()
-
-
-/*
- * Constructor note: If no wxDb object is passed in, a new connection to the database
- *     is created for this instance of Ccontact.  This can be a slow process depending
- *     on the database engine being used, and some database engines have a limit on the
- *     number of connections (either hard limits, or license restricted) so care should
- *     be used to use as few connections as is necessary.
- *
- * IMPORTANT: Objects which share a wxDb pointer are ALL acted upon whenever a member
- *     function of pDb is called (i.e. CommitTrans() or RollbackTrans(), so if modifying
- *     or creating a table objects which use the same pDb, know that all the objects
- *     will be committed or rolled back when any of the objects has this function call made.
- */
-Ccontact::Ccontact (wxDb *pwxDb) : wxDbTable(pwxDb ? pwxDb : wxDbGetConnection(wxGetApp().DbConnectInf),
-                                             CONTACT_TABLE_NAME, CONTACT_NO_COLS, (const wxString &)wxEmptyString,
-                                             !wxDB_QUERY_ONLY, wxGetApp().DbConnectInf->GetDefaultDir())
-{
-    // This is used to represent whether the database connection should be released
-    // when this instance of the object is deleted.  If using the same connection
-    // for multiple instance of database objects, then the connection should only be
-    // released when the last database instance using the connection is deleted
-    freeDbConn = !pwxDb;
-
-    if (GetDb())
-        GetDb()->SetSqlLogging(sqlLogON);
-
-    SetupColumns();
-
-}  // Ccontact Constructor
-
-
-void Ccontact::Initialize()
-{
-    Name[0]            = 0;
-    Addr1[0]           = 0;
-    Addr2[0]           = 0;
-    City[0]            = 0;
-    State[0]           = 0;
-    PostalCode[0]      = 0;
-    Country[0]         = 0;
-    JoinDate.year      = 1980;
-    JoinDate.month     = 1;
-    JoinDate.day       = 1;
-    JoinDate.hour      = 0;
-    JoinDate.minute    = 0;
-    JoinDate.second    = 0;
-    JoinDate.fraction  = 0;
-    NativeLanguage     = langENGLISH;
-    IsDeveloper        = false;
-    Contributions      = 0;
-    LinesOfCode        = 0L;
-    BlobSize           = 0L;
-    memset(Picture, 0, MAX_PICTURE_SIZE);
-}  // Ccontact::Initialize
-
-
-Ccontact::~Ccontact()
-{
-    if (freeDbConn)
-    {
-        if (!wxDbFreeConnection(GetDb()))
-        {
-            wxString tStr;
-            tStr = wxT("Unable to Free the Ccontact data table handle\n\n");
-
-            wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),wxGetApp().Contact->GetDb(),__TFILE__,__LINE__),
-                         wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-        }
-    }
-}  // Ccontract destructor
-
-
-/*
- * Handles setting up all the connections for the interface from the wxDbTable
- * functions to interface to the data structure used to store records in
- * memory, and for all the column definitions that define the table structure
- */
-void Ccontact::SetupColumns()
-{
-    // NOTE: Columns now are 8 character names, as that is all dBase can support.  Longer
-    //       names can be used for other database engines
-    SetColDefs ( 0,wxT("NAME"),       DB_DATA_TYPE_VARCHAR,     Name,           SQL_C_WXCHAR,               sizeof(Name),           true, true);  // Primary index
-    SetColDefs ( 1,wxT("ADDRESS1"),   DB_DATA_TYPE_VARCHAR,     Addr1,          SQL_C_WXCHAR,               sizeof(Addr1),          false,true);
-    SetColDefs ( 2,wxT("ADDRESS2"),   DB_DATA_TYPE_VARCHAR,     Addr2,          SQL_C_WXCHAR,               sizeof(Addr2),          false,true);
-    SetColDefs ( 3,wxT("CITY"),       DB_DATA_TYPE_VARCHAR,     City,           SQL_C_WXCHAR,               sizeof(City),           false,true);
-    SetColDefs ( 4,wxT("STATE"),      DB_DATA_TYPE_VARCHAR,     State,          SQL_C_WXCHAR,               sizeof(State),          false,true);
-    SetColDefs ( 5,wxT("POSTCODE"),   DB_DATA_TYPE_VARCHAR,     PostalCode,     SQL_C_WXCHAR,               sizeof(PostalCode),     false,true);
-    SetColDefs ( 6,wxT("COUNTRY"),    DB_DATA_TYPE_VARCHAR,     Country,        SQL_C_WXCHAR,               sizeof(Country),        false,true);
-    SetColDefs ( 7,wxT("JOINDATE"),   DB_DATA_TYPE_DATE,       &JoinDate,       SQL_C_TIMESTAMP,            sizeof(JoinDate),       false,true);
-    SetColDefs ( 8,wxT("IS_DEV"),     DB_DATA_TYPE_INTEGER,    &IsDeveloper,    SQL_C_BOOLEAN(IsDeveloper), sizeof(IsDeveloper),    false,true);
-    SetColDefs ( 9,wxT("CONTRIBS"),   DB_DATA_TYPE_INTEGER,    &Contributions,  SQL_C_UTINYINT,             sizeof(Contributions),  false,true);
-    SetColDefs (10,wxT("LINE_CNT"),   DB_DATA_TYPE_INTEGER,    &LinesOfCode,    SQL_C_ULONG,                sizeof(LinesOfCode),    false,true);
-    SetColDefs (11,wxT("LANGUAGE"),   DB_DATA_TYPE_INTEGER,    &NativeLanguage, SQL_C_ENUM,                 sizeof(NativeLanguage), false,true);
-#ifdef wxODBC_BLOB_SUPPORT
-    SetColDefs (12,wxT("PICSIZE"),    DB_DATA_TYPE_INTEGER,    &BlobSize,       SQL_C_ULONG,                sizeof(BlobSize),       false,true);
-    SetColDefs (13,wxT("PICTURE"),    DB_DATA_TYPE_BLOB,        Picture,        SQL_C_BINARY,               sizeof(Picture),        false,true);
-#endif
-}  // Ccontact::SetupColumns
-
-
-bool Ccontact::CreateIndexes(bool recreate)
-{
-    // This index could easily be accomplished with an "orderBy" clause,
-    // but is done to show how to construct a non-primary index.
-    wxString    indexName;
-    wxDbIdxDef  idxDef[2];
-
-    wxStrcpy(idxDef[0].ColName, wxT("IS_DEV"));
-    idxDef[0].Ascending = true;
-
-    wxStrcpy(idxDef[1].ColName, wxT("NAME"));
-    idxDef[1].Ascending = true;
-
-    indexName = GetTableName();
-    indexName += wxT("_IDX1");
-
-    return CreateIndex(indexName.c_str(), true, 2, idxDef, recreate);
-
-}  // Ccontact::CreateIndexes()
-
-
-/*
- * Having a function to do a query on the primary key (and possibly others) is
- * very efficient and tighter coding so that it is available where ever the object
- * is.  Great for use with multiple tables when not using views or outer joins
- */
-bool Ccontact::FetchByName(const wxString &name)
-{
-    whereStr.Printf(wxT("NAME = '%s'"),name.c_str());
-    SetWhereClause(whereStr.c_str());
-    SetOrderByClause(wxEmptyString);
-
-    if (!Query())
-        return(false);
-
-    // Fetch the record
-    return(GetNext());
-
-}  // Ccontact::FetchByName()
-
-
-/*
- *
- *  ************* DIALOGS ***************
- *
- */
-
-
-/* CeditorDlg constructor
- *
- * Creates the dialog used for creating/editing/deleting/copying a Ccontact object.
- * This dialog actually is drawn in the main frame of the program
- *
- * An instance of Ccontact is created - "Contact" - which is used to hold the Ccontact
- * object that is currently being worked with.
- */
-
-BEGIN_EVENT_TABLE(CeditorDlg, wxPanel)
-    EVT_BUTTON(wxID_ANY,  CeditorDlg::OnButton)
-    EVT_CLOSE(CeditorDlg::OnCloseWindow)
-END_EVENT_TABLE()
-
-CeditorDlg::CeditorDlg(wxWindow *parent) : wxPanel (parent, 0, 0, 537, 530)
-{
-    // Since the ::OnCommand() function is overridden, this prevents the widget
-    // detection in ::OnCommand() until all widgets have been initialized to prevent
-    // uninitialized pointers from crashing the program
-    widgetPtrsSet = false;
-
-    initialized = false;
-
-    SetMode(mView);
-
-    Show(false);
-}  // CeditorDlg constructor
-
-
-void CeditorDlg::OnCloseWindow(wxCloseEvent& event)
-{
-    // Clean up time
-    if ((mode != mCreate) && (mode != mEdit))
-    {
-        this->Destroy();
-    }
-    else
-    {
-        wxMessageBox(wxT("Must finish processing the current record being created/modified before exiting"),wxT("Notice..."),wxOK | wxICON_INFORMATION);
-        event.Veto();
-    }
-}  // CeditorDlg::OnCloseWindow()
-
-
-void CeditorDlg::OnButton(wxCommandEvent &event)
-{
-    wxWindow *win = (wxWindow*) event.GetEventObject();
-    OnCommand( *win, event );
-}  // CeditorDlg::OnButton()
-
-
-void CeditorDlg::OnCommand(wxWindow& win, wxCommandEvent& WXUNUSED(event))
-{
-    wxString widgetName;
-
-    widgetName = win.GetName();
-
-    if (!widgetPtrsSet)
-        return;
-
-    if (widgetName == pCreateBtn->GetName())
-    {
-        wxGetApp().Contact->Initialize();
-        PutData();
-        SetMode( mCreate );
-        pNameTxt->SetValue(wxEmptyString);
-        pNameTxt->SetFocus();
-        return;
-    }
-
-    if (widgetName == pEditBtn->GetName())
-    {
-        saveName = wxGetApp().Contact->Name;
-        SetMode( mEdit );
-        pNameTxt->SetFocus();
-        return;
-    }
-
-    if (widgetName == pCopyBtn->GetName())
-    {
-        SetMode(mCreate);
-        pNameTxt->SetValue(wxEmptyString);
-        pNameTxt->SetFocus();
-        return;
-    }
-
-    if (widgetName == pDeleteBtn->GetName())
-    {
-        bool Ok = (wxMessageBox(wxT("Are you sure?"),wxT("Confirm"),wxYES_NO|wxICON_QUESTION) == wxYES);
-
-        if (!Ok)
-            return;
-
-        if (Ok && wxGetApp().Contact->Delete())
-        {
-            // NOTE: Deletions are not finalized until a CommitTrans() is performed.
-            //       If the commit were not performed, the program will continue to
-            //       show the table contents as if they were deleted until this instance
-            //       of Ccontact is deleted.  If the Commit wasn't performed, the
-            //       database will automatically Rollback the changes when the database
-            //       connection is terminated
-            wxGetApp().Contact->GetDb()->CommitTrans();
-
-            // Try to get the row that followed the just deleted row in the orderBy sequence
-            if (!GetNextRec())
-            {
-                // There was now row (in sequence) after the just deleted row, so get the
-                // row which preceded the just deleted row
-                if (!GetPrevRec())
-                {
-                    // There are now no rows remaining, so clear the dialog widgets
-                    wxGetApp().Contact->Initialize();
-                    PutData();
-                }
-            }
-            SetMode(mode);    // force reset of button enable/disable
-        }
-        else
-            // Delete failed
-            wxGetApp().Contact->GetDb()->RollbackTrans();
-
-        SetMode(mView);
-        return;
-    }
-
-    if (widgetName == pSaveBtn->GetName())
-    {
-        Save();
-        return;
-    }
-
-    if (widgetName == pCancelBtn->GetName())
-    {
-        bool Ok = (wxMessageBox(wxT("Are you sure?"),wxT("Confirm"),wxYES_NO|wxICON_QUESTION) == wxYES);
-
-        if (!Ok)
-            return;
-
-        if (saveName.empty())
-        {
-            wxGetApp().Contact->Initialize();
-            PutData();
-            SetMode(mView);
-            return;
-        }
-        else
-        {
-            // Requery previous record
-            if (wxGetApp().Contact->FetchByName(saveName))
-            {
-                PutData();
-                SetMode(mView);
-                return;
-            }
-        }
-
-        // Previous record not available, retrieve first record in table
-        if (wxGetApp().Contact->GetDb()->Dbms() != dbmsPOSTGRES &&
-            wxGetApp().Contact->GetDb()->Dbms() != dbmsMY_SQL)
-        {
-            wxGetApp().Contact->whereStr  = wxT("NAME = (SELECT MIN(NAME) FROM ");
-            wxGetApp().Contact->whereStr += wxGetApp().Contact->GetTableName();
-            wxGetApp().Contact->whereStr += wxT(")");
-            wxGetApp().Contact->SetWhereClause(wxGetApp().Contact->whereStr.c_str());
-        }
-        else
-            wxGetApp().Contact->SetWhereClause(wxEmptyString);
-
-        if (!wxGetApp().Contact->Query())
-        {
-            wxString tStr;
-            tStr = wxT("ODBC error during Query()\n\n");
-            wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),wxGetApp().Contact->GetDb(),__TFILE__,__LINE__),
-                         wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-
-            SetMode(mView);
-            return;
-        }
-        if (wxGetApp().Contact->GetNext())  // Successfully read first record
-        {
-            PutData();
-            SetMode(mView);
-            return;
-        }
-        // No contacts are available, clear dialog
-        wxGetApp().Contact->Initialize();
-        PutData();
-        SetMode(mView);
-        return;
-    }  // Cancel Button
-
-    if (widgetName == pPrevBtn->GetName())
-    {
-        if (!GetPrevRec())
-            wxBell();
-        return;
-    }  // Prev Button
-
-    if (widgetName == pNextBtn->GetName())
-    {
-        if (!GetNextRec())
-            wxBell();
-        return;
-    }  // Next Button
-
-    if (widgetName == pQueryBtn->GetName())
-    {
-        // Display the query dialog box
-        wxChar qryWhere[DB_MAX_WHERE_CLAUSE_LEN+1];
-        wxStrcpy(qryWhere, (const wxChar*) wxGetApp().Contact->qryWhereStr);
-        const wxChar *tblName[] = {(const wxChar *)CONTACT_TABLE_NAME.c_str(), 0};
-        new CqueryDlg(GetParent(), wxGetApp().Contact->GetDb(), (wxChar**) tblName, qryWhere);
-
-        // Query the first record in the new record set and
-        // display it, if the query string has changed.
-        if (wxStrcmp(qryWhere, (const wxChar*) wxGetApp().Contact->qryWhereStr))
-        {
-            wxGetApp().Contact->whereStr.Empty();
-            wxGetApp().Contact->SetOrderByClause(wxT("NAME"));
-
-            if (wxGetApp().Contact->GetDb()->Dbms() != dbmsPOSTGRES &&
-                wxGetApp().Contact->GetDb()->Dbms() != dbmsMY_SQL)
-            {
-                wxGetApp().Contact->whereStr  = wxT("NAME = (SELECT MIN(NAME) FROM ");
-                wxGetApp().Contact->whereStr += CONTACT_TABLE_NAME;
-            }
-
-            // Append the query where string (if there is one)
-            wxGetApp().Contact->qryWhereStr  = qryWhere;
-            if (wxStrlen(qryWhere))
-            {
-                wxGetApp().Contact->whereStr += wxT(" WHERE ");
-                wxGetApp().Contact->whereStr += wxGetApp().Contact->qryWhereStr;
-            }
-            // Close the expression with a right paren
-            wxGetApp().Contact->whereStr += wxT(")");
-            // Requery the table
-            wxGetApp().Contact->SetWhereClause(wxGetApp().Contact->whereStr.c_str());
-            if (!wxGetApp().Contact->Query())
-            {
-                wxString tStr;
-                tStr = wxT("ODBC error during Query()\n\n");
-                wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),wxGetApp().Contact->GetDb(),__TFILE__,__LINE__),
-                             wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-
-                return;
-            }
-            // Display the first record from the query set
-            if (!wxGetApp().Contact->GetNext())
-                wxGetApp().Contact->Initialize();
-            PutData();
-        }
-
-        // Enable/Disable the reset button
-        pResetBtn->Enable(!wxGetApp().Contact->qryWhereStr.empty());
-
-        return;
-    }  // Query button
-
-
-    if (widgetName == pResetBtn->GetName())
-    {
-        // Clear the additional where criteria established by the query feature
-        wxGetApp().Contact->qryWhereStr = wxEmptyString;
-        wxGetApp().Contact->SetOrderByClause(wxT("NAME"));
-
-        if (wxGetApp().Contact->GetDb()->Dbms() != dbmsPOSTGRES &&
-            wxGetApp().Contact->GetDb()->Dbms() != dbmsMY_SQL)
-        {
-            wxGetApp().Contact->whereStr  = wxT("NAME = (SELECT MIN(NAME) FROM ");
-            wxGetApp().Contact->whereStr += CONTACT_TABLE_NAME;
-            wxGetApp().Contact->whereStr += wxT(")");
-        }
-
-        wxGetApp().Contact->SetWhereClause(wxGetApp().Contact->whereStr.c_str());
-        if (!wxGetApp().Contact->Query())
-        {
-            wxString tStr;
-            tStr = wxT("ODBC error during Query()\n\n");
-            wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),wxGetApp().Contact->GetDb(),__TFILE__,__LINE__),
-                         wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-            return;
-        }
-        if (!wxGetApp().Contact->GetNext())
-            wxGetApp().Contact->Initialize();
-        PutData();
-        pResetBtn->Enable(false);
-
-        return;
-    }  // Reset button
-
-
-    if (widgetName == pNameListBtn->GetName())
-    {
-        new ClookUpDlg(/* wxWindow       *parent        */ this,
-                       /* const wxString &windowTitle   */ wxT("Select contact name"),
-                       /* const wxString &tableName     */ CONTACT_TABLE_NAME,
-                       /* const wxString &dispCol1      */ wxT("NAME"),
-                       /* const wxString &dispCol2      */ wxT("JOINDATE"),
-                       /* const wxString &where         */ wxT(""),
-                       /* const wxString &orderBy       */ wxT("NAME"),
-                       /* wxDb           *pDb           */ wxGetApp().READONLY_DB,
-                       /* const wxString &defDir        */ wxGetApp().DbConnectInf->GetDefaultDir(),
-                       /* bool            distinctValues*/ true,
-                       wxEmptyString, 20);
-
-        if (ListDB_Selection && wxStrlen(ListDB_Selection))
-        {
-            wxString w = wxT("NAME = '");
-            w += ListDB_Selection;
-            w += wxT("'");
-            GetRec(w);
-        }
-
-        return;
-    }
-
-    if (widgetName == pDataTypesBtn->GetName())
-    {
-        CheckSupportForAllDataTypes(wxGetApp().READONLY_DB);
-        wxMessageBox(wxT("Support datatypes was dumped to stdout."));
-        return;
-    }  // Data types Button
-
-    if (widgetName == pDbDiagsBtn->GetName())
-    {
-        DisplayDbDiagnostics(wxGetApp().READONLY_DB);
-        wxMessageBox(wxT("Diagnostics info was dumped to stdout."));
-        return;
-    }
-
-    if (widgetName == pCatalogBtn->GetName())
-    {
-        if (wxGetApp().Contact->GetDb()->Catalog(wxEmptyString, wxT("catalog.txt")))
-            wxMessageBox(wxT("The file 'catalog.txt' was created."));
-        else
-            wxMessageBox(wxT("Creation of the file 'catalog.txt' failed."));
-        return;
-    }
-
-#ifdef wxODBC_BLOB_SUPPORT
-    if (widgetName == pChooseImageBtn->GetName())
-    {
-        OnSelectPict();
-    }
-
-    if (widgetName == pShowImageBtn->GetName())
-    {
-        OnShowImage();
-    }
-#endif
-
-}  // CeditorDlg::OnCommand()
-
-
-bool CeditorDlg::Initialize()
-{
-    // Create the data structure and a new database connection.
-    // (As there is not a pDb being passed in the constructor, a new database
-    // connection is created)
-    wxGetApp().Contact = new Ccontact();
-
-    if (!wxGetApp().Contact)
-    {
-        wxMessageBox(wxT("Unable to instantiate an instance of Ccontact"),wxT("Error..."),wxOK | wxICON_EXCLAMATION);
-        return false;
-    }
-
-    // Check if the table exists or not.  If it doesn't, ask the user if they want to
-    // create the table.  Continue trying to create the table until it exists, or user aborts
-    while (!wxGetApp().Contact->GetDb()->TableExists(CONTACT_TABLE_NAME,
-                                          wxGetApp().DbConnectInf->GetUserID(),
-                                          wxGetApp().DbConnectInf->GetDefaultDir()))
-    {
-        wxString tStr;
-        tStr.Printf(wxT("Unable to open the table '%s'.  The table may\nneed to be created.\n\nDo you wish to try to create/clear the table?\n\n"),CONTACT_TABLE_NAME.c_str());
-        bool createTable = (wxMessageBox(tStr.c_str(),wxT("Confirm"),wxYES_NO|wxICON_QUESTION) == wxYES);
-
-        if (!createTable)
-        {
-//            Close();
-            return false;
-        }
-        else
-            wxGetApp().CreateDataTable(false);
-    }
-
-    // Tables must be "opened" before anything other than creating/deleting table can be done
-    if (!wxGetApp().Contact->Open())
-    {
-        // Table does exist, or there was some problem opening it.  Currently this should
-        // never fail, except in the case of the table not exisiting or the current
-        // user has insufficent privileges to access the table
-#if 1
-// This code is experimenting with a new function that will hopefully be available
-// in the 2.4 release.  This check will determine whether the open failing was due
-// to the table not existing, or the users privileges being insufficient to
-// open the table.
-        if (!wxGetApp().Contact->GetDb()->TablePrivileges(CONTACT_TABLE_NAME, wxT("SELECT"),
-                                                wxGetApp().Contact->GetDb()->GetUsername(),
-                                                wxGetApp().Contact->GetDb()->GetUsername(),
-                                                wxGetApp().DbConnectInf->GetDefaultDir()))
-        {
-            wxString tStr;
-            tStr.Printf(wxT("Unable to open the table '%s' (likely due to\ninsufficient privileges of the logged in user).\n\n"),CONTACT_TABLE_NAME.c_str());
-
-            wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),wxGetApp().Contact->GetDb(),__TFILE__,__LINE__),
-                         wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-        }
-        else
-#endif
-        if (!wxGetApp().Contact->GetDb()->TableExists(CONTACT_TABLE_NAME,
-                                           wxGetApp().Contact->GetDb()->GetUsername(),
-                                           wxGetApp().DbConnectInf->GetDefaultDir()))
-        {
-            wxString tStr;
-            tStr.Printf(wxT("Unable to open the table '%s' as the table\ndoes not appear to exist in the tablespace available\nto the currently logged in user.\n\n"),CONTACT_TABLE_NAME.c_str());
-            wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),wxGetApp().Contact->GetDb(),__TFILE__,__LINE__),
-                         wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-        }
-
-        return false;
-    }
-
-    // Build the dialog
-
-    (void)new wxStaticBox(this, EDITOR_DIALOG_FN_GROUP, wxEmptyString,  wxPoint(15, 1), wxSize(497,  69), 0, wxT("FunctionGrp"));
-    (void)new wxStaticBox(this, EDITOR_DIALOG_SEARCH_GROUP, wxEmptyString, wxPoint(417, 1), wxSize(95, 242), 0, wxT("SearchGrp"));
-
-    pCreateBtn      = new wxButton(this, EDITOR_DIALOG_CREATE,           wxT("&Create"),     wxPoint( 25,  21), wxSize( 70,  35), 0, wxDefaultValidator, wxT("CreateBtn"));
-    pEditBtn        = new wxButton(this, EDITOR_DIALOG_EDIT,             wxT("&Edit"),       wxPoint(102,  21), wxSize( 70,  35), 0, wxDefaultValidator, wxT("EditBtn"));
-    pDeleteBtn      = new wxButton(this, EDITOR_DIALOG_DELETE,           wxT("&Delete"),     wxPoint(179,  21), wxSize( 70,  35), 0, wxDefaultValidator, wxT("DeleteBtn"));
-    pCopyBtn        = new wxButton(this, EDITOR_DIALOG_COPY,             wxT("Cop&y"),       wxPoint(256,  21), wxSize( 70,  35), 0, wxDefaultValidator, wxT("CopyBtn"));
-    pSaveBtn        = new wxButton(this, EDITOR_DIALOG_SAVE,             wxT("&Save"),       wxPoint(333,  21), wxSize( 70,  35), 0, wxDefaultValidator, wxT("SaveBtn"));
-    pCancelBtn      = new wxButton(this, EDITOR_DIALOG_CANCEL,           wxT("C&ancel"),     wxPoint(430,  21), wxSize( 70,  35), 0, wxDefaultValidator, wxT("CancelBtn"));
-    pPrevBtn        = new wxButton(this, EDITOR_DIALOG_PREV,             wxT("<< &Prev"),    wxPoint(430,  81), wxSize( 70,  35), 0, wxDefaultValidator, wxT("PrevBtn"));
-    pNextBtn        = new wxButton(this, EDITOR_DIALOG_NEXT,             wxT("&Next >>"),    wxPoint(430, 121), wxSize( 70,  35), 0, wxDefaultValidator, wxT("NextBtn"));
-    pQueryBtn       = new wxButton(this, EDITOR_DIALOG_QUERY,            wxT("&Query"),      wxPoint(430, 161), wxSize( 70,  35), 0, wxDefaultValidator, wxT("QueryBtn"));
-    pResetBtn       = new wxButton(this, EDITOR_DIALOG_RESET,            wxT("&Reset"),      wxPoint(430, 200), wxSize( 70,  35), 0, wxDefaultValidator, wxT("ResetBtn"));
-    pNameMsg        = new wxStaticText(this, EDITOR_DIALOG_NAME_MSG,     wxT("Name:"),       wxPoint( 17,  80), wxDefaultSize,    0, wxT("NameMsg"));
-    pNameTxt        = new wxTextCtrl(this, EDITOR_DIALOG_NAME_TEXT,      wxEmptyString,      wxPoint( 17,  97), wxSize(308,  25), 0, wxDefaultValidator, wxT("NameTxt"));
-    pNameListBtn    = new wxButton(this, EDITOR_DIALOG_LOOKUP,           wxT("&Lookup"),     wxPoint(333,  97), wxSize( 70,  24), 0, wxDefaultValidator, wxT("LookupBtn"));
-    pAddress1Msg    = new wxStaticText(this, EDITOR_DIALOG_ADDRESS1_MSG, wxT("Address:"),    wxPoint( 17, 130), wxDefaultSize,    0, wxT("Address1Msg"));
-    pAddress1Txt    = new wxTextCtrl(this, EDITOR_DIALOG_ADDRESS2_TEXT,  wxEmptyString,      wxPoint( 17, 147), wxSize(308,  25), 0, wxDefaultValidator, wxT("Address1Txt"));
-    pAddress2Msg    = new wxStaticText(this, EDITOR_DIALOG_ADDRESS2_MSG, wxT("Address:"),    wxPoint( 17, 180), wxDefaultSize,    0, wxT("Address2Msg"));
-    pAddress2Txt    = new wxTextCtrl(this, EDITOR_DIALOG_ADDRESS2_TEXT,  wxEmptyString,      wxPoint( 17, 197), wxSize(308,  25), 0, wxDefaultValidator, wxT("Address2Txt"));
-    pCityMsg        = new wxStaticText(this, EDITOR_DIALOG_CITY_MSG,     wxT("City:"),       wxPoint( 17, 230), wxDefaultSize,    0, wxT("CityMsg"));
-    pCityTxt        = new wxTextCtrl(this, EDITOR_DIALOG_CITY_TEXT,      wxEmptyString,      wxPoint( 17, 247), wxSize(225,  25), 0, wxDefaultValidator, wxT("CityTxt"));
-    pStateMsg       = new wxStaticText(this, EDITOR_DIALOG_STATE_MSG,    wxT("State:"),      wxPoint(250, 230), wxDefaultSize,    0, wxT("StateMsg"));
-    pStateTxt       = new wxTextCtrl(this, EDITOR_DIALOG_STATE_TEXT,     wxEmptyString,      wxPoint(250, 247), wxSize(153,  25), 0, wxDefaultValidator, wxT("StateTxt"));
-    pCountryMsg     = new wxStaticText(this, EDITOR_DIALOG_COUNTRY_MSG,  wxT("Country:"),    wxPoint( 17, 280), wxDefaultSize,    0, wxT("CountryMsg"));
-    pCountryTxt     = new wxTextCtrl(this, EDITOR_DIALOG_COUNTRY_TEXT,   wxEmptyString,      wxPoint( 17, 297), wxSize(225,  25), 0, wxDefaultValidator, wxT("CountryTxt"));
-    pPostalCodeMsg  = new wxStaticText(this, EDITOR_DIALOG_POSTAL_MSG,   wxT("Postal Code:"),wxPoint(250, 280), wxDefaultSize,    0, wxT("PostalCodeMsg"));
-    pPostalCodeTxt  = new wxTextCtrl(this, EDITOR_DIALOG_POSTAL_TEXT,    wxEmptyString,      wxPoint(250, 297), wxSize(153,  25), 0, wxDefaultValidator, wxT("PostalCodeTxt"));
-
-    wxString choice_strings[5];
-    choice_strings[0] = wxT("English");
-    choice_strings[1] = wxT("French");
-    choice_strings[2] = wxT("German");
-    choice_strings[3] = wxT("Spanish");
-    choice_strings[4] = wxT("Other");
-
-    pNativeLangChoice = new wxChoice(this, EDITOR_DIALOG_LANG_CHOICE,                             wxPoint( 17, 346), wxSize(277,  wxDefaultCoord), 5, choice_strings);
-    pNativeLangMsg    = new wxStaticText(this, EDITOR_DIALOG_LANG_MSG,   wxT("Native language:"), wxPoint( 17, 330), wxDefaultSize, 0, wxT("NativeLangMsg"));
-
-    wxString radio_strings[2];
-    radio_strings[0]  = wxT("No");
-    radio_strings[1]  = wxT("Yes");
-    pDeveloperRadio   = new wxRadioBox(this,EDITOR_DIALOG_DEVELOPER,     wxT("Developer:"),       wxPoint(303, 330), wxDefaultSize, 2, radio_strings, 2, wxHORIZONTAL);
-    pJoinDateMsg      = new wxStaticText(this, EDITOR_DIALOG_JOIN_MSG,   wxT("Date joined:"),     wxPoint( 17, 380), wxDefaultSize, 0, wxT("JoinDateMsg"));
-    pJoinDateTxt      = new wxTextCtrl(this, EDITOR_DIALOG_JOIN_TEXT,    wxEmptyString,           wxPoint( 17, 397), wxSize(150,  25), 0, wxDefaultValidator, wxT("JoinDateTxt"));
-    pContribMsg       = new wxStaticText(this, EDITOR_DIALOG_CONTRIB_MSG,wxT("Contributions:"),   wxPoint(175, 380), wxDefaultSize, 0, wxT("ContribMsg"));
-    pContribTxt       = new wxTextCtrl(this, EDITOR_DIALOG_CONTRIB_TEXT, wxEmptyString,           wxPoint(175, 397), wxSize(120,  25), 0, wxDefaultValidator, wxT("ContribTxt"));
-    pLinesMsg         = new wxStaticText(this, EDITOR_DIALOG_LINES_MSG,  wxT("Lines of code:"),   wxPoint(303, 380), wxDefaultSize, 0, wxT("LinesMsg"));
-    pLinesTxt         = new wxTextCtrl(this, EDITOR_DIALOG_LINES_TEXT,   wxEmptyString,           wxPoint(303, 397), wxSize(100,  25), 0, wxDefaultValidator, wxT("LinesTxt"));
-
-    pCatalogBtn       = new wxButton(this, EDITOR_DIALOG_CATALOG,        wxT("Catalo&g"),         wxPoint(430, 287), wxSize( 70,  35), 0, wxDefaultValidator, wxT("CatalogBtn"));
-    pDataTypesBtn     = new wxButton(this, EDITOR_DIALOG_DATATYPES,      wxT("Data&types"),       wxPoint(430, 337), wxSize( 70,  35), 0, wxDefaultValidator, wxT("DataTypesBtn"));
-    pDbDiagsBtn       = new wxButton(this, EDITOR_DIALOG_DB_DIAGS,       wxT("DB Dia&gs"),        wxPoint(430, 387), wxSize( 70,  35), 0, wxDefaultValidator, wxT("DbDiagsBtn"));
-
-#ifdef wxODBC_BLOB_SUPPORT
-    pPictureMsg       = new wxStaticText(this, EDITOR_DIALOG_PIC_MSG,     wxT("Picture:"),        wxPoint( 17,430), wxDefaultSize, 0, wxT("PicMsg"));
-    pPictSizeMsg      = new wxStaticText(this, EDITOR_DIALOG_PICSIZE_MSG, wxT("Picture Bytes:"),  wxPoint(175,430), wxDefaultSize, 0, wxT("PicSizeMsg"));
-    pChooseImageBtn      = new wxButton(this, EDITOR_DIALOG_PIC_BROWSE,      wxT("Select..."),       wxPoint( 17,447), wxSize( 70, 24), 0, wxDefaultValidator, wxT("PicBrowseBtn"));
-    pShowImageBtn        = new wxButton(this, EDITOR_DIALOG_PIC_SHOW,        wxT("Show..."),         wxPoint( 97,447), wxSize( 70, 24), 0, wxDefaultValidator, wxT("PictShowBtn"));
-    pPictSizeTxt      = new wxTextCtrl(this, EDITOR_DIALOG_PIC_SIZE_TEXT, wxEmptyString,          wxPoint(175,447), wxSize(120, 25), 0, wxDefaultValidator, wxT("PictSizeTxt"));
-#endif
-
-    // Now that all the widgets on the panel are created, its safe to allow ::OnCommand() to
-    // handle all widget processing
-    widgetPtrsSet = true;
-
-    // Setup the orderBy and where clauses to return back a single record as the result set,
-    // as there will only be one record being shown on the dialog at a time, this optimizes
-    // network traffic by only returning a one row result
-
-    wxGetApp().Contact->SetOrderByClause(wxT("NAME"));  // field name to sort by
-
-    // The wxString "whereStr" is not a member of the wxDbTable object, it is a member variable
-    // specifically in the Ccontact class.  It is used here for simpler construction of a varying
-    // length string, and then after the string is built, the wxDbTable member variable "where" is
-    // assigned the pointer to the constructed string.
-    //
-    // The constructed where clause below has a sub-query within it "SELECT MIN(NAME) FROM %s"
-    // to achieve a single row (in this case the first name in alphabetical order).
-
-    if (wxGetApp().Contact->GetDb()->Dbms() != dbmsPOSTGRES &&
-        wxGetApp().Contact->GetDb()->Dbms() != dbmsMY_SQL)
-    {
-        wxGetApp().Contact->whereStr.Printf(wxT("NAME = (SELECT MIN(NAME) FROM %s)"),
-                                            wxGetApp().Contact->GetTableName().c_str());
-        // NOTE: (const wxChar*) returns a pointer which may not be valid later, so this is short term use only
-        wxGetApp().Contact->SetWhereClause(wxGetApp().Contact->whereStr);
-    }
-    else
-       wxGetApp().Contact->SetWhereClause(wxEmptyString);
-
-    // Perform the Query to get the result set.
-    // NOTE: If there are no rows returned, that is a valid result, so Query() would return true.
-    //       Only if there is a database error will Query() come back as false
-    if (!wxGetApp().Contact->Query())
-    {
-        wxString tStr;
-        tStr = wxT("ODBC error during Query()\n\n");
-        wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),wxGetApp().Contact->GetDb(),__TFILE__,__LINE__),
-                     wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-        return false;
-    }
-
-    // Since Query succeeded, now get the row that was returned
-    if (!wxGetApp().Contact->GetNext())
-        // If the GetNext() failed at this point, then there are no rows to retrieve,
-        // so clear the values in the members of "Contact" so that PutData() blanks the
-        // widgets on the dialog
-        wxGetApp().Contact->Initialize();
-/*
-    wxGetApp().Contact->GetDb()->RollbackTrans();
-*/
-    SetMode(mView);
-    PutData();
-
-    Show(true);
-
-    initialized = true;
-    return true;
-}  // CeditorDlg::Initialize()
-
-#ifdef wxODBC_BLOB_SUPPORT
-
-void CeditorDlg::OnSelectPict()
-{
-    wxFileDialog dlg(this, wxT("Choose an image file less than 60K"), wxEmptyString, wxEmptyString, wxT("JPEG files (*.jpg)|*.jpg|GIF files (*.gif)|*.gif|BMP files (*.bmp)|*.bmp|All Files (*.*)|*.*"), wxFD_OPEN);
-
-    if (dlg.ShowModal() == wxID_OK)
-    {
-        wxFile file(dlg.GetPath());
-
-        if (file.IsOpened())
-        {
-            // assume not huge file in sample
-            long iSize = (long)file.Length();
-
-            if ((iSize > 0) && (iSize < MAX_PICTURE_SIZE))
-            {
-                wxGetApp().Contact->BlobSize = (size_t)iSize;
-
-                memset(wxGetApp().Contact->Picture, 0, MAX_PICTURE_SIZE);
-
-                wxFileOffset iReadSize = file.Read(wxGetApp().Contact->Picture, (size_t)iSize);
-
-                if (iReadSize < iSize)
-                    wxMessageBox(wxT("Something bad happened while reading..."), wxT("BLOB Loading Error"), wxOK | wxICON_EXCLAMATION);
-
-                wxString tStr;
-                tStr.Printf(wxT("%ld"),iSize);
-                pPictSizeTxt->SetValue(tStr);
-            }
-            else
-                wxMessageBox(wxT("Selected File is TOO BIG.  60k is the max image size"), wxT("BLOB Loading Error"), wxOK | wxICON_EXCLAMATION);
-        }
-        else
-            wxMessageBox(wxT("Unable to open the requested image file"), wxT("File Access Error"), wxOK | wxICON_EXCLAMATION);
-    }
-}
-
-void CeditorDlg::OnShowImage()
-{
-    if (wxGetApp().Contact->BlobSize > 0)
-    {
-        CimageDlg dlg(this, wxGetApp().Contact->Picture, wxGetApp().Contact->BlobSize);
-
-        dlg.ShowModal();
-    }
-}
-
-#endif
-
-void CeditorDlg::FieldsEditable()
-{
-    if (!widgetPtrsSet)
-        return;
-
-    pNameTxt->Enable((mode == mCreate) || (mode == mEdit));
-    pAddress1Txt->Enable((mode == mCreate) || (mode == mEdit));
-    pAddress2Txt->Enable((mode == mCreate) || (mode == mEdit));
-    pCityTxt->Enable((mode == mCreate) || (mode == mEdit));
-    pStateTxt->Enable((mode == mCreate) || (mode == mEdit));
-    pPostalCodeTxt->Enable((mode == mCreate) || (mode == mEdit));
-    pCountryTxt->Enable((mode == mCreate) || (mode == mEdit));
-
-    pJoinDateTxt->Enable((mode == mCreate) || (mode == mEdit));
-    pContribTxt->Enable((mode == mCreate) || (mode == mEdit));
-    pLinesTxt->Enable((mode == mCreate) || (mode == mEdit));
-    pNativeLangChoice->Enable((mode == mCreate) || (mode == mEdit));
-    pDeveloperRadio->Enable((mode == mCreate) || (mode == mEdit));
-
-#ifdef wxODBC_BLOB_SUPPORT
-    pPictSizeTxt->Enable(false);
-    pChooseImageBtn->Enable((mode == mCreate) || (mode == mEdit));
-    pShowImageBtn->Enable(wxGetApp().Contact && wxGetApp().Contact->BlobSize > 0); //((mode == mCreate) || (mode == mEdit));
-#endif
-
-}  // CeditorDlg::FieldsEditable()
-
-
-void CeditorDlg::SetMode(enum DialogModes m)
-{
-    bool edit = false;
-
-    mode = m;
-    switch (mode)
-    {
-        case mCreate:
-        case mEdit:
-            edit = true;
-            break;
-        case mView:
-        case mSearch:
-            edit = false;
-            break;
-        default:
-                break;
-    };
-
-    if (widgetPtrsSet)
-    {
-        pCreateBtn->Enable( !edit );
-        pEditBtn->Enable( !edit && (wxStrcmp(wxGetApp().Contact->Name, wxEmptyString) != 0) );
-        pDeleteBtn->Enable( !edit && (wxStrcmp(wxGetApp().Contact->Name, wxEmptyString)!=0) );
-        pCopyBtn->Enable( !edit && (wxStrcmp(wxGetApp().Contact->Name, wxEmptyString)!=0) );
-        pSaveBtn->Enable( edit );
-        pCancelBtn->Enable( edit );
-        pPrevBtn->Enable( !edit );
-        pNextBtn->Enable( !edit );
-        pQueryBtn->Enable( !edit );
-        pResetBtn->Enable( !edit && !wxGetApp().Contact->qryWhereStr.empty() );
-        pNameListBtn->Enable( !edit );
-    }
-
-    FieldsEditable();
-}  // CeditorDlg::SetMode()
-
-
-bool CeditorDlg::PutData()
-{
-    wxString tStr;
-
-    pNameTxt->SetValue(wxGetApp().Contact->Name);
-    pAddress1Txt->SetValue(wxGetApp().Contact->Addr1);
-    pAddress2Txt->SetValue(wxGetApp().Contact->Addr2);
-    pCityTxt->SetValue(wxGetApp().Contact->City);
-    pStateTxt->SetValue(wxGetApp().Contact->State);
-    pCountryTxt->SetValue(wxGetApp().Contact->Country);
-    pPostalCodeTxt->SetValue(wxGetApp().Contact->PostalCode);
-
-    tStr.Printf(wxT("%d/%d/%d"),wxGetApp().Contact->JoinDate.month,wxGetApp().Contact->JoinDate.day,wxGetApp().Contact->JoinDate.year);
-    pJoinDateTxt->SetValue(tStr);
-
-    tStr.Printf(wxT("%d"),wxGetApp().Contact->Contributions);
-    pContribTxt->SetValue(tStr);
-
-    tStr.Printf(wxT("%lu"),wxGetApp().Contact->LinesOfCode);
-    pLinesTxt->SetValue(tStr);
-
-    pNativeLangChoice->SetSelection(wxGetApp().Contact->NativeLanguage);
-
-    pDeveloperRadio->SetSelection(wxGetApp().Contact->IsDeveloper);
-
-#ifdef wxODBC_BLOB_SUPPORT
-    tStr.Printf(wxT("%lu"),wxGetApp().Contact->BlobSize);
-    pPictSizeTxt->SetValue(tStr);
-    pShowImageBtn->Enable(wxGetApp().Contact->BlobSize > 0);
-#endif
-
-    return true;
-}  // Ceditor::PutData()
-
-
-/*
- * Reads the data out of all the widgets on the dialog.  Some data evaluation is done
- * to ensure that there is a name entered and that the date field is valid.
- *
- * A return value of true means that valid data was retrieved from the dialog, otherwise
- * invalid data was found (and a message was displayed telling the user what to fix), and
- * the data was not placed into the appropraite fields of Ccontact
- */
-bool CeditorDlg::GetData()
-{
-    // Validate that the data currently entered into the widgets is valid data
-
-    wxString tStr;
-    tStr = pNameTxt->GetValue();
-    if (!wxStrcmp((const wxChar*) tStr, wxEmptyString))
-    {
-        wxMessageBox(wxT("A name is required for entry into the contact table"), wxT("Notice..."), wxOK | wxICON_INFORMATION);
-        return false;
-    }
-
-    bool   invalid = false;
-    int    mm = 1,dd = 1,yyyy = 2001;
-    int    first, second;
-
-    tStr = pJoinDateTxt->GetValue();
-    if (tStr.Freq(wxT('/')) != 2)
-        invalid = true;
-
-    // Find the month, day, and year tokens
-    if (!invalid)
-    {
-        first   = tStr.First(wxT('/'));
-        second  = tStr.Last(wxT('/'));
-
-        mm      = wxAtoi(tStr.SubString(0,first));
-        dd      = wxAtoi(tStr.SubString(first+1,second));
-        yyyy    = wxAtoi(tStr.SubString(second+1,tStr.Length()-1));
-
-        invalid = !(mm && dd && yyyy);
-    }
-
-    // Force Year 2000 compliance
-    if (!invalid && (yyyy < 1000))
-        invalid = true;
-
-    // Check the token ranges for validity
-    if (!invalid)
-    {
-        if (yyyy > 9999)
-            invalid = true;
-        else if ((mm < 1) || (mm > 12))
-            invalid = true;
-        else
-        {
-            if (dd < 1)
-                invalid = true;
-            else
-            {
-                int days[12] = {31,28,31,30,31,30,
-                                31,31,30,31,30,31};
-                if (dd > days[mm-1])
-                {
-                    invalid = true;
-                    if ((dd == 29) && (mm == 2))
-                    {
-                        if (((yyyy % 4) == 0) && (((yyyy % 100) != 0) || ((yyyy % 400) == 0)))
-                            invalid = false;
-                    }
-                }
-            }
-        }
-    }
-
-    if (!invalid)
-    {
-        wxGetApp().Contact->JoinDate.month = (unsigned short) mm;
-        wxGetApp().Contact->JoinDate.day   = (unsigned short) dd;
-        wxGetApp().Contact->JoinDate.year  = (short) yyyy;
-    }
-    else
-    {
-        wxMessageBox(wxT("Improper date format.  Please check the date\nspecified and try again.\n\nNOTE: Dates are in american format (MM/DD/YYYY)"),wxT("Notice..."),wxOK | wxICON_INFORMATION);
-        return false;
-    }
-
-    tStr = pNameTxt->GetValue();
-    wxStrcpy(wxGetApp().Contact->Name,(const wxChar*) tStr);
-    wxStrcpy(wxGetApp().Contact->Addr1,pAddress1Txt->GetValue());
-    wxStrcpy(wxGetApp().Contact->Addr2,pAddress2Txt->GetValue());
-    wxStrcpy(wxGetApp().Contact->City,pCityTxt->GetValue());
-    wxStrcpy(wxGetApp().Contact->State,pStateTxt->GetValue());
-    wxStrcpy(wxGetApp().Contact->Country,pCountryTxt->GetValue());
-    wxStrcpy(wxGetApp().Contact->PostalCode,pPostalCodeTxt->GetValue());
-
-    wxGetApp().Contact->Contributions = (UCHAR)wxAtoi(pContribTxt->GetValue());
-    wxGetApp().Contact->LinesOfCode = wxAtol(pLinesTxt->GetValue());
-
-    wxGetApp().Contact->NativeLanguage = (enum Language) pNativeLangChoice->GetSelection();
-    wxGetApp().Contact->IsDeveloper = pDeveloperRadio->GetSelection() > 0;
-
-    return true;
-}  // CeditorDlg::GetData()
-
-
-/*
- * Retrieve data from the dialog, verify the validity of the data, and if it is valid,
- * try to insert/update the data to the table based on the current 'mode' the dialog
- * is set to.
- *
- * A return value of true means the insert/update was completed successfully, a return
- * value of false means that Save() failed.  If returning false, then this function
- * has displayed a detailed error message for the user.
- */
-bool CeditorDlg::Save()
-{
-    bool failed = false;
-
-    // Read the data in the widgets of the dialog to get the user's data
-    if (!GetData())
-        failed = true;
-
-    // Perform any other required validations necessary before saving
-    if (!failed)
-    {
-        wxBeginBusyCursor();
-
-        if (mode == mCreate)
-        {
-            RETCODE result = (RETCODE)wxGetApp().Contact->Insert();
-
-            failed = (result != DB_SUCCESS);
-            if (failed)
-            {
-                // Some errors may be expected, like a duplicate key, so handle those instances with
-                // specific error messages.
-                if (result == DB_ERR_INTEGRITY_CONSTRAINT_VIOL)
-                {
-                    wxString tStr;
-                    tStr = wxT("A duplicate key value already exists in the table.\nUnable to save record\n\n");
-                    wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),wxGetApp().Contact->GetDb(),__TFILE__,__LINE__),
-                                 wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-                }
-                else
-                {
-                    // Some other unexpected error occurred
-                    wxString tStr;
-                    tStr = wxT("Database insert failed\n\n");
-                    wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),wxGetApp().Contact->GetDb(),__TFILE__,__LINE__),
-                                 wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-                }
-            }
-        }
-        else  // mode == mEdit
-        {
-            wxGetApp().Contact->GetDb()->RollbackTrans();
-            wxGetApp().Contact->whereStr.Printf(wxT("NAME = '%s'"),saveName.c_str());
-            if (!wxGetApp().Contact->UpdateWhere(wxGetApp().Contact->whereStr))
-            {
-                wxString tStr;
-                tStr = wxT("Database update failed\n\n");
-                wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),wxGetApp().Contact->GetDb(),__TFILE__,__LINE__),
-                             wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-                failed = true;
-            }
-        }
-
-        if (!failed)
-        {
-            wxGetApp().Contact->GetDb()->CommitTrans();
-            SetMode(mView);  // Sets the dialog mode back to viewing after save is successful
-        }
-        else
-            wxGetApp().Contact->GetDb()->RollbackTrans();
-
-        wxEndBusyCursor();
-    }
-
-    return !failed;
-}  // CeditorDlg::Save()
-
-
-/*
- * Where this program is only showing a single row at a time in the dialog,
- * a special where clause must be built to find just the single row which,
- * in sequence, would follow the currently displayed row.
- */
-bool CeditorDlg::GetNextRec()
-{
-    wxString w;
-
-    if (wxGetApp().Contact->GetDb()->Dbms() != dbmsPOSTGRES &&
-        wxGetApp().Contact->GetDb()->Dbms() != dbmsMY_SQL)
-    {
-        w  = wxT("NAME = (SELECT MIN(NAME) FROM ");
-        w += wxGetApp().Contact->GetTableName();
-        w += wxT(" WHERE NAME > '");
-    }
-    else
-        w = wxT("(NAME > '");
-
-    w += wxGetApp().Contact->Name;
-    w += wxT("'");
-
-    // If a query where string is currently set, append that criteria
-    if (!wxGetApp().Contact->qryWhereStr.empty())
-    {
-        w += wxT(" AND (");
-        w += wxGetApp().Contact->qryWhereStr;
-        w += wxT(")");
-    }
-
-    w += wxT(")");
-    return(GetRec(w));
-
-}  // CeditorDlg::GetNextRec()
-
-
-/*
- * Where this program is only showing a single row at a time in the dialog,
- * a special where clause must be built to find just the single row which,
- * in sequence, would precede the currently displayed row.
- */
-bool CeditorDlg::GetPrevRec()
-{
-    wxString w;
-
-    if (wxGetApp().Contact->GetDb()->Dbms() != dbmsPOSTGRES &&
-        wxGetApp().Contact->GetDb()->Dbms() != dbmsMY_SQL)
-    {
-        w  = wxT("NAME = (SELECT MAX(NAME) FROM ");
-        w += wxGetApp().Contact->GetTableName();
-        w += wxT(" WHERE NAME < '");
-    }
-    else
-        w = wxT("(NAME < '");
-
-    w += wxGetApp().Contact->Name;
-    w += wxT("'");
-
-    // If a query where string is currently set, append that criteria
-    if (!wxGetApp().Contact->qryWhereStr.empty())
-    {
-        w += wxT(" AND (");
-        w += wxGetApp().Contact->qryWhereStr;
-        w += wxT(")");
-    }
-
-    w += wxT(")");
-
-    return(GetRec(w));
-
-}  // CeditorDlg::GetPrevRec()
-
-
-/*
- * This function is here to avoid duplicating this same code in both the
- * GetPrevRec() and GetNextRec() functions
- */
-bool CeditorDlg::GetRec(const wxString &whereStr)
-{
-    wxGetApp().Contact->SetWhereClause(whereStr);
-    wxGetApp().Contact->SetOrderByClause(wxT("NAME"));
-
-    if (!wxGetApp().Contact->Query())
-    {
-        wxString tStr;
-        tStr = wxT("ODBC error during Query()\n\n");
-        wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),wxGetApp().Contact->GetDb(),__TFILE__,__LINE__),
-                     wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-
-        return(false);
-    }
-
-    if (wxGetApp().Contact->GetNext())
-    {
-        PutData();
-        return(true);
-    }
-    else
-        return(false);
-}  // CeditorDlg::GetRec()
-
-
-
-/*
- * CparameterDlg constructor
- */
-
-BEGIN_EVENT_TABLE(CparameterDlg, wxDialog)
-    EVT_BUTTON(PARAMETER_DIALOG_SAVE,  CparameterDlg::OnButton)
-    EVT_BUTTON(PARAMETER_DIALOG_CANCEL,  CparameterDlg::OnButton)
-    EVT_CLOSE(CparameterDlg::OnCloseWindow)
-END_EVENT_TABLE()
-
-CparameterDlg::CparameterDlg(wxWindow *parent) : wxDialog (parent, PARAMETER_DIALOG, wxT("ODBC parameter settings"), wxDefaultPosition, wxSize(400, 325))
-{
-    // Since the ::OnCommand() function is overridden, this prevents the widget
-    // detection in ::OnCommand() until all widgets have been initialized to prevent
-    // uninitialized pointers from crashing the program
-    widgetPtrsSet = false;
-
-    pParamODBCSourceMsg  = new wxStaticText(this, PARAMETER_DIALOG_SOURCE_MSG,   wxT("ODBC data sources:"),   wxPoint( 10, 10),    wxDefaultSize, 0, wxT("ParamODBCSourceMsg"));
-    pParamODBCSourceList = new wxListBox(this, PARAMETER_DIALOG_SOURCE_LISTBOX,                               wxPoint( 10, 29),    wxSize(285, 150), 0, 0, wxLB_SINGLE|wxLB_ALWAYS_SB, wxDefaultValidator, wxT("ParamODBCSourceList"));
-    pParamUserNameMsg    = new wxStaticText(this, PARAMETER_DIALOG_NAME_MSG,     wxT("Database user name:"),  wxPoint( 10, 193),   wxDefaultSize, 0, wxT("ParamUserNameMsg"));
-    pParamUserNameTxt    = new wxTextCtrl(this, PARAMETER_DIALOG_NAME_TEXT,      wxEmptyString,               wxPoint(10, 209),   wxSize( 140, 25),    0, wxDefaultValidator, wxT("ParamUserNameTxt"));
-    pParamPasswordMsg    = new wxStaticText(this, PARAMETER_DIALOG_PASSWORD_MSG, wxT("Password:"),            wxPoint(156, 193),   wxDefaultSize, 0, wxT("ParamPasswordMsg"));
-    pParamPasswordTxt    = new wxTextCtrl(this, PARAMETER_DIALOG_PASSWORD_TEXT,  wxEmptyString,               wxPoint(156, 209),  wxSize( 140,  25),   0, wxDefaultValidator, wxT("ParamPasswordTxt"));
-    pParamDirPathMsg     = new wxStaticText(this, PARAMETER_DIALOG_DIRPATH_MSG,  wxT("Directory:"),           wxPoint( 10, 243),   wxDefaultSize, 0, wxT("ParamDirPathMsg"));
-    pParamDirPathTxt     = new wxTextCtrl(this, PARAMETER_DIALOG_DIRPATH_TEXT,   wxEmptyString,               wxPoint( 10, 259),   wxSize(140,  25), 0, wxDefaultValidator, wxT("ParamDirPathTxt"));
-    pParamSaveBtn        = new wxButton(this, PARAMETER_DIALOG_SAVE,             wxT("&Save"),                wxPoint(310,  21),   wxSize( 70,  35), 0, wxDefaultValidator, wxT("ParamSaveBtn"));
-    pParamCancelBtn      = new wxButton(this, PARAMETER_DIALOG_CANCEL,           wxT("C&ancel"),              wxPoint(310,  66),   wxSize( 70,  35), 0, wxDefaultValidator, wxT("ParamCancelBtn"));
-
-    // Now that all the widgets on the panel are created, its safe to allow ::OnCommand() to
-    // handle all widget processing
-    widgetPtrsSet = true;
-
-    saved = false;
-    savedParamSettings = wxGetApp().params;
-
-    Centre(wxBOTH);
-    PutData();
-    ShowModal();
-}  // CparameterDlg constructor
-
-
-void CparameterDlg::OnCloseWindow(wxCloseEvent& event)
-{
-    // Put any additional checking necessary to make certain it is alright
-    // to close the program here that is not done elsewhere
-    if (!saved)
-    {
-        bool Ok = (wxMessageBox(wxT("No changes have been saved.\n\nAre you sure you wish exit the parameter screen?"),wxT("Confirm"),wxYES_NO|wxICON_QUESTION) == wxYES);
-
-        if (!Ok)
-        {
-            event.Veto();
-            return;
-        }
-
-        wxGetApp().params = savedParamSettings;
-    }
-
-    if (GetParent() != NULL)
-        GetParent()->SetFocus();
-
-    while (wxIsBusy())
-        wxEndBusyCursor();
-
-    Show(false);
-    SetReturnCode(0);  // added so BoundsChecker would not report use of uninitialized variable
-
-    this->Destroy();
-}  // CparameterDlg::OnCloseWindow()
-
-
-void CparameterDlg::OnButton( wxCommandEvent &event )
-{
-    wxWindow *win = (wxWindow*) event.GetEventObject();
-    OnCommand( *win, event );
-}
-
-
-void CparameterDlg::OnCommand(wxWindow& win, wxCommandEvent& WXUNUSED(event))
-{
-    wxString widgetName;
-
-    widgetName = win.GetName();
-
-    if (!widgetPtrsSet)
-        return;
-
-    if (widgetName == pParamSaveBtn->GetName())
-    {
-        if (Save())
-        {
-            wxString tStr;
-            tStr = wxT("Database parameters have been saved.");
-            if (GetParent() != NULL)  // The parameter dialog was not called during startup due to a missing cfg file
-                tStr += wxT("\nNew parameters will take effect the next time the program is started.");
-            wxMessageBox(tStr,wxT("Notice..."),wxOK | wxICON_INFORMATION);
-            saved = true;
-            Close();
-        }
-        return;
-    }
-
-    if (widgetName == pParamCancelBtn->GetName())
-    {
-        Close();
-        return;
-    }
-}  // CparameterDlg::OnCommand()
-
-
-bool CparameterDlg::PutData()
-{
-    // Fill the data source list box
-    FillDataSourceList();
-
-    // Fill in the fields from the params object
-    if (wxGetApp().params.ODBCSource && wxStrlen(wxGetApp().params.ODBCSource))
-    {
-        int index = pParamODBCSourceList->FindString(wxGetApp().params.ODBCSource);
-        if (index != wxNOT_FOUND)
-            pParamODBCSourceList->SetSelection(index);
-    }
-    pParamUserNameTxt->SetValue(wxGetApp().params.UserName);
-    pParamPasswordTxt->SetValue(wxGetApp().params.Password);
-    pParamDirPathTxt->SetValue(wxGetApp().params.DirPath);
-    return true;
-}  // CparameterDlg::PutData()
-
-
-bool CparameterDlg::GetData()
-{
-    wxString tStr;
-    if (pParamODBCSourceList->GetStringSelection() != wxEmptyString)
-    {
-        tStr = pParamODBCSourceList->GetStringSelection();
-        if (tStr.Length() > ((int)(sizeof(wxGetApp().params.ODBCSource) / sizeof(wxChar))-1))
-        {
-            wxString errmsg;
-            errmsg.Printf(wxT("ODBC Data source name is longer than the data structure to hold it.\n'Cparameter.ODBCSource' must have a larger character array\nto handle a data source with this long of a name\n\nThe data source currently selected is %d characters long."), tStr.Length());
-            wxMessageBox(errmsg, wxT("Internal program error..."), wxOK | wxICON_EXCLAMATION);
-            return false;
-        }
-        wxStrcpy(wxGetApp().params.ODBCSource, tStr);
-    }
-    else
-        return false;
-
-    tStr = pParamUserNameTxt->GetValue();
-    if (tStr.Length() > ((int)(sizeof(wxGetApp().params.UserName) / sizeof(wxChar))-1))
-    {
-        wxString errmsg;
-        errmsg.Printf(wxT("User name is longer than the data structure to hold it.\n'Cparameter.UserName' must have a larger character array\nto handle a data source with this long of a name\n\nThe user name currently specified is %d characters long."), tStr.Length());
-        wxMessageBox(errmsg, wxT("Internal program error..."), wxOK | wxICON_EXCLAMATION);
-        return false;
-    }
-    wxStrcpy(wxGetApp().params.UserName, tStr);
-
-    tStr = pParamPasswordTxt->GetValue();
-    if (tStr.Length() > ((int)(sizeof(wxGetApp().params.Password) / sizeof(wxChar))-1))
-    {
-        wxString errmsg;
-        errmsg.Printf(wxT("Password is longer than the data structure to hold it.\n'Cparameter.Password' must have a larger character array\nto handle a data source with this long of a name\n\nThe password currently specified is %d characters long."), tStr.Length());
-        wxMessageBox(errmsg, wxT("Internal program error..."), wxOK | wxICON_EXCLAMATION);
-        return false;
-    }
-    wxStrcpy(wxGetApp().params.Password,tStr);
-
-    tStr = pParamDirPathTxt->GetValue();
-    tStr.Replace(wxT("\\"),wxT("/"));
-    if (tStr.Length() > ((int)(sizeof(wxGetApp().params.DirPath) / sizeof(wxChar))-1))
-    {
-        wxString errmsg;
-        errmsg.Printf(wxT("DirPath is longer than the data structure to hold it.\n'Cparameter.DirPath' must have a larger character array\nto handle a data source with this long of a name\n\nThe password currently specified is %d characters long."), tStr.Length());
-        wxMessageBox(errmsg, wxT("Internal program error..."), wxOK | wxICON_EXCLAMATION);
-        return false;
-    }
-    wxStrcpy(wxGetApp().params.DirPath,tStr);
-    return true;
-}  // CparameterDlg::GetData()
-
-
-bool CparameterDlg::Save()
-{
-    // Copy the current params in case user cancels changing
-    // the params, so that we can reset them.
-    if (!GetData())
-    {
-        wxGetApp().params = savedParamSettings;
-        return false;
-    }
-
-    wxGetApp().WriteParamFile(wxGetApp().params);
-
-    return true;
-}  // CparameterDlg::Save()
-
-
-void CparameterDlg::FillDataSourceList()
-{
-    wxChar Dsn[SQL_MAX_DSN_LENGTH+1];
-    wxChar DsDesc[254+1];
-    wxSortedArrayString strArr;
-
-    while (wxDbGetDataSource(wxGetApp().DbConnectInf->GetHenv(), Dsn,
-                             SQL_MAX_DSN_LENGTH, DsDesc, 254))
-    {
-        strArr.Add(Dsn);
-    }
-
-    for (size_t i=0; i < strArr.GetCount(); i++)
-    {
-        pParamODBCSourceList->Append(strArr[i].c_str());
-    }
-
-}  // CparameterDlg::FillDataSourceList()
-
-
-BEGIN_EVENT_TABLE(CqueryDlg, wxDialog)
-    EVT_BUTTON(wxID_ANY,  CqueryDlg::OnButton)
-    EVT_CLOSE(CqueryDlg::OnCloseWindow)
-END_EVENT_TABLE()
-
-
-// CqueryDlg() constructor
-CqueryDlg::CqueryDlg(wxWindow *parent, wxDb *pDb, wxChar *tblName[],
-                     const wxString &pWhereArg) :
-    wxDialog (parent, QUERY_DIALOG, wxT("Query"), wxDefaultPosition, wxSize(480, 360))
-{
-    wxBeginBusyCursor();
-
-    colInf = 0;
-    dbTable = 0;
-    masterTableName = tblName[0];
-    widgetPtrsSet = false;
-    pDB = pDb;
-
-    // Initialize the WHERE clause from the string passed in
-    pWhere = pWhereArg;                                           // Save a pointer to the output buffer
-    if (pWhere.Length() > (unsigned int)DB_MAX_WHERE_CLAUSE_LEN)  // Check the length of the buffer passed in
-    {
-        wxString s;
-        s.Printf(wxT("Maximum where clause length exceeded.\nLength must be less than %d"), DB_MAX_WHERE_CLAUSE_LEN+1);
-        wxMessageBox(s,wxT("Error..."),wxOK | wxICON_EXCLAMATION);
-        Close();
-        return;
-    }
-
-    pQueryCol1Msg           = new wxStaticText(this, QUERY_DIALOG_COL_MSG,    wxT("Column 1:"), wxPoint( 10,  10), wxSize( 69,  16), 0, wxT("QueryCol1Msg"));
-    pQueryCol1Choice        = new wxChoice(this, QUERY_DIALOG_COL_CHOICE,                       wxPoint( 10,  27), wxSize(250,  27), 0, 0, 0, wxDefaultValidator, wxT("QueryCol1Choice"));
-    pQueryNotMsg            = new wxStaticText(this, QUERY_DIALOG_NOT_MSG,    wxT("NOT"),       wxPoint(268,  10), wxDefaultSize,    0, wxT("QueryNotMsg"));
-    pQueryNotCheck          = new wxCheckBox(this, QUERY_DIALOG_NOT_CHECKBOX, wxEmptyString,    wxPoint(275,  37), wxSize( 20,  20), 0, wxDefaultValidator, wxT("QueryNotCheck"));
-
-    wxString choice_strings[9];
-    choice_strings[0] = wxT("=");
-    choice_strings[1] = wxT("<");
-    choice_strings[2] = wxT(">");
-    choice_strings[3] = wxT("<=");
-    choice_strings[4] = wxT(">=");
-    choice_strings[5] = wxT("Begins");
-    choice_strings[6] = wxT("Contains");
-    choice_strings[7] = wxT("Like");
-    choice_strings[8] = wxT("Between");
-
-    pQueryOperatorMsg       = new wxStaticText(this, QUERY_DIALOG_OP_MSG,       wxT("Operator:"),         wxPoint(305,  10), wxDefaultSize, 0, wxT("QueryOperatorMsg"));
-    pQueryOperatorChoice    = new wxChoice(this, QUERY_DIALOG_OP_CHOICE,                                  wxPoint(305,  27), wxSize( 80,  27), 9, choice_strings, 0, wxDefaultValidator, wxT("QueryOperatorChoice"));
-    pQueryCol2Msg           = new wxStaticText(this, QUERY_DIALOG_COL2_MSG,     wxT("Column 2:"),         wxPoint( 10,  65), wxSize( 69,  16), 0, wxT("QueryCol2Msg"));
-    pQueryCol2Choice        = new wxChoice(this, QUERY_DIALOG_COL2_CHOICE,                                wxPoint( 10,  82), wxSize(250,  27), 0, 0, 0, wxDefaultValidator, wxT("QueryCol2Choice"));
-    pQuerySqlWhereMsg       = new wxStaticText(this, QUERY_DIALOG_WHERE_MSG,    wxT("SQL where clause:"), wxPoint( 10, 141), wxDefaultSize, 0, wxT("QuerySqlWhereMsg"));
-    pQuerySqlWhereMtxt      = new wxTextCtrl(this, QUERY_DIALOG_WHERE_TEXT,     wxEmptyString,            wxPoint( 10, 159), wxSize(377, 134), wxTE_MULTILINE, wxDefaultValidator, wxT("QuerySqlWhereMtxt"));
-    pQueryAddBtn            = new wxButton(this, QUERY_DIALOG_ADD,              wxT("&Add"),              wxPoint(406,  24), wxSize( 56,  26), 0, wxDefaultValidator, wxT("QueryAddBtn"));
-    pQueryAndBtn            = new wxButton(this, QUERY_DIALOG_AND,              wxT("A&nd"),              wxPoint(406,  58), wxSize( 56,  26), 0, wxDefaultValidator, wxT("QueryAndBtn"));
-    pQueryOrBtn             = new wxButton(this, QUERY_DIALOG_OR,               wxT("&Or"),               wxPoint(406,  92), wxSize( 56,  26), 0, wxDefaultValidator, wxT("QueryOrBtn"));
-    pQueryLParenBtn         = new wxButton(this, QUERY_DIALOG_LPAREN,           wxT("("),                 wxPoint(406, 126), wxSize( 26,  26), 0, wxDefaultValidator, wxT("QueryLParenBtn"));
-    pQueryRParenBtn         = new wxButton(this, QUERY_DIALOG_RPAREN,           wxT(")"),                 wxPoint(436, 126), wxSize( 26,  26), 0, wxDefaultValidator, wxT("QueryRParenBtn"));
-    pQueryDoneBtn           = new wxButton(this, QUERY_DIALOG_DONE,             wxT("&Done"),             wxPoint(406, 185), wxSize( 56,  26), 0, wxDefaultValidator, wxT("QueryDoneBtn"));
-    pQueryClearBtn          = new wxButton(this, QUERY_DIALOG_CLEAR,            wxT("C&lear"),            wxPoint(406, 218), wxSize( 56,  26), 0, wxDefaultValidator, wxT("QueryClearBtn"));
-    pQueryCountBtn          = new wxButton(this, QUERY_DIALOG_COUNT,            wxT("&Count"),            wxPoint(406, 252), wxSize( 56,  26), 0, wxDefaultValidator, wxT("QueryCountBtn"));
-    pQueryValue1Msg         = new wxStaticText(this, QUERY_DIALOG_VALUE1_MSG,   wxT("Value:"),            wxPoint(277,  66), wxDefaultSize, 0, wxT("QueryValue1Msg"));
-    pQueryValue1Txt         = new wxTextCtrl(this, QUERY_DIALOG_VALUE1_TEXT,    wxEmptyString,            wxPoint(277,  83), wxSize(108,  25), 0, wxDefaultValidator, wxT("QueryValue1Txt"));
-    pQueryValue2Msg         = new wxStaticText(this, QUERY_DIALOG_VALUE2_MSG,   wxT("AND"),               wxPoint(238, 126), wxDefaultSize, 0, wxT("QueryValue2Msg"));
-    pQueryValue2Txt         = new wxTextCtrl(this, QUERY_DIALOG_VALUE2_TEXT,    wxEmptyString,            wxPoint(277, 120), wxSize(108,  25), 0, wxDefaultValidator, wxT("QueryValue2Txt"));
-    pQueryHintGrp           = new wxStaticBox(this, QUERY_DIALOG_HINT_GROUP,    wxEmptyString,            wxPoint( 10, 291), wxSize(377,  40), 0, wxT("QueryHintGrp"));
-    pQueryHintMsg           = new wxStaticText(this, QUERY_DIALOG_HINT_MSG,     wxEmptyString,            wxPoint( 16, 306), wxDefaultSize, 0, wxT("QueryHintMsg"));
-
-    widgetPtrsSet = true;
-    // Initialize the dialog
-    wxString qualName;
-    pQueryCol2Choice->Append(wxT("VALUE -->"));
-    colInf = pDB->GetColumns(tblName);
-
-    if (!colInf)
-    {
-        wxEndBusyCursor();
-        wxString tStr;
-        tStr = wxT("ODBC error during GetColumns()\n\n");
-        wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),wxGetApp().Contact->GetDb(),__TFILE__,__LINE__),
-                     wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-        return;
-    }
-
-    int i;
-    for (i = 0; colInf[i].colName && wxStrlen(colInf[i].colName); i++)
-    {
-        // If there is more than one table being queried, qualify
-        // the column names with the table name prefix.
-        if (tblName[1] && wxStrlen(tblName[1]))
-        {
-            qualName.Printf(wxT("%s.%s"), colInf[i].tableName, colInf[i].colName);
-            pQueryCol1Choice->Append(qualName);
-            pQueryCol2Choice->Append(qualName);
-        }
-        else  // Single table query, append just the column names
-        {
-            pQueryCol1Choice->Append(colInf[i].colName);
-            pQueryCol2Choice->Append(colInf[i].colName);
-        }
-    }
-
-    pQueryCol1Choice->SetSelection(0);
-    pQueryCol2Choice->SetSelection(0);
-    pQueryOperatorChoice->SetSelection(0);
-
-    pQueryValue2Msg->Show(false);
-    pQueryValue2Txt->Show(false);
-
-    pQueryHintMsg->SetLabel(langQRY_EQ);
-
-    pQuerySqlWhereMtxt->SetValue(pWhere.c_str());
-
-    wxEndBusyCursor();
-
-    // Display the dialog window
-    Centre(wxBOTH);
-    ShowModal();
-}  // CqueryDlg() constructor
-
-
-CqueryDlg::~CqueryDlg()
-{
-}  // CqueryDlg::~CqueryDlg() destructor
-
-
-void CqueryDlg::OnButton(wxCommandEvent &event)
-{
-  wxWindow *win = (wxWindow*) event.GetEventObject();
-  OnCommand( *win, event );
-}  // CqueryDlg::OnButton()
-
-
-void CqueryDlg::OnCommand(wxWindow& win, wxCommandEvent& WXUNUSED(event))
-{
-    // Widget pointers won't be set when the dialog is constructed.
-    // Control is passed through this function once for each widget on
-    // a dialog as the dialog is constructed.
-    if (!widgetPtrsSet)
-        return;
-
-    wxString widgetName = win.GetName();
-
-    // Operator choice box
-    if (widgetName == pQueryOperatorChoice->GetName())
-    {
-        // Set the help text
-        switch((qryOp) pQueryOperatorChoice->GetSelection())
-        {
-            case qryOpEQ:
-                pQueryHintMsg->SetLabel(langQRY_EQ);
-                break;
-            case qryOpLT:
-                pQueryHintMsg->SetLabel(langQRY_LT);
-                break;
-            case qryOpGT:
-                pQueryHintMsg->SetLabel(langQRY_GT);
-                break;
-            case qryOpLE:
-                pQueryHintMsg->SetLabel(langQRY_LE);
-                break;
-            case qryOpGE:
-                pQueryHintMsg->SetLabel(langQRY_GE);
-                break;
-            case qryOpBEGINS:
-                pQueryHintMsg->SetLabel(langQRY_BEGINS);
-                break;
-            case qryOpCONTAINS:
-                pQueryHintMsg->SetLabel(langQRY_CONTAINS);
-                break;
-            case qryOpLIKE:
-                pQueryHintMsg->SetLabel(langQRY_LIKE);
-                break;
-            case qryOpBETWEEN:
-                pQueryHintMsg->SetLabel(langQRY_BETWEEN);
-                break;
-        }
-
-        // Hide the value2 widget
-        pQueryValue2Msg->Show(false);  // BETWEEN will show this widget
-        pQueryValue2Txt->Show(false);  // BETWEEN will show this widget
-
-        // Disable the NOT operator for <, <=, >, >=
-        switch((qryOp) pQueryOperatorChoice->GetSelection())
-        {
-            case qryOpLT:
-            case qryOpGT:
-            case qryOpLE:
-            case qryOpGE:
-                pQueryNotCheck->SetValue(0);
-                pQueryNotCheck->Enable(false);
-                break;
-            default:
-                pQueryNotCheck->Enable(true);
-                break;
-        }
-
-        // Manipulate the dialog to handle the selected operator
-        switch((qryOp) pQueryOperatorChoice->GetSelection())
-        {
-            case qryOpEQ:
-            case qryOpLT:
-            case qryOpGT:
-            case qryOpLE:
-            case qryOpGE:
-                pQueryCol2Choice->Enable(true);
-                if (pQueryCol2Choice->GetSelection())    // Column name is highlighted
-                {
-                    pQueryValue1Msg->Show(false);
-                    pQueryValue1Txt->Show(false);
-                }
-                else                                                // "Value" is highlighted
-                {
-                    pQueryValue1Msg->Show(true);
-                    pQueryValue1Txt->Show(true);
-                    pQueryValue1Txt->SetFocus();
-                }
-                break;
-            case qryOpBEGINS:
-            case qryOpCONTAINS:
-            case qryOpLIKE:
-                pQueryCol2Choice->SetSelection(0);
-                pQueryCol2Choice->Enable(false);
-                pQueryValue1Msg->Show(true);
-                pQueryValue1Txt->Show(true);
-                pQueryValue1Txt->SetFocus();
-                break;
-            case qryOpBETWEEN:
-                pQueryCol2Choice->SetSelection(0);
-                pQueryCol2Choice->Enable(false);
-                pQueryValue2Msg->Show(true);
-                pQueryValue2Txt->Show(true);
-                pQueryValue1Msg->Show(true);
-                pQueryValue1Txt->Show(true);
-                pQueryValue1Txt->SetFocus();
-                break;
-        }
-
-        return;
-
-    }  // Operator choice box
-
-    // Column 2 choice
-    if (widgetName == pQueryCol2Choice->GetName())
-    {
-        if (pQueryCol2Choice->GetSelection())    // Column name is highlighted
-        {
-            pQueryValue1Msg->Show(false);
-            pQueryValue1Txt->Show(false);
-        }
-        else                                                // "Value" is highlighted
-        {
-            pQueryValue1Msg->Show(true);
-            pQueryValue1Txt->Show(true);
-            pQueryValue1Txt->SetFocus();
-        }
-        return;
-    }  // Column 2 choice
-
-    // Add button
-    if (widgetName == pQueryAddBtn->GetName())
-    {
-        ProcessAddBtn();
-        return;
-    }  // Add button
-
-    // And button
-    if (widgetName == pQueryAndBtn->GetName())
-    {
-        AppendToWhere(wxT(" AND\n"));
-        return;
-    }  // And button
-
-    // Or button
-    if (widgetName == pQueryOrBtn->GetName())
-    {
-        AppendToWhere(wxT(" OR\n"));
-        return;
-    }  // Or button
-
-    // Left Paren button
-    if (widgetName == pQueryLParenBtn->GetName())
-    {
-        AppendToWhere(wxT("("));
-        return;
-    }  // Left Paren button
-
-    // Right paren button
-    if (widgetName == pQueryRParenBtn->GetName())
-    {
-        AppendToWhere(wxT(")"));
-        return;
-    }  // Right Paren button
-
-    // Done button
-    if (widgetName == pQueryDoneBtn->GetName())
-    {
-        // Be sure the where clause will not overflow the output buffer
-        if (wxStrlen(pQuerySqlWhereMtxt->GetValue()) > (unsigned int)DB_MAX_WHERE_CLAUSE_LEN)
-        {
-            wxString s;
-            s.Printf(wxT("Maximum where clause length exceeded.\nLength must be less than %d"), DB_MAX_WHERE_CLAUSE_LEN+1);
-            wxMessageBox(s,wxT("Error..."),wxOK | wxICON_EXCLAMATION);
-            return;
-        }
-        // Validate the where clause for things such as matching parens
-        if (!ValidateWhereClause())
-            return;
-        // Copy the where clause to the output buffer and exit
-        pWhere = pQuerySqlWhereMtxt->GetValue();
-        Close();
-        return;
-    }  // Done button
-
-    // Clear button
-    if (widgetName == pQueryClearBtn->GetName())
-    {
-        bool Ok = (wxMessageBox(wxT("Are you sure you wish to clear the Query?"), wxT("Confirm"), wxYES_NO|wxICON_QUESTION) == wxYES);
-
-        if (Ok)
-            pQuerySqlWhereMtxt->SetValue(wxEmptyString);
-
-        return;
-    }  // Clear button
-
-    // Count button
-    if (widgetName == pQueryCountBtn->GetName())
-    {
-        wxBeginBusyCursor();
-        ProcessCountBtn();
-        wxEndBusyCursor();
-        return;
-    }  // Count button
-
-}  // CqueryDlg::OnCommand
-
-
-void CqueryDlg::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
-    // Clean up
-    wxDELETEA(colInf);
-
-    wxDELETE(dbTable);
-
-    GetParent()->SetFocus();
-    while (wxIsBusy())
-        wxEndBusyCursor();
-
-    Show(false);
-    SetReturnCode(1);  // added so BoundsChecker would not report use of uninitialized variable
-
-    this->Destroy();
-}  // CqueryDlg::OnCloseWindow()
-
-
-void CqueryDlg::AppendToWhere(wxChar *s)
-{
-    wxString whereStr = pQuerySqlWhereMtxt->GetValue();
-    whereStr += s;
-    pQuerySqlWhereMtxt->SetValue(whereStr);
-}  // CqueryDlg::AppendToWhere()
-
-
-void CqueryDlg::ProcessAddBtn()
-{
-    qryOp oper = (qryOp) pQueryOperatorChoice->GetSelection();
-
-    // Verify that eveything is filled in correctly
-    if (pQueryCol2Choice->GetSelection() == 0)            // "Value" is selected
-    {
-        // Verify that value 1 is filled in
-        if (wxStrlen(pQueryValue1Txt->GetValue()) == 0)
-        {
-            wxBell();
-            pQueryValue1Txt->SetFocus();
-            return;
-        }
-        // For the BETWEEN operator, value 2 must be filled in as well
-        if (oper == qryOpBETWEEN &&
-             wxStrlen(pQueryValue2Txt->GetValue()) == 0)
-        {
-            wxBell();
-            pQueryValue2Txt->SetFocus();
-            return;
-        }
-    }
-
-    // Build the expression and append it to the where clause window
-    wxString s = pQueryCol1Choice->GetStringSelection();
-
-    if (pQueryNotCheck->GetValue() && (oper != qryOpEQ))
-        s += wxT(" NOT");
-
-    switch(oper)
-    {
-    case qryOpEQ:
-        if (pQueryNotCheck->GetValue())    // NOT box is checked
-            s += wxT(" <>");
-        else
-            s += wxT(" =");
-        break;
-    case qryOpLT:
-        s += wxT(" <");
-        break;
-    case qryOpGT:
-        s += wxT(" >");
-        break;
-    case qryOpLE:
-        s += wxT(" <=");
-        break;
-    case qryOpGE:
-        s += wxT(" >=");
-        break;
-    case qryOpBEGINS:
-    case qryOpCONTAINS:
-    case qryOpLIKE:
-        s += wxT(" LIKE");
-        break;
-    case qryOpBETWEEN:
-        s += wxT(" BETWEEN");
-        break;
-    }
-
-    s += wxT(" ");
-
-    int col1Idx = pQueryCol1Choice->GetSelection();
-
-    bool quote = false;
-    if (colInf[col1Idx].sqlDataType == SQL_VARCHAR  ||
-        oper == qryOpBEGINS                         ||
-        oper == qryOpCONTAINS                       ||
-        oper == qryOpLIKE)
-        quote = true;
-
-    if (pQueryCol2Choice->GetSelection())    // Column name
-        s += pQueryCol2Choice->GetStringSelection();
-    else  // Column 2 is a "value"
-    {
-        if (quote)
-            s += wxT("'");
-        if (oper == qryOpCONTAINS)
-            s += wxT("%");
-        s += pQueryValue1Txt->GetValue();
-        if (oper == qryOpCONTAINS || oper == qryOpBEGINS)
-            s += wxT("%");
-        if (quote)
-            s += wxT("'");
-    }
-
-    if (oper == qryOpBETWEEN)
-    {
-        s += wxT(" AND ");
-        if (quote)
-            s += wxT("'");
-        s += pQueryValue2Txt->GetValue();
-        if (quote)
-            s += wxT("'");
-    }
-
-    AppendToWhere((wxChar*) (const wxChar*) s);
-
-}  // CqueryDlg::ProcessAddBtn()
-
-
-void CqueryDlg::ProcessCountBtn()
-{
-    if (!ValidateWhereClause())
-        return;
-
-    if (!dbTable)  // wxDbTable object needs to be created and opened
-    {
-        dbTable = new wxDbTable(pDB, masterTableName, 0, (const wxString &)wxEmptyString,
-                                !wxDB_QUERY_ONLY,
-                                wxGetApp().DbConnectInf->GetDefaultDir());
-        if (!dbTable)
-        {
-            wxMessageBox(wxT("Memory allocation failed creating a wxDbTable object."),wxT("Error..."),wxOK | wxICON_EXCLAMATION);
-            return;
-        }
-        if (!dbTable->Open())
-        {
-            wxString tStr;
-            tStr = wxT("ODBC error during Open()\n\n");
-            wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),wxGetApp().Contact->GetDb(),__TFILE__,__LINE__),
-                         wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-            return;
-        }
-    }
-
-    // Count() with WHERE clause
-    wxString whereStr;
-
-    whereStr = pQuerySqlWhereMtxt->GetValue();
-    dbTable->SetWhereClause(whereStr.c_str());
-
-    ULONG whereCnt = dbTable->Count();
-
-    // Count() of all records in the table
-    dbTable->SetWhereClause(wxEmptyString);
-    ULONG totalCnt = dbTable->Count();
-
-    if (whereCnt > 0 || totalCnt == 0)
-    {
-        wxString tStr;
-        tStr.Printf(wxT("%lu of %lu records match the query criteria."),whereCnt,totalCnt);
-        wxMessageBox(tStr,wxT("Notice..."),wxOK | wxICON_INFORMATION);
-    }
-    else
-    {
-        wxString tStr;
-        tStr.Printf(wxT("%lu of %lu records match the query criteria.\n\nEither the criteria entered produced a result set\nwith no records, or there was a syntactical error\nin the clause you entered.\n\nPress the details button to see if any database errors were reported."),whereCnt,totalCnt);
-        wxMessageBox(tStr,wxT("Notice..."),wxOK | wxICON_INFORMATION);
-    }
-
-    // After a wxMessageBox, the focus does not necessarily return to the
-    // window which was the focus when the message box popped up, so return
-    // focus to the Query dialog for certain
-    SetFocus();
-
-}  // CqueryDlg::ProcessCountBtn()
-
-
-bool CqueryDlg::ValidateWhereClause()
-{
-    wxString where = pQuerySqlWhereMtxt->GetValue();
-
-    if (where.Freq(wxT('(')) != where.Freq(wxT(')')))
-    {
-        wxMessageBox(wxT("There are mismatched parenthesis in the constructed where clause"),wxT("Error..."),wxOK | wxICON_EXCLAMATION);
-        return(false);
-    }
-    // After a wxMessageBox, the focus does not necessarily return to the
-    // window which was the focus when the message box popped up, so return
-    // focus to the Query dialog for certain
-    SetFocus();
-
-    return(true);
-
-}  // CqueryDlg::ValidateWhereClause()
-
-#ifdef wxODBC_BLOB_SUPPORT
-
-BEGIN_EVENT_TABLE(CimageDlg, wxDialog)
-    EVT_CLOSE(CimageDlg::OnCloseWindow)
-END_EVENT_TABLE()
-
-CimageDlg::CimageDlg(wxWindow *parent, wxChar *pImageData, off_t iSize)
-: wxDialog(parent, IMAGE_DIALOG, wxT("BLOB Image"), wxDefaultPosition, wxDefaultSize),
-m_pDisplayBmp(NULL),
-m_pBmp(NULL),
-m_pImage(NULL)
-{
-    wxMemoryInputStream inStream(pImageData, iSize);
-
-    if(inStream.IsOk())
-    {
-        m_pImage = new wxImage(inStream, wxBITMAP_TYPE_ANY);
-
-        if(m_pImage->Ok())
-        {
-            m_pBmp = new wxBitmap(*m_pImage);
-            m_pDisplayBmp = new wxStaticBitmap(this, IMAGE_DIALOG_STATIC_BMP, *m_pBmp, wxPoint(5,5), wxDefaultSize);
-
-            SetSize(m_pBmp->GetWidth() + 10, m_pBmp->GetHeight() + 30);
-        }
-    }
-}
-
-CimageDlg::~CimageDlg()
-{
-    if(m_pImage)
-        delete m_pImage;
-
-    if(m_pBmp)
-        delete m_pBmp;
-
-    if(m_pDisplayBmp)
-        delete m_pDisplayBmp;
-}
-
-void CimageDlg::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
-    GetParent()->SetFocus();
-
-    Show(false);
-
-    this->Destroy();
-}
-
-#endif
-
-void DisplayDbDiagnostics(wxDb *pDb)
-{
-    wxString s, t;
-    bool comma;
-
-    s =  wxT("Diagnostics Output\n");
-    s += langDBINF_DB_NAME;
-    s += pDb->dbInf.dbmsName;
-    s += wxT("\n");
-
-    s += langDBINF_DB_VER;
-    s += pDb->dbInf.dbmsVer;
-    s += wxT("\n");
-
-    s += langDBINF_DRIVER_NAME;
-    s += pDb->dbInf.driverName;
-    s += wxT("\n");
-
-    s += langDBINF_DRIVER_ODBC_VER;
-    s += pDb->dbInf.odbcVer;
-    s += wxT("\n");
-
-    s += langDBINF_DRIVER_MGR_ODBC_VER;
-    s += pDb->dbInf.drvMgrOdbcVer;
-    s += wxT("\n");
-
-    s += langDBINF_DRIVER_VER;
-    s += pDb->dbInf.driverVer;
-    s += wxT("\n");
-
-    s += langDBINF_SERVER_NAME;
-    s += pDb->dbInf.serverName;
-    s += wxT("\n");
-
-    s += langDBINF_FILENAME;
-    s += pDb->dbInf.databaseName;
-    s += wxT("\n");
-
-    s += langDBINF_OUTER_JOINS;
-    s += pDb->dbInf.outerJoins;
-    s += wxT("\n");
-
-    s += langDBINF_STORED_PROC;
-    s += pDb->dbInf.procedureSupport;
-    s += wxT("\n");
-
-    if (pDb->dbInf.maxConnections)
-        t.sprintf(wxT("%s%d\n"), langDBINF_MAX_HDBC, pDb->dbInf.maxConnections);
-    else
-        t.sprintf(wxT("%s%s\n"), langDBINF_MAX_HDBC, langDBINF_UNLIMITED);
-    s += t;
-
-    if (pDb->dbInf.maxStmts)
-        t.sprintf(wxT("%s%d\n"), langDBINF_MAX_HSTMT, pDb->dbInf.maxStmts);
-    else
-        t.sprintf(wxT("%s%s\n"), langDBINF_MAX_HSTMT, langDBINF_UNLIMITED);
-    s += t;
-
-    s += langDBINF_API_LVL;
-    switch(pDb->dbInf.apiConfLvl)
-    {
-        case SQL_OAC_NONE:  s += langDBINF_NONE;        break;
-        case SQL_OAC_LEVEL1:    s += langDBINF_LEVEL1;  break;
-        case SQL_OAC_LEVEL2:    s += langDBINF_LEVEL2;  break;
-    }
-    s += wxT("\n");
-
-    s += langDBINF_CLI_LVL;
-    switch(pDb->dbInf.cliConfLvl)
-    {
-        case SQL_OSCC_NOT_COMPLIANT:    s += langDBINF_NOT_COMPLIANT;   break;
-        case SQL_OSCC_COMPLIANT:        s += langDBINF_COMPLIANT;           break;
-    }
-    s += wxT("\n");
-
-    s += langDBINF_SQL_LVL;
-    switch(pDb->dbInf.sqlConfLvl)
-    {
-        case SQL_OSC_MINIMUM:   s += langDBINF_MIN_GRAMMAR; break;
-        case SQL_OSC_CORE:      s += langDBINF_CORE_GRAMMAR;    break;
-        case SQL_OSC_EXTENDED:  s += langDBINF_EXT_GRAMMAR; break;
-    }
-    s += wxT("\n");
-
-    s += langDBINF_COMMIT_BEHAVIOR;
-    switch(pDb->dbInf.cursorCommitBehavior)
-    {
-        case SQL_CB_DELETE:     s += langDBINF_DELETE_CURSORS;  break;
-        case SQL_CB_CLOSE:      s += langDBINF_CLOSE_CURSORS;       break;
-        case SQL_CB_PRESERVE:   s += langDBINF_PRESERVE_CURSORS;    break;
-    }
-    s += wxT("\n");
-
-    s += langDBINF_ROLLBACK_BEHAVIOR;
-    switch(pDb->dbInf.cursorRollbackBehavior)
-    {
-        case SQL_CB_DELETE:     s += langDBINF_DELETE_CURSORS;  break;
-        case SQL_CB_CLOSE:      s += langDBINF_CLOSE_CURSORS;       break;
-        case SQL_CB_PRESERVE:   s += langDBINF_PRESERVE_CURSORS;    break;
-    }
-    s += wxT("\n");
-
-    s += langDBINF_SUPP_NOT_NULL;
-    switch(pDb->dbInf.supportNotNullClause)
-    {
-        case SQL_NNC_NULL:      s += langNO;    break;
-        case SQL_NNC_NON_NULL:  s += langYES;   break;
-    }
-    s += wxT("\n");
-
-    s += langDBINF_SUPP_IEF;
-    s += pDb->dbInf.supportIEF;
-    s += wxT("\n");
-
-    // DEFAULT setting for "Transaction Isolation Level"
-    s += langDBINF_TXN_ISOLATION;
-    switch(pDb->dbInf.txnIsolation)
-    {
-        case SQL_TXN_READ_UNCOMMITTED:  s += langDBINF_READ_UNCOMMITTED;    break;
-        case SQL_TXN_READ_COMMITTED:        s += langDBINF_READ_COMMITTED;  break;
-        case SQL_TXN_REPEATABLE_READ:       s += langDBINF_REPEATABLE_READ; break;
-        case SQL_TXN_SERIALIZABLE:          s += langDBINF_SERIALIZABLE;        break;
-#ifdef ODBC_V20
-        case SQL_TXN_VERSIONING:            s += langDBINF_VERSIONING;          break;
-#endif
-    }
-    s += wxT("\n");
-
-    // CURRENT setting for "Transaction Isolation Level"
-    long txnIsoLvl;
-    s += langDBINF_TXN_ISOLATION_CURR;
-    if (SQLGetConnectOption(pDb->GetHDBC(),SQL_TXN_ISOLATION,&txnIsoLvl) == SQL_SUCCESS)
-    {
-        switch(txnIsoLvl)
-        {
-            case SQL_TXN_READ_UNCOMMITTED:  s += langDBINF_READ_UNCOMMITTED;    break;
-            case SQL_TXN_READ_COMMITTED:        s += langDBINF_READ_COMMITTED;  break;
-            case SQL_TXN_REPEATABLE_READ:       s += langDBINF_REPEATABLE_READ; break;
-            case SQL_TXN_SERIALIZABLE:          s += langDBINF_SERIALIZABLE;        break;
-#ifdef ODBC_V20
-            case SQL_TXN_VERSIONING:            s += langDBINF_VERSIONING;          break;
-#endif
-        }
-    }
-    s += wxT("\n");
-
-#ifdef __VMS__
-#pragma message disable incboodep
-#endif
-    comma = false;
-    s += langDBINF_TXN_ISOLATION_OPTS;
-    if (pDb->dbInf.txnIsolationOptions & SQL_TXN_READ_UNCOMMITTED)
-        {s += langDBINF_READ_UNCOMMITTED; comma++;}
-    if (pDb->dbInf.txnIsolationOptions & SQL_TXN_READ_COMMITTED)
-        {if (comma++) s += wxT(", "); s += langDBINF_READ_COMMITTED;}
-    if (pDb->dbInf.txnIsolationOptions & SQL_TXN_REPEATABLE_READ)
-        {if (comma++) s += wxT(", "); s += langDBINF_REPEATABLE_READ;}
-    if (pDb->dbInf.txnIsolationOptions & SQL_TXN_SERIALIZABLE)
-        {if (comma++) s += wxT(", "); s += langDBINF_SERIALIZABLE;}
-#ifdef ODBC_V20
-    if (pDb->dbInf.txnIsolationOptions & SQL_TXN_VERSIONING)
-        {if (comma++) s += wxT(", "); s += langDBINF_VERSIONING;}
-#endif
-    s += wxT("\n");
-
-    comma = false;
-    s += langDBINF_FETCH_DIRS;
-    if (pDb->dbInf.fetchDirections & SQL_FD_FETCH_NEXT)
-        {s += langDBINF_NEXT; comma++;}
-    if (pDb->dbInf.fetchDirections & SQL_FD_FETCH_PRIOR)
-        {if (comma++) s += wxT(", "); s += langDBINF_PREV;}
-    if (pDb->dbInf.fetchDirections & SQL_FD_FETCH_FIRST)
-        {if (comma++) s += wxT(", "); s += langDBINF_FIRST;}
-    if (pDb->dbInf.fetchDirections & SQL_FD_FETCH_LAST)
-        {if (comma++) s += wxT(", "); s += langDBINF_LAST;}
-    if (pDb->dbInf.fetchDirections & SQL_FD_FETCH_ABSOLUTE)
-        {if (comma++) s += wxT(", "); s += langDBINF_ABSOLUTE;}
-    if (pDb->dbInf.fetchDirections & SQL_FD_FETCH_RELATIVE)
-        {if (comma++) s += wxT(", "); s += langDBINF_RELATIVE;}
-#ifdef ODBC_V20
-    if (pDb->dbInf.fetchDirections & SQL_FD_FETCH_RESUME)
-        {if (comma++) s += wxT(", "); s += langDBINF_RESUME;}
-#endif
-    if (pDb->dbInf.fetchDirections & SQL_FD_FETCH_BOOKMARK)
-        {if (comma++) s += wxT(", "); s += langDBINF_BOOKMARK;}
-    s += wxT("\n");
-
-    comma = false;
-    s += langDBINF_LOCK_TYPES;
-    if (pDb->dbInf.lockTypes & SQL_LCK_NO_CHANGE)
-        {s += langDBINF_NO_CHANGE; comma++;}
-    if (pDb->dbInf.lockTypes & SQL_LCK_EXCLUSIVE)
-        {if (comma++) s += wxT(", "); s += langDBINF_EXCLUSIVE;}
-    if (pDb->dbInf.lockTypes & SQL_LCK_UNLOCK)
-        {if (comma++) s += wxT(", "); s += langDBINF_UNLOCK;}
-    s += wxT("\n");
-
-    comma = false;
-    s += langDBINF_POS_OPERS;
-    if (pDb->dbInf.posOperations & SQL_POS_POSITION)
-        {s += langDBINF_POSITION; comma++;}
-    if (pDb->dbInf.posOperations & SQL_POS_REFRESH)
-        {if (comma++) s += wxT(", "); s += langDBINF_REFRESH;}
-    if (pDb->dbInf.posOperations & SQL_POS_UPDATE)
-        {if (comma++) s += wxT(", "); s += langDBINF_UPD;}
-    if (pDb->dbInf.posOperations & SQL_POS_DELETE)
-        {if (comma++) s += wxT(", "); s += langDBINF_DEL;}
-    if (pDb->dbInf.posOperations & SQL_POS_ADD)
-        {if (comma++) s += wxT(", "); s += langDBINF_ADD;}
-    s += wxT("\n");
-
-    comma = false;
-    s += langDBINF_POS_STMTS;
-    if (pDb->dbInf.posStmts & SQL_PS_POSITIONED_DELETE)
-        {s += langDBINF_POS_DEL; comma++;}
-    if (pDb->dbInf.posStmts & SQL_PS_POSITIONED_UPDATE)
-        {if (comma++) s += wxT(", "); s += langDBINF_POS_UPD;}
-    if (pDb->dbInf.posStmts & SQL_PS_SELECT_FOR_UPDATE)
-        {if (comma++) s += wxT(", "); s += langDBINF_SELECT_FOR_UPD;}
-    s += wxT("\n");
-
-    comma = false;
-    s += langDBINF_SCROLL_CONCURR;
-    if (pDb->dbInf.scrollConcurrency & SQL_SCCO_READ_ONLY)
-        {s += langDBINF_READ_ONLY; comma++;}
-    if (pDb->dbInf.scrollConcurrency & SQL_SCCO_LOCK)
-        {if (comma++) s += wxT(", "); s += langDBINF_LOCK;}
-    if (pDb->dbInf.scrollConcurrency & SQL_SCCO_OPT_ROWVER)
-        {if (comma++) s += wxT(", "); s += langDBINF_OPT_ROWVER;}
-    if (pDb->dbInf.scrollConcurrency & SQL_SCCO_OPT_VALUES)
-        {if (comma++) s += wxT(", "); s += langDBINF_OPT_VALUES;}
-    s += wxT("\n");
-
-    comma = false;
-    s += langDBINF_SCROLL_OPTS;
-    if (pDb->dbInf.scrollOptions & SQL_SO_FORWARD_ONLY)
-        {s += langDBINF_FWD_ONLY; comma++;}
-    if (pDb->dbInf.scrollOptions & SQL_SO_STATIC)
-        {if (comma++) s += wxT(", "); s += langDBINF_STATIC;}
-    if (pDb->dbInf.scrollOptions & SQL_SO_KEYSET_DRIVEN)
-        {if (comma++) s += wxT(", "); s += langDBINF_KEYSET_DRIVEN;}
-    if (pDb->dbInf.scrollOptions & SQL_SO_DYNAMIC)
-        {if (comma++) s += wxT(", "); s += langDBINF_DYNAMIC;}
-    if (pDb->dbInf.scrollOptions & SQL_SO_MIXED)
-        {if (comma++) s += wxT(", "); s += langDBINF_MIXED;}
-    s += wxT("\n");
-
-    comma = false;
-    s += langDBINF_STATIC_SENS;
-    if (pDb->dbInf.staticSensitivity & SQL_SS_ADDITIONS)
-        {s += langDBINF_ADDITIONS; comma++;}
-    if (pDb->dbInf.staticSensitivity & SQL_SS_DELETIONS)
-        {if (comma++) s += wxT(", "); s += langDBINF_DELETIONS;}
-    if (pDb->dbInf.staticSensitivity & SQL_SS_UPDATES)
-        {if (comma++) s += wxT(", "); s += langDBINF_UPDATES;}
-    s += wxT("\n");
-#ifdef __VMS__
-#pragma message enable incboodep
-#endif
-
-
-    s += langDBINF_TXN_CAPABLE;
-    switch(pDb->dbInf.txnCapable)
-    {
-        case SQL_TC_NONE:           s += langNO;                        break;
-        case SQL_TC_DML:            s += langDBINF_DML_ONLY;        break;
-        case SQL_TC_DDL_COMMIT:     s += langDBINF_DDL_COMMIT;      break;
-        case SQL_TC_DDL_IGNORE:     s += langDBINF_DDL_IGNORE;      break;
-        case SQL_TC_ALL:            s += langDBINF_DDL_AND_DML; break;
-    }
-    s += wxT("\n");
-
-    t.sprintf(wxT("%s%lu\n"), langDBINF_LOGIN_TIMEOUT, pDb->dbInf.loginTimeout);
-    s += t;
-
-    // Oracle specific information
-    if (pDb->Dbms() == dbmsORACLE)
-    {
-        s += wxT("\n");
-        s += langDBINF_ORACLE_BANNER;
-        s += wxT("\n");
-
-        // Oracle cache hit ratio
-        SDWORD cb;
-        ULONG dbBlockGets;
-        pDb->ExecSql(wxT("SELECT VALUE FROM V$SYSSTAT WHERE NAME = 'db block gets'"));
-        pDb->GetNext();
-        if (pDb->GetData(1, SQL_C_ULONG, &dbBlockGets, 0, &cb))
-        {
-            t.sprintf(wxT("%s: %lu\n"), langDBINF_DB_BLOCK_GETS, dbBlockGets);
-            s += t;
-        }
-
-        ULONG consistentGets;
-        pDb->ExecSql(wxT("SELECT VALUE FROM V$SYSSTAT WHERE NAME = 'consistent gets'"));
-        pDb->GetNext();
-        if (pDb->GetData(1, SQL_C_ULONG, &consistentGets, 0, &cb))
-        {
-            t.sprintf(wxT("%s: %lu\n"), langDBINF_CONSISTENT_GETS, consistentGets);
-            s += t;
-        }
-
-        ULONG physReads;
-        pDb->ExecSql(wxT("SELECT VALUE FROM V$SYSSTAT WHERE NAME = 'physical reads'"));
-        pDb->GetNext();
-        if (pDb->GetData(1, SQL_C_ULONG, &physReads, 0, &cb))
-        {
-            t.sprintf(wxT("%s: %lu\n"), langDBINF_PHYSICAL_READS, physReads);
-            s += t;
-        }
-
-        ULONG hitRatio = (ULONG)((1.00 - ((float)physReads / (float)(dbBlockGets + consistentGets))) * 100.00);
-        t.sprintf(wxT("*** %s: %lu%%\n"), langDBINF_CACHE_HIT_RATIO, hitRatio);
-        s += t;
-
-        // Tablespace information
-        s += wxT("\n");
-        s += langDBINF_TABLESPACE_IO;
-        s += wxT("\n");
-        ULONG physWrites;
-        char tablespaceName[256+1];
-        pDb->ExecSql(wxT("SELECT NAME,PHYRDS,PHYWRTS FROM V$DATAFILE, V$FILESTAT WHERE V$DATAFILE.FILE# = V$FILESTAT.FILE#"));
-        while (pDb->GetNext())
-        {
-            pDb->GetData(1, SQL_C_WXCHAR, tablespaceName, 256, &cb);
-            pDb->GetData(2, SQL_C_ULONG, &physReads,      0,   &cb);
-            pDb->GetData(3, SQL_C_ULONG, &physWrites,     0,   &cb);
-            t.sprintf(wxT("%s\n\t%s: %lu\t%s: %lu\n"), tablespaceName,
-                langDBINF_PHYSICAL_READS, physReads, langDBINF_PHYSICAL_WRITES, physWrites);
-            s += t;
-        }
-
-        s += wxT("\n");
-    }
-
-    s += wxT("End of Diagnostics\n");
-    wxLogMessage(s);
-
-}  // DisplayDbDiagnostics()
-
-#if wxUSE_GRID
-
-BEGIN_EVENT_TABLE(DbGridFrame, wxFrame)
- //   EVT_CLOSE(DbGridFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-
-DbGridFrame::DbGridFrame(wxWindow *parent)
-    : wxFrame (parent, wxID_ANY, wxT("Database Table"),
-               wxDefaultPosition, wxSize(400, 325))
-{
-    initialized = false;
-}
-
-
-void DbGridFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
-    this->Destroy();
-}
-
-
-bool DbGridFrame::Initialize()
-{
-    wxGrid *grid = new wxGrid(this, wxID_ANY, wxDefaultPosition);
-
-    grid->RegisterDataType(wxGRID_VALUE_DATETIME,
-                             new wxGridCellDateTimeRenderer(wxT("%d %b %Y")),
-                             new wxGridCellTextEditor);
-#ifdef CHOICEINT
-    grid->RegisterDataType(wxGRID_VALUE_CHOICEINT,
-                             new wxGridCellEnumRenderer,
-                             new wxGridCellEnumEditor);
-
-    wxString NativeLangChoice( wxString::Format(wxT("%s:%s,%s,%s,%s,%s"),wxGRID_VALUE_CHOICEINT,
-                            wxT("English"),
-                            wxT("French"),
-                            wxT("German"),
-                            wxT("Spanish"),
-                            wxT("Other") ));
-#endif
-
-    // Columns must match the sequence specified in SetColDef() calls
-    wxDbGridColInfo* cols =
-        new wxDbGridColInfo( 0,wxGRID_VALUE_STRING,wxT("Name"),
-        new wxDbGridColInfo( 1,wxGRID_VALUE_STRING,wxT("Address 1"),
-        new wxDbGridColInfo( 2,wxGRID_VALUE_STRING,wxT("Address 2"),
-        new wxDbGridColInfo( 3,wxGRID_VALUE_STRING,wxT("City"),
-        new wxDbGridColInfo( 4,wxGRID_VALUE_STRING,wxT("State"),
-        new wxDbGridColInfo( 5,wxGRID_VALUE_STRING,wxT("PostCode"),
-        new wxDbGridColInfo( 6,wxGRID_VALUE_STRING,wxT("Country"),
-        new wxDbGridColInfo( 7,wxGRID_VALUE_DBAUTO,wxT("Join Date"),
-        new wxDbGridColInfo( 8,wxGRID_VALUE_BOOL,  wxT("Developer"),
-        new wxDbGridColInfo( 9,wxGRID_VALUE_NUMBER,wxT("Contributions"),
-        new wxDbGridColInfo(10,wxGRID_VALUE_NUMBER,wxT("Lines Of Code"),
-#ifdef CHOICEINT
-        new wxDbGridColInfo(11,NativeLangChoice,   wxT("Native Language"),NULL))))))))))));
-#else
-        new wxDbGridColInfo(11,wxGRID_VALUE_NUMBER,wxT("Native Language"),NULL))))))))))));
-#endif
-
-    Ccontact *Contact = new Ccontact();
-    //wxGetApp().Contact
-
-    if (!Contact)
-    {
-        wxMessageBox(wxT("Unable to instantiate an instance of Ccontact"), wxT("Error..."), wxOK | wxICON_EXCLAMATION);
-        return false;
-    }
-
-    if (!Contact->Open())
-    {
-        if (Contact->GetDb()->TableExists(CONTACT_TABLE_NAME, Contact->GetDb()->GetUsername(),
-                                          wxGetApp().DbConnectInf->GetDefaultDir()))
-        {
-            wxString tStr;
-            tStr.Printf(wxT("Unable to open the table '%s'.\n\n"),CONTACT_TABLE_NAME.c_str());
-            wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),wxGetApp().Contact->GetDb(),__TFILE__,__LINE__),
-                         wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-        }
-
-        return false;
-    }
-
-    // Execute the following query using the cursor designated
-    // for full table query
-    Contact->SetRowMode(wxDbTable::WX_ROW_MODE_QUERY);
-
-    if (!Contact->Query())
-    {
-        wxString tStr;
-        tStr = wxT("ODBC error during Query()\n\n");
-        wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),wxGetApp().Contact->GetDb(),__TFILE__,__LINE__),
-                     wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-        return false;
-    }
-
-    // No data has been read in from the database yet, so
-    // we need to initialize the data members to valid values
-    // so Fit() can correctly size the grid
-    Contact->Initialize();
-
-    wxDbGridTableBase* db = new wxDbGridTableBase(Contact, cols, wxUSE_QUERY, true);
-
-    delete cols;
-
-    grid->SetTable(db,true);
-    grid->SetMargins(0, 0);
-
-    grid->Fit();
-    wxSize size = grid->GetSize();
-    size.x += 10;
-    size.y += 10;
-    SetClientSize(size);
-    initialized = true;
-    return true;
-}  // DbGridFrame::Initialize()
-
-#endif // #if wxUSE_GRID
-
-/*
-    TEST CODE FOR TESTING THE wxDbCreateDataSource() FUNCTION
-
-        int result = 0;
-        result = wxDbCreateDataSource(wxT("Microsoft Access Driver (*.mdb)"), wxT("GLT-TEST2"), wxT("GLT-Descrip"), false, wxEmptyString, this);
-        if (!result)
-        {
-            // check for errors caused by ConfigDSN based functions
-            DWORD retcode = 0;
-            WORD cb;
-            wxChar errMsg[500+1];
-            errMsg[0] = wxT('\0');
-
-            SQLInstallerError(1, &retcode, errMsg, 500, &cb);
-
-            wxMessageBox(wxT("FAILED creating data source"), wxT("FAILED"));
-        }
-        else
-            wxMessageBox(wxT("SUCCEEDED creating data source"), wxT("SUCCESS"));
-*/
-
-
diff --git a/samples/db/dbtest.h b/samples/db/dbtest.h
deleted file mode 100644 (file)
index 9d710d0..0000000
+++ /dev/null
@@ -1,696 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        dbtest.h
-// Purpose:     wxWidgets database demo app
-// Author:      George Tasker
-// Modified by:
-// Created:     1998
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Remstar International, Inc.
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#include "wx/string.h"
-#include "wx/dbtable.h"
-
-enum    DialogModes {mView,mCreate,mEdit,mSearch};
-
-// ID for the menu quit command
-#define FILE_CREATE_ID        100
-#define FILE_RECREATE_TABLE   110
-#define FILE_RECREATE_INDEXES 120
-
-#if wxUSE_GRID
-#define FILE_DBGRID_TABLE     130
-#endif
-#define FILE_EXIT             wxID_EXIT
-#define EDIT_PARAMETERS       200
-#define HELP_ABOUT            wxID_ABOUT
-
-// this seems to be missing, Robert Roebling (?)
-#ifndef MAX_PATH
-    #if defined(__WXMAC__)
-        #define MAX_PATH   260 /* max. length of full pathname */
-    #else  /* _MAC */
-        #define MAX_PATH   256 /* max. length of full pathname */
-    #endif
-#endif
-
-// Name of the table to be created/opened
-const wxString     CONTACT_TABLE_NAME       = wxT("CONTACTS");
-
-#define wxODBC_BLOB_SUPPORT
-
-
-// Number of columns in the CONTACT table
-#ifdef wxODBC_BLOB_SUPPORT
-    const int        CONTACT_NO_COLS        = 14;        // 0-13
-    const int        MAX_PICTURE_SIZE       = 128000;    // in bytes
-#else
-    const int        CONTACT_NO_COLS        = 12;        // 0-11
-#endif
-
-const wxString       PARAM_FILENAME         = wxT("dbtest.cfg");
-
-enum Language {langENGLISH, langFRENCH, langGERMAN, langSPANISH, langOTHER};
-
-// Forward class declarations
-class CeditorDlg;
-class CparameterDlg;
-
-
-// Used for displaying many of the database capabilites
-// and usage statistics on a database connection
-void DisplayDbDiagnostics(wxDb *pDb);
-
-
-//
-// This class contains the actual data members that are used for transferring
-// data back and forth from the database to the program.
-//
-// NOTE: The object described in this class is just for example purposes, and has no
-// real meaning other than to show each type of field being used by the database
-//
-class CstructContact : public wxObject
-{
-    public:
-        wxChar             Name[50+1];          //    Contact's name
-        wxChar             Addr1[50+1];
-        wxChar             Addr2[50+1];
-        wxChar             City[25+1];
-        wxChar             State[25+1];
-        wxChar             PostalCode[15+1];
-        wxChar             Country[20+1];
-        TIMESTAMP_STRUCT   JoinDate;            // Date on which this person joined the wxWidgets project
-        Language           NativeLanguage;      // Enumerated type indicating person's native language
-        ULONG              BlobSize;
-        wxChar             Picture[MAX_PICTURE_SIZE];
-        bool               IsDeveloper;         // Is this person a developer for wxWidgets, or just a subscriber
-        UCHAR              Contributions;       // Something to show off an integer field
-        ULONG              LinesOfCode;         // Something to show off a 'long' field
-};  // CstructContact
-
-
-//
-// The Ccontact class derives from wxDbTable, so we have access to all
-// of the database table functions and the local memory variables that
-// the database classes will store the data into (and read the data from)
-// all combined in this one class.
-//
-class Ccontact : public wxDbTable, public CstructContact
-{
-    private:
-        // Used to keep track of whether this class had a wxDb instance
-        // passed in to it or not.  If an existing wxDb instance was not
-        // passed in at Ccontact creation time, then when the Ccontact
-        // instance is deleted, the connection will be freed as Ccontact
-        // created its own connection when it was created.
-        bool                 freeDbConn;
-
-        // Calls wxDbTable::SetColDefs() once for each column that is
-        // to be associated with some member variable for use with
-        // this database object.
-        void                 SetupColumns();
-
-    public:
-        // Used in places where we need to construct a WHERE clause to
-        // be passed to the SetWhereClause() function.  From example,
-        // where building the WHERE clause requires using ::Printf()
-        // to build the string.
-        wxString             whereStr;
-
-        // WHERE string returned from the query dialog
-        wxString             qryWhereStr;
-
-        Ccontact(wxDb *pwxDb=NULL);
-        ~Ccontact();
-
-        void                 Initialize();
-
-        // Contains all the index definitions and calls to wxDbTable::CreateIndex()
-        // required to create all the indexes we wish to define for this table.
-        bool                 CreateIndexes(bool recreate);
-
-        // Since we do not wish to have duplicate code blocks all over our program
-        // for a common query/fetch that we will need to do in many places, we
-        // include this member function that does it all for us in one place.
-        bool                 FetchByName(const wxString &name);
-
-};  // Ccontact class definition
-
-
-typedef struct Cparameters
-{
-    wxChar    ODBCSource[SQL_MAX_DSN_LENGTH+1];
-    wxChar    UserName[SQL_MAX_USER_NAME_LEN+1];
-    wxChar    Password[SQL_MAX_AUTHSTR_LEN+1];
-    wxChar    DirPath[MAX_PATH+1];
-} Cparameters;
-
-
-// Define a new frame type
-class DatabaseDemoFrame: public wxFrame
-{
-    private:
-        CeditorDlg      *pEditorDlg;
-        CparameterDlg   *pParamDlg;
-
-    public:
-        DatabaseDemoFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& sz);
-        ~DatabaseDemoFrame();
-
-        void    OnCloseWindow(wxCloseEvent& event);
-        void    OnCreate(wxCommandEvent& event);
-        void    OnRecreateTable(wxCommandEvent& event);
-        void    OnRecreateIndexes(wxCommandEvent& event);
-        void    OnExit(wxCommandEvent& event);
-        void    OnEditParameters(wxCommandEvent& event);
-        void    OnAbout(wxCommandEvent& event);
-#if wxUSE_GRID
-        void    OnDbGridTable( wxCommandEvent& );
-#endif
-        void    CreateDataTable(bool recreate);
-        void    BuildEditorDialog();
-        void    BuildParameterDialog(wxWindow *parent);
-
-DECLARE_EVENT_TABLE()
-};  // DatabaseDemoFrame
-
-
-#if wxUSE_GRID
-
-// *************************** DBGridFrame ***************************
-
-class DbGridFrame : public wxFrame
-{
-public:
-    bool     initialized;
-
-    DbGridFrame(wxWindow *parent);
-
-    void     OnCloseWindow(wxCloseEvent& event);
-    bool     Initialize();
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
-
-// Define a new application type
-class DatabaseDemoApp: public wxApp
-{
-    public:
-        // These are the parameters that are stored in the "PARAM_FILENAME" file
-        // that are read in at startup of the program that indicate the connection
-        // parameters to be used for connecting to the ODBC data source.
-        Cparameters      params;
-
-        // Pointer to the main frame used by the App
-        DatabaseDemoFrame *DemoFrame;
-
-        // Pointer to the main database connection used in the program.  This
-        // pointer would normally be used for doing things as database lookups
-        // for user login names and passwords, getting workstation settings, etc.
-        //
-        // ---> IMPORTANT <---
-        //
-        // For each database object created which uses this wxDb pointer
-        // connection to the database, when a CommitTrans() or RollBackTrans()
-        // will commit or rollback EVERY object which uses this wxDb pointer.
-        //
-        // To allow each table object (those derived from wxDbTable) to be
-        // individually committed or rolled back, you MUST use a different
-        // instance of wxDb in the constructor of the table.  Doing so creates
-        // more overhead, and will use more database connections (some DBs have
-        // connection limits...), so use connections sparringly.
-        //
-        // It is recommended that one "main" database connection be created for
-        // the entire program to use for READ-ONLY database accesses, but for each
-        // table object which will do a CommitTrans() or RollbackTrans() that a
-        // new wxDb object be created and used for it.
-        wxDb            *READONLY_DB;
-
-        // Contains the ODBC connection information used by
-        // all database connections
-        wxDbConnectInf  *DbConnectInf;
-
-        bool             OnInit();
-
-        // Read/Write ODBC connection parameters to the "PARAM_FILENAME" file
-        bool             ReadParamFile(Cparameters &params);
-        bool             WriteParamFile(Cparameters &params);
-
-        void             CreateDataTable(bool recreate);
-
-        // Pointer to the wxDbTable instance that is used to manipulate
-        // the data in memory and in the database
-        Ccontact        *Contact;
-
-};  // DatabaseDemoApp
-
-
-DECLARE_APP(DatabaseDemoApp)
-
-
-// *************************** CeditorDlg ***************************
-
-class CeditorDlg : public wxPanel
-{
-    private:
-        // Used to indicate whether all of the widget pointers (defined
-        // below) have been initialized to point to the memory for
-        // the named widget.  Used as a safeguard from using the widget
-        // before it has been initialized.
-        bool             widgetPtrsSet;
-
-        // Used when the EDIT button has been pressed to maintain the
-        // original name that was displayed in the editor before the
-        // EDIT button was pressed, so that if CANCEL is pressed, a
-        // FetchByName() can be done to retrieve the original data
-        // to repopulate the dialog.
-        wxString         saveName;
-
-        // Pointers to all widgets on the dialog
-        wxButton        *pCreateBtn,  *pEditBtn,      *pDeleteBtn,  *pCopyBtn,  *pSaveBtn,  *pCancelBtn;
-        wxButton        *pPrevBtn,    *pNextBtn,      *pQueryBtn,   *pResetBtn, *pDoneBtn,  *pHelpBtn;
-        wxButton        *pNameListBtn;
-        wxButton        *pCatalogBtn, *pDataTypesBtn, *pDbDiagsBtn;
-        wxTextCtrl      *pNameTxt,    *pAddress1Txt,  *pAddress2Txt,*pCityTxt,  *pStateTxt, *pCountryTxt,*pPostalCodeTxt;
-        wxStaticText    *pNameMsg,    *pAddress1Msg,  *pAddress2Msg,*pCityMsg,  *pStateMsg, *pCountryMsg,*pPostalCodeMsg;
-        wxTextCtrl      *pJoinDateTxt,*pContribTxt,   *pLinesTxt;
-        wxStaticText    *pJoinDateMsg,*pContribMsg,   *pLinesMsg;
-        wxRadioBox      *pDeveloperRadio;
-        wxChoice        *pNativeLangChoice;
-        wxStaticText    *pNativeLangMsg;
-#ifdef wxODBC_BLOB_SUPPORT
-        wxStaticText    *pPictureMsg, *pPictSizeMsg;
-        wxButton        *pChooseImageBtn, *pShowImageBtn;
-        wxTextCtrl      *pPictSizeTxt;
-#endif
-
-    public:
-        // Indicates if the editor dialog has been initialized yet (used to
-        // help trap if the Initialize() function failed to load all required
-        // resources or not.
-        bool             initialized;
-
-        enum DialogModes mode;
-
-        CeditorDlg(wxWindow *parent);
-
-        void    OnCloseWindow(wxCloseEvent& event);
-        void    OnButton( wxCommandEvent &event );
-        void    OnCommand(wxWindow& win, wxCommandEvent& event);
-        void    OnActivate(bool) {};  // necessary for hot keys
-
-        bool    Initialize();
-
-#ifdef wxODBC_BLOB_SUPPORT
-        // Methods for reading image file into current table, and
-        // also displaying the image.
-        void    OnSelectPict();
-        void    OnShowImage();
-#endif
-
-        // Sets wxStaticText fields to be editable or not depending
-        // on the current value of 'mode'
-        void    FieldsEditable();
-
-        // Sets the editor mode, determining what state widgets
-        // on the dialog are to be in based on the operation
-        // being performed.
-        void    SetMode(enum DialogModes m);
-
-        // Update/Retrieve data from the widgets on the dialog
-        bool    PutData();
-        bool    GetData();
-
-        // Inserts/updates the database with the current data
-        // retrieved from the editor dialog
-        bool    Save();
-
-        // Database functions for changing the data that is to
-        // be displayed on the dialog.  GetNextRec()/GetPrevRec()
-        // provide database independent methods that do not require
-        // backward scrolling cursors to obtain the record that
-        // is prior to the current record in the search sequence.
-        bool    GetNextRec();
-        bool    GetPrevRec();
-        bool    GetRec(const wxString &whereStr);
-
-DECLARE_EVENT_TABLE()
-};  // CeditorDlg
-
-#define EDITOR_DIALOG                   199
-
-// Editor dialog control ids
-#define EDITOR_DIALOG_FN_GROUP          200
-#define EDITOR_DIALOG_SEARCH_GROUP      201
-#define EDITOR_DIALOG_CREATE            202
-#define EDITOR_DIALOG_EDIT              203
-#define EDITOR_DIALOG_DELETE            204
-#define EDITOR_DIALOG_COPY              205
-#define EDITOR_DIALOG_SAVE              206
-#define EDITOR_DIALOG_CANCEL            207
-#define EDITOR_DIALOG_PREV              208
-#define EDITOR_DIALOG_NEXT              209
-#define EDITOR_DIALOG_QUERY             211
-#define EDITOR_DIALOG_RESET             212
-#define EDITOR_DIALOG_NAME_MSG          213
-#define EDITOR_DIALOG_NAME_TEXT         214
-#define EDITOR_DIALOG_LOOKUP            215
-#define EDITOR_DIALOG_ADDRESS1_MSG      216
-#define EDITOR_DIALOG_ADDRESS1_TEXT     217
-#define EDITOR_DIALOG_ADDRESS2_MSG      218
-#define EDITOR_DIALOG_ADDRESS2_TEXT     219
-#define EDITOR_DIALOG_CITY_MSG          220
-#define EDITOR_DIALOG_CITY_TEXT         221
-#define EDITOR_DIALOG_COUNTRY_MSG       222
-#define EDITOR_DIALOG_COUNTRY_TEXT      223
-#define EDITOR_DIALOG_POSTAL_MSG        224
-#define EDITOR_DIALOG_POSTAL_TEXT       225
-#define EDITOR_DIALOG_LANG_MSG          226
-#define EDITOR_DIALOG_LANG_CHOICE       227
-#define EDITOR_DIALOG_DATE_MSG          228
-#define EDITOR_DIALOG_DATE_TEXT         229
-#define EDITOR_DIALOG_CONTRIB_MSG       230
-#define EDITOR_DIALOG_CONTRIB_TEXT      231
-#define EDITOR_DIALOG_LINES_MSG         232
-#define EDITOR_DIALOG_LINES_TEXT        233
-#define EDITOR_DIALOG_STATE_MSG         234
-#define EDITOR_DIALOG_STATE_TEXT        235
-#define EDITOR_DIALOG_DEVELOPER         236
-#define EDITOR_DIALOG_JOIN_MSG          237
-#define EDITOR_DIALOG_JOIN_TEXT         238
-#define EDITOR_DIALOG_CATALOG           240
-#define EDITOR_DIALOG_DATATYPES         250
-#define EDITOR_DIALOG_DB_DIAGS          260
-#ifdef wxODBC_BLOB_SUPPORT
-       #define EDITOR_DIALOG_PIC_MSG           270
-       #define EDITOR_DIALOG_PICSIZE_MSG       271
-       #define EDITOR_DIALOG_PIC_BROWSE        272
-       #define EDITOR_DIALOG_PIC_SHOW          273
-       #define EDITOR_DIALOG_PIC_SIZE_TEXT     274
-#endif
-
-// *************************** CparameterDlg ***************************
-
-class CparameterDlg : public wxDialog
-{
-    private:
-        // Used to indicate whether all of the widget pointers (defined
-        // below) have been initialized to point to the memory for
-        // the named widget.  Used as a safeguard from using the widget
-        // before it has been initialized.
-        bool                 widgetPtrsSet;
-
-        enum DialogModes     mode;
-
-        // Have the parameters been saved yet, or do they
-        // need to be saved to update the params on disk
-        bool                 saved;
-
-        // Original params
-        Cparameters          savedParamSettings;
-
-        // Pointers to all widgets on the dialog
-        wxStaticText        *pParamODBCSourceMsg;
-        wxListBox           *pParamODBCSourceList;
-        wxStaticText        *pParamUserNameMsg,        *pParamPasswordMsg,    *pParamDirPathMsg;
-        wxTextCtrl          *pParamUserNameTxt,        *pParamPasswordTxt,    *pParamDirPathTxt;
-        wxButton            *pParamSaveBtn,            *pParamCancelBtn;
-
-    public:
-        CparameterDlg(wxWindow *parent);
-
-        void    OnCloseWindow(wxCloseEvent& event);
-        void    OnButton( wxCommandEvent &event );
-        void    OnCommand(wxWindow& win, wxCommandEvent& event);
-        void    OnActivate(bool) {};  // necessary for hot keys
-
-        // Update/Retrieve data from the widgets on the dialog
-        bool    PutData();
-        bool    GetData();
-
-        // Stores the defined parameter for connecting to the selected ODBC
-        // data source to the config file name in "PARAM_FILENAME"
-        bool    Save();
-
-        // Populates the 'pParamODBCSourceList' listbox with the names of all
-        // ODBC datasource defined for use at the current workstation
-        void    FillDataSourceList();
-
-DECLARE_EVENT_TABLE()
-};  // CparameterDlg
-
-#define PARAMETER_DIALOG                    400
-
-// Parameter dialog control ids
-#define PARAMETER_DIALOG_SOURCE_MSG         401
-#define PARAMETER_DIALOG_SOURCE_LISTBOX     402
-#define PARAMETER_DIALOG_NAME_MSG           403
-#define PARAMETER_DIALOG_NAME_TEXT          404
-#define PARAMETER_DIALOG_PASSWORD_MSG       405
-#define PARAMETER_DIALOG_PASSWORD_TEXT      406
-#define PARAMETER_DIALOG_DIRPATH_MSG        407
-#define PARAMETER_DIALOG_DIRPATH_TEXT       408
-#define PARAMETER_DIALOG_SAVE               409
-#define PARAMETER_DIALOG_CANCEL             410
-
-// *************************** CqueryDlg ***************************
-
-
-// QUERY DIALOG
-enum qryOp
-{
-    qryOpEQ,
-    qryOpLT,
-    qryOpGT,
-    qryOpLE,
-    qryOpGE,
-    qryOpBEGINS,
-    qryOpCONTAINS,
-    qryOpLIKE,
-    qryOpBETWEEN
-};
-
-
-// Query strings
-wxString const & langQRY_EQ           = wxT("column = column | value");
-const wxString & langQRY_LT           = wxT("column < column | value");
-const wxString & langQRY_GT           = wxT("column > column | value");
-const wxString & langQRY_LE           = wxT("column <= column | value");
-const wxString & langQRY_GE           = wxT("column >= column | value");
-const wxString & langQRY_BEGINS       = wxT("columns that BEGIN with the string entered");
-const wxString & langQRY_CONTAINS     = wxT("columns that CONTAIN the string entered");
-const wxString & langQRY_LIKE         = wxT("% matches 0 or more of any char; _ matches 1 char");
-const wxString & langQRY_BETWEEN      = wxT("column BETWEEN value AND value");
-
-
-class CqueryDlg : public wxDialog
-{
-    private:
-        wxDbColInf  *colInf;            // Column inf. returned by db->GetColumns()
-        wxDbTable   *dbTable;           // generic wxDbTable object for attaching to the table to query
-        wxChar      *masterTableName;   // Name of the table that 'dbTable' will be associated with
-        wxString     pWhere;            // A pointer to the storage for the resulting where clause
-        wxDb        *pDB;
-
-    public:
-        // Used to indicate whether all of the widget pointers (defined
-        // below) have been initialized to point to the memory for
-        // the named widget.  Used as a safeguard from using the widget
-        // before it has been initialized.
-        bool                     widgetPtrsSet;
-
-        // Widget pointers
-        wxStaticText            *pQueryCol1Msg;
-        wxChoice                *pQueryCol1Choice;
-        wxStaticText            *pQueryNotMsg;
-        wxCheckBox              *pQueryNotCheck;
-        wxStaticText            *pQueryOperatorMsg;
-        wxChoice                *pQueryOperatorChoice;
-        wxStaticText            *pQueryCol2Msg;
-        wxChoice                *pQueryCol2Choice;
-        wxStaticText            *pQueryValue1Msg;
-        wxTextCtrl              *pQueryValue1Txt;
-        wxStaticText            *pQueryValue2Msg;
-        wxTextCtrl              *pQueryValue2Txt;
-        wxStaticText            *pQuerySqlWhereMsg;
-        wxTextCtrl              *pQuerySqlWhereMtxt;
-        wxButton                *pQueryAddBtn;
-        wxButton                *pQueryAndBtn;
-        wxButton                *pQueryOrBtn;
-        wxButton                *pQueryLParenBtn;
-        wxButton                *pQueryRParenBtn;
-        wxButton                *pQueryDoneBtn;
-        wxButton                *pQueryClearBtn;
-        wxButton                *pQueryCountBtn;
-        wxButton                *pQueryHelpBtn;
-        wxStaticBox             *pQueryHintGrp;
-        wxStaticText            *pQueryHintMsg;
-
-        wxTextCtrl              *pFocusTxt;
-
-        CqueryDlg(wxWindow *parent, wxDb *pDb, wxChar *tblName[], const wxString &pWhereArg);
-        ~CqueryDlg();
-
-        void        OnButton( wxCommandEvent &event );
-        void        OnCommand(wxWindow& win, wxCommandEvent& event);
-        void        OnCloseWindow(wxCloseEvent& event);
-        void        OnActivate(bool) {};  // necessary for hot keys
-
-        void        AppendToWhere(wxChar *s);
-        void        ProcessAddBtn();
-        void        ProcessCountBtn();
-        bool        ValidateWhereClause();
-
-DECLARE_EVENT_TABLE()
-};  // CqueryDlg
-
-#define QUERY_DIALOG                    300
-
-// Parameter dialog control ids
-#define QUERY_DIALOG_COL_MSG            301
-#define QUERY_DIALOG_COL_CHOICE         302
-#define QUERY_DIALOG_NOT_MSG            303
-#define QUERY_DIALOG_NOT_CHECKBOX       304
-#define QUERY_DIALOG_OP_MSG             305
-#define QUERY_DIALOG_OP_CHOICE          306
-#define QUERY_DIALOG_COL2_MSG           307
-#define QUERY_DIALOG_COL2_CHOICE        308
-#define QUERY_DIALOG_WHERE_MSG          309
-#define QUERY_DIALOG_WHERE_TEXT         310
-#define QUERY_DIALOG_ADD                311
-#define QUERY_DIALOG_AND                312
-#define QUERY_DIALOG_OR                 313
-#define QUERY_DIALOG_LPAREN             314
-#define QUERY_DIALOG_RPAREN             315
-#define QUERY_DIALOG_DONE               316
-#define QUERY_DIALOG_CLEAR              317
-#define QUERY_DIALOG_COUNT              318
-#define QUERY_DIALOG_VALUE1_MSG         319
-#define QUERY_DIALOG_VALUE1_TEXT        320
-#define QUERY_DIALOG_VALUE2_MSG         321
-#define QUERY_DIALOG_VALUE2_TEXT        322
-#define QUERY_DIALOG_HINT_GROUP         323
-#define QUERY_DIALOG_HINT_MSG           324
-
-#ifdef wxODBC_BLOB_SUPPORT
-
-class CimageDlg : public wxDialog
-{
-public:
-    CimageDlg(wxWindow *parent, wxChar *pImageData, off_t iSize);
-    ~CimageDlg();
-
-    void OnCloseWindow(wxCloseEvent &event);
-
-private:
-    wxStaticBitmap *m_pDisplayBmp;
-    wxBitmap       *m_pBmp;
-    wxImage        *m_pImage;
-
-protected:
-
-
-DECLARE_EVENT_TABLE()
-};  // CimageDlg
-
-#define IMAGE_DIALOG            400
-
-#define IMAGE_DIALOG_STATIC_BMP 401
-
-#endif
-
-wxChar * const langNO                        = wxT("No");
-wxChar * const langYES                       = wxT("Yes");
-wxChar * const langDBINF_DB_NAME             = wxT("Database Name = ");
-wxChar * const langDBINF_DB_VER              = wxT("Database Version = ");
-wxChar * const langDBINF_DRIVER_NAME         = wxT("Driver Name = ");
-wxChar * const langDBINF_DRIVER_ODBC_VER     = wxT("Driver ODBC Version = ");
-wxChar * const langDBINF_DRIVER_MGR_ODBC_VER = wxT("Driver Manager ODBC Version = ");
-wxChar * const langDBINF_DRIVER_VER          = wxT("Driver Version = ");
-wxChar * const langDBINF_SERVER_NAME         = wxT("Server Name = ");
-wxChar * const langDBINF_FILENAME            = wxT("Filename = ");
-wxChar * const langDBINF_OUTER_JOINS         = wxT("Outer Joins = ");
-wxChar * const langDBINF_STORED_PROC         = wxT("Stored Procedures = ");
-wxChar * const langDBINF_MAX_HDBC            = wxT("Max # of Db connections = ");
-wxChar * const langDBINF_MAX_HSTMT           = wxT("Max # of cursors (per db connection) = ");
-wxChar * const langDBINF_UNLIMITED           = wxT("Unlimited or Unknown");
-wxChar * const langDBINF_API_LVL             = wxT("ODBC API conformance level = ");
-wxChar * const langDBINF_CLI_LVL             = wxT("Client (SAG) conformance level = ");
-wxChar * const langDBINF_SQL_LVL             = wxT("SQL conformance level = ");
-wxChar * const langDBINF_COMMIT_BEHAVIOR     = wxT("Commit Behavior = ");
-wxChar * const langDBINF_ROLLBACK_BEHAVIOR   = wxT("Rollback Behavior = ");
-wxChar * const langDBINF_SUPP_NOT_NULL       = wxT("Support NOT NULL clause = ");
-wxChar * const langDBINF_SUPP_IEF            = wxT("Support IEF = ");
-wxChar * const langDBINF_TXN_ISOLATION       = wxT("Transaction Isolation Level (default) = ");
-wxChar * const langDBINF_TXN_ISOLATION_CURR  = wxT("Transaction Isolation Level (current) = ");
-wxChar * const langDBINF_TXN_ISOLATION_OPTS  = wxT("Transaction Isolation Options Available = ");
-wxChar * const langDBINF_FETCH_DIRS          = wxT("Fetch Directions = ");
-wxChar * const langDBINF_LOCK_TYPES          = wxT("Lock Types (SQLSetPos) = ");
-wxChar * const langDBINF_POS_OPERS           = wxT("Position Operations (SQLSetPos) = ");
-wxChar * const langDBINF_POS_STMTS           = wxT("Position Statements = ");
-wxChar * const langDBINF_SCROLL_CONCURR      = wxT("Concurrency Options (scrollable cursors) = ");
-wxChar * const langDBINF_SCROLL_OPTS         = wxT("Scroll Options (scrollable cursors) = ");
-wxChar * const langDBINF_STATIC_SENS         = wxT("Static Sensitivity = ");
-wxChar * const langDBINF_TXN_CAPABLE         = wxT("Transaction Support = ");
-wxChar * const langDBINF_LOGIN_TIMEOUT       = wxT("Login Timeout = ");
-wxChar * const langDBINF_NONE                = wxT("None");
-wxChar * const langDBINF_LEVEL1              = wxT("Level 1");
-wxChar * const langDBINF_LEVEL2              = wxT("Level 2");
-wxChar * const langDBINF_NOT_COMPLIANT       = wxT("Not Compliant");
-wxChar * const langDBINF_COMPLIANT           = wxT("Compliant");
-wxChar * const langDBINF_MIN_GRAMMAR         = wxT("Minimum Grammer");
-wxChar * const langDBINF_CORE_GRAMMAR        = wxT("Core Grammer");
-wxChar * const langDBINF_EXT_GRAMMAR         = wxT("Extended Grammer");
-wxChar * const langDBINF_DELETE_CURSORS      = wxT("Delete cursors");
-wxChar * const langDBINF_CLOSE_CURSORS       = wxT("Close cursors");
-wxChar * const langDBINF_PRESERVE_CURSORS    = wxT("Preserve cursors");
-wxChar * const langDBINF_READ_UNCOMMITTED    = wxT("Read Uncommitted");
-wxChar * const langDBINF_READ_COMMITTED      = wxT("Read Committed");
-wxChar * const langDBINF_REPEATABLE_READ     = wxT("Repeatable Read");
-wxChar * const langDBINF_SERIALIZABLE        = wxT("Serializable");
-wxChar * const langDBINF_VERSIONING          = wxT("Versioning");
-wxChar * const langDBINF_NEXT                = wxT("Next");
-wxChar * const langDBINF_PREV                = wxT("Prev");
-wxChar * const langDBINF_FIRST               = wxT("First");
-wxChar * const langDBINF_LAST                = wxT("Last");
-wxChar * const langDBINF_ABSOLUTE            = wxT("Absolute");
-wxChar * const langDBINF_RELATIVE            = wxT("Relative");
-wxChar * const langDBINF_RESUME              = wxT("Resume");
-wxChar * const langDBINF_BOOKMARK            = wxT("Bookmark");
-wxChar * const langDBINF_NO_CHANGE           = wxT("No Change");
-wxChar * const langDBINF_EXCLUSIVE           = wxT("Exclusive");
-wxChar * const langDBINF_UNLOCK              = wxT("Unlock");
-wxChar * const langDBINF_POSITION            = wxT("Position");
-wxChar * const langDBINF_REFRESH             = wxT("Refresh");
-wxChar * const langDBINF_UPD                 = wxT("Upd");
-wxChar * const langDBINF_DEL                 = wxT("Del");
-wxChar * const langDBINF_ADD                 = wxT("Add");
-wxChar * const langDBINF_POS_DEL             = wxT("Pos Delete");
-wxChar * const langDBINF_POS_UPD             = wxT("Pos Update");
-wxChar * const langDBINF_SELECT_FOR_UPD      = wxT("Select For Update");
-wxChar * const langDBINF_READ_ONLY           = wxT("Read Only");
-wxChar * const langDBINF_LOCK                = wxT("Lock");
-wxChar * const langDBINF_OPT_ROWVER          = wxT("Opt. Rowver");
-wxChar * const langDBINF_OPT_VALUES          = wxT("Opt. Values");
-wxChar * const langDBINF_FWD_ONLY            = wxT("Fwd Only");
-wxChar * const langDBINF_STATIC              = wxT("Static");
-wxChar * const langDBINF_KEYSET_DRIVEN       = wxT("Keyset Driven");
-wxChar * const langDBINF_DYNAMIC             = wxT("Dynamic");
-wxChar * const langDBINF_MIXED               = wxT("Mixed");
-wxChar * const langDBINF_ADDITIONS           = wxT("Additions");
-wxChar * const langDBINF_DELETIONS           = wxT("Deletions");
-wxChar * const langDBINF_UPDATES             = wxT("Updates");
-wxChar * const langDBINF_DML_ONLY            = wxT("DML Only");
-wxChar * const langDBINF_DDL_COMMIT          = wxT("DDL Commit");
-wxChar * const langDBINF_DDL_IGNORE          = wxT("DDL Ignore");
-wxChar * const langDBINF_DDL_AND_DML         = wxT("DDL and DML");
-wxChar * const langDBINF_ORACLE_BANNER       = wxT(">>> ORACLE STATISTICS AND TUNING INFORMATION <<<");
-wxChar * const langDBINF_DB_BLOCK_GETS       = wxT("DB block gets");
-wxChar * const langDBINF_CONSISTENT_GETS     = wxT("Consistent gets");
-wxChar * const langDBINF_PHYSICAL_READS      = wxT("Physical reads");
-wxChar * const langDBINF_CACHE_HIT_RATIO     = wxT("Cache hit ratio");
-wxChar * const langDBINF_TABLESPACE_IO       = wxT("TABLESPACE I/O LEVELS");
-wxChar * const langDBINF_PHYSICAL_WRITES     = wxT("Physical writes");
diff --git a/samples/db/dbtest.ico b/samples/db/dbtest.ico
deleted file mode 100644 (file)
index c4dbd3f..0000000
Binary files a/samples/db/dbtest.ico and /dev/null differ
diff --git a/samples/db/dbtest.rc b/samples/db/dbtest.rc
deleted file mode 100644 (file)
index 5b153e2..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-db_icon ICON "dbtest.ico"
-#include "wx/msw/wx.rc"
-
diff --git a/samples/db/descrip.mms b/samples/db/descrip.mms
deleted file mode 100755 (executable)
index cbae353..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-#*****************************************************************************
-#                                                                            *
-# Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 31 October 2001                                                     *
-#                                                                            *
-#*****************************************************************************
-.first
-       define wx [--.include.wx]
-
-.ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
-          /assume=(nostdnew,noglobal_array_new)
-.else
-.ifdef __WXGTK__
-CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
-          /assume=(nostdnew,noglobal_array_new)
-.else
-CXX_DEFINE =
-.endif
-.endif
-
-.suffixes : .cpp
-
-.cpp.obj :
-       cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
-
-all :
-.ifdef __WXMOTIF__
-       $(MMS)$(MMSQUALIFIERS) dbtest.exe
-.else
-.ifdef __WXGTK__
-       $(MMS)$(MMSQUALIFIERS) dbtest_gtk.exe
-.endif
-.endif
-
-.ifdef __WXMOTIF__
-dbtest.exe : dbtest.obj,listdb.obj
-       cxxlink dbtest,listdb,[--.lib]vms/opt
-.else
-.ifdef __WXGTK__
-dbtest_gtk.exe : dbtest.obj,listdb.obj
-       cxxlink/exec=dbtest_gtk.exe dbtest,listdb,[--.lib]vms_gtk/opt
-.endif
-.endif
-
-dbtest.obj : dbtest.cpp
-listdb.obj : listdb.cpp
diff --git a/samples/db/listdb.cpp b/samples/db/listdb.cpp
deleted file mode 100644 (file)
index 07ced21..0000000
+++ /dev/null
@@ -1,518 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        listdb.cpp
-// Purpose:     Data table lookup listbox code
-// Author:      George Tasker/Doug Card
-// Modified by:
-// Created:     1996
-// RCS-ID:      $Id$
-// Copyright:   (c) 1996 Remstar International, Inc.
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-/*
-// SYNOPSIS START
-
-    Member functions for the classes defined in LISTDB.H
-
-     This class is used to present a generic ListBox lookup window for
-     use with any of the object creation/selection choice widgets.   This
-     dialog window will present a (possibly) scrolling list of values
-     that come from a data table source.  Based on the object type passed
-     in the constructor, a ListBox is built to present the user with a
-     single selection listbox.
-
-     The string selected from the list box is stored in the Global variable
-     "ListDB_Selection", and will remain set until another interation of this
-     routine is called.
-
-     For each object (database) type that is to be used, an overridden
-     constructor should be written to appropriately link to the proper
-     data table/object for building the list.
-
-    The data table record access is all handled through the routines
-    in this module, interfacing with the methods defined in wxDbTable.
-
-     All objects which use data table access must be initialized and
-     have opened the table prior to passing them in the dialog
-     constructor, and the 'where' query should already have been set
-     and performed before creating this dialog instance.
-
-// SYNOPSIS STOP
-*/
-
-#include  "wx/wxprec.h"
-
-#ifdef    __BORLANDC__
-#pragma hdrstop
-#endif  //__BORLANDC__
-
-#ifndef WX_PRECOMP
-#include  "wx/wx.h"
-#endif //WX_PRECOMP
-
-#include "wx/dbtable.h"
-
-extern wxDbList WXDLLEXPORT *PtrBegDbList;    /* from db.cpp, used in getting back error results from db connections */
-
-#include "listdb.h"
-//#include "dbtest.h"
-
-// Used for passing the selected listbox selection back to the calling
-// routine.  This variable must be declared as 'extern' in the calling
-// source module
-wxChar ListDB_Selection[LOOKUP_COL_LEN+1];
-
-// If the listbox contains two columns of data, the second column is
-// returned in this variable.
-wxChar ListDB_Selection2[LOOKUP_COL_LEN+1];
-
-// Constants
-const int LISTDB_NO_SPACES_BETWEEN_COLS = 3;
-
-
-extern wxApp *DatabaseDemoApp;
-
-
-/*
- * This function will return the exact string(s) from the database engine
- * indicating all error conditions which have just occurred during the
- * last call to the database engine.
- *
- * This demo uses the returned string by displaying it in a wxMessageBox.  The
- * formatting therefore is not the greatest, but this is just a demo, not a
- * finished product.  :-) gt
- *
- * NOTE: The value returned by this function is for temporary use only and
- *       should be copied for long term use
- */
-wxString GetExtendedDBErrorMsg2(wxDb *pDb, wxChar *ErrFile, int ErrLine)
-{
-    static wxString msg;
-    msg = wxT("");
-
-    wxString tStr;
-
-    if (ErrFile || ErrLine)
-    {
-        msg += wxT("File: ");
-        msg += ErrFile;
-        msg += wxT("   Line: ");
-        tStr.Printf(wxT("%d"),ErrLine);
-        msg += tStr.c_str();
-        msg += wxT("\n");
-    }
-
-    msg.Append (wxT("\nODBC errors:\n"));
-    msg += wxT("\n");
-
-    // Display errors for this connection
-    int i;
-    for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
-    {
-        if (pDb->errorList[i])
-        {
-            msg.Append(pDb->errorList[i]);
-            if (wxStrcmp(pDb->errorList[i],wxT("")) != 0)
-                msg.Append(wxT("\n"));
-            // Clear the errmsg buffer so the next error will not
-            // end up showing the previous error that have occurred
-            wxStrcpy(pDb->errorList[i],wxT(""));
-        }
-    }
-    msg += wxT("\n");
-
-    return msg;
-}  // GetExtendedDBErrorMsg
-
-
-// Clookup constructor
-Clookup::Clookup(wxString tblName, wxString colName, wxDb *pDb, const wxString &defDir)
-   : wxDbTable(pDb, tblName, 1, (const wxString &)wxEmptyString, !wxDB_QUERY_ONLY,
-               defDir)
-{
-
-    SetColDefs (0, colName, DB_DATA_TYPE_VARCHAR, lookupCol, SQL_C_WXCHAR, LOOKUP_COL_LEN+1, false, false);
-
-}  // Clookup()
-
-
-// Clookup2 constructor
-Clookup2::Clookup2(wxString tblName, wxString colName1, wxString colName2,
-                   wxDb *pDb, const wxString &defDir)
-   : wxDbTable(pDb, tblName, (UWORD)(1 + (wxStrlen(colName2) > 0)), (const wxString &)wxEmptyString,
-               !wxDB_QUERY_ONLY, defDir)
-{
-    wxASSERT(pDb);
-    wxASSERT(tblName);
-    wxASSERT(colName1);
-    wxASSERT(colName2);
-
-    int i = 0;
-
-    SetColDefs ((UWORD)i, colName1, DB_DATA_TYPE_VARCHAR, lookupCol1, SQL_C_WXCHAR, LOOKUP_COL_LEN+1, false, false);
-
-    if (wxStrlen(colName2) > 0)
-        SetColDefs ((UWORD)(++i), colName2, DB_DATA_TYPE_VARCHAR, lookupCol2, SQL_C_WXCHAR, LOOKUP_COL_LEN+1, false, false);
-
-}  // Clookup2()
-
-
-BEGIN_EVENT_TABLE(ClookUpDlg, wxDialog)
-    EVT_BUTTON(LOOKUP_DIALOG_OK,  ClookUpDlg::OnButton)
-    EVT_BUTTON(LOOKUP_DIALOG_CANCEL,  ClookUpDlg::OnButton)
-    EVT_CLOSE(ClookUpDlg::OnClose)
-    EVT_LISTBOX_DCLICK(LOOKUP_DIALOG_SELECT,  ClookUpDlg::OnDClick)
-END_EVENT_TABLE()
-
-
-// This is a generic lookup constructor that will work with any table and any column
-ClookUpDlg::ClookUpDlg(wxWindow *parent, const wxString &windowTitle, const wxString &tableName,
-                       const wxString &colName, const wxString &where, const wxString &orderBy,
-                       wxDb *pDb, const wxString &defDir)
-   : wxDialog (parent, LOOKUP_DIALOG, wxT("Select..."), wxDefaultPosition, wxSize(400, 290))
-{
-    wxBeginBusyCursor();
-
-    wxStrcpy(ListDB_Selection,wxT(""));
-    widgetPtrsSet = false;
-    lookup  = 0;
-    lookup2 = 0;
-    noDisplayCols = 1;
-    col1Len = 0;
-
-    pLookUpSelectList = new wxListBox(this, LOOKUP_DIALOG_SELECT,                  wxPoint(  5,  15), wxSize(384, 195), 0, 0, wxLB_SINGLE|wxLB_ALWAYS_SB, wxDefaultValidator, wxT("LookUpSelectList"));
-    pLookUpOkBtn      = new wxButton(this,  LOOKUP_DIALOG_OK,      wxT("&Ok"),     wxPoint(113, 222), wxSize( 70,  35), 0, wxDefaultValidator, wxT("LookUpOkBtn"));
-    pLookUpCancelBtn  = new wxButton(this,  LOOKUP_DIALOG_CANCEL,  wxT("C&ancel"), wxPoint(212, 222), wxSize( 70,  35), 0, wxDefaultValidator, wxT("LookUpCancelBtn"));
-
-    widgetPtrsSet = true;
-
-    // Query the lookup table and display the result set
-    lookup = new Clookup(tableName, colName, pDb, defDir);
-    if (!lookup)
-    {
-        wxMessageBox(wxT("Error allocating memory for 'Clookup' object."),wxT("Error..."));
-        Close();
-        return;
-    }
-
-    if (!lookup->Open())
-    {
-        wxString tStr;
-        tStr.Printf(wxT("Unable to open the table '%s'."), tableName.c_str());
-        wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),lookup->GetDb(),__TFILE__,__LINE__),
-                    wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-
-        Close();
-        return;
-    }
-
-    lookup->SetOrderByClause(orderBy);
-    lookup->SetWhereClause(where);
-    if (!lookup->Query())
-    {
-        wxString tStr;
-        tStr = wxT("ODBC error during Query()\n\n");
-        wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),lookup->GetDb(),__TFILE__,__LINE__),
-                    wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-
-        Close();
-        return;
-    }
-
-    // Fill in the list box from the query result set
-    while (lookup->GetNext())
-        pLookUpSelectList->Append(lookup->lookupCol);
-
-    // Make the OK activate by pressing Enter
-    if (pLookUpSelectList->GetCount())
-    {
-        pLookUpSelectList->SetSelection(0);
-        pLookUpOkBtn->SetDefault();
-    }
-    else
-    {
-        pLookUpCancelBtn->SetDefault();
-        pLookUpOkBtn->Enable(false);
-    }
-
-    // Display the dialog window
-    SetTitle(windowTitle);
-    Centre(wxBOTH);
-    wxEndBusyCursor();
-    ShowModal();
-
-}  // Generic lookup constructor
-
-
-//
-// This is a generic lookup constructor that will work with any table and any column.
-// It extends the capabilites of the lookup dialog in the following ways:
-//
-//    1) 2 columns rather than one
-// 2) The ability to select DISTINCT column values
-//
-// Only set distinctValues equal to true if necessary.  In many cases, the constraints
-// of the index(es) will enforce this uniqueness.  Selecting DISTINCT does require
-// overhead by the database to ensure that all values returned are distinct.  Therefore,
-// use this ONLY when you need it.
-//
-// For complicated queries, you can pass in the sql select statement.  This would be
-// necessary if joins are involved since by default both columns must come from the
-// same table.
-//
-// If you do query by sql statement, you must pass in the maximum length of column1,
-// since it cannot be derived when you query using your own sql statement.
-//
-// The optional database connection can be used if you'd like the lookup class
-// to use a database pointer other than wxGetApp().READONLY_DB.  This is necessary if
-// records are being saved, but not committed to the db, yet should be included
-// in the lookup window.
-//
-ClookUpDlg::ClookUpDlg(wxWindow *parent, const wxString &windowTitle, const wxString &tableName,
-                       const wxString &dispCol1, const wxString &dispCol2,
-                       const wxString &where, const wxString &orderBy,
-                       wxDb *pDb, const wxString &defDir, bool distinctValues,
-                       const wxString &selectStmt, int maxLenCol1, bool allowOk)
-   : wxDialog (parent, LOOKUP_DIALOG, wxT("Select..."), wxDefaultPosition, wxSize(400, 290))
-{
-    wxBeginBusyCursor();
-
-    wxStrcpy(ListDB_Selection,wxT(""));
-    wxStrcpy(ListDB_Selection2,wxT(""));
-    widgetPtrsSet = false;
-    lookup  = 0;
-    lookup2 = 0;
-
-    noDisplayCols = (dispCol2.Length() == 0 ? 1 : 2);
-    col1Len = 0;
-
-    wxFont fixedFont(12, wxMODERN, wxNORMAL, wxNORMAL);
-
-    // this is done with fixed font so that the second column (if any) will be left
-    // justified in the second column
-    pLookUpSelectList        = new wxListBox(this, LOOKUP_DIALOG_SELECT, wxPoint(5, 15), wxSize(384, 195), 0, 0, wxLB_SINGLE|wxLB_ALWAYS_SB, wxDefaultValidator, wxT("LookUpSelectList"));
-
-    pLookUpSelectList->SetFont(fixedFont);
-
-    pLookUpOkBtn            = new wxButton(this, LOOKUP_DIALOG_OK,      wxT("&Ok"),        wxPoint(113, 222), wxSize(70, 35), 0, wxDefaultValidator, wxT("LookUpOkBtn"));
-    pLookUpCancelBtn        = new wxButton(this, LOOKUP_DIALOG_CANCEL,  wxT("C&ancel"),    wxPoint(212, 222), wxSize(70, 35), 0, wxDefaultValidator, wxT("LookUpCancelBtn"));
-
-    widgetPtrsSet = true;
-
-    // Query the lookup table and display the result set
-    lookup2 = new Clookup2(tableName, dispCol1, dispCol2, pDb, defDir);
-    if (!lookup2)
-    {
-        wxMessageBox(wxT("Error allocating memory for 'Clookup2' object."),wxT("Error..."));
-        Close();
-        return;
-    }
-
-    if (!lookup2->Open())
-    {
-        wxString tStr;
-        tStr.Printf(wxT("Unable to open the table '%s'."),tableName.c_str());
-        tStr += GetExtendedDBErrorMsg2(pDb,__TFILE__,__LINE__);
-        wxMessageBox(tStr,wxT("ODBC Error..."));
-        Close();
-        return;
-    }
-
-    // If displaying 2 columns, determine the maximum length of column1
-    int maxColLen;
-    if (maxLenCol1 > 0)
-        maxColLen = col1Len = maxLenCol1;  // user passed in max col length for column 1
-    else
-    {
-        // NOTE: Some databases (Firebird/Interbase) cannot handle the "fn" and "MAX()" functions
-
-        maxColLen = LOOKUP_COL_LEN;
-        if (wxStrlen(dispCol2))
-        {
-            wxString q = wxT("SELECT MAX({fn LENGTH(");
-            q += dispCol1;
-            q += wxT(")}), NULL");
-            q += wxT(" FROM ");
-            q += tableName;
-            if (wxStrlen(where))
-            {
-                q += wxT(" WHERE ");
-                q += where;
-            }
-            if (!lookup2->QueryBySqlStmt(q))
-            {
-                wxString tStr;
-                tStr = wxT("ODBC error during QueryBySqlStmt()\n\n");
-                wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),lookup2->GetDb(),__TFILE__,__LINE__),
-                            wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-
-                Close();
-                return;
-            }
-            if (lookup2->GetNext())
-                maxColLen = col1Len = wxAtoi(lookup2->lookupCol1);
-            else
-            {
-                wxString tStr;
-                tStr = wxT("ODBC error during GetNext()\n\n");
-                wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),lookup2->GetDb(),__TFILE__,__LINE__),
-                            wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-            }
-        }
-    }
-
-    // Query the actual record set
-    if ( (const char*) selectStmt && wxStrlen(selectStmt))    // Query by sql stmt passed in
-    {
-        if (!lookup2->QueryBySqlStmt(selectStmt))
-        {
-            wxString tStr;
-            tStr = wxT("ODBC error during QueryBySqlStmt()\n\n");
-            wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),lookup2->GetDb(),__TFILE__,__LINE__),
-                        wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-
-            Close();
-            return;
-        }
-    }
-    else    // Query using where and order by clauses
-    {
-        lookup2->SetOrderByClause(orderBy);
-        lookup2->SetWhereClause(where);
-        if (!lookup2->Query(false, distinctValues))
-        {
-            wxString tStr;
-            tStr = wxT("ODBC error during Query()\n\n");
-            wxMessageBox(wxDbLogExtendedErrorMsg(tStr.c_str(),lookup2->GetDb(),__TFILE__,__LINE__),
-                        wxT("ODBC Error..."),wxOK | wxICON_EXCLAMATION);
-
-            Close();
-            return;
-        }
-    }
-
-    // Fill in the list box from the query result set
-    wxString s;
-    while (lookup2->GetNext())
-    {
-        s = lookup2->lookupCol1;
-        if (wxStrlen(dispCol2))        // Append the optional column 2
-        {
-            s.Append(wxT(' '), (maxColLen + LISTDB_NO_SPACES_BETWEEN_COLS - wxStrlen(lookup2->lookupCol1)));
-            s.Append(lookup2->lookupCol2);
-        }
-        pLookUpSelectList->Append(s);
-    }
-
-    // Make the OK activate by pressing Enter
-    if (pLookUpSelectList->GetCount())
-    {
-        pLookUpSelectList->SetSelection(0);
-        pLookUpOkBtn->SetDefault();
-    }
-    else
-    {
-        pLookUpCancelBtn->SetDefault();
-        pLookUpOkBtn->Enable(false);
-    }
-
-    pLookUpOkBtn->Enable(allowOk);
-
-    // Display the dialog window
-    SetTitle(windowTitle);
-    Centre(wxBOTH);
-    wxEndBusyCursor();
-    ShowModal();
-
-}  // Generic lookup constructor 2
-
-
-void ClookUpDlg::OnClose(wxCloseEvent& event)
-{
-    widgetPtrsSet = false;
-    GetParent()->Enable(true);
-
-    if (lookup)
-        delete lookup;
-    if (lookup2)
-        delete lookup2;
-
-     SetReturnCode(1);
-
-    while (wxIsBusy()) wxEndBusyCursor();
-    event.Skip();
-
-//    return true;
-
-}  // ClookUpDlg::OnClose
-
-
-void ClookUpDlg::OnDClick( wxCommandEvent &event )
-{
-  wxWindow *win = (wxWindow*) event.GetEventObject();
-  OnCommand( *win, event );
-}
-
-
-void ClookUpDlg::OnButton( wxCommandEvent &event )
-{
-  wxWindow *win = (wxWindow*) event.GetEventObject();
-  OnCommand( *win, event );
-}
-
-
-void ClookUpDlg::OnCommand(wxWindow& win, wxCommandEvent& WXUNUSED(event))
-{
-    wxString widgetName = win.GetName();
-
-    if (widgetPtrsSet)
-    {
-        bool doubleclick = false;
-        // Double click
-        if (widgetName == pLookUpSelectList->GetName())
-        {
-            doubleclick = true;
-        }  // Double click
-
-        // OK Button
-        if (widgetName == pLookUpOkBtn->GetName() || doubleclick)
-        {
-            if (pLookUpSelectList->GetSelection() != -1)
-            {
-                if (noDisplayCols == 1)
-                    wxStrcpy (ListDB_Selection, pLookUpSelectList->GetStringSelection());
-                else  // 2 display columns
-                {
-                    wxString s = pLookUpSelectList->GetStringSelection();
-                    // Column 1
-                    s = s.SubString(0, col1Len-1);
-                    s = s.Strip();
-                    wxStrcpy(ListDB_Selection, s);
-                    // Column 2
-                    s = pLookUpSelectList->GetStringSelection();
-                    s = s.Mid(col1Len + LISTDB_NO_SPACES_BETWEEN_COLS);
-                    s = s.Strip();
-                    wxStrcpy(ListDB_Selection2, s);
-                }
-            }
-            else
-            {
-                wxStrcpy(ListDB_Selection,wxT(""));
-                wxStrcpy(ListDB_Selection2,wxT(""));
-            }
-            Close();
-        }  // OK Button
-
-        // Cancel Button
-        if (widgetName == pLookUpCancelBtn->GetName())
-        {
-            wxStrcpy (ListDB_Selection,wxT(""));
-            wxStrcpy (ListDB_Selection2,wxT(""));
-            Close();
-        }  // Cancel Button
-
-    }
-
-}  // ClookUpDlg::OnCommand
-
-// *********************************** listdb.cpp **********************************
diff --git a/samples/db/listdb.h b/samples/db/listdb.h
deleted file mode 100644 (file)
index 237b94c..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        listdb.h
-// Purpose:     wxWidgets database demo app
-// Author:      George Tasker
-// Modified by:
-// Created:     1996
-// RCS-ID:      $Id$
-// Copyright:   (c) 1996 Remstar International, Inc.
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-/*
-    Contains dialog class for creating a data table lookup listbox
-*/
-
-#ifndef LISTDB_DOT_H
-#define LISTDB_DOT_H
-
-
-#include "wx/dbtable.h"
-
-const int LOOKUP_COL_LEN = 250;
-
-// Clookup class
-class Clookup : public wxDbTable
-{
-    public:
-
-        wxChar lookupCol[LOOKUP_COL_LEN+1];
-
-        Clookup(wxString tblName, wxString colName, wxDb *pDb, const wxString &defDir=wxT(""));
-
-};  // Clookup
-
-
-// Clookup2 class
-class Clookup2 : public wxDbTable
-{
-    public:
-
-        wxChar lookupCol1[LOOKUP_COL_LEN+1];
-        wxChar lookupCol2[LOOKUP_COL_LEN+1];
-
-        Clookup2(wxString tblName, wxString colName1, wxString colName2, wxDb *pDb, const wxString &defDir=wxT(""));
-
-};  // Clookup2
-
-
-// ClookUpDlg class
-class ClookUpDlg : public wxDialog
-{
-    private:
-        bool             widgetPtrsSet;
-        int              currentCursor;
-        Clookup         *lookup;
-        Clookup2        *lookup2;
-        int              noDisplayCols;
-        int              col1Len;
-
-        wxListBox       *pLookUpSelectList;
-        wxButton        *pLookUpOkBtn;
-        wxButton        *pLookUpCancelBtn;
-
-    public:
-
-        // This is a generic lookup constructor that will work with any table and any column
-        ClookUpDlg(wxWindow         *parent,
-                    const wxString  &windowTitle,
-                    const wxString  &tableName,
-                    const wxString  &colName,
-                    const wxString  &where,
-                    const wxString  &orderBy,
-                    wxDb            *pDb,
-                    const wxString  &defDir);
-
-        //
-        // This is a generic lookup constructor that will work with any table and any column.
-        // It extends the capabilites of the lookup dialog in the following ways:
-        //
-        //    1) 2 columns rather than one
-        //    2) The ability to select DISTINCT column values
-        //
-        // Only set distinctValues equal to true if necessary.  In many cases, the constraints
-        // of the index(es) will enforce this uniqueness.  Selecting DISTINCT does require
-        // overhead by the database to ensure that all values returned are distinct.  Therefore,
-        // use this ONLY when you need it.
-        //
-        // For complicated queries, you can pass in the sql select statement.  This would be
-        // necessary if joins are involved since by default both columns must come from the
-        // same table.
-        //
-        // If you do query by sql statement, you must pass in the maximum length of column1,
-        // since it cannot be derived when you query using your own sql statement.
-        //
-        // The optional database connection can be used if you'd like the lookup class
-        // to use a database pointer other than the READONLY_DB of the app.  This is necessary
-        // if records are being saved, but not committed to the db, yet should be included
-        // in the lookup window.
-        //
-        ClookUpDlg(wxWindow *parent,
-                    const wxString  &windowTitle,
-                    const wxString  &tableName,
-                    const wxString  &dispCol1,                  // Must have at least 1 display column
-                    const wxString  &dispCol2,                  // Optional
-                    const wxString  &where,
-                    const wxString  &orderBy,
-                    wxDb            *pDb,                       // Database connection pointer
-                    const wxString  &defDir,
-                    bool             distinctValues,            // e.g. SELECT DISTINCT ...
-                    const wxString &selectStmt = wxEmptyString, // If you wish to query by SQLstmt (complicated lookups)
-                    int             maxLenCol1 = 0,             // Mandatory if querying by SQLstmt
-                    bool            allowOk    = true);         // is the OK button enabled
-
-        void        OnButton(wxCommandEvent &event);
-        void        OnCommand(wxWindow& win, wxCommandEvent& event);
-        void        OnClose(wxCloseEvent& event);
-        void        OnActivate(bool) {};  // necessary for hot keys
-        void        OnDClick(wxCommandEvent &event);
-
-DECLARE_EVENT_TABLE()
-};  // class ClookUpDlg
-
-#define LOOKUP_DIALOG                   500
-
-#define LOOKUP_DIALOG_SELECT            501
-#define LOOKUP_DIALOG_OK                502
-#define LOOKUP_DIALOG_CANCEL            503
-
-#endif  // LISTDB_DOT_H
-
-// ************************************ listdb.h *********************************
diff --git a/samples/db/makefile.bcc b/samples/db/makefile.bcc
deleted file mode 100644 (file)
index 10704ed..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.2 (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 = 29
-COMPILER_PREFIX = bcc
-OBJS = \
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DBTEST_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) \
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
-       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
-DBTEST_OBJECTS =  \
-       $(OBJS)\dbtest_dbtest.obj \
-       $(OBJS)\dbtest_listdb.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 "$(USE_ODBC)" == "1"
-__dbtest___depname = $(OBJS)\dbtest.exe
-!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 "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = -DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = -dWXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_DBGRID_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(USE_ODBC)" == "1"
-__WXLIB_ODBC_p = \
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_ADV_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!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 "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.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: $(__dbtest___depname)
-
-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)\dbtest.exe del $(OBJS)\dbtest.exe
-       -if exist $(OBJS)\dbtest.tds del $(OBJS)\dbtest.tds
-       -if exist $(OBJS)\dbtest.ilc del $(OBJS)\dbtest.ilc
-       -if exist $(OBJS)\dbtest.ild del $(OBJS)\dbtest.ild
-       -if exist $(OBJS)\dbtest.ilf del $(OBJS)\dbtest.ilf
-       -if exist $(OBJS)\dbtest.ils del $(OBJS)\dbtest.ils
-
-!if "$(USE_ODBC)" == "1"
-$(OBJS)\dbtest.exe: $(DBTEST_OBJECTS)  $(OBJS)\dbtest_dbtest.res
-       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-       c0w32.obj $(DBTEST_OBJECTS),$@,, $(__WXLIB_DBGRID_p)  $(__WXLIB_ODBC_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__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) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dbtest_dbtest.res
-|
-!endif
-
-$(OBJS)\dbtest_dbtest.obj: .\dbtest.cpp
-       $(CXX) -q -c -P -o$@ $(DBTEST_CXXFLAGS) $**
-
-$(OBJS)\dbtest_listdb.obj: .\listdb.cpp
-       $(CXX) -q -c -P -o$@ $(DBTEST_CXXFLAGS) $**
-
-$(OBJS)\dbtest_dbtest.res: .\dbtest.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) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH $**
-
diff --git a/samples/db/makefile.gcc b/samples/db/makefile.gcc
deleted file mode 100644 (file)
index 35cd3a9..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.2 (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 = 29
-COMPILER_PREFIX = gcc
-OBJS = \
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DBTEST_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) \
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \
-       $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
-       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
-DBTEST_OBJECTS =  \
-       $(OBJS)\dbtest_dbtest.o \
-       $(OBJS)\dbtest_listdb.o \
-       $(OBJS)\dbtest_dbtest_rc.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 ($(USE_ODBC),1)
-__dbtest___depname = $(OBJS)\dbtest.exe
-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 ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(USE_GDIPLUS),1)
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL
-endif
-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_DBGRID_p = \
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid
-endif
-ifeq ($(MONOLITHIC),0)
-ifeq ($(USE_ODBC),1)
-__WXLIB_ODBC_p = \
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc
-endif
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_ADV_p = \
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_HTML_p = \
-       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_XML_p = \
-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
-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 ($(USE_GDIPLUS),1)
-__GDIPLUS_LIB_p = -lgdiplus
-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: $(__dbtest___depname)
-
-clean: 
-       -if exist $(OBJS)\*.o del $(OBJS)\*.o
-       -if exist $(OBJS)\*.d del $(OBJS)\*.d
-       -if exist $(OBJS)\dbtest.exe del $(OBJS)\dbtest.exe
-
-ifeq ($(USE_ODBC),1)
-$(OBJS)\dbtest.exe: $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest_rc.o
-       $(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_DBGRID_p)  $(__WXLIB_ODBC_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__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) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
-endif
-
-$(OBJS)\dbtest_dbtest.o: ./dbtest.cpp
-       $(CXX) -c -o $@ $(DBTEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\dbtest_listdb.o: ./listdb.cpp
-       $(CXX) -c -o $@ $(DBTEST_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\dbtest_dbtest_rc.o: ./dbtest.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) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
-
-.PHONY: all clean
-
-
-# Dependencies tracking:
--include $(OBJS)/*.d
diff --git a/samples/db/makefile.unx b/samples/db/makefile.unx
deleted file mode 100644 (file)
index 8e66a08..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-
-
-# -------------------------------------------------------------------------
-# These are configurable options:
-# -------------------------------------------------------------------------
-
-# C++ compiler 
-CXX := g++
-
-# Standard flags for C++ 
-CXXFLAGS := 
-
-# Standard preprocessor flags (common for CC and CXX) 
-CPPFLAGS := 
-
-# Standard linker flags 
-LDFLAGS := 
-
-# Location and arguments of wx-config script 
-WX_CONFIG := wx-config
-
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
-
-# Use DLL build of wx library to use? [0,1]
-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
-
-# Compile Unicode build of wxWidgets? [0,1]
-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
-
-# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
-
-# Version of the wx library to build against. 
-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
-
-
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD
-WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1)
-WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2)
-WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \
-       $(WX_CONFIG_SHARED_FLAG) --toolkit=$(WX_PORT) \
-       --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
-DBTEST_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
-       $(CXXFLAGS)
-DBTEST_OBJECTS =  \
-       dbtest_dbtest.o \
-       dbtest_listdb.o
-
-### Conditionally set variables: ###
-
-ifeq ($(WX_DEBUG),0)
-WX_CONFIG_DEBUG_FLAG = --debug=no
-endif
-ifeq ($(WX_DEBUG),1)
-WX_CONFIG_DEBUG_FLAG = --debug=yes
-endif
-ifeq ($(WX_UNICODE),0)
-WX_CONFIG_UNICODE_FLAG = --unicode=no
-endif
-ifeq ($(WX_UNICODE),1)
-WX_CONFIG_UNICODE_FLAG = --unicode=yes
-endif
-ifeq ($(WX_SHARED),0)
-WX_CONFIG_SHARED_FLAG = --static=yes
-endif
-ifeq ($(WX_SHARED),1)
-WX_CONFIG_SHARED_FLAG = --static=no
-endif
-
-
-### Targets: ###
-
-all: test_for_selected_wxbuild dbtest
-
-install: all
-
-uninstall: 
-
-clean: 
-       rm -f ./*.o
-       rm -f ./*.d
-       rm -f dbtest
-
-test_for_selected_wxbuild: 
-       @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
-
-dbtest: $(DBTEST_OBJECTS)
-       $(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS)   `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs dbgrid,odbc,adv,html,xml,core,base`
-
-dbtest_dbtest.o: ./dbtest.cpp
-       $(CXX) -c -o $@ $(DBTEST_CXXFLAGS) $(CPPDEPS) $<
-
-dbtest_listdb.o: ./listdb.cpp
-       $(CXX) -c -o $@ $(DBTEST_CXXFLAGS) $(CPPDEPS) $<
-
-.PHONY: all install uninstall clean
-
-
-# Dependencies tracking:
--include ./*.d
diff --git a/samples/db/makefile.vc b/samples/db/makefile.vc
deleted file mode 100644 (file)
index 464b2e7..0000000
+++ /dev/null
@@ -1,340 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.2 (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 = 29
-COMPILER_PREFIX = vc
-OBJS = \
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
-LIBDIRNAME = \
-       .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = \
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DBTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
-       $(__DEBUGINFO_0) /Fd$(OBJS)\dbtest.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) \
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \
-       /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \
-       $(CPPFLAGS) $(CXXFLAGS)
-DBTEST_OBJECTS =  \
-       $(OBJS)\dbtest_dbtest.obj \
-       $(OBJS)\dbtest_listdb.obj \
-       $(OBJS)\dbtest_dbtest.res
-
-### 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 "$(USE_ODBC)" == "1"
-__dbtest___depname = $(OBJS)\dbtest.exe
-!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 "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p = /DWXUSINGDLL
-!endif
-!if "$(SHARED)" == "1"
-__DLLFLAG_p_1 = /d WXUSINGDLL
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_DBGRID_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(USE_ODBC)" == "1"
-__WXLIB_ODBC_p = \
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_ADV_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_HTML_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_XML_p = \
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!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 "$(USE_GDIPLUS)" == "1"
-__GDIPLUS_LIB_p = gdiplus.lib
-!endif
-
-
-all: $(OBJS)
-$(OBJS):
-       -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all: $(__dbtest___depname)
-
-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)\dbtest.exe del $(OBJS)\dbtest.exe
-       -if exist $(OBJS)\dbtest.ilk del $(OBJS)\dbtest.ilk
-       -if exist $(OBJS)\dbtest.pdb del $(OBJS)\dbtest.pdb
-
-!if "$(USE_ODBC)" == "1"
-$(OBJS)\dbtest.exe: $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
-       $(DBTEST_OBJECTS)  $(__WXLIB_DBGRID_p)  $(__WXLIB_ODBC_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__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) $(__GDIPLUS_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
-<<
-!endif
-
-$(OBJS)\dbtest_dbtest.obj: .\dbtest.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBTEST_CXXFLAGS) $**
-
-$(OBJS)\dbtest_listdb.obj: .\listdb.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(DBTEST_CXXFLAGS) $**
-
-$(OBJS)\dbtest_dbtest.res: .\dbtest.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) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH $**
-
diff --git a/samples/db/makefile.wat b/samples/db/makefile.wat
deleted file mode 100644 (file)
index 66df655..0000000
+++ /dev/null
@@ -1,300 +0,0 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.2 (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
-__dbtest___depname =
-!ifeq USE_ODBC 1
-__dbtest___depname = $(OBJS)\dbtest.exe
-!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_DBGRID_p =
-!ifeq MONOLITHIC 0
-__WXLIB_DBGRID_p = &
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid.lib
-!endif
-__WXLIB_ODBC_p =
-!ifeq MONOLITHIC 0
-!ifeq USE_ODBC 1
-__WXLIB_ODBC_p = &
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc.lib
-!endif
-!endif
-__WXLIB_ADV_p =
-!ifeq MONOLITHIC 0
-__WXLIB_ADV_p = &
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
-!endif
-__WXLIB_HTML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_HTML_p = &
-       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
-!endif
-__WXLIB_XML_p =
-!ifeq MONOLITHIC 0
-__WXLIB_XML_p = &
-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
-!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
-__GDIPLUS_LIB_p =
-!ifeq USE_GDIPLUS 1
-__GDIPLUS_LIB_p = gdiplus.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
-__GFXCTX_DEFINE_p =
-!ifeq USE_GDIPLUS 1
-__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
-!endif
-__DLLFLAG_p =
-!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
-!endif
-
-### Variables: ###
-
-WX_RELEASE_NODOT = 29
-COMPILER_PREFIX = wat
-OBJS = &
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
-SETUPHDIR = &
-       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DBTEST_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) $(__GFXCTX_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)
-DBTEST_OBJECTS =  &
-       $(OBJS)\dbtest_dbtest.obj &
-       $(OBJS)\dbtest_listdb.obj
-
-
-all : $(OBJS)
-$(OBJS) :
-       -if not exist $(OBJS) mkdir $(OBJS)
-
-### Targets: ###
-
-all : .SYMBOLIC $(__dbtest___depname)
-
-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)\dbtest.exe del $(OBJS)\dbtest.exe
-
-!ifeq USE_ODBC 1
-$(OBJS)\dbtest.exe :  $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res
-       @%create $(OBJS)\dbtest.lbc
-       @%append $(OBJS)\dbtest.lbc option quiet
-       @%append $(OBJS)\dbtest.lbc name $^@
-       @%append $(OBJS)\dbtest.lbc option caseexact
-       @%append $(OBJS)\dbtest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-       @for %i in ($(DBTEST_OBJECTS)) do @%append $(OBJS)\dbtest.lbc file %i
-       @for %i in ( $(__WXLIB_DBGRID_p)  $(__WXLIB_ODBC_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_XML_p)  $(__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)  $(__GDIPLUS_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) do @%append $(OBJS)\dbtest.lbc library %i
-       @%append $(OBJS)\dbtest.lbc option resource=$(OBJS)\dbtest_dbtest.res
-       @for %i in () do @%append $(OBJS)\dbtest.lbc option stack=%i
-       wlink @$(OBJS)\dbtest.lbc
-!endif
-
-$(OBJS)\dbtest_dbtest.obj :  .AUTODEPEND .\dbtest.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(DBTEST_CXXFLAGS) $<
-
-$(OBJS)\dbtest_listdb.obj :  .AUTODEPEND .\listdb.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(DBTEST_CXXFLAGS) $<
-
-$(OBJS)\dbtest_dbtest.res :  .AUTODEPEND .\dbtest.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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
-
index f15835055d7e5d980488402eeb2e3bb3f818e58d..ecb50f9dfaa18d287256f21b4af8cbbdc5e30008 100644 (file)
 #define wxUSE_SVG 0
 
 
-#define wxUSE_ODBC          0
-
-#define wxODBC_FWD_ONLY_CURSORS         0
-
-#define wxODBC_BACKWARD_COMPATABILITY 0
-
-
 #define REMOVE_UNUSED_ARG   0
 
 #define wxUSE_IOSTREAMH     0
  * Use the Hildon framework
  */
 #define wxUSE_LIBHILDON 0
-/*
- * Use iODBC
- */
-#define wxUSE_BUILTIN_IODBC 0
 /*
  * Have glibc2
  */
index b72ba72455f794e61bfd9ef441166458575502b9..7ae26caae899eb6d798f2e3171bfe5598a08c016 100644 (file)
@@ -532,13 +532,6 @@ typedef pid_t GPid;
 
 #define wxUSE_SVG 1
 
-#define wxUSE_ODBC          1
-
-#define wxODBC_FWD_ONLY_CURSORS         1
-
-#define wxODBC_BACKWARD_COMPATABILITY 0
-
-
 #define REMOVE_UNUSED_ARG   1
 
 #define wxUSE_IOSTREAMH     1
@@ -760,10 +753,6 @@ typedef pid_t GPid;
  * Use the Hildon framework
  */
 #define wxUSE_LIBHILDON 0
-/*
- * Use iODBC
- */
-#define wxUSE_BUILTIN_IODBC 0
 /*
  * Have glibc2
  */
diff --git a/src/common/db.cpp b/src/common/db.cpp
deleted file mode 100644 (file)
index cf4f9a2..0000000
+++ /dev/null
@@ -1,4527 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/db.cpp
-// Purpose:     Implementation of the wxDb class.  The wxDb class represents a connection
-//              to an ODBC data source.  The wxDb class allows operations on the data
-//              source such as opening and closing the data source.
-// Author:      Doug Card
-// Modified by: George Tasker
-//              Bart Jourquin
-//              Mark Johnson, wxWindows@mj10777.de
-// Mods:        Dec, 1998:
-//                -Added support for SQL statement logging and database cataloging
-// Mods:        April, 1999
-//                -Added QUERY_ONLY mode support to reduce default number of cursors
-//                -Added additional SQL logging code
-//                -Added DEBUG-ONLY tracking of wxTable objects to detect orphaned DB connections
-//                -Set ODBC option to only read committed writes to the DB so all
-//                   databases operate the same in that respect
-// Created:     9.96
-// RCS-ID:      $Id$
-// Copyright:   (c) 1996 Remstar International, Inc.
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_ODBC
-
-#ifndef WX_PRECOMP
-    #include "wx/object.h"
-    #include "wx/list.h"
-    #include "wx/string.h"
-    #include "wx/utils.h"
-    #include "wx/log.h"
-    #include "wx/app.h"
-#endif
-
-#ifdef DBDEBUG_CONSOLE
-    #include "wx/ioswrap.h"
-#endif
-
-#include "wx/filefn.h"
-#include "wx/crt.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include "wx/db.h"
-
-// FIXME-UTF8: get rid of this after switching to Unicode-only builds:
-#if wxUSE_UNICODE
-    #define WXSQLCAST(s) ((SQLTCHAR FAR *)(wchar_t*)(s).wchar_str())
-#else
-    #define WXSQLCAST(s) ((SQLTCHAR FAR *)(char*)(s).char_str())
-#endif
-
-// DLL options compatibility check:
-WX_CHECK_BUILD_OPTIONS("wxODBC")
-
-WXDLLIMPEXP_DATA_ODBC(wxDbList*) PtrBegDbList = 0;
-
-wxChar const *SQL_LOG_FILENAME         = wxT("sqllog.txt");
-wxChar const *SQL_CATALOG_FILENAME     = wxT("catalog.txt");
-
-#ifdef __WXDEBUG__
-    #include "wx/thread.h"
-
-    extern wxList TablesInUse;
-    extern wxCriticalSection csTablesInUse;
-#endif
-
-// SQL Log defaults to be used by GetDbConnection
-wxDbSqlLogState SQLLOGstate = sqlLogOFF;
-
-static wxString SQLLOGfn = SQL_LOG_FILENAME;
-
-// The wxDb::errorList is copied to this variable when the wxDb object
-// is closed.  This way, the error list is still available after the
-// database object is closed.  This is necessary if the database
-// connection fails so the calling application can show the operator
-// why the connection failed.  Note: as each wxDb object is closed, it
-// will overwrite the errors of the previously destroyed wxDb object in
-// this variable.  NOTE: This occurs during a CLOSE, not a FREEing of the
-// connection
-wxChar DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN+1];
-
-
-// This type defines the return row-struct form
-// SQLTablePrivileges, and is used by wxDB::TablePrivileges.
-typedef struct
-{
-   wxChar        tableQual[128+1];
-   wxChar        tableOwner[128+1];
-   wxChar        tableName[128+1];
-   wxChar        grantor[128+1];
-   wxChar        grantee[128+1];
-   wxChar        privilege[128+1];
-   wxChar        grantable[3+1];
-} wxDbTablePrivilegeInfo;
-
-
-/********** wxDbConnectInf Constructor - form 1 **********/
-wxDbConnectInf::wxDbConnectInf()
-{
-    Henv = 0;
-    freeHenvOnDestroy = false;
-
-    Initialize();
-}  // Constructor
-
-
-/********** wxDbConnectInf Constructor - form 2 **********/
-wxDbConnectInf::wxDbConnectInf(HENV henv, const wxString &dsn, const wxString &userID,
-                       const wxString &password, const wxString &defaultDir,
-                       const wxString &fileType, const wxString &description)
-{
-    Henv = 0;
-    freeHenvOnDestroy = false;
-
-    Initialize();
-
-    if (henv)
-        SetHenv(henv);
-    else
-        AllocHenv();
-
-    SetDsn(dsn);
-    SetUserID(userID);
-    SetPassword(password);
-    SetDescription(description);
-    SetFileType(fileType);
-    SetDefaultDir(defaultDir);
-}  // wxDbConnectInf Constructor
-
-
-wxDbConnectInf::~wxDbConnectInf()
-{
-    if (freeHenvOnDestroy)
-    {
-        FreeHenv();
-    }
-}  // wxDbConnectInf Destructor
-
-
-
-/********** wxDbConnectInf::Initialize() **********/
-bool wxDbConnectInf::Initialize()
-{
-    freeHenvOnDestroy = false;
-
-    if (freeHenvOnDestroy && Henv)
-        FreeHenv();
-
-    Henv = 0;
-    Dsn[0] = 0;
-    Uid[0] = 0;
-    AuthStr[0] = 0;
-    ConnectionStr[0] = 0;
-    Description.Empty();
-    FileType.Empty();
-    DefaultDir.Empty();
-
-    useConnectionStr = false;
-
-    return true;
-}  // wxDbConnectInf::Initialize()
-
-
-/********** wxDbConnectInf::AllocHenv() **********/
-bool wxDbConnectInf::AllocHenv()
-{
-    // This is here to help trap if you are getting a new henv
-    // without releasing an existing henv
-    wxASSERT(!Henv);
-
-    // Initialize the ODBC Environment for Database Operations
-    if (SQLAllocEnv(&Henv) != SQL_SUCCESS)
-    {
-        wxLogDebug(wxT("A problem occurred while trying to get a connection to the data source"));
-        return false;
-    }
-
-    freeHenvOnDestroy = true;
-
-    return true;
-}  // wxDbConnectInf::AllocHenv()
-
-
-void wxDbConnectInf::FreeHenv()
-{
-    wxASSERT(Henv);
-
-    if (Henv)
-        SQLFreeEnv(Henv);
-
-    Henv = 0;
-    freeHenvOnDestroy = false;
-
-}  // wxDbConnectInf::FreeHenv()
-
-
-void wxDbConnectInf::SetDsn(const wxString &dsn)
-{
-    wxASSERT(dsn.length() < WXSIZEOF(Dsn));
-
-    wxStrncpy(Dsn, dsn, WXSIZEOF(Dsn)-1);
-    Dsn[WXSIZEOF(Dsn)-1] = 0;  // Prevent buffer overrun
-}  // wxDbConnectInf::SetDsn()
-
-
-void wxDbConnectInf::SetUserID(const wxString &uid)
-{
-    wxASSERT(uid.length() < WXSIZEOF(Uid));
-    wxStrncpy(Uid, uid, WXSIZEOF(Uid)-1);
-    Uid[WXSIZEOF(Uid)-1] = 0;  // Prevent buffer overrun
-}  // wxDbConnectInf::SetUserID()
-
-
-void wxDbConnectInf::SetPassword(const wxString &password)
-{
-    wxASSERT(password.length() < WXSIZEOF(AuthStr));
-
-    wxStrncpy(AuthStr, password, WXSIZEOF(AuthStr)-1);
-    AuthStr[WXSIZEOF(AuthStr)-1] = 0;  // Prevent buffer overrun
-}  // wxDbConnectInf::SetPassword()
-
-void wxDbConnectInf::SetConnectionStr(const wxString &connectStr)
-{
-    wxASSERT(connectStr.length() < WXSIZEOF(ConnectionStr));
-
-    useConnectionStr = wxStrlen(connectStr) > 0;
-
-    wxStrncpy(ConnectionStr, connectStr, WXSIZEOF(ConnectionStr)-1);
-    ConnectionStr[WXSIZEOF(ConnectionStr)-1] = 0;  // Prevent buffer overrun
-}  // wxDbConnectInf::SetConnectionStr()
-
-
-/********** wxDbColFor Constructor **********/
-wxDbColFor::wxDbColFor()
-{
-    Initialize();
-}  // wxDbColFor::wxDbColFor()
-
-
-/********** wxDbColFor::Initialize() **********/
-void wxDbColFor::Initialize()
-{
-    s_Field.Empty();
-    int i;
-    for (i=0; i<7; i++)
-    {
-        s_Format[i].Empty();
-        s_Amount[i].Empty();
-        i_Amount[i] = 0;
-    }
-    i_Nation      = 0;                     // 0=EU, 1=UK, 2=International, 3=US
-    i_dbDataType  = 0;
-    i_sqlDataType = 0;
-    Format(1,DB_DATA_TYPE_VARCHAR,0,0,0);  // the Function that does the work
-}  // wxDbColFor::Initialize()
-
-
-/********** wxDbColFor::Format() **********/
-int wxDbColFor::Format(int Nation, int dbDataType, SWORD sqlDataType,
-                       short columnLength, short decimalDigits)
-{
-    // ----------------------------------------------------------------------------------------
-    // -- 19991224 : mj10777 : Create
-    // There is still a lot of work to do here, but it is a start
-    // It handles all the basic data-types that I have run into up to now
-    // The main work will have be with Dates and float Formatting
-    //    (US 1,000.00 ; EU 1.000,00)
-    // There are wxWindow plans for locale support and the new wxDateTime.  If
-    //    they define some constants (wxEUROPEAN) that can be gloably used,
-    //    they should be used here.
-    // ----------------------------------------------------------------------------------------
-    // There should also be a function to scan in a string to fill the variable
-    // ----------------------------------------------------------------------------------------
-    wxString tempStr;
-    i_Nation      = Nation;                                       // 0 = timestamp , 1=EU, 2=UK, 3=International, 4=US
-    i_dbDataType  = dbDataType;
-    i_sqlDataType = sqlDataType;
-    s_Field.Printf(wxT("%s%d"),s_Amount[1].c_str(),i_Amount[1]);  // OK for VARCHAR, INTEGER and FLOAT
-
-    if (i_dbDataType == 0)                                        // Filter unsupported dbDataTypes
-    {
-        if ((i_sqlDataType == SQL_VARCHAR)
-#if wxUSE_UNICODE
-    #if defined(SQL_WCHAR)
-            || (i_sqlDataType == SQL_WCHAR)
-    #endif
-    #if defined(SQL_WVARCHAR)
-            || (i_sqlDataType == SQL_WVARCHAR)
-    #endif
-#endif
-            || (i_sqlDataType == SQL_LONGVARCHAR))
-            i_dbDataType = DB_DATA_TYPE_VARCHAR;
-        if ((i_sqlDataType == SQL_C_DATE) || (i_sqlDataType == SQL_C_TIMESTAMP))
-            i_dbDataType = DB_DATA_TYPE_DATE;
-        if (i_sqlDataType == SQL_C_BIT)
-            i_dbDataType = DB_DATA_TYPE_INTEGER;
-        if (i_sqlDataType == SQL_NUMERIC)
-            i_dbDataType = DB_DATA_TYPE_VARCHAR;   // glt - ??? is this right?
-        if (i_sqlDataType == SQL_REAL)
-            i_dbDataType = DB_DATA_TYPE_FLOAT;
-        if (i_sqlDataType == SQL_C_BINARY)
-            i_dbDataType = DB_DATA_TYPE_BLOB;
-    }
-
-    if ((i_dbDataType == DB_DATA_TYPE_INTEGER) && (i_sqlDataType == SQL_C_DOUBLE))
-    {   // DBASE Numeric
-        i_dbDataType = DB_DATA_TYPE_FLOAT;
-    }
-
-    switch(i_dbDataType)     // TBD: Still a lot of proper formatting to do
-    {
-        case DB_DATA_TYPE_VARCHAR:
-            s_Field = wxT("%s");
-            break;
-        case DB_DATA_TYPE_INTEGER:
-            s_Field = wxT("%d");
-            break;
-        case DB_DATA_TYPE_FLOAT:
-            if (decimalDigits == 0)
-                decimalDigits = 2;
-            tempStr.Printf(wxT("%%%d.%d"), columnLength, decimalDigits);
-            s_Field.Printf(wxT("%sf"), tempStr.c_str());
-            break;
-        case DB_DATA_TYPE_DATE:
-            if (i_Nation == 0)      // timestamp       YYYY-MM-DD HH:MM:SS.SSS (tested for SYBASE)
-            {
-                s_Field = wxT("%04d-%02d-%02d %02d:%02d:%02d.%03d");
-            }
-            if (i_Nation == 1)      // European        DD.MM.YYYY HH:MM:SS.SSS
-            {
-                s_Field = wxT("%02d.%02d.%04d %02d:%02d:%02d.%03d");
-            }
-            if (i_Nation == 2)      // UK              DD/MM/YYYY HH:MM:SS.SSS
-            {
-                s_Field = wxT("%02d/%02d/%04d %02d:%02d:%02d.%03d");
-            }
-            if (i_Nation == 3)      // International   YYYY-MM-DD HH:MM:SS.SSS
-            {
-                s_Field = wxT("%04d-%02d-%02d %02d:%02d:%02d.%03d");
-            }
-            if (i_Nation == 4)      // US              MM/DD/YYYY HH:MM:SS.SSS
-            {
-                s_Field = wxT("%02d/%02d/%04d %02d:%02d:%02d.%03d");
-            }
-            break;
-          case DB_DATA_TYPE_BLOB:
-            s_Field.Printf(wxT("Unable to format(%d)-SQL(%d)"), dbDataType,sqlDataType);        //
-                break;
-        default:
-            s_Field.Printf(wxT("Unknown Format(%d)-SQL(%d)"), dbDataType,sqlDataType);        //
-            break;
-    };
-    return TRUE;
-}  // wxDbColFor::Format()
-
-
-/********** wxDbColInf Constructor **********/
-wxDbColInf::wxDbColInf()
-{
-    Initialize();
-}  // wxDbColInf::wxDbColInf()
-
-
-/********** wxDbColInf Destructor ********/
-wxDbColInf::~wxDbColInf()
-{
-    if (pColFor)
-        delete pColFor;
-    pColFor = NULL;
-}  // wxDbColInf::~wxDbColInf()
-
-
-bool wxDbColInf::Initialize()
-{
-    catalog[0]      = 0;
-    schema[0]       = 0;
-    tableName[0]    = 0;
-    colName[0]      = 0;
-    sqlDataType     = 0;
-    typeName[0]     = 0;
-    columnLength    = 0;
-    bufferSize      = 0;
-    decimalDigits   = 0;
-    numPrecRadix    = 0;
-    nullable        = 0;
-    remarks[0]      = 0;
-    dbDataType      = 0;
-    PkCol           = 0;
-    PkTableName[0]  = 0;
-    FkCol           = 0;
-    FkTableName[0]  = 0;
-    pColFor         = NULL;
-
-    return true;
-}  // wxDbColInf::Initialize()
-
-
-/********** wxDbTableInf Constructor ********/
-wxDbTableInf::wxDbTableInf()
-{
-    Initialize();
-}  // wxDbTableInf::wxDbTableInf()
-
-
-/********** wxDbTableInf Constructor ********/
-wxDbTableInf::~wxDbTableInf()
-{
-    if (pColInf)
-        delete [] pColInf;
-    pColInf = NULL;
-}  // wxDbTableInf::~wxDbTableInf()
-
-
-bool wxDbTableInf::Initialize()
-{
-    tableName[0]    = 0;
-    tableType[0]    = 0;
-    tableRemarks[0] = 0;
-    numCols         = 0;
-    pColInf         = NULL;
-
-    return true;
-}  // wxDbTableInf::Initialize()
-
-
-/********** wxDbInf Constructor *************/
-wxDbInf::wxDbInf()
-{
-    Initialize();
-}  // wxDbInf::wxDbInf()
-
-
-/********** wxDbInf Destructor *************/
-wxDbInf::~wxDbInf()
-{
-  if (pTableInf)
-    delete [] pTableInf;
-  pTableInf = NULL;
-}  // wxDbInf::~wxDbInf()
-
-
-/********** wxDbInf::Initialize() *************/
-bool wxDbInf::Initialize()
-{
-    catalog[0]      = 0;
-    schema[0]       = 0;
-    numTables       = 0;
-    pTableInf       = NULL;
-
-    return true;
-}  // wxDbInf::Initialize()
-
-
-/********** wxDb Constructor **********/
-wxDb::wxDb(const HENV &aHenv, bool FwdOnlyCursors)
-{
-    // Copy the HENV into the db class
-    henv = aHenv;
-    fwdOnlyCursors = FwdOnlyCursors;
-
-    initialize();
-} // wxDb::wxDb()
-
-
-/********** wxDb Destructor **********/
-wxDb::~wxDb()
-{
-    wxASSERT_MSG(!IsCached(),wxT("Cached connections must not be manually deleted, use\nwxDbFreeConnection() or wxDbCloseConnections()."));
-
-    if (IsOpen())
-    {
-        Close();
-    }
-}  // wxDb destructor
-
-
-
-/********** PRIVATE! wxDb::initialize PRIVATE! **********/
-/********** wxDb::initialize() **********/
-void wxDb::initialize()
-/*
- * Private member function that sets all wxDb member variables to
- * known values at creation of the wxDb
- */
-{
-    int i;
-
-    fpSqlLog      = 0;            // Sql Log file pointer
-    sqlLogState   = sqlLogOFF;    // By default, logging is turned off
-    nTables       = 0;
-    dbmsType      = dbmsUNIDENTIFIED;
-
-    wxStrcpy(sqlState,wxEmptyString);
-    wxStrcpy(errorMsg,wxEmptyString);
-    nativeError = cbErrorMsg = 0;
-    for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
-        wxStrcpy(errorList[i], wxEmptyString);
-
-    // Init typeInf structures
-    typeInfVarchar.TypeName.Empty();
-    typeInfVarchar.FsqlType      = 0;
-    typeInfVarchar.Precision     = 0;
-    typeInfVarchar.CaseSensitive = 0;
-    typeInfVarchar.MaximumScale  = 0;
-
-    typeInfInteger.TypeName.Empty();
-    typeInfInteger.FsqlType      = 0;
-    typeInfInteger.Precision     = 0;
-    typeInfInteger.CaseSensitive = 0;
-    typeInfInteger.MaximumScale  = 0;
-
-    typeInfFloat.TypeName.Empty();
-    typeInfFloat.FsqlType      = 0;
-    typeInfFloat.Precision     = 0;
-    typeInfFloat.CaseSensitive = 0;
-    typeInfFloat.MaximumScale  = 0;
-
-    typeInfDate.TypeName.Empty();
-    typeInfDate.FsqlType      = 0;
-    typeInfDate.Precision     = 0;
-    typeInfDate.CaseSensitive = 0;
-    typeInfDate.MaximumScale  = 0;
-
-    typeInfBlob.TypeName.Empty();
-    typeInfBlob.FsqlType      = 0;
-    typeInfBlob.Precision     = 0;
-    typeInfBlob.CaseSensitive = 0;
-    typeInfBlob.MaximumScale  = 0;
-
-    typeInfMemo.TypeName.Empty();
-    typeInfMemo.FsqlType      = 0;
-    typeInfMemo.Precision     = 0;
-    typeInfMemo.CaseSensitive = 0;
-    typeInfMemo.MaximumScale  = 0;
-
-    // Error reporting is turned OFF by default
-    silent = true;
-
-    // Allocate a data source connection handle
-    if (SQLAllocConnect(henv, &hdbc) != SQL_SUCCESS)
-        DispAllErrors(henv);
-
-    // Initialize the db status flag
-    DB_STATUS = 0;
-
-    // Mark database as not open as of yet
-    dbIsOpen = false;
-    dbIsCached = false;
-    dbOpenedWithConnectionString = false;
-}  // wxDb::initialize()
-
-
-/********** PRIVATE! wxDb::convertUserID PRIVATE! **********/
-//
-// NOTE: Return value from this function MUST be copied
-//       immediately, as the value is not good after
-//       this function has left scope.
-//
-void wxDb::convertUserID(const wxChar *userID, wxString &UserID)
-{
-    if (userID)
-    {
-        if (!wxStrlen(userID))
-            UserID = uid;
-        else
-            UserID = userID;
-    }
-    else
-        UserID.Empty();
-
-    // dBase does not use user names, and some drivers fail if you try to pass one
-    if ( Dbms() == dbmsDBASE
-         || Dbms() == dbmsXBASE_SEQUITER )
-        UserID.Empty();
-
-    // Some databases require user names to be specified in uppercase,
-    // so force the name to uppercase
-    if ((Dbms() == dbmsORACLE) ||
-        (Dbms() == dbmsMAXDB))
-        UserID = UserID.Upper();
-}  // wxDb::convertUserID()
-
-
-bool wxDb::determineDataTypes(bool failOnDataTypeUnsupported)
-{
-    size_t iIndex;
-
-    // These are the possible SQL types we check for use against the datasource we are connected
-    // to for the purpose of determining which data type to use for the basic character strings
-    // column types
-    //
-    // NOTE: The first type in this enumeration that is determined to be supported by the
-    //       datasource/driver is the one that will be used.
-    SWORD PossibleSqlCharTypes[] = {
-#if wxUSE_UNICODE && defined(SQL_WVARCHAR)
-        SQL_WVARCHAR,
-#endif
-        SQL_VARCHAR,
-#if wxUSE_UNICODE && defined(SQL_WVARCHAR)
-        SQL_WCHAR,
-#endif
-        SQL_CHAR
-    };
-
-    // These are the possible SQL types we check for use against the datasource we are connected
-    // to for the purpose of determining which data type to use for the basic non-floating point
-    // column types
-    //
-    // NOTE: The first type in this enumeration that is determined to be supported by the
-    //       datasource/driver is the one that will be used.
-    SWORD PossibleSqlIntegerTypes[] = {
-        SQL_INTEGER
-    };
-
-    // These are the possible SQL types we check for use against the datasource we are connected
-    // to for the purpose of determining which data type to use for the basic floating point number
-    // column types
-    //
-    // NOTE: The first type in this enumeration that is determined to be supported by the
-    //       datasource/driver is the one that will be used.
-    SWORD PossibleSqlFloatTypes[] = {
-        SQL_DOUBLE,
-        SQL_REAL,
-        SQL_FLOAT,
-        SQL_DECIMAL,
-        SQL_NUMERIC
-    };
-
-    // These are the possible SQL types we check for use agains the datasource we are connected
-    // to for the purpose of determining which data type to use for the date/time column types
-    //
-    // NOTE: The first type in this enumeration that is determined to be supported by the
-    //       datasource/driver is the one that will be used.
-    SWORD PossibleSqlDateTypes[] = {
-        SQL_TIMESTAMP,
-        SQL_DATE,
-#ifdef SQL_DATETIME
-        SQL_DATETIME
-#endif
-    };
-
-    // These are the possible SQL types we check for use agains the datasource we are connected
-    // to for the purpose of determining which data type to use for the BLOB column types.
-    //
-    // NOTE: The first type in this enumeration that is determined to be supported by the
-    //       datasource/driver is the one that will be used.
-    SWORD PossibleSqlBlobTypes[] = {
-        SQL_LONGVARBINARY,
-        SQL_VARBINARY
-    };
-
-    // These are the possible SQL types we check for use agains the datasource we are connected
-    // to for the purpose of determining which data type to use for the MEMO column types
-    // (a type which allow to store large strings; like VARCHAR just with a bigger precision)
-    //
-    // NOTE: The first type in this enumeration that is determined to be supported by the
-    //       datasource/driver is the one that will be used.
-    SWORD PossibleSqlMemoTypes[] = {
-        SQL_LONGVARCHAR,
-    };
-
-
-    // Query the data source regarding data type information
-
-    //
-    // The way it was determined which SQL data types to use was by calling SQLGetInfo
-    // for all of the possible SQL data types to see which ones were supported.  If
-    // a type is not supported, the SQLFetch() that's called from getDataTypeInfo()
-    // fails with SQL_NO_DATA_FOUND.  This is ugly because I'm sure the three SQL data
-    // types I've selected below will not always be what we want.  These are just
-    // what happened to work against an Oracle 7/Intersolv combination.  The following is
-    // a complete list of the results I got back against the Oracle 7 database:
-    //
-    // SQL_BIGINT             SQL_NO_DATA_FOUND
-    // SQL_BINARY             SQL_NO_DATA_FOUND
-    // SQL_BIT                SQL_NO_DATA_FOUND
-    // SQL_CHAR               type name = 'CHAR', Precision = 255
-    // SQL_DATE               SQL_NO_DATA_FOUND
-    // SQL_DECIMAL            type name = 'NUMBER', Precision = 38
-    // SQL_DOUBLE             type name = 'NUMBER', Precision = 15
-    // SQL_FLOAT              SQL_NO_DATA_FOUND
-    // SQL_INTEGER            SQL_NO_DATA_FOUND
-    // SQL_LONGVARBINARY      type name = 'LONG RAW', Precision = 2 billion
-    // SQL_LONGVARCHAR        type name = 'LONG', Precision = 2 billion
-    // SQL_NUMERIC            SQL_NO_DATA_FOUND
-    // SQL_REAL               SQL_NO_DATA_FOUND
-    // SQL_SMALLINT           SQL_NO_DATA_FOUND
-    // SQL_TIME               SQL_NO_DATA_FOUND
-    // SQL_TIMESTAMP          type name = 'DATE', Precision = 19
-    // SQL_VARBINARY          type name = 'RAW', Precision = 255
-    // SQL_VARCHAR            type name = 'VARCHAR2', Precision = 2000
-    // =====================================================================
-    // Results from a Microsoft Access 7.0 db, using a driver from Microsoft
-    //
-    // SQL_VARCHAR            type name = 'TEXT', Precision = 255
-    // SQL_TIMESTAMP          type name = 'DATETIME'
-    // SQL_DECIMAL            SQL_NO_DATA_FOUND
-    // SQL_NUMERIC            type name = 'CURRENCY', Precision = 19
-    // SQL_FLOAT              SQL_NO_DATA_FOUND
-    // SQL_REAL               type name = 'SINGLE', Precision = 7
-    // SQL_DOUBLE             type name = 'DOUBLE', Precision = 15
-    // SQL_INTEGER            type name = 'LONG', Precision = 10
-
-    // Query the data source for info about itself
-    if (!getDbInfo(failOnDataTypeUnsupported))
-        return false;
-
-    // --------------- Varchar - (Variable length character string) ---------------
-    for (iIndex = 0; iIndex < WXSIZEOF(PossibleSqlCharTypes) &&
-                     !getDataTypeInfo(PossibleSqlCharTypes[iIndex], typeInfVarchar); ++iIndex)
-    {}
-
-    if (iIndex < WXSIZEOF(PossibleSqlCharTypes))
-        typeInfVarchar.FsqlType = PossibleSqlCharTypes[iIndex];
-    else if (failOnDataTypeUnsupported)
-        return false;
-
-    // --------------- Float ---------------
-    for (iIndex = 0; iIndex < WXSIZEOF(PossibleSqlFloatTypes) &&
-                     !getDataTypeInfo(PossibleSqlFloatTypes[iIndex], typeInfFloat); ++iIndex)
-    {}
-
-    if (iIndex < WXSIZEOF(PossibleSqlFloatTypes))
-        typeInfFloat.FsqlType = PossibleSqlFloatTypes[iIndex];
-    else if (failOnDataTypeUnsupported)
-        return false;
-
-    // --------------- Integer -------------
-    for (iIndex = 0; iIndex < WXSIZEOF(PossibleSqlIntegerTypes) &&
-                     !getDataTypeInfo(PossibleSqlIntegerTypes[iIndex], typeInfInteger); ++iIndex)
-    {}
-
-    if (iIndex < WXSIZEOF(PossibleSqlIntegerTypes))
-        typeInfInteger.FsqlType = PossibleSqlIntegerTypes[iIndex];
-    else if (failOnDataTypeUnsupported)
-    {
-        // If no non-floating point data types are supported, we'll
-        // use the type assigned for floats to store integers as well
-        if (!getDataTypeInfo(typeInfFloat.FsqlType, typeInfInteger))
-        {
-            if (failOnDataTypeUnsupported)
-                return false;
-        }
-        else
-            typeInfInteger.FsqlType = typeInfFloat.FsqlType;
-    }
-
-    // --------------- Date/Time ---------------
-    for (iIndex = 0; iIndex < WXSIZEOF(PossibleSqlDateTypes) &&
-                     !getDataTypeInfo(PossibleSqlDateTypes[iIndex], typeInfDate); ++iIndex)
-    {}
-
-    if (iIndex < WXSIZEOF(PossibleSqlDateTypes))
-        typeInfDate.FsqlType = PossibleSqlDateTypes[iIndex];
-    else if (failOnDataTypeUnsupported)
-        return false;
-
-    // --------------- BLOB ---------------
-    for (iIndex = 0; iIndex < WXSIZEOF(PossibleSqlBlobTypes) &&
-                     !getDataTypeInfo(PossibleSqlBlobTypes[iIndex], typeInfBlob); ++iIndex)
-    {}
-
-    if (iIndex < WXSIZEOF(PossibleSqlBlobTypes))
-        typeInfBlob.FsqlType = PossibleSqlBlobTypes[iIndex];
-    else if (failOnDataTypeUnsupported)
-        return false;
-
-    // --------------- MEMO ---------------
-    for (iIndex = 0; iIndex < WXSIZEOF(PossibleSqlMemoTypes) &&
-                     !getDataTypeInfo(PossibleSqlMemoTypes[iIndex], typeInfMemo); ++iIndex)
-    {}
-
-    if (iIndex < WXSIZEOF(PossibleSqlMemoTypes))
-        typeInfMemo.FsqlType = PossibleSqlMemoTypes[iIndex];
-    else if (failOnDataTypeUnsupported)
-        return false;
-
-    return true;
-}  // wxDb::determineDataTypes
-
-
-bool wxDb::open(bool failOnDataTypeUnsupported)
-{
-/*
-    If using Intersolv branded ODBC drivers, this is the place where you would substitute
-    your branded driver license information
-
-    SQLSetConnectOption(hdbc, 1041, (UDWORD) wxEmptyString);
-    SQLSetConnectOption(hdbc, 1042, (UDWORD) wxEmptyString);
-*/
-
-    // Mark database as open
-    dbIsOpen = true;
-
-    // Allocate a statement handle for the database connection
-    if (SQLAllocStmt(hdbc, &hstmt) != SQL_SUCCESS)
-        return(DispAllErrors(henv, hdbc));
-
-    // Set Connection Options
-    if (!setConnectionOptions())
-        return false;
-
-    if (!determineDataTypes(failOnDataTypeUnsupported))
-        return false;
-
-#ifdef DBDEBUG_CONSOLE
-    cout << wxT("VARCHAR DATA TYPE: ") << typeInfVarchar.TypeName << endl;
-    cout << wxT("INTEGER DATA TYPE: ") << typeInfInteger.TypeName << endl;
-    cout << wxT("FLOAT   DATA TYPE: ") << typeInfFloat.TypeName << endl;
-    cout << wxT("DATE    DATA TYPE: ") << typeInfDate.TypeName << endl;
-    cout << wxT("BLOB    DATA TYPE: ") << typeInfBlob.TypeName << endl;
-    cout << wxT("MEMO    DATA TYPE: ") << typeInfMemo.TypeName << endl;
-    cout << endl;
-#endif
-
-    // Completed Successfully
-    return true;
-}
-
-bool wxDb::Open(const wxString& inConnectStr, bool failOnDataTypeUnsupported)
-{
-    wxASSERT(inConnectStr.length());
-    return Open(inConnectStr, NULL, failOnDataTypeUnsupported);
-}
-
-bool wxDb::Open(const wxString& inConnectStr, SQLHWND parentWnd, bool failOnDataTypeUnsupported)
-{
-    dsn        = wxEmptyString;
-    uid        = wxEmptyString;
-    authStr    = wxEmptyString;
-
-    RETCODE retcode;
-
-    if (!FwdOnlyCursors())
-    {
-        // Specify that the ODBC cursor library be used, if needed.  This must be
-        // specified before the connection is made.
-        retcode = SQLSetConnectOption(hdbc, SQL_ODBC_CURSORS, SQL_CUR_USE_IF_NEEDED);
-
-#ifdef DBDEBUG_CONSOLE
-        if (retcode == SQL_SUCCESS)
-            cout << wxT("SQLSetConnectOption(CURSOR_LIB) successful") << endl;
-        else
-            cout << wxT("SQLSetConnectOption(CURSOR_LIB) failed") << endl;
-#else
-        wxUnusedVar(retcode);
-#endif
-    }
-
-    // Connect to the data source
-    SQLTCHAR outConnectBuffer[SQL_MAX_CONNECTSTR_LEN+1];  // MS recommends at least 1k buffer
-    short outConnectBufferLen;
-
-    inConnectionStr = inConnectStr;
-
-    retcode = SQLDriverConnect(hdbc, parentWnd, WXSQLCAST(inConnectionStr),
-                        (SWORD)inConnectionStr.length(), (SQLTCHAR FAR *)outConnectBuffer,
-                        WXSIZEOF(outConnectBuffer), &outConnectBufferLen, SQL_DRIVER_COMPLETE );
-
-    if ((retcode != SQL_SUCCESS) &&
-        (retcode != SQL_SUCCESS_WITH_INFO))
-        return(DispAllErrors(henv, hdbc));
-
-    outConnectBuffer[outConnectBufferLen] = 0;
-    outConnectionStr = outConnectBuffer;
-    dbOpenedWithConnectionString = true;
-
-    return open(failOnDataTypeUnsupported);
-}
-
-/********** wxDb::Open() **********/
-bool wxDb::Open(const wxString &Dsn, const wxString &Uid, const wxString &AuthStr, bool failOnDataTypeUnsupported)
-{
-    wxASSERT(!Dsn.empty());
-    dsn        = Dsn;
-    uid        = Uid;
-    authStr    = AuthStr;
-
-    inConnectionStr = wxEmptyString;
-    outConnectionStr = wxEmptyString;
-
-    RETCODE retcode;
-
-    if (!FwdOnlyCursors())
-    {
-        // Specify that the ODBC cursor library be used, if needed.  This must be
-        // specified before the connection is made.
-        retcode = SQLSetConnectOption(hdbc, SQL_ODBC_CURSORS, SQL_CUR_USE_IF_NEEDED);
-
-#ifdef DBDEBUG_CONSOLE
-        if (retcode == SQL_SUCCESS)
-            cout << wxT("SQLSetConnectOption(CURSOR_LIB) successful") << endl;
-        else
-            cout << wxT("SQLSetConnectOption(CURSOR_LIB) failed") << endl;
-#else
-        wxUnusedVar( retcode );
-#endif
-    }
-
-    // Connect to the data source
-    retcode = SQLConnect(hdbc,
-                         WXSQLCAST(dsn), SQL_NTS,
-                         WXSQLCAST(uid), SQL_NTS,
-                         WXSQLCAST(authStr), SQL_NTS);
-
-    if ((retcode != SQL_SUCCESS) &&
-        (retcode != SQL_SUCCESS_WITH_INFO))
-        return(DispAllErrors(henv, hdbc));
-
-    return open(failOnDataTypeUnsupported);
-
-} // wxDb::Open()
-
-
-bool wxDb::Open(wxDbConnectInf *dbConnectInf, bool failOnDataTypeUnsupported)
-{
-    wxASSERT(dbConnectInf);
-
-    // Use the connection string if one is present
-    if (dbConnectInf->UseConnectionStr())
-        return Open(dbConnectInf->GetConnectionStr(), failOnDataTypeUnsupported);
-    else
-        return Open(dbConnectInf->GetDsn(), dbConnectInf->GetUserID(),
-                    dbConnectInf->GetPassword(), failOnDataTypeUnsupported);
-}  // wxDb::Open()
-
-
-bool wxDb::Open(wxDb *copyDb)
-{
-    dsn              = copyDb->GetDatasourceName();
-    uid              = copyDb->GetUsername();
-    authStr          = copyDb->GetPassword();
-    inConnectionStr  = copyDb->GetConnectionInStr();
-    outConnectionStr = copyDb->GetConnectionOutStr();
-
-    RETCODE retcode;
-
-    if (!FwdOnlyCursors())
-    {
-        // Specify that the ODBC cursor library be used, if needed.  This must be
-        // specified before the connection is made.
-        retcode = SQLSetConnectOption(hdbc, SQL_ODBC_CURSORS, SQL_CUR_USE_IF_NEEDED);
-
-#ifdef DBDEBUG_CONSOLE
-        if (retcode == SQL_SUCCESS)
-            cout << wxT("SQLSetConnectOption(CURSOR_LIB) successful") << endl;
-        else
-            cout << wxT("SQLSetConnectOption(CURSOR_LIB) failed") << endl;
-#else
-        wxUnusedVar( retcode );
-#endif
-    }
-
-    if (copyDb->OpenedWithConnectionString())
-    {
-        // Connect to the data source
-        SQLTCHAR outConnectBuffer[SQL_MAX_CONNECTSTR_LEN+1];
-        short outConnectBufferLen;
-
-        inConnectionStr = copyDb->GetConnectionInStr();
-
-        retcode = SQLDriverConnect(hdbc, NULL, WXSQLCAST(inConnectionStr),
-                            (SWORD)inConnectionStr.length(), (SQLTCHAR FAR *)outConnectBuffer,
-                            WXSIZEOF(outConnectBuffer), &outConnectBufferLen, SQL_DRIVER_COMPLETE);
-
-        if ((retcode != SQL_SUCCESS) &&
-            (retcode != SQL_SUCCESS_WITH_INFO))
-            return(DispAllErrors(henv, hdbc));
-
-        outConnectBuffer[outConnectBufferLen] = 0;
-        outConnectionStr = outConnectBuffer;
-        dbOpenedWithConnectionString = true;
-    }
-    else
-    {
-        // Connect to the data source
-        retcode = SQLConnect(hdbc,
-                             WXSQLCAST(dsn), SQL_NTS,
-                             WXSQLCAST(uid), SQL_NTS,
-                             WXSQLCAST(authStr), SQL_NTS);
-    }
-
-    if ((retcode != SQL_SUCCESS) &&
-        (retcode != SQL_SUCCESS_WITH_INFO))
-        return(DispAllErrors(henv, hdbc));
-
-/*
-    If using Intersolv branded ODBC drivers, this is the place where you would substitute
-    your branded driver license information
-
-    SQLSetConnectOption(hdbc, 1041, (UDWORD) wxEmptyString);
-    SQLSetConnectOption(hdbc, 1042, (UDWORD) wxEmptyString);
-*/
-
-    // Mark database as open
-    dbIsOpen = true;
-
-    // Allocate a statement handle for the database connection
-    if (SQLAllocStmt(hdbc, &hstmt) != SQL_SUCCESS)
-        return(DispAllErrors(henv, hdbc));
-
-    // Set Connection Options
-    if (!setConnectionOptions())
-        return false;
-
-    // Instead of Querying the data source for info about itself, it can just be copied
-    // from the wxDb instance that was passed in (copyDb).
-    wxStrcpy(dbInf.serverName,copyDb->dbInf.serverName);
-    wxStrcpy(dbInf.databaseName,copyDb->dbInf.databaseName);
-    wxStrcpy(dbInf.dbmsName,copyDb->dbInf.dbmsName);
-    wxStrcpy(dbInf.dbmsVer,copyDb->dbInf.dbmsVer);
-    dbInf.maxConnections = copyDb->dbInf.maxConnections;
-    dbInf.maxStmts = copyDb->dbInf.maxStmts;
-    wxStrcpy(dbInf.driverName,copyDb->dbInf.driverName);
-    wxStrcpy(dbInf.odbcVer,copyDb->dbInf.odbcVer);
-    wxStrcpy(dbInf.drvMgrOdbcVer,copyDb->dbInf.drvMgrOdbcVer);
-    wxStrcpy(dbInf.driverVer,copyDb->dbInf.driverVer);
-    dbInf.apiConfLvl = copyDb->dbInf.apiConfLvl;
-    dbInf.cliConfLvl = copyDb->dbInf.cliConfLvl;
-    dbInf.sqlConfLvl = copyDb->dbInf.sqlConfLvl;
-    wxStrcpy(dbInf.outerJoins,copyDb->dbInf.outerJoins);
-    wxStrcpy(dbInf.procedureSupport,copyDb->dbInf.procedureSupport);
-    wxStrcpy(dbInf.accessibleTables,copyDb->dbInf.accessibleTables);
-    dbInf.cursorCommitBehavior = copyDb->dbInf.cursorCommitBehavior;
-    dbInf.cursorRollbackBehavior = copyDb->dbInf.cursorRollbackBehavior;
-    dbInf.supportNotNullClause = copyDb->dbInf.supportNotNullClause;
-    wxStrcpy(dbInf.supportIEF,copyDb->dbInf.supportIEF);
-    dbInf.txnIsolation = copyDb->dbInf.txnIsolation;
-    dbInf.txnIsolationOptions = copyDb->dbInf.txnIsolationOptions;
-    dbInf.fetchDirections = copyDb->dbInf.fetchDirections;
-    dbInf.lockTypes = copyDb->dbInf.lockTypes;
-    dbInf.posOperations = copyDb->dbInf.posOperations;
-    dbInf.posStmts = copyDb->dbInf.posStmts;
-    dbInf.scrollConcurrency = copyDb->dbInf.scrollConcurrency;
-    dbInf.scrollOptions = copyDb->dbInf.scrollOptions;
-    dbInf.staticSensitivity = copyDb->dbInf.staticSensitivity;
-    dbInf.txnCapable = copyDb->dbInf.txnCapable;
-    dbInf.loginTimeout = copyDb->dbInf.loginTimeout;
-
-    // VARCHAR = Variable length character string
-    typeInfVarchar.FsqlType         = copyDb->typeInfVarchar.FsqlType;
-    typeInfVarchar.TypeName         = copyDb->typeInfVarchar.TypeName;
-    typeInfVarchar.Precision        = copyDb->typeInfVarchar.Precision;
-    typeInfVarchar.CaseSensitive    = copyDb->typeInfVarchar.CaseSensitive;
-    typeInfVarchar.MaximumScale     = copyDb->typeInfVarchar.MaximumScale;
-
-    // Float
-    typeInfFloat.FsqlType         = copyDb->typeInfFloat.FsqlType;
-    typeInfFloat.TypeName         = copyDb->typeInfFloat.TypeName;
-    typeInfFloat.Precision        = copyDb->typeInfFloat.Precision;
-    typeInfFloat.CaseSensitive    = copyDb->typeInfFloat.CaseSensitive;
-    typeInfFloat.MaximumScale     = copyDb->typeInfFloat.MaximumScale;
-
-    // Integer
-    typeInfInteger.FsqlType         = copyDb->typeInfInteger.FsqlType;
-    typeInfInteger.TypeName         = copyDb->typeInfInteger.TypeName;
-    typeInfInteger.Precision        = copyDb->typeInfInteger.Precision;
-    typeInfInteger.CaseSensitive    = copyDb->typeInfInteger.CaseSensitive;
-    typeInfInteger.MaximumScale     = copyDb->typeInfInteger.MaximumScale;
-
-    // Date/Time
-    typeInfDate.FsqlType         = copyDb->typeInfDate.FsqlType;
-    typeInfDate.TypeName         = copyDb->typeInfDate.TypeName;
-    typeInfDate.Precision        = copyDb->typeInfDate.Precision;
-    typeInfDate.CaseSensitive    = copyDb->typeInfDate.CaseSensitive;
-    typeInfDate.MaximumScale     = copyDb->typeInfDate.MaximumScale;
-
-    // Blob
-    typeInfBlob.FsqlType         = copyDb->typeInfBlob.FsqlType;
-    typeInfBlob.TypeName         = copyDb->typeInfBlob.TypeName;
-    typeInfBlob.Precision        = copyDb->typeInfBlob.Precision;
-    typeInfBlob.CaseSensitive    = copyDb->typeInfBlob.CaseSensitive;
-    typeInfBlob.MaximumScale     = copyDb->typeInfBlob.MaximumScale;
-
-    // Memo
-    typeInfMemo.FsqlType         = copyDb->typeInfMemo.FsqlType;
-    typeInfMemo.TypeName         = copyDb->typeInfMemo.TypeName;
-    typeInfMemo.Precision        = copyDb->typeInfMemo.Precision;
-    typeInfMemo.CaseSensitive    = copyDb->typeInfMemo.CaseSensitive;
-    typeInfMemo.MaximumScale     = copyDb->typeInfMemo.MaximumScale;
-
-#ifdef DBDEBUG_CONSOLE
-    cout << wxT("VARCHAR DATA TYPE: ") << typeInfVarchar.TypeName << endl;
-    cout << wxT("INTEGER DATA TYPE: ") << typeInfInteger.TypeName << endl;
-    cout << wxT("FLOAT   DATA TYPE: ") << typeInfFloat.TypeName << endl;
-    cout << wxT("DATE    DATA TYPE: ") << typeInfDate.TypeName << endl;
-    cout << wxT("BLOB    DATA TYPE: ") << typeInfBlob.TypeName << endl;
-    cout << wxT("MEMO    DATA TYPE: ") << typeInfMemo.TypeName << endl;
-    cout << endl;
-#endif
-
-    // Completed Successfully
-    return true;
-} // wxDb::Open() 2
-
-
-/********** wxDb::setConnectionOptions() **********/
-bool wxDb::setConnectionOptions(void)
-/*
- * NOTE: The Intersolv/Oracle 7 driver was "Not Capable" of setting the login timeout.
- */
-{
-    SWORD cb;
-
-    // I need to get the DBMS name here, because some of the connection options
-    // are database specific and need to call the Dbms() function.
-    RETCODE retcode;
-
-    retcode = SQLGetInfo(hdbc, SQL_DBMS_NAME, (UCHAR *) dbInf.dbmsName, sizeof(dbInf.dbmsName), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
-        return(DispAllErrors(henv, hdbc));
-
-    /* retcode = */ SQLSetConnectOption(hdbc, SQL_AUTOCOMMIT, SQL_AUTOCOMMIT_OFF);
-    /* retcode = */ SQLSetConnectOption(hdbc, SQL_OPT_TRACE, SQL_OPT_TRACE_OFF);
-//  SQLSetConnectOption(hdbc, SQL_TXN_ISOLATION, SQL_TXN_READ_COMMITTED);  // No dirty reads
-
-    // By default, MS Sql Server closes cursors on commit and rollback.  The following
-    // call to SQLSetConnectOption() is needed to force SQL Server to preserve cursors
-    // after a transaction.  This is a driver specific option and is not part of the
-    // ODBC standard.  Note: this behavior is specific to the ODBC interface to SQL Server.
-    // The database settings don't have any effect one way or the other.
-    if (Dbms() == dbmsMS_SQL_SERVER)
-    {
-        const long SQL_PRESERVE_CURSORS = 1204L;
-        const long SQL_PC_ON = 1L;
-        /* retcode = */ SQLSetConnectOption(hdbc, SQL_PRESERVE_CURSORS, SQL_PC_ON);
-    }
-
-    // Display the connection options to verify them
-#ifdef DBDEBUG_CONSOLE
-    long l;
-    cout << wxT("****** CONNECTION OPTIONS ******") << endl;
-
-    retcode = SQLGetConnectOption(hdbc, SQL_AUTOCOMMIT, &l);
-    if (retcode != SQL_SUCCESS)
-        return(DispAllErrors(henv, hdbc));
-    cout << wxT("AUTOCOMMIT: ") << (l == SQL_AUTOCOMMIT_OFF ? "OFF" : "ON") << endl;
-
-    retcode = SQLGetConnectOption(hdbc, SQL_ODBC_CURSORS, &l);
-    if (retcode != SQL_SUCCESS)
-        return(DispAllErrors(henv, hdbc));
-    cout << wxT("ODBC CURSORS: ");
-    switch(l)
-    {
-        case(SQL_CUR_USE_IF_NEEDED):
-            cout << wxT("SQL_CUR_USE_IF_NEEDED");
-            break;
-        case(SQL_CUR_USE_ODBC):
-            cout << wxT("SQL_CUR_USE_ODBC");
-            break;
-        case(SQL_CUR_USE_DRIVER):
-            cout << wxT("SQL_CUR_USE_DRIVER");
-            break;
-    }
-    cout << endl;
-
-    retcode = SQLGetConnectOption(hdbc, SQL_OPT_TRACE, &l)
-    if (retcode != SQL_SUCCESS)
-        return(DispAllErrors(henv, hdbc));
-    cout << wxT("TRACING: ") << (l == SQL_OPT_TRACE_OFF ? wxT("OFF") : wxT("ON")) << endl;
-
-    cout << endl;
-#endif
-
-    // Completed Successfully
-    return true;
-
-} // wxDb::setConnectionOptions()
-
-
-/********** wxDb::getDbInfo() **********/
-bool wxDb::getDbInfo(bool failOnDataTypeUnsupported)
-{
-    SWORD cb;
-    RETCODE retcode;
-
-    retcode = SQLGetInfo(hdbc, SQL_SERVER_NAME, (UCHAR*) dbInf.serverName, sizeof(dbInf.serverName), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_DATABASE_NAME, (UCHAR*) dbInf.databaseName, sizeof(dbInf.databaseName), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_DBMS_NAME, (UCHAR*) dbInf.dbmsName, sizeof(dbInf.dbmsName), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    // 16-Mar-1999
-    // After upgrading to MSVC6, the original 20 char buffer below was insufficient,
-    // causing database connectivity to fail in some cases.
-    retcode = SQLGetInfo(hdbc, SQL_DBMS_VER, (UCHAR*) dbInf.dbmsVer, sizeof(dbInf.dbmsVer), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_ACTIVE_CONNECTIONS, (UCHAR*) &dbInf.maxConnections, sizeof(dbInf.maxConnections), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_ACTIVE_STATEMENTS, (UCHAR*) &dbInf.maxStmts, sizeof(dbInf.maxStmts), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_DRIVER_NAME, (UCHAR*) dbInf.driverName, sizeof(dbInf.driverName), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_DRIVER_ODBC_VER, (UCHAR*) dbInf.odbcVer, sizeof(dbInf.odbcVer), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_ODBC_VER, (UCHAR*) dbInf.drvMgrOdbcVer, sizeof(dbInf.drvMgrOdbcVer), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_DRIVER_VER, (UCHAR*) dbInf.driverVer, sizeof(dbInf.driverVer), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_ODBC_API_CONFORMANCE, (UCHAR*) &dbInf.apiConfLvl, sizeof(dbInf.apiConfLvl), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_ODBC_SAG_CLI_CONFORMANCE, (UCHAR*) &dbInf.cliConfLvl, sizeof(dbInf.cliConfLvl), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        // Not all drivers support this call - Nick Gorham(unixODBC)
-        dbInf.cliConfLvl = 0;
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_ODBC_SQL_CONFORMANCE, (UCHAR*) &dbInf.sqlConfLvl, sizeof(dbInf.sqlConfLvl), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_OUTER_JOINS, (UCHAR*) dbInf.outerJoins, sizeof(dbInf.outerJoins), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_PROCEDURES, (UCHAR*) dbInf.procedureSupport, sizeof(dbInf.procedureSupport), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_ACCESSIBLE_TABLES, (UCHAR*) dbInf.accessibleTables, sizeof(dbInf.accessibleTables), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_CURSOR_COMMIT_BEHAVIOR, (UCHAR*) &dbInf.cursorCommitBehavior, sizeof(dbInf.cursorCommitBehavior), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_CURSOR_ROLLBACK_BEHAVIOR, (UCHAR*) &dbInf.cursorRollbackBehavior, sizeof(dbInf.cursorRollbackBehavior), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_NON_NULLABLE_COLUMNS, (UCHAR*) &dbInf.supportNotNullClause, sizeof(dbInf.supportNotNullClause), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_ODBC_SQL_OPT_IEF, (UCHAR*) dbInf.supportIEF, sizeof(dbInf.supportIEF), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_DEFAULT_TXN_ISOLATION, (UCHAR*) &dbInf.txnIsolation, sizeof(dbInf.txnIsolation), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_TXN_ISOLATION_OPTION, (UCHAR*) &dbInf.txnIsolationOptions, sizeof(dbInf.txnIsolationOptions), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_FETCH_DIRECTION, (UCHAR*) &dbInf.fetchDirections, sizeof(dbInf.fetchDirections), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_LOCK_TYPES, (UCHAR*) &dbInf.lockTypes, sizeof(dbInf.lockTypes), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_POS_OPERATIONS, (UCHAR*) &dbInf.posOperations, sizeof(dbInf.posOperations), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_POSITIONED_STATEMENTS, (UCHAR*) &dbInf.posStmts, sizeof(dbInf.posStmts), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_SCROLL_CONCURRENCY, (UCHAR*) &dbInf.scrollConcurrency, sizeof(dbInf.scrollConcurrency), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_SCROLL_OPTIONS, (UCHAR*) &dbInf.scrollOptions, sizeof(dbInf.scrollOptions), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_STATIC_SENSITIVITY, (UCHAR*) &dbInf.staticSensitivity, sizeof(dbInf.staticSensitivity), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_TXN_CAPABLE, (UCHAR*) &dbInf.txnCapable, sizeof(dbInf.txnCapable), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-    retcode = SQLGetInfo(hdbc, SQL_LOGIN_TIMEOUT, (UCHAR*) &dbInf.loginTimeout, sizeof(dbInf.loginTimeout), &cb);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
-    {
-        DispAllErrors(henv, hdbc);
-        if (failOnDataTypeUnsupported)
-            return false;
-    }
-
-#ifdef DBDEBUG_CONSOLE
-    cout << wxT("***** DATA SOURCE INFORMATION *****") << endl;
-    cout << wxT(wxT("SERVER Name: ") << dbInf.serverName << endl;
-    cout << wxT("DBMS Name: ") << dbInf.dbmsName << wxT("; DBMS Version: ") << dbInf.dbmsVer << endl;
-    cout << wxT("ODBC Version: ") << dbInf.odbcVer << wxT("; Driver Version: ") << dbInf.driverVer << endl;
-
-    cout << wxT("API Conf. Level: ");
-    switch(dbInf.apiConfLvl)
-    {
-        case SQL_OAC_NONE:      cout << wxT("None");       break;
-        case SQL_OAC_LEVEL1:    cout << wxT("Level 1");    break;
-        case SQL_OAC_LEVEL2:    cout << wxT("Level 2");    break;
-    }
-    cout << endl;
-
-    cout << wxT("SAG CLI Conf. Level: ");
-    switch(dbInf.cliConfLvl)
-    {
-        case SQL_OSCC_NOT_COMPLIANT:    cout << wxT("Not Compliant");    break;
-        case SQL_OSCC_COMPLIANT:        cout << wxT("Compliant");        break;
-    }
-    cout << endl;
-
-    cout << wxT("SQL Conf. Level: ");
-    switch(dbInf.sqlConfLvl)
-    {
-        case SQL_OSC_MINIMUM:     cout << wxT("Minimum Grammar");     break;
-        case SQL_OSC_CORE:        cout << wxT("Core Grammar");        break;
-        case SQL_OSC_EXTENDED:    cout << wxT("Extended Grammar");    break;
-    }
-    cout << endl;
-
-    cout << wxT("Max. Connections: ")       << dbInf.maxConnections   << endl;
-    cout << wxT("Outer Joins: ")            << dbInf.outerJoins       << endl;
-    cout << wxT("Support for Procedures: ") << dbInf.procedureSupport << endl;
-    cout << wxT("All tables accessible : ") << dbInf.accessibleTables << endl;
-    cout << wxT("Cursor COMMIT Behavior: ");
-    switch(dbInf.cursorCommitBehavior)
-    {
-        case SQL_CB_DELETE:        cout << wxT("Delete cursors");      break;
-        case SQL_CB_CLOSE:         cout << wxT("Close cursors");       break;
-        case SQL_CB_PRESERVE:      cout << wxT("Preserve cursors");    break;
-    }
-    cout << endl;
-
-    cout << wxT("Cursor ROLLBACK Behavior: ");
-    switch(dbInf.cursorRollbackBehavior)
-    {
-        case SQL_CB_DELETE:      cout << wxT("Delete cursors");      break;
-        case SQL_CB_CLOSE:       cout << wxT("Close cursors");       break;
-        case SQL_CB_PRESERVE:    cout << wxT("Preserve cursors");    break;
-    }
-    cout << endl;
-
-    cout << wxT("Support NOT NULL clause: ");
-    switch(dbInf.supportNotNullClause)
-    {
-        case SQL_NNC_NULL:        cout << wxT("No");        break;
-        case SQL_NNC_NON_NULL:    cout << wxT("Yes");       break;
-    }
-    cout << endl;
-
-    cout << wxT("Support IEF (Ref. Integrity): ") << dbInf.supportIEF   << endl;
-    cout << wxT("Login Timeout: ")                << dbInf.loginTimeout << endl;
-
-    cout << endl << endl << wxT("more ...") << endl;
-    getchar();
-
-    cout << wxT("Default Transaction Isolation: ";
-    switch(dbInf.txnIsolation)
-    {
-        case SQL_TXN_READ_UNCOMMITTED:  cout << wxT("Read Uncommitted");    break;
-        case SQL_TXN_READ_COMMITTED:    cout << wxT("Read Committed");      break;
-        case SQL_TXN_REPEATABLE_READ:   cout << wxT("Repeatable Read");     break;
-        case SQL_TXN_SERIALIZABLE:      cout << wxT("Serializable");        break;
-#ifdef ODBC_V20
-        case SQL_TXN_VERSIONING:        cout << wxT("Versioning");          break;
-#endif
-    }
-    cout << endl;
-
-    cout << wxT("Transaction Isolation Options: ");
-    if (dbInf.txnIsolationOptions & SQL_TXN_READ_UNCOMMITTED)
-        cout << wxT("Read Uncommitted, ");
-    if (dbInf.txnIsolationOptions & SQL_TXN_READ_COMMITTED)
-        cout << wxT("Read Committed, ");
-    if (dbInf.txnIsolationOptions & SQL_TXN_REPEATABLE_READ)
-        cout << wxT("Repeatable Read, ");
-    if (dbInf.txnIsolationOptions & SQL_TXN_SERIALIZABLE)
-        cout << wxT("Serializable, ");
-#ifdef ODBC_V20
-    if (dbInf.txnIsolationOptions & SQL_TXN_VERSIONING)
-        cout << wxT("Versioning");
-#endif
-    cout << endl;
-
-    cout << wxT("Fetch Directions Supported:") << endl << wxT("   ");
-    if (dbInf.fetchDirections & SQL_FD_FETCH_NEXT)
-        cout << wxT("Next, ");
-    if (dbInf.fetchDirections & SQL_FD_FETCH_PRIOR)
-        cout << wxT("Prev, ");
-    if (dbInf.fetchDirections & SQL_FD_FETCH_FIRST)
-        cout << wxT("First, ");
-    if (dbInf.fetchDirections & SQL_FD_FETCH_LAST)
-        cout << wxT("Last, ");
-    if (dbInf.fetchDirections & SQL_FD_FETCH_ABSOLUTE)
-        cout << wxT("Absolute, ");
-    if (dbInf.fetchDirections & SQL_FD_FETCH_RELATIVE)
-        cout << wxT("Relative, ");
-#ifdef ODBC_V20
-    if (dbInf.fetchDirections & SQL_FD_FETCH_RESUME)
-        cout << wxT("Resume, ");
-#endif
-    if (dbInf.fetchDirections & SQL_FD_FETCH_BOOKMARK)
-        cout << wxT("Bookmark");
-    cout << endl;
-
-    cout << wxT("Lock Types Supported (SQLSetPos): ");
-    if (dbInf.lockTypes & SQL_LCK_NO_CHANGE)
-        cout << wxT("No Change, ");
-    if (dbInf.lockTypes & SQL_LCK_EXCLUSIVE)
-        cout << wxT("Exclusive, ");
-    if (dbInf.lockTypes & SQL_LCK_UNLOCK)
-        cout << wxT("UnLock");
-    cout << endl;
-
-    cout << wxT("Position Operations Supported (SQLSetPos): ");
-    if (dbInf.posOperations & SQL_POS_POSITION)
-        cout << wxT("Position, ");
-    if (dbInf.posOperations & SQL_POS_REFRESH)
-        cout << wxT("Refresh, ");
-    if (dbInf.posOperations & SQL_POS_UPDATE)
-        cout << wxT("Upd, "));
-    if (dbInf.posOperations & SQL_POS_DELETE)
-        cout << wxT("Del, ");
-    if (dbInf.posOperations & SQL_POS_ADD)
-        cout << wxT("Add");
-    cout << endl;
-
-    cout << wxT("Positioned Statements Supported: ");
-    if (dbInf.posStmts & SQL_PS_POSITIONED_DELETE)
-        cout << wxT("Pos delete, ");
-    if (dbInf.posStmts & SQL_PS_POSITIONED_UPDATE)
-        cout << wxT("Pos update, ");
-    if (dbInf.posStmts & SQL_PS_SELECT_FOR_UPDATE)
-        cout << wxT("Select for update");
-    cout << endl;
-
-    cout << wxT("Scroll Concurrency: ");
-    if (dbInf.scrollConcurrency & SQL_SCCO_READ_ONLY)
-        cout << wxT("Read Only, ");
-    if (dbInf.scrollConcurrency & SQL_SCCO_LOCK)
-        cout << wxT("Lock, ");
-    if (dbInf.scrollConcurrency & SQL_SCCO_OPT_ROWVER)
-        cout << wxT("Opt. Rowver, ");
-    if (dbInf.scrollConcurrency & SQL_SCCO_OPT_VALUES)
-        cout << wxT("Opt. Values");
-    cout << endl;
-
-    cout << wxT("Scroll Options: ");
-    if (dbInf.scrollOptions & SQL_SO_FORWARD_ONLY)
-        cout << wxT("Fwd Only, ");
-    if (dbInf.scrollOptions & SQL_SO_STATIC)
-        cout << wxT("Static, ");
-    if (dbInf.scrollOptions & SQL_SO_KEYSET_DRIVEN)
-        cout << wxT("Keyset Driven, ");
-    if (dbInf.scrollOptions & SQL_SO_DYNAMIC)
-        cout << wxT("Dynamic, ");
-    if (dbInf.scrollOptions & SQL_SO_MIXED)
-        cout << wxT("Mixed");
-    cout << endl;
-
-    cout << wxT("Static Sensitivity: ");
-    if (dbInf.staticSensitivity & SQL_SS_ADDITIONS)
-        cout << wxT("Additions, ");
-    if (dbInf.staticSensitivity & SQL_SS_DELETIONS)
-        cout << wxT("Deletions, ");
-    if (dbInf.staticSensitivity & SQL_SS_UPDATES)
-        cout << wxT("Updates");
-    cout << endl;
-
-    cout << wxT("Transaction Capable?: ");
-    switch(dbInf.txnCapable)
-    {
-        case SQL_TC_NONE:          cout << wxT("No");            break;
-        case SQL_TC_DML:           cout << wxT("DML Only");      break;
-        case SQL_TC_DDL_COMMIT:    cout << wxT("DDL Commit");    break;
-        case SQL_TC_DDL_IGNORE:    cout << wxT("DDL Ignore");    break;
-        case SQL_TC_ALL:           cout << wxT("DDL & DML");     break;
-    }
-    cout << endl;
-
-    cout << endl;
-#endif
-
-    // Completed Successfully
-    return true;
-
-} // wxDb::getDbInfo()
-
-
-/********** wxDb::getDataTypeInfo() **********/
-bool wxDb::getDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo)
-{
-/*
- * fSqlType will be something like SQL_VARCHAR.  This parameter determines
- * the data type inf. is gathered for.
- *
- * wxDbSqlTypeInfo is a structure that is filled in with data type information,
- */
-    RETCODE retcode;
-    SQLLEN  cbRet;
-
-    // Get information about the data type specified
-    if (SQLGetTypeInfo(hstmt, fSqlType) != SQL_SUCCESS)
-        return(DispAllErrors(henv, hdbc, hstmt));
-
-    // Fetch the record
-    retcode = SQLFetch(hstmt);
-    if (retcode != SQL_SUCCESS)
-    {
-#ifdef DBDEBUG_CONSOLE
-        if (retcode == SQL_NO_DATA_FOUND)
-            cout << wxT("SQL_NO_DATA_FOUND fetching information about data type.") << endl;
-#endif
-        DispAllErrors(henv, hdbc, hstmt);
-        SQLFreeStmt(hstmt, SQL_CLOSE);
-        return false;
-    }
-
-    wxChar typeName[DB_TYPE_NAME_LEN+1];
-
-    // Obtain columns from the record
-    if (SQLGetData(hstmt, 1, SQL_C_WXCHAR, typeName, sizeof(typeName), &cbRet) != SQL_SUCCESS)
-        return(DispAllErrors(henv, hdbc, hstmt));
-
-    structSQLTypeInfo.TypeName = typeName;
-
-    // BJO 20000503: no more needed with new GetColumns...
-#if  OLD_GETCOLUMNS
-    // BJO 991209
-    if (Dbms() == dbmsMY_SQL)
-    {
-        if (structSQLTypeInfo.TypeName == wxT("middleint"))
-            structSQLTypeInfo.TypeName = wxT("mediumint");
-        else if (structSQLTypeInfo.TypeName == wxT("middleint unsigned"))
-            structSQLTypeInfo.TypeName = wxT("mediumint unsigned");
-        else if (structSQLTypeInfo.TypeName == wxT("integer"))
-            structSQLTypeInfo.TypeName = wxT("int");
-        else if (structSQLTypeInfo.TypeName == wxT("integer unsigned"))
-            structSQLTypeInfo.TypeName = wxT("int unsigned");
-        else if (structSQLTypeInfo.TypeName == wxT("middleint"))
-            structSQLTypeInfo.TypeName = wxT("mediumint");
-        else if (structSQLTypeInfo.TypeName == wxT("varchar"))
-            structSQLTypeInfo.TypeName = wxT("char");
-    }
-
-    // BJO 20000427 : OpenLink driver
-    if (!wxStrncmp(dbInf.driverName, wxT("oplodbc"), 7) ||
-        !wxStrncmp(dbInf.driverName, wxT("OLOD"), 4))
-    {
-        if (structSQLTypeInfo.TypeName == wxT("double precision"))
-            structSQLTypeInfo.TypeName = wxT("real");
-    }
-#endif
-
-    if (SQLGetData(hstmt, 3, SQL_C_LONG, (UCHAR*) &structSQLTypeInfo.Precision, 0, &cbRet) != SQL_SUCCESS)
-        return(DispAllErrors(henv, hdbc, hstmt));
-    if (SQLGetData(hstmt, 8, SQL_C_SHORT, (UCHAR*) &structSQLTypeInfo.CaseSensitive, 0, &cbRet) != SQL_SUCCESS)
-        return(DispAllErrors(henv, hdbc, hstmt));
-//    if (SQLGetData(hstmt, 14, SQL_C_SHORT, (UCHAR*) &structSQLTypeInfo.MinimumScale, 0, &cbRet) != SQL_SUCCESS)
-//        return(DispAllErrors(henv, hdbc, hstmt));
-
-    if (SQLGetData(hstmt, 15, SQL_C_SHORT,(UCHAR*)  &structSQLTypeInfo.MaximumScale, 0, &cbRet) != SQL_SUCCESS)
-        return(DispAllErrors(henv, hdbc, hstmt));
-
-    if (structSQLTypeInfo.MaximumScale < 0)
-        structSQLTypeInfo.MaximumScale = 0;
-
-    // Close the statement handle which closes open cursors
-    if (SQLFreeStmt(hstmt, SQL_CLOSE) != SQL_SUCCESS)
-        return(DispAllErrors(henv, hdbc, hstmt));
-
-    // Completed Successfully
-    return true;
-
-} // wxDb::getDataTypeInfo()
-
-
-/********** wxDb::Close() **********/
-void wxDb::Close(void)
-{
-    // Close the Sql Log file
-    if (fpSqlLog)
-    {
-        fclose(fpSqlLog);
-        fpSqlLog = 0;
-    }
-
-    // Free statement handle
-    if (dbIsOpen)
-    {
-        if (SQLFreeStmt(hstmt, SQL_DROP) != SQL_SUCCESS)
-            DispAllErrors(henv, hdbc);
-    }
-
-    // Disconnect from the datasource
-    if (SQLDisconnect(hdbc) != SQL_SUCCESS)
-        DispAllErrors(henv, hdbc);
-
-    // Free the connection to the datasource
-    if (SQLFreeConnect(hdbc) != SQL_SUCCESS)
-        DispAllErrors(henv, hdbc);
-
-    // There should be zero Ctable objects still connected to this db object
-    wxASSERT(nTables == 0);
-
-#ifdef __WXDEBUG__
-    {
-        wxCriticalSectionLocker lock(csTablesInUse);
-        wxTablesInUse *tiu;
-        wxList::compatibility_iterator pNode;
-        pNode = TablesInUse.GetFirst();
-        wxString s,s2;
-        while (pNode)
-        {
-            tiu = (wxTablesInUse *)pNode->GetData();
-            if (tiu->pDb == this)
-            {
-                s.Printf(wxT("(%-20s)     tableID:[%6lu]     pDb:[%p]"),
-                        tiu->tableName, tiu->tableID, wx_static_cast(void*, tiu->pDb));
-                s2.Printf(wxT("Orphaned table found using pDb:[%p]"), wx_static_cast(void*, this));
-                wxLogDebug(s.c_str(),s2.c_str());
-            }
-            pNode = pNode->GetNext();
-        }
-    }
-#endif
-
-    // Copy the error messages to a global variable
-    int i;
-    for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
-        wxStrcpy(DBerrorList[i], errorList[i]);
-
-    dbmsType = dbmsUNIDENTIFIED;
-    dbIsOpen = false;
-
-} // wxDb::Close()
-
-
-/********** wxDb::CommitTrans() **********/
-bool wxDb::CommitTrans(void)
-{
-    if (this)
-    {
-        // Commit the transaction
-        if (SQLTransact(henv, hdbc, SQL_COMMIT) != SQL_SUCCESS)
-            return(DispAllErrors(henv, hdbc));
-    }
-
-    // Completed successfully
-    return true;
-
-} // wxDb::CommitTrans()
-
-
-/********** wxDb::RollbackTrans() **********/
-bool wxDb::RollbackTrans(void)
-{
-    // Rollback the transaction
-    if (SQLTransact(henv, hdbc, SQL_ROLLBACK) != SQL_SUCCESS)
-        return(DispAllErrors(henv, hdbc));
-
-    // Completed successfully
-    return true;
-
-} // wxDb::RollbackTrans()
-
-
-/********** wxDb::DispAllErrors() **********/
-bool wxDb::DispAllErrors(HENV aHenv, HDBC aHdbc, HSTMT aHstmt)
-/*
- * This function is called internally whenever an error condition prevents the user's
- * request from being executed.  This function will query the datasource as to the
- * actual error(s) that just occurred on the previous request of the datasource.
- *
- * The function will retrieve each error condition from the datasource and
- * Printf the codes/text values into a string which it then logs via logError().
- * If in DBDEBUG_CONSOLE mode, the constructed string will be displayed in the console
- * window and program execution will be paused until the user presses a key.
- *
- * This function always returns false, so that functions which call this function
- * can have a line like "return (DispAllErrors(henv, hdbc));" to indicate the failure
- * of the user's request, so that the calling code can then process the error message log.
- */
-{
-    wxString odbcErrMsg;
-
-   while (SQLError(aHenv, aHdbc, aHstmt, (SQLTCHAR FAR *) sqlState, &nativeError, (SQLTCHAR FAR *) errorMsg, SQL_MAX_MESSAGE_LENGTH - 1, &cbErrorMsg) == SQL_SUCCESS)
-     {
-        odbcErrMsg.Printf(wxT("SQL State = %s\nNative Error Code = %li\nError Message = %s\n"),
-                          sqlState, (long)nativeError, errorMsg);
-        logError(odbcErrMsg, sqlState);
-        if (!silent)
-        {
-#ifdef DBDEBUG_CONSOLE
-            // When run in console mode, use standard out to display errors.
-            cout << odbcErrMsg.c_str() << endl;
-            cout << wxT("Press any key to continue...") << endl;
-            getchar();
-#endif
-
-#ifdef __WXDEBUG__
-            wxLogDebug(odbcErrMsg,wxT("ODBC DEBUG MESSAGE from DispAllErrors()"));
-#endif
-        }
-    }
-
-    return false;  // This function always returns false.
-
-} // wxDb::DispAllErrors()
-
-
-/********** wxDb::GetNextError() **********/
-bool wxDb::GetNextError(HENV aHenv, HDBC aHdbc, HSTMT aHstmt)
-{
-   if (SQLError(aHenv, aHdbc, aHstmt, (SQLTCHAR FAR *) sqlState, &nativeError, (SQLTCHAR FAR *) errorMsg, SQL_MAX_MESSAGE_LENGTH - 1, &cbErrorMsg) == SQL_SUCCESS)
-     return true;
-    else
-        return false;
-
-} // wxDb::GetNextError()
-
-
-/********** wxDb::DispNextError() **********/
-void wxDb::DispNextError(void)
-{
-    wxString odbcErrMsg;
-
-    odbcErrMsg.Printf(wxT("SQL State = %s\nNative Error Code = %li\nError Message = %s\n"),
-                      sqlState, (long)nativeError, errorMsg);
-    logError(odbcErrMsg, sqlState);
-
-    if (silent)
-        return;
-
-#ifdef DBDEBUG_CONSOLE
-    // When run in console mode, use standard out to display errors.
-    cout << odbcErrMsg.c_str() << endl;
-    cout << wxT("Press any key to continue...")  << endl;
-    getchar();
-#endif
-
-#ifdef __WXDEBUG__
-    wxLogDebug(odbcErrMsg,wxT("ODBC DEBUG MESSAGE"));
-#endif  // __WXDEBUG__
-
-} // wxDb::DispNextError()
-
-
-/********** wxDb::logError() **********/
-void wxDb::logError(const wxString &errMsg, const wxString &SQLState)
-{
-    wxASSERT(errMsg.length());
-
-    static int pLast = -1;
-    int dbStatus;
-
-    if (++pLast == DB_MAX_ERROR_HISTORY)
-    {
-        int i;
-        for (i = 0; i < DB_MAX_ERROR_HISTORY-1; i++)
-            wxStrcpy(errorList[i], errorList[i+1]);
-        pLast--;
-    }
-
-    wxStrncpy(errorList[pLast], errMsg, DB_MAX_ERROR_MSG_LEN);
-    errorList[pLast][DB_MAX_ERROR_MSG_LEN] = 0;
-
-    if (SQLState.length())
-        if ((dbStatus = TranslateSqlState(SQLState)) != DB_ERR_FUNCTION_SEQUENCE_ERROR)
-            DB_STATUS = dbStatus;
-
-    // Add the errmsg to the sql log
-    WriteSqlLog(errMsg);
-
-}  // wxDb::logError()
-
-
-/**********wxDb::TranslateSqlState()  **********/
-int wxDb::TranslateSqlState(const wxString &SQLState)
-{
-    if (!wxStrcmp(SQLState, wxT("01000")))
-        return(DB_ERR_GENERAL_WARNING);
-    if (!wxStrcmp(SQLState, wxT("01002")))
-        return(DB_ERR_DISCONNECT_ERROR);
-    if (!wxStrcmp(SQLState, wxT("01004")))
-        return(DB_ERR_DATA_TRUNCATED);
-    if (!wxStrcmp(SQLState, wxT("01006")))
-        return(DB_ERR_PRIV_NOT_REVOKED);
-    if (!wxStrcmp(SQLState, wxT("01S00")))
-        return(DB_ERR_INVALID_CONN_STR_ATTR);
-    if (!wxStrcmp(SQLState, wxT("01S01")))
-        return(DB_ERR_ERROR_IN_ROW);
-    if (!wxStrcmp(SQLState, wxT("01S02")))
-        return(DB_ERR_OPTION_VALUE_CHANGED);
-    if (!wxStrcmp(SQLState, wxT("01S03")))
-        return(DB_ERR_NO_ROWS_UPD_OR_DEL);
-    if (!wxStrcmp(SQLState, wxT("01S04")))
-        return(DB_ERR_MULTI_ROWS_UPD_OR_DEL);
-    if (!wxStrcmp(SQLState, wxT("07001")))
-        return(DB_ERR_WRONG_NO_OF_PARAMS);
-    if (!wxStrcmp(SQLState, wxT("07006")))
-        return(DB_ERR_DATA_TYPE_ATTR_VIOL);
-    if (!wxStrcmp(SQLState, wxT("08001")))
-        return(DB_ERR_UNABLE_TO_CONNECT);
-    if (!wxStrcmp(SQLState, wxT("08002")))
-        return(DB_ERR_CONNECTION_IN_USE);
-    if (!wxStrcmp(SQLState, wxT("08003")))
-        return(DB_ERR_CONNECTION_NOT_OPEN);
-    if (!wxStrcmp(SQLState, wxT("08004")))
-        return(DB_ERR_REJECTED_CONNECTION);
-    if (!wxStrcmp(SQLState, wxT("08007")))
-        return(DB_ERR_CONN_FAIL_IN_TRANS);
-    if (!wxStrcmp(SQLState, wxT("08S01")))
-        return(DB_ERR_COMM_LINK_FAILURE);
-    if (!wxStrcmp(SQLState, wxT("21S01")))
-        return(DB_ERR_INSERT_VALUE_LIST_MISMATCH);
-    if (!wxStrcmp(SQLState, wxT("21S02")))
-        return(DB_ERR_DERIVED_TABLE_MISMATCH);
-    if (!wxStrcmp(SQLState, wxT("22001")))
-        return(DB_ERR_STRING_RIGHT_TRUNC);
-    if (!wxStrcmp(SQLState, wxT("22003")))
-        return(DB_ERR_NUMERIC_VALUE_OUT_OF_RNG);
-    if (!wxStrcmp(SQLState, wxT("22005")))
-        return(DB_ERR_ERROR_IN_ASSIGNMENT);
-    if (!wxStrcmp(SQLState, wxT("22008")))
-        return(DB_ERR_DATETIME_FLD_OVERFLOW);
-    if (!wxStrcmp(SQLState, wxT("22012")))
-        return(DB_ERR_DIVIDE_BY_ZERO);
-    if (!wxStrcmp(SQLState, wxT("22026")))
-        return(DB_ERR_STR_DATA_LENGTH_MISMATCH);
-    if (!wxStrcmp(SQLState, wxT("23000")))
-        return(DB_ERR_INTEGRITY_CONSTRAINT_VIOL);
-    if (!wxStrcmp(SQLState, wxT("24000")))
-        return(DB_ERR_INVALID_CURSOR_STATE);
-    if (!wxStrcmp(SQLState, wxT("25000")))
-        return(DB_ERR_INVALID_TRANS_STATE);
-    if (!wxStrcmp(SQLState, wxT("28000")))
-        return(DB_ERR_INVALID_AUTH_SPEC);
-    if (!wxStrcmp(SQLState, wxT("34000")))
-        return(DB_ERR_INVALID_CURSOR_NAME);
-    if (!wxStrcmp(SQLState, wxT("37000")))
-        return(DB_ERR_SYNTAX_ERROR_OR_ACCESS_VIOL);
-    if (!wxStrcmp(SQLState, wxT("3C000")))
-        return(DB_ERR_DUPLICATE_CURSOR_NAME);
-    if (!wxStrcmp(SQLState, wxT("40001")))
-        return(DB_ERR_SERIALIZATION_FAILURE);
-    if (!wxStrcmp(SQLState, wxT("42000")))
-        return(DB_ERR_SYNTAX_ERROR_OR_ACCESS_VIOL2);
-    if (!wxStrcmp(SQLState, wxT("70100")))
-        return(DB_ERR_OPERATION_ABORTED);
-    if (!wxStrcmp(SQLState, wxT("IM001")))
-        return(DB_ERR_UNSUPPORTED_FUNCTION);
-    if (!wxStrcmp(SQLState, wxT("IM002")))
-        return(DB_ERR_NO_DATA_SOURCE);
-    if (!wxStrcmp(SQLState, wxT("IM003")))
-        return(DB_ERR_DRIVER_LOAD_ERROR);
-    if (!wxStrcmp(SQLState, wxT("IM004")))
-        return(DB_ERR_SQLALLOCENV_FAILED);
-    if (!wxStrcmp(SQLState, wxT("IM005")))
-        return(DB_ERR_SQLALLOCCONNECT_FAILED);
-    if (!wxStrcmp(SQLState, wxT("IM006")))
-        return(DB_ERR_SQLSETCONNECTOPTION_FAILED);
-    if (!wxStrcmp(SQLState, wxT("IM007")))
-        return(DB_ERR_NO_DATA_SOURCE_DLG_PROHIB);
-    if (!wxStrcmp(SQLState, wxT("IM008")))
-        return(DB_ERR_DIALOG_FAILED);
-    if (!wxStrcmp(SQLState, wxT("IM009")))
-        return(DB_ERR_UNABLE_TO_LOAD_TRANSLATION_DLL);
-    if (!wxStrcmp(SQLState, wxT("IM010")))
-        return(DB_ERR_DATA_SOURCE_NAME_TOO_LONG);
-    if (!wxStrcmp(SQLState, wxT("IM011")))
-        return(DB_ERR_DRIVER_NAME_TOO_LONG);
-    if (!wxStrcmp(SQLState, wxT("IM012")))
-        return(DB_ERR_DRIVER_KEYWORD_SYNTAX_ERROR);
-    if (!wxStrcmp(SQLState, wxT("IM013")))
-        return(DB_ERR_TRACE_FILE_ERROR);
-    if (!wxStrcmp(SQLState, wxT("S0001")))
-        return(DB_ERR_TABLE_OR_VIEW_ALREADY_EXISTS);
-    if (!wxStrcmp(SQLState, wxT("S0002")))
-        return(DB_ERR_TABLE_NOT_FOUND);
-    if (!wxStrcmp(SQLState, wxT("S0011")))
-        return(DB_ERR_INDEX_ALREADY_EXISTS);
-    if (!wxStrcmp(SQLState, wxT("S0012")))
-        return(DB_ERR_INDEX_NOT_FOUND);
-    if (!wxStrcmp(SQLState, wxT("S0021")))
-        return(DB_ERR_COLUMN_ALREADY_EXISTS);
-    if (!wxStrcmp(SQLState, wxT("S0022")))
-        return(DB_ERR_COLUMN_NOT_FOUND);
-    if (!wxStrcmp(SQLState, wxT("S0023")))
-        return(DB_ERR_NO_DEFAULT_FOR_COLUMN);
-    if (!wxStrcmp(SQLState, wxT("S1000")))
-        return(DB_ERR_GENERAL_ERROR);
-    if (!wxStrcmp(SQLState, wxT("S1001")))
-        return(DB_ERR_MEMORY_ALLOCATION_FAILURE);
-    if (!wxStrcmp(SQLState, wxT("S1002")))
-        return(DB_ERR_INVALID_COLUMN_NUMBER);
-    if (!wxStrcmp(SQLState, wxT("S1003")))
-        return(DB_ERR_PROGRAM_TYPE_OUT_OF_RANGE);
-    if (!wxStrcmp(SQLState, wxT("S1004")))
-        return(DB_ERR_SQL_DATA_TYPE_OUT_OF_RANGE);
-    if (!wxStrcmp(SQLState, wxT("S1008")))
-        return(DB_ERR_OPERATION_CANCELLED);
-    if (!wxStrcmp(SQLState, wxT("S1009")))
-        return(DB_ERR_INVALID_ARGUMENT_VALUE);
-    if (!wxStrcmp(SQLState, wxT("S1010")))
-        return(DB_ERR_FUNCTION_SEQUENCE_ERROR);
-    if (!wxStrcmp(SQLState, wxT("S1011")))
-        return(DB_ERR_OPERATION_INVALID_AT_THIS_TIME);
-    if (!wxStrcmp(SQLState, wxT("S1012")))
-        return(DB_ERR_INVALID_TRANS_OPERATION_CODE);
-    if (!wxStrcmp(SQLState, wxT("S1015")))
-        return(DB_ERR_NO_CURSOR_NAME_AVAIL);
-    if (!wxStrcmp(SQLState, wxT("S1090")))
-        return(DB_ERR_INVALID_STR_OR_BUF_LEN);
-    if (!wxStrcmp(SQLState, wxT("S1091")))
-        return(DB_ERR_DESCRIPTOR_TYPE_OUT_OF_RANGE);
-    if (!wxStrcmp(SQLState, wxT("S1092")))
-        return(DB_ERR_OPTION_TYPE_OUT_OF_RANGE);
-    if (!wxStrcmp(SQLState, wxT("S1093")))
-        return(DB_ERR_INVALID_PARAM_NO);
-    if (!wxStrcmp(SQLState, wxT("S1094")))
-        return(DB_ERR_INVALID_SCALE_VALUE);
-    if (!wxStrcmp(SQLState, wxT("S1095")))
-        return(DB_ERR_FUNCTION_TYPE_OUT_OF_RANGE);
-    if (!wxStrcmp(SQLState, wxT("S1096")))
-        return(DB_ERR_INF_TYPE_OUT_OF_RANGE);
-    if (!wxStrcmp(SQLState, wxT("S1097")))
-        return(DB_ERR_COLUMN_TYPE_OUT_OF_RANGE);
-    if (!wxStrcmp(SQLState, wxT("S1098")))
-        return(DB_ERR_SCOPE_TYPE_OUT_OF_RANGE);
-    if (!wxStrcmp(SQLState, wxT("S1099")))
-        return(DB_ERR_NULLABLE_TYPE_OUT_OF_RANGE);
-    if (!wxStrcmp(SQLState, wxT("S1100")))
-        return(DB_ERR_UNIQUENESS_OPTION_TYPE_OUT_OF_RANGE);
-    if (!wxStrcmp(SQLState, wxT("S1101")))
-        return(DB_ERR_ACCURACY_OPTION_TYPE_OUT_OF_RANGE);
-    if (!wxStrcmp(SQLState, wxT("S1103")))
-        return(DB_ERR_DIRECTION_OPTION_OUT_OF_RANGE);
-    if (!wxStrcmp(SQLState, wxT("S1104")))
-        return(DB_ERR_INVALID_PRECISION_VALUE);
-    if (!wxStrcmp(SQLState, wxT("S1105")))
-        return(DB_ERR_INVALID_PARAM_TYPE);
-    if (!wxStrcmp(SQLState, wxT("S1106")))
-        return(DB_ERR_FETCH_TYPE_OUT_OF_RANGE);
-    if (!wxStrcmp(SQLState, wxT("S1107")))
-        return(DB_ERR_ROW_VALUE_OUT_OF_RANGE);
-    if (!wxStrcmp(SQLState, wxT("S1108")))
-        return(DB_ERR_CONCURRENCY_OPTION_OUT_OF_RANGE);
-    if (!wxStrcmp(SQLState, wxT("S1109")))
-        return(DB_ERR_INVALID_CURSOR_POSITION);
-    if (!wxStrcmp(SQLState, wxT("S1110")))
-        return(DB_ERR_INVALID_DRIVER_COMPLETION);
-    if (!wxStrcmp(SQLState, wxT("S1111")))
-        return(DB_ERR_INVALID_BOOKMARK_VALUE);
-    if (!wxStrcmp(SQLState, wxT("S1C00")))
-        return(DB_ERR_DRIVER_NOT_CAPABLE);
-    if (!wxStrcmp(SQLState, wxT("S1T00")))
-        return(DB_ERR_TIMEOUT_EXPIRED);
-
-    // No match
-    return(0);
-
-}  // wxDb::TranslateSqlState()
-
-
-/**********  wxDb::Grant() **********/
-bool wxDb::Grant(int privileges, const wxString &tableName, const wxString &userList)
-{
-    wxString sqlStmt;
-
-    // Build the grant statement
-    sqlStmt  = wxT("GRANT ");
-    if (privileges == DB_GRANT_ALL)
-        sqlStmt += wxT("ALL");
-    else
-    {
-        int c = 0;
-        if (privileges & DB_GRANT_SELECT)
-        {
-            sqlStmt += wxT("SELECT");
-            c++;
-        }
-        if (privileges & DB_GRANT_INSERT)
-        {
-            if (c++)
-                sqlStmt += wxT(", ");
-            sqlStmt += wxT("INSERT");
-        }
-        if (privileges & DB_GRANT_UPDATE)
-        {
-            if (c++)
-                sqlStmt += wxT(", ");
-            sqlStmt += wxT("UPDATE");
-        }
-        if (privileges & DB_GRANT_DELETE)
-        {
-            if (c++)
-                sqlStmt += wxT(", ");
-            sqlStmt += wxT("DELETE");
-        }
-    }
-
-    sqlStmt += wxT(" ON ");
-    sqlStmt += SQLTableName(tableName);
-    sqlStmt += wxT(" TO ");
-    sqlStmt += userList;
-
-#ifdef DBDEBUG_CONSOLE
-    cout << endl << sqlStmt.c_str() << endl;
-#endif
-
-    WriteSqlLog(sqlStmt);
-
-    return(ExecSql(sqlStmt));
-
-}  // wxDb::Grant()
-
-
-/********** wxDb::CreateView() **********/
-bool wxDb::CreateView(const wxString &viewName, const wxString &colList,
-                      const wxString &pSqlStmt, bool attemptDrop)
-{
-    wxString sqlStmt;
-
-    // Drop the view first
-    if (attemptDrop && !DropView(viewName))
-        return false;
-
-    // Build the create view statement
-    sqlStmt  = wxT("CREATE VIEW ");
-    sqlStmt += viewName;
-
-    if (colList.length())
-    {
-        sqlStmt += wxT(" (");
-        sqlStmt += colList;
-        sqlStmt += wxT(")");
-    }
-
-    sqlStmt += wxT(" AS ");
-    sqlStmt += pSqlStmt;
-
-    WriteSqlLog(sqlStmt);
-
-#ifdef DBDEBUG_CONSOLE
-    cout << sqlStmt.c_str() << endl;
-#endif
-
-    return(ExecSql(sqlStmt));
-
-}  // wxDb::CreateView()
-
-
-/********** wxDb::DropView()  **********/
-bool wxDb::DropView(const wxString &viewName)
-{
-/*
- * NOTE: This function returns true if the View does not exist, but
- *       only for identified databases.  Code will need to be added
- *            below for any other databases when those databases are defined
- *       to handle this situation consistently
- */
-    wxString sqlStmt;
-
-    sqlStmt.Printf(wxT("DROP VIEW %s"), viewName.c_str());
-
-    WriteSqlLog(sqlStmt);
-
-#ifdef DBDEBUG_CONSOLE
-    cout << endl << sqlStmt.c_str() << endl;
-#endif
-
-    if (SQLExecDirect(hstmt, WXSQLCAST(sqlStmt), SQL_NTS) != SQL_SUCCESS)
-    {
-        // Check for "Base table not found" error and ignore
-        GetNextError(henv, hdbc, hstmt);
-        if (wxStrcmp(sqlState,wxT("S0002")))  // "Base table not found"
-        {
-            // Check for product specific error codes
-            if (!((Dbms() == dbmsSYBASE_ASA    && !wxStrcmp(sqlState,wxT("42000")))))  // 5.x (and lower?)
-            {
-                DispNextError();
-                DispAllErrors(henv, hdbc, hstmt);
-                RollbackTrans();
-                return false;
-            }
-        }
-    }
-
-    // Commit the transaction
-    if (!CommitTrans())
-        return false;
-
-    return true;
-
-}  // wxDb::DropView()
-
-
-/********** wxDb::ExecSql()  **********/
-bool wxDb::ExecSql(const wxString &pSqlStmt)
-{
-    RETCODE retcode;
-
-    SQLFreeStmt(hstmt, SQL_CLOSE);
-
-    retcode = SQLExecDirect(hstmt, WXSQLCAST(pSqlStmt), SQL_NTS);
-    if (retcode == SQL_SUCCESS ||
-        (Dbms() == dbmsDB2 && (retcode == SQL_SUCCESS_WITH_INFO || retcode == SQL_NO_DATA_FOUND)))
-    {
-        return true;
-    }
-    else
-    {
-        DispAllErrors(henv, hdbc, hstmt);
-        return false;
-    }
-
-}  // wxDb::ExecSql()
-
-
-/********** wxDb::ExecSql() with column info **********/
-bool wxDb::ExecSql(const wxString &pSqlStmt, wxDbColInf** columns, short& numcols)
-{
-    //execute the statement first
-    if (!ExecSql(pSqlStmt))
-        return false;
-
-    SWORD noCols;
-    if (SQLNumResultCols(hstmt, &noCols) != SQL_SUCCESS)
-    {
-        DispAllErrors(henv, hdbc, hstmt);
-        return false;
-    }
-
-    if (noCols == 0)
-        return false;
-    else
-        numcols = noCols;
-
-    //  Get column information
-    short colNum;
-    wxChar name[DB_MAX_COLUMN_NAME_LEN+1];
-    SWORD Sword;
-    SQLLEN Sqllen;
-    wxDbColInf* pColInf = new wxDbColInf[noCols];
-
-    // Fill in column information (name, datatype)
-    for (colNum = 0; colNum < noCols; colNum++)
-    {
-        if (SQLColAttributes(hstmt, (UWORD)(colNum+1), SQL_COLUMN_NAME,
-            name, sizeof(name),
-            &Sword, &Sqllen) != SQL_SUCCESS)
-        {
-            DispAllErrors(henv, hdbc, hstmt);
-            delete[] pColInf;
-            return false;
-        }
-
-        wxStrncpy(pColInf[colNum].colName, name, DB_MAX_COLUMN_NAME_LEN);
-        pColInf[colNum].colName[DB_MAX_COLUMN_NAME_LEN] = 0;  // Prevent buffer overrun
-
-        if (SQLColAttributes(hstmt, (UWORD)(colNum+1), SQL_COLUMN_TYPE,
-            NULL, 0, &Sword, &Sqllen) != SQL_SUCCESS)
-        {
-            DispAllErrors(henv, hdbc, hstmt);
-            delete[] pColInf;
-            return false;
-        }
-
-        switch (Sqllen)
-        {
-#if wxUSE_UNICODE
-    #if defined(SQL_WCHAR)
-            case SQL_WCHAR:
-    #endif
-    #if defined(SQL_WVARCHAR)
-            case SQL_WVARCHAR:
-    #endif
-#endif
-            case SQL_VARCHAR:
-            case SQL_CHAR:
-                pColInf[colNum].dbDataType = DB_DATA_TYPE_VARCHAR;
-                break;
-            case SQL_LONGVARCHAR:
-                pColInf[colNum].dbDataType = DB_DATA_TYPE_MEMO;
-                break;
-            case SQL_TINYINT:
-            case SQL_SMALLINT:
-            case SQL_INTEGER:
-            case SQL_BIT:
-                pColInf[colNum].dbDataType = DB_DATA_TYPE_INTEGER;
-                break;
-            case SQL_DOUBLE:
-            case SQL_DECIMAL:
-            case SQL_NUMERIC:
-            case SQL_FLOAT:
-            case SQL_REAL:
-                pColInf[colNum].dbDataType = DB_DATA_TYPE_FLOAT;
-                break;
-            case SQL_DATE:
-            case SQL_TIMESTAMP:
-                pColInf[colNum].dbDataType = DB_DATA_TYPE_DATE;
-                break;
-            case SQL_BINARY:
-                pColInf[colNum].dbDataType = DB_DATA_TYPE_BLOB;
-                break;
-#ifdef __WXDEBUG__
-            default:
-                wxString errMsg;
-                errMsg.Printf(wxT("SQL Data type %ld currently not supported by wxWidgets"), (long)Sqllen);
-                wxLogDebug(errMsg,wxT("ODBC DEBUG MESSAGE"));
-#endif
-        }
-    }
-
-    *columns = pColInf;
-    return true;
-}  // wxDb::ExecSql()
-
-/********** wxDb::GetNext()  **********/
-bool wxDb::GetNext(void)
-{
-    if (SQLFetch(hstmt) == SQL_SUCCESS)
-        return true;
-    else
-    {
-        DispAllErrors(henv, hdbc, hstmt);
-        return false;
-    }
-
-}  // wxDb::GetNext()
-
-
-/********** wxDb::GetData()  **********/
-bool wxDb::GetData(UWORD colNo, SWORD cType, PTR pData, SDWORD maxLen, SQLLEN FAR *cbReturned)
-{
-    wxASSERT(pData);
-    wxASSERT(cbReturned);
-
-    long bufferSize = maxLen;
-
-    if (cType == SQL_C_WXCHAR)
-        bufferSize = maxLen * sizeof(wxChar);
-
-    if (SQLGetData(hstmt, colNo, cType, pData, bufferSize, cbReturned) == SQL_SUCCESS)
-        return true;
-    else
-    {
-        DispAllErrors(henv, hdbc, hstmt);
-        return false;
-    }
-
-}  // wxDb::GetData()
-
-
-/********** wxDb::GetKeyFields() **********/
-int wxDb::GetKeyFields(const wxString &tableName, wxDbColInf* colInf, UWORD noCols)
-{
-    wxChar       szPkTable[DB_MAX_TABLE_NAME_LEN+1];  /* Primary key table name */
-    wxChar       szFkTable[DB_MAX_TABLE_NAME_LEN+1];  /* Foreign key table name */
-    SWORD        iKeySeq;
-    wxChar       szPkCol[DB_MAX_COLUMN_NAME_LEN+1];   /* Primary key column     */
-    wxChar       szFkCol[DB_MAX_COLUMN_NAME_LEN+1];   /* Foreign key column     */
-    SQLRETURN    retcode;
-    SQLLEN       cb;
-    SWORD        i;
-    wxString     tempStr;
-    /*
-     * -----------------------------------------------------------------------
-     * -- 19991224 : mj10777 : Create                                   ------
-     * --          : Three things are done and stored here :            ------
-     * --          : 1) which Column(s) is/are Primary Key(s)           ------
-     * --          : 2) which tables use this Key as a Foreign Key      ------
-     * --          : 3) which columns are Foreign Key and the name      ------
-     * --          :     of the Table where the Key is the Primary Key  -----
-     * --          : Called from GetColumns(const wxString &tableName,  ------
-     * --                           int *numCols,const wxChar *userID ) ------
-     * -----------------------------------------------------------------------
-     */
-
-    /*---------------------------------------------------------------------*/
-    /* Get the names of the columns in the primary key.                    */
-    /*---------------------------------------------------------------------*/
-    retcode = SQLPrimaryKeys(hstmt,
-                             NULL, 0,                               /* Catalog name  */
-                             NULL, 0,                               /* Schema name   */
-                             WXSQLCAST(tableName), SQL_NTS); /* Table name    */
-
-    /*---------------------------------------------------------------------*/
-    /* Fetch and display the result set. This will be a list of the        */
-    /* columns in the primary key of the tableName table.                  */
-    /*---------------------------------------------------------------------*/
-    while ((retcode == SQL_SUCCESS) || (retcode == SQL_SUCCESS_WITH_INFO))
-    {
-        retcode = SQLFetch(hstmt);
-        if (retcode == SQL_SUCCESS || retcode == SQL_SUCCESS_WITH_INFO)
-        {
-            GetData( 4, SQL_C_WXCHAR,  szPkCol,    DB_MAX_COLUMN_NAME_LEN+1, &cb);
-            GetData( 5, SQL_C_SSHORT, &iKeySeq,    0,                        &cb);
-            //-------
-            for (i=0;i<noCols;i++)                          // Find the Column name
-                if (!wxStrcmp(colInf[i].colName,szPkCol))   // We have found the Column
-                    colInf[i].PkCol = iKeySeq;              // Which Primary Key is this (first, second usw.) ?
-        }  // if
-    }  // while
-    SQLFreeStmt(hstmt, SQL_CLOSE);  /* Close the cursor (the hstmt is still allocated).      */
-
-    /*---------------------------------------------------------------------*/
-    /* Get all the foreign keys that refer to tableName primary key.       */
-    /*---------------------------------------------------------------------*/
-    retcode = SQLForeignKeys(hstmt,
-                             NULL, 0,                            /* Primary catalog */
-                             NULL, 0,                            /* Primary schema  */
-                             WXSQLCAST(tableName), SQL_NTS,/* Primary table   */
-                             NULL, 0,                            /* Foreign catalog */
-                             NULL, 0,                            /* Foreign schema  */
-                             NULL, 0);                           /* Foreign table   */
-
-    /*---------------------------------------------------------------------*/
-    /* Fetch and display the result set. This will be all of the foreign   */
-    /* keys in other tables that refer to the tableName  primary key.      */
-    /*---------------------------------------------------------------------*/
-    tempStr.Empty();
-    szPkCol[0] = 0;
-    while ((retcode == SQL_SUCCESS) || (retcode == SQL_SUCCESS_WITH_INFO))
-    {
-        retcode = SQLFetch(hstmt);
-        if (retcode == SQL_SUCCESS || retcode == SQL_SUCCESS_WITH_INFO)
-        {
-            GetData( 3, SQL_C_WXCHAR,  szPkTable,   DB_MAX_TABLE_NAME_LEN+1,   &cb);
-            GetData( 4, SQL_C_WXCHAR,  szPkCol,     DB_MAX_COLUMN_NAME_LEN+1,  &cb);
-            GetData( 5, SQL_C_SSHORT, &iKeySeq,     0,                         &cb);
-            GetData( 7, SQL_C_WXCHAR,  szFkTable,   DB_MAX_TABLE_NAME_LEN+1,   &cb);
-            GetData( 8, SQL_C_WXCHAR,  szFkCol,     DB_MAX_COLUMN_NAME_LEN+1,  &cb);
-            tempStr << _T('[') << szFkTable << _T(']');  // [ ] in case there is a blank in the Table name
-        }  // if
-    }  // while
-
-    tempStr.Trim();     // Get rid of any unneeded blanks
-    if (!tempStr.empty())
-    {
-        for (i=0; i<noCols; i++)
-        {   // Find the Column name
-            if (!wxStrcmp(colInf[i].colName, szPkCol))           // We have found the Column, store the Information
-            {
-                wxStrncpy(colInf[i].PkTableName, tempStr.c_str(), DB_MAX_TABLE_NAME_LEN);  // Name of the Tables where this Primary Key is used as a Foreign Key
-                colInf[i].PkTableName[DB_MAX_TABLE_NAME_LEN] = 0;  // Prevent buffer overrun
-            }
-        }
-    }  // if
-
-    SQLFreeStmt(hstmt, SQL_CLOSE);  /* Close the cursor (the hstmt is still allocated). */
-
-    /*---------------------------------------------------------------------*/
-    /* Get all the foreign keys in the tablename table.                    */
-    /*---------------------------------------------------------------------*/
-    retcode = SQLForeignKeys(hstmt,
-                             NULL, 0,                             /* Primary catalog   */
-                             NULL, 0,                             /* Primary schema    */
-                             NULL, 0,                             /* Primary table     */
-                             NULL, 0,                             /* Foreign catalog   */
-                             NULL, 0,                             /* Foreign schema    */
-                             WXSQLCAST(tableName), SQL_NTS);/* Foreign table     */
-
-    /*---------------------------------------------------------------------*/
-    /*  Fetch and display the result set. This will be all of the          */
-    /*  primary keys in other tables that are referred to by foreign       */
-    /*  keys in the tableName table.                                       */
-    /*---------------------------------------------------------------------*/
-    while ((retcode == SQL_SUCCESS) || (retcode == SQL_SUCCESS_WITH_INFO))
-    {
-        retcode = SQLFetch(hstmt);
-        if (retcode == SQL_SUCCESS || retcode == SQL_SUCCESS_WITH_INFO)
-        {
-            GetData( 3, SQL_C_WXCHAR,  szPkTable,   DB_MAX_TABLE_NAME_LEN+1,  &cb);
-            GetData( 5, SQL_C_SSHORT, &iKeySeq,     0,                        &cb);
-            GetData( 8, SQL_C_WXCHAR,  szFkCol,     DB_MAX_COLUMN_NAME_LEN+1, &cb);
-            //-------
-            for (i=0; i<noCols; i++)                            // Find the Column name
-            {
-                if (!wxStrcmp(colInf[i].colName,szFkCol))       // We have found the (Foreign Key) Column
-                {
-                    colInf[i].FkCol = iKeySeq;                  // Which Foreign Key is this (first, second usw.) ?
-                    wxStrncpy(colInf[i].FkTableName, szFkTable, DB_MAX_TABLE_NAME_LEN);  // Name of the Table where this Foriegn is the Primary Key
-                    colInf[i].FkTableName[DB_MAX_TABLE_NAME_LEN] = 0;  // Prevent buffer overrun
-                } // if
-            }  // for
-        }  // if
-    }  // while
-    SQLFreeStmt(hstmt, SQL_CLOSE);  /* Close the cursor (the hstmt is still allocated). */
-
-    return TRUE;
-
-}  // wxDb::GetKeyFields()
-
-
-#if OLD_GETCOLUMNS
-/********** wxDb::GetColumns() **********/
-wxDbColInf *wxDb::GetColumns(wxChar *tableName[], const wxChar *userID)
-/*
- *        1) The last array element of the tableName[] argument must be zero (null).
- *            This is how the end of the array is detected.
- *        2) This function returns an array of wxDbColInf structures.  If no columns
- *            were found, or an error occurred, this pointer will be zero (null).  THE
- *            CALLING FUNCTION IS RESPONSIBLE FOR DELETING THE MEMORY RETURNED WHEN IT
- *            IS FINISHED WITH IT.  i.e.
- *
- *            wxDbColInf *colInf = pDb->GetColumns(tableList, userID);
- *            if (colInf)
- *            {
- *                // Use the column inf
- *                .......
- *                // Destroy the memory
- *                delete [] colInf;
- *            }
- *
- * userID is evaluated in the following manner:
- *        userID == NULL  ... UserID is ignored
- *        userID == ""    ... UserID set equal to 'this->uid'
- *        userID != ""    ... UserID set equal to 'userID'
- *
- * NOTE: ALL column bindings associated with this wxDb instance are unbound
- *       by this function.  This function should use its own wxDb instance
- *       to avoid undesired unbinding of columns.
- */
-{
-    UWORD       noCols = 0;
-    UWORD       colNo  = 0;
-    wxDbColInf *colInf = 0;
-
-    RETCODE  retcode;
-    SQLLEN   cb;
-
-    wxString TableName;
-
-    wxString UserID;
-    convertUserID(userID,UserID);
-
-    // Pass 1 - Determine how many columns there are.
-    // Pass 2 - Allocate the wxDbColInf array and fill in
-    //                the array with the column information.
-    int pass;
-    for (pass = 1; pass <= 2; pass++)
-    {
-        if (pass == 2)
-        {
-            if (noCols == 0)  // Probably a bogus table name(s)
-                break;
-            // Allocate n wxDbColInf objects to hold the column information
-            colInf = new wxDbColInf[noCols+1];
-            if (!colInf)
-                break;
-            // Mark the end of the array
-            wxStrcpy(colInf[noCols].tableName, wxEmptyString);
-            wxStrcpy(colInf[noCols].colName, wxEmptyString);
-            colInf[noCols].sqlDataType = 0;
-        }
-        // Loop through each table name
-        int tbl;
-        for (tbl = 0; tableName[tbl]; tbl++)
-        {
-            TableName = tableName[tbl];
-            // Oracle and Interbase table names are uppercase only, so force
-            // the name to uppercase just in case programmer forgot to do this
-            if ((Dbms() == dbmsORACLE) ||
-                (Dbms() == dbmsFIREBIRD) ||
-                (Dbms() == dbmsINTERBASE))
-                TableName = TableName.Upper();
-
-            SQLFreeStmt(hstmt, SQL_CLOSE);
-
-            // MySQL, SQLServer, and Access cannot accept a user name when looking up column names, so we
-            // use the call below that leaves out the user name
-            if (!UserID.empty() &&
-                Dbms() != dbmsMY_SQL &&
-                Dbms() != dbmsACCESS &&
-                Dbms() != dbmsMS_SQL_SERVER)
-            {
-                retcode = SQLColumns(hstmt,
-                                     NULL, 0,                                // All qualifiers
-                                     WXSQLCAST(UserID), SQL_NTS,      // Owner
-                                     WXSQLCAST(TableName), SQL_NTS,
-                                     NULL, 0);                               // All columns
-            }
-            else
-            {
-                retcode = SQLColumns(hstmt,
-                                     NULL, 0,                                // All qualifiers
-                                     NULL, 0,                                // Owner
-                                     WXSQLCAST(TableName), SQL_NTS,
-                                     NULL, 0);                               // All columns
-            }
-            if (retcode != SQL_SUCCESS)
-            {  // Error occurred, abort
-                DispAllErrors(henv, hdbc, hstmt);
-                if (colInf)
-                    delete [] colInf;
-                SQLFreeStmt(hstmt, SQL_CLOSE);
-                return(0);
-            }
-
-            while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
-            {
-                if (pass == 1)  // First pass, just add up the number of columns
-                    noCols++;
-                else  // Pass 2; Fill in the array of structures
-                {
-                    if (colNo < noCols)  // Some extra error checking to prevent memory overwrites
-                    {
-                        // NOTE: Only the ODBC 1.x fields are retrieved
-                        GetData( 1, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].catalog,      128+1,                    &cb);
-                        GetData( 2, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].schema,       128+1,                    &cb);
-                        GetData( 3, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].tableName,    DB_MAX_TABLE_NAME_LEN+1,  &cb);
-                        GetData( 4, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].colName,      DB_MAX_COLUMN_NAME_LEN+1, &cb);
-                        GetData( 5, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].sqlDataType,  0,                        &cb);
-                        GetData( 6, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].typeName,     128+1,                    &cb);
-                        GetData( 7, SQL_C_SLONG,  (UCHAR*) &colInf[colNo].columnLength, 0,                        &cb);
-                        GetData( 8, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].bufferSize,   0,                        &cb);
-                        GetData( 9, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].decimalDigits,0,                        &cb);
-                        GetData(10, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].numPrecRadix, 0,                        &cb);
-                        GetData(11, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].nullable,     0,                        &cb);
-                        GetData(12, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].remarks,      254+1,                    &cb);
-
-                        // Determine the wxDb data type that is used to represent the native data type of this data source
-                        colInf[colNo].dbDataType = 0;
-                        if (!wxStricmp(typeInfVarchar.TypeName,colInf[colNo].typeName))
-                        {
-#ifdef _IODBC_
-                            // IODBC does not return a correct columnLength, so we set
-                            // columnLength = bufferSize if no column length was returned
-                            // IODBC returns the columnLength in bufferSize. (bug)
-                            if (colInf[colNo].columnLength < 1)
-                            {
-                               colInf[colNo].columnLength = colInf[colNo].bufferSize;
-                            }
-#endif
-                            colInf[colNo].dbDataType = DB_DATA_TYPE_VARCHAR;
-                        }
-                        else if (!wxStricmp(typeInfInteger.TypeName, colInf[colNo].typeName))
-                            colInf[colNo].dbDataType = DB_DATA_TYPE_INTEGER;
-                        else if (!wxStricmp(typeInfFloat.TypeName, colInf[colNo].typeName))
-                            colInf[colNo].dbDataType = DB_DATA_TYPE_FLOAT;
-                        else if (!wxStricmp(typeInfDate.TypeName, colInf[colNo].typeName))
-                            colInf[colNo].dbDataType = DB_DATA_TYPE_DATE;
-                        else if (!wxStricmp(typeInfBlob.TypeName, colInf[colNo].typeName))
-                            colInf[colNo].dbDataType = DB_DATA_TYPE_BLOB;
-                        colNo++;
-                    }
-                }
-            }
-            if (retcode != SQL_NO_DATA_FOUND)
-            {  // Error occurred, abort
-                DispAllErrors(henv, hdbc, hstmt);
-                if (colInf)
-                    delete [] colInf;
-                SQLFreeStmt(hstmt, SQL_CLOSE);
-                return(0);
-            }
-        }
-    }
-
-    SQLFreeStmt(hstmt, SQL_CLOSE);
-    return colInf;
-
-}  // wxDb::GetColumns()
-
-
-/********** wxDb::GetColumns() **********/
-
-wxDbColInf *wxDb::GetColumns(const wxString &tableName, UWORD *numCols, const wxChar *userID)
-//
-// Same as the above GetColumns() function except this one gets columns
-// only for a single table, and if 'numCols' is not NULL, the number of
-// columns stored in the returned wxDbColInf is set in '*numCols'
-//
-// userID is evaluated in the following manner:
-//        userID == NULL  ... UserID is ignored
-//        userID == ""    ... UserID set equal to 'this->uid'
-//        userID != ""    ... UserID set equal to 'userID'
-//
-// NOTE: ALL column bindings associated with this wxDb instance are unbound
-//       by this function.  This function should use its own wxDb instance
-//       to avoid undesired unbinding of columns.
-
-{
-    UWORD       noCols = 0;
-    UWORD       colNo  = 0;
-    wxDbColInf *colInf = 0;
-
-    RETCODE  retcode;
-    SQLLEN   cb;
-
-    wxString TableName;
-
-    wxString UserID;
-    convertUserID(userID,UserID);
-
-    // Pass 1 - Determine how many columns there are.
-    // Pass 2 - Allocate the wxDbColInf array and fill in
-    //                the array with the column information.
-    int pass;
-    for (pass = 1; pass <= 2; pass++)
-    {
-        if (pass == 2)
-        {
-            if (noCols == 0)  // Probably a bogus table name(s)
-                break;
-            // Allocate n wxDbColInf objects to hold the column information
-            colInf = new wxDbColInf[noCols+1];
-            if (!colInf)
-                break;
-            // Mark the end of the array
-            wxStrcpy(colInf[noCols].tableName, wxEmptyString);
-            wxStrcpy(colInf[noCols].colName, wxEmptyString);
-            colInf[noCols].sqlDataType = 0;
-        }
-
-        TableName = tableName;
-        // Oracle and Interbase table names are uppercase only, so force
-        // the name to uppercase just in case programmer forgot to do this
-        if ((Dbms() == dbmsORACLE) ||
-            (Dbms() == dbmsFIREBIRD) ||
-            (Dbms() == dbmsINTERBASE))
-            TableName = TableName.Upper();
-
-        SQLFreeStmt(hstmt, SQL_CLOSE);
-
-        // MySQL, SQLServer, and Access cannot accept a user name when looking up column names, so we
-        // use the call below that leaves out the user name
-        if (!UserID.empty() &&
-            Dbms() != dbmsMY_SQL &&
-            Dbms() != dbmsACCESS &&
-            Dbms() != dbmsMS_SQL_SERVER)
-        {
-            retcode = SQLColumns(hstmt,
-                                 NULL, 0,                                // All qualifiers
-                                 WXSQLCAST(UserID), SQL_NTS,    // Owner
-                                 WXSQLCAST(TableName), SQL_NTS,
-                                 NULL, 0);                               // All columns
-        }
-        else
-        {
-            retcode = SQLColumns(hstmt,
-                                 NULL, 0,                                 // All qualifiers
-                                 NULL, 0,                                 // Owner
-                                 WXSQLCAST(TableName), SQL_NTS,
-                                 NULL, 0);                                // All columns
-        }
-        if (retcode != SQL_SUCCESS)
-        {  // Error occurred, abort
-            DispAllErrors(henv, hdbc, hstmt);
-            if (colInf)
-                delete [] colInf;
-            SQLFreeStmt(hstmt, SQL_CLOSE);
-            if (numCols)
-                *numCols = 0;
-            return(0);
-        }
-
-        while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
-        {
-            if (pass == 1)  // First pass, just add up the number of columns
-                noCols++;
-            else  // Pass 2; Fill in the array of structures
-            {
-                if (colNo < noCols)  // Some extra error checking to prevent memory overwrites
-                {
-                    // NOTE: Only the ODBC 1.x fields are retrieved
-                    GetData( 1, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].catalog,      128+1,                     &cb);
-                    GetData( 2, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].schema,       128+1,                     &cb);
-                    GetData( 3, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].tableName,    DB_MAX_TABLE_NAME_LEN+1,   &cb);
-                    GetData( 4, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].colName,      DB_MAX_COLUMN_NAME_LEN+1,  &cb);
-                    GetData( 5, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].sqlDataType,  0,                         &cb);
-                    GetData( 6, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].typeName,     128+1,                     &cb);
-                    GetData( 7, SQL_C_SLONG,  (UCHAR*) &colInf[colNo].columnLength, 0,                         &cb);
-                    // BJO 991214 : SQL_C_SSHORT instead of SQL_C_SLONG, otherwise fails on Sparc (probably all 64 bit architectures)
-                    GetData( 8, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].bufferSize,   0,                         &cb);
-                    GetData( 9, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].decimalDigits,0,                         &cb);
-                    GetData(10, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].numPrecRadix, 0,                         &cb);
-                    GetData(11, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].nullable,     0,                         &cb);
-                    GetData(12, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].remarks,      254+1,                     &cb);
-                    // Start Values for Primary/Foriegn Key (=No)
-                    colInf[colNo].PkCol = 0;           // Primary key column   0=No; 1= First Key, 2 = Second Key etc.
-                    colInf[colNo].PkTableName[0] = 0;  // Tablenames where Primary Key is used as a Foreign Key
-                    colInf[colNo].FkCol = 0;           // Foreign key column   0=No; 1= First Key, 2 = Second Key etc.
-                    colInf[colNo].FkTableName[0] = 0;  // Foreign key table name
-
-                    // BJO 20000428 : Virtuoso returns type names with upper cases!
-                    if (Dbms() == dbmsVIRTUOSO)
-                    {
-                        wxString s = colInf[colNo].typeName;
-                        s = s.MakeLower();
-                        wxStrcmp(colInf[colNo].typeName, s.c_str());
-                    }
-
-                    // Determine the wxDb data type that is used to represent the native data type of this data source
-                    colInf[colNo].dbDataType = 0;
-                    if (!wxStricmp(typeInfVarchar.TypeName, colInf[colNo].typeName))
-                    {
-#ifdef _IODBC_
-                        // IODBC does not return a correct columnLength, so we set
-                        // columnLength = bufferSize if no column length was returned
-                        // IODBC returns the columnLength in bufferSize. (bug)
-                        if (colInf[colNo].columnLength < 1)
-                        {
-                           colInf[colNo].columnLength = colInf[colNo].bufferSize;
-                        }
-#endif
-
-                        colInf[colNo].dbDataType = DB_DATA_TYPE_VARCHAR;
-                    }
-                    else if (!wxStricmp(typeInfInteger.TypeName, colInf[colNo].typeName))
-                        colInf[colNo].dbDataType = DB_DATA_TYPE_INTEGER;
-                    else if (!wxStricmp(typeInfFloat.TypeName, colInf[colNo].typeName))
-                        colInf[colNo].dbDataType = DB_DATA_TYPE_FLOAT;
-                    else if (!wxStricmp(typeInfDate.TypeName, colInf[colNo].typeName))
-                        colInf[colNo].dbDataType = DB_DATA_TYPE_DATE;
-                    else if (!wxStricmp(typeInfBlob.TypeName, colInf[colNo].typeName))
-                        colInf[colNo].dbDataType = DB_DATA_TYPE_BLOB;
-
-                    colNo++;
-                }
-            }
-        }
-        if (retcode != SQL_NO_DATA_FOUND)
-        {  // Error occurred, abort
-            DispAllErrors(henv, hdbc, hstmt);
-            if (colInf)
-                delete [] colInf;
-            SQLFreeStmt(hstmt, SQL_CLOSE);
-            if (numCols)
-                *numCols = 0;
-            return(0);
-        }
-    }
-
-    SQLFreeStmt(hstmt, SQL_CLOSE);
-
-    // Store Primary and Foriegn Keys
-    GetKeyFields(tableName,colInf,noCols);
-
-    if (numCols)
-        *numCols = noCols;
-    return colInf;
-
-}  // wxDb::GetColumns()
-
-
-#else  // New GetColumns
-
-
-/*
-    BJO 20000503
-    These are tentative new GetColumns members which should be more database
-    independent and which always returns the columns in the order they were
-    created.
-
-    - The first one (wxDbColInf *wxDb::GetColumns(wxChar *tableName[], const
-      wxChar* userID)) calls the second implementation for each separate table
-      before merging the results. This makes the code easier to maintain as
-      only one member (the second) makes the real work
-    - wxDbColInf *wxDb::GetColumns(const wxString &tableName, int *numCols, const
-      wxChar *userID) is a little bit improved
-    - It doesn't anymore rely on the type-name to find out which database-type
-      each column has
-    - It ends by sorting the columns, so that they are returned in the same
-      order they were created
-*/
-
-typedef struct
-{
-    UWORD noCols;
-    wxDbColInf *colInf;
-} _TableColumns;
-
-
-wxDbColInf *wxDb::GetColumns(wxChar *tableName[], const wxChar *userID)
-{
-    int i, j;
-    // The last array element of the tableName[] argument must be zero (null).
-    // This is how the end of the array is detected.
-
-    UWORD noCols = 0;
-
-    // How many tables ?
-    int tbl;
-    for (tbl = 0 ; tableName[tbl]; tbl++);
-
-    // Create a table to maintain the columns for each separate table
-    _TableColumns *TableColumns = new _TableColumns[tbl];
-
-    // Fill the table
-    for (i = 0 ; i < tbl ; i++)
-
-    {
-        TableColumns[i].colInf = GetColumns(tableName[i], &TableColumns[i].noCols, userID);
-        if (TableColumns[i].colInf == NULL)
-            return NULL;
-        noCols += TableColumns[i].noCols;
-    }
-
-    // Now merge all the separate table infos
-    wxDbColInf *colInf = new wxDbColInf[noCols+1];
-
-    // Mark the end of the array
-    wxStrcpy(colInf[noCols].tableName, wxEmptyString);
-    wxStrcpy(colInf[noCols].colName, wxEmptyString);
-    colInf[noCols].sqlDataType = 0;
-
-    // Merge ...
-    int offset = 0;
-
-    for (i = 0 ; i < tbl ; i++)
-    {
-        for (j = 0 ; j < TableColumns[i].noCols ; j++)
-        {
-            colInf[offset++] = TableColumns[i].colInf[j];
-        }
-    }
-
-    delete [] TableColumns;
-
-    return colInf;
-}  // wxDb::GetColumns()  -- NEW
-
-
-wxDbColInf *wxDb::GetColumns(const wxString &tableName, int *numCols, const wxChar *userID)
-//
-// Same as the above GetColumns() function except this one gets columns
-// only for a single table, and if 'numCols' is not NULL, the number of
-// columns stored in the returned wxDbColInf is set in '*numCols'
-//
-// userID is evaluated in the following manner:
-//        userID == NULL  ... UserID is ignored
-//        userID == ""    ... UserID set equal to 'this->uid'
-//        userID != ""    ... UserID set equal to 'userID'
-//
-// NOTE: ALL column bindings associated with this wxDb instance are unbound
-//       by this function.  This function should use its own wxDb instance
-//       to avoid undesired unbinding of columns.
-{
-    UWORD       noCols = 0;
-    UWORD       colNo  = 0;
-    wxDbColInf *colInf = 0;
-
-    RETCODE  retcode;
-    SDWORD   cb;
-
-    wxString TableName;
-
-    wxString UserID;
-    convertUserID(userID,UserID);
-
-    // Pass 1 - Determine how many columns there are.
-    // Pass 2 - Allocate the wxDbColInf array and fill in
-    //                the array with the column information.
-    int pass;
-    for (pass = 1; pass <= 2; pass++)
-    {
-        if (pass == 2)
-        {
-            if (noCols == 0)  // Probably a bogus table name(s)
-                break;
-            // Allocate n wxDbColInf objects to hold the column information
-            colInf = new wxDbColInf[noCols+1];
-            if (!colInf)
-                break;
-            // Mark the end of the array
-            wxStrcpy(colInf[noCols].tableName, wxEmptyString);
-            wxStrcpy(colInf[noCols].colName, wxEmptyString);
-            colInf[noCols].sqlDataType = 0;
-        }
-
-        TableName = tableName;
-        // Oracle and Interbase table names are uppercase only, so force
-        // the name to uppercase just in case programmer forgot to do this
-        if ((Dbms() == dbmsORACLE) ||
-            (Dbms() == dbmsFIREBIRD) ||
-            (Dbms() == dbmsINTERBASE))
-            TableName = TableName.Upper();
-
-        SQLFreeStmt(hstmt, SQL_CLOSE);
-
-        // MySQL, SQLServer, and Access cannot accept a user name when looking up column names, so we
-        // use the call below that leaves out the user name
-        if (!UserID.empty() &&
-            Dbms() != dbmsMY_SQL &&
-            Dbms() != dbmsACCESS &&
-            Dbms() != dbmsMS_SQL_SERVER)
-        {
-            retcode = SQLColumns(hstmt,
-                                 NULL, 0,                              // All qualifiers
-                                 (UCHAR *) UserID.c_str(), SQL_NTS,    // Owner
-                                 (UCHAR *) TableName.c_str(), SQL_NTS,
-                                 NULL, 0);                             // All columns
-        }
-        else
-        {
-            retcode = SQLColumns(hstmt,
-                                 NULL, 0,                              // All qualifiers
-                                 NULL, 0,                              // Owner
-                                 (UCHAR *) TableName.c_str(), SQL_NTS,
-                                 NULL, 0);                             // All columns
-        }
-        if (retcode != SQL_SUCCESS)
-        {  // Error occurred, abort
-            DispAllErrors(henv, hdbc, hstmt);
-            if (colInf)
-                delete [] colInf;
-            SQLFreeStmt(hstmt, SQL_CLOSE);
-            if (numCols)
-                *numCols = 0;
-            return(0);
-        }
-
-        while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
-        {
-            if (pass == 1)  // First pass, just add up the number of columns
-                noCols++;
-            else  // Pass 2; Fill in the array of structures
-            {
-                if (colNo < noCols)  // Some extra error checking to prevent memory overwrites
-                {
-                    // NOTE: Only the ODBC 1.x fields are retrieved
-                    GetData( 1, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].catalog,      128+1,                     &cb);
-                    GetData( 2, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].schema,       128+1,                     &cb);
-                    GetData( 3, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].tableName,    DB_MAX_TABLE_NAME_LEN+1,   &cb);
-                    GetData( 4, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].colName,      DB_MAX_COLUMN_NAME_LEN+1,  &cb);
-                    GetData( 5, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].sqlDataType,  0,                         &cb);
-                    GetData( 6, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].typeName,     128+1,                     &cb);
-                    GetData( 7, SQL_C_SLONG,  (UCHAR*) &colInf[colNo].columnLength, 0,                         &cb);
-                    GetData( 8, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].bufferSize,   0,                         &cb);
-                    GetData( 9, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].decimalDigits,0,                         &cb);
-                    GetData(10, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].numPrecRadix, 0,                         &cb);
-                    GetData(11, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].nullable,     0,                         &cb);
-                    GetData(12, SQL_C_WXCHAR, (UCHAR*)  colInf[colNo].remarks,      254+1,                     &cb);
-                    // Start Values for Primary/Foriegn Key (=No)
-                    colInf[colNo].PkCol = 0;           // Primary key column   0=No; 1= First Key, 2 = Second Key etc.
-                    colInf[colNo].PkTableName[0] = 0;  // Tablenames where Primary Key is used as a Foreign Key
-                    colInf[colNo].FkCol = 0;           // Foreign key column   0=No; 1= First Key, 2 = Second Key etc.
-                    colInf[colNo].FkTableName[0] = 0;  // Foreign key table name
-
-#ifdef _IODBC_
-                    // IODBC does not return a correct columnLength, so we set
-                    // columnLength = bufferSize if no column length was returned
-                    // IODBC returns the columnLength in bufferSize. (bug)
-                    if (colInf[colNo].columnLength < 1)
-                    {
-                       colInf[colNo].columnLength = colInf[colNo].bufferSize;
-                    }
-#endif
-
-                    // Determine the wxDb data type that is used to represent the native data type of this data source
-                    colInf[colNo].dbDataType = 0;
-                    // Get the intern datatype
-                    switch (colInf[colNo].sqlDataType)
-                    {
-#if wxUSE_UNICODE
-    #if defined(SQL_WCHAR)
-                        case SQL_WCHAR:
-    #endif
-    #if defined(SQL_WVARCHAR)
-                        case SQL_WVARCHAR:
-    #endif
-#endif
-                        case SQL_VARCHAR:
-                        case SQL_CHAR:
-                            colInf[colNo].dbDataType = DB_DATA_TYPE_VARCHAR;
-                        break;
-                        case SQL_LONGVARCHAR:
-                            colInf[colNo].dbDataType = DB_DATA_TYPE_MEMO;
-                            break;
-                        case SQL_TINYINT:
-                        case SQL_SMALLINT:
-                        case SQL_INTEGER:
-                        case SQL_BIT:
-                            colInf[colNo].dbDataType = DB_DATA_TYPE_INTEGER;
-                            break;
-                        case SQL_DOUBLE:
-                        case SQL_DECIMAL:
-                        case SQL_NUMERIC:
-                        case SQL_FLOAT:
-                        case SQL_REAL:
-                            colInf[colNo].dbDataType = DB_DATA_TYPE_FLOAT;
-                            break;
-                        case SQL_DATE:
-                        case SQL_TIMESTAMP:
-                            colInf[colNo].dbDataType = DB_DATA_TYPE_DATE;
-                            break;
-                        case SQL_BINARY:
-                            colInf[colNo].dbDataType = DB_DATA_TYPE_BLOB;
-                            break;
-#ifdef __WXDEBUG__
-                        default:
-                            wxString errMsg;
-                            errMsg.Printf(wxT("SQL Data type %d currently not supported by wxWidgets"), colInf[colNo].sqlDataType);
-                            wxLogDebug(errMsg,wxT("ODBC DEBUG MESSAGE"));
-#endif
-                    }
-                    colNo++;
-                }
-            }
-        }
-        if (retcode != SQL_NO_DATA_FOUND)
-        {  // Error occurred, abort
-            DispAllErrors(henv, hdbc, hstmt);
-            if (colInf)
-                delete [] colInf;
-            SQLFreeStmt(hstmt, SQL_CLOSE);
-            if (numCols)
-                *numCols = 0;
-            return(0);
-        }
-    }
-
-    SQLFreeStmt(hstmt, SQL_CLOSE);
-
-    // Store Primary and Foreign Keys
-    GetKeyFields(tableName,colInf,noCols);
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Now sort the the columns in order to make them appear in the right order
-    ///////////////////////////////////////////////////////////////////////////
-
-    // Build a generic SELECT statement which returns 0 rows
-    wxString Stmt;
-
-    Stmt.Printf(wxT("select * from \"%s\" where 0=1"), tableName);
-
-    // Execute query
-    if (SQLExecDirect(hstmt, (UCHAR FAR *) Stmt.c_str(), SQL_NTS) != SQL_SUCCESS)
-    {
-        DispAllErrors(henv, hdbc, hstmt);
-        return NULL;
-    }
-
-    // Get the number of result columns
-    if (SQLNumResultCols (hstmt, &noCols) != SQL_SUCCESS)
-    {
-        DispAllErrors(henv, hdbc, hstmt);
-        return NULL;
-    }
-
-    if (noCols == 0) // Probably a bogus table name
-        return NULL;
-
-    //  Get the name
-    int i;
-    short colNum;
-    UCHAR name[100];
-    SWORD Sword;
-    SDWORD Sdword;
-    for (colNum = 0; colNum < noCols; colNum++)
-    {
-        if (SQLColAttributes(hstmt,colNum+1, SQL_COLUMN_NAME,
-            name, sizeof(name),
-            &Sword, &Sdword) != SQL_SUCCESS)
-        {
-            DispAllErrors(henv, hdbc, hstmt);
-            return NULL;
-        }
-
-        wxString Name1 = name;
-        Name1 = Name1.Upper();
-
-        // Where is this name in the array ?
-        for (i = colNum ; i < noCols ; i++)
-        {
-            wxString Name2 =  colInf[i].colName;
-            Name2 = Name2.Upper();
-            if (Name2 == Name1)
-            {
-                if (colNum != i) // swap to sort
-                {
-                    wxDbColInf tmpColInf = colInf[colNum];
-                    colInf[colNum] =  colInf[i];
-                    colInf[i] = tmpColInf;
-                }
-                break;
-            }
-        }
-    }
-    SQLFreeStmt(hstmt, SQL_CLOSE);
-
-    ///////////////////////////////////////////////////////////////////////////
-    // End sorting
-    ///////////////////////////////////////////////////////////////////////////
-
-    if (numCols)
-        *numCols = noCols;
-    return colInf;
-
-}  // wxDb::GetColumns()
-
-
-#endif  // #else OLD_GETCOLUMNS
-
-
-/********** wxDb::GetColumnCount() **********/
-int wxDb::GetColumnCount(const wxString &tableName, const wxChar *userID)
-/*
- * Returns a count of how many columns are in a table.
- * If an error occurs in computing the number of columns
- * this function will return a -1 for the count
- *
- * userID is evaluated in the following manner:
- *        userID == NULL  ... UserID is ignored
- *        userID == ""    ... UserID set equal to 'this->uid'
- *        userID != ""    ... UserID set equal to 'userID'
- *
- * NOTE: ALL column bindings associated with this wxDb instance are unbound
- *       by this function.  This function should use its own wxDb instance
- *       to avoid undesired unbinding of columns.
- */
-{
-    UWORD    noCols = 0;
-
-    RETCODE  retcode;
-
-    wxString TableName;
-
-    wxString UserID;
-    convertUserID(userID,UserID);
-
-    TableName = tableName;
-    // Oracle and Interbase table names are uppercase only, so force
-    // the name to uppercase just in case programmer forgot to do this
-    if ((Dbms() == dbmsORACLE) ||
-        (Dbms() == dbmsFIREBIRD) ||
-        (Dbms() == dbmsINTERBASE))
-        TableName = TableName.Upper();
-
-    SQLFreeStmt(hstmt, SQL_CLOSE);
-
-    // MySQL, SQLServer, and Access cannot accept a user name when looking up column names, so we
-    // use the call below that leaves out the user name
-    if (!UserID.empty() &&
-        Dbms() != dbmsMY_SQL &&
-        Dbms() != dbmsACCESS &&
-        Dbms() != dbmsMS_SQL_SERVER)
-    {
-        retcode = SQLColumns(hstmt,
-                             NULL, 0,                                // All qualifiers
-                             WXSQLCAST(UserID), SQL_NTS,      // Owner
-                             WXSQLCAST(TableName), SQL_NTS,
-                             NULL, 0);                               // All columns
-    }
-    else
-    {
-        retcode = SQLColumns(hstmt,
-                             NULL, 0,                                // All qualifiers
-                             NULL, 0,                                // Owner
-                             WXSQLCAST(TableName), SQL_NTS,
-                             NULL, 0);                               // All columns
-    }
-    if (retcode != SQL_SUCCESS)
-    {  // Error occurred, abort
-        DispAllErrors(henv, hdbc, hstmt);
-        SQLFreeStmt(hstmt, SQL_CLOSE);
-        return(-1);
-    }
-
-    // Count the columns
-    while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
-        noCols++;
-
-    if (retcode != SQL_NO_DATA_FOUND)
-    {  // Error occurred, abort
-        DispAllErrors(henv, hdbc, hstmt);
-        SQLFreeStmt(hstmt, SQL_CLOSE);
-        return(-1);
-    }
-
-    SQLFreeStmt(hstmt, SQL_CLOSE);
-    return noCols;
-
-}  // wxDb::GetColumnCount()
-
-
-/********** wxDb::GetCatalog() *******/
-wxDbInf *wxDb::GetCatalog(const wxChar *userID)
-/*
- * ---------------------------------------------------------------------
- * -- 19991203 : mj10777 : Create                                 ------
- * --          : Creates a wxDbInf with Tables / Cols Array       ------
- * --          : uses SQLTables and fills pTableInf;              ------
- * --          : pColInf is set to NULL and numCols to 0;         ------
- * --          : returns pDbInf (wxDbInf)                         ------
- * --            - if unsuccessful (pDbInf == NULL)               ------
- * --          : pColInf can be filled with GetColumns(..);       ------
- * --          : numCols   can be filled with GetColumnCount(..); ------
- * ---------------------------------------------------------------------
- *
- * userID is evaluated in the following manner:
- *        userID == NULL  ... UserID is ignored
- *        userID == ""    ... UserID set equal to 'this->uid'
- *        userID != ""    ... UserID set equal to 'userID'
- *
- * NOTE: ALL column bindings associated with this wxDb instance are unbound
- *       by this function.  This function should use its own wxDb instance
- *       to avoid undesired unbinding of columns.
- */
-{
-    int      noTab = 0;     // Counter while filling table entries
-    int      pass;
-    RETCODE  retcode;
-    SQLLEN   cb;
-    wxString tblNameSave;
-
-    wxString UserID;
-    convertUserID(userID,UserID);
-
-    //-------------------------------------------------------------
-    // Create the Database Array of catalog entries
-
-    wxDbInf *pDbInf = new wxDbInf;
-
-    //-------------------------------------------------------------
-    // Table Information
-    // Pass 1 - Determine how many Tables there are.
-    // Pass 2 - Create the Table array and fill it
-    //        - Create the Cols array = NULL
-    //-------------------------------------------------------------
-
-    for (pass = 1; pass <= 2; pass++)
-    {
-        SQLFreeStmt(hstmt, SQL_CLOSE);   // Close if Open
-        tblNameSave.Empty();
-
-        if (!UserID.empty() &&
-            Dbms() != dbmsMY_SQL &&
-            Dbms() != dbmsACCESS &&
-            Dbms() != dbmsMS_SQL_SERVER)
-        {
-            retcode = SQLTables(hstmt,
-                                NULL, 0,                             // All qualifiers
-                                WXSQLCAST(UserID), SQL_NTS,   // User specified
-                                NULL, 0,                             // All tables
-                                NULL, 0);                            // All columns
-        }
-        else
-        {
-            retcode = SQLTables(hstmt,
-                                NULL, 0,           // All qualifiers
-                                NULL, 0,           // User specified
-                                NULL, 0,           // All tables
-                                NULL, 0);          // All columns
-        }
-
-        if (retcode != SQL_SUCCESS)
-        {
-            DispAllErrors(henv, hdbc, hstmt);
-            pDbInf = NULL;
-            SQLFreeStmt(hstmt, SQL_CLOSE);
-            return pDbInf;
-        }
-
-        while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)   // Table Information
-        {
-            if (pass == 1)  // First pass, just count the Tables
-            {
-                if (pDbInf->numTables == 0)
-                {
-                    GetData( 1, SQL_C_WXCHAR,   (UCHAR*)  pDbInf->catalog,  128+1, &cb);
-                    GetData( 2, SQL_C_WXCHAR,   (UCHAR*)  pDbInf->schema,   128+1, &cb);
-                 }
-                 pDbInf->numTables++;      // Counter for Tables
-            }  // if (pass == 1)
-            if (pass == 2) // Create and fill the Table entries
-            {
-                if (pDbInf->pTableInf == NULL)   // Has the Table Array been created
-                {  // no, then create the Array
-                    pDbInf->pTableInf = new wxDbTableInf[pDbInf->numTables];
-                    noTab = 0;
-                } // if (pDbInf->pTableInf == NULL)   // Has the Table Array been created
-
-                GetData( 3, SQL_C_WXCHAR,   (UCHAR*)  (pDbInf->pTableInf+noTab)->tableName,    DB_MAX_TABLE_NAME_LEN+1, &cb);
-                GetData( 4, SQL_C_WXCHAR,   (UCHAR*)  (pDbInf->pTableInf+noTab)->tableType,    30+1,                    &cb);
-                GetData( 5, SQL_C_WXCHAR,   (UCHAR*)  (pDbInf->pTableInf+noTab)->tableRemarks, 254+1,                   &cb);
-
-                noTab++;
-            }  // if
-        }  // while
-    }  // for
-    SQLFreeStmt(hstmt, SQL_CLOSE);
-
-    // Query how many columns are in each table
-    for (noTab=0;noTab<pDbInf->numTables;noTab++)
-    {
-        (pDbInf->pTableInf+noTab)->numCols = (UWORD)GetColumnCount((pDbInf->pTableInf+noTab)->tableName,UserID);
-    }
-
-    return pDbInf;
-
-}  // wxDb::GetCatalog()
-
-
-/********** wxDb::Catalog() **********/
-bool wxDb::Catalog(const wxChar *userID, const wxString &fileName)
-/*
- * Creates the text file specified in 'filename' which will contain
- * a minimal data dictionary of all tables accessible by the user specified
- * in 'userID'
- *
- * userID is evaluated in the following manner:
- *        userID == NULL  ... UserID is ignored
- *        userID == ""    ... UserID set equal to 'this->uid'
- *        userID != ""    ... UserID set equal to 'userID'
- *
- * NOTE: ALL column bindings associated with this wxDb instance are unbound
- *       by this function.  This function should use its own wxDb instance
- *       to avoid undesired unbinding of columns.
- */
-{
-    wxASSERT(fileName.length());
-
-    RETCODE   retcode;
-    SQLLEN    cb;
-    wxChar    tblName[DB_MAX_TABLE_NAME_LEN+1];
-    wxString  tblNameSave;
-    wxChar    colName[DB_MAX_COLUMN_NAME_LEN+1];
-    SWORD     sqlDataType;
-    wxChar    typeName[30+1];
-    SDWORD    precision, length;
-
-    FILE *fp = wxFopen(fileName.c_str(),wxT("wt"));
-    if (fp == NULL)
-        return false;
-
-    SQLFreeStmt(hstmt, SQL_CLOSE);
-
-    wxString UserID;
-    convertUserID(userID,UserID);
-
-    if (!UserID.empty() &&
-        Dbms() != dbmsMY_SQL &&
-        Dbms() != dbmsACCESS &&
-        Dbms() != dbmsFIREBIRD &&
-        Dbms() != dbmsINTERBASE &&
-        Dbms() != dbmsMS_SQL_SERVER)
-    {
-        retcode = SQLColumns(hstmt,
-                             NULL, 0,                                // All qualifiers
-                             WXSQLCAST(UserID), SQL_NTS,      // User specified
-                             NULL, 0,                                // All tables
-                             NULL, 0);                               // All columns
-    }
-    else
-    {
-        retcode = SQLColumns(hstmt,
-                             NULL, 0,    // All qualifiers
-                             NULL, 0,    // User specified
-                             NULL, 0,    // All tables
-                             NULL, 0);   // All columns
-    }
-    if (retcode != SQL_SUCCESS)
-    {
-        DispAllErrors(henv, hdbc, hstmt);
-        fclose(fp);
-        return false;
-    }
-
-    wxString outStr;
-    tblNameSave.Empty();
-    int cnt = 0;
-
-    while (true)
-    {
-        retcode = SQLFetch(hstmt);
-        if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
-            break;
-
-        GetData(3,SQL_C_WXCHAR,  (UCHAR *) tblName,     DB_MAX_TABLE_NAME_LEN+1, &cb);
-        GetData(4,SQL_C_WXCHAR,  (UCHAR *) colName,     DB_MAX_COLUMN_NAME_LEN+1,&cb);
-        GetData(5,SQL_C_SSHORT,  (UCHAR *)&sqlDataType, 0,                       &cb);
-        GetData(6,SQL_C_WXCHAR,  (UCHAR *) typeName,    sizeof(typeName),        &cb);
-        GetData(7,SQL_C_SLONG,   (UCHAR *)&precision,   0,                       &cb);
-        GetData(8,SQL_C_SLONG,   (UCHAR *)&length,      0,                       &cb);
-
-        if (wxStrcmp(tblName, tblNameSave.c_str()))
-        {
-            if (cnt)
-                wxFputs(wxT("\n"), fp);
-            wxFputs(wxT("================================ "), fp);
-            wxFputs(wxT("================================ "), fp);
-            wxFputs(wxT("===================== "), fp);
-            wxFputs(wxT("========= "), fp);
-            wxFputs(wxT("=========\n"), fp);
-            outStr.Printf(wxT("%-32s %-32s %-21s %9s %9s\n"),
-                wxT("TABLE NAME"), wxT("COLUMN NAME"), wxT("DATA TYPE"), wxT("PRECISION"), wxT("LENGTH"));
-            wxFputs(outStr.c_str(), fp);
-            wxFputs(wxT("================================ "), fp);
-            wxFputs(wxT("================================ "), fp);
-            wxFputs(wxT("===================== "), fp);
-            wxFputs(wxT("========= "), fp);
-            wxFputs(wxT("=========\n"), fp);
-            tblNameSave = tblName;
-        }
-
-        outStr.Printf(wxT("%-32s %-32s (%04d)%-15s %9ld %9ld\n"),
-            tblName, colName, sqlDataType, typeName, precision, length);
-        if (wxFputs(outStr.c_str(), fp) == EOF)
-        {
-            SQLFreeStmt(hstmt, SQL_CLOSE);
-            fclose(fp);
-            return false;
-        }
-        cnt++;
-    }
-
-    if (retcode != SQL_NO_DATA_FOUND)
-        DispAllErrors(henv, hdbc, hstmt);
-
-    SQLFreeStmt(hstmt, SQL_CLOSE);
-
-    fclose(fp);
-    return(retcode == SQL_NO_DATA_FOUND);
-
-}  // wxDb::Catalog()
-
-
-bool wxDb::TableExists(const wxString &tableName, const wxChar *userID, const wxString &tablePath)
-/*
- * Table name can refer to a table, view, alias or synonym.  Returns true
- * if the object exists in the database.  This function does not indicate
- * whether or not the user has privleges to query or perform other functions
- * on the table.
- *
- * userID is evaluated in the following manner:
- *        userID == NULL  ... UserID is ignored
- *        userID == ""    ... UserID set equal to 'this->uid'
- *        userID != ""    ... UserID set equal to 'userID'
- */
-{
-    wxASSERT(tableName.length());
-
-    wxString TableName;
-
-    if (Dbms() == dbmsDBASE)
-    {
-        wxString dbName;
-        if (tablePath.length())
-            dbName.Printf(wxT("%s/%s.dbf"), tablePath.c_str(), tableName.c_str());
-        else
-            dbName.Printf(wxT("%s.dbf"), tableName.c_str());
-
-        bool exists;
-        exists = wxFileExists(dbName);
-        return exists;
-    }
-
-    wxString UserID;
-    convertUserID(userID,UserID);
-
-    TableName = tableName;
-    // Oracle and Interbase table names are uppercase only, so force
-    // the name to uppercase just in case programmer forgot to do this
-    if ((Dbms() == dbmsORACLE) ||
-        (Dbms() == dbmsFIREBIRD) ||
-        (Dbms() == dbmsINTERBASE))
-        TableName = TableName.Upper();
-
-    SQLFreeStmt(hstmt, SQL_CLOSE);
-    RETCODE retcode;
-
-    // Some databases cannot accept a user name when looking up table names,
-    // so we use the call below that leaves out the user name
-    if (!UserID.empty() &&
-        Dbms() != dbmsMY_SQL &&
-        Dbms() != dbmsACCESS &&
-        Dbms() != dbmsMS_SQL_SERVER &&
-        Dbms() != dbmsDB2 &&
-        Dbms() != dbmsFIREBIRD &&
-        Dbms() != dbmsINTERBASE &&
-        Dbms() != dbmsPERVASIVE_SQL)
-    {
-        retcode = SQLTables(hstmt,
-                            NULL, 0,                                  // All qualifiers
-                            WXSQLCAST(UserID), SQL_NTS,        // Only tables owned by this user
-                            WXSQLCAST(TableName), SQL_NTS,
-                            NULL, 0);                                 // All table types
-    }
-    else
-    {
-        retcode = SQLTables(hstmt,
-                            NULL, 0,                                  // All qualifiers
-                            NULL, 0,                                  // All owners
-                            WXSQLCAST(TableName), SQL_NTS,
-                            NULL, 0);                                 // All table types
-    }
-    if (retcode != SQL_SUCCESS)
-        return(DispAllErrors(henv, hdbc, hstmt));
-
-    retcode = SQLFetch(hstmt);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
-    {
-        SQLFreeStmt(hstmt, SQL_CLOSE);
-        return(DispAllErrors(henv, hdbc, hstmt));
-    }
-
-    SQLFreeStmt(hstmt, SQL_CLOSE);
-
-    return true;
-
-}  // wxDb::TableExists()
-
-
-/********** wxDb::TablePrivileges() **********/
-bool wxDb::TablePrivileges(const wxString &tableName, const wxString &priv, const wxChar *userID,
-                            const wxChar *schema, const wxString &WXUNUSED(tablePath))
-{
-    wxASSERT(tableName.length());
-
-    wxDbTablePrivilegeInfo  result;
-    SQLLEN  cbRetVal;
-    RETCODE retcode;
-
-    // We probably need to be able to dynamically set this based on
-    // the driver type, and state.
-    wxChar curRole[]=wxT("public");
-
-    wxString TableName;
-
-    wxString UserID,Schema;
-    convertUserID(userID,UserID);
-    convertUserID(schema,Schema);
-
-    TableName = tableName;
-    // Oracle and Interbase table names are uppercase only, so force
-    // the name to uppercase just in case programmer forgot to do this
-    if ((Dbms() == dbmsORACLE) ||
-        (Dbms() == dbmsFIREBIRD) ||
-        (Dbms() == dbmsINTERBASE))
-        TableName = TableName.Upper();
-
-    SQLFreeStmt(hstmt, SQL_CLOSE);
-
-    // Some databases cannot accept a user name when looking up table names,
-    // so we use the call below that leaves out the user name
-    if (!Schema.empty() &&
-        Dbms() != dbmsMY_SQL &&
-        Dbms() != dbmsACCESS &&
-        Dbms() != dbmsMS_SQL_SERVER)
-    {
-        retcode = SQLTablePrivileges(hstmt,
-                                     NULL, 0,                                    // Catalog
-                                     WXSQLCAST(Schema), SQL_NTS,               // Schema
-                                     WXSQLCAST(TableName), SQL_NTS);
-    }
-    else
-    {
-        retcode = SQLTablePrivileges(hstmt,
-                                     NULL, 0,                                    // Catalog
-                                     NULL, 0,                                    // Schema
-                                     WXSQLCAST(TableName), SQL_NTS);
-    }
-
-#ifdef DBDEBUG_CONSOLE
-    wxFprintf(stderr ,wxT("SQLTablePrivileges() returned %i \n"),retcode);
-#endif
-
-    if ((retcode != SQL_SUCCESS) && (retcode != SQL_SUCCESS_WITH_INFO))
-        return (DispAllErrors(henv, hdbc, hstmt));
-
-    bool failed = false;
-    retcode = SQLFetch(hstmt);
-    while (retcode == SQL_SUCCESS || retcode == SQL_SUCCESS_WITH_INFO)
-    {
-        if (SQLGetData(hstmt, 1, SQL_C_WXCHAR, (UCHAR*) result.tableQual, sizeof(result.tableQual), &cbRetVal) != SQL_SUCCESS)
-            failed = true;
-
-        if (!failed && SQLGetData(hstmt, 2, SQL_C_WXCHAR, (UCHAR*) result.tableOwner, sizeof(result.tableOwner), &cbRetVal) != SQL_SUCCESS)
-            failed = true;
-
-        if (!failed && SQLGetData(hstmt, 3, SQL_C_WXCHAR, (UCHAR*) result.tableName, sizeof(result.tableName), &cbRetVal) != SQL_SUCCESS)
-            failed = true;
-
-        if (!failed && SQLGetData(hstmt, 4, SQL_C_WXCHAR, (UCHAR*) result.grantor, sizeof(result.grantor), &cbRetVal) != SQL_SUCCESS)
-            failed = true;
-
-        if (!failed && SQLGetData(hstmt, 5, SQL_C_WXCHAR, (UCHAR*) result.grantee, sizeof(result.grantee), &cbRetVal) != SQL_SUCCESS)
-            failed = true;
-
-        if (!failed && SQLGetData(hstmt, 6, SQL_C_WXCHAR, (UCHAR*) result.privilege, sizeof(result.privilege), &cbRetVal) != SQL_SUCCESS)
-            failed = true;
-
-        if (!failed && SQLGetData(hstmt, 7, SQL_C_WXCHAR, (UCHAR*) result.grantable, sizeof(result.grantable), &cbRetVal) != SQL_SUCCESS)
-            failed = true;
-
-        if (failed)
-        {
-            return(DispAllErrors(henv, hdbc, hstmt));
-        }
-#ifdef DBDEBUG_CONSOLE
-        wxFprintf(stderr,wxT("Scanning %s privilege on table %s.%s granted by %s to %s\n"),
-                result.privilege,result.tableOwner,result.tableName,
-                result.grantor, result.grantee);
-#endif
-
-        if (UserID.IsSameAs(result.tableOwner,false))
-        {
-            SQLFreeStmt(hstmt, SQL_CLOSE);
-            return true;
-        }
-
-        if (UserID.IsSameAs(result.grantee,false) &&
-            !wxStrcmp(result.privilege,priv))
-        {
-            SQLFreeStmt(hstmt, SQL_CLOSE);
-            return true;
-        }
-
-        if (!wxStrcmp(result.grantee,curRole) &&
-            !wxStrcmp(result.privilege,priv))
-        {
-            SQLFreeStmt(hstmt, SQL_CLOSE);
-            return true;
-        }
-
-        retcode = SQLFetch(hstmt);
-    }
-
-    SQLFreeStmt(hstmt, SQL_CLOSE);
-    return false;
-
-}  // wxDb::TablePrivileges
-
-
-const wxString wxDb::SQLTableName(const wxChar *tableName)
-{
-    wxString TableName;
-
-    if (Dbms() == dbmsACCESS)
-        TableName = _T("\"");
-    TableName += tableName;
-    if (Dbms() == dbmsACCESS)
-        TableName += _T("\"");
-
-    return TableName;
-}  // wxDb::SQLTableName()
-
-
-const wxString wxDb::SQLColumnName(const wxChar *colName)
-{
-    wxString ColName;
-
-    if (Dbms() == dbmsACCESS)
-        ColName = _T("\"");
-    ColName += colName;
-    if (Dbms() == dbmsACCESS)
-        ColName += _T("\"");
-
-    return ColName;
-}  // wxDb::SQLColumnName()
-
-
-/********** wxDb::SetSqlLogging() **********/
-bool wxDb::SetSqlLogging(wxDbSqlLogState state, const wxString &filename, bool append)
-{
-    wxASSERT(state == sqlLogON  || state == sqlLogOFF);
-    wxASSERT(state == sqlLogOFF || filename.length());
-
-    if (state == sqlLogON)
-    {
-        if (fpSqlLog == 0)
-        {
-            fpSqlLog = wxFopen(filename.c_str(), (append ? wxT("at") : wxT("wt")));
-            if (fpSqlLog == NULL)
-                return false;
-        }
-    }
-    else  // sqlLogOFF
-    {
-        if (fpSqlLog)
-        {
-            if (fclose(fpSqlLog))
-                return false;
-            fpSqlLog = 0;
-        }
-    }
-
-    sqlLogState = state;
-    return true;
-
-}  // wxDb::SetSqlLogging()
-
-
-/********** wxDb::WriteSqlLog() **********/
-bool wxDb::WriteSqlLog(const wxString &logMsg)
-{
-    wxASSERT(logMsg.length());
-
-    if (fpSqlLog == 0 || sqlLogState == sqlLogOFF)
-        return false;
-
-    if (wxFputs(wxT("\n"),   fpSqlLog) == EOF)
-        return false;
-    if (wxFputs(logMsg, fpSqlLog) == EOF)
-        return false;
-    if (wxFputs(wxT("\n"),   fpSqlLog) == EOF)
-        return false;
-
-    return true;
-
-}  // wxDb::WriteSqlLog()
-
-
-/********** wxDb::Dbms() **********/
-wxDBMS wxDb::Dbms(void)
-/*
- * Be aware that not all database engines use the exact same syntax, and not
- * every ODBC compliant database is compliant to the same level of compliancy.
- * Some manufacturers support the minimum Level 1 compliancy, and others up
- * through Level 3.  Others support subsets of features for levels above 1.
- *
- * If you find an inconsistency between the wxDb class and a specific database
- * engine, and an identifier to this section, and special handle the database in
- * the area where behavior is non-conforming with the other databases.
- *
- *
- * NOTES ABOUT ISSUES SPECIFIC TO EACH DATABASE ENGINE
- * ---------------------------------------------------
- *
- * ORACLE
- *        - Currently the only database supported by the class to support VIEWS
- *
- * DBASE
- *        - Does not support the SQL_TIMESTAMP structure
- *        - Supports only one cursor and one connect (apparently? with Microsoft driver only?)
- *        - Does not automatically create the primary index if the 'keyField' param of SetColDef
- *            is true.  The user must create ALL indexes from their program.
- *        - Table names can only be 8 characters long
- *        - Column names can only be 10 characters long
- *
- * SYBASE (all)
- *        - To lock a record during QUERY functions, the reserved word 'HOLDLOCK' must be added
- *            after every table name involved in the query/join if that tables matching record(s)
- *            are to be locked
- *        - Ignores the keywords 'FOR UPDATE'.  Use the HOLDLOCK functionality described above
- *
- * SYBASE (Enterprise)
- *        - If a column is part of the Primary Key, the column cannot be NULL
- *        - Maximum row size is somewhere in the neighborhood of 1920 bytes
- *
- * MY_SQL
- *        - If a column is part of the Primary Key, the column cannot be NULL
- *        - Cannot support selecting for update [::CanSelectForUpdate()].  Always returns FALSE
- *        - Columns that are part of primary or secondary keys must be defined as being NOT NULL
- *            when they are created.  Some code is added in ::CreateIndex to try to adjust the
- *            column definition if it is not defined correctly, but it is experimental
- *        - Does not support sub-queries in SQL statements
- *
- * POSTGRES
- *        - Does not support the keywords 'ASC' or 'DESC' as of release v6.5.0
- *        - Does not support sub-queries in SQL statements
- *
- * DB2
- *        - Primary keys must be declared as NOT NULL
- *        - Table and index names must not be longer than 13 characters in length (technically
- *          table names can be up to 18 characters, but the primary index is created using the
- *          base table name plus "_PIDX", so the limit if the table has a primary index is 13.
- *
- * PERVASIVE SQL
- *
- * INTERBASE
- *        - Columns that are part of primary keys must be defined as being NOT NULL
- *          when they are created.  Some code is added in ::CreateIndex to try to adjust the
- *          column definition if it is not defined correctly, but it is experimental
- */
-{
-    // Should only need to do this once for each new database connection
-    // so return the value we already determined it to be to save time
-    // and lots of string comparisons
-    if (dbmsType != dbmsUNIDENTIFIED)
-        return(dbmsType);
-
-#ifdef DBDEBUG_CONSOLE
-               // When run in console mode, use standard out to display errors.
-               cout << "Database connecting to: " << dbInf.dbmsName << endl;
-#endif  // DBDEBUG_CONSOLE
-
-    wxLogDebug(wxT("Database connecting to: "));
-    wxLogDebug(dbInf.dbmsName);
-
-    wxChar baseName[25+1];
-    wxStrncpy(baseName, dbInf.dbmsName, 25);
-    baseName[25] = 0;
-
-    // RGG 20001025 : add support for Interbase
-    // GT : Integrated to base classes on 20001121
-    if (!wxStricmp(dbInf.dbmsName,wxT("Interbase")))
-        return((wxDBMS)(dbmsType = dbmsINTERBASE));
-
-    // BJO 20000428 : add support for Virtuoso
-    if (!wxStricmp(dbInf.dbmsName,wxT("OpenLink Virtuoso VDBMS")))
-      return((wxDBMS)(dbmsType = dbmsVIRTUOSO));
-
-    if (!wxStricmp(dbInf.dbmsName,wxT("Adaptive Server Anywhere")))
-        return((wxDBMS)(dbmsType = dbmsSYBASE_ASA));
-
-    // BJO 20000427 : The "SQL Server" string is also returned by SQLServer when
-    // connected through an OpenLink driver.
-    // Is it also returned by Sybase Adapatitve server?
-    // OpenLink driver name is OLOD3032.DLL for msw and oplodbc.so for unix
-    if (!wxStricmp(dbInf.dbmsName,wxT("SQL Server")))
-    {
-      if (!wxStrncmp(dbInf.driverName, wxT("oplodbc"), 7) ||
-          !wxStrncmp(dbInf.driverName, wxT("OLOD"), 4))
-            return ((wxDBMS)(dbmsMS_SQL_SERVER));
-        else
-            return ((wxDBMS)(dbmsType = dbmsSYBASE_ASE));
-    }
-
-    if (!wxStricmp(dbInf.dbmsName,wxT("Microsoft SQL Server")))
-        return((wxDBMS)(dbmsType = dbmsMS_SQL_SERVER));
-
-    baseName[10] = 0;
-    if (!wxStricmp(baseName,wxT("PostgreSQL")))  // v6.5.0
-        return((wxDBMS)(dbmsType = dbmsPOSTGRES));
-
-    baseName[9] = 0;
-    if (!wxStricmp(baseName,wxT("Pervasive")))
-        return((wxDBMS)(dbmsType = dbmsPERVASIVE_SQL));
-
-    baseName[8] = 0;
-    if (!wxStricmp(baseName,wxT("Informix")))
-        return((wxDBMS)(dbmsType = dbmsINFORMIX));
-
-    if (!wxStricmp(baseName,wxT("Firebird")))
-        return((wxDBMS)(dbmsType = dbmsFIREBIRD));
-
-    baseName[6] = 0;
-    if (!wxStricmp(baseName,wxT("Oracle")))
-        return((wxDBMS)(dbmsType = dbmsORACLE));
-    if (!wxStricmp(baseName,wxT("ACCESS")))
-        return((wxDBMS)(dbmsType = dbmsACCESS));
-    if (!wxStricmp(baseName,wxT("Sybase")))
-      return((wxDBMS)(dbmsType = dbmsSYBASE_ASE));
-
-    baseName[5] = 0;
-    if (!wxStricmp(baseName,wxT("DBASE")))
-        return((wxDBMS)(dbmsType = dbmsDBASE));
-    if (!wxStricmp(baseName,wxT("xBase")))
-        return((wxDBMS)(dbmsType = dbmsXBASE_SEQUITER));
-    if (!wxStricmp(baseName,wxT("MySQL")))
-        return((wxDBMS)(dbmsType = dbmsMY_SQL));
-    if (!wxStricmp(baseName,wxT("MaxDB")))
-        return((wxDBMS)(dbmsType = dbmsMAXDB));
-
-    baseName[3] = 0;
-    if (!wxStricmp(baseName,wxT("DB2")))
-        return((wxDBMS)(dbmsType = dbmsDB2));
-
-    return((wxDBMS)(dbmsType = dbmsUNIDENTIFIED));
-
-}  // wxDb::Dbms()
-
-
-bool wxDb::ModifyColumn(const wxString &tableName, const wxString &columnName,
-                        int dataType, ULONG columnLength,
-                        const wxString &optionalParam)
-{
-    wxASSERT(tableName.length());
-    wxASSERT(columnName.length());
-    wxASSERT((dataType == DB_DATA_TYPE_VARCHAR && columnLength > 0) ||
-             dataType != DB_DATA_TYPE_VARCHAR);
-
-    // Must specify a columnLength if modifying a VARCHAR type column
-    if (dataType == DB_DATA_TYPE_VARCHAR && !columnLength)
-        return false;
-
-    wxString dataTypeName;
-    wxString sqlStmt;
-    wxString alterSlashModify;
-
-    switch(dataType)
-    {
-        case DB_DATA_TYPE_VARCHAR :
-            dataTypeName = typeInfVarchar.TypeName;
-            break;
-        case DB_DATA_TYPE_INTEGER :
-            dataTypeName = typeInfInteger.TypeName;
-            break;
-        case DB_DATA_TYPE_FLOAT :
-            dataTypeName = typeInfFloat.TypeName;
-            break;
-        case DB_DATA_TYPE_DATE :
-            dataTypeName = typeInfDate.TypeName;
-            break;
-        case DB_DATA_TYPE_BLOB :
-            dataTypeName = typeInfBlob.TypeName;
-            break;
-        default:
-            return false;
-    }
-
-    // Set the modify or alter syntax depending on the type of database connected to
-    switch (Dbms())
-    {
-        case dbmsORACLE :
-            alterSlashModify = _T("MODIFY");
-            break;
-        case dbmsMS_SQL_SERVER :
-            alterSlashModify = _T("ALTER COLUMN");
-            break;
-        case dbmsUNIDENTIFIED :
-            return false;
-        case dbmsSYBASE_ASA :
-        case dbmsSYBASE_ASE :
-        case dbmsMY_SQL :
-        case dbmsPOSTGRES :
-        case dbmsACCESS :
-        case dbmsDBASE :
-        case dbmsXBASE_SEQUITER :
-        default :
-            alterSlashModify = _T("MODIFY");
-            break;
-    }
-
-    // create the SQL statement
-    if ( Dbms() == dbmsMY_SQL )
-    {
-        sqlStmt.Printf(wxT("ALTER TABLE %s %s %s %s"), tableName.c_str(), alterSlashModify.c_str(),
-              columnName.c_str(), dataTypeName.c_str());
-    }
-    else
-    {
-        sqlStmt.Printf(wxT("ALTER TABLE \"%s\" \"%s\" \"%s\" %s"), tableName.c_str(), alterSlashModify.c_str(),
-              columnName.c_str(), dataTypeName.c_str());
-    }
-
-    // For varchars only, append the size of the column
-    if (dataType == DB_DATA_TYPE_VARCHAR &&
-        (Dbms() != dbmsMY_SQL || dataTypeName != _T("text")))
-    {
-        wxString s;
-        s.Printf(wxT("(%lu)"), columnLength);
-        sqlStmt += s;
-    }
-
-    // for passing things like "NOT NULL"
-    if (optionalParam.length())
-    {
-        sqlStmt += wxT(" ");
-        sqlStmt += optionalParam;
-    }
-
-    return ExecSql(sqlStmt);
-
-} // wxDb::ModifyColumn()
-
-/********** wxDb::EscapeSqlChars() **********/
-wxString wxDb::EscapeSqlChars(const wxString& valueOrig)
-{
-    wxString value(valueOrig);
-    switch (Dbms())
-    {
-        case dbmsACCESS:
-            // Access doesn't seem to care about backslashes, so only escape single quotes.
-            value.Replace(wxT("'"), wxT("''"));
-            break;
-
-        default:
-            // All the others are supposed to be the same for now, add special
-            // handling for them if necessary
-            value.Replace(wxT("\\"), wxT("\\\\"));
-            value.Replace(wxT("'"), wxT("\\'"));
-            break;
-    }
-
-    return value;
-} // wxDb::EscapeSqlChars()
-
-
-/********** wxDbGetConnection() **********/
-wxDb WXDLLIMPEXP_ODBC *wxDbGetConnection(wxDbConnectInf *pDbConfig, bool FwdOnlyCursors)
-{
-    wxDbList *pList;
-
-    // Used to keep a pointer to a DB connection that matches the requested
-    // DSN and FwdOnlyCursors settings, even if it is not FREE, so that the
-    // data types can be copied from it (using the wxDb::Open(wxDb *) function)
-    // rather than having to re-query the datasource to get all the values
-    // using the wxDb::Open(Dsn,Uid,AuthStr) function
-    wxDb *matchingDbConnection = NULL;
-
-    // Scan the linked list searching for an available database connection
-    // that's already been opened but is currently not in use.
-    for (pList = PtrBegDbList; pList; pList = pList->PtrNext)
-    {
-        // The database connection must be for the same datasource
-        // name and must currently not be in use.
-        if (pList->Free &&
-            (pList->PtrDb->FwdOnlyCursors() == FwdOnlyCursors))
-        {
-            if (pDbConfig->UseConnectionStr())
-            {
-                if (pList->PtrDb->OpenedWithConnectionString() &&
-                     (!wxStrcmp(pDbConfig->GetConnectionStr(), pList->ConnectionStr)))
-                {
-                    // Found a free connection
-                    pList->Free = false;
-                    return(pList->PtrDb);
-                }
-            }
-            else
-            {
-                if (!pList->PtrDb->OpenedWithConnectionString() &&
-                     (!wxStrcmp(pDbConfig->GetDsn(), pList->Dsn)))
-                {
-                    // Found a free connection
-                    pList->Free = false;
-                    return(pList->PtrDb);
-                }
-            }
-        }
-
-        if (pDbConfig->UseConnectionStr())
-        {
-            if (!wxStrcmp(pDbConfig->GetConnectionStr(), pList->ConnectionStr))
-                matchingDbConnection = pList->PtrDb;
-        }
-        else
-        {
-            if (!wxStrcmp(pDbConfig->GetDsn(), pList->Dsn) &&
-                !wxStrcmp(pDbConfig->GetUserID(), pList->Uid) &&
-                !wxStrcmp(pDbConfig->GetPassword(), pList->AuthStr))
-                matchingDbConnection = pList->PtrDb;
-        }
-    }
-
-    // No available connections.  A new connection must be made and
-    // appended to the end of the linked list.
-    if (PtrBegDbList)
-    {
-        // Find the end of the list
-        for (pList = PtrBegDbList; pList->PtrNext; pList = pList->PtrNext);
-        // Append a new list item
-        pList->PtrNext = new wxDbList;
-        pList->PtrNext->PtrPrev = pList;
-        pList = pList->PtrNext;
-    }
-    else  // Empty list
-    {
-        // Create the first node on the list
-        pList = PtrBegDbList = new wxDbList;
-        pList->PtrPrev = 0;
-    }
-
-    // Initialize new node in the linked list
-    pList->PtrNext          = 0;
-    pList->Free             = false;
-    pList->Dsn              = pDbConfig->GetDsn();
-    pList->Uid              = pDbConfig->GetUserID();
-    pList->AuthStr          = pDbConfig->GetPassword();
-    pList->ConnectionStr    = pDbConfig->GetConnectionStr();
-
-    pList->PtrDb = new wxDb(pDbConfig->GetHenv(), FwdOnlyCursors);
-
-    bool opened;
-
-    if (!matchingDbConnection)
-    {
-        if (pDbConfig->UseConnectionStr())
-        {
-            opened = pList->PtrDb->Open(pDbConfig->GetConnectionStr());
-        }
-        else
-        {
-            opened = pList->PtrDb->Open(pDbConfig->GetDsn(), pDbConfig->GetUserID(), pDbConfig->GetPassword());
-        }
-    }
-    else
-        opened = pList->PtrDb->Open(matchingDbConnection);
-
-    // Connect to the datasource
-    if (opened)
-    {
-        pList->PtrDb->setCached(true);  // Prevent a user from deleting a cached connection
-        pList->PtrDb->SetSqlLogging(SQLLOGstate, SQLLOGfn, true);
-        return(pList->PtrDb);
-    }
-    else  // Unable to connect, destroy list item
-    {
-        if (pList->PtrPrev)
-            pList->PtrPrev->PtrNext = 0;
-        else
-            PtrBegDbList = 0;        // Empty list again
-
-        pList->PtrDb->CommitTrans(); // Commit any open transactions on wxDb object
-        pList->PtrDb->Close();       // Close the wxDb object
-        delete pList->PtrDb;         // Deletes the wxDb object
-        delete pList;                // Deletes the linked list object
-        return(0);
-    }
-
-}  // wxDbGetConnection()
-
-
-/********** wxDbFreeConnection() **********/
-bool WXDLLIMPEXP_ODBC wxDbFreeConnection(wxDb *pDb)
-{
-    wxDbList *pList;
-
-    // Scan the linked list searching for the database connection
-    for (pList = PtrBegDbList; pList; pList = pList->PtrNext)
-    {
-        if (pList->PtrDb == pDb)  // Found it, now free it!!!
-            return (pList->Free = true);
-    }
-
-    // Never found the database object, return failure
-    return false;
-
-}  // wxDbFreeConnection()
-
-
-/********** wxDbCloseConnections() **********/
-void WXDLLIMPEXP_ODBC wxDbCloseConnections(void)
-{
-    wxDbList *pList, *pNext;
-
-    // Traverse the linked list closing database connections and freeing memory as I go.
-    for (pList = PtrBegDbList; pList; pList = pNext)
-    {
-        pNext = pList->PtrNext;       // Save the pointer to next
-        pList->PtrDb->CommitTrans();  // Commit any open transactions on wxDb object
-        pList->PtrDb->Close();        // Close the wxDb object
-        pList->PtrDb->setCached(false);  // Allows deletion of the wxDb instance
-        delete pList->PtrDb;          // Deletes the wxDb object
-        delete pList;                 // Deletes the linked list object
-    }
-
-    // Mark the list as empty
-    PtrBegDbList = 0;
-
-}  // wxDbCloseConnections()
-
-
-/********** wxDbConnectionsInUse() **********/
-int WXDLLIMPEXP_ODBC wxDbConnectionsInUse(void)
-{
-    wxDbList *pList;
-    int cnt = 0;
-
-    // Scan the linked list counting db connections that are currently in use
-    for (pList = PtrBegDbList; pList; pList = pList->PtrNext)
-    {
-        if (pList->Free == false)
-            cnt++;
-    }
-
-    return(cnt);
-
-}  // wxDbConnectionsInUse()
-
-
-
-/********** wxDbLogExtendedErrorMsg() **********/
-// DEBUG ONLY function
-const wxChar WXDLLIMPEXP_ODBC *wxDbLogExtendedErrorMsg(const wxChar *userText,
-                                                  wxDb *pDb,
-                                                  const wxChar *ErrFile,
-                                                  int ErrLine)
-{
-    static wxString msg;
-    msg = userText;
-
-    wxString tStr;
-
-    if (ErrFile || ErrLine)
-    {
-        msg += wxT("File: ");
-        msg += ErrFile;
-        msg += wxT("   Line: ");
-        tStr.Printf(wxT("%d"),ErrLine);
-        msg += tStr.c_str();
-        msg += wxT("\n");
-    }
-
-    msg.Append (wxT("\nODBC errors:\n"));
-    msg += wxT("\n");
-
-    // Display errors for this connection
-    int i;
-    for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
-    {
-        if (pDb->errorList[i])
-        {
-            msg.Append(pDb->errorList[i]);
-            if (wxStrcmp(pDb->errorList[i], wxEmptyString) != 0)
-                msg.Append(wxT("\n"));
-            // Clear the errmsg buffer so the next error will not
-            // end up showing the previous error that have occurred
-            wxStrcpy(pDb->errorList[i], wxEmptyString);
-        }
-    }
-    msg += wxT("\n");
-
-    wxLogDebug(msg.c_str());
-
-    return msg.c_str();
-}  // wxDbLogExtendedErrorMsg()
-
-
-/********** wxDbSqlLog() **********/
-bool wxDbSqlLog(wxDbSqlLogState state, const wxChar *filename)
-{
-    bool append = false;
-    wxDbList *pList;
-
-    for (pList = PtrBegDbList; pList; pList = pList->PtrNext)
-    {
-        if (!pList->PtrDb->SetSqlLogging(state,filename,append))
-            return false;
-        append = true;
-    }
-
-    SQLLOGstate = state;
-    SQLLOGfn = filename;
-
-    return true;
-
-}  // wxDbSqlLog()
-
-
-#if 0
-/********** wxDbCreateDataSource() **********/
-int wxDbCreateDataSource(const wxString &driverName, const wxString &dsn, const wxString &description,
-                         bool sysDSN, const wxString &defDir, wxWindow *parent)
-/*
- * !!!! ONLY FUNCTIONAL UNDER MSW with VC6 !!!!
- * Very rudimentary creation of an ODBC data source.
- *
- * ODBC driver must be ODBC 3.0 compliant to use this function
- */
-{
-    int result = FALSE;
-
-//!!!! ONLY FUNCTIONAL UNDER MSW with VC6 !!!!
-#ifdef __VISUALC__
-    int       dsnLocation;
-    wxString  setupStr;
-
-    if (sysDSN)
-        dsnLocation = ODBC_ADD_SYS_DSN;
-    else
-        dsnLocation = ODBC_ADD_DSN;
-
-    // NOTE: The decimal 2 is an invalid character in all keyword pairs
-    // so that is why I used it, as wxString does not deal well with
-    // embedded nulls in strings
-    setupStr.Printf(wxT("DSN=%s%cDescription=%s%cDefaultDir=%s%c"),dsn,2,description,2,defDir,2);
-
-    // Replace the separator from above with the '\0' separator needed
-    // by the SQLConfigDataSource() function
-    int k;
-    do
-    {
-        k = setupStr.Find((wxChar)2,true);
-        if (k != wxNOT_FOUND)
-            setupStr[(UINT)k] = wxT('\0');
-    }
-    while (k != wxNOT_FOUND);
-
-    result = SQLConfigDataSource((HWND)parent->GetHWND(), dsnLocation,
-                                 driverName, setupStr.c_str());
-
-    if ((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO))
-    {
-        // check for errors caused by ConfigDSN based functions
-        DWORD retcode = 0;
-        WORD cb;
-        wxChar errMsg[SQL_MAX_MESSAGE_LENGTH];
-        errMsg[0] = wxT('\0');
-
-        // This function is only supported in ODBC drivers v3.0 compliant and above
-        SQLInstallerError(1,&retcode,errMsg,SQL_MAX_MESSAGE_LENGTH-1,&cb);
-        if (retcode)
-        {
-#ifdef DBDEBUG_CONSOLE
-               // When run in console mode, use standard out to display errors.
-               cout << errMsg << endl;
-               cout << wxT("Press any key to continue...") << endl;
-               getchar();
-#endif  // DBDEBUG_CONSOLE
-
-#ifdef __WXDEBUG__
-               wxLogDebug(errMsg,wxT("ODBC DEBUG MESSAGE"));
-#endif  // __WXDEBUG__
-        }
-    }
-    else
-       result = TRUE;
-#else
-    // Using iODBC/unixODBC or some other compiler which does not support the APIs
-    // necessary to use this function, so this function is not supported
-#ifdef __WXDEBUG__
-    wxLogDebug(wxT("wxDbCreateDataSource() not available except under VC++/MSW"),wxT("ODBC DEBUG MESSAGE"));
-#endif
-    result = FALSE;
-#endif  // __VISUALC__
-
-    return result;
-
-}  // wxDbCreateDataSource()
-#endif
-
-
-/********** wxDbGetDataSource() **********/
-bool wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMaxLength, wxChar *DsDesc,
-                       SWORD DsDescMaxLength, UWORD direction)
-/*
- * Dsn and DsDesc will contain the data source name and data source
- * description upon return
- */
-{
-    SWORD cb1,cb2;
-    SWORD lengthDsn = (SWORD)(DsnMaxLength*sizeof(wxChar));
-    SWORD lengthDsDesc = (SWORD)(DsDescMaxLength*sizeof(wxChar));
-
-    if (SQLDataSources(henv, direction, (SQLTCHAR FAR *) Dsn, lengthDsn, &cb1,
-                       (SQLTCHAR FAR *) DsDesc, lengthDsDesc, &cb2) == SQL_SUCCESS)
-        return true;
-    else
-        return false;
-
-}  // wxDbGetDataSource()
-
-
-// Change this to 0 to remove use of all deprecated functions
-#if wxODBC_BACKWARD_COMPATABILITY
-/********************************************************************
- ********************************************************************
- *
- * The following functions are all DEPRECATED and are included for
- * backward compatibility reasons only
- *
- ********************************************************************
- ********************************************************************/
-bool SqlLog(sqlLog state, const wxChar *filename)
-{
-    return wxDbSqlLog((enum wxDbSqlLogState)state, filename);
-}
-/***** DEPRECATED: use wxGetDataSource() *****/
-bool GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,
-                         UWORD direction)
-{
-    return wxDbGetDataSource(henv, Dsn, DsnMax, DsDesc, DsDescMax, direction);
-}
-/***** DEPRECATED: use wxDbGetConnection() *****/
-wxDb WXDLLIMPEXP_ODBC *GetDbConnection(DbStuff *pDbStuff, bool FwdOnlyCursors)
-{
-    return wxDbGetConnection((wxDbConnectInf *)pDbStuff, FwdOnlyCursors);
-}
-/***** DEPRECATED: use wxDbFreeConnection() *****/
-bool WXDLLIMPEXP_ODBC FreeDbConnection(wxDb *pDb)
-{
-    return wxDbFreeConnection(pDb);
-}
-/***** DEPRECATED: use wxDbCloseConnections() *****/
-void WXDLLIMPEXP_ODBC CloseDbConnections(void)
-{
-    wxDbCloseConnections();
-}
-/***** DEPRECATED: use wxDbConnectionsInUse() *****/
-int WXDLLIMPEXP_ODBC NumberDbConnectionsInUse(void)
-{
-    return wxDbConnectionsInUse();
-}
-#endif
-
-
-#endif
- // wxUSE_ODBC
diff --git a/src/common/dbgrid.cpp b/src/common/dbgrid.cpp
deleted file mode 100644 (file)
index 634be02..0000000
+++ /dev/null
@@ -1,727 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/dbgrid.cpp
-// Purpose:     Displays a wxDbTable in a wxGrid.
-// Author:      Roger Gammans, Paul Gammans
-// Modified by:
-// Created:
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999 The Computer Surgery (roger@computer-surgery.co.uk)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-// Branched From : dbgrid.cpp,v 1.18 2000/12/19 13:00:58
-///////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_ODBC && wxUSE_GRID
-
-#ifndef WX_PRECOMP
-    #include "wx/textctrl.h"
-    #include "wx/dc.h"
-    #include "wx/app.h"
-#endif // WX_PRECOMP
-
-#include "wx/generic/gridctrl.h"
-#include "wx/dbgrid.h"
-
-// DLL options compatibility check:
-WX_CHECK_BUILD_OPTIONS("wxDbGrid")
-
-
-wxDbGridCellAttrProvider::wxDbGridCellAttrProvider()
-{
-    m_data=NULL;
-    m_ColInfo=NULL;
-}
-
-wxDbGridCellAttrProvider::wxDbGridCellAttrProvider(wxDbTable *tab, wxDbGridColInfoBase* ColInfo)
-{
-    m_data=tab;
-    m_ColInfo=ColInfo;
-}
-
-wxDbGridCellAttrProvider::~wxDbGridCellAttrProvider()
-{
-}
-
-wxGridCellAttr *wxDbGridCellAttrProvider::GetAttr(int row, int col,
-                                      wxGridCellAttr::wxAttrKind  kind) const
-{
-    wxGridCellAttr *attr = wxGridCellAttrProvider::GetAttr(row,col,kind);
-
-    if (m_data && m_ColInfo && (m_data->GetNumberOfColumns() > m_ColInfo[col].DbCol))
-    {
-        //FIXME: this test could.
-        //  ??::InsertPending == m_data->get_ModifiedStatus()
-        //  and if InsertPending use colDef[].InsertAllowed
-        if (!(m_data->GetColDefs()[(m_ColInfo[col].DbCol)].Updateable))
-        {
-            switch(kind)
-            {
-                case (wxGridCellAttr::Any):
-                    if (!attr)
-                    {
-                        attr = new wxGridCellAttr;
-                        // Store so we don't keep creating / deleting this...
-                        wxDbGridCellAttrProvider * self = wxConstCast(this, wxDbGridCellAttrProvider) ;
-                        attr->IncRef();
-                        self->SetColAttr(attr, col);
-                        attr->SetReadOnly();
-                    }
-                    else
-                    {
-                        //We now must check what we were returned. and do the right thing (tm)
-                        wxGridCellAttr::wxAttrKind attrkind = attr->GetKind();
-                        if ((attrkind == (wxGridCellAttr::Default)) || (attrkind == (wxGridCellAttr::Cell)) ||
-                            (attrkind == (wxGridCellAttr::Col)))
-                        {
-                                wxGridCellAttr *attrtomerge = attr;
-                                attr = new wxGridCellAttr;
-                                attr->SetKind(wxGridCellAttr::Merged);
-                                attr->MergeWith(attrtomerge);
-                                attr->SetReadOnly();
-                                attrtomerge->DecRef();
-                        }
-                        attr->SetReadOnly();
-                    }
-                break;
-                case (wxGridCellAttr::Col):
-                    //As we must have a Coll, and were setting Coll attributes
-                    // we can based on wxdbTable's so just set RO if attr valid
-                    if (!attr)
-                    {
-                        attr = new wxGridCellAttr;
-                        wxDbGridCellAttrProvider * self = wxConstCast(this, wxDbGridCellAttrProvider) ;
-                        attr->IncRef();
-                        self->SetColAttr(attr, col);
-                    }
-                    attr->SetReadOnly();
-                break;
-                default:
-                    //Dont add RO for...
-                    //  wxGridCellAttr::Cell - Not required, will inherit on merge from row.
-                    //  wxGridCellAttr::Row - If wxDbtable ever supports row locking could add
-                    //                        support to make RO on a row basis also.
-                    //  wxGridCellAttr::Default - Don't edit this ! or all cell with a attr will become readonly
-                    //  wxGridCellAttr::Merged - This should never be asked for.
-                break;
-            }
-        }
-
-    }
-    return attr;
-}
-
-void wxDbGridCellAttrProvider::AssignDbTable(wxDbTable *tab)
-{
-    m_data = tab;
-}
-
-wxDbGridTableBase::wxDbGridTableBase(wxDbTable *tab, wxDbGridColInfo*  ColInfo,
-                     int count, bool takeOwnership)  :
-    m_keys(),
-    m_data(tab),
-    m_dbowner(takeOwnership),
-    m_rowmodified(false)
-{
-
-    if (count == wxUSE_QUERY)
-    {
-        m_rowtotal = m_data ? m_data->Count() : 0;
-    }
-    else
-    {
-        m_rowtotal = count;
-    }
-//    m_keys.Size(m_rowtotal);
-    m_row = -1;
-    if (ColInfo)
-    {
-        m_nocols = ColInfo->Length();
-        m_ColInfo = new wxDbGridColInfoBase[m_nocols];
-        //Do Copy.
-        wxDbGridColInfo *ptr = ColInfo;
-        int i =0;
-        while (ptr && i < m_nocols)
-        {
-            m_ColInfo[i] = ptr->m_data;
-            ptr = ptr->m_next;
-            i++;
-        }
-#ifdef __WXDEBUG__
-        if (ptr)
-        {
-            wxLogDebug(wxT("NoCols over length after traversing %i items"),i);
-        }
-        if (i < m_nocols)
-        {
-            wxLogDebug(wxT("NoCols under length after traversing %i items"),i);
-        }
-#endif
-    }
-}
-
-wxDbGridTableBase::~wxDbGridTableBase()
-{
-    wxDbGridCellAttrProvider *provider;
-
-    //Can't check for update here as
-
-    //FIXME: should i remove m_ColInfo and m_data from m_attrProvider if a wxDbGridAttrProvider
-//    if ((provider = dynamic_cast<wxDbGridCellAttrProvider *>(GetAttrProvider())))
-     // Using C casting for now until we can support dynamic_cast with wxWidgets
-    provider = (wxDbGridCellAttrProvider *)(GetAttrProvider());
-    if (provider)
-    {
-        provider->AssignDbTable(NULL);
-    }
-    delete [] m_ColInfo;
-
-    Writeback();
-    if (m_dbowner)
-    {
-        delete m_data;
-    }
-}
-
-bool wxDbGridTableBase::CanHaveAttributes()
-{
-    if (!GetAttrProvider())
-    {
-        // use the default attr provider by default
-        SetAttrProvider(new wxDbGridCellAttrProvider(m_data, m_ColInfo));
-    }
-    return true;
-}
-
-
-bool wxDbGridTableBase::AssignDbTable(wxDbTable *tab, int count, bool takeOwnership)
-{
-    wxDbGridCellAttrProvider *provider;
-
-    wxGridUpdateLocker locker(GetView());
-
-    //Remove Information from grid about old data
-    if (GetView())
-    {
-        wxGrid *grid = GetView();
-        grid->ClearSelection();
-        if (grid->IsCellEditControlEnabled())
-        {
-            grid->DisableCellEditControl();
-        }
-        wxGridTableMessage msg(this, wxGRIDTABLE_NOTIFY_ROWS_DELETED,0,m_rowtotal);
-        grid->ProcessTableMessage(msg);
-    }
-
-    //reset our internals...
-    Writeback();
-    if (m_dbowner)
-    {
-        delete m_data;
-    }
-    m_keys.Empty();
-    m_data = tab;
-    //FIXME: Remove dynamic_cast before sumision to wxwin
-//    if ((provider = dynamic_cast<wxDbGridCellAttrProvider *> (GetAttrProvider())))
-     // Using C casting for now until we can support dynamic_cast with wxWidgets
-    provider = (wxDbGridCellAttrProvider *)(GetAttrProvider());
-    if (provider)
-    {
-        provider->AssignDbTable(m_data);
-    }
-
-    if (count == wxUSE_QUERY)
-    {
-        m_rowtotal = m_data ? m_data->Count() : 0;
-    }
-    else
-    {
-         m_rowtotal = count;
-    }
-    m_row = -1;
-
-    //Add Information to grid about new data
-    if (GetView())
-    {
-        wxGrid * grid = GetView();
-        wxGridTableMessage msg(this, wxGRIDTABLE_NOTIFY_ROWS_APPENDED, m_rowtotal);
-        grid->ProcessTableMessage(msg);
-    }
-    m_dbowner = takeOwnership;
-    m_rowmodified = false;
-    return true;
-}
-
-wxString wxDbGridTableBase::GetTypeName(int WXUNUSED(row), int col)
-{
-    if (GetNumberCols() > col)
-    {
-        if (m_ColInfo[col].wxtypename == wxGRID_VALUE_DBAUTO)
-        {
-            if (m_data->GetNumberOfColumns() <= m_ColInfo[col].DbCol)
-            {
-                wxFAIL_MSG (_T("You can not use wxGRID_VALUE_DBAUTO for virtual columns"));
-            }
-            switch(m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype)
-            {
-                case SQL_C_CHAR:
-#ifdef SQL_C_WCHAR
-                case SQL_C_WCHAR:
-#endif
-                    return wxGRID_VALUE_STRING;
-                case SQL_C_SHORT:
-                case SQL_C_SSHORT:
-                    return wxGRID_VALUE_NUMBER;
-                case SQL_C_USHORT:
-                    return wxGRID_VALUE_NUMBER;
-                case SQL_C_LONG:
-                case SQL_C_SLONG:
-                    return wxGRID_VALUE_NUMBER;
-                case SQL_C_ULONG:
-                    return wxGRID_VALUE_NUMBER;
-                case SQL_C_FLOAT:
-                    return wxGRID_VALUE_FLOAT;
-                case SQL_C_DOUBLE:
-                    return wxGRID_VALUE_FLOAT;
-                case SQL_C_DATE:
-                    return wxGRID_VALUE_DATETIME;
-                case SQL_C_TIME:
-                    return wxGRID_VALUE_DATETIME;
-                case SQL_C_TIMESTAMP:
-                    return wxGRID_VALUE_DATETIME;
-                default:
-                    return wxGRID_VALUE_STRING;
-            }
-        }
-        else
-        {
-            return m_ColInfo[col].wxtypename;
-        }
-    }
-    wxFAIL_MSG (_T("unknown column"));
-    return wxString();
-}
-
-bool wxDbGridTableBase::CanGetValueAs(int row, int col, const wxString& typeName)
-{
-    wxLogDebug(wxT("CanGetValueAs() on %i,%i"),row,col);
-    //Is this needed? As it will be validated on GetValueAsXXXX
-    ValidateRow(row);
-
-    if (typeName == wxGRID_VALUE_STRING)
-    {
-        //FIXME ummm What about blob field etc.
-        return true;
-    }
-
-    if (m_data->IsColNull((UWORD)m_ColInfo[col].DbCol))
-    {
-        return false;
-    }
-
-    if (m_data->GetNumberOfColumns() <= m_ColInfo[col].DbCol)
-    {
-        //If a virtual column then we can't find it's type. we have to
-        // return false to get using wxVariant.
-        return false;
-    }
-    int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype;
-
-    if (typeName == wxGRID_VALUE_DATETIME)
-    {
-        if ((sqltype == SQL_C_DATE) ||
-            (sqltype == SQL_C_TIME) ||
-            (sqltype == SQL_C_TIMESTAMP))
-        {
-            return true;
-        }
-        return false;
-    }
-    if (typeName == wxGRID_VALUE_NUMBER)
-    {
-        if ((sqltype == SQL_C_SSHORT) ||
-            (sqltype == SQL_C_USHORT) ||
-            (sqltype == SQL_C_SLONG)  ||
-            (sqltype == SQL_C_ULONG))
-        {
-            return true;
-        }
-        return false;
-    }
-    if (typeName == wxGRID_VALUE_FLOAT)
-    {
-        if ((sqltype == SQL_C_SSHORT) ||
-            (sqltype == SQL_C_USHORT) ||
-            (sqltype == SQL_C_SLONG)  ||
-            (sqltype == SQL_C_ULONG)  ||
-            (sqltype == SQL_C_FLOAT)  ||
-            (sqltype == SQL_C_DOUBLE))
-        {
-            return true;
-        }
-        return false;
-    }
-    return false;
-}
-
-bool wxDbGridTableBase::CanSetValueAs(int WXUNUSED(row), int col, const wxString& typeName)
-{
-    if (typeName == wxGRID_VALUE_STRING)
-    {
-        //FIXME ummm What about blob field etc.
-        return true;
-    }
-
-    if (!(m_data->GetColDefs()[(m_ColInfo[col].DbCol)].Updateable))
-    {
-        return false;
-    }
-
-    if (m_data->GetNumberOfColumns() <= m_ColInfo[col].DbCol)
-    {
-        //If a virtual column then we can't find it's type. we have to faulse to
-        //get using wxVairent.
-        return false;
-    }
-
-    int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype;
-    if (typeName == wxGRID_VALUE_DATETIME)
-    {
-        if ((sqltype == SQL_C_DATE) ||
-            (sqltype == SQL_C_TIME) ||
-            (sqltype == SQL_C_TIMESTAMP))
-        {
-            return true;
-        }
-        return false;
-    }
-    if (typeName == wxGRID_VALUE_NUMBER)
-    {
-        if ((sqltype == SQL_C_SSHORT) ||
-            (sqltype == SQL_C_USHORT) ||
-            (sqltype == SQL_C_SLONG)  ||
-            (sqltype == SQL_C_ULONG))
-        {
-            return true;
-        }
-        return false;
-    }
-    if (typeName == wxGRID_VALUE_FLOAT)
-    {
-        if ((sqltype == SQL_C_SSHORT) ||
-            (sqltype == SQL_C_USHORT) ||
-            (sqltype == SQL_C_SLONG)  ||
-            (sqltype == SQL_C_ULONG)  ||
-            (sqltype == SQL_C_FLOAT)  ||
-            (sqltype == SQL_C_DOUBLE))
-        {
-            return true;
-        }
-        return false;
-    }
-    return false;
-}
-
-long wxDbGridTableBase::GetValueAsLong(int row, int col)
-{
-    ValidateRow(row);
-
-    if (m_data->GetNumberOfColumns() <= m_ColInfo[col].DbCol)
-    {
-        wxFAIL_MSG (_T("You can not use GetValueAsLong for virtual columns"));
-        return 0;
-    }
-    int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype;
-    if ((sqltype == SQL_C_SSHORT) ||
-        (sqltype == SQL_C_USHORT) ||
-        (sqltype == SQL_C_SLONG) ||
-        (sqltype == SQL_C_ULONG))
-    {
-        wxVariant val = m_data->GetColumn(m_ColInfo[col].DbCol);
-        return val.GetLong();
-    }
-    wxFAIL_MSG (_T("unknown column, "));
-    return 0;
-}
-
-double wxDbGridTableBase::GetValueAsDouble(int row, int col)
-{
-    wxLogDebug(wxT("GetValueAsDouble() on %i,%i"),row,col);
-    ValidateRow(row);
-
-    if (m_data->GetNumberOfColumns() <= m_ColInfo[col].DbCol)
-    {
-        wxFAIL_MSG (_T("You can not use GetValueAsDouble for virtual columns"));
-        return 0.0;
-    }
-    int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype;
-    if ((sqltype == SQL_C_SSHORT) ||
-        (sqltype == SQL_C_USHORT) ||
-        (sqltype == SQL_C_SLONG) ||
-        (sqltype == SQL_C_ULONG) ||
-        (sqltype == SQL_C_FLOAT) ||
-        (sqltype == SQL_C_DOUBLE))
-    {
-        wxVariant val = m_data->GetColumn(m_ColInfo[col].DbCol);
-        return val.GetDouble();
-    }
-    wxFAIL_MSG (_T("unknown column"));
-    return 0.0;
-}
-
-bool wxDbGridTableBase::GetValueAsBool(int row, int col)
-{
-    wxLogDebug(wxT("GetValueAsBool() on %i,%i"),row,col);
-    ValidateRow(row);
-
-    if (m_data->GetNumberOfColumns() <= m_ColInfo[col].DbCol)
-    {
-        wxFAIL_MSG (_T("You can not use GetValueAsBool for virtual columns"));
-        return 0;
-    }
-    int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype;
-    if ((sqltype == SQL_C_SSHORT) ||
-        (sqltype == SQL_C_USHORT) ||
-        (sqltype == SQL_C_SLONG) ||
-        (sqltype == SQL_C_ULONG))
-    {
-        wxVariant val = m_data->GetColumn(m_ColInfo[col].DbCol);
-        return val.GetBool();
-    }
-    wxFAIL_MSG (_T("unknown column, "));
-    return 0;
-}
-
-void* wxDbGridTableBase::GetValueAsCustom(int row, int col, const wxString& typeName)
-{
-    wxLogDebug(wxT("GetValueAsCustom() on %i,%i"),row,col);
-    ValidateRow(row);
-
-    if (m_data->GetNumberOfColumns() <= m_ColInfo[col].DbCol)
-    {
-        wxFAIL_MSG (_T("You can not use GetValueAsCustom for virtual columns"));
-        return NULL;
-    }
-    if (m_data->IsColNull((UWORD)m_ColInfo[col].DbCol))
-        return NULL;
-
-    if (typeName == wxGRID_VALUE_DATETIME)
-    {
-        wxDbColDef *pColDefs = m_data->GetColDefs();
-        int sqltype = pColDefs[(m_ColInfo[col].DbCol)].SqlCtype;
-
-        if ((sqltype == SQL_C_DATE) ||
-            (sqltype == SQL_C_TIME) ||
-            (sqltype == SQL_C_TIMESTAMP))
-        {
-            wxVariant val = m_data->GetColumn(m_ColInfo[col].DbCol);
-            return new wxDateTime(val.GetDateTime());
-        }
-    }
-    wxFAIL_MSG (_T("unknown column data type "));
-    return NULL;
-}
-
-
-void wxDbGridTableBase::SetValueAsCustom(int row, int col, const wxString& typeName, void* value)
-{
-    wxLogDebug(wxT("SetValueAsCustom() on %i,%i"),row,col);
-    ValidateRow(row);
-
-    if (m_data->GetNumberOfColumns() <= m_ColInfo[col].DbCol)
-    {
-        wxFAIL_MSG (_T("You can not use SetValueAsCustom for virtual columns"));
-        return;
-    }
-
-    if (typeName == wxGRID_VALUE_DATETIME)
-    {
-        int sqltype = m_data->GetColDefs()[(m_ColInfo[col].DbCol)].SqlCtype;
-        if ((sqltype == SQL_C_DATE) ||
-            (sqltype == SQL_C_TIME) ||
-            (sqltype == SQL_C_TIMESTAMP))
-        {
-            //FIXME: you can't dynamic_cast from (void *)
-            //wxDateTime *date = wxDynamicCast(value, wxDateTime);
-            wxDateTime *date = (wxDateTime *)value;
-            if (!date)
-            {
-                wxFAIL_MSG (_T("Failed to convert data"));
-                return;
-            }
-            wxVariant val(date);
-            m_rowmodified = true;
-            m_data->SetColumn(m_ColInfo[col].DbCol,val);
-        }
-    }
-    wxFAIL_MSG (_T("unknown column data type"));
-    return ;
-}
-
-
-wxString wxDbGridTableBase::GetColLabelValue(int col)
-{
-    if (GetNumberCols() > col)
-    {
-        return m_ColInfo[col].Title;
-    }
-    wxFAIL_MSG (_T("unknown column"));
-    return wxString();
-}
-
-bool wxDbGridTableBase::IsEmptyCell(int row, int col)
-{
-    wxLogDebug(wxT("IsEmtpyCell on %i,%i"),row,col);
-
-    ValidateRow(row);
-    return m_data->IsColNull((UWORD)m_ColInfo[col].DbCol);
-}
-
-
-wxString wxDbGridTableBase::GetValue(int row, int col)
-{
-    wxLogDebug(wxT("GetValue() on %i,%i"),row,col);
-
-    ValidateRow(row);
-    wxVariant val = m_data->GetColumn(m_ColInfo[col].DbCol);
-    wxLogDebug(wxT("\tReturning \"%s\"\n"),val.GetString().c_str());
-
-    return val.GetString();
-}
-
-
-void wxDbGridTableBase::SetValue(int row, int col,const wxString& value)
-{
-    wxLogDebug(wxT("SetValue() on %i,%i"),row,col);
-
-    ValidateRow(row);
-    wxVariant val(value);
-
-    m_rowmodified = true;
-    m_data->SetColumn(m_ColInfo[col].DbCol,val);
-}
-
-
-void wxDbGridTableBase::SetValueAsLong(int row, int col, long value)
-{
-    wxLogDebug(wxT("SetValueAsLong() on %i,%i"),row,col);
-
-    ValidateRow(row);
-    wxVariant val(value);
-
-    m_rowmodified = true;
-    m_data->SetColumn(m_ColInfo[col].DbCol,val);
-}
-
-
-void wxDbGridTableBase::SetValueAsDouble(int row, int col, double value)
-{
-    wxLogDebug(wxT("SetValueAsDouble() on %i,%i"),row,col);
-
-    ValidateRow(row);
-    wxVariant val(value);
-
-    m_rowmodified = true;
-    m_data->SetColumn(m_ColInfo[col].DbCol,val);
-
-}
-
-
-void wxDbGridTableBase::SetValueAsBool(int row, int col, bool value)
-{
-    wxLogDebug(wxT("SetValueAsBool() on %i,%i"),row,col);
-
-    ValidateRow(row);
-    wxVariant val(value);
-
-    m_rowmodified = true;
-    m_data->SetColumn(m_ColInfo[col].DbCol,val);
-}
-
-
-void wxDbGridTableBase::ValidateRow(int row)
-{
-    wxLogDebug(wxT("ValidateRow(%i) currently on row (%i). Array count = %lu"),
-               row, m_row, (unsigned long)m_keys.GetCount());
-
-    if (row == m_row)
-         return;
-    Writeback();
-
-    //We add to row as Count is unsigned!
-    if ((unsigned)(row+1) > m_keys.GetCount())
-    {
-        wxLogDebug(wxT("\trow key unknown"));
-        // Extend Array, iterate through data filling with keys
-        m_data->SetRowMode(wxDbTable::WX_ROW_MODE_QUERY);
-        int trow;
-        for (trow = m_keys.GetCount(); trow <= row; trow++)
-        {
-            wxLogDebug(wxT("Fetching row %i.."), trow);
-            bool ret = m_data->GetNext();
-
-            wxLogDebug(wxT(" ...success=(%i)"),ret);
-            GenericKey k = m_data->GetKey();
-            m_keys.Add(k);
-        }
-        m_row = row;
-    }
-    else
-    {
-        wxLogDebug(wxT("\trow key known centering data"));
-        GenericKey k = m_keys.Item(row);
-        m_data->SetRowMode(wxDbTable::WX_ROW_MODE_INDIVIDUAL);
-        m_data->ClearMemberVars();
-        m_data->SetKey(k);
-        if (!m_data->QueryOnKeyFields())
-        {
-            wxDbLogExtendedErrorMsg(_T("ODBC error during Query()\n\n"), m_data->GetDb(),__TFILE__,__LINE__);
-        }
-
-        m_data->GetNext();
-
-        m_row = row;
-    }
-    m_rowmodified = false;
-}
-
-bool wxDbGridTableBase::Writeback() const
-{
-    if (!m_rowmodified)
-    {
-        return true;
-    }
-
-    bool result=true;
-    wxLogDebug(wxT("\trow key unknown"));
-
-// FIXME: this code requires dbtable support for record status
-#if 0
-    switch (m_data->get_ModifiedStatus())
-    {
-        case wxDbTable::UpdatePending:
-            result = m_data->Update();
-           break;
-        case wxDbTable::InsertPending:
-            result = (m_data->Insert() == SQL_SUCCESS);
-        break;
-        default:
-            //Nothing
-        break;
-    }
-#else
-    wxLogDebug(wxT("WARNING : Row writeback not implemented "));
-#endif
-    return result;
-}
-
-#include "wx/arrimpl.cpp"
-
-WX_DEFINE_EXPORTED_OBJARRAY(keyarray)
-
-#endif  // wxUSE_GRID && wxUSE_ODBC
diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
deleted file mode 100644 (file)
index ac99814..0000000
+++ /dev/null
@@ -1,2920 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/dbtable.cpp
-// Purpose:     Implementation of the wxDbTable class.
-// Author:      Doug Card
-// Modified by: George Tasker
-//              Bart Jourquin
-//              Mark Johnson
-// Created:     9.96
-// RCS-ID:      $Id$
-// Copyright:   (c) 1996 Remstar International, Inc.
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#include  "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_ODBC
-
-#ifndef WX_PRECOMP
-    #include "wx/object.h"
-    #include "wx/list.h"
-    #include "wx/string.h"
-    #include "wx/utils.h"
-    #include "wx/log.h"
-    #include "wx/crt.h"
-#endif
-
-#ifdef DBDEBUG_CONSOLE
-    #include "wx/ioswrap.h"
-#endif
-
-#include "wx/filefn.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "wx/dbtable.h"
-
-// FIXME-UTF8: get rid of this after switching to Unicode-only builds:
-#if wxUSE_UNICODE
-    #define WXSQLCAST(s) ((SQLTCHAR FAR *)(wchar_t*)(s).wchar_str())
-#else
-    #define WXSQLCAST(s) ((SQLTCHAR FAR *)(char*)(s).char_str())
-#endif
-
-ULONG lastTableID = 0;
-
-
-#ifdef __WXDEBUG__
-    #include "wx/thread.h"
-
-    wxList TablesInUse;
-    wxCriticalSection csTablesInUse;
-#endif
-
-
-void csstrncpyt(wxChar *target, const wxChar *source, int n)
-{
-    while ( (*target++ = *source++) != '\0' && --n != 0 )
-        ;
-
-    *target = '\0';
-}
-
-
-
-/********** wxDbColDef::wxDbColDef() Constructor **********/
-wxDbColDef::wxDbColDef()
-{
-    Initialize();
-}  // Constructor
-
-
-bool wxDbColDef::Initialize()
-{
-    ColName[0]      = 0;
-    DbDataType      = DB_DATA_TYPE_INTEGER;
-    SqlCtype        = SQL_C_LONG;
-    PtrDataObj      = NULL;
-    SzDataObj       = 0;
-    KeyField        = false;
-    Updateable      = false;
-    InsertAllowed   = false;
-    DerivedCol      = false;
-    CbValue         = 0;
-    Null            = false;
-    CbValueCol      = 0;
-
-    return true;
-}  // wxDbColDef::Initialize()
-
-
-/********** wxDbTable::wxDbTable() Constructor **********/
-wxDbTable::wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns,
-                    const wxString &qryTblName, bool qryOnly, const wxString &tblPath)
-{
-    if (!initialize(pwxDb, tblName, numColumns, qryTblName, qryOnly, tblPath))
-        cleanup();
-}  // wxDbTable::wxDbTable()
-
-
-/********** wxDbTable::~wxDbTable() **********/
-wxDbTable::~wxDbTable()
-{
-    this->cleanup();
-}  // wxDbTable::~wxDbTable()
-
-
-bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns,
-                    const wxString &qryTblName, bool qryOnly, const wxString &tblPath)
-{
-    // Initializing member variables
-    pDb                 = pwxDb;                    // Pointer to the wxDb object
-    henv                = 0;
-    hdbc                = 0;
-    hstmt               = 0;
-    m_hstmtGridQuery               = 0;
-    hstmtDefault        = 0;                        // Initialized below
-    hstmtCount          = 0;                        // Initialized first time it is needed
-    hstmtInsert         = 0;
-    hstmtDelete         = 0;
-    hstmtUpdate         = 0;
-    hstmtInternal       = 0;
-    colDefs             = 0;
-    tableID             = 0;
-    m_numCols           = numColumns;               // Number of columns in the table
-    where.Empty();                                  // Where clause
-    orderBy.Empty();                                // Order By clause
-    from.Empty();                                   // From clause
-    selectForUpdate     = false;                    // SELECT ... FOR UPDATE; Indicates whether to include the FOR UPDATE phrase
-    queryOnly           = qryOnly;
-    insertable          = true;
-    tablePath.Empty();
-    tableName.Empty();
-    queryTableName.Empty();
-
-    wxASSERT(tblName.length());
-    wxASSERT(pDb);
-
-    if (!pDb)
-        return false;
-
-    tableName = tblName;                        // Table Name
-    if ((pDb->Dbms() == dbmsORACLE) ||
-        (pDb->Dbms() == dbmsFIREBIRD) ||
-        (pDb->Dbms() == dbmsINTERBASE))
-        tableName = tableName.Upper();
-
-    if (tblPath.length())
-        tablePath = tblPath;                    // Table Path - used for dBase files
-    else
-        tablePath.Empty();
-
-    if (qryTblName.length())                    // Name of the table/view to query
-        queryTableName = qryTblName;
-    else
-        queryTableName = tblName;
-
-    if ((pDb->Dbms() == dbmsORACLE) ||
-        (pDb->Dbms() == dbmsFIREBIRD) ||
-        (pDb->Dbms() == dbmsINTERBASE))
-        queryTableName = queryTableName.Upper();
-
-    pDb->incrementTableCount();
-
-    wxString s;
-    tableID = ++lastTableID;
-    s.Printf(wxT("wxDbTable constructor (%-20s) tableID:[%6lu] pDb:[%p]"),
-             tblName.c_str(), tableID, wx_static_cast(void*, pDb));
-
-#ifdef __WXDEBUG__
-    wxTablesInUse *tableInUse;
-    tableInUse            = new wxTablesInUse();
-    tableInUse->tableName = tblName;
-    tableInUse->tableID   = tableID;
-    tableInUse->pDb       = pDb;
-    {
-        wxCriticalSectionLocker lock(csTablesInUse);
-        TablesInUse.Append(tableInUse);
-    }
-#endif
-
-    pDb->WriteSqlLog(s);
-
-    // Grab the HENV and HDBC from the wxDb object
-    henv = pDb->GetHENV();
-    hdbc = pDb->GetHDBC();
-
-    // Allocate space for column definitions
-    if (m_numCols)
-        colDefs = new wxDbColDef[m_numCols];  // Points to the first column definition
-
-    // Allocate statement handles for the table
-    if (!queryOnly)
-    {
-        // Allocate a separate statement handle for performing inserts
-        if (SQLAllocStmt(hdbc, &hstmtInsert) != SQL_SUCCESS)
-            pDb->DispAllErrors(henv, hdbc);
-        // Allocate a separate statement handle for performing deletes
-        if (SQLAllocStmt(hdbc, &hstmtDelete) != SQL_SUCCESS)
-            pDb->DispAllErrors(henv, hdbc);
-        // Allocate a separate statement handle for performing updates
-        if (SQLAllocStmt(hdbc, &hstmtUpdate) != SQL_SUCCESS)
-            pDb->DispAllErrors(henv, hdbc);
-    }
-    // Allocate a separate statement handle for internal use
-    if (SQLAllocStmt(hdbc, &hstmtInternal) != SQL_SUCCESS)
-        pDb->DispAllErrors(henv, hdbc);
-
-    // Set the cursor type for the statement handles
-    cursorType = SQL_CURSOR_STATIC;
-
-    if (SQLSetStmtOption(hstmtInternal, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS)
-    {
-        // Check to see if cursor type is supported
-        pDb->GetNextError(henv, hdbc, hstmtInternal);
-        if (! wxStrcmp(pDb->sqlState, wxT("01S02")))  // Option Value Changed
-        {
-            // Datasource does not support static cursors.  Driver
-            // will substitute a cursor type.  Call SQLGetStmtOption()
-            // to determine which cursor type was selected.
-            if (SQLGetStmtOption(hstmtInternal, SQL_CURSOR_TYPE, &cursorType) != SQL_SUCCESS)
-                pDb->DispAllErrors(henv, hdbc, hstmtInternal);
-#ifdef DBDEBUG_CONSOLE
-            cout << wxT("Static cursor changed to: ");
-            switch(cursorType)
-            {
-            case SQL_CURSOR_FORWARD_ONLY:
-                cout << wxT("Forward Only");
-                break;
-            case SQL_CURSOR_STATIC:
-                cout << wxT("Static");
-                break;
-            case SQL_CURSOR_KEYSET_DRIVEN:
-                cout << wxT("Keyset Driven");
-                break;
-            case SQL_CURSOR_DYNAMIC:
-                cout << wxT("Dynamic");
-                break;
-            }
-            cout << endl << endl;
-#endif
-            // BJO20000425
-            if (pDb->FwdOnlyCursors() && cursorType != SQL_CURSOR_FORWARD_ONLY)
-            {
-                // Force the use of a forward only cursor...
-                cursorType = SQL_CURSOR_FORWARD_ONLY;
-                if (SQLSetStmtOption(hstmtInternal, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS)
-                {
-                    // Should never happen
-                    pDb->GetNextError(henv, hdbc, hstmtInternal);
-                    return false;
-                }
-            }
-        }
-        else
-        {
-            pDb->DispNextError();
-            pDb->DispAllErrors(henv, hdbc, hstmtInternal);
-        }
-    }
-#ifdef DBDEBUG_CONSOLE
-    else
-        cout << wxT("Cursor Type set to STATIC") << endl << endl;
-#endif
-
-    if (!queryOnly)
-    {
-        // Set the cursor type for the INSERT statement handle
-        if (SQLSetStmtOption(hstmtInsert, SQL_CURSOR_TYPE, SQL_CURSOR_FORWARD_ONLY) != SQL_SUCCESS)
-            pDb->DispAllErrors(henv, hdbc, hstmtInsert);
-        // Set the cursor type for the DELETE statement handle
-        if (SQLSetStmtOption(hstmtDelete, SQL_CURSOR_TYPE, SQL_CURSOR_FORWARD_ONLY) != SQL_SUCCESS)
-            pDb->DispAllErrors(henv, hdbc, hstmtDelete);
-        // Set the cursor type for the UPDATE statement handle
-        if (SQLSetStmtOption(hstmtUpdate, SQL_CURSOR_TYPE, SQL_CURSOR_FORWARD_ONLY) != SQL_SUCCESS)
-            pDb->DispAllErrors(henv, hdbc, hstmtUpdate);
-    }
-
-    // Make the default cursor the active cursor
-    hstmtDefault = GetNewCursor(false,false);
-    wxASSERT(hstmtDefault);
-    hstmt = *hstmtDefault;
-
-    return true;
-
-}  // wxDbTable::initialize()
-
-
-void wxDbTable::cleanup()
-{
-    wxString s;
-    if (pDb)
-    {
-        s.Printf(wxT("wxDbTable destructor (%-20s) tableID:[%6lu] pDb:[%p]"),
-                 tableName.c_str(), tableID, wx_static_cast(void*, pDb));
-        pDb->WriteSqlLog(s);
-    }
-
-#ifdef __WXDEBUG__
-    if (tableID)
-    {
-        bool found = false;
-
-        wxList::compatibility_iterator pNode;
-        {
-            wxCriticalSectionLocker lock(csTablesInUse);
-            pNode = TablesInUse.GetFirst();
-            while (!found && pNode)
-            {
-                if (((wxTablesInUse *)pNode->GetData())->tableID == tableID)
-                {
-                    found = true;
-                    delete (wxTablesInUse *)pNode->GetData();
-                    TablesInUse.Erase(pNode);
-                }
-                else
-                    pNode = pNode->GetNext();
-            }
-        }
-        if (!found)
-        {
-            wxString msg;
-            msg.Printf(wxT("Unable to find the tableID in the linked\nlist of tables in use.\n\n%s"),s.c_str());
-            wxLogDebug (msg,wxT("NOTICE..."));
-        }
-    }
-#endif
-
-    // Decrement the wxDb table count
-    if (pDb)
-        pDb->decrementTableCount();
-
-    // Delete memory allocated for column definitions
-    if (colDefs)
-        delete [] colDefs;
-
-    // Free statement handles
-    if (!queryOnly)
-    {
-        if (hstmtInsert)
-        {
-/*
-ODBC 3.0 says to use this form
-            if (SQLFreeHandle(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
-*/
-            if (SQLFreeStmt(hstmtInsert, SQL_DROP) != SQL_SUCCESS)
-                pDb->DispAllErrors(henv, hdbc);
-        }
-
-        if (hstmtDelete)
-        {
-/*
-ODBC 3.0 says to use this form
-            if (SQLFreeHandle(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
-*/
-            if (SQLFreeStmt(hstmtDelete, SQL_DROP) != SQL_SUCCESS)
-                pDb->DispAllErrors(henv, hdbc);
-        }
-
-        if (hstmtUpdate)
-        {
-/*
-ODBC 3.0 says to use this form
-            if (SQLFreeHandle(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
-*/
-            if (SQLFreeStmt(hstmtUpdate, SQL_DROP) != SQL_SUCCESS)
-                pDb->DispAllErrors(henv, hdbc);
-        }
-    }
-
-    if (hstmtInternal)
-    {
-        if (SQLFreeStmt(hstmtInternal, SQL_DROP) != SQL_SUCCESS)
-            pDb->DispAllErrors(henv, hdbc);
-    }
-
-    // Delete dynamically allocated cursors
-    if (hstmtDefault)
-        DeleteCursor(hstmtDefault);
-
-    if (hstmtCount)
-        DeleteCursor(hstmtCount);
-
-    if (m_hstmtGridQuery)
-        DeleteCursor(m_hstmtGridQuery);
-
-}  // wxDbTable::cleanup()
-
-
-/***************************** PRIVATE FUNCTIONS *****************************/
-
-
-void wxDbTable::setCbValueForColumn(int columnIndex)
-{
-    switch(colDefs[columnIndex].DbDataType)
-    {
-        case DB_DATA_TYPE_VARCHAR:
-        case DB_DATA_TYPE_MEMO:
-            if (colDefs[columnIndex].Null)
-                colDefs[columnIndex].CbValue = SQL_NULL_DATA;
-            else
-                colDefs[columnIndex].CbValue = SQL_NTS;
-            break;
-        case DB_DATA_TYPE_INTEGER:
-            if (colDefs[columnIndex].Null)
-                colDefs[columnIndex].CbValue = SQL_NULL_DATA;
-            else
-                colDefs[columnIndex].CbValue = 0;
-            break;
-        case DB_DATA_TYPE_FLOAT:
-            if (colDefs[columnIndex].Null)
-                colDefs[columnIndex].CbValue = SQL_NULL_DATA;
-            else
-                colDefs[columnIndex].CbValue = 0;
-            break;
-        case DB_DATA_TYPE_DATE:
-            if (colDefs[columnIndex].Null)
-                colDefs[columnIndex].CbValue = SQL_NULL_DATA;
-            else
-                colDefs[columnIndex].CbValue = 0;
-            break;
-        case DB_DATA_TYPE_BLOB:
-            if (colDefs[columnIndex].Null)
-                colDefs[columnIndex].CbValue = SQL_NULL_DATA;
-            else
-                if (colDefs[columnIndex].SqlCtype == SQL_C_WXCHAR)
-                    colDefs[columnIndex].CbValue = SQL_NTS;
-                else
-                    colDefs[columnIndex].CbValue = SQL_LEN_DATA_AT_EXEC(colDefs[columnIndex].SzDataObj);
-            break;
-    }
-}
-
-/********** wxDbTable::bindParams() **********/
-bool wxDbTable::bindParams(bool forUpdate)
-{
-    wxASSERT(!queryOnly);
-    if (queryOnly)
-        return false;
-
-    SWORD   fSqlType    = 0;
-    SDWORD  precision   = 0;
-    SWORD   scale       = 0;
-
-    // Bind each column of the table that should be bound
-    // to a parameter marker
-    int i;
-    UWORD colNumber;
-
-    for (i=0, colNumber=1; i < m_numCols; i++)
-    {
-        if (forUpdate)
-        {
-            if (!colDefs[i].Updateable)
-                continue;
-        }
-        else
-        {
-            if (!colDefs[i].InsertAllowed)
-                continue;
-        }
-
-        switch(colDefs[i].DbDataType)
-        {
-            case DB_DATA_TYPE_VARCHAR:
-                fSqlType = pDb->GetTypeInfVarchar().FsqlType;
-                precision = colDefs[i].SzDataObj;
-                scale = 0;
-                break;
-            case DB_DATA_TYPE_MEMO:
-                fSqlType = pDb->GetTypeInfMemo().FsqlType;
-                precision = colDefs[i].SzDataObj;
-                scale = 0;
-                break;
-            case DB_DATA_TYPE_INTEGER:
-                fSqlType = pDb->GetTypeInfInteger().FsqlType;
-                precision = pDb->GetTypeInfInteger().Precision;
-                scale = 0;
-                break;
-            case DB_DATA_TYPE_FLOAT:
-                fSqlType = pDb->GetTypeInfFloat().FsqlType;
-                precision = pDb->GetTypeInfFloat().Precision;
-                scale = pDb->GetTypeInfFloat().MaximumScale;
-                // SQL Sybase Anywhere v5.5 returned a negative number for the
-                // MaxScale.  This caused ODBC to kick out an error on ibscale.
-                // I check for this here and set the scale = precision.
-                //if (scale < 0)
-                // scale = (short) precision;
-                break;
-            case DB_DATA_TYPE_DATE:
-                fSqlType = pDb->GetTypeInfDate().FsqlType;
-                precision = pDb->GetTypeInfDate().Precision;
-                scale = 0;
-                break;
-            case DB_DATA_TYPE_BLOB:
-                fSqlType = pDb->GetTypeInfBlob().FsqlType;
-                precision = colDefs[i].SzDataObj;
-                scale = 0;
-                break;
-        }
-
-        setCbValueForColumn(i);
-
-        if (forUpdate)
-        {
-            if (SQLBindParameter(hstmtUpdate, colNumber++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,
-                                 fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj,
-                                 precision+1, &colDefs[i].CbValue) != SQL_SUCCESS)
-            {
-                return(pDb->DispAllErrors(henv, hdbc, hstmtUpdate));
-            }
-        }
-        else
-        {
-            if (SQLBindParameter(hstmtInsert, colNumber++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,
-                                 fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj,
-                                 precision+1, &colDefs[i].CbValue) != SQL_SUCCESS)
-            {
-                return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
-            }
-        }
-    }
-
-    // Completed successfully
-    return true;
-
-}  // wxDbTable::bindParams()
-
-
-/********** wxDbTable::bindInsertParams() **********/
-bool wxDbTable::bindInsertParams(void)
-{
-    return bindParams(false);
-}  // wxDbTable::bindInsertParams()
-
-
-/********** wxDbTable::bindUpdateParams() **********/
-bool wxDbTable::bindUpdateParams(void)
-{
-    return bindParams(true);
-}  // wxDbTable::bindUpdateParams()
-
-
-/********** wxDbTable::bindCols() **********/
-bool wxDbTable::bindCols(HSTMT cursor)
-{
-    // Bind each column of the table to a memory address for fetching data
-    UWORD i;
-    for (i = 0; i < m_numCols; i++)
-    {
-        if (SQLBindCol(cursor, (UWORD)(i+1), colDefs[i].SqlCtype, (UCHAR*) colDefs[i].PtrDataObj,
-                       colDefs[i].SzDataObj, &colDefs[i].CbValueCol ) != SQL_SUCCESS)
-          return (pDb->DispAllErrors(henv, hdbc, cursor));
-    }
-
-    // Completed successfully
-    return true;
-}  // wxDbTable::bindCols()
-
-
-/********** wxDbTable::getRec() **********/
-bool wxDbTable::getRec(UWORD fetchType)
-{
-    RETCODE retcode;
-
-    if (!pDb->FwdOnlyCursors())
-    {
-        // Fetch the NEXT, PREV, FIRST or LAST record, depending on fetchType
-        SQLULEN cRowsFetched;
-        UWORD   rowStatus;
-
-        retcode = SQLExtendedFetch(hstmt, fetchType, 0, &cRowsFetched, &rowStatus);
-        if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
-        {
-            if (retcode == SQL_NO_DATA_FOUND)
-                return false;
-            else
-                return(pDb->DispAllErrors(henv, hdbc, hstmt));
-        }
-        else
-        {
-            // Set the Null member variable to indicate the Null state
-            // of each column just read in.
-            int i;
-            for (i = 0; i < m_numCols; i++)
-                colDefs[i].Null = (colDefs[i].CbValueCol == SQL_NULL_DATA);
-        }
-    }
-    else
-    {
-        // Fetch the next record from the record set
-        retcode = SQLFetch(hstmt);
-        if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
-        {
-            if (retcode == SQL_NO_DATA_FOUND)
-                return false;
-            else
-                return(pDb->DispAllErrors(henv, hdbc, hstmt));
-        }
-        else
-        {
-            // Set the Null member variable to indicate the Null state
-            // of each column just read in.
-            int i;
-            for (i = 0; i < m_numCols; i++)
-                colDefs[i].Null = (colDefs[i].CbValueCol == SQL_NULL_DATA);
-        }
-    }
-
-    // Completed successfully
-    return true;
-
-}  // wxDbTable::getRec()
-
-
-/********** wxDbTable::execDelete() **********/
-bool wxDbTable::execDelete(const wxString &pSqlStmt)
-{
-    RETCODE retcode;
-
-    // Execute the DELETE statement
-    retcode = SQLExecDirect(hstmtDelete, WXSQLCAST(pSqlStmt), SQL_NTS);
-
-    if (retcode == SQL_SUCCESS ||
-        retcode == SQL_NO_DATA_FOUND ||
-        retcode == SQL_SUCCESS_WITH_INFO)
-    {
-        // Record deleted successfully
-        return true;
-    }
-
-    // Problem deleting record
-    return(pDb->DispAllErrors(henv, hdbc, hstmtDelete));
-
-}  // wxDbTable::execDelete()
-
-
-/********** wxDbTable::execUpdate() **********/
-bool wxDbTable::execUpdate(const wxString &pSqlStmt)
-{
-    RETCODE retcode;
-
-    // Execute the UPDATE statement
-    retcode = SQLExecDirect(hstmtUpdate, WXSQLCAST(pSqlStmt), SQL_NTS);
-
-    if (retcode == SQL_SUCCESS ||
-        retcode == SQL_NO_DATA_FOUND ||
-        retcode == SQL_SUCCESS_WITH_INFO)
-    {
-        // Record updated successfully
-        return true;
-    }
-    else if (retcode == SQL_NEED_DATA)
-    {
-        PTR pParmID;
-        retcode = SQLParamData(hstmtUpdate, &pParmID);
-        while (retcode == SQL_NEED_DATA)
-        {
-            // Find the parameter
-            int i;
-            for (i=0; i < m_numCols; i++)
-            {
-                if (colDefs[i].PtrDataObj == pParmID)
-                {
-                    // We found it.  Store the parameter.
-                    retcode = SQLPutData(hstmtUpdate, pParmID, colDefs[i].SzDataObj);
-                    if (retcode != SQL_SUCCESS)
-                    {
-                        pDb->DispNextError();
-                        return pDb->DispAllErrors(henv, hdbc, hstmtUpdate);
-                    }
-                    break;
-                }
-            }
-            retcode = SQLParamData(hstmtUpdate, &pParmID);
-        }
-        if (retcode == SQL_SUCCESS ||
-            retcode == SQL_NO_DATA_FOUND ||
-            retcode == SQL_SUCCESS_WITH_INFO)
-        {
-            // Record updated successfully
-            return true;
-        }
-    }
-
-    // Problem updating record
-    return(pDb->DispAllErrors(henv, hdbc, hstmtUpdate));
-
-}  // wxDbTable::execUpdate()
-
-
-/********** wxDbTable::query() **********/
-bool wxDbTable::query(int queryType, bool forUpdate, bool distinct, const wxString &pSqlStmt)
-{
-    wxString sqlStmt;
-
-    if (forUpdate)
-        // The user may wish to select for update, but the DBMS may not be capable
-        selectForUpdate = CanSelectForUpdate();
-    else
-        selectForUpdate = false;
-
-    // Set the SQL SELECT string
-    if (queryType != DB_SELECT_STATEMENT)               // A select statement was not passed in,
-    {                                                   // so generate a select statement.
-        BuildSelectStmt(sqlStmt, queryType, distinct);
-        pDb->WriteSqlLog(sqlStmt);
-    }
-
-    // Make sure the cursor is closed first
-    if (!CloseCursor(hstmt))
-        return false;
-
-    // Execute the SQL SELECT statement
-    int retcode;
-    retcode = SQLExecDirect(hstmt, (queryType == DB_SELECT_STATEMENT ? WXSQLCAST(pSqlStmt) : WXSQLCAST(sqlStmt)), SQL_NTS);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
-        return(pDb->DispAllErrors(henv, hdbc, hstmt));
-
-    // Completed successfully
-    return true;
-
-}  // wxDbTable::query()
-
-
-/***************************** PUBLIC FUNCTIONS *****************************/
-
-
-/********** wxDbTable::Open() **********/
-bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
-{
-    if (!pDb)
-        return false;
-
-    int i;
-    wxString sqlStmt;
-    wxString s;
-
-    // Calculate the maximum size of the concatenated
-    // keys for use with wxDbGrid
-    m_keysize = 0;
-    for (i=0; i < m_numCols; i++)
-    {
-        if (colDefs[i].KeyField)
-        {
-            m_keysize += colDefs[i].SzDataObj;
-        }
-    }
-
-    s.Empty();
-
-    bool exists = true;
-    if (checkTableExists)
-    {
-        if (pDb->Dbms() == dbmsPOSTGRES)
-            exists = pDb->TableExists(tableName, NULL, tablePath);
-        else
-            exists = pDb->TableExists(tableName, pDb->GetUsername(), tablePath);
-    }
-
-    // Verify that the table exists in the database
-    if (!exists)
-    {
-        s = wxT("Table/view does not exist in the database");
-        if ( *(pDb->dbInf.accessibleTables) == wxT('Y'))
-            s += wxT(", or you have no permissions.\n");
-        else
-            s += wxT(".\n");
-    }
-    else if (checkPrivileges)
-    {
-        // Verify the user has rights to access the table.
-        bool hasPrivs wxDUMMY_INITIALIZE(true);
-
-        if (pDb->Dbms() == dbmsPOSTGRES)
-            hasPrivs = pDb->TablePrivileges(tableName, wxT("SELECT"), pDb->GetUsername(), NULL, tablePath);
-        else
-            hasPrivs = pDb->TablePrivileges(tableName, wxT("SELECT"), pDb->GetUsername(), pDb->GetUsername(), tablePath);
-
-        if (!hasPrivs)
-            s = wxT("Connecting user does not have sufficient privileges to access this table.\n");
-    }
-
-    if (!s.empty())
-    {
-        wxString p;
-
-        if (!tablePath.empty())
-            p.Printf(wxT("Error opening '%s/%s'.\n"),tablePath.c_str(),tableName.c_str());
-        else
-            p.Printf(wxT("Error opening '%s'.\n"), tableName.c_str());
-
-        p += s;
-        pDb->LogError(p.GetData());
-
-        return false;
-    }
-
-    // Bind the member variables for field exchange between
-    // the wxDbTable object and the ODBC record.
-    if (!queryOnly)
-    {
-        if (!bindInsertParams())                    // Inserts
-            return false;
-
-        if (!bindUpdateParams())                    // Updates
-            return false;
-    }
-
-    if (!bindCols(*hstmtDefault))                   // Selects
-        return false;
-
-    if (!bindCols(hstmtInternal))                   // Internal use only
-        return false;
-
-     /*
-     * Do NOT bind the hstmtCount cursor!!!
-     */
-
-    // Build an insert statement using parameter markers
-    if (!queryOnly && m_numCols > 0)
-    {
-        bool needComma = false;
-        sqlStmt.Printf(wxT("INSERT INTO %s ("),
-                       pDb->SQLTableName(tableName.c_str()).c_str());
-        for (i = 0; i < m_numCols; i++)
-        {
-            if (! colDefs[i].InsertAllowed)
-                continue;
-            if (needComma)
-                sqlStmt += wxT(",");
-            sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
-            needComma = true;
-        }
-        needComma = false;
-        sqlStmt += wxT(") VALUES (");
-
-        int insertableCount = 0;
-
-        for (i = 0; i < m_numCols; i++)
-        {
-            if (! colDefs[i].InsertAllowed)
-                continue;
-            if (needComma)
-                sqlStmt += wxT(",");
-            sqlStmt += wxT("?");
-            needComma = true;
-            insertableCount++;
-        }
-        sqlStmt += wxT(")");
-
-        // Prepare the insert statement for execution
-        if (insertableCount)
-        {
-            if (SQLPrepare(hstmtInsert, WXSQLCAST(sqlStmt), SQL_NTS) != SQL_SUCCESS)
-                return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
-        }
-        else
-            insertable = false;
-    }
-
-    // Completed successfully
-    return true;
-
-}  // wxDbTable::Open()
-
-
-/********** wxDbTable::Query() **********/
-bool wxDbTable::Query(bool forUpdate, bool distinct)
-{
-
-    return(query(DB_SELECT_WHERE, forUpdate, distinct));
-
-}  // wxDbTable::Query()
-
-
-/********** wxDbTable::QueryBySqlStmt() **********/
-bool wxDbTable::QueryBySqlStmt(const wxString &pSqlStmt)
-{
-    pDb->WriteSqlLog(pSqlStmt);
-
-    return(query(DB_SELECT_STATEMENT, false, false, pSqlStmt));
-
-}  // wxDbTable::QueryBySqlStmt()
-
-
-/********** wxDbTable::QueryMatching() **********/
-bool wxDbTable::QueryMatching(bool forUpdate, bool distinct)
-{
-
-    return(query(DB_SELECT_MATCHING, forUpdate, distinct));
-
-}  // wxDbTable::QueryMatching()
-
-
-/********** wxDbTable::QueryOnKeyFields() **********/
-bool wxDbTable::QueryOnKeyFields(bool forUpdate, bool distinct)
-{
-
-    return(query(DB_SELECT_KEYFIELDS, forUpdate, distinct));
-
-}  // wxDbTable::QueryOnKeyFields()
-
-
-/********** wxDbTable::GetPrev() **********/
-bool wxDbTable::GetPrev(void)
-{
-    if (pDb->FwdOnlyCursors())
-    {
-        wxFAIL_MSG(wxT("GetPrev()::Backward scrolling cursors are not enabled for this instance of wxDbTable"));
-        return false;
-    }
-    else
-        return(getRec(SQL_FETCH_PRIOR));
-
-}  // wxDbTable::GetPrev()
-
-
-/********** wxDbTable::operator-- **********/
-bool wxDbTable::operator--(int)
-{
-    if (pDb->FwdOnlyCursors())
-    {
-        wxFAIL_MSG(wxT("operator--:Backward scrolling cursors are not enabled for this instance of wxDbTable"));
-        return false;
-    }
-    else
-        return(getRec(SQL_FETCH_PRIOR));
-
-}  // wxDbTable::operator--
-
-
-/********** wxDbTable::GetFirst() **********/
-bool wxDbTable::GetFirst(void)
-{
-    if (pDb->FwdOnlyCursors())
-    {
-        wxFAIL_MSG(wxT("GetFirst():Backward scrolling cursors are not enabled for this instance of wxDbTable"));
-        return false;
-    }
-    else
-        return(getRec(SQL_FETCH_FIRST));
-
-}  // wxDbTable::GetFirst()
-
-
-/********** wxDbTable::GetLast() **********/
-bool wxDbTable::GetLast(void)
-{
-    if (pDb->FwdOnlyCursors())
-    {
-        wxFAIL_MSG(wxT("GetLast()::Backward scrolling cursors are not enabled for this instance of wxDbTable"));
-        return false;
-    }
-    else
-        return(getRec(SQL_FETCH_LAST));
-
-}  // wxDbTable::GetLast()
-
-
-/********** wxDbTable::BuildDeleteStmt() **********/
-void wxDbTable::BuildDeleteStmt(wxString &pSqlStmt, int typeOfDel, const wxString &pWhereClause)
-{
-    wxASSERT(!queryOnly);
-    if (queryOnly)
-        return;
-
-    wxString whereClause;
-
-    whereClause.Empty();
-
-    // Handle the case of DeleteWhere() and the where clause is blank.  It should
-    // delete all records from the database in this case.
-    if (typeOfDel == DB_DEL_WHERE && (pWhereClause.length() == 0))
-    {
-        pSqlStmt.Printf(wxT("DELETE FROM %s"),
-                        pDb->SQLTableName(tableName.c_str()).c_str());
-        return;
-    }
-
-    pSqlStmt.Printf(wxT("DELETE FROM %s WHERE "),
-                    pDb->SQLTableName(tableName.c_str()).c_str());
-
-    // Append the WHERE clause to the SQL DELETE statement
-    switch(typeOfDel)
-    {
-        case DB_DEL_KEYFIELDS:
-            // If the datasource supports the ROWID column, build
-            // the where on ROWID for efficiency purposes.
-            // e.g. DELETE FROM PARTS WHERE ROWID = '111.222.333'
-            if (CanUpdateByROWID())
-            {
-                SQLLEN cb;
-                wxChar   rowid[wxDB_ROWID_LEN+1];
-
-                // Get the ROWID value.  If not successful retreiving the ROWID,
-                // simply fall down through the code and build the WHERE clause
-                // based on the key fields.
-                if (SQLGetData(hstmt, (UWORD)(m_numCols+1), SQL_C_WXCHAR, (UCHAR*) rowid, sizeof(rowid), &cb) == SQL_SUCCESS)
-                {
-                    pSqlStmt += wxT("ROWID = '");
-                    pSqlStmt += rowid;
-                    pSqlStmt += wxT("'");
-                    break;
-                }
-            }
-            // Unable to delete by ROWID, so build a WHERE
-            // clause based on the keyfields.
-            BuildWhereClause(whereClause, DB_WHERE_KEYFIELDS);
-            pSqlStmt += whereClause;
-            break;
-        case DB_DEL_WHERE:
-            pSqlStmt += pWhereClause;
-            break;
-        case DB_DEL_MATCHING:
-            BuildWhereClause(whereClause, DB_WHERE_MATCHING);
-            pSqlStmt += whereClause;
-            break;
-    }
-
-}  // BuildDeleteStmt()
-
-
-/***** DEPRECATED: use wxDbTable::BuildDeleteStmt(wxString &....) form *****/
-void wxDbTable::BuildDeleteStmt(wxChar *pSqlStmt, int typeOfDel, const wxString &pWhereClause)
-{
-    wxString tempSqlStmt;
-    BuildDeleteStmt(tempSqlStmt, typeOfDel, pWhereClause);
-    wxStrcpy(pSqlStmt, tempSqlStmt);
-}  // wxDbTable::BuildDeleteStmt()
-
-
-/********** wxDbTable::BuildSelectStmt() **********/
-void wxDbTable::BuildSelectStmt(wxString &pSqlStmt, int typeOfSelect, bool distinct)
-{
-    wxString whereClause;
-    whereClause.Empty();
-
-    // Build a select statement to query the database
-    pSqlStmt = wxT("SELECT ");
-
-    // SELECT DISTINCT values only?
-    if (distinct)
-        pSqlStmt += wxT("DISTINCT ");
-
-    // Was a FROM clause specified to join tables to the base table?
-    // Available for ::Query() only!!!
-    bool appendFromClause = false;
-#if wxODBC_BACKWARD_COMPATABILITY
-    if (typeOfSelect == DB_SELECT_WHERE && from && wxStrlen(from))
-        appendFromClause = true;
-#else
-    if (typeOfSelect == DB_SELECT_WHERE && from.length())
-        appendFromClause = true;
-#endif
-
-    // Add the column list
-    int i;
-    wxString tStr;
-    for (i = 0; i < m_numCols; i++)
-    {
-        tStr = colDefs[i].ColName;
-        // If joining tables, the base table column names must be qualified to avoid ambiguity
-        if ((appendFromClause || pDb->Dbms() == dbmsACCESS) && tStr.Find(wxT('.')) == wxNOT_FOUND)
-        {
-            pSqlStmt += pDb->SQLTableName(queryTableName.c_str());
-            pSqlStmt += wxT(".");
-        }
-        pSqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
-        if (i + 1 < m_numCols)
-            pSqlStmt += wxT(",");
-    }
-
-    // If the datasource supports ROWID, get this column as well.  Exception: Don't retrieve
-    // the ROWID if querying distinct records.  The rowid will always be unique.
-    if (!distinct && CanUpdateByROWID())
-    {
-        // If joining tables, the base table column names must be qualified to avoid ambiguity
-        if (appendFromClause || pDb->Dbms() == dbmsACCESS)
-        {
-            pSqlStmt += wxT(",");
-            pSqlStmt += pDb->SQLTableName(queryTableName);
-            pSqlStmt += wxT(".ROWID");
-        }
-        else
-            pSqlStmt += wxT(",ROWID");
-    }
-
-    // Append the FROM tablename portion
-    pSqlStmt += wxT(" FROM ");
-    pSqlStmt += pDb->SQLTableName(queryTableName);
-//    pSqlStmt += queryTableName;
-
-    // Sybase uses the HOLDLOCK keyword to lock a record during query.
-    // The HOLDLOCK keyword follows the table name in the from clause.
-    // Each table in the from clause must specify HOLDLOCK or
-    // NOHOLDLOCK (the default).  Note: The "FOR UPDATE" clause
-    // is parsed but ignored in SYBASE Transact-SQL.
-    if (selectForUpdate && (pDb->Dbms() == dbmsSYBASE_ASA || pDb->Dbms() == dbmsSYBASE_ASE))
-        pSqlStmt += wxT(" HOLDLOCK");
-
-    if (appendFromClause)
-        pSqlStmt += from;
-
-    // Append the WHERE clause.  Either append the where clause for the class
-    // or build a where clause.  The typeOfSelect determines this.
-    switch(typeOfSelect)
-    {
-        case DB_SELECT_WHERE:
-#if wxODBC_BACKWARD_COMPATABILITY
-            if (where && wxStrlen(where))   // May not want a where clause!!!
-#else
-            if (where.length())   // May not want a where clause!!!
-#endif
-            {
-                pSqlStmt += wxT(" WHERE ");
-                pSqlStmt += where;
-            }
-            break;
-        case DB_SELECT_KEYFIELDS:
-            BuildWhereClause(whereClause, DB_WHERE_KEYFIELDS);
-            if (whereClause.length())
-            {
-                pSqlStmt += wxT(" WHERE ");
-                pSqlStmt += whereClause;
-            }
-            break;
-        case DB_SELECT_MATCHING:
-            BuildWhereClause(whereClause, DB_WHERE_MATCHING);
-            if (whereClause.length())
-            {
-                pSqlStmt += wxT(" WHERE ");
-                pSqlStmt += whereClause;
-            }
-            break;
-    }
-
-    // Append the ORDER BY clause
-#if wxODBC_BACKWARD_COMPATABILITY
-    if (orderBy && wxStrlen(orderBy))
-#else
-    if (orderBy.length())
-#endif
-    {
-        pSqlStmt += wxT(" ORDER BY ");
-        pSqlStmt += orderBy;
-    }
-
-    // SELECT FOR UPDATE if told to do so and the datasource is capable.  Sybase
-    // parses the FOR UPDATE clause but ignores it.  See the comment above on the
-    // HOLDLOCK for Sybase.
-    if (selectForUpdate && CanSelectForUpdate())
-        pSqlStmt += wxT(" FOR UPDATE");
-
-}  // wxDbTable::BuildSelectStmt()
-
-
-/***** DEPRECATED: use wxDbTable::BuildSelectStmt(wxString &....) form *****/
-void wxDbTable::BuildSelectStmt(wxChar *pSqlStmt, int typeOfSelect, bool distinct)
-{
-    wxString tempSqlStmt;
-    BuildSelectStmt(tempSqlStmt, typeOfSelect, distinct);
-    wxStrcpy(pSqlStmt, tempSqlStmt);
-}  // wxDbTable::BuildSelectStmt()
-
-
-/********** wxDbTable::BuildUpdateStmt() **********/
-void wxDbTable::BuildUpdateStmt(wxString &pSqlStmt, int typeOfUpdate, const wxString &pWhereClause)
-{
-    wxASSERT(!queryOnly);
-    if (queryOnly)
-        return;
-
-    wxString whereClause;
-    whereClause.Empty();
-
-    bool firstColumn = true;
-
-    pSqlStmt.Printf(wxT("UPDATE %s SET "),
-                    pDb->SQLTableName(tableName.c_str()).c_str());
-
-    // Append a list of columns to be updated
-    int i;
-    for (i = 0; i < m_numCols; i++)
-    {
-        // Only append Updateable columns
-        if (colDefs[i].Updateable)
-        {
-            if (!firstColumn)
-                pSqlStmt += wxT(",");
-            else
-                firstColumn = false;
-
-            pSqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
-//            pSqlStmt += colDefs[i].ColName;
-            pSqlStmt += wxT(" = ?");
-        }
-    }
-
-    // Append the WHERE clause to the SQL UPDATE statement
-    pSqlStmt += wxT(" WHERE ");
-    switch(typeOfUpdate)
-    {
-        case DB_UPD_KEYFIELDS:
-            // If the datasource supports the ROWID column, build
-            // the where on ROWID for efficiency purposes.
-            // e.g. UPDATE PARTS SET Col1 = ?, Col2 = ? WHERE ROWID = '111.222.333'
-            if (CanUpdateByROWID())
-            {
-                SQLLEN cb;
-                wxChar rowid[wxDB_ROWID_LEN+1];
-
-                // Get the ROWID value.  If not successful retreiving the ROWID,
-                // simply fall down through the code and build the WHERE clause
-                // based on the key fields.
-                if (SQLGetData(hstmt, (UWORD)(m_numCols+1), SQL_C_WXCHAR, (UCHAR*) rowid, sizeof(rowid), &cb) == SQL_SUCCESS)
-                {
-                    pSqlStmt += wxT("ROWID = '");
-                    pSqlStmt += rowid;
-                    pSqlStmt += wxT("'");
-                    break;
-                }
-            }
-            // Unable to delete by ROWID, so build a WHERE
-            // clause based on the keyfields.
-            BuildWhereClause(whereClause, DB_WHERE_KEYFIELDS);
-            pSqlStmt += whereClause;
-            break;
-        case DB_UPD_WHERE:
-            pSqlStmt += pWhereClause;
-            break;
-    }
-}  // BuildUpdateStmt()
-
-
-/***** DEPRECATED: use wxDbTable::BuildUpdateStmt(wxString &....) form *****/
-void wxDbTable::BuildUpdateStmt(wxChar *pSqlStmt, int typeOfUpdate, const wxString &pWhereClause)
-{
-    wxString tempSqlStmt;
-    BuildUpdateStmt(tempSqlStmt, typeOfUpdate, pWhereClause);
-    wxStrcpy(pSqlStmt, tempSqlStmt);
-}  // BuildUpdateStmt()
-
-
-/********** wxDbTable::BuildWhereClause() **********/
-void wxDbTable::BuildWhereClause(wxString &pWhereClause, int typeOfWhere,
-                                 const wxString &qualTableName, bool useLikeComparison)
-/*
- * Note: BuildWhereClause() currently ignores timestamp columns.
- *       They are not included as part of the where clause.
- */
-{
-    bool moreThanOneColumn = false;
-    wxString colValue;
-
-    // Loop through the columns building a where clause as you go
-    int colNumber;
-    for (colNumber = 0; colNumber < m_numCols; colNumber++)
-    {
-        // Determine if this column should be included in the WHERE clause
-        if ((typeOfWhere == DB_WHERE_KEYFIELDS && colDefs[colNumber].KeyField) ||
-             (typeOfWhere == DB_WHERE_MATCHING  && (!IsColNull((UWORD)colNumber))))
-        {
-            // Skip over timestamp columns
-            if (colDefs[colNumber].SqlCtype == SQL_C_TIMESTAMP)
-                continue;
-            // If there is more than 1 column, join them with the keyword "AND"
-            if (moreThanOneColumn)
-                pWhereClause += wxT(" AND ");
-            else
-                moreThanOneColumn = true;
-
-            // Concatenate where phrase for the column
-            wxString tStr = colDefs[colNumber].ColName;
-
-            if (qualTableName.length() && tStr.Find(wxT('.')) == wxNOT_FOUND)
-            {
-                pWhereClause += pDb->SQLTableName(qualTableName);
-                pWhereClause += wxT(".");
-            }
-            pWhereClause += pDb->SQLColumnName(colDefs[colNumber].ColName);
-
-            if (useLikeComparison && (colDefs[colNumber].SqlCtype == SQL_C_WXCHAR))
-                pWhereClause += wxT(" LIKE ");
-            else
-                pWhereClause += wxT(" = ");
-
-            switch(colDefs[colNumber].SqlCtype)
-            {
-                case SQL_C_CHAR:
-#ifdef SQL_C_WCHAR
-                case SQL_C_WCHAR:
-#endif
-                //case SQL_C_WXCHAR:  SQL_C_WXCHAR is covered by either SQL_C_CHAR or SQL_C_WCHAR
-                    colValue.Printf(wxT("'%s'"), GetDb()->EscapeSqlChars((wxChar *)colDefs[colNumber].PtrDataObj).c_str());
-                    break;
-                case SQL_C_SHORT:
-                case SQL_C_SSHORT:
-                    colValue.Printf(wxT("%hi"), *((SWORD *) colDefs[colNumber].PtrDataObj));
-                    break;
-                case SQL_C_USHORT:
-                    colValue.Printf(wxT("%hu"), *((UWORD *) colDefs[colNumber].PtrDataObj));
-                    break;
-                case SQL_C_LONG:
-                case SQL_C_SLONG:
-                    colValue.Printf(wxT("%li"), *((SDWORD *) colDefs[colNumber].PtrDataObj));
-                    break;
-                case SQL_C_ULONG:
-                    colValue.Printf(wxT("%lu"), *((UDWORD *) colDefs[colNumber].PtrDataObj));
-                    break;
-                case SQL_C_FLOAT:
-                    colValue.Printf(wxT("%.6f"), *((SFLOAT *) colDefs[colNumber].PtrDataObj));
-                    break;
-                case SQL_C_DOUBLE:
-                    colValue.Printf(wxT("%.6f"), *((SDOUBLE *) colDefs[colNumber].PtrDataObj));
-                    break;
-                default:
-                    {
-                        wxString strMsg;
-                        strMsg.Printf(wxT("wxDbTable::bindParams(): Unknown column type for colDefs %d colName %s"),
-                                    colNumber,colDefs[colNumber].ColName);
-                        wxFAIL_MSG(strMsg.c_str());
-                    }
-                    break;
-            }
-            pWhereClause += colValue;
-        }
-    }
-}  // wxDbTable::BuildWhereClause()
-
-
-/***** DEPRECATED: use wxDbTable::BuildWhereClause(wxString &....) form *****/
-void wxDbTable::BuildWhereClause(wxChar *pWhereClause, int typeOfWhere,
-                                 const wxString &qualTableName, bool useLikeComparison)
-{
-    wxString tempSqlStmt;
-    BuildWhereClause(tempSqlStmt, typeOfWhere, qualTableName, useLikeComparison);
-    wxStrcpy(pWhereClause, tempSqlStmt);
-}  // wxDbTable::BuildWhereClause()
-
-
-/********** wxDbTable::GetRowNum() **********/
-UWORD wxDbTable::GetRowNum(void)
-{
-    UDWORD rowNum;
-
-    if (SQLGetStmtOption(hstmt, SQL_ROW_NUMBER, (UCHAR*) &rowNum) != SQL_SUCCESS)
-    {
-        pDb->DispAllErrors(henv, hdbc, hstmt);
-        return(0);
-    }
-
-    // Completed successfully
-    return((UWORD) rowNum);
-
-}  // wxDbTable::GetRowNum()
-
-
-/********** wxDbTable::CloseCursor() **********/
-bool wxDbTable::CloseCursor(HSTMT cursor)
-{
-    if (SQLFreeStmt(cursor, SQL_CLOSE) != SQL_SUCCESS)
-        return(pDb->DispAllErrors(henv, hdbc, cursor));
-
-    // Completed successfully
-    return true;
-
-}  // wxDbTable::CloseCursor()
-
-
-/********** wxDbTable::CreateTable() **********/
-bool wxDbTable::CreateTable(bool attemptDrop)
-{
-    if (!pDb)
-        return false;
-
-    int i, j;
-    wxString sqlStmt;
-
-#ifdef DBDEBUG_CONSOLE
-    cout << wxT("Creating Table ") << tableName << wxT("...") << endl;
-#endif
-
-    // Drop table first
-    if (attemptDrop && !DropTable())
-        return false;
-
-    // Create the table
-#ifdef DBDEBUG_CONSOLE
-    for (i = 0; i < m_numCols; i++)
-    {
-        // Exclude derived columns since they are NOT part of the base table
-        if (colDefs[i].DerivedCol)
-            continue;
-        cout << i + 1 << wxT(": ") << colDefs[i].ColName << wxT("; ");
-        switch(colDefs[i].DbDataType)
-        {
-            case DB_DATA_TYPE_VARCHAR:
-                cout << pDb->GetTypeInfVarchar().TypeName << wxT("(") << (int)(colDefs[i].SzDataObj / sizeof(wxChar)) << wxT(")");
-                break;
-            case DB_DATA_TYPE_MEMO:
-                cout << pDb->GetTypeInfMemo().TypeName;
-                break;
-            case DB_DATA_TYPE_INTEGER:
-                cout << pDb->GetTypeInfInteger().TypeName;
-                break;
-            case DB_DATA_TYPE_FLOAT:
-                cout << pDb->GetTypeInfFloat().TypeName;
-                break;
-            case DB_DATA_TYPE_DATE:
-                cout << pDb->GetTypeInfDate().TypeName;
-                break;
-            case DB_DATA_TYPE_BLOB:
-                cout << pDb->GetTypeInfBlob().TypeName;
-                break;
-        }
-        cout << endl;
-    }
-#endif
-
-    // Build a CREATE TABLE string from the colDefs structure.
-    bool needComma = false;
-
-    sqlStmt.Printf(wxT("CREATE TABLE %s ("),
-                   pDb->SQLTableName(tableName.c_str()).c_str());
-
-    for (i = 0; i < m_numCols; i++)
-    {
-        // Exclude derived columns since they are NOT part of the base table
-        if (colDefs[i].DerivedCol)
-            continue;
-        // Comma Delimiter
-        if (needComma)
-            sqlStmt += wxT(",");
-        // Column Name
-        sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
-//        sqlStmt += colDefs[i].ColName;
-        sqlStmt += wxT(" ");
-        // Column Type
-        switch(colDefs[i].DbDataType)
-        {
-            case DB_DATA_TYPE_VARCHAR:
-                sqlStmt += pDb->GetTypeInfVarchar().TypeName;
-                break;
-            case DB_DATA_TYPE_MEMO:
-                sqlStmt += pDb->GetTypeInfMemo().TypeName;
-                break;
-            case DB_DATA_TYPE_INTEGER:
-                sqlStmt += pDb->GetTypeInfInteger().TypeName;
-                break;
-            case DB_DATA_TYPE_FLOAT:
-                sqlStmt += pDb->GetTypeInfFloat().TypeName;
-                break;
-            case DB_DATA_TYPE_DATE:
-                sqlStmt += pDb->GetTypeInfDate().TypeName;
-                break;
-            case DB_DATA_TYPE_BLOB:
-                sqlStmt += pDb->GetTypeInfBlob().TypeName;
-                break;
-        }
-        // For varchars, append the size of the string
-        if (colDefs[i].DbDataType == DB_DATA_TYPE_VARCHAR &&
-            (pDb->Dbms() != dbmsMY_SQL || pDb->GetTypeInfVarchar().TypeName != _T("text")))// ||
-//            colDefs[i].DbDataType == DB_DATA_TYPE_BLOB)
-        {
-            wxString s;
-            s.Printf(wxT("(%d)"), (int)(colDefs[i].SzDataObj / sizeof(wxChar)));
-            sqlStmt += s;
-        }
-
-        if (pDb->Dbms() == dbmsDB2 ||
-            pDb->Dbms() == dbmsMY_SQL ||
-            pDb->Dbms() == dbmsSYBASE_ASE  ||
-            pDb->Dbms() == dbmsINTERBASE  ||
-            pDb->Dbms() == dbmsFIREBIRD  ||
-            pDb->Dbms() == dbmsMS_SQL_SERVER)
-        {
-            if (colDefs[i].KeyField)
-            {
-                sqlStmt += wxT(" NOT NULL");
-            }
-        }
-
-        needComma = true;
-    }
-    // If there is a primary key defined, include it in the create statement
-    for (i = j = 0; i < m_numCols; i++)
-    {
-        if (colDefs[i].KeyField)
-        {
-            j++;
-            break;
-        }
-    }
-    if ( j && (pDb->Dbms() != dbmsDBASE)
-        && (pDb->Dbms() != dbmsXBASE_SEQUITER) )  // Found a keyfield
-    {
-        switch (pDb->Dbms())
-        {
-            case dbmsACCESS:
-            case dbmsINFORMIX:
-            case dbmsSYBASE_ASA:
-            case dbmsSYBASE_ASE:
-            case dbmsMY_SQL:
-            case dbmsFIREBIRD:
-            {
-                // MySQL goes out on this one. We also declare the relevant key NON NULL above
-                sqlStmt += wxT(",PRIMARY KEY (");
-                break;
-            }
-            default:
-            {
-                sqlStmt += wxT(",CONSTRAINT ");
-                //  DB2 is limited to 18 characters for index names
-                if (pDb->Dbms() == dbmsDB2)
-                {
-                    wxASSERT_MSG(!tableName.empty() && tableName.length() <= 13, wxT("DB2 table/index names must be no longer than 13 characters in length.\n\nTruncating table name to 13 characters."));
-                    sqlStmt += pDb->SQLTableName(tableName.substr(0, 13).c_str());
-//                    sqlStmt += tableName.substr(0, 13);
-                }
-                else
-                    sqlStmt += pDb->SQLTableName(tableName.c_str());
-//                    sqlStmt += tableName;
-
-                sqlStmt += wxT("_PIDX PRIMARY KEY (");
-                break;
-            }
-        }
-
-        // List column name(s) of column(s) comprising the primary key
-        for (i = j = 0; i < m_numCols; i++)
-        {
-            if (colDefs[i].KeyField)
-            {
-                if (j++) // Multi part key, comma separate names
-                    sqlStmt += wxT(",");
-                sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
-
-                if (pDb->Dbms() == dbmsMY_SQL &&
-                    colDefs[i].DbDataType ==  DB_DATA_TYPE_VARCHAR)
-                {
-                    wxString s;
-                    s.Printf(wxT("(%d)"), (int)(colDefs[i].SzDataObj / sizeof(wxChar)));
-                    sqlStmt += s;
-                }
-            }
-        }
-        sqlStmt += wxT(")");
-
-        if (pDb->Dbms() == dbmsINFORMIX ||
-            pDb->Dbms() == dbmsSYBASE_ASA ||
-            pDb->Dbms() == dbmsSYBASE_ASE)
-        {
-            sqlStmt += wxT(" CONSTRAINT ");
-            sqlStmt += pDb->SQLTableName(tableName);
-//            sqlStmt += tableName;
-            sqlStmt += wxT("_PIDX");
-        }
-    }
-    // Append the closing parentheses for the create table statement
-    sqlStmt += wxT(")");
-
-    pDb->WriteSqlLog(sqlStmt);
-
-#ifdef DBDEBUG_CONSOLE
-    cout << endl << sqlStmt.c_str() << endl;
-#endif
-
-    // Execute the CREATE TABLE statement
-    RETCODE retcode = SQLExecDirect(hstmt, WXSQLCAST(sqlStmt), SQL_NTS);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
-    {
-        pDb->DispAllErrors(henv, hdbc, hstmt);
-        pDb->RollbackTrans();
-        CloseCursor(hstmt);
-        return false;
-    }
-
-    // Commit the transaction and close the cursor
-    if (!pDb->CommitTrans())
-        return false;
-    if (!CloseCursor(hstmt))
-        return false;
-
-    // Database table created successfully
-    return true;
-
-} // wxDbTable::CreateTable()
-
-
-/********** wxDbTable::DropTable() **********/
-bool wxDbTable::DropTable()
-{
-    // NOTE: This function returns true if the Table does not exist, but
-    //       only for identified databases.  Code will need to be added
-    //       below for any other databases when those databases are defined
-    //       to handle this situation consistently
-
-    wxString sqlStmt;
-
-    sqlStmt.Printf(wxT("DROP TABLE %s"),
-                   pDb->SQLTableName(tableName.c_str()).c_str());
-
-    pDb->WriteSqlLog(sqlStmt);
-
-#ifdef DBDEBUG_CONSOLE
-    cout << endl << sqlStmt.c_str() << endl;
-#endif
-
-    RETCODE retcode = SQLExecDirect(hstmt, WXSQLCAST(sqlStmt), SQL_NTS);
-    if (retcode != SQL_SUCCESS)
-    {
-        // Check for "Base table not found" error and ignore
-        pDb->GetNextError(henv, hdbc, hstmt);
-        if (wxStrcmp(pDb->sqlState, wxT("S0002")) /*&&
-            wxStrcmp(pDb->sqlState, wxT("S1000"))*/)  // "Base table not found"
-        {
-            // Check for product specific error codes
-            if (!((pDb->Dbms() == dbmsSYBASE_ASA    && !wxStrcmp(pDb->sqlState,wxT("42000")))   ||  // 5.x (and lower?)
-                  (pDb->Dbms() == dbmsSYBASE_ASE    && !wxStrcmp(pDb->sqlState,wxT("37000")))   ||
-                  (pDb->Dbms() == dbmsPERVASIVE_SQL && !wxStrcmp(pDb->sqlState,wxT("S1000")))   ||  // Returns an S1000 then an S0002
-                  (pDb->Dbms() == dbmsPOSTGRES      && !wxStrcmp(pDb->sqlState,wxT("08S01")))))
-            {
-                pDb->DispNextError();
-                pDb->DispAllErrors(henv, hdbc, hstmt);
-                pDb->RollbackTrans();
-//                CloseCursor(hstmt);
-                return false;
-            }
-        }
-    }
-
-    // Commit the transaction and close the cursor
-    if (! pDb->CommitTrans())
-        return false;
-    if (! CloseCursor(hstmt))
-        return false;
-
-    return true;
-}  // wxDbTable::DropTable()
-
-
-/********** wxDbTable::CreateIndex() **********/
-bool wxDbTable::CreateIndex(const wxString &indexName, bool unique, UWORD numIndexColumns,
-                                     wxDbIdxDef *pIndexDefs, bool attemptDrop)
-{
-    wxString sqlStmt;
-
-    // Drop the index first
-    if (attemptDrop && !DropIndex(indexName))
-        return false;
-
-    // MySQL (and possibly Sybase ASE?? - gt) require that any columns which are used as portions
-    // of an index have the columns defined as "NOT NULL".  During initial table creation though,
-    // it may not be known which columns are necessarily going to be part of an index (e.g. the
-    // table was created, then months later you determine that an additional index while
-    // give better performance, so you want to add an index).
-    //
-    // The following block of code will modify the column definition to make the column be
-    // defined with the "NOT NULL" qualifier.
-    if (pDb->Dbms() == dbmsMY_SQL)
-    {
-        wxString sqlStmt;
-        int i;
-        bool ok = true;
-        for (i = 0; i < numIndexColumns && ok; i++)
-        {
-            int   j = 0;
-            bool  found = false;
-            // Find the column definition that has the ColName that matches the
-            // index column name.  We need to do this to get the DB_DATA_TYPE of
-            // the index column, as MySQL's syntax for the ALTER column requires
-            // this information
-            while (!found && (j < this->m_numCols))
-            {
-                if (wxStrcmp(colDefs[j].ColName,pIndexDefs[i].ColName) == 0)
-                    found = true;
-                if (!found)
-                    j++;
-            }
-
-            if (found)
-            {
-                ok = pDb->ModifyColumn(tableName, pIndexDefs[i].ColName,
-                                        colDefs[j].DbDataType, (int)(colDefs[j].SzDataObj / sizeof(wxChar)),
-                                        wxT("NOT NULL"));
-
-                if (!ok)
-                {
-                    #if 0
-                    // retcode is not used
-                    wxODBC_ERRORS retcode;
-                    // Oracle returns a DB_ERR_GENERAL_ERROR if the column is already
-                    // defined to be NOT NULL, but reportedly MySQL doesn't mind.
-                    // This line is just here for debug checking of the value
-                    retcode = (wxODBC_ERRORS)pDb->DB_STATUS;
-                    #endif
-                }
-            }
-            else
-                ok = false;
-        }
-        if (ok)
-            pDb->CommitTrans();
-        else
-        {
-            pDb->RollbackTrans();
-            return false;
-        }
-    }
-
-    // Build a CREATE INDEX statement
-    sqlStmt = wxT("CREATE ");
-    if (unique)
-        sqlStmt += wxT("UNIQUE ");
-
-    sqlStmt += wxT("INDEX ");
-    sqlStmt += pDb->SQLTableName(indexName);
-    sqlStmt += wxT(" ON ");
-
-    sqlStmt += pDb->SQLTableName(tableName);
-//    sqlStmt += tableName;
-    sqlStmt += wxT(" (");
-
-    // Append list of columns making up index
-    int i;
-    for (i = 0; i < numIndexColumns; i++)
-    {
-        sqlStmt += pDb->SQLColumnName(pIndexDefs[i].ColName);
-//        sqlStmt += pIndexDefs[i].ColName;
-
-        // MySQL requires a key length on VARCHAR keys
-        if ( pDb->Dbms() == dbmsMY_SQL )
-        {
-            // Find the details on this column
-            int j;
-            for ( j = 0; j < m_numCols; ++j )
-            {
-                if ( wxStrcmp( pIndexDefs[i].ColName, colDefs[j].ColName ) == 0 )
-                {
-                    break;
-                }
-            }
-            if ( colDefs[j].DbDataType ==  DB_DATA_TYPE_VARCHAR)
-            {
-                wxString s;
-                s.Printf(wxT("(%d)"), (int)(colDefs[i].SzDataObj / sizeof(wxChar)));
-                sqlStmt += s;
-            }
-        }
-
-        // Postgres and SQL Server 7 do not support the ASC/DESC keywords for index columns
-        if (!((pDb->Dbms() == dbmsMS_SQL_SERVER) && (wxStrncmp(pDb->dbInf.dbmsVer,_T("07"),2)==0)) &&
-            !(pDb->Dbms() == dbmsFIREBIRD) &&
-            !(pDb->Dbms() == dbmsPOSTGRES))
-        {
-            if (pIndexDefs[i].Ascending)
-                sqlStmt += wxT(" ASC");
-            else
-                sqlStmt += wxT(" DESC");
-        }
-        else
-            wxASSERT_MSG(pIndexDefs[i].Ascending, _T("Datasource does not support DESCending index columns"));
-
-        if ((i + 1) < numIndexColumns)
-            sqlStmt += wxT(",");
-    }
-
-    // Append closing parentheses
-    sqlStmt += wxT(")");
-
-    pDb->WriteSqlLog(sqlStmt);
-
-#ifdef DBDEBUG_CONSOLE
-    cout << endl << sqlStmt.c_str() << endl << endl;
-#endif
-
-    // Execute the CREATE INDEX statement
-    RETCODE retcode = SQLExecDirect(hstmt, WXSQLCAST(sqlStmt), SQL_NTS);
-    if (retcode != SQL_SUCCESS)
-    {
-        pDb->DispAllErrors(henv, hdbc, hstmt);
-        pDb->RollbackTrans();
-        CloseCursor(hstmt);
-        return false;
-    }
-
-    // Commit the transaction and close the cursor
-    if (! pDb->CommitTrans())
-        return false;
-    if (! CloseCursor(hstmt))
-        return false;
-
-    // Index Created Successfully
-    return true;
-
-}  // wxDbTable::CreateIndex()
-
-
-/********** wxDbTable::DropIndex() **********/
-bool wxDbTable::DropIndex(const wxString &indexName)
-{
-    // NOTE: This function returns true if the Index does not exist, but
-    //       only for identified databases.  Code will need to be added
-    //       below for any other databases when those databases are defined
-    //       to handle this situation consistently
-
-    wxString sqlStmt;
-
-    if (pDb->Dbms() == dbmsACCESS || pDb->Dbms() == dbmsMY_SQL ||
-        pDb->Dbms() == dbmsDBASE /*|| Paradox needs this syntax too when we add support*/)
-        sqlStmt.Printf(wxT("DROP INDEX %s ON %s"),
-                       pDb->SQLTableName(indexName.c_str()).c_str(),
-                       pDb->SQLTableName(tableName.c_str()).c_str());
-    else if ((pDb->Dbms() == dbmsMS_SQL_SERVER) ||
-             (pDb->Dbms() == dbmsSYBASE_ASE) ||
-             (pDb->Dbms() == dbmsXBASE_SEQUITER))
-        sqlStmt.Printf(wxT("DROP INDEX %s.%s"),
-                       pDb->SQLTableName(tableName.c_str()).c_str(),
-                       pDb->SQLTableName(indexName.c_str()).c_str());
-    else
-        sqlStmt.Printf(wxT("DROP INDEX %s"),
-                       pDb->SQLTableName(indexName.c_str()).c_str());
-
-    pDb->WriteSqlLog(sqlStmt);
-
-#ifdef DBDEBUG_CONSOLE
-    cout << endl << sqlStmt.c_str() << endl;
-#endif
-    RETCODE retcode = SQLExecDirect(hstmt, WXSQLCAST(sqlStmt), SQL_NTS);
-    if (retcode != SQL_SUCCESS)
-    {
-        // Check for "Index not found" error and ignore
-        pDb->GetNextError(henv, hdbc, hstmt);
-        if (wxStrcmp(pDb->sqlState,wxT("S0012")))  // "Index not found"
-        {
-            // Check for product specific error codes
-            if (!((pDb->Dbms() == dbmsSYBASE_ASA    && !wxStrcmp(pDb->sqlState,wxT("42000"))) ||  // v5.x (and lower?)
-                  (pDb->Dbms() == dbmsSYBASE_ASE    && !wxStrcmp(pDb->sqlState,wxT("37000"))) ||
-                  (pDb->Dbms() == dbmsMS_SQL_SERVER && !wxStrcmp(pDb->sqlState,wxT("S1000"))) ||
-                  (pDb->Dbms() == dbmsINTERBASE     && !wxStrcmp(pDb->sqlState,wxT("S1000"))) ||
-                  (pDb->Dbms() == dbmsMAXDB         && !wxStrcmp(pDb->sqlState,wxT("S1000"))) ||
-                  (pDb->Dbms() == dbmsFIREBIRD      && !wxStrcmp(pDb->sqlState,wxT("HY000"))) ||
-                  (pDb->Dbms() == dbmsSYBASE_ASE    && !wxStrcmp(pDb->sqlState,wxT("S0002"))) ||  // Base table not found
-                  (pDb->Dbms() == dbmsMY_SQL        && !wxStrcmp(pDb->sqlState,wxT("42S12"))) ||  // tested by Christopher Ludwik Marino-Cebulski using v3.23.21beta
-                  (pDb->Dbms() == dbmsPOSTGRES      && !wxStrcmp(pDb->sqlState,wxT("08S01")))
-               ))
-            {
-                pDb->DispNextError();
-                pDb->DispAllErrors(henv, hdbc, hstmt);
-                pDb->RollbackTrans();
-                CloseCursor(hstmt);
-                return false;
-            }
-        }
-    }
-
-    // Commit the transaction and close the cursor
-    if (! pDb->CommitTrans())
-        return false;
-    if (! CloseCursor(hstmt))
-        return false;
-
-    return true;
-}  // wxDbTable::DropIndex()
-
-
-/********** wxDbTable::SetOrderByColNums() **********/
-bool wxDbTable::SetOrderByColNums(UWORD first, ... )
-{
-    int         colNumber = first;  // using 'int' to be able to look for wxDB_NO_MORE_COLUN_NUMBERS
-    va_list     argptr;
-
-    bool        abort = false;
-    wxString    tempStr;
-
-    va_start(argptr, first);     /* Initialize variable arguments. */
-    while (!abort && (colNumber != wxDB_NO_MORE_COLUMN_NUMBERS))
-    {
-        // Make sure the passed in column number
-        // is within the valid range of columns
-        //
-        // Valid columns are 0 thru m_numCols-1
-        if (colNumber >= m_numCols || colNumber < 0)
-        {
-            abort = true;
-            continue;
-        }
-
-        if (colNumber != first)
-            tempStr += wxT(",");
-
-        tempStr += colDefs[colNumber].ColName;
-        colNumber = va_arg (argptr, int);
-    }
-    va_end (argptr);              /* Reset variable arguments.      */
-
-    SetOrderByClause(tempStr);
-
-    return (!abort);
-}  // wxDbTable::SetOrderByColNums()
-
-
-/********** wxDbTable::Insert() **********/
-int wxDbTable::Insert(void)
-{
-    wxASSERT(!queryOnly);
-    if (queryOnly || !insertable)
-        return(DB_FAILURE);
-
-    bindInsertParams();
-
-    // Insert the record by executing the already prepared insert statement
-    RETCODE retcode;
-    retcode = SQLExecute(hstmtInsert);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO &&
-        retcode != SQL_NEED_DATA)
-    {
-        // Check to see if integrity constraint was violated
-        pDb->GetNextError(henv, hdbc, hstmtInsert);
-        if (! wxStrcmp(pDb->sqlState, wxT("23000")))  // Integrity constraint violated
-            return(DB_ERR_INTEGRITY_CONSTRAINT_VIOL);
-        else
-        {
-            pDb->DispNextError();
-            pDb->DispAllErrors(henv, hdbc, hstmtInsert);
-            return(DB_FAILURE);
-        }
-    }
-    if (retcode == SQL_NEED_DATA)
-    {
-        PTR pParmID;
-        retcode = SQLParamData(hstmtInsert, &pParmID);
-        while (retcode == SQL_NEED_DATA)
-        {
-            // Find the parameter
-            int i;
-            for (i=0; i < m_numCols; i++)
-            {
-                if (colDefs[i].PtrDataObj == pParmID)
-                {
-                    // We found it.  Store the parameter.
-                    retcode = SQLPutData(hstmtInsert, pParmID, colDefs[i].SzDataObj);
-                    if (retcode != SQL_SUCCESS)
-                    {
-                        pDb->DispNextError();
-                        pDb->DispAllErrors(henv, hdbc, hstmtInsert);
-                        return(DB_FAILURE);
-                    }
-                    break;
-                }
-            }
-            retcode = SQLParamData(hstmtInsert, &pParmID);
-            if (retcode != SQL_SUCCESS &&
-                retcode != SQL_SUCCESS_WITH_INFO)
-            {
-                // record was not inserted
-                pDb->DispNextError();
-                pDb->DispAllErrors(henv, hdbc, hstmtInsert);
-                return(DB_FAILURE);
-            }
-        }
-    }
-
-    // Record inserted into the datasource successfully
-    return(DB_SUCCESS);
-
-}  // wxDbTable::Insert()
-
-
-/********** wxDbTable::Update() **********/
-bool wxDbTable::Update(void)
-{
-    wxASSERT(!queryOnly);
-    if (queryOnly)
-        return false;
-
-    wxString sqlStmt;
-
-    // Build the SQL UPDATE statement
-    BuildUpdateStmt(sqlStmt, DB_UPD_KEYFIELDS);
-
-    pDb->WriteSqlLog(sqlStmt);
-
-#ifdef DBDEBUG_CONSOLE
-    cout << endl << sqlStmt.c_str() << endl << endl;
-#endif
-
-    // Execute the SQL UPDATE statement
-    return(execUpdate(sqlStmt));
-
-}  // wxDbTable::Update()
-
-
-/********** wxDbTable::Update(pSqlStmt) **********/
-bool wxDbTable::Update(const wxString &pSqlStmt)
-{
-    wxASSERT(!queryOnly);
-    if (queryOnly)
-        return false;
-
-    pDb->WriteSqlLog(pSqlStmt);
-
-    return(execUpdate(pSqlStmt));
-
-}  // wxDbTable::Update(pSqlStmt)
-
-
-/********** wxDbTable::UpdateWhere() **********/
-bool wxDbTable::UpdateWhere(const wxString &pWhereClause)
-{
-    wxASSERT(!queryOnly);
-    if (queryOnly)
-        return false;
-
-    wxString sqlStmt;
-
-    // Build the SQL UPDATE statement
-    BuildUpdateStmt(sqlStmt, DB_UPD_WHERE, pWhereClause);
-
-    pDb->WriteSqlLog(sqlStmt);
-
-#ifdef DBDEBUG_CONSOLE
-    cout << endl << sqlStmt.c_str() << endl << endl;
-#endif
-
-    // Execute the SQL UPDATE statement
-    return(execUpdate(sqlStmt));
-
-}  // wxDbTable::UpdateWhere()
-
-
-/********** wxDbTable::Delete() **********/
-bool wxDbTable::Delete(void)
-{
-    wxASSERT(!queryOnly);
-    if (queryOnly)
-        return false;
-
-    wxString sqlStmt;
-    sqlStmt.Empty();
-
-    // Build the SQL DELETE statement
-    BuildDeleteStmt(sqlStmt, DB_DEL_KEYFIELDS);
-
-    pDb->WriteSqlLog(sqlStmt);
-
-    // Execute the SQL DELETE statement
-    return(execDelete(sqlStmt));
-
-}  // wxDbTable::Delete()
-
-
-/********** wxDbTable::DeleteWhere() **********/
-bool wxDbTable::DeleteWhere(const wxString &pWhereClause)
-{
-    wxASSERT(!queryOnly);
-    if (queryOnly)
-        return false;
-
-    wxString sqlStmt;
-    sqlStmt.Empty();
-
-    // Build the SQL DELETE statement
-    BuildDeleteStmt(sqlStmt, DB_DEL_WHERE, pWhereClause);
-
-    pDb->WriteSqlLog(sqlStmt);
-
-    // Execute the SQL DELETE statement
-    return(execDelete(sqlStmt));
-
-}  // wxDbTable::DeleteWhere()
-
-
-/********** wxDbTable::DeleteMatching() **********/
-bool wxDbTable::DeleteMatching(void)
-{
-    wxASSERT(!queryOnly);
-    if (queryOnly)
-        return false;
-
-    wxString sqlStmt;
-    sqlStmt.Empty();
-
-    // Build the SQL DELETE statement
-    BuildDeleteStmt(sqlStmt, DB_DEL_MATCHING);
-
-    pDb->WriteSqlLog(sqlStmt);
-
-    // Execute the SQL DELETE statement
-    return(execDelete(sqlStmt));
-
-}  // wxDbTable::DeleteMatching()
-
-
-/********** wxDbTable::IsColNull() **********/
-bool wxDbTable::IsColNull(UWORD colNumber) const
-{
-/*
-    This logic is just not right.  It would indicate true
-    if a numeric field were set to a value of 0.
-
-    switch(colDefs[colNumber].SqlCtype)
-    {
-        case SQL_C_CHAR:
-        case SQL_C_WCHAR:
-        //case SQL_C_WXCHAR:  SQL_C_WXCHAR is covered by either SQL_C_CHAR or SQL_C_WCHAR
-            return(((UCHAR FAR *) colDefs[colNumber].PtrDataObj)[0] == 0);
-        case SQL_C_SSHORT:
-            return((  *((SWORD *) colDefs[colNumber].PtrDataObj))   == 0);
-        case SQL_C_USHORT:
-            return((   *((UWORD*) colDefs[colNumber].PtrDataObj))   == 0);
-        case SQL_C_SLONG:
-            return(( *((SDWORD *) colDefs[colNumber].PtrDataObj))   == 0);
-        case SQL_C_ULONG:
-            return(( *((UDWORD *) colDefs[colNumber].PtrDataObj))   == 0);
-        case SQL_C_FLOAT:
-            return(( *((SFLOAT *) colDefs[colNumber].PtrDataObj))   == 0);
-        case SQL_C_DOUBLE:
-            return((*((SDOUBLE *) colDefs[colNumber].PtrDataObj))   == 0);
-        case SQL_C_TIMESTAMP:
-            TIMESTAMP_STRUCT *pDt;
-            pDt = (TIMESTAMP_STRUCT *) colDefs[colNumber].PtrDataObj;
-            if (pDt->year == 0 && pDt->month == 0 && pDt->day == 0)
-                return true;
-            else
-                return false;
-        default:
-            return true;
-    }
-*/
-    return (colDefs[colNumber].Null);
-}  // wxDbTable::IsColNull()
-
-
-/********** wxDbTable::CanSelectForUpdate() **********/
-bool wxDbTable::CanSelectForUpdate(void)
-{
-    if (queryOnly)
-        return false;
-
-    if (pDb->Dbms() == dbmsMY_SQL)
-        return false;
-
-    if ((pDb->Dbms() == dbmsORACLE) ||
-        (pDb->dbInf.posStmts & SQL_PS_SELECT_FOR_UPDATE))
-        return true;
-    else
-        return false;
-
-}  // wxDbTable::CanSelectForUpdate()
-
-
-/********** wxDbTable::CanUpdateByROWID() **********/
-bool wxDbTable::CanUpdateByROWID(void)
-{
-/*
- * NOTE: Returning false for now until this can be debugged,
- *        as the ROWID is not getting updated correctly
- */
-    return false;
-/*
-    if (pDb->Dbms() == dbmsORACLE)
-        return true;
-    else
-        return false;
-*/
-}  // wxDbTable::CanUpdateByROWID()
-
-
-/********** wxDbTable::IsCursorClosedOnCommit() **********/
-bool wxDbTable::IsCursorClosedOnCommit(void)
-{
-    if (pDb->dbInf.cursorCommitBehavior == SQL_CB_PRESERVE)
-        return false;
-    else
-        return true;
-
-}  // wxDbTable::IsCursorClosedOnCommit()
-
-
-
-/********** wxDbTable::ClearMemberVar() **********/
-void wxDbTable::ClearMemberVar(UWORD colNumber, bool setToNull)
-{
-    wxASSERT(colNumber < m_numCols);
-
-    switch(colDefs[colNumber].SqlCtype)
-    {
-        case SQL_C_CHAR:
-#ifdef SQL_C_WCHAR
-        case SQL_C_WCHAR:
-#endif
-        //case SQL_C_WXCHAR:  SQL_C_WXCHAR is covered by either SQL_C_CHAR or SQL_C_WCHAR
-            ((UCHAR FAR *) colDefs[colNumber].PtrDataObj)[0]    = 0;
-            break;
-        case SQL_C_SSHORT:
-            *((SWORD *) colDefs[colNumber].PtrDataObj)          = 0;
-            break;
-        case SQL_C_USHORT:
-            *((UWORD*) colDefs[colNumber].PtrDataObj)           = 0;
-            break;
-        case SQL_C_LONG:
-        case SQL_C_SLONG:
-            *((SDWORD *) colDefs[colNumber].PtrDataObj)         = 0;
-            break;
-        case SQL_C_ULONG:
-            *((UDWORD *) colDefs[colNumber].PtrDataObj)         = 0;
-            break;
-        case SQL_C_FLOAT:
-            *((SFLOAT *) colDefs[colNumber].PtrDataObj)         = 0.0f;
-            break;
-        case SQL_C_DOUBLE:
-            *((SDOUBLE *) colDefs[colNumber].PtrDataObj)        = 0.0f;
-            break;
-        case SQL_C_TIMESTAMP:
-            TIMESTAMP_STRUCT *pDt;
-            pDt = (TIMESTAMP_STRUCT *) colDefs[colNumber].PtrDataObj;
-            pDt->year = 0;
-            pDt->month = 0;
-            pDt->day = 0;
-            pDt->hour = 0;
-            pDt->minute = 0;
-            pDt->second = 0;
-            pDt->fraction = 0;
-            break;
-        case SQL_C_DATE:
-            DATE_STRUCT *pDtd;
-            pDtd = (DATE_STRUCT *) colDefs[colNumber].PtrDataObj;
-            pDtd->year = 0;
-            pDtd->month = 0;
-            pDtd->day = 0;
-            break;
-        case SQL_C_TIME:
-            TIME_STRUCT *pDtt;
-            pDtt = (TIME_STRUCT *) colDefs[colNumber].PtrDataObj;
-            pDtt->hour = 0;
-            pDtt->minute = 0;
-            pDtt->second = 0;
-            break;
-    }
-
-    if (setToNull)
-        SetColNull(colNumber);
-}  // wxDbTable::ClearMemberVar()
-
-
-/********** wxDbTable::ClearMemberVars() **********/
-void wxDbTable::ClearMemberVars(bool setToNull)
-{
-    int i;
-
-    // Loop through the columns setting each member variable to zero
-    for (i=0; i < m_numCols; i++)
-        ClearMemberVar((UWORD)i,setToNull);
-
-}  // wxDbTable::ClearMemberVars()
-
-
-/********** wxDbTable::SetQueryTimeout() **********/
-bool wxDbTable::SetQueryTimeout(UDWORD nSeconds)
-{
-    if (SQLSetStmtOption(hstmtInsert, SQL_QUERY_TIMEOUT, nSeconds) != SQL_SUCCESS)
-        return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
-    if (SQLSetStmtOption(hstmtUpdate, SQL_QUERY_TIMEOUT, nSeconds) != SQL_SUCCESS)
-        return(pDb->DispAllErrors(henv, hdbc, hstmtUpdate));
-    if (SQLSetStmtOption(hstmtDelete, SQL_QUERY_TIMEOUT, nSeconds) != SQL_SUCCESS)
-        return(pDb->DispAllErrors(henv, hdbc, hstmtDelete));
-    if (SQLSetStmtOption(hstmtInternal, SQL_QUERY_TIMEOUT, nSeconds) != SQL_SUCCESS)
-        return(pDb->DispAllErrors(henv, hdbc, hstmtInternal));
-
-    // Completed Successfully
-    return true;
-
-}  // wxDbTable::SetQueryTimeout()
-
-
-/********** wxDbTable::SetColDefs() **********/
-bool wxDbTable::SetColDefs(UWORD index, const wxString &fieldName, int dataType, void *pData,
-                           SWORD cType, int size, bool keyField, bool updateable,
-                           bool insertAllowed, bool derivedColumn)
-{
-    wxString tmpStr;
-
-    if (index >= m_numCols)  // Columns numbers are zero based....
-    {
-        tmpStr.Printf(wxT("Specified column index (%d) exceeds the maximum number of columns (%d) registered for this table definition.  Column definition not added."), index, m_numCols);
-        wxFAIL_MSG(tmpStr);
-        wxLogDebug(tmpStr);
-        return false;
-    }
-
-    if (!colDefs)  // May happen if the database connection fails
-        return false;
-
-    if (fieldName.length() > (unsigned int) DB_MAX_COLUMN_NAME_LEN)
-    {
-        wxStrncpy(colDefs[index].ColName, fieldName, DB_MAX_COLUMN_NAME_LEN);
-        colDefs[index].ColName[DB_MAX_COLUMN_NAME_LEN] = 0;  // Prevent buffer overrun
-
-        tmpStr.Printf(wxT("Column name '%s' is too long. Truncated to '%s'."),
-                      fieldName.c_str(),colDefs[index].ColName);
-        wxFAIL_MSG(tmpStr);
-        wxLogDebug(tmpStr);
-    }
-    else
-        wxStrcpy(colDefs[index].ColName, fieldName);
-
-    colDefs[index].DbDataType       = dataType;
-    colDefs[index].PtrDataObj       = pData;
-    colDefs[index].SqlCtype         = cType;
-    colDefs[index].SzDataObj        = size;  //TODO: glt ??? * sizeof(wxChar) ???
-    colDefs[index].KeyField         = keyField;
-    colDefs[index].DerivedCol       = derivedColumn;
-    // Derived columns by definition would NOT be "Insertable" or "Updateable"
-    if (derivedColumn)
-    {
-        colDefs[index].Updateable       = false;
-        colDefs[index].InsertAllowed    = false;
-    }
-    else
-    {
-        colDefs[index].Updateable       = updateable;
-        colDefs[index].InsertAllowed    = insertAllowed;
-    }
-
-    colDefs[index].Null                 = false;
-
-    return true;
-
-}  // wxDbTable::SetColDefs()
-
-
-/********** wxDbTable::SetColDefs() **********/
-wxDbColDataPtr* wxDbTable::SetColDefs(wxDbColInf *pColInfs, UWORD numCols)
-{
-    wxASSERT(pColInfs);
-    wxDbColDataPtr *pColDataPtrs = NULL;
-
-    if (pColInfs)
-    {
-        UWORD index;
-
-        pColDataPtrs = new wxDbColDataPtr[numCols+1];
-
-        for (index = 0; index < numCols; index++)
-        {
-            // Process the fields
-            switch (pColInfs[index].dbDataType)
-            {
-                case DB_DATA_TYPE_VARCHAR:
-                   pColDataPtrs[index].PtrDataObj = new wxChar[pColInfs[index].bufferSize+(1*sizeof(wxChar))];
-                   pColDataPtrs[index].SzDataObj  = pColInfs[index].bufferSize+(1*sizeof(wxChar));
-                   pColDataPtrs[index].SqlCtype   = SQL_C_WXCHAR;
-                   break;
-                case DB_DATA_TYPE_MEMO:
-                   pColDataPtrs[index].PtrDataObj = new wxChar[pColInfs[index].bufferSize+(1*sizeof(wxChar))];
-                   pColDataPtrs[index].SzDataObj  = pColInfs[index].bufferSize+(1*sizeof(wxChar));
-                   pColDataPtrs[index].SqlCtype   = SQL_C_WXCHAR;
-                   break;
-                case DB_DATA_TYPE_INTEGER:
-                    // Can be long or short
-                    if (pColInfs[index].bufferSize == sizeof(long))
-                    {
-                      pColDataPtrs[index].PtrDataObj = new long;
-                      pColDataPtrs[index].SzDataObj  = sizeof(long);
-                      pColDataPtrs[index].SqlCtype   = SQL_C_SLONG;
-                    }
-                    else
-                    {
-                        pColDataPtrs[index].PtrDataObj = new short;
-                        pColDataPtrs[index].SzDataObj  = sizeof(short);
-                        pColDataPtrs[index].SqlCtype   = SQL_C_SSHORT;
-                    }
-                    break;
-                case DB_DATA_TYPE_FLOAT:
-                    // Can be float or double
-                    if (pColInfs[index].bufferSize == sizeof(float))
-                    {
-                        pColDataPtrs[index].PtrDataObj = new float;
-                        pColDataPtrs[index].SzDataObj  = sizeof(float);
-                        pColDataPtrs[index].SqlCtype   = SQL_C_FLOAT;
-                    }
-                    else
-                    {
-                        pColDataPtrs[index].PtrDataObj = new double;
-                        pColDataPtrs[index].SzDataObj  = sizeof(double);
-                        pColDataPtrs[index].SqlCtype   = SQL_C_DOUBLE;
-                    }
-                    break;
-                case DB_DATA_TYPE_DATE:
-                    pColDataPtrs[index].PtrDataObj = new TIMESTAMP_STRUCT;
-                    pColDataPtrs[index].SzDataObj  = sizeof(TIMESTAMP_STRUCT);
-                    pColDataPtrs[index].SqlCtype   = SQL_C_TIMESTAMP;
-                    break;
-                case DB_DATA_TYPE_BLOB:
-                    wxFAIL_MSG(wxT("This form of ::SetColDefs() cannot be used with BLOB columns"));
-                    pColDataPtrs[index].PtrDataObj = /*BLOB ADDITION NEEDED*/NULL;
-                    pColDataPtrs[index].SzDataObj  = /*BLOB ADDITION NEEDED*/sizeof(void *);
-                    pColDataPtrs[index].SqlCtype   = SQL_VARBINARY;
-                    break;
-            }
-            if (pColDataPtrs[index].PtrDataObj != NULL)
-                SetColDefs (index,pColInfs[index].colName,pColInfs[index].dbDataType, pColDataPtrs[index].PtrDataObj, pColDataPtrs[index].SqlCtype, pColDataPtrs[index].SzDataObj);
-            else
-            {
-                // Unable to build all the column definitions, as either one of
-                // the calls to "new" failed above, or there was a BLOB field
-                // to have a column definition for.  If BLOBs are to be used,
-                // the other form of ::SetColDefs() must be used, as it is impossible
-                // to know the maximum size to create the PtrDataObj to be.
-                delete [] pColDataPtrs;
-                return NULL;
-            }
-        }
-    }
-
-    return (pColDataPtrs);
-
-} // wxDbTable::SetColDefs()
-
-
-/********** wxDbTable::SetCursor() **********/
-void wxDbTable::SetCursor(HSTMT *hstmtActivate)
-{
-    if (hstmtActivate == wxDB_DEFAULT_CURSOR)
-        hstmt = *hstmtDefault;
-    else
-        hstmt = *hstmtActivate;
-
-}  // wxDbTable::SetCursor()
-
-
-/********** wxDbTable::Count(const wxString &) **********/
-ULONG wxDbTable::Count(const wxString &args)
-{
-    ULONG count;
-    wxString sqlStmt;
-    SQLLEN cb;
-
-    // Build a "SELECT COUNT(*) FROM queryTableName [WHERE whereClause]" SQL Statement
-    sqlStmt  = wxT("SELECT COUNT(");
-    sqlStmt += args;
-    sqlStmt += wxT(") FROM ");
-    sqlStmt += pDb->SQLTableName(queryTableName);
-//    sqlStmt += queryTableName;
-#if wxODBC_BACKWARD_COMPATABILITY
-    if (from && wxStrlen(from))
-#else
-    if (from.length())
-#endif
-        sqlStmt += from;
-
-    // Add the where clause if one is provided
-#if wxODBC_BACKWARD_COMPATABILITY
-    if (where && wxStrlen(where))
-#else
-    if (where.length())
-#endif
-    {
-        sqlStmt += wxT(" WHERE ");
-        sqlStmt += where;
-    }
-
-    pDb->WriteSqlLog(sqlStmt);
-
-    // Initialize the Count cursor if it's not already initialized
-    if (!hstmtCount)
-    {
-        hstmtCount = GetNewCursor(false,false);
-        wxASSERT(hstmtCount);
-        if (!hstmtCount)
-            return(0);
-    }
-
-    // Execute the SQL statement
-    if (SQLExecDirect(*hstmtCount, WXSQLCAST(sqlStmt), SQL_NTS) != SQL_SUCCESS)
-    {
-        pDb->DispAllErrors(henv, hdbc, *hstmtCount);
-        return(0);
-    }
-
-    // Fetch the record
-    if (SQLFetch(*hstmtCount) != SQL_SUCCESS)
-    {
-        pDb->DispAllErrors(henv, hdbc, *hstmtCount);
-        return(0);
-    }
-
-    // Obtain the result
-    if (SQLGetData(*hstmtCount, (UWORD)1, SQL_C_ULONG, &count, sizeof(count), &cb) != SQL_SUCCESS)
-    {
-        pDb->DispAllErrors(henv, hdbc, *hstmtCount);
-        return(0);
-    }
-
-    // Free the cursor
-    if (SQLFreeStmt(*hstmtCount, SQL_CLOSE) != SQL_SUCCESS)
-        pDb->DispAllErrors(henv, hdbc, *hstmtCount);
-
-    // Return the record count
-    return(count);
-
-}  // wxDbTable::Count()
-
-
-/********** wxDbTable::Refresh() **********/
-bool wxDbTable::Refresh(void)
-{
-    bool result = true;
-
-    // Switch to the internal cursor so any active cursors are not corrupted
-    HSTMT currCursor = GetCursor();
-    hstmt = hstmtInternal;
-#if wxODBC_BACKWARD_COMPATABILITY
-    // Save the where and order by clauses
-    wxChar *saveWhere = where;
-    wxChar *saveOrderBy = orderBy;
-#else
-    wxString saveWhere = where;
-    wxString saveOrderBy = orderBy;
-#endif
-    // Build a where clause to refetch the record with.  Try and use the
-    // ROWID if it's available, ow use the key fields.
-    wxString whereClause;
-    whereClause.Empty();
-
-    if (CanUpdateByROWID())
-    {
-        SQLLEN cb;
-        wxChar rowid[wxDB_ROWID_LEN+1];
-
-        // Get the ROWID value.  If not successful retreiving the ROWID,
-        // simply fall down through the code and build the WHERE clause
-        // based on the key fields.
-        if (SQLGetData(hstmt, (UWORD)(m_numCols+1), SQL_C_WXCHAR, (UCHAR*) rowid, sizeof(rowid), &cb) == SQL_SUCCESS)
-        {
-            whereClause += pDb->SQLTableName(queryTableName);
-//            whereClause += queryTableName;
-            whereClause += wxT(".ROWID = '");
-            whereClause += rowid;
-            whereClause += wxT("'");
-        }
-    }
-
-    // If unable to use the ROWID, build a where clause from the keyfields
-    if (wxStrlen(whereClause) == 0)
-        BuildWhereClause(whereClause, DB_WHERE_KEYFIELDS, queryTableName);
-
-    // Requery the record
-    where = whereClause;
-    orderBy.Empty();
-    if (!Query())
-        result = false;
-
-    if (result && !GetNext())
-        result = false;
-
-    // Switch back to original cursor
-    SetCursor(&currCursor);
-
-    // Free the internal cursor
-    if (SQLFreeStmt(hstmtInternal, SQL_CLOSE) != SQL_SUCCESS)
-        pDb->DispAllErrors(henv, hdbc, hstmtInternal);
-
-    // Restore the original where and order by clauses
-    where   = saveWhere;
-    orderBy = saveOrderBy;
-
-    return(result);
-
-}  // wxDbTable::Refresh()
-
-
-/********** wxDbTable::SetColNull() **********/
-bool wxDbTable::SetColNull(UWORD colNumber, bool set)
-{
-    if (colNumber < m_numCols)
-    {
-        colDefs[colNumber].Null = set;
-        if (set)  // Blank out the values in the member variable
-           ClearMemberVar(colNumber, false);  // Must call with false here, or infinite recursion will happen
-
-        setCbValueForColumn(colNumber);
-
-        return true;
-    }
-    else
-        return false;
-
-}  // wxDbTable::SetColNull()
-
-
-/********** wxDbTable::SetColNull() **********/
-bool wxDbTable::SetColNull(const wxString &colName, bool set)
-{
-    int colNumber;
-    for (colNumber = 0; colNumber < m_numCols; colNumber++)
-    {
-        if (!wxStricmp(colName, colDefs[colNumber].ColName))
-            break;
-    }
-
-    if (colNumber < m_numCols)
-    {
-        colDefs[colNumber].Null = set;
-        if (set)  // Blank out the values in the member variable
-           ClearMemberVar((UWORD)colNumber,false);  // Must call with false here, or infinite recursion will happen
-
-        setCbValueForColumn(colNumber);
-
-        return true;
-    }
-    else
-        return false;
-
-}  // wxDbTable::SetColNull()
-
-
-/********** wxDbTable::GetNewCursor() **********/
-HSTMT *wxDbTable::GetNewCursor(bool setCursor, bool bindColumns)
-{
-    HSTMT *newHSTMT = new HSTMT;
-    wxASSERT(newHSTMT);
-    if (!newHSTMT)
-        return(0);
-
-    if (SQLAllocStmt(hdbc, newHSTMT) != SQL_SUCCESS)
-    {
-        pDb->DispAllErrors(henv, hdbc);
-        delete newHSTMT;
-        return(0);
-    }
-
-    if (SQLSetStmtOption(*newHSTMT, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS)
-    {
-        pDb->DispAllErrors(henv, hdbc, *newHSTMT);
-        delete newHSTMT;
-        return(0);
-    }
-
-    if (bindColumns)
-    {
-        if (!bindCols(*newHSTMT))
-        {
-            delete newHSTMT;
-            return(0);
-        }
-    }
-
-    if (setCursor)
-        SetCursor(newHSTMT);
-
-    return(newHSTMT);
-
-}   // wxDbTable::GetNewCursor()
-
-
-/********** wxDbTable::DeleteCursor() **********/
-bool wxDbTable::DeleteCursor(HSTMT *hstmtDel)
-{
-    bool result = true;
-
-    if (!hstmtDel)  // Cursor already deleted
-        return(result);
-
-/*
-ODBC 3.0 says to use this form
-    if (SQLFreeHandle(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
-
-*/
-    if (SQLFreeStmt(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
-    {
-        pDb->DispAllErrors(henv, hdbc);
-        result = false;
-    }
-
-    delete hstmtDel;
-
-    return(result);
-
-}  // wxDbTable::DeleteCursor()
-
-//////////////////////////////////////////////////////////////
-// wxDbGrid support functions
-//////////////////////////////////////////////////////////////
-
-void wxDbTable::SetRowMode(const rowmode_t rowmode)
-{
-    if (!m_hstmtGridQuery)
-    {
-        m_hstmtGridQuery = GetNewCursor(false,false);
-        if (!bindCols(*m_hstmtGridQuery))
-            return;
-    }
-
-    m_rowmode = rowmode;
-    switch (m_rowmode)
-    {
-        case WX_ROW_MODE_QUERY:
-            SetCursor(m_hstmtGridQuery);
-            break;
-        case WX_ROW_MODE_INDIVIDUAL:
-            SetCursor(hstmtDefault);
-            break;
-        default:
-           wxASSERT(0);
-    }
-}  // wxDbTable::SetRowMode()
-
-
-wxVariant wxDbTable::GetColumn(const int colNumber) const
-{
-    wxVariant val;
-    if ((colNumber < m_numCols) && (!IsColNull((UWORD)colNumber)))
-    {
-        switch (colDefs[colNumber].SqlCtype)
-        {
-#if wxUSE_UNICODE
-    #if defined(SQL_WCHAR)
-            case SQL_WCHAR:
-    #endif
-    #if defined(SQL_WVARCHAR)
-            case SQL_WVARCHAR:
-    #endif
-#endif
-            case SQL_CHAR:
-            case SQL_VARCHAR:
-                val = (wxChar *)(colDefs[colNumber].PtrDataObj);
-                break;
-            case SQL_C_LONG:
-            case SQL_C_SLONG:
-                val = *(long *)(colDefs[colNumber].PtrDataObj);
-                break;
-            case SQL_C_SHORT:
-            case SQL_C_SSHORT:
-                val = (long int )(*(short *)(colDefs[colNumber].PtrDataObj));
-                break;
-            case SQL_C_ULONG:
-                val = (long)(*(unsigned long *)(colDefs[colNumber].PtrDataObj));
-                break;
-            case SQL_C_TINYINT:
-                val = (long)(*(wxChar *)(colDefs[colNumber].PtrDataObj));
-                break;
-            case SQL_C_UTINYINT:
-                val = (long)(*(wxChar *)(colDefs[colNumber].PtrDataObj));
-                break;
-            case SQL_C_USHORT:
-                val = (long)(*(UWORD *)(colDefs[colNumber].PtrDataObj));
-                break;
-            case SQL_C_DATE:
-                val = (DATE_STRUCT *)(colDefs[colNumber].PtrDataObj);
-                break;
-            case SQL_C_TIME:
-                val = (TIME_STRUCT *)(colDefs[colNumber].PtrDataObj);
-                break;
-            case SQL_C_TIMESTAMP:
-                val = (TIMESTAMP_STRUCT *)(colDefs[colNumber].PtrDataObj);
-                break;
-            case SQL_C_DOUBLE:
-                val = *(double *)(colDefs[colNumber].PtrDataObj);
-                break;
-            default:
-                assert(0);
-        }
-    }
-    return val;
-}  // wxDbTable::GetCol()
-
-
-void wxDbTable::SetColumn(const int colNumber, const wxVariant val)
-{
-    //FIXME: Add proper wxDateTime support to wxVariant..
-    wxDateTime dateval;
-
-    SetColNull((UWORD)colNumber, val.IsNull());
-
-    if (!val.IsNull())
-    {
-        if ((colDefs[colNumber].SqlCtype == SQL_C_DATE)
-            || (colDefs[colNumber].SqlCtype == SQL_C_TIME)
-            || (colDefs[colNumber].SqlCtype == SQL_C_TIMESTAMP))
-        {
-            //Returns null if invalid!
-            if (!dateval.ParseDate(val.GetString()))
-                SetColNull((UWORD)colNumber, true);
-        }
-
-        switch (colDefs[colNumber].SqlCtype)
-        {
-#if wxUSE_UNICODE
-    #if defined(SQL_WCHAR)
-            case SQL_WCHAR:
-    #endif
-    #if defined(SQL_WVARCHAR)
-            case SQL_WVARCHAR:
-    #endif
-#endif
-            case SQL_CHAR:
-            case SQL_VARCHAR:
-                csstrncpyt((wxChar *)(colDefs[colNumber].PtrDataObj),
-                           val.GetString().c_str(),
-                           colDefs[colNumber].SzDataObj-1);  //TODO: glt ??? * sizeof(wxChar) ???
-                break;
-            case SQL_C_LONG:
-            case SQL_C_SLONG:
-                *(long *)(colDefs[colNumber].PtrDataObj) = val;
-                break;
-            case SQL_C_SHORT:
-            case SQL_C_SSHORT:
-                *(short *)(colDefs[colNumber].PtrDataObj) = (short)val.GetLong();
-                break;
-            case SQL_C_ULONG:
-                *(unsigned long *)(colDefs[colNumber].PtrDataObj) = val.GetLong();
-                break;
-            case SQL_C_TINYINT:
-                *(wxChar *)(colDefs[colNumber].PtrDataObj) = val.GetChar();
-                break;
-            case SQL_C_UTINYINT:
-                *(wxChar *)(colDefs[colNumber].PtrDataObj) = val.GetChar();
-                break;
-            case SQL_C_USHORT:
-                *(unsigned short *)(colDefs[colNumber].PtrDataObj) = (unsigned short)val.GetLong();
-                break;
-            //FIXME: Add proper wxDateTime support to wxVariant..
-            case SQL_C_DATE:
-                {
-                    DATE_STRUCT *dataptr =
-                        (DATE_STRUCT *)colDefs[colNumber].PtrDataObj;
-
-                    dataptr->year   = (SWORD)dateval.GetYear();
-                    dataptr->month  = (UWORD)(dateval.GetMonth()+1);
-                    dataptr->day    = (UWORD)dateval.GetDay();
-                }
-                break;
-            case SQL_C_TIME:
-                {
-                    TIME_STRUCT *dataptr =
-                        (TIME_STRUCT *)colDefs[colNumber].PtrDataObj;
-
-                    dataptr->hour   = dateval.GetHour();
-                    dataptr->minute = dateval.GetMinute();
-                    dataptr->second = dateval.GetSecond();
-                }
-                break;
-            case SQL_C_TIMESTAMP:
-                {
-                    TIMESTAMP_STRUCT *dataptr =
-                        (TIMESTAMP_STRUCT *)colDefs[colNumber].PtrDataObj;
-                    dataptr->year   = (SWORD)dateval.GetYear();
-                    dataptr->month  = (UWORD)(dateval.GetMonth()+1);
-                    dataptr->day    = (UWORD)dateval.GetDay();
-
-                    dataptr->hour   = dateval.GetHour();
-                    dataptr->minute = dateval.GetMinute();
-                    dataptr->second = dateval.GetSecond();
-                }
-                break;
-            case SQL_C_DOUBLE:
-                *(double *)(colDefs[colNumber].PtrDataObj) = val;
-                break;
-            default:
-                assert(0);
-        }  // switch
-    }  // if (!val.IsNull())
-}  // wxDbTable::SetCol()
-
-
-GenericKey wxDbTable::GetKey()
-{
-    void *blk;
-    wxChar *blkptr;
-
-    blk = malloc(m_keysize);
-    blkptr = (wxChar *) blk;
-
-    int i;
-    for (i=0; i < m_numCols; i++)
-    {
-        if (colDefs[i].KeyField)
-        {
-            memcpy(blkptr,colDefs[i].PtrDataObj, colDefs[i].SzDataObj);
-            blkptr += colDefs[i].SzDataObj;
-        }
-    }
-
-    GenericKey k = GenericKey(blk, m_keysize);
-    free(blk);
-
-    return k;
-}  // wxDbTable::GetKey()
-
-
-void wxDbTable::SetKey(const GenericKey& k)
-{
-    void    *blk;
-    wxChar  *blkptr;
-
-    blk = k.GetBlk();
-    blkptr = (wxChar *)blk;
-
-    int i;
-    for (i=0; i < m_numCols; i++)
-    {
-        if (colDefs[i].KeyField)
-        {
-            SetColNull((UWORD)i, false);
-            memcpy(colDefs[i].PtrDataObj, blkptr, colDefs[i].SzDataObj);
-            blkptr += colDefs[i].SzDataObj;
-        }
-    }
-}  // wxDbTable::SetKey()
-
-
-#endif  // wxUSE_ODBC
index 5120dc5554dcabfbcd0dc3d37e06b86817df8254..b71f67801d286d0520a55e838fc5ababd0fe0cb9 100644 (file)
@@ -1199,15 +1199,6 @@ class wxVariantDataDateTime: public wxVariantData
 public:
     wxVariantDataDateTime() { }
     wxVariantDataDateTime(const wxDateTime& value) { m_value = value; }
-#if wxUSE_ODBC
-    wxVariantDataDateTime(const TIME_STRUCT* valptr)
-        { m_value = wxDateTime(valptr->hour, valptr->minute, valptr->second); }
-    wxVariantDataDateTime(const DATE_STRUCT* valptr)
-        { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1),valptr->year); }
-    wxVariantDataDateTime(const TIMESTAMP_STRUCT* valptr)
-        { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1), valptr->year,
-                        valptr->hour, valptr->minute, valptr->second, (wxDateTime::wxDateTime_t)valptr->fraction ); }
-#endif //ODBC
 
     inline wxDateTime GetValue() const { return m_value; }
     inline void SetValue(const wxDateTime& value) { m_value = value; }
@@ -1281,26 +1272,6 @@ wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date
     m_name = name;
 }
 
-#if wxUSE_ODBC
-wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date
-{
-    m_data = new wxVariantDataDateTime(valptr);
-    m_name = name;
-}
-
-wxVariant::wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name) // Date
-{
-    m_data = new wxVariantDataDateTime(valptr);
-    m_name = name;
-}
-
-wxVariant::wxVariant(const DATE_STRUCT* valptr, const wxString& name) // Date
-{
-    m_data = new wxVariantDataDateTime(valptr);
-    m_name = name;
-}
-#endif // wxUSE_ODBC
-
 bool wxVariant::operator== (const wxDateTime& value) const
 {
     wxDateTime thisValue;
@@ -1329,27 +1300,6 @@ void wxVariant::operator= (const wxDateTime& value)
     }
 }
 
-#if wxUSE_ODBC
-void wxVariant::operator= (const DATE_STRUCT* value)
-{
-    UnRef();
-    m_data = new wxVariantDataDateTime(value);
-}
-
-void wxVariant::operator= (const TIME_STRUCT* value)
-{
-    UnRef();
-    m_data = new wxVariantDataDateTime(value);
-}
-
-void wxVariant::operator= (const TIMESTAMP_STRUCT* value)
-{
-    UnRef();
-    m_data = new wxVariantDataDateTime(value);
-}
-
-#endif // wxUSE_ODBC
-
 wxDateTime wxVariant::GetDateTime() const
 {
     wxDateTime value;
index 859972c5479f7529e9902660331dcf573bbfe56c..811b640290cf89a0658ffde0057e978294a11616 100755 (executable)
@@ -970,7 +970,6 @@ ldlibs_core="@EXTRALIBS_GUI@"
 ldlibs_gl="@OPENGL_LIBS@"
 ldlibs_html="@EXTRALIBS_HTML@"
 ldlibs_xml="@EXTRALIBS_XML@"
-ldlibs_odbc="@EXTRALIBS_ODBC@"
 ldlibs_adv="@EXTRALIBS_SDL@"
 ldlibs_stc="@EXTRALIBS_STC@"
 
index 46b7a8929aac9d6fe4087f91b4b2c4dd8249347b..3ac7f828268947284a0e9b75d0db67c5e99b0f52 100644 (file)
@@ -73,7 +73,7 @@ cd obj-shared
 %if %{unicode}
                               --enable-unicode
 %else
-                              --with-odbc
+                              --disable-unicode \
 %endif
 $MAKE
 cd ..
@@ -84,7 +84,7 @@ cd obj-static
 %if %{unicode}
                               --enable-unicode
 %else
-                              --with-odbc
+                              --disable-unicode \
 %endif
 $MAKE
 cd ..
index 5b5f5f9e8c5164c3db958933996454033b4fce91..62ba24c927a89130e8a4e1c4a7c24bc1e7e34c5b 100644 (file)
@@ -167,7 +167,6 @@ cd obj-shared
                              --enable-unicode \
 %else
                              --disable-unicode \
-                             --with-odbc \
 %endif
                              --with-opengl
 $MAKE
@@ -189,7 +188,6 @@ cd obj-static
                              --enable-unicode \
 %else
                              --disable-unicode \
-                             --with-odbc \
 %endif
                              --with-opengl
 $MAKE
@@ -358,9 +356,6 @@ wx/url.h
 wx/unix/gsockunx.h
 wx/xml/xml.h
 wx/xtixml.h
-wx/db.h
-wx/dbkeyg.h
-wx/dbtable.h
 EOF
 # --- wxBase headers list ends here ---
 cat <<EOF >wxbase-headers.paths
@@ -484,9 +479,6 @@ cat <<EOF >wxbase-headers.paths
 %{_includedir}/wx-%{ver2}/wx/url.h
 %{_includedir}/wx-%{ver2}/wx/xml/xml.h
 %{_includedir}/wx-%{ver2}/wx/xtixml.h
-%{_includedir}/wx-%{ver2}/wx/db.h
-%{_includedir}/wx-%{ver2}/wx/dbkeyg.h
-%{_includedir}/wx-%{ver2}/wx/dbtable.h
 %{_includedir}/wx-%{ver2}/wx/unix/apptbase.h
 %{_includedir}/wx-%{ver2}/wx/unix/apptrait.h
 %{_includedir}/wx-%{ver2}/wx/unix/execute.h
@@ -589,9 +581,6 @@ rm -f %{_bindir}/%{wxbaseconfiglink}
 %{_libdir}/libwx_%{buildname}_adv-%{ver2}.so.*
 %{_libdir}/libwx_%{buildname}_aui-%{ver2}.so.*
 %{_libdir}/libwx_%{buildname}_core-%{ver2}.so.*
-%if !%{unicode}
-    %{_libdir}/libwx_%{buildname}_dbgrid-%{ver2}.so.*
-%endif
 %{_libdir}/libwx_%{buildname}_html-%{ver2}.so.*
 %{_libdir}/libwx_%{buildname}_mmedia-%{ver2}.so.*
 %{_libdir}/libwx_%{buildname}_qa-%{ver2}.so.*
@@ -608,9 +597,6 @@ rm -f %{_bindir}/%{wxbaseconfiglink}
 %{_libdir}/libwx_%{buildname}_adv-%{ver2}.so
 %{_libdir}/libwx_%{buildname}_aui-%{ver2}.so
 %{_libdir}/libwx_%{buildname}_core-%{ver2}.so
-%if !%{unicode}
-    %{_libdir}/libwx_%{buildname}_dbgrid-%{ver2}.so
-%endif
 %{_libdir}/libwx_%{buildname}_gl-%{ver2}.so
 %{_libdir}/libwx_%{buildname}_html-%{ver2}.so
 %{_libdir}/libwx_%{buildname}_mmedia-%{ver2}.so
@@ -621,9 +607,6 @@ rm -f %{_bindir}/%{wxbaseconfiglink}
 %{_libdir}/libwx_%{buildname}_adv-%{ver2}.a
 %{_libdir}/libwx_%{buildname}_aui-%{ver2}.a
 %{_libdir}/libwx_%{buildname}_core-%{ver2}.a
-%if !%{unicode}
-    %{_libdir}/libwx_%{buildname}_dbgrid-%{ver2}.a
-%endif
 %{_libdir}/libwx_%{buildname}_gl-%{ver2}.a
 %{_libdir}/libwx_%{buildname}_html-%{ver2}.a
 %{_libdir}/libwx_%{buildname}_qa-%{ver2}.a
index 945690bb3ca6fb4d22f33e51dca046364e8d25b3..18fed691aa4c2ce5beba90c0791cf364c9423db8 100644 (file)
@@ -88,7 +88,7 @@ fi
 
 mkdir obj-shared
 cd obj-shared
-../configure --prefix=%{pref} --with-motif --with-odbc --with-opengl
+../configure --prefix=%{pref} --with-motif --with-opengl
 $MAKE
 
 cd contrib/src
@@ -97,7 +97,7 @@ cd ../../..
 
 mkdir obj-static
 cd obj-static
-../configure --prefix=%{pref} --with-motif --disable-shared --with-odbc --with-opengl 
+../configure --prefix=%{pref} --with-motif --disable-shared --with-opengl
 $MAKE
 cd ..
 
@@ -261,9 +261,6 @@ wx/url.h
 wx/unix/gsockunx.h
 wx/xml/xml.h
 wx/xtixml.h
-wx/db.h
-wx/dbkeyg.h
-wx/dbtable.h
 EOF
 # --- wxBase headers list ends here ---
 for f in `cat wxbase-headers-list` ; do
@@ -334,7 +331,6 @@ rm -f %{_bindir}/%{wxconfiglink}
 %doc COPYING.LIB *.txt
 %{_libdir}/libwx_%{portname}*_adv-%{ver2}.so.*
 %{_libdir}/libwx_%{portname}*_core-%{ver2}.so.*
-%{_libdir}/libwx_%{portname}*_dbgrid-%{ver2}.so.*
 %{_libdir}/libwx_%{portname}*_html-%{ver2}.so.*
 %{_libdir}/libwx_%{portname}*_media-%{ver2}.so.*
 %{_libdir}/libwx_%{portname}*_qa-%{ver2}.so.*
@@ -345,7 +341,6 @@ rm -f %{_bindir}/%{wxconfiglink}
 %defattr(-,root,root)
 %{_libdir}/libwx_%{portname}*_adv-%{ver2}.so
 %{_libdir}/libwx_%{portname}*_core-%{ver2}.so
-%{_libdir}/libwx_%{portname}*_dbgrid-%{ver2}.so
 %{_libdir}/libwx_%{portname}*_gl-%{ver2}.so
 %{_libdir}/libwx_%{portname}*_html-%{ver2}.so
 %{_libdir}/libwx_%{portname}*_media-%{ver2}.so
index 7fca7608c083734bf9c35a83ef36449af7990ac7..d18ab2000997c634d26a581371a14f80833b0a51 100644 (file)
@@ -105,9 +105,8 @@ cd obj-shared
 %if %{unicode}
                               --enable-unicode \
 %else
-                              --with-odbc \
+                              --disable-unicode \
 %endif
-                              --with-opengl
 $MAKE
 
 cd contrib/src
@@ -120,7 +119,7 @@ cd obj-static
 %if %{unicode}
                               --enable-unicode \
 %else
-                              --with-odbc \
+                              --disable-unicode \
 %endif
                               --with-opengl
 $MAKE
@@ -286,9 +285,6 @@ wx/url.h
 wx/unix/gsockunx.h
 wx/xml/xml.h
 wx/xtixml.h
-wx/db.h
-wx/dbkeyg.h
-wx/dbtable.h
 EOF
 # --- wxBase headers list ends here ---
 for f in `cat wxbase-headers-list` ; do
@@ -362,9 +358,6 @@ rm -f %{_bindir}/%{wxconfiglink}
 %doc COPYING.LIB *.txt
 %{_libdir}/libwx_%{portname}*_adv-%{ver2}.so.*
 %{_libdir}/libwx_%{portname}*_core-%{ver2}.so.*
-%if !%{unicode}
-    %{_libdir}/libwx_%{portname}*_dbgrid-%{ver2}.so.*
-%endif
 %{_libdir}/libwx_%{portname}*_html-%{ver2}.so.*
 %{_libdir}/libwx_%{portname}*_media-%{ver2}.so.*
 %{_libdir}/libwx_%{portname}*_qa-%{ver2}.so.*
@@ -375,9 +368,6 @@ rm -f %{_bindir}/%{wxconfiglink}
 %defattr(-,root,root)
 %{_libdir}/libwx_%{portname}*_adv-%{ver2}.so
 %{_libdir}/libwx_%{portname}*_core-%{ver2}.so
-%if !%{unicode}
-    %{_libdir}/libwx_%{portname}*_dbgrid-%{ver2}.so
-%endif
 %{_libdir}/libwx_%{portname}*_gl-%{ver2}.so
 %{_libdir}/libwx_%{portname}*_html-%{ver2}.so
 %{_libdir}/libwx_%{portname}*_media-%{ver2}.so