X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f52c3131bff35b58e62c6696db4312b90d8c2102..60acae65faac4b98254c76437d4bb9ac55f5d759:/src/univ/menu.cpp?ds=sidebyside

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index acad3b9451..ba4e56b519 100644
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -1678,6 +1678,14 @@ void wxMenuBar::Init()
     m_shouldShowMenu = false;
 }
 
+wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long WXUNUSED(style))
+{
+    Init();
+
+    for (size_t i = 0; i < n; ++i )
+        Append(menus[i], titles[i]);
+}
+
 void wxMenuBar::Attach(wxFrame *frame)
 {
     // maybe you really wanted to call Detach()?
@@ -2138,6 +2146,9 @@ bool wxMenuBar::ProcessMouseEvent(const wxPoint& pt)
         return false;
     }
 
+    // FIXME: temporary workaround for crash, to be fixed
+    // in a later version.
+#if 0
     // select the new active item
     DoSelectMenu(currentNew);
 
@@ -2148,6 +2159,7 @@ bool wxMenuBar::ProcessMouseEvent(const wxPoint& pt)
         // open the new menu if the old one we closed had been opened
         PopupCurrentMenu(false /* don't select first item - as Windows does */);
     }
+#endif
 
     return true;
 }