diff -Nru wxwidgets2.8-2.8.11.0/debian/changelog wxwidgets2.8-2.8.11.0/debian/changelog --- wxwidgets2.8-2.8.11.0/debian/changelog 2010-08-27 02:36:35.000000000 +0200 +++ wxwidgets2.8-2.8.11.0/debian/changelog 2011-02-19 21:05:43.000000000 +0100 @@ -1,3 +1,9 @@ +wxwidgets2.8 (2.8.11.0-0ubuntu4.1) maverick-proposed; urgency=low + + * Apply appmenu.patch to get menus back (LP: #662077). + + -- Benjamin Drung Sat, 19 Feb 2011 21:05:43 +0100 + wxwidgets2.8 (2.8.11.0-0ubuntu4) maverick; urgency=low * python-wxversion: install wxversion.py in the right path (LP: #620280). diff -Nru wxwidgets2.8-2.8.11.0/debian/patches/appmenu.patch wxwidgets2.8-2.8.11.0/debian/patches/appmenu.patch --- wxwidgets2.8-2.8.11.0/debian/patches/appmenu.patch 1970-01-01 01:00:00.000000000 +0100 +++ wxwidgets2.8-2.8.11.0/debian/patches/appmenu.patch 2011-02-19 21:05:37.000000000 +0100 @@ -0,0 +1,25 @@ +Description: In some cases menu bar height is reported as 0 when the menu hasn't + fully realized yet. Nee to update the height during idle time if it is 0, + otherwise no menu is shown. +Bug-Ubuntu: https://launchpad.net/bugs/662077 +Origin: upstream, http://svn.wxwidgets.org/viewvc/wx/wxWidgets/branches/WX_2_8_BRANCH/src/gtk/frame.cpp?r1=66344&r2=66343&pathrev=66344 + +--- a/src/gtk/frame.cpp ++++ b/src/gtk/frame.cpp +@@ -560,6 +560,16 @@ + + #if wxUSE_MENUS_NATIVE + if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle(); ++ ++ // UpdateMenuBarSize may return a height of zero on some ++ // systems (e.g. Ubuntu 11.04 Alpha as of 2010-12-06), ++ // when the menubar widget has not been fully realized. ++ // Update the menu bar size again at this point, otherwise ++ // the menu would not be visible at all. ++ if (!m_menuBarHeight) ++ { ++ UpdateMenuBarSize(); ++ } + #endif // wxUSE_MENUS_NATIVE + #if wxUSE_TOOLBAR + if (m_frameToolBar) m_frameToolBar->OnInternalIdle(); diff -Nru wxwidgets2.8-2.8.11.0/debian/patches/series wxwidgets2.8-2.8.11.0/debian/patches/series --- wxwidgets2.8-2.8.11.0/debian/patches/series 2010-07-20 03:54:09.000000000 +0200 +++ wxwidgets2.8-2.8.11.0/debian/patches/series 2011-02-19 21:05:37.000000000 +0100 @@ -8,3 +8,4 @@ wx_pth_dbg.dpatch debian-changes-2.8.11.0-0ubuntu1.1 debian-changes-2.8.11.0-0ubuntu1+devfil +appmenu.patch