X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9a0ceca5b549414a6119e98bc6d868c071a8b1b..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/tbarbase.h?ds=inline

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 96920150b9..34928b79f6 100644
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -24,15 +24,15 @@
 #include "wx/list.h"
 #include "wx/control.h"
 
-class WXDLLEXPORT wxToolBarBase;
-class WXDLLEXPORT wxToolBarToolBase;
-class WXDLLEXPORT wxImage;
+class WXDLLIMPEXP_FWD_CORE wxToolBarBase;
+class WXDLLIMPEXP_FWD_CORE wxToolBarToolBase;
+class WXDLLIMPEXP_FWD_CORE wxImage;
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[];
 extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize;
 extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition;
 
@@ -77,7 +77,7 @@ public:
         m_tbar = tbar;
         m_id = toolid;
         if (m_id == wxID_ANY)
-            m_id = wxNewId();
+            m_id = wxWindow::NewControlId();
         m_clientData = clientData;
 
         m_bmpNormal = bmpNormal;