2008-04-14 17:37-EDT Gregory John Casamento <greg_casamento@yahoo.com>

* GormCore/GormImageEditor.m
        * GormCore/GormOutlineView.m
        * GormCore/GormResourceManager.m
        * GormCore/GormSoundInspector.m
        * GormCore/GormSplitViewEditor.m
        * GormLib/IBInspectorManager.m
        * Palettes/2Controls/GormBoxAttributesInspector.m
        * Palettes/4Data/GormDateFormatterAttributesInspector.m
        * Palettes/4Data/GormImageViewAttributesInspector.m
        * Palettes/4Data/GormNumberFormatterAttributesInspector.m: General
        clean up and compilation fixes to allow Gorm to compile without
        warnings.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@26447 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2008-04-14 21:40:11 +00:00
parent de80c16c94
commit a91fcf8e6b
11 changed files with 28 additions and 12 deletions

View file

@ -1,3 +1,18 @@
2008-04-14 17:37-EDT Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormImageEditor.m
* GormCore/GormOutlineView.m
* GormCore/GormResourceManager.m
* GormCore/GormSoundInspector.m
* GormCore/GormSplitViewEditor.m
* GormLib/IBInspectorManager.m
* Palettes/2Controls/GormBoxAttributesInspector.m
* Palettes/4Data/GormDateFormatterAttributesInspector.m
* Palettes/4Data/GormImageViewAttributesInspector.m
* Palettes/4Data/GormNumberFormatterAttributesInspector.m: General
clean up and compilation fixes to allow Gorm to compile without
warnings.
2008-04-07 18:59-EDT Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormFilePrefsManager.m

View file

@ -128,6 +128,7 @@ static NSMapTable *docMap = 0;
RELEASE(objects);
NSDebugLog(@"Released...");
GSNOSUPERDEALLOC;
}
- (void) close

View file

@ -229,7 +229,7 @@ static NSColor *darkGreyBlueColor = nil;
int i = 0;
int insertionPoint = 0;
id object = nil;
id sitem = (item == nil)?[NSNull null]:item;
id sitem = (item == nil)?((id)[NSNull null]):((id)item);
object = [_dataSource outlineView: self
actionsForItem: sitem];
@ -271,7 +271,7 @@ static NSColor *darkGreyBlueColor = nil;
int i = 0;
int insertionPoint = 0;
id object = nil;
id sitem = (item == nil)?[NSNull null]:item;
id sitem = (item == nil)?((id)[NSNull null]):((id)item);
object = [_dataSource outlineView: self
outletsForItem: sitem];

View file

@ -118,7 +118,7 @@
NSString *ext = [file pathExtension];
if ([ext isEqual:@"h"])
{
GormDocument *doc = document;
GormDocument *doc = (GormDocument *)document;
GormClassManager *classManager = [doc classManager];
NS_DURING
{
@ -148,14 +148,14 @@
}
else if ([imageTypes containsObject:ext])
{
GormDocument *doc = document;
GormDocument *doc = (GormDocument *)document;
[(GormGenericEditor *)[doc viewWithTag:1]
addObject:[GormImage imageForPath:file]];
[doc changeToViewWithTag:1];
}
else if ([soundTypes containsObject:ext])
{
GormDocument *doc = document;
GormDocument *doc = (GormDocument *)document;
[(GormGenericEditor *)[doc viewWithTag:2]
addObject:[GormSound soundForPath:file]];
[doc changeToViewWithTag:2];

View file

@ -88,13 +88,13 @@
- (void) stop: (id)sender
{
NSDebugLog(@"Stop");
[object stop];
[(NSSound *)object stop];
}
- (void) play: (id)sender
{
NSDebugLog(@"Play");
[object play];
[(NSSound *)object play];
}
- (void) pause: (id)sender

View file

@ -361,7 +361,6 @@
NSEnumerator *enumerator = [[_EO subviews] objectEnumerator];
GormViewEditor *subview;
NSMutableArray *newSelection = [NSMutableArray array];
id thisView = [self editedObject];
[parent makeSubeditorResign];

View file

@ -26,6 +26,7 @@
#include <Foundation/NSString.h>
#include <Foundation/NSDictionary.h>
#include <Foundation/NSArray.h>
#include <Foundation/NSEnumerator.h>
#include <InterfaceBuilder/IBInspectorManager.h>
#include <InterfaceBuilder/IBInspectorMode.h>
#include <math.h>

View file

@ -48,7 +48,7 @@
#include <AppKit/NSTextFieldCell.h>
/* This macro makes sure that the string contains a value, even if @"" */
#define VSTR(str) ({id _str = str; (_str) ? _str : @"";})
#define VSTR(str) ({id _str = (id)str; (_str) ? (id)_str : (id)(@"");})
/*

View file

@ -34,7 +34,7 @@
#include "GormDateFormatterAttributesInspector.h"
/* this macro makes sure that the string contains a value, even if @"" */
#define VSTR(str) ({id _str = str; (_str) ? _str : @"";})
#define VSTR(str) ({id _str = (id)str; (_str) ? (id)_str : (id)(@"");})
extern NSArray *predefinedDateFormats;

View file

@ -40,7 +40,7 @@
#include <AppKit/NSTextField.h>
/* This macro makes sure that the string contains a value, even if @"" */
#define VSTR(str) ({id _str = str; (_str) ? _str : @"";})
#define VSTR(str) ({id _str = (id)str; (_str) ? (id)_str : (id)(@"");})
@implementation GormImageViewAttributesInspector

View file

@ -35,7 +35,7 @@
#include "GormNumberFormatterAttributesInspector.h"
/* this macro makes sure that the string contains a value, even if @"" */
#define VSTR(str) ({id _str = str; (_str) ? _str : @"";})
#define VSTR(str) ({id _str = (id)str; (_str) ? (id)_str : (id)(@"");})
extern NSArray *predefinedNumberFormats;