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 1847f583c136d47753b09afac5968daccf8f46e8..0e452bdd6bbefa09a8c1d292692204c90f6c585e 100644 (file)
--- a/src/ribbon/art_aui.cpp
+++ b/src/ribbon/art_aui.cpp
@@ -15,12 +15,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/dc.h"
-#include "wx/settings.h"
-#include "wx/ribbon/art.h"
-

 #if wxUSE_RIBBON
 
 #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/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/ribbon/toolbar.h"
 
 #ifndef WX_PRECOMP

+#include "wx/dc.h"
+#include "wx/settings.h"

 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__

diff --git a/src/ribbon/art_internal.cpp b/src/ribbon/art_internal.cpp
index 7f90889eb6847720aea37e628ba1ccdb1d630a1d..0e641024ecac3c43676d5798ccf5dbc6d701a767 100644 (file)
--- a/src/ribbon/art_internal.cpp
+++ b/src/ribbon/art_internal.cpp
@@ -15,17 +15,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/dc.h"
-#include "wx/ribbon/art.h"
-

 #if wxUSE_RIBBON
 
 #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/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__
 #endif
 
 #ifdef __WXMSW__

diff --git a/src/ribbon/art_msw.cpp b/src/ribbon/art_msw.cpp
index 3b147d8fa9b11d57bdee539bedd6bf8b6f992dfd..3d42946d526c990d83e512be861da82eaf9e4888 100644 (file)
--- a/src/ribbon/art_msw.cpp
+++ b/src/ribbon/art_msw.cpp
@@ -15,11 +15,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/dcmemory.h"
-#include "wx/ribbon/art.h"
-

 #if wxUSE_RIBBON
 
 #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/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/ribbon/toolbar.h"
 
 #ifndef WX_PRECOMP

+#include "wx/dcmemory.h"

 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__

diff --git a/src/ribbon/bar.cpp b/src/ribbon/bar.cpp
index 5e469b427ae01b397a8a7c8e7d63b90463072e90..e8f6d4fe26324db33c99552ea613fba2b904991f 100644 (file)
--- a/src/ribbon/bar.cpp
+++ b/src/ribbon/bar.cpp
@@ -15,10 +15,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/ribbon/bar.h"
-

 #if wxUSE_RIBBON
 
 #if wxUSE_RIBBON
 

+#include "wx/ribbon/bar.h"

 #include "wx/ribbon/art.h"
 #include "wx/dcbuffer.h"
 
 #include "wx/ribbon/art.h"
 #include "wx/dcbuffer.h"
 

diff --git a/src/ribbon/buttonbar.cpp b/src/ribbon/buttonbar.cpp
index cfc8fe09319a9b70925891bc3d20374b762a6eb8..3262c3b257d5ab157b2e74161764db6fc9afe5ad 100644 (file)
--- a/src/ribbon/buttonbar.cpp
+++ b/src/ribbon/buttonbar.cpp
@@ -15,10 +15,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/ribbon/buttonbar.h"
-

 #if wxUSE_RIBBON
 
 #if wxUSE_RIBBON
 

+#include "wx/ribbon/buttonbar.h"

 #include "wx/ribbon/art.h"
 #include "wx/dcbuffer.h"
 
 #include "wx/ribbon/art.h"
 #include "wx/dcbuffer.h"
 

diff --git a/src/ribbon/control.cpp b/src/ribbon/control.cpp
index a963a6c4c16c9fde4c91deb704cf9c7868409033..beb97ab70a856cdb725d58cef6a8c0b74ff98e94 100644 (file)
--- a/src/ribbon/control.cpp
+++ b/src/ribbon/control.cpp
@@ -8,16 +8,17 @@
 // Copyright:   (C) Peter Cawley
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (C) Peter Cawley
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

+

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

-#include "wx/ribbon/control.h"
-

 #if wxUSE_RIBBON
 
 #if wxUSE_RIBBON
 

+#include "wx/ribbon/control.h"
+

 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 

diff --git a/src/ribbon/gallery.cpp b/src/ribbon/gallery.cpp
index 0a1aa02d0359421e0c8e9bff09ba51e18dc35b71..6fc52d0df977c7e76eadcb8fe2705877c42bcb9f 100644 (file)
--- a/src/ribbon/gallery.cpp
+++ b/src/ribbon/gallery.cpp
@@ -15,10 +15,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/ribbon/gallery.h"
-

 #if wxUSE_RIBBON
 
 #if wxUSE_RIBBON
 

+#include "wx/ribbon/gallery.h"

 #include "wx/ribbon/art.h"
 #include "wx/ribbon/bar.h"
 #include "wx/dcbuffer.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 5e7562f4a089652f5a1d4d2fc2e3b20e64bd6ad0..dd6e2a11ef68aa9a79cc28408e370e7a9bb05f21 100644 (file)
--- a/src/ribbon/page.cpp
+++ b/src/ribbon/page.cpp
@@ -14,10 +14,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/ribbon/page.h"
-

 #if wxUSE_RIBBON
 
 #if wxUSE_RIBBON
 

+#include "wx/ribbon/page.h"

 #include "wx/ribbon/art.h"
 #include "wx/ribbon/bar.h"
 #include "wx/dcbuffer.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 68a8d216e8acd3aac6b1a28909799dc68685460f..481b9a0597e78ba5c0b1e29fc0987f52f5c5648f 100644 (file)
--- a/src/ribbon/panel.cpp
+++ b/src/ribbon/panel.cpp
@@ -8,22 +8,23 @@
 // Copyright:   (C) Peter Cawley
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (C) Peter Cawley
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

+

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #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/art.h"
 #include "wx/ribbon/bar.h"

-#include "wx/ribbon/panel.h"

 #include "wx/dcbuffer.h"
 #include "wx/display.h"
 #include "wx/dcbuffer.h"
 #include "wx/display.h"

-#include "wx/frame.h"
-
-#if wxUSE_RIBBON

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

+#include "wx/frame.h"

 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__

diff --git a/src/ribbon/toolbar.cpp b/src/ribbon/toolbar.cpp
index 22679350545b0844c53d8302d82be5c6ccb09a27..9e8839bc92113ce59c2359bac2d2e59b500eb44c 100644 (file)
--- a/src/ribbon/toolbar.cpp
+++ b/src/ribbon/toolbar.cpp
@@ -15,10 +15,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/ribbon/toolbar.h"
-

 #if wxUSE_RIBBON
 
 #if wxUSE_RIBBON
 

+#include "wx/ribbon/toolbar.h"

 #include "wx/ribbon/art.h"
 #include "wx/ribbon/bar.h"
 #include "wx/dcbuffer.h"
 #include "wx/ribbon/art.h"
 #include "wx/ribbon/bar.h"
 #include "wx/dcbuffer.h"