gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-26 15:00:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

coding fixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@5769 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 2000-01-13 23:32:54 +00:00
parent 8e4d92bebf
commit fd582aa69d
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Source/NSMenu.m
View file

@ -870,9 +870,10 @@ static NSString *NSMenuLocationsKey = @"NSMenuLocations";
NSNotificationCenter *theCenter = [NSNotificationCenter defaultCenter]; NSNotificationCenter *theCenter = [NSNotificationCenter defaultCenter];
NSRect winRect = {{0,0},{20,23}}; NSRect winRect = {{0,0},{20,23}};
menu_title = [[decoder decodeObject] retain]; [decoder decodeValueOfObjCType: @encode(id) at: &menu_title];
menu_items = [[decoder decodeObject] retain]; [decoder decodeValueOfObjCType: @encode(id) at: &menu_items];
menu_view = [[decoder decodeObject] retain]; [decoder decodeValueOfObjCType: @encode(id) at: &menu_view];
[menu_view setMenu: self]; // Sets notifications up
menu_supermenu = [decoder decodeObject]; menu_supermenu = [decoder decodeObject];
menu_popb = [decoder decodeObject]; menu_popb = [decoder decodeObject];
[decoder decodeValueOfObjCType: @encode(BOOL) at: &menu_autoenable]; [decoder decodeValueOfObjCType: @encode(BOOL) at: &menu_autoenable];
@ -1490,7 +1491,7 @@ static NSString *NSMenuLocationsKey = @"NSMenuLocations";
- (void) _releaseCloseButton - (void) _releaseCloseButton
{ {
[button retain]; RETAIN(button);
[button removeFromSuperview]; [button removeFromSuperview];
} }

5
Source/NSMenuView.m
View file

@ -109,7 +109,6 @@ static float GSMenuBarHeight = 25.0; // A wild guess.
{ {
// Remove this menu view from the old menu list of observers. // Remove this menu view from the old menu list of observers.
[theCenter removeObserver: self name: nil object: menuv_menu]; [theCenter removeObserver: self name: nil object: menuv_menu];
[menuv_menu release];
} }
ASSIGN(menuv_menu, menu); ASSIGN(menuv_menu, menu);
@ -972,8 +971,6 @@ static float GSMenuBarHeight = 25.0; // A wild guess.
[encoder encodeObject: menuv_itemCells]; [encoder encodeObject: menuv_itemCells];
[encoder encodeObject: menuv_font]; [encoder encodeObject: menuv_font];
[encoder encodeConditionalObject: menuv_menu];
[encoder encodeConditionalObject: menuv_items_link];
[encoder encodeValueOfObjCType: @encode(BOOL) at: &menuv_horizontal]; [encoder encodeValueOfObjCType: @encode(BOOL) at: &menuv_horizontal];
[encoder encodeValueOfObjCType: @encode(float) at: &menuv_horizontalEdgePad]; [encoder encodeValueOfObjCType: @encode(float) at: &menuv_horizontalEdgePad];
[encoder encodeValueOfObjCType: @encode(NSSize) at: &cellSize]; [encoder encodeValueOfObjCType: @encode(NSSize) at: &cellSize];
@ -985,8 +982,6 @@ static float GSMenuBarHeight = 25.0; // A wild guess.
[decoder decodeValueOfObjCType: @encode(id) at: &menuv_itemCells]; [decoder decodeValueOfObjCType: @encode(id) at: &menuv_itemCells];
[decoder decodeValueOfObjCType: @encode(id) at: &menuv_font]; [decoder decodeValueOfObjCType: @encode(id) at: &menuv_font];
menuv_menu = [decoder decodeObject];
menuv_items_link = [decoder decodeObject];
[decoder decodeValueOfObjCType: @encode(BOOL) at: &menuv_horizontal]; [decoder decodeValueOfObjCType: @encode(BOOL) at: &menuv_horizontal];
[decoder decodeValueOfObjCType: @encode(float) at: &menuv_horizontalEdgePad]; [decoder decodeValueOfObjCType: @encode(float) at: &menuv_horizontalEdgePad];
[decoder decodeValueOfObjCType: @encode(NSSize) at: &cellSize]; [decoder decodeValueOfObjCType: @encode(NSSize) at: &cellSize];