diff --git a/include/wx/mac/setup.h b/include/wx/mac/setup.h index bfb74aab4d..44e5cb73a8 100644 --- a/include/wx/mac/setup.h +++ b/include/wx/mac/setup.h @@ -262,17 +262,27 @@ // Set this to 0 if your compiler can't cope // with omission of prototype parameters. -#define wxUSE_ODBC 1 - // Define 1 to use ODBC classes +#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. diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 09d16421ef..0b36adfd73 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -505,6 +505,14 @@ // 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. + // ---------------------------------------------------------------------------- // other compiler (mis)features // ---------------------------------------------------------------------------- diff --git a/include/wx/os2/setup.h b/include/wx/os2/setup.h index 8ac9024a09..7404ddb6f3 100644 --- a/include/wx/os2/setup.h +++ b/include/wx/os2/setup.h @@ -167,13 +167,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 and diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index 8ac9024a09..7404ddb6f3 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -167,13 +167,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 and diff --git a/include/wx/stubs/setup.h b/include/wx/stubs/setup.h index b791618903..566b0d414d 100644 --- a/include/wx/stubs/setup.h +++ b/include/wx/stubs/setup.h @@ -103,13 +103,22 @@ // 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 + // 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 and diff --git a/setup.h.in b/setup.h.in index 78a1cc6ecd..654d4afcfe 100644 --- a/setup.h.in +++ b/setup.h.in @@ -141,6 +141,7 @@ */ #define wxUSE_ODBC 0 #define wxODBC_FWD_ONLY_CURSORS 1 +#define wxODBC_BACKWARD_COMPATABILITY 1 /* * Use Threads */ diff --git a/setup.h_vms b/setup.h_vms index 20faff8f5f..475c36a322 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -138,6 +138,7 @@ */ #define wxUSE_ODBC 0 #define wxODBC_FWD_ONLY_CURSORS 1 +#define wxODBC_BACKWARD_COMPATABILITY 1 /* * Use Threads */