changed format of wxFontMapper entries: facename_encoding instead of encoding as key

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

diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h
index ed88e668d20e5288fb405e3a5e43f5fbd78299b7..278353b88c35724ba3796a881255b3f373ea7ae1 100644 (file)
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -16,7 +16,7 @@
 #pragma interface "tbarmsw.h"
 #endif
 
-#if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
+#if wxUSE_TOOLBAR
 
 #include "wx/tbarbase.h"
 
@@ -110,7 +110,7 @@ protected:
     void CreateMask(WXHDC hDC, int xoffset, int yoffset, int dx, int dy);
     void DrawBlankButton(WXHDC hdc, int x, int y, int dx, int dy, int state);
     void DrawButton(WXHDC hdc, int x, int y, int dx, int dy,
-                    wxToolBarTool *tool, int state);
+                    wxToolBarToolBase *tool, int state);
     WXHBITMAP CreateDitherBitmap();
     bool CreateDitherBrush();
     bool FreeDitherBrush();
@@ -144,7 +144,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };
 
-#endif // wxUSE_TOOL/BUTTONBAR
+#endif // wxUSE_TOOLBAR
 
 #endif
     // _WX_TBARMSW_H_