removed focus assert

[wxWidgets.git] / src / univ / menu.cpp

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index 4151a9523661e5aecb6d2dba9a4da71d0d41d63c..967fa78da4a3594b87cde7a99c2852c813f53989 100644 (file)
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -1548,6 +1548,9 @@ void wxMenuBar::Attach(wxFrame *frame)
         SetCursor(wxCURSOR_ARROW);
 
         SetFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));
         SetCursor(wxCURSOR_ARROW);
 
         SetFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));

+
+        // calculate and set our height (it won't be changed any more)
+        SetSize(-1, GetBestSize().y);

     }
 
     // remember the last frame which had us to avoid unnecessarily reparenting
     }
 
     // remember the last frame which had us to avoid unnecessarily reparenting


@@ -2293,7 +2296,7 @@ void wxMenuBar::OnDismissMenu(bool dismissMenuBar)
 void wxMenuBar::OnDismiss()
 {
     if ( GetCapture() )
 void wxMenuBar::OnDismiss()
 {
     if ( GetCapture() )

-        ReleaseMouse();
+        GetCapture()->ReleaseMouse();

 
     if ( m_current != -1 )
     {
 
     if ( m_current != -1 )
     {