added InitCommandEventWithItems() and call it from wxChoice and wxComboBox code to...

[wxWidgets.git] / src / msw / statbox.cpp

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 829976e363bcef1dfe78cb039a7ddd76b6dedfbd..bbd39a04dcd18fd723aeb842110b678b8bf2b51a 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -160,7 +160,7 @@ wxSize wxStaticBox::DoGetBestSize() const
     wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
 
     int wBox;
-    GetTextExtent(wxGetWindowText(m_hWnd), &wBox, &cy);
+    GetTextExtent(wxStripMenuCodes(wxGetWindowText(m_hWnd)), &wBox, &cy);
 
     wBox += 3*cx;
     int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
@@ -386,7 +386,7 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& WXUNUSED(rc))
         const int x = 9;
 
         // TODO: RTL?
-        RECT rc = { x, 0, GetSize().x - x, y };
+        RECT rc = { x, 0, GetSize().x, y };
 
         const wxString label = GetLabel();
         ::DrawText(hdc, label, label.length(), &rc, DT_SINGLELINE | DT_VCENTER);