allow adding/removing columns dynamically (based on patch 763540)

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

diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp
index 11a40f1b7293aea40a96b21220c446cac6c26f03..127333729656e83d7eccc93bdeab02351d488c17 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,6 +37,7 @@
     #include "wx/dcmemory.h"
 #endif
 
+#include "wx/toolbar.h"
 #include "wx/tbarsmpl.h"
 
 // ----------------------------------------------------------------------------
@@ -86,9 +87,7 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
 
-#if !defined(wxUSE_TOOLBAR_NATIVE) && !defined(__WXUNIVERSAL__)
-    #include "wx/toolbar.h"
-
+#if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
     IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarSimple)
 #endif