X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6aa89a22b8e47000c98bff05c6f545f331f1c353..df6f82f04876bd1fc1d8f71cf7e0fa2a67ce682f:/src/generic/tbarsmpl.cpp?ds=sidebyside diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp index 11a40f1b72..1273337296 100644 --- 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