mirror of
https://github.com/gnustep/apps-gorm.git
synced 2025-02-24 03:51:22 +00:00
Corrected some menu issues with testing and added the paletteDocument method to IBPalette.[hm].
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@19356 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
7377aafb21
commit
e7d5af0253
4 changed files with 30 additions and 2 deletions
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
2004-05-16 07:20 Gregory John Casamento <greg_casamento@yahoo.com>
|
||||
|
||||
* Gorm.m: in testInterface: bring the temporary menu to the
|
||||
front. There has been an issue with it sometimes not
|
||||
displaying. In endTesting bring the normal menu to the front.
|
||||
In unhide, bring the menu to the front.
|
||||
* GormLib/IBPalette.[hm]: Added paletteDocument method as
|
||||
per specs. Currently this method will return nil unless
|
||||
the ivar is set to something conforming to IBDocuments.
|
||||
|
||||
2004-05-16 07:20 Gregory John Casamento <greg_casamento@yahoo.com>
|
||||
|
||||
* GormSoundEditor.m: Added methods to GormSound class to
|
||||
|
|
5
Gorm.m
5
Gorm.m
|
@ -782,6 +782,9 @@ NSString *GormResizeCellNotification = @"GormResizeCellNotification";
|
|||
keyEquivalent: @"q"];
|
||||
}
|
||||
}
|
||||
|
||||
// display the current main menu...
|
||||
[[self mainMenu] display];
|
||||
|
||||
[notifCenter postNotificationName: IBDidBeginTestingInterfaceNotification
|
||||
object: self];
|
||||
|
@ -1054,6 +1057,7 @@ NSString *GormResizeCellNotification = @"GormResizeCellNotification";
|
|||
}
|
||||
|
||||
[self setMainMenu: mainMenu];
|
||||
[mainMenu display]; // bring it to the front...
|
||||
|
||||
isTesting = NO;
|
||||
|
||||
|
@ -1478,6 +1482,7 @@ NSString *GormResizeCellNotification = @"GormResizeCellNotification";
|
|||
[(GormDocument *)document setDocumentActive: NO];
|
||||
[(GormDocument *)document setDocumentActive: YES];
|
||||
[window orderFront: sender];
|
||||
[[self mainMenu] display];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
|
||||
#include <Foundation/NSMapTable.h>
|
||||
#include <Foundation/NSObject.h>
|
||||
#include <InterfaceBuilder/IBDocuments.h>
|
||||
|
||||
// forward references
|
||||
@class NSString;
|
||||
|
@ -58,8 +59,9 @@ extern NSString *GormLinkPboardType;
|
|||
|
||||
@interface IBPalette : NSObject
|
||||
{
|
||||
NSWindow *window;
|
||||
NSImage *icon;
|
||||
NSWindow *window;
|
||||
NSImage *icon;
|
||||
id<IBDocuments> document;
|
||||
}
|
||||
/*
|
||||
* For internal use only - these class methods return the information
|
||||
|
@ -101,5 +103,11 @@ extern NSString *GormLinkPboardType;
|
|||
* palette.
|
||||
*/
|
||||
- (NSWindow*) originalWindow;
|
||||
|
||||
/**
|
||||
* Returns an object representing the palette which conforms to the
|
||||
* IBDocuments protocol.
|
||||
*/
|
||||
- (id<IBDocuments>) paletteDocument;
|
||||
@end
|
||||
#endif
|
||||
|
|
|
@ -143,5 +143,10 @@ static NSMapTable *viewToType = 0;
|
|||
{
|
||||
return window;
|
||||
}
|
||||
|
||||
- (id<IBDocuments>) paletteDocument
|
||||
{
|
||||
return document;
|
||||
}
|
||||
@end
|
||||
|
||||
|
|
Loading…
Reference in a new issue