Removing vestiges of wxUSE_NEW_GRID
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -475,14 +475,6 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif /* !defined(wxUSE_MSGDLG) */
|
#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
|
#ifndef wxUSE_NOTEBOOK
|
||||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||||
# error "wxUSE_NOTEBOOK must be defined."
|
# error "wxUSE_NOTEBOOK must be defined."
|
||||||
@@ -834,7 +826,6 @@
|
|||||||
wxUSE_CHOICE || \
|
wxUSE_CHOICE || \
|
||||||
wxUSE_GAUGE || \
|
wxUSE_GAUGE || \
|
||||||
wxUSE_GRID || \
|
wxUSE_GRID || \
|
||||||
wxUSE_NEW_GRID || \
|
|
||||||
wxUSE_LISTBOX || \
|
wxUSE_LISTBOX || \
|
||||||
wxUSE_LISTCTRL || \
|
wxUSE_LISTCTRL || \
|
||||||
wxUSE_NOTEBOOK || \
|
wxUSE_NOTEBOOK || \
|
||||||
|
@@ -19,7 +19,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxUSE_ODBC
|
#if wxUSE_ODBC
|
||||||
#if wxUSE_NEW_GRID
|
#if wxUSE_GRID
|
||||||
|
|
||||||
#include "wx/log.h"
|
#include "wx/log.h"
|
||||||
#include "wx/dbtable.h"
|
#include "wx/dbtable.h"
|
||||||
@@ -175,7 +175,7 @@ private:
|
|||||||
bool m_rowmodified;
|
bool m_rowmodified;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // #if wxUSE_NEW_GRID
|
#endif // #if wxUSE_GRID
|
||||||
#endif // #if wxUSE_ODBC
|
#endif // #if wxUSE_ODBC
|
||||||
|
|
||||||
#endif // _WX_GENERIC_DBGRID_H_
|
#endif // _WX_GENERIC_DBGRID_H_
|
||||||
|
@@ -546,20 +546,12 @@
|
|||||||
// Recommended setting: 0 (use wxNotebook)
|
// Recommended setting: 0 (use wxNotebook)
|
||||||
#define wxUSE_TAB_DIALOG 0
|
#define wxUSE_TAB_DIALOG 0
|
||||||
|
|
||||||
// wxGrid class comes in two flavours: the original (pre wxWin 2.2) one and
|
// wxGrid class
|
||||||
// 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.
|
|
||||||
//
|
//
|
||||||
// Default is 1 for both options.
|
// Default is 1
|
||||||
//
|
//
|
||||||
// Recommended setting: 1 for wxUSE_NEW_GRID, 0 if you have an old code using
|
// Recommended setting: 1
|
||||||
// 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 1
|
#define wxUSE_GRID 1
|
||||||
#define wxUSE_NEW_GRID 1
|
|
||||||
|
|
||||||
// wxProperty[Value/Form/List] classes, used by Dialog Editor
|
// wxProperty[Value/Form/List] classes, used by Dialog Editor
|
||||||
#define wxUSE_PROPSHEET 0
|
#define wxUSE_PROPSHEET 0
|
||||||
@@ -1102,10 +1094,6 @@
|
|||||||
#undef wxUSE_ODBC
|
#undef wxUSE_ODBC
|
||||||
#define wxUSE_ODBC 0
|
#define wxUSE_ODBC 0
|
||||||
|
|
||||||
#undef wxUSE_NEW_GRID
|
|
||||||
#define wxUSE_NEW_GRID 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
|
#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
|
||||||
// BC++ 4.0 can't compile JPEG library
|
// BC++ 4.0 can't compile JPEG library
|
||||||
#undef wxUSE_LIBJPEG
|
#undef wxUSE_LIBJPEG
|
||||||
|
@@ -545,20 +545,13 @@
|
|||||||
// Recommended setting: 0 (use wxNotebook)
|
// Recommended setting: 0 (use wxNotebook)
|
||||||
#define wxUSE_TAB_DIALOG 0
|
#define wxUSE_TAB_DIALOG 0
|
||||||
|
|
||||||
// wxGrid class comes in two flavours: the original (pre wxWin 2.2) one and
|
// wxGrid class
|
||||||
// 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.
|
|
||||||
//
|
//
|
||||||
// Default is 1 for both options.
|
// Default is 1 for both options.
|
||||||
//
|
//
|
||||||
// Recommended setting: 1 for wxUSE_NEW_GRID, 0 if you have an old code using
|
// Recommended setting: 1
|
||||||
// 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 1
|
#define wxUSE_GRID 1
|
||||||
#define wxUSE_NEW_GRID 1
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// Miscellaneous GUI stuff
|
// Miscellaneous GUI stuff
|
||||||
@@ -1151,10 +1144,6 @@
|
|||||||
#undef wxUSE_ODBC
|
#undef wxUSE_ODBC
|
||||||
#define wxUSE_ODBC 0
|
#define wxUSE_ODBC 0
|
||||||
|
|
||||||
#undef wxUSE_NEW_GRID
|
|
||||||
#define wxUSE_NEW_GRID 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
|
#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
|
||||||
// BC++ 4.0 can't compile JPEG library
|
// BC++ 4.0 can't compile JPEG library
|
||||||
#undef wxUSE_LIBJPEG
|
#undef wxUSE_LIBJPEG
|
||||||
|
@@ -338,9 +338,6 @@
|
|||||||
#define wxUSE_OWNER_DRAWN 1
|
#define wxUSE_OWNER_DRAWN 1
|
||||||
// Owner-drawn menus and listboxes
|
// Owner-drawn menus and listboxes
|
||||||
|
|
||||||
#define wxUSE_NEW_GRID 1
|
|
||||||
// Define 1 to use the new drid classes
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Any platform
|
* Any platform
|
||||||
*
|
*
|
||||||
|
Reference in New Issue
Block a user