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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 65a6c2b17214c8bae2c7b6a72689bcc8bf0a1cf8..95bba3811a8dbc4717c40d2afb5d656c7b1cfa39 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -848,6 +848,14 @@
 #   endif
 #endif /* !defined(wxUSE_REARRANGECTRL) */
 
 #   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."
 #ifndef wxUSE_SASH
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_SASH must be defined."

diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index 2f0de038d4e020c17f24ec79ad2bc114ca3e8a3b..37aa22eb2adec3a248c63bfd188f9183de44a61e 100644 (file)
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -615,6 +615,13 @@
 // Recommended setting: 1
 #define wxUSE_AUI       1
 
 // 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
 // Use wxPropertyGrid.
 //
 // Default is 1

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index 6eb0590be0bb62638cb0fb02336facdb361ca582..f13813b5744c4d4a81fbe4b37065d8ea265b181e 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -615,6 +615,13 @@
 // Recommended setting: 1
 #define wxUSE_AUI       1
 
 // 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
 // Use wxPropertyGrid.
 //
 // Default is 1

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index 0ee07b3d5145f31f64e56225ed6f2c0c006bc321..cc24179174a9baa53cdf9de96623f4845b3aa0fa 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -611,6 +611,13 @@
 // Recommended setting: 1
 #define wxUSE_AUI       1
 
 // 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
 // Use wxPropertyGrid.
 //
 // Default is 1

diff --git a/setup.h.in b/setup.h.in
index 10eb975c5d092fc642dffaefe3ae5b8110f4eee3..117d7b5542817ff915c1a0de0418bdf45003e312 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -308,7 +308,7 @@
 
 #define wxUSE_AUI       0
 
 
 #define wxUSE_AUI       0
 

-#define wxUSE_RIBBON  0
+#define wxUSE_RIBBON    0

 
 #define wxUSE_PROPGRID  0
 
 
 #define wxUSE_PROPGRID  0