Fix problem when try to remove an old menu in a window.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@35744 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Germán Arias 2012-10-26 01:35:04 +00:00
parent 235cfca2db
commit 4bab57213d
2 changed files with 13 additions and 3 deletions

View file

@ -1,3 +1,9 @@
2012-10-25 German A. Arias <german@xelalug.org>
* Source/GSThemeMenu.m (-setMenu:forWindow:): Remove any possible old
menu before set the new menu. Because in its previous place (before if
statement) doesn't work.
2012-10-18 23:19-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Source/NSButtonCell.m: Correct issues when decoding a .gorm

View file

@ -69,9 +69,6 @@
// Prevent recursion
[window _setMenu: menu];
// Remove any possible old menu view
[wv removeMenuView];
//NSLog(@"Adding menu %@ to window %@", menu, window);
if (menu != nil)
{
@ -80,6 +77,13 @@
[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);