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

diff --git a/docs/changes.txt b/docs/changes.txt
index d91188d16121cbe30e49aad56e2832b5a4f3b946..a69ab388403bd7195a3cd93b73ce4ddb283beb71 100644 (file)
--- a/docs/changes.txt
+++ b/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
 ===========

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index 6a2056e2afd2f838da72701f0df655df317600cb..14c62eca20a3ace748db6d4b6b2287294e3f1f64 100644 (file)
--- a/src/msw/stattext.cpp
+++ b/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;
         }
     }