Toolbar Not support X64 windows, and I give a patch

[GoogleCodeExporter]

What steps will reproduce the problem?
1. Build With Unicode-X64
2. Launch ToolBar test.
3. Forms/inc and toolbar directionary include different versions.

What is the expected output? What do you see instead?

build with unicode,Tips and click not corrently.

What version of the product are you using? On what operating system?

Windows7 X64bits, 

Please provide any additional information below.

Please attach file.

Original issue reported on code.google.com by zha...@gmail.com on 9 Mar 2013 at 9:17