Merge branch 'develop_2' of https://github.com/dankan1890/nana into dankan1890-develop_2

This commit is contained in:
Jinhao
2016-08-23 07:50:10 +08:00
6 changed files with 9 additions and 9 deletions

View File

@@ -212,7 +212,7 @@ namespace nana
if (hotkey)
{
unsigned off_w = (hotkey_pos ? graph.text_extent_size(text.c_str(), static_cast<unsigned>(hotkey_pos)).width : 0);
unsigned off_w = (hotkey_pos ? graph.text_extent_size(text.c_str(), hotkey_pos).width : 0);
nana::size hotkey_size = graph.text_extent_size(text.c_str() + hotkey_pos, 1);
unsigned ascent, descent, inleading;