X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6dd16e4f26490f1f4f2be1204840cbf4ecf74a35..f77cf4e68a98b10378ab07c1c591464b89656102:/src/msw/stattext.cpp diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp index 6a2056e2af..e34b055958 100644 --- a/src/msw/stattext.cpp +++ b/src/msw/stattext.cpp @@ -76,10 +76,15 @@ wxSize wxStaticText::DoGetBestSize() const int widthTextMax = 0, widthLine, heightTextTotal = 0, heightLineDefault = 0, heightLine = 0; + bool lastWasAmpersand = FALSE; + wxString curLine; - for ( const wxChar *pc = text; ; pc++ ) { - if ( *pc == wxT('\n') || *pc == wxT('\0') ) { - if ( !curLine ) { + for ( const wxChar *pc = text; ; pc++ ) + { + if ( *pc == wxT('\n') || *pc == wxT('\0') ) + { + if ( !curLine ) + { // we can't use GetTextExtent - it will return 0 for both width // and height and an empty line should count in height // calculation @@ -90,22 +95,44 @@ wxSize wxStaticText::DoGetBestSize() const heightTextTotal += heightLineDefault; } - else { + else + { GetTextExtent(curLine, &widthLine, &heightLine); if ( widthLine > widthTextMax ) widthTextMax = widthLine; heightTextTotal += heightLine; } - if ( *pc == wxT('\n') ) { + if ( *pc == wxT('\n') ) + { curLine.Empty(); } - else { + else + { // the end of string break; } } - else { + else + { + // we shouldn't take into account the '&' which just introduces the + // mnemonic characters and so are not shown on the screen -- except + // when it is preceded by another '&' in which case it stands for a + // literal ampersand + if ( *pc == _T('&') ) + { + if ( !lastWasAmpersand ) + { + lastWasAmpersand = TRUE; + + // skip the statement adding pc to curLine below + continue; + } + + // it is a literal ampersand + lastWasAmpersand = FALSE; + } + curLine += *pc; } }