GTK_TOOLBAR_BOTH_HORIZ is GTK 2 only (it would have been nice if the patch mentioned...

[wxWidgets.git] / src / generic / tbarsmpl.cpp

diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp
index 33d24e417864825d729f618c6c5f30c117cf791c..985c33e72732f319c2d6f1497f8cd78a439cb140 100644 (file)
--- a/src/generic/tbarsmpl.cpp
+++ b/src/generic/tbarsmpl.cpp
@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_TOOLBAR_SIMPLE
+#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_SIMPLE
 
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
@@ -37,7 +37,7 @@
     #include "wx/dcmemory.h"
 #endif
 
-#include "wx/tbarsmpl.h"
+#include "wx/toolbar.h"
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -87,8 +87,6 @@ public:
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
 
 #if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
-    #include "wx/toolbar.h"
-
     IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarSimple)
 #endif