X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9dae7798b164a5f4abc85d16f49cabd4e0980c0..5bc97d1b81910a82e249f6227798b42089149f94:/include/wx/toolbar.h diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h index 11878e4760..4e1a581f47 100644 --- a/include/wx/toolbar.h +++ b/include/wx/toolbar.h @@ -55,7 +55,9 @@ enum #if wxUSE_TOOLBAR #include "wx/tbarbase.h" // the base class for all toolbars - #if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__) + // Simple toolbar no longer available, so we will need to have + // a generic toolbar at some point (perhaps the wxUniv toolbar) + #if 0 // !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__) #include "wx/tbarsmpl.h" class WXDLLEXPORT wxToolBar : public wxToolBarSimple @@ -121,6 +123,8 @@ enum #else // wxUSE_TOOLBAR_NATIVE #if defined(__WXUNIVERSAL__) #include "wx/univ/toolbar.h" + #elif defined(__WXWINCE__) + #include "wx/msw/wince/tbarwce.h" #elif defined(__WXMSW__) && defined(__WIN95__) #include "wx/msw/tbar95.h" #elif defined(__WXMSW__)