#define wxACTION_TOOLBAR_PRESS wxACTION_BUTTON_PRESS
#define wxACTION_TOOLBAR_RELEASE wxACTION_BUTTON_RELEASE
#define wxACTION_TOOLBAR_CLICK wxACTION_BUTTON_CLICK
-#define wxACTION_TOOLBAR_ENTER _T("enter") // highlight the tool
-#define wxACTION_TOOLBAR_LEAVE _T("leave") // unhighlight the tool
+#define wxACTION_TOOLBAR_ENTER wxT("enter") // highlight the tool
+#define wxACTION_TOOLBAR_LEAVE wxT("leave") // unhighlight the tool
// ----------------------------------------------------------------------------
// wxToolBar
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxToolBar : public wxToolBarBase
+class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase
{
public:
// construction/destruction