Revert last change.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@35745 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Germán Arias 2012-10-26 06:33:45 +00:00
parent 4bab57213d
commit 3e2aacab04
2 changed files with 9 additions and 7 deletions

View file

@ -1,3 +1,9 @@
2012-10-26 German A. Arias <german@xelalug.org>
* Source/GSThemeMenu.m (-setMenu:forWindow:): Revert last change. After
a different test I notice this really work. I don't know why my first
test didn't work.
2012-10-25 German A. Arias <german@xelalug.org>
* Source/GSThemeMenu.m (-setMenu:forWindow:): Remove any possible old

View file

@ -69,6 +69,9 @@
// Prevent recursion
[window _setMenu: menu];
// Remove any possible old menu view
[wv removeMenuView];
//NSLog(@"Adding menu %@ to window %@", menu, window);
if (menu != nil)
{
@ -77,13 +80,6 @@
[menuView setMenu: menu];
[menuView setHorizontal: YES];
[menuView setInterfaceStyle: NSWindows95InterfaceStyle];
/* Remove any possible old menu view.
* We do this here, because in its previous place
* (before if statement) doesn't work.
*/
[wv removeMenuView];
[wv addMenuView: menuView];
[menuView sizeToFit];
RELEASE(menuView);