From: Paul Cornett <paulcor@bullseye.com>
Date: Thu, 1 Apr 2010 17:16:57 +0000 (+0000)
Subject: move everything inside wxUSE_RIBBON wrapper
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4cf018e14ea61679b99874765f232b2032b3d3f8

move everything inside wxUSE_RIBBON wrapper


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

diff --git a/src/ribbon/art_aui.cpp b/src/ribbon/art_aui.cpp
index 1847f583c1..0e452bdd6b 100644
--- a/src/ribbon/art_aui.cpp
+++ b/src/ribbon/art_aui.cpp
@@ -15,12 +15,9 @@
     #pragma hdrstop
 #endif
 
-#include "wx/dc.h"
-#include "wx/settings.h"
-#include "wx/ribbon/art.h"
-
 #if wxUSE_RIBBON
 
+#include "wx/ribbon/art.h"
 #include "wx/ribbon/art_internal.h"
 #include "wx/ribbon/bar.h"
 #include "wx/ribbon/buttonbar.h"
@@ -28,6 +25,8 @@
 #include "wx/ribbon/toolbar.h"
 
 #ifndef WX_PRECOMP
+#include "wx/dc.h"
+#include "wx/settings.h"
 #endif
 
 #ifdef __WXMSW__
diff --git a/src/ribbon/art_internal.cpp b/src/ribbon/art_internal.cpp
index 7f90889eb6..0e641024ec 100644
--- a/src/ribbon/art_internal.cpp
+++ b/src/ribbon/art_internal.cpp
@@ -15,17 +15,16 @@
     #pragma hdrstop
 #endif
 
-#include "wx/dc.h"
-#include "wx/ribbon/art.h"
-
 #if wxUSE_RIBBON
 
+#include "wx/ribbon/art.h"
 #include "wx/ribbon/art_internal.h"
 #include "wx/ribbon/bar.h"
 #include "wx/ribbon/buttonbar.h"
 #include "wx/ribbon/gallery.h"
 
 #ifndef WX_PRECOMP
+#include "wx/dc.h"
 #endif
 
 #ifdef __WXMSW__
diff --git a/src/ribbon/art_msw.cpp b/src/ribbon/art_msw.cpp
index 3b147d8fa9..3d42946d52 100644
--- a/src/ribbon/art_msw.cpp
+++ b/src/ribbon/art_msw.cpp
@@ -15,11 +15,9 @@
     #pragma hdrstop
 #endif
 
-#include "wx/dcmemory.h"
-#include "wx/ribbon/art.h"
-
 #if wxUSE_RIBBON
 
+#include "wx/ribbon/art.h"
 #include "wx/ribbon/art_internal.h"
 #include "wx/ribbon/bar.h"
 #include "wx/ribbon/buttonbar.h"
@@ -27,6 +25,7 @@
 #include "wx/ribbon/toolbar.h"
 
 #ifndef WX_PRECOMP
+#include "wx/dcmemory.h"
 #endif
 
 #ifdef __WXMSW__
diff --git a/src/ribbon/bar.cpp b/src/ribbon/bar.cpp
index 5e469b427a..e8f6d4fe26 100644
--- a/src/ribbon/bar.cpp
+++ b/src/ribbon/bar.cpp
@@ -15,10 +15,9 @@
     #pragma hdrstop
 #endif
 
-#include "wx/ribbon/bar.h"
-
 #if wxUSE_RIBBON
 
+#include "wx/ribbon/bar.h"
 #include "wx/ribbon/art.h"
 #include "wx/dcbuffer.h"
 
diff --git a/src/ribbon/buttonbar.cpp b/src/ribbon/buttonbar.cpp
index cfc8fe0931..3262c3b257 100644
--- a/src/ribbon/buttonbar.cpp
+++ b/src/ribbon/buttonbar.cpp
@@ -15,10 +15,9 @@
     #pragma hdrstop
 #endif
 
-#include "wx/ribbon/buttonbar.h"
-
 #if wxUSE_RIBBON
 
+#include "wx/ribbon/buttonbar.h"
 #include "wx/ribbon/art.h"
 #include "wx/dcbuffer.h"
 
diff --git a/src/ribbon/control.cpp b/src/ribbon/control.cpp
index a963a6c4c1..beb97ab70a 100644
--- a/src/ribbon/control.cpp
+++ b/src/ribbon/control.cpp
@@ -8,16 +8,17 @@
 // Copyright:   (C) Peter Cawley
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
+
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
-#include "wx/ribbon/control.h"
-
 #if wxUSE_RIBBON
 
+#include "wx/ribbon/control.h"
+
 #ifndef WX_PRECOMP
 #endif
 
diff --git a/src/ribbon/gallery.cpp b/src/ribbon/gallery.cpp
index 0a1aa02d03..6fc52d0df9 100644
--- a/src/ribbon/gallery.cpp
+++ b/src/ribbon/gallery.cpp
@@ -15,10 +15,9 @@
     #pragma hdrstop
 #endif
 
-#include "wx/ribbon/gallery.h"
-
 #if wxUSE_RIBBON
 
+#include "wx/ribbon/gallery.h"
 #include "wx/ribbon/art.h"
 #include "wx/ribbon/bar.h"
 #include "wx/dcbuffer.h"
diff --git a/src/ribbon/page.cpp b/src/ribbon/page.cpp
index 5e7562f4a0..dd6e2a11ef 100644
--- a/src/ribbon/page.cpp
+++ b/src/ribbon/page.cpp
@@ -14,10 +14,9 @@
     #pragma hdrstop
 #endif
 
-#include "wx/ribbon/page.h"
-
 #if wxUSE_RIBBON
 
+#include "wx/ribbon/page.h"
 #include "wx/ribbon/art.h"
 #include "wx/ribbon/bar.h"
 #include "wx/dcbuffer.h"
diff --git a/src/ribbon/panel.cpp b/src/ribbon/panel.cpp
index 68a8d216e8..481b9a0597 100644
--- a/src/ribbon/panel.cpp
+++ b/src/ribbon/panel.cpp
@@ -8,22 +8,23 @@
 // Copyright:   (C) Peter Cawley
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
+
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
+#if wxUSE_RIBBON
+
+#include "wx/ribbon/panel.h"
 #include "wx/ribbon/art.h"
 #include "wx/ribbon/bar.h"
-#include "wx/ribbon/panel.h"
 #include "wx/dcbuffer.h"
 #include "wx/display.h"
-#include "wx/frame.h"
-
-#if wxUSE_RIBBON
 
 #ifndef WX_PRECOMP
+#include "wx/frame.h"
 #endif
 
 #ifdef __WXMSW__
diff --git a/src/ribbon/toolbar.cpp b/src/ribbon/toolbar.cpp
index 2267935054..9e8839bc92 100644
--- a/src/ribbon/toolbar.cpp
+++ b/src/ribbon/toolbar.cpp
@@ -15,10 +15,9 @@
     #pragma hdrstop
 #endif
 
-#include "wx/ribbon/toolbar.h"
-
 #if wxUSE_RIBBON
 
+#include "wx/ribbon/toolbar.h"
 #include "wx/ribbon/art.h"
 #include "wx/ribbon/bar.h"
 #include "wx/dcbuffer.h"