From 452935628ae02d118e3f1d81712d8679eb64a876 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 3 Aug 2003 20:48:09 +0000 Subject: [PATCH] added wxDbGrid git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 168 +++++++++++++++++++++++++++---------- build/bakefiles/common.bkl | 3 + configure | 5 +- configure.in | 5 +- docs/latex/wx/libs.dia | Bin 1422 -> 1640 bytes docs/latex/wx/libs.gif | Bin 5251 -> 6176 bytes docs/latex/wx/libs.tex | 15 ++-- 7 files changed, 141 insertions(+), 55 deletions(-) diff --git a/Makefile.in b/Makefile.in index fcf8827ef2..e3fd78bbb4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -228,9 +228,9 @@ ALL_HEADERS = \ wx/xml/xml.h \ $(OPENGL_HDR) \ wx/db.h \ - wx/dbgrid.h \ wx/dbkeyg.h \ - wx/dbtable.h + wx/dbtable.h \ + wx/dbgrid.h BASEDLL_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ @@ -391,6 +391,18 @@ CORELIB_OBJECTS = \ corelib_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5) \ $(__CORE_SRC_OBJECTS_3) +DBGRIDDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + -DWXUSINGDLL -DWXMAKINGDLL_DBGRID $(CXXFLAGS) $(PIC_FLAG) +DBGRIDDLL_OBJECTS = \ + dbgriddll_dbgrid.o +DBGRIDLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ + -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ + $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ + $(CXXFLAGS) +DBGRIDLIB_OBJECTS = \ + dbgridlib_dbgrid.o GLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ @@ -660,7 +672,6 @@ ODBCDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(CXXFLAGS) $(PIC_FLAG) ODBCDLL_OBJECTS = \ odbcdll_db.o \ - odbcdll_dbgrid.o \ odbcdll_dbtable.o ODBCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ @@ -668,7 +679,6 @@ ODBCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(CXXFLAGS) ODBCLIB_OBJECTS = \ odbclib_db.o \ - odbclib_dbgrid.o \ odbclib_dbtable.o WXEXPAT_CFLAGS = $(CPPFLAGS) -I./src/expat $(CFLAGS) WXEXPAT_OBJECTS = \ @@ -5359,8 +5369,8 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_winpars.o \ monodll_htmllbox.o \ monodll_db.o \ - monodll_dbgrid.o \ - monodll_dbtable.o + monodll_dbtable.o \ + monodll_dbgrid.o @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS) COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ $(__CORE_SRC_OBJECTS_1) \ @@ -5399,8 +5409,8 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_winpars.o \ monolib_htmllbox.o \ monolib_db.o \ - monolib_dbgrid.o \ - monolib_dbtable.o + monolib_dbtable.o \ + monolib_dbgrid.o @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS_1 = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1) @COND_TOOLKIT_COCOA@__NET_MACOSX_SRC_OBJECTS = monodll_gsocket.o @COND_TOOLKIT_GTK@__NET_MACOSX_SRC_OBJECTS = monodll_gsocket.o @@ -5586,6 +5596,44 @@ COND_USE_SOVERSOLARIS_1___coredll___soname_flags = \ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \ $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__corelib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname) +COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname = \ + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_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_PLATFORM_WIN32_1___dbgriddll___importlib = \ + -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_PLATFORM_WIN32_1@__dbgriddll___importlib = $(COND_PLATFORM_WIN32_1___dbgriddll___importlib) +COND_PLATFORM_MACOSX_1___dbgriddll___macinstnamecmd = -install_name \ + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) +@COND_PLATFORM_MACOSX_1@__dbgriddll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___dbgriddll___macinstnamecmd) +COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) +@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 \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(LN_S) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ + libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_USE_SOSYMLINKS_1@__dbgriddll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_inst_cmd) +COND_USE_SOVERLINUX_1___dbgriddll___soname_flags = \ + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_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)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) +@COND_USE_SOVERSOLARIS_1@__dbgriddll___soname_flags = $(COND_USE_SOVERSOLARIS_1___dbgriddll___soname_flags) +COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgridlib___depname = \ + $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a +@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_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__gldll___depname = $(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname) @@ -5673,6 +5721,10 @@ COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname = \ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_coredll @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__install_corelib___depname \ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_corelib +@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_0_USE_GUI_1_USE_ODBC_1@__install_dbgridlib___depname \ +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ = install_dbgridlib @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__install_gldll___depname \ @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ = install_gldll @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__install_gllib___depname \ @@ -5781,42 +5833,42 @@ COND_MONOLITHIC_0_SHARED_0___netlib___depname = \ $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a @COND_MONOLITHIC_0_SHARED_0@__netlib___depname = $(COND_MONOLITHIC_0_SHARED_0___netlib___depname) COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___odbcdll___depname = \ - $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__odbcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___odbcdll___depname) COND_PLATFORM_WIN32_1___odbcdll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_PLATFORM_WIN32_1@__odbcdll___importlib = $(COND_PLATFORM_WIN32_1___odbcdll___importlib) COND_PLATFORM_MACOSX_1___odbcdll___macinstnamecmd = -install_name \ - $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @COND_PLATFORM_MACOSX_1@__odbcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___odbcdll___macinstnamecmd) COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ + libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) @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 \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \ + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \ $(LN_S) \ - $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \ + libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_USE_SOSYMLINKS_1@__odbcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___odbcdll___soname_flags = \ - $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_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)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__odbcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___odbcdll___soname_flags) COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___odbclib___depname = \ - $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a + $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__odbclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___odbclib___depname) @COND_WXUSE_EXPAT_BUILTIN@__wxexpat___depname = \ @COND_WXUSE_EXPAT_BUILTIN@ $(LIBDIRNAME)/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a @@ -5886,7 +5938,7 @@ COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \ ### Targets: ### -all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__macos_res___depname) +all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__macos_res___depname) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @@ -6662,10 +6714,14 @@ clean: rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a - rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) + rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) @@ -10787,6 +10843,21 @@ corelib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp @COND_USE_GUI_1@corelib_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(SHARED_LD_CXX) $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__dbgriddll___macinstnamecmd) $(__dbgriddll___importlib) $(__dbgriddll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(__dbgriddll___so_symlinks_cmd) + +dbgriddll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp + $(CXXC) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $< + +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a: $(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) rcu $@ $(DBGRIDLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(RANLIB) $@ + +dbgridlib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp + $(CXXC) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $< + distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh @@ -10971,7 +11042,7 @@ htmllib_m_tables.o: $(srcdir)/src/html/m_tables.cpp htmllib_winpars.o: $(srcdir)/src/html/winpars.cpp $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $< -install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___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_odbcdll___depname) $(__install_odbclib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig $(__macos_res_install___depname) +install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig $(__macos_res_install___depname) $(INSTALL_DIR) $(datadir)/aclocal (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(datadir)/aclocal) $(INSTALL_DIR) $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx @@ -10998,7 +11069,8 @@ install-strip: install $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) - $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) + $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @@ -11038,6 +11110,16 @@ install-wxconfig: @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(libdir) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a $(libdir) +@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) $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ (cd $(libdir) ; $(__dbgriddll___so_symlinks_inst_cmd)) + +@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) $(libdir) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a $(libdir) + @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@install_gldll: @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(libdir) @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) @@ -11080,13 +11162,13 @@ install-wxconfig: @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@install_odbcdll: @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ (cd $(libdir) ; $(__odbcdll___so_symlinks_inst_cmd)) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@install_odbclib: @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DIR) $(libdir) -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a $(libdir) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a $(libdir) @COND_WXUSE_EXPAT_BUILTIN@install_wxexpat: @COND_WXUSE_EXPAT_BUILTIN@ $(INSTALL_DIR) $(libdir) @@ -16270,20 +16352,17 @@ netlib_socket.o: $(srcdir)/src/common/socket.cpp netlib_url.o: $(srcdir)/src/common/url.cpp $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(SHARED_LD_CXX) $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__odbcdll___macinstnamecmd) $(__odbcdll___importlib) $(__odbcdll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(EXTRALIBS_ODBC) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(SHARED_LD_CXX) $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__odbcdll___macinstnamecmd) $(__odbcdll___importlib) $(__odbcdll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(EXTRALIBS_ODBC) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(__odbcdll___so_symlinks_cmd) odbcdll_db.o: $(srcdir)/src/common/db.cpp $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $< -odbcdll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp - $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $< - odbcdll_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a: $(ODBCLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a: $(ODBCLIB_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) rcu $@ $(ODBCLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(RANLIB) $@ @@ -16291,9 +16370,6 @@ odbcdll_dbtable.o: $(srcdir)/src/common/dbtable.cpp odbclib_db.o: $(srcdir)/src/common/db.cpp $(CXXC) -c -o $@ $(ODBCLIB_CXXFLAGS) $< -odbclib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp - $(CXXC) -c -o $@ $(ODBCLIB_CXXFLAGS) $< - odbclib_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(CXXC) -c -o $@ $(ODBCLIB_CXXFLAGS) $< @@ -16755,4 +16831,4 @@ xmllib_xml.o: $(srcdir)/src/xml/xml.cpp # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install install_advdll install_advlib install_basedll install_baselib install_coredll install_corelib install_gldll install_gllib install_htmldll install_htmllib install_monodll install_monolib install_netdll install_netlib install_odbcdll install_odbclib install_wxexpat install_wxjpeg install_wxodbc install_wxpng install_wxregex install_wxtiff install_wxzlib install_xmldll install_xmllib uninstall +.PHONY: all clean distclean install install_advdll install_advlib install_basedll install_baselib install_coredll install_corelib install_dbgriddll install_dbgridlib install_gldll install_gllib install_htmldll install_htmllib install_monodll install_monolib install_netdll install_netlib install_odbcdll install_odbclib install_wxexpat install_wxjpeg install_wxodbc install_wxpng install_wxregex install_wxtiff install_wxzlib install_xmldll install_xmllib uninstall diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 04be5918f5..9564da605f 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -134,6 +134,9 @@ $(mk.evalExpr(wxwin.mkLibName('odbc'))) + + $(mk.evalExpr(wxwin.mkLibName('dbgrid'))) + $(mk.evalExpr(wxwin.mkLibName('mono'))) diff --git a/configure b/configure index de2ca68616..22108e48a4 100755 --- a/configure +++ b/configure @@ -33425,8 +33425,9 @@ CORE_GUI_LIBS="adv core" if test "$wxUSE_XML" = "yes" ; then CORE_BASE_LIBS="xml $CORE_BASE_LIBS" fi -if test "$wxUSE_ODBC" = "yes" ; then - CORE_GUI_LIBS="odbc $CORE_GUI_LIBS" +if test "$wxUSE_ODBC" != "no" ; then + CORE_BASE_LIBS="odbc $CORE_BASE_LIBS" + CORE_GUI_LIBS="dbgrid $CORE_GUI_LIBS" fi if test "$wxUSE_HTML" = "yes" ; then CORE_GUI_LIBS="html $CORE_GUI_LIBS" diff --git a/configure.in b/configure.in index 8f6cc5104f..f93d7e9b0a 100644 --- a/configure.in +++ b/configure.in @@ -5402,8 +5402,9 @@ CORE_GUI_LIBS="adv core" if test "$wxUSE_XML" = "yes" ; then CORE_BASE_LIBS="xml $CORE_BASE_LIBS" fi -if test "$wxUSE_ODBC" = "yes" ; then - CORE_GUI_LIBS="odbc $CORE_GUI_LIBS" +if test "$wxUSE_ODBC" != "no" ; then + CORE_BASE_LIBS="odbc $CORE_BASE_LIBS" + CORE_GUI_LIBS="dbgrid $CORE_GUI_LIBS" fi if test "$wxUSE_HTML" = "yes" ; then CORE_GUI_LIBS="html $CORE_GUI_LIBS" diff --git a/docs/latex/wx/libs.dia b/docs/latex/wx/libs.dia index 5d84f29511d3e76d0339375b8bb8d6a499509256..94ff3ab55c0a70ea90e7dd2e300a8a4b8072ad7e 100644 GIT binary patch literal 1640 zcmV-u2ABCCiwFp8SS>#Q17~_=WG*oO8Mv?7KUsDUm6+bhogO#G4TP*vLu*oGCqjdicgIhoBzE?;!Wh2 zBj#}!CxdGiPK~!$#g8#Me?Pi6w%*m6t$A|mWwnme0BqTAU9nZi<*%hF1xvIzfBVsX zD^6K{pmhFh#gau3m97%bLU9=uaxKeJy^2{UUcyeiB%OE((#v(6WC;th($g%CL(U@M zEK4?A)m1uYA>5A#0bx}KS3#D=bx~ZgFs%w>bT6IM&ay}XzabG1Ox01_z|WSKH|;M@ zIM}s!a2=$jf*Z!K< z@$HP8$R1iq`Of8jX0zMenP)6ognaLc&>=>cP6)gV38GZhEf4wXavmqqE&a9+vG7$S zc?u&rT3(hsSS+)LNI|wT6=gi(aef0UwWCet;5S)AMjx0SMv&Zb;r{H~n+ulm7BO7K z(f&mF;oyp`f^auAR&f-kYc_|ROtW2{#*mR>$ftOd1aMy!XRKk)P2?(9`1(9|hD6mv zp)P8ahFScmdVwOeh*tb|!g#bE5o%w8RZ8%$KfZlE zsS@lWH_s#w*~*#pVyo~G#;~;+10yO>jht>M100IG;Z7_xHcdRl7E)f&lXFI!U?rqs zYpxHxV$%5NU$bb={gWaNEUFvEX#Dz_L#p4YHgA9$5HMHo$ECDU`h!jiI(_K(bC8>Q zLb*}KS7OyP7YhYaqodAmy`q0|MNjk1=OHnp%U7fLpwvob&2+9*M!y@tX`m9m> zrBJH|EU`NZZMEa6e4)qObHbc`A3&r%fQ|@UM;k&e^16i(IP`=FrFm0KN(gz~NZdBz zO8a6xFRxhQemS+Scx;QzBquIz-8SO3oICsk>Xrbshq$99>T0OXcB{@zklfan+2>Sd zokvUC@sm|%PZwoSGO3A&Zbx+)+~tc+4pe1|XnyE*RFhi-+E-+iiu@bTPN^hA??sEW zJb{9IY)^^ymNQ#m+SYiqD0<@t|>Rsg?^+xTd1(bpQrU$%SNtQ zq@}U|d$D98Rqt4P|5*vZj#S0C+*tx%1x>gbE8a5cei&wh37NI4&IHMA{SK4oB-*iA zvp9A{wO58X?Nz%RTiW}!N-gYl)EHw#1iIj*cvNie)B4fyszlmkwQ5m>K@7-^J;t6B z#=J*E?CBa~ti6rP5&I@6_s+GKTVAN%IAR%YwV@pCH2nEaoT z_gFpF-t0s~D~`#2Pr_qSMnFM|jgi#Kkyfk=VjFoK{c%&PfF-4wXbOf`T$(@6z9hj( zZIiSSHbr_8^<;Xbtq1FU zy?*j~P4(-w-C6%Ehn)6~FDR$oLe7C?Eu^V8@sM5krkyQQJ&3l^UcVUSiiNCWc1Po( mV-L9h9B@iIIfy>uiZ{hS4=Im*@t;M`-~0=8y_~+NNdN$bvM|X2 literal 1422 zcmV;91#$WxiwFP!000001MOQ~Z`(E$eebU@lvkS)Maj16I7QQ9+e5n!SPSeepe@GM zCW{6|$MH*l`>sCx8A%}(1;{2DNFe)~hgami=N?k@^@qn**n40i4tO**FtUsui{{)9 zqQ%ts@%@*<*!Xbs?%EINd-z)jy6QoTC{Er@jir?9_olhsZc(_4spJBM!3M?5{7J)* zn(!slxH)a@Q%SQAsFWg@Z6xbObj7B|jL!dA2)>E@yv3Y{T=X7jI5n>B)0bi1T$^WY zi=ozZ&BOs^wdQdEHo040*e=^8|8r9emS}Nv_0hS?y39XN>R+y?SOifHB^U~`+py8t zwr$nBm^FeDHi9A=K?&l!H5XFQK;}p@&O=6{3`~j&Q-zA>G=%wh;t*B^xDTY{MPA&~ zFfMe%JPRkaUKS$oO9Ju4blGYf_;PvoSpViSfL(onhae7SAv^dGM6xErP6?sb*lq%! z#bu*=YP@W@%&lgL>qql*ewl^T7SbIPIoR!y)_VDv@rf5~SDup4a>^;udnDhd>$MYLjvL1WQol{-|2>dYf6 z)MW^)%Mb$>lCSTokAD?I02t{zFc*`73S=?T&FeCj&~~z82^E(3#6_!EV&EXp?GM!h z;6KX}pV^v4J}l>U1sq{(bA+8#=^<)FMPy(E*%J%|L6ji{$lBDW=N#0qSTb@X2m%BGG`{?xx1^Du(}?70 zaqAteQ^VO0VL=m|H?hu}xF^c~q~8V#FVRk_G4kNmA48xul2;zG9Kai);bbsGc5;oa zX3B30SGx+VQh|T_{`E_%D)1NzlSuNA(|W1yXfp=RG8|hPqgP280GQ2&3yXSeS-6ie z@|xj{I?h&*hJ$cN8X0MP^dD$6XMU@Q!$PApoG>D8yXCv9%^RQwvNUgIA8?Nc3n^IW z!*V}Ka?5Q-$zS-YX-@YEDvcv#cZ&YaD0-r==y79;zB0>(wW~AM*oLf3Gm?q;EX}M; zf&==vp-j8Ye?PZt5zsZZn7dK=^MK# zeOt%f%0;o;>Dx@-{@S`Fv6Dq++m-FOhO%|?vBOPCTjwZk38Z!(lct32xvS-NyU0vX zwXG|&Z>h|VUaV_}uU45o-7Etk=UTYm$P;3~O17CspcyAFBFVL3RFRw`0kq^9>|_KS0oOx~ZKg`9(D$?> z3l*~Xt6h(?Tx2I<uiZtursE2xMcK7ThZ9AtJu{KT2y6Mvcr|87o=Gx*xhE*>)g#!V^IoWVErt z`>9P@*8$egA``b<>^k)c!)xewSZ;Py%bDz<9gR|7t$5E|)w1H8yQ;0)53sw^{HnT_ c=+|aPzc!nPA4i`5a`NWgznmJ&<%m8202aH_0RR91 diff --git a/docs/latex/wx/libs.gif b/docs/latex/wx/libs.gif index d9c154d9efebc7cd481f1a82510d9e29fd5becd2..51bc8e486da5430e8e23012ce3c87e42272fb856 100644 GIT binary patch delta 5451 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 B0gW6GRKv!>0PAS-$-sS~Hq zpFo2O9l8?0PLe%|DqYI7sndc)%ak)~ z&dGOc=gpu)?>*|7wCK~QBVtClI<@P~tqsP0O}lZwm$-B5&S<)}Z@ag53m>kr_wVCv zXP;D#ytz>3qn%4X3tg)5>DZ}OFMplA`_=7nKmL0kuN3@P@#ND3HP89F`u8>2uSE~P zzD)TP>D%AGT>nCg0-PXAbo>>l(rN(wlTRxW5NP0o4i3~nJpZ^8fk0Ha@{cN12$bN0 zFbEWaQ5~crP$@4Q0Kf+Vl_P`!G;EWXdl1(6kXR~E^G`E12$aqW*r=e6hkq7r;0;0h z0Aqnb4cw9sK~0o$Pb)vnXycXh^>&0UT!ezfK&LQ(%0LOa!v_-rWy6IC2_*OrD=6^s z&Oi!WRDhLO=6R!dW55vr40{a3iUO^WDbPI#2vkBK+SKFbKlU&}LM2Sr!M#K;q^F037Z62z-&n1*}hxPp~yZjI>f zN#nXUwwsu`@ERy@L-*F}TD}YMtM6(4CKT|$pbfk$y#&{1uxtn?{C^%x#6>LJyAIn2 zvBVg^MDau!yHs&ohaf^y$RmrKQpYWQjMfb}ki@dfEuSpwNEWGVRyhF(V2(&Q>&$b` zJEK&yNkiNG)g=~TA`;R7C>;{hPM=gXNmCn*)e#mUArjUAXdM#QUQ0c*NL5>16+8wE z5WoQxeuTE#Y=eY00e@?^P4w6ym2LL^Q>Op`#18MX=ea+11^|Ev^alWFO!R#8|9?zhy+qebPyO<>Gv0hq z{bT^ZGXgmSfCm0VRQ~ztuirjI?>iGf0P3^PeE8!xbqoL?Ajk&*fQ*RzFMtCXU;!a= zz@8{@e^e7+|9o->0KkDDZvX%uB2vK%4kUvcgh&T_0zwGVOo9`<$q4}Pi=Oxb04Rva z3V%V67se1GGk2o@S*IGK8)i+xbcQ3B?TXEXqH15>3>MQKvI$oq2wU{aY;iWvSW&j zP?nG~zr`&DccF9_cd&v=o3t{OkZIVZHa3)3(!`dqjE^jTf=ik7vMU$+BrR#|XeduD{3DF0Vn{xnvd_kBQ(WOx zNZBS-p$q*ZLmTRlK!ETEACRdEtH{DV8?w-*G?X#QX<|ALwo;OgEk`?I)sKQSB!T<_ z0KFiSBNQ-+kt)=mVTtIs7L!t;uF-KEK}b>yvVWy6c`i(b`^Qb)>7oCrFQNYdDlm;& zl$KJ*s6|EUMwB|%g7oQ6ffC4|3N?@)T@6!I$huOi z$$v!cGEF;F(mu8;q0RoAYOOL_={!`Tv&H5&8GGBZ6ce_&^`={D8_L)=F1Sw#4l@tQ zS_m2UcF1*#a+lk&=051T9E+|=8N14gVOJvGbqsgIV_gG<7b53P%XrUI-U3lKV~cHX zcUMc9_hKx*3|%iuQaa9D&P%@J4Qg|H3x6&G6L^;M^>4rQJIbvNn8AB9FoZ>!9{}fW zHQhJ@0ss)t1Rv(L3dYwo{m}wQ+@n7h-YO$A96K<84#GjE zQ9NJ;EqYOmTI<*pKMqGa;*pPlB&2_sA`1pt!X4}(hb52+40emslsddAjuOk^H>04C4^^&8F|pd70+HlB`Q*x>WeCf1U?AD1XBDX6llV#Kyali zOJlk=zY5l{igheiB|~#F!pwH| zzM!41W=q?_`L(ua`+M!iF6F>80e7Y(tnF`8+h*j>jJWlbZptXezWhA*f7OjJc$*8% z_8m^S%TsUdlF8rW!FRrQvu~oj8{qOpxOYf45{66U5QhNRnQ^PzOucL*7k`%s4ge_~ zJn^P3mWq{7rlz??c}| zT+fhxXyAMnc?JM7&=1p7Uhq{>JxvpECu(pO>h<}1sD1pQ=7jtNa1@n90 z^$7mL_Jm*P6Mz^of~bcCQHT6yez$W1{E%3nwTL(&iEfBm+r){4W{46(Aux7PGNw@g z&;_iJSS|u1GU8d{bBA7-U30;Qj5v!}ae4&-Q%d#^Gu34B^b9+YSXxFUk*JB0g^Nw7 zj4=U<&+%EEsDBX#(Nt{qW^RTmL68h?QYRL1CzD2qxA+vCn1$fQj2|Xe(r8wGa%gIm zXs99!ky9ydh>WKtj^@Zx(A6DfvuS3K;f%6qkADl9DI}SY|7McU2#K1Jk{=2F zUWPJO^HfiA<&kq?g4KqSDv6T_c{|@ID*#|n2!)A0sY+UyCop-21@U4Qg;6txi9#8P zASF_X7>S+;R`4$cN6@R&jdgUpc=2xB;SaoTbg^8GY zshC~a7LBMIF*y(rSy{DqYn2(4h*g%E=@yIW6`h$IpXrC3xtS@nns6AKZns?ZLYw2L zll16G%#@q5d6Z$8kIi_6;i8+ei6CBxhggD~Cx01y#tAOY*^-tQhs_zBiAkN%{)vX% zgq^7=UM_i%SOhPv$$#3JdePY{<+&S#wv|M|oZZ%O=^3B;IG^-+7v}|^_i3BO$({RY z7WrwP|EZaI<(~t}n9C`k2kIESDW1^;h6^fM)fAxX*_sEcoVQt_fVdf6hZgHbn+9qZ z9e=89)ma!IdP@qLi+$-3CkmnUm7?^uorck(1!|o!ik^!>qy1^4wB??)5Kb9m88r}5P=5weFc85PRCEW22-GI-bt;Qb{J3G&K+xzzr8L5JP|m_Rt7! zf(U-_50JnHNTMVjG6m$I3n3s7WDp5VSB&v=s;Qc(QJRcwDq0OH6lFt=Pj!v|V1Esa z#sUxc4+qd{ZW0bD@DDSf3~90^ZQ>!8avK711&yX>&?>E5x~4q(Vd2?_fys_<;*S52 z2^WzG0bAyewtryjq;y-O zV+*%hE4QzC9GXg;U7EJY(Y1}pw@kT&gu8!+3zroGaY{K`+)xA?b^=$)vgJ{%ld*A+ zOA#wz2#@xS=tZ_s>lEd1aw&Hu6Ge(od5ZtA3_xawfcv$gA#>Mh5MjAwp=t`A1G*6? zx@)TxJl8d~8<*Ai4^Sl#Pk$DIn8~7Eikl-L2=%ZHdC9yLb9NW8yR7tHGa*^BCYmtI z4rVX`6)*?n8@djYcNo!k2>Nz-`?d+=c#9`_tm&oYD7f_!dVk<~2!Hyty$P8A5_Xb>Z~#GIO1I~*=FSVwSpgB+K&OuRUWTf~cTgvwil2zx^P z8^&Th8Dc!75emcgD1XFnY@`ke$8&7I=x4!qOvfE8$9qhR{&{T2e>{?E9KC}~rG;F+ zhupRx`NWG1$W5`vkNm+YJjtp_wUTVfZ0p3DjJA#3$>nOopA5E_tt_XiOQ%s80^jft;V`L*bqlQWA*~Q1HHN~}%s6}briM(uVye!De7n9l zmI6@#0k{takWloHCAvmi)PUmEqTfW(Z2o|SZlxt#=Hg|;t$Y( z0?m9_s?s9?DQWD4L?)>lo|V@=jU+|_FR(-d0W)>o0piVW9-C)a09*IyA3 F06Uy+8o>Yn diff --git a/docs/latex/wx/libs.tex b/docs/latex/wx/libs.tex index 3dce5b94df..dc13522de5 100644 --- a/docs/latex/wx/libs.tex +++ b/docs/latex/wx/libs.tex @@ -48,11 +48,6 @@ is not recommended, it is only meant for use by XML resources system. Future versions of wxWindows will contain new XML handling classes with DOM-like API. Requires wxBase. -{\large {\bf wxODBC}} - -\helpref{Database classes}{odbcoverview}. Requires -wxBase, wxCore and wxAdvanced. - {\large {\bf wxCore}} Basic GUI classes such as GDI classes or controls are in this library. All @@ -95,3 +90,13 @@ contained in this library, as well as \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller}, \helpref{wxBestHelpController}{wxhelpcontroller} and \helpref{wxHtmlListBox}{wxhtmllistbox}. Requires wxCore and wxBase. + +{\large {\bf wxODBC}} + +\helpref{Database classes}{odbcoverview}. Requires wxBase. + +{\large {\bf wxDbGrid}} + +\helpref{wxDbGridTableBase}{wxdbgridtablebase} class which combines +\helpref{wxGrid}{wxgrid} and \helpref{wxDbTable}{wxdbtable}. +Requires wxODBC and wxAdvanced. -- 2.47.2