And here

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 3cf75abf8ba9061202c6a8c6ba021fb3d44606d0..f28173944d69b335a739ccc4a3e2bb8ba57dbf26 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -23,7 +23,7 @@
 #include "wx/list.h"
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
 WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize;
 WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition;
 

diff --git a/include/wx/tbarsmpl.h b/include/wx/tbarsmpl.h
index 2e4911aee15c2c29218361d35c3c4f6569d0a35c..132aa56d4ec1b988e650d60e68d706a971fe7e2a 100644 (file)
--- a/include/wx/tbarsmpl.h
+++ b/include/wx/tbarsmpl.h
@@ -26,7 +26,7 @@
 
 class WXDLLEXPORT wxMemoryDC;
 
-WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
 WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize;
 WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition;