Add wxUSE_RIBBON to wx/setup_inc.h and wx/chkconf.h.

wxUSE_RIBBON was apparently added to the different wx/*/setup.h files manually
instead of being added to wx/setup_inc.h and regenerating the rest, correct it.

Also check that it is defined in wx/chkconf.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-09-18 22:16:59 +00:00
parent 7b8d24ad99
commit 11c2b0413a
5 changed files with 30 additions and 1 deletions

View File

@@ -848,6 +848,14 @@
# endif
#endif /* !defined(wxUSE_REARRANGECTRL) */
#ifndef wxUSE_RIBBON
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_RIBBON must be defined."
# else
# define wxUSE_RIBBON 0
# endif
#endif /* !defined(wxUSE_RIBBON) */
#ifndef wxUSE_SASH
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_SASH must be defined."

View File

@@ -615,6 +615,13 @@
// Recommended setting: 1
#define wxUSE_AUI 1
// Use wxWidget's Ribbon classes for interfaces
//
// Default is 1
//
// Recommended setting: 1
#define wxUSE_RIBBON 1
// Use wxPropertyGrid.
//
// Default is 1

View File

@@ -615,6 +615,13 @@
// Recommended setting: 1
#define wxUSE_AUI 1
// Use wxWidget's Ribbon classes for interfaces
//
// Default is 1
//
// Recommended setting: 1
#define wxUSE_RIBBON 1
// Use wxPropertyGrid.
//
// Default is 1

View File

@@ -611,6 +611,13 @@
// Recommended setting: 1
#define wxUSE_AUI 1
// Use wxWidget's Ribbon classes for interfaces
//
// Default is 1
//
// Recommended setting: 1
#define wxUSE_RIBBON 1
// Use wxPropertyGrid.
//
// Default is 1

View File

@@ -308,7 +308,7 @@
#define wxUSE_AUI 0
#define wxUSE_RIBBON 0
#define wxUSE_RIBBON 0
#define wxUSE_PROPGRID 0