Disabled ODBC code by default,

Move isql.h and isqlext.h to /include/wx


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

Makefile.in

@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 19:55, 2000/01/27
+# This file was automatically generated by tmake at 18:29, 2000/01/29
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -279,6 +279,8 @@ WX_HEADERS = \
 		intl.h \
 		ioswrap.h \
 		ipcbase.h \
+		isql.h \
+		isqlext.h \
 		joystick.h \
 		layout.h \
 		laywin.h \
@@ -677,8 +679,6 @@ UNIX_HEADERS = \
 		unix/execute.h \
 		unix/fontutil.h \
 		unix/gsockunx.h \
-		unix/isql.h \
-		unix/isqlext.h \
 		unix/mimetype.h
 
 GENERIC_HEADERS = \

configure.in

@@ -764,7 +764,7 @@ else
   DEFAULT_wxUSE_LIBPNG=yes
   DEFAULT_wxUSE_LIBJPEG=yes
   DEFAULT_wxUSE_LIBTIFF=yes
-  DEFAULT_wxUSE_ODBC=yes
+  DEFAULT_wxUSE_ODBC=no
 
   DEFAULT_wxUSE_STD_IOSTREAM=no
   DEFAULT_wxUSE_FILE=yes
@@ -3305,6 +3305,7 @@ AC_OUTPUT([
             Makefile
             demos/Makefile
             demos/bombs/Makefile
+            demos/dbbrowse/Makefile
             demos/forty/Makefile
             demos/fractal/Makefile
             demos/life/Makefile

demos/dbbrowse/Makefile.in

@@ -0,0 +1,23 @@
+#
+# File:		Makefile.in
+# Author:	Julian Smart
+# Created:	1998
+# Updated:	
+# Copyright:	(c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for bombs example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+program_dir = demos/dbbrowse
+
+PROGRAM=dbbrowser
+
+
+OBJECTS= dbbrowser.o doc.o pgmctrl.o wxtbpgwin.o \
+         browserdb.o dbtree.o dbgrid.o  dlguser.o
+         
+include ../../src/makeprog.env
+

distrib/msw/tmake/filelist.txt

@@ -622,6 +622,8 @@ imaglist.h	W
 intl.h	W	B
 ioswrap.h	W	B
 ipcbase.h	W
+isql.h	W
+isqlext.h	W
 joystick.h	W
 layout.h	W
 laywin.h	W
@@ -1040,8 +1042,6 @@ fontutil.h	S
 execute.h	S
 mimetype.h	S	B
 gsockunx.h	S
-isql.h	S
-isqlext.h	S
 
 file.h	P
 ftp.h	P

include/wx/db.h

@@ -49,10 +49,12 @@
 	#endif
 #endif
 
+#include "wx/setup.h"
+
 #if wxMAJOR_VERSION == 2
 	extern "C" {
-	#include "wx/unix/isql.h"
+	#include "wx/isql.h"
-	#include "wx/unix/isqlext.h"
+	#include "wx/isqlext.h"
 	}
 #else  // version == 1
 	extern "C" {