mirror of
https://github.com/gnustep/apps-gorm.git
synced 2025-04-22 22:20:44 +00:00
* GormCore/GormDocument.m
* GormCore/GormFilePrefsManager.m * GormCore/GormStandaloneViewEditor.m * GormCore/GormViewWithContentViewEditor.m * GormCore/GormWindowTemplate.m * Palettes/0Menus/GormMenuEditor.m * Palettes/0Menus/MenusPalette.m: Eliminate as many of the remaining warnings in the code as possible. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@35133 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
95434c6620
commit
d49d1fd71a
8 changed files with 39 additions and 23 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
|||
2012-05-01 23:25-EDT Gregory John Casamento <greg.casamento@gmail.com>
|
||||
|
||||
* GormCore/GormDocument.m
|
||||
* GormCore/GormFilePrefsManager.m
|
||||
* GormCore/GormStandaloneViewEditor.m
|
||||
* GormCore/GormViewWithContentViewEditor.m
|
||||
* GormCore/GormWindowTemplate.m
|
||||
* Palettes/0Menus/GormMenuEditor.m
|
||||
* Palettes/0Menus/MenusPalette.m: Eliminate as many of the remaining
|
||||
warnings in the code as possible.
|
||||
|
||||
2012-04-20 18:53-EDT Gregory John Casamento <greg.casamento@gmail.com>
|
||||
|
||||
* GormCore/GormResourceEditor.m: Correct compiler warnings.
|
||||
|
|
|
@ -1190,10 +1190,12 @@ static NSImage *fileImage = nil;
|
|||
NSDebugLog(@"Owner changed for %@", sender);
|
||||
}
|
||||
|
||||
- (void) release
|
||||
/*
|
||||
- (id) release
|
||||
{
|
||||
[super release];
|
||||
return [super release];
|
||||
}
|
||||
*/
|
||||
|
||||
- (id) retain
|
||||
{
|
||||
|
@ -3458,7 +3460,7 @@ static void _real_close(GormDocument *self,
|
|||
*/
|
||||
- (void) setSounds: (NSArray *)snds
|
||||
{
|
||||
ASSIGN(sounds,snds);
|
||||
ASSIGN(sounds,[snds mutableCopy]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -3466,7 +3468,7 @@ static void _real_close(GormDocument *self,
|
|||
*/
|
||||
- (void) setImages: (NSArray *)imgs
|
||||
{
|
||||
ASSIGN(images,imgs);
|
||||
ASSIGN(images,[imgs mutableCopy]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -235,7 +235,8 @@ NSString *formatVersion(int version)
|
|||
|
||||
NS_DURING
|
||||
{
|
||||
id object = [NSUnarchiver unarchiveObjectWithData: data];
|
||||
GormFilePrefsManager *object = (GormFilePrefsManager *)
|
||||
[NSUnarchiver unarchiveObjectWithData: data];
|
||||
[gormAppVersion setStringValue: formatVersion([object version])];
|
||||
version = [object version];
|
||||
[targetVersion selectItemWithTitle: [object targetVersionName]];
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#include <GormCore/GormPrivate.h>
|
||||
#include <GormCore/GormStandaloneViewEditor.h>
|
||||
#include <GormCore/GormDefines.h>
|
||||
#include <GormCore/GormViewKnobs.h>
|
||||
|
||||
static NSImage *verticalImage;
|
||||
static NSImage *horizontalImage;
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#include "GormPlacementInfo.h"
|
||||
#include "GormSplitViewEditor.h"
|
||||
#include "GormViewKnobs.h"
|
||||
#include "GormInternalViewEditor.h"
|
||||
|
||||
@interface GormViewEditor (Private)
|
||||
- (NSRect) _displayMovingFrameWithHint: (NSRect) frame
|
||||
|
|
|
@ -23,8 +23,8 @@
|
|||
*/
|
||||
|
||||
#include "GormWindowTemplate.h"
|
||||
|
||||
@class GormNSWindow;
|
||||
#include "GormNSWindow.h"
|
||||
// @class GormNSWindow;
|
||||
|
||||
@interface NSWindow (Private)
|
||||
- (void) _setReleasedWhenClosed: (BOOL)flags;
|
||||
|
|
|
@ -135,7 +135,7 @@
|
|||
|
||||
if (pos >= 0)
|
||||
{
|
||||
NSMenuItem *item = [edited itemAtIndex: pos];
|
||||
NSMenuItem *item = (NSMenuItem *)[edited itemAtIndex: pos];
|
||||
|
||||
if ([theEvent clickCount] == 2)
|
||||
{
|
||||
|
@ -309,7 +309,7 @@
|
|||
newPos = [rep indexOfItemAtPoint: point];
|
||||
if (newPos < pos)
|
||||
{
|
||||
NSMenuItem *item = [edited itemAtIndex: pos];
|
||||
NSMenuItem *item = (NSMenuItem *)[edited itemAtIndex: pos];
|
||||
|
||||
RETAIN(item);
|
||||
if (newPos < 0)
|
||||
|
@ -320,7 +320,7 @@
|
|||
}
|
||||
else if (newPos > pos)
|
||||
{
|
||||
NSMenuItem *item = [edited itemAtIndex: pos];
|
||||
NSMenuItem *item = (NSMenuItem *)[edited itemAtIndex: pos];
|
||||
|
||||
RETAIN(item);
|
||||
[edited removeItemAtIndex: pos];
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
keyEquivalent: @"q"];
|
||||
RELEASE(self);
|
||||
|
||||
return m;
|
||||
return ((id)m);
|
||||
}
|
||||
@end
|
||||
|
||||
|
@ -306,21 +306,21 @@
|
|||
* The Find menu
|
||||
*/
|
||||
m = [[GormNSMenu alloc] init];
|
||||
i = [m addItemWithTitle: @"Find Panel..."
|
||||
action: @selector(performFindPanelAction:)
|
||||
keyEquivalent: @"f"];
|
||||
i = (NSMenuItem *)[m addItemWithTitle: @"Find Panel..."
|
||||
action: @selector(performFindPanelAction:)
|
||||
keyEquivalent: @"f"];
|
||||
[i setTag: NSFindPanelActionShowFindPanel];
|
||||
i = [m addItemWithTitle: @"Find Next"
|
||||
action: @selector(performFindPanelAction:)
|
||||
keyEquivalent: @"g"];
|
||||
i = (NSMenuItem *)[m addItemWithTitle: @"Find Next"
|
||||
action: @selector(performFindPanelAction:)
|
||||
keyEquivalent: @"g"];
|
||||
[i setTag: NSFindPanelActionNext];
|
||||
i = [m addItemWithTitle: @"Find Previous"
|
||||
action: @selector(performFindPanelAction:)
|
||||
keyEquivalent: @"d"];
|
||||
i = (NSMenuItem *)[m addItemWithTitle: @"Find Previous"
|
||||
action: @selector(performFindPanelAction:)
|
||||
keyEquivalent: @"d"];
|
||||
[i setTag: NSFindPanelActionPrevious];
|
||||
i = [m addItemWithTitle: @"Enter Selection"
|
||||
action: @selector(performFindPanelAction:)
|
||||
keyEquivalent: @"e"];
|
||||
i = (NSMenuItem *)[m addItemWithTitle: @"Enter Selection"
|
||||
action: @selector(performFindPanelAction:)
|
||||
keyEquivalent: @"e"];
|
||||
[i setTag: NSFindPanelActionSetFindString];
|
||||
[m addItemWithTitle: @"Jump To Selection"
|
||||
action: @selector(centerSelectionInVisibleArea:)
|
||||
|
|
Loading…
Reference in a new issue