merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -149,7 +149,11 @@
 | 
			
		||||
                                  // since you may well need to output
 | 
			
		||||
                                  // an error log in a production
 | 
			
		||||
                                  // version (or non-debugging beta)
 | 
			
		||||
#if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
 | 
			
		||||
#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
 | 
			
		||||
#else
 | 
			
		||||
#define wxUSE_GLOBAL_MEMORY_OPERATORS 1
 | 
			
		||||
#endif
 | 
			
		||||
                                  // In debug mode, cause new and delete to be redefined globally.
 | 
			
		||||
                                  // If this causes problems (e.g. link errors), set this to 0.
 | 
			
		||||
 | 
			
		||||
@@ -167,13 +171,23 @@
 | 
			
		||||
#define wxUSE_ODBC                1
 | 
			
		||||
                                  // Define 1 to use ODBC classes
 | 
			
		||||
 | 
			
		||||
#define wxODBC_FWD_ONLY_CURSORS   1
 | 
			
		||||
                                  // Some databases/ODBC drivers only allow forward scrolling cursors.
 | 
			
		||||
                                  // Unless you specifically want to use backward scrolling
 | 
			
		||||
                                  // cursors, and you know that all of the databases/ODBC drivers
 | 
			
		||||
                                  // that you will use these odbc classes with allow backward
 | 
			
		||||
                                  // scrolling cursors, this setting should remain set to 1
 | 
			
		||||
                                  // for maximum database/driver compatibilty
 | 
			
		||||
#define wxODBC_FWD_ONLY_CURSORS	1
 | 
			
		||||
                                  // 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::GetDbConnection() to indicate whether the connection
 | 
			
		||||
                                  // (and any wxTable()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_BACKWARD_COMPATABILITY 0
 | 
			
		||||
                                  // Default is 0.  Set to 1 to use the deprecated classes, enum
 | 
			
		||||
                                  // types, function, member variables.  With a setting of 1, full
 | 
			
		||||
                                  // backward compatability 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 wxUSE_IOSTREAMH     1
 | 
			
		||||
                                  // VC++ 4.2 and above allows <iostream> and <iostream.h>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user