send wxEVT_MENU_CLOSE at least sometimes

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

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index 7eaa18b562f7638180c40fcb94065205469913c9..0ea485b4f716a127310f0e0ca871a1a595621642 100644 (file)
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "stattext.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -123,6 +119,9 @@ WXDWORD wxStaticText::MSWGetStyle(long style, WXDWORD *exstyle) const
     else
         msStyle |= SS_LEFT;
 
+    // this style is necessary to receive mouse events
+    msStyle |= SS_NOTIFY;
+
     return msStyle;
 }
 
@@ -136,7 +135,8 @@ wxSize wxStaticText::DoGetBestSize() const
     dc.SetFont(font);
 
     wxCoord widthTextMax, heightTextTotal;
-    dc.GetMultiLineTextExtent(GetLabel(), &widthTextMax, &heightTextTotal);
+    dc.GetMultiLineTextExtent(::wxStripMenuCodes(GetLabel()),
+        &widthTextMax, &heightTextTotal);
 
 #ifdef __WXWINCE__
     if ( widthTextMax )