MSW fixes; added wxUSE_XPM to wxUniv's setup.h so now widgets sample works

[wxWidgets.git] / include / wx / msw / tbarmsw.h

diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h
index d03dbe7ff3afffa90fd7ab4367c49c4f31bd1aa5..278353b88c35724ba3796a881255b3f373ea7ae1 100644 (file)
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -16,7 +16,7 @@
 #pragma interface "tbarmsw.h"
 #endif
 
 #pragma interface "tbarmsw.h"
 #endif
 

-#if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
+#if wxUSE_TOOLBAR

 
 #include "wx/tbarbase.h"
 
 
 #include "wx/tbarbase.h"
 


@@ -144,7 +144,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };
 
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };
 

-#endif // wxUSE_TOOL/BUTTONBAR
+#endif // wxUSE_TOOLBAR

 
 #endif
     // _WX_TBARMSW_H_
 
 #endif
     // _WX_TBARMSW_H_