Removing vestiges of wxUSE_NEW_GRID

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 644c7c7adad9c5771e1e108c39ec81c4e5d3c3e0..631c99b1af86ed7123f5b77f846398867d43b69d 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -475,14 +475,6 @@
 #   endif
 #endif /* !defined(wxUSE_MSGDLG) */
 
-#ifndef wxUSE_NEW_GRID
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_NEW_GRID must be defined."
-#   else
-#       define wxUSE_NEW_GRID 0
-#   endif
-#endif /* !defined(wxUSE_NEW_GRID) */
-
 #ifndef wxUSE_NOTEBOOK
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_NOTEBOOK must be defined."
@@ -834,7 +826,6 @@
     wxUSE_CHOICE || \
     wxUSE_GAUGE || \
     wxUSE_GRID || \
-    wxUSE_NEW_GRID || \
     wxUSE_LISTBOX || \
     wxUSE_LISTCTRL || \
     wxUSE_NOTEBOOK || \

diff --git a/include/wx/dbgrid.h b/include/wx/dbgrid.h
index e5c9fa6b08a55b6386f33fe2f56fcd473afad94e..dd10c6c39b6fcecfa63add5c5cd6de35b7a352b9 100644 (file)
--- a/include/wx/dbgrid.h
+++ b/include/wx/dbgrid.h
@@ -19,7 +19,7 @@
 #endif
 
 #if wxUSE_ODBC
-#if wxUSE_NEW_GRID
+#if wxUSE_GRID
 
 #include "wx/log.h"
 #include "wx/dbtable.h"
@@ -175,7 +175,7 @@ private:
     bool         m_rowmodified;
 };
 
-#endif  // #if wxUSE_NEW_GRID
+#endif  // #if wxUSE_GRID
 #endif  // #if wxUSE_ODBC
 
 #endif  // _WX_GENERIC_DBGRID_H_

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index f2bae0b7b7ea6a1db8a98d78004b114e4a461f24..fc96743177c7e24e4e4ba4be4c15f65e72ab3bc4 100644 (file)
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -546,20 +546,12 @@
 // 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.
+// Default is 1
 //
-// WIN16/BC++ resets wxUSE_NEW_GRID to 0 because it exceeds the data limit.
+// Recommended setting: 1
 #define wxUSE_GRID         1
-#define wxUSE_NEW_GRID     1
 
 // wxProperty[Value/Form/List] classes, used by Dialog Editor
 #define wxUSE_PROPSHEET    0
@@ -1102,10 +1094,6 @@
 #undef wxUSE_ODBC
 #define wxUSE_ODBC                0
 
-#undef wxUSE_NEW_GRID
-#define wxUSE_NEW_GRID            0
-#endif
-
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
 // BC++ 4.0 can't compile JPEG library
 #undef wxUSE_LIBJPEG

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 761624b7d1559c614f56c21f6e2b9bb037644074..5e3f78835c5d51a9f78a6d9d848776bede2f8291 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -545,20 +545,13 @@
 // 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.
+// Recommended setting: 1
 //
-// WIN16/BC++ resets wxUSE_NEW_GRID to 0 because it exceeds the data limit.
 #define wxUSE_GRID         1
-#define wxUSE_NEW_GRID     1
 
 // ----------------------------------------------------------------------------
 // Miscellaneous GUI stuff
@@ -1151,10 +1144,6 @@
 #undef wxUSE_ODBC
 #define wxUSE_ODBC                0
 
-#undef wxUSE_NEW_GRID
-#define wxUSE_NEW_GRID            0
-#endif
-
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
 // BC++ 4.0 can't compile JPEG library
 #undef wxUSE_LIBJPEG

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 59a5b1b189911a4016dd4dede37c4a7f589e769c..55898472b7dd4ef647c98f4398b32e8b6558ac0b 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -338,9 +338,6 @@
 #define wxUSE_OWNER_DRAWN             1
                                     // Owner-drawn menus and listboxes
 
-#define wxUSE_NEW_GRID 1
-                                // Define 1 to use the new drid classes
-
 /*
  * Any platform
  *