fixed wxStaticText best size calculation (closes bug 667324)

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

docs/changes.txt

@@ -70,6 +70,7 @@ wxMSW:
 - wxCheckListBox::Check() doesn't send CHECKLISTBOX_TOGGLE event any more
 - fixed bug with wxTR_EDIT_LABELS not workign with wxTR_MULTIPLE
 - fixes for compilation with OpenWatcom compiler
+- fixed wxStaticText best size calculation (was wrong by '&' width)
 
 OLD CHANGES
 ===========

src/msw/stattext.cpp

@@ -106,7 +106,10 @@ wxSize wxStaticText::DoGetBestSize() const
             }
         }
         else {
-            curLine += *pc;
+            // we shouldn't take into account the '&' which just introduce the
+            // mnemonic characters and so are not shown on the screen
+            if ( pc != _T('&') )
+                curLine += *pc;
         }
     }