gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-06-02 18:50:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed GMappKit NSMenu decoding.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4575 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
michael 1999-07-13 01:58:32 +00:00
parent ed724a3ae7
commit 8c6c6c5363
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -3,6 +3,9 @@
* Source/NSMenu.m: added code to convert anything that conforms to * Source/NSMenu.m: added code to convert anything that conforms to
<NSMenuItem> into an NSMenuItemCell. Not tested, but should work. <NSMenuItem> into an NSMenuItemCell. Not tested, but should work.
Also fixed a small bug in -init, it was not returning. Also fixed a small bug in -init, it was not returning.
* Model/GMAppKit.m: fixed code in unarchiving of NSMenus to
addItems so they are converted rather than swapped in (in an
operation which we can not intercede.)
Mon Jul 12 5:40:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk> Mon Jul 12 5:40:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>

7
Model/GMAppKit.m
View file

@ -750,10 +750,11 @@ void __dummy_GMAppKit_functionForLinking() {}
= [unarchiver decodeObjectWithName:@"itemArray"]; = [unarchiver decodeObjectWithName:@"itemArray"];
for (i = 0, count = [decodedItems count]; i < count; i++) for (i = 0, count = [decodedItems count]; i < count; i++)
[self addItemWithTitle:@"dummy" action:NULL keyEquivalent:@""]; [self addItem:[decodedItems objectAtIndex:i]];
// [self addItemWithTitle:@"dummy" action:NULL keyEquivalent:@""];
[itemArray replaceObjectsInRange:NSMakeRange(0, count) // [itemArray replaceObjectsInRange:NSMakeRange(0, count)
withObjectsFromArray:decodedItems]; // withObjectsFromArray:decodedItems];
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
id item = [itemArray objectAtIndex:i]; id item = [itemArray objectAtIndex:i];

8
Model/test.gmodel
View file

@ -28,7 +28,7 @@
isVisible = NO; isVisible = NO;
isa = NSWindow; isa = NSWindow;
level = 0; level = 0;
maxSize = "{width = 3.40282e+38; height = 3.40282e+38}"; maxSize = "{width = 16000.0; height = 16000.0}";
minSize = "{width = 0; height = 0}"; minSize = "{width = 0; height = 0}";
representedFilename = ""; representedFilename = "";
styleMask = 0; styleMask = 0;
@ -70,7 +70,7 @@
isVisible = NO; isVisible = NO;
isa = NSWindow; isa = NSWindow;
level = 0; level = 0;
maxSize = "{width = 3.40282e+38; height = 3.40282e+38}"; maxSize = "{width = 16000.0; height = 16000.0}";
minSize = "{width = 0; height = 0}"; minSize = "{width = 0; height = 0}";
representedFilename = ""; representedFilename = "";
styleMask = 0; styleMask = 0;
@ -100,7 +100,7 @@
isVisible = YES; isVisible = YES;
isa = NSWindow; isa = NSWindow;
level = 0; level = 0;
maxSize = "{width = 3.40282e+38; height = 3.40282e+38}"; maxSize = "{width = 16000.0; height = 16000.0}";
minSize = "{width = 0; height = 0}"; minSize = "{width = 0; height = 0}";
representedFilename = ""; representedFilename = "";
styleMask = 14; styleMask = 14;
@ -468,7 +468,7 @@
isVisible = NO; isVisible = NO;
isa = NSWindow; isa = NSWindow;
level = 0; level = 0;
maxSize = "{width = 3.40282e+38; height = 3.40282e+38}"; maxSize = "{width = 16000.0; height = 16000.0}";
minSize = "{width = 0; height = 0}"; minSize = "{width = 0; height = 0}";
representedFilename = ""; representedFilename = "";
styleMask = 14; styleMask = 14;