From 11c2b0413acb18377d6a641b76941b3e6f7e2475 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 18 Sep 2009 22:16:59 +0000
Subject: [PATCH] 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
---
 include/wx/chkconf.h         | 8 ++++++++
 include/wx/motif/setup0.h    | 7 +++++++
 include/wx/msw/wince/setup.h | 7 +++++++
 include/wx/setup_inc.h       | 7 +++++++
 setup.h.in                   | 2 +-
 5 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 65a6c2b172..95bba3811a 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -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."
diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index 2f0de038d4..37aa22eb2a 100644
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -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
diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index 6eb0590be0..f13813b574 100644
--- 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
 
+// Use wxWidget's Ribbon classes for interfaces
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_RIBBON    1
+
 // Use wxPropertyGrid.
 //
 // Default is 1
diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index 0ee07b3d51..cc24179174 100644
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -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
diff --git a/setup.h.in b/setup.h.in
index 10eb975c5d..117d7b5542 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -308,7 +308,7 @@
 
 #define wxUSE_AUI       0
 
-#define wxUSE_RIBBON  0
+#define wxUSE_RIBBON    0
 
 #define wxUSE_PROPGRID  0
 
-- 
2.45.2