merged in the commit from the 2.2 branch

[wxWidgets.git] / include / wx / gtk / setup0.h

diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h
index 0d805c59488479fb84f7c10e0fb3661836652153..cca48903c0728ed27ae88ff4a15e7fd27a06573d 100644 (file)
--- a/include/wx/gtk/setup0.h
+++ b/include/wx/gtk/setup0.h
@@ -114,6 +114,7 @@
  * Use iODBC
  */
 #define wxUSE_ODBC 0
+#define wxODBC_FWD_ONLY_CURSORS 1
 /*
  * Use Threads
  */
@@ -343,7 +344,7 @@
  * Use standard C++ streams if 1. If 0, use wxWin
  * streams implementation.
  */
-#define wxUSE_STD_IOSTREAM  1
+#define wxUSE_STD_IOSTREAM  0
 /*
  * wxLibrary class
  */