diff --git a/include/wx/msw/setup_microwin.h b/include/wx/msw/setup_microwin.h index 21ea52e5ea..235cf162a1 100644 --- a/include/wx/msw/setup_microwin.h +++ b/include/wx/msw/setup_microwin.h @@ -522,20 +522,10 @@ // Recommended setting: 0 (use wxNotebook) #define wxUSE_TAB_DIALOG 0 -// wxGrid class comes in two flavours: the original (pre wxWin 2.2) one and -// the new, much imporved and enhanced version. The new version is backwards -// compatible with the old one and should be used whenever possible, i.e. if -// you set wxUSE_GRID to 1, set wxUSE_NEW_GRID to 1 too. +// wxGrid class +// Default is 1 // -// Default is 1 for both options. -// -// Recommended setting: 1 for wxUSE_NEW_GRID, 0 if you have an old code using -// wxGrid and 100% backwards compatibality (with all old wxGrid quirks) is -// essential. -// -// WIN16/BC++ resets wxUSE_NEW_GRID to 0 because it exceeds the data limit. #define wxUSE_GRID 0 -#define wxUSE_NEW_GRID 0 // wxProperty[Value/Form/List] classes, used by Dialog Editor #define wxUSE_PROPSHEET 0 diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 87934a5e36..5925084bd0 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -584,20 +584,10 @@ // Recommended setting: 0 (use wxNotebook) #define wxUSE_TAB_DIALOG 0 -// wxGrid class comes in two flavours: the original (pre wxWin 2.2) one and -// the new, much imporved and enhanced version. The new version is backwards -// compatible with the old one and should be used whenever possible, i.e. if -// you set wxUSE_GRID to 1, set wxUSE_NEW_GRID to 1 too. +// wxGrid class. // -// Default is 1 for both options. -// -// Recommended setting: 1 for wxUSE_NEW_GRID, 0 if you have an old code using -// wxGrid and 100% backwards compatibality (with all old wxGrid quirks) is -// essential. -// -// WIN16/BC++ resets wxUSE_NEW_GRID to 0 because it exceeds the data limit. +// Default is 1. #define wxUSE_GRID 1 -#define wxUSE_NEW_GRID 1 // wxProperty[Value/Form/List] classes, used by Dialog Editor #define wxUSE_PROPSHEET 1