Commit 66a596ee authored by Gürkan Myczko's avatar Gürkan Myczko Committed by Yavor Doganov

Import Debian changes 1.2.23-1

gorm.app (1.2.23-1) unstable; urgency=medium

  [ Gürkan Myczko ]
  * New upstream version.
    + Drop patches/fix-gorm-loading.patch: not needed anymore.
  * Update my name.
  * debian/control: Bump standards version to 3.9.8.
  * Bump debhelper version to 9.
  * Remove empty MimeType field from desktop file.

  [ Axel Beckert ]
  * Update Vcs-* header to https and cgit.
  * debian/copyright: Remove invalid backslash escaped line breaks.
  * Enable parallel building.
  * Enable all hardening build flags.
  * Remove gorm.app-dbg in favour of an automatic gorm.app-dbgsym package.
parents b4113299 982c1f56
*.app
*.debug
*.profile
*.palette
*obj
.gdbinit
1 ANNOUNCE
**********
This is version 1.2.20 of Gorm.
This is version 1.2.23 of Gorm.
1.1 What is Gorm?
=================
......@@ -12,17 +12,11 @@ GNUstep Object Relationship Modeler).
Gorm is a clone of the Cocoa (OpenStep/NeXTSTEP) `Interface Builder'
application for GNUstep.
1.2 Noteworthy changes in version `1.2.20'
1.2 Noteworthy changes in version `1.2.23'
==========================================
* Bug fixes #28643, #32827
* Corrected issues with updating document when there is a change.
* Add cells as objects to the document so they can be properly
edited.
* Changes to prevent recursive frame change notifications.
* Fix for issue where NSPanel was being saved as an NSWindow in some
cases.
1.3 How can I get support for this software?
============================================
......
2015-11-05 20:40-EST Gregory John Casamento <greg.casamento@gmail.com>
* GormCore/GormWindowTemplate.m: in baseWindowClass return
GormNSPanel if _windowClass is NSPanel. This should probably
use GormPalettesManager substituteClasses at some point, but
for now this is a workable solution.
2015-05-20 06:19-EDT Gregory John Casamento <greg.casamento@gmail.com>
* ANNOUNCE
* NEWS
* Version: 1.2.22
2015-05-20 06:16-EDT Gregory John Casamento <greg.casamento@gmail.com>
* ChangeLog
* Documentation/news.texi
* English.lproj/GormPrefGeneral.gorm
* GormCore/GormFilePrefsManager.m
* GormInfo.plist
* GormPrefs/GormGeneralPref.m
* Plugins/Gorm/GormGormWrapperLoader.m: Remove calls to repairFile:
as some of the logic in it is outdated and could cause issues with
perfectly good gorm files. Disabling pending further development.
* Version
2015-05-11 Gregory John Casamento <greg.casamento@gmail.com
* GormLib/IBObjectAdditions.m: Removed canSubstituteForClass:
dummy implementation. The reason for this is because some objc
runtime implementations do not smash categories the same and
do not allow replacement of class methods. For this reason
it was failing on some operating systems. Fixes bug#45040.
2015-04-17 Riccardo Mottola <rm@gnu.org>
* Palettes/3Containers/GormTabViewAttributesInspector.m
* Palettes/3Containers/GormBrowserAttributesInspector.m
* GormCore/GormFilePrefsManager.m
Use cast to larger type for string formatting to allow
compilation on Solaris.
2015-03-02 00:04-EST Gregory John Casamento <greg.casamento@gmail.com>
* GormObjCHeaderParser/NSScanner+OCHeaderParser.m
* GormObjCHeaderParser/OCHeaderParser.m: Fix for crash seen after
last commit.
2015-03-02 00:04-EST Gregory John Casamento <greg.casamento@gmail.com>
* GormObjCHeaderParser/OCHeaderParser.m: Add _stripRedundantStatements
method which eliminates excess empty statements from the code which
could confuse the parser.
2015-02-22 21:21-EST Gregory John Casamento <greg.casamento@gmail.com>
* English.lproj/GormPreferences.gorm: Removed from pulldown menu
* English.lproj/GormPrefGuideline.gorm: Added colorwell and
connections.
* GormPrefs/GNUmakefile: Removed classes.
* GormPrefs/GormColorsPref.h
* GormPrefs/GormColorsPref.m: Removed.
* GormPrefs/GormGuidelinePref.h
* GormPrefs/GormGuidelinePref.m: Added color well...
* GormPrefs/GormPrefController.m: Removed view from case statement
2014-10-28 03:08-EDT Gregory John Casamento <greg.casamento@gmail.com>
* English.lproj/Gorm.gorm: Change connection to point to
new selectAll:
* GormCore/GormWrapperLoader.m: Fix for bug #42782
* Gorm.m: Add select all method.
2014-08-31 Fred Kiefer <FredKiefer@gmx.de>
* GormCore/GormDocument.m: Rewrite fix for bug #39072 to stop
leaking memory.
2014-07-21 Fred Kiefer <FredKiefer@gmx.de>
* GormCore/GormImage.m: Fix the init issue for the second
method as well. Small cleanup.
2014-05-31 10:58-EDT Gregory John Casamento <greg.casamento@gmail.com>
* GormCore/GormDocumentController.h: add declaration of
openDocumentForContentsOfURL:
* GormCore/GormDocumentController.m: add implementation of
openDocumentForContentsOfURL:
* GormCore/GormDocument.m: Add implementation of revertContentsOfURL:..
Fix bug#28644
2014-05-30 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
* Palettes/2Controls/GormColorWellAttributesInspector.h
fix typo in header guard
* Palettes/2Controls/GormFormAttributesInspector.m
fix some format string warnings
2014-05-28 Riccardo Mottola <rm@gnu.org>
* GormCore/GormClassInspector.m
* GormCore/GormClassManager.m
* GormCore/GormFilePrefsManager.m
* GormCore/GormInspectorsManager.m
Explicitely cast NSIntegers to avoid warning and problems.
2014-05-27 03:26-EDT Gregory John Casamento <greg.casamento@gmail.com>
* GormCore/GormInspectorsManager.m
* Palettes/2Controls/GormMatrixAttributesInspector.h
* Palettes/2Controls/GormMatrixAttributesInspector.m
* Palettes/2Controls/GormNSMatrixInspector.gorm: Fix for bug #28646.
2014-05-27 03:15-EDT Gregory John Casamento <greg.casamento@gmail.com>
* GormCore/GormDocument.m: Fix bug #39072: add retain to prevent
segmentation fault when renaming object in document view.
2014-05-26 19:25-EDT Gregory John Casamento <greg.casamento@gmail.com>
* GormObjCHeaderParser/OCIVarDecl.m
* GormObjCHeaderParser/OCIVar.m: Fix for bug#30837.
2014-05-26 18:32-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Palettes/2Controls/GormFormAttributesInspector.h
* Palettes/2Controls/GormFormAttributesInspector.m
* Palettes/2Controls/GormNSFormInspector.gorm: Accept patch on
bug#38477 by Sergei Golovin. Allows user to modify the
number of items in an NSForm using the inspector.
2014-01-19 Fred Kiefer <FredKiefer@gmx.de>
* Palettes/2Controls/GormButtonAttributesInspector.h: Use NSButton
instead of the non-existign NSSwitch.
* GormCore/GormViewKnobs.m: Replace DPS calls. Only realloc
rect lists if needed.
* Plugins/Gorm/GormGormWrapperBuilder.m,
* Palettes/2Controls/GormPopUpButtonAttributesInspector.m,
* Palettes/2Controls/GormButtonEditor.m: Remove compiler warnings.
2014-01-19 Fred Kiefer <FredKiefer@gmx.de>
* GormCore/GormResourceManager.m,
* GormCore/GormResource.m,
* GormCore/GormOutlineView.m,
* GormCore/GormObjectEditor.m,
* GormCore/GormClassManager.m: Remove compiler warnings.
2014-01-19 Fred Kiefer <FredKiefer@gmx.de>
* GormInfo.plist: Don't claim to be able to write XIB files.
2013-12-31 Fred Kiefer <FredKiefer@gmx.de>
* GormCore/GormResourceManager.m (-resourcePasteboardTypes): Add
IBMenuPboardType to work around menus not being draggable.
2013-11-04 10:03-EST Gregory John Casamento <greg.casamento@gmail.com>
* GormCore/GormBoxEditor.m
* GormCore/GormClassEditor.m
* GormCore/GormClassInspector.m
* GormCore/GormClassManager.m
* GormCore/GormControlEditor.m
* GormCore/GormCustomView.m
* GormCore/GormDocument.m
* GormCore/GormDocumentWindow.m
* GormCore/GormFilePrefsManager.h
* GormCore/GormFilePrefsManager.m
* GormCore/GormFunctions.h
* GormCore/GormFunctions.m
* GormCore/GormInspectorsManager.m
* GormCore/GormInternalViewEditor.m
* GormCore/GormMatrixEditor.h
* GormCore/GormMatrixEditor.m
* GormCore/GormNSPanel.h
* GormCore/GormNSPanel.m
* GormCore/GormNSWindow.h
* GormCore/GormNSWindow.m
* GormCore/GormObjectEditor.m
* GormCore/GormObjectInspector.m
* GormCore/GormOutlineView.m
* GormCore/GormPrivate.h
* GormCore/GormPrivate.m
* GormCore/GormResourceEditor.m
* GormCore/GormResourceManager.m
* GormCore/GormSoundView.m
* GormCore/GormSplitViewEditor.m
* GormCore/GormStandaloneViewEditor.m
* GormCore/GormViewEditor.m
* GormCore/GormViewKnobs.m
* GormCore/GormViewWithContentViewEditor.m
* GormCore/GormViewWithSubviewsEditor.m: int -> NSInteger transition.
2013-10-26 Fred Kiefer <FredKiefer@gmx.de>
* Plugins/Nib/GormNibWrapperBuilder.m (-initWithDocument:):
Don't store nil values in maps.
2013-10-26 Riccardo Mottola <rm@gnu.org>
* Plugins/Nib/GormNibWrapperBuilder.m
Write warnings of respectively the proper nil object.
2013-10-19 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
* GormCore/GormClassEditor.m
* GormCore/GormFilePrefsManager.m
* Palettes/3Containers/GormBrowserAttributesInspector.m
* Palettes/3Containers/GormTabViewAttributesInspector.m
fix format strings
2013-10-14 Eric Wasylishen <ewasylishen@gmail.com>
* Palettes/2Controls/GormNSMatrixInspector.gorm:
* Palettes/2Controls/GormNSSliderInspector.gorm:
* Palettes/2Controls/GormNSBoxInspector.gorm:
* Palettes/2Controls/GormNSTextFieldInspector.gorm:
* Palettes/2Controls/GormNSPopUpButtonInspector.gorm:
* Palettes/2Controls/GormNSButtonInspector.gorm:
* Palettes/2Controls/ControlsPalette.gorm:
* Palettes/2Controls/GormNSFormInspector.gorm:
* Palettes/2Controls/GormNSCellInspector.gorm:
* Palettes/0Menus/GormMenuAttributesInspector.gorm:
* Palettes/3Containers/GormNSTableColumnSizeInspector.gorm:
* Palettes/3Containers/GormTabViewInspector.gorm:
* Palettes/3Containers/GormNSTableViewInspector.gorm:
* Palettes/3Containers/GormNSBrowserInspector.gorm:
* Palettes/1Windows/GormNSWindowSizeInspector.gorm:
* Palettes/1Windows/GormNSWindowInspector.gorm:
* Palettes/4Data/GormNSComboBoxInspector.gorm:
* Palettes/4Data/GormNSImageViewInspector.gorm:
* Palettes/4Data/GormNSTextViewInspector.gorm:
Turn off "Draws Background" on NSMatrix and NSForms; there's no need
to draw backgrounds and it may look bad with themes.
2013-07-03 Niels Grewe <niels.grewe@halbordnung.de>
* InterfaceBuilder/InterfaceBuilder.h: Fix incorrect header inclusion guard.
2013-06-05 Riccardo Mottola <rm@gnu.org>
* GormCore/GormSetNameController.h
* GormCore/GormSetNameController.m
Make runModal return NSInteger
2013-05-26: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
* Palettes/3Containers/GormNSOutlineView.m
* GormCore/GormMatrixEditor.m
* GormCore/GormClassEditor.m
some int -> NSInteger and float -> CGFloat transitions
spotted by libobjc2 runtime in debug mode
2013-04-14 13:19-EDT Gregory John Casamento <greg.casamento@gmail.com>
* ANNOUNCE
......
*.log
*.dvi
*.ps
*.html
*.info
*.aux
*.toc
*.cp
*.fn
*.vr
*.tp
*.ky
*.pg
*.ps
*.vrs
......@@ -4,6 +4,26 @@
@include version.texi
@end ifset
@section Noteworthy changes in version @samp{1.2.23}
@itemize @bullet
@item Fix for issue where NSPanel was being saved as an NSWindow in some cases.
@end itemize
@ifclear ANNOUNCE-ONLY
@section Noteworthy changes in version @samp{1.2.22}
@itemize @bullet
@item Fix for bug#45040: Fix allows Gorm custom class functionality to work normally on OpenBSD/NetBSD/FreeBSD.
@item Fixes for Solaris
@item Memory leak fixes.
@item Objective-C parser improvements.
@end itemize
@c ====================================================================
@c Keep the next line just below the list of changes in most recent version.
@section Noteworthy changes in version @samp{1.2.20}
@itemize @bullet
......@@ -13,10 +33,6 @@
@item Changes to prevent recursive frame change notifications.
@end itemize
@ifclear ANNOUNCE-ONLY
@c ====================================================================
@c Keep the next line just below the list of changes in most recent version.
@section Noteworthy changes in version @samp{1.2.18}
@itemize @bullet
......
......@@ -14,9 +14,10 @@
Outlets = (
spacingSlider,
window,
_view,
"_view",
currentSpacing,
halfSpacing
halfSpacing,
colorWell
);
Super = NSObject;
};
......
......@@ -24,6 +24,23 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
ifeq ($(GNUSTEP_MAKEFILES),)
GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
ifeq ($(GNUSTEP_MAKEFILES),)
$(warning )
$(warning Unable to obtain GNUSTEP_MAKEFILES setting from gnustep-config!)
$(warning Perhaps gnustep-make is not properly installed,)
$(warning so gnustep-config is not in your PATH.)
$(warning )
$(warning Your PATH is currently $(PATH))
$(warning )
endif
endif
ifeq ($(GNUSTEP_MAKEFILES),)
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
endif
PACKAGE_NAME = gorm
export PACKAGE_NAME
include $(GNUSTEP_MAKEFILES)/common.make
......@@ -183,3 +200,5 @@ include $(GNUSTEP_MAKEFILES)/aggregate.make
include $(GNUSTEP_MAKEFILES)/application.make
-include GNUmakefile.postamble
include $(GNUSTEP_MAKEFILES)/Master/nsis.make
......@@ -713,11 +713,26 @@
[(id<IBSelectionOwners,IBEditors>)selectionOwner deleteSelection];
}
- (void) selectAll: (id)sender
{
if ([[selectionOwner selection] count] == 0
|| [selectionOwner respondsToSelector: @selector(deleteSelection)] == NO)
return;
if([self isConnecting])
{
[self stopConnecting];
}
[(id<IBSelectionOwners,IBEditors>)selectionOwner deleteSelection];
}
/*
- (void) selectAllItems: (id)sender
{
/* TODO: Select all items in the current selection owner. */
return;
}
*/
- (void) setName: (id)sender
{
......
......@@ -99,8 +99,8 @@
- (void) deleteSelection
{
int i = 0;
int count = [selection count];
NSInteger i = 0;
NSInteger count = [selection count];
id temp = nil;
for (i = count - 1; i >= 0; i--)
......
......@@ -273,7 +273,7 @@ NSImage *browserImage = nil;
{
if([classesView contentView] == scrollView)
{
int row = [outlineView selectedRow];
NSInteger row = [outlineView selectedRow];
if ( row == -1 )
{
row = 0;
......@@ -314,7 +314,7 @@ NSImage *browserImage = nil;
NSMutableArray *subClassesArray = [NSMutableArray array];
NSEnumerator *en;
int row = 0;
int col = 0;
NSInteger col = 0;
if ( ( className != nil )
&& ( [className isEqual: @"CustomView"] == NO )
......@@ -426,7 +426,7 @@ NSImage *browserImage = nil;
if([classesView contentView] == scrollView)
{
int i = [outlineView selectedRow];
NSInteger i = [outlineView selectedRow];
if (i >= 0 && i <= ([outlineView numberOfRows] - 1))
{
......@@ -507,7 +507,7 @@ NSImage *browserImage = nil;
- (void) deleteSelection
{
id anitem;
int i = [outlineView selectedRow];
NSInteger i = [outlineView selectedRow];
NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
// if no selection, then return.
......@@ -820,7 +820,7 @@ NSImage *browserImage = nil;
itemSelected];
if(newClassName != nil)
{
int i = 0;
NSInteger i = 0;
if([classesView contentView] == scrollView)
{
[outlineView reloadData];
......@@ -1065,12 +1065,12 @@ objectValueForTableColumn: (NSTableColumn *)aTableColumn
}
else if ([identifier isEqualToString: @"outlets"])
{
return [NSString stringWithFormat: @"%d",
return [NSString stringWithFormat: @"%"PRIuPTR,
[[classManager allOutletsForClassNamed: className] count]];
}
else if ([identifier isEqualToString: @"actions"])
{
return [NSString stringWithFormat: @"%d",
return [NSString stringWithFormat: @"%"PRIuPTR,
[[classManager allActionsForClassNamed: className] count]];
}
......@@ -1171,7 +1171,7 @@ objectValueForTableColumn: (NSTableColumn *)aTableColumn
rename = [document renameConnectionsForClassNamed: item toName: anObject];
if (rename)
{
int row = 0;
NSInteger row = 0;
[classManager renameClassNamed: item newName: anObject];
[gov reloadData];
......@@ -1191,7 +1191,7 @@ objectValueForTableColumn: (NSTableColumn *)aTableColumn
[gov setNeedsDisplay: YES];
}
- (int) outlineView: (NSOutlineView *)anOutlineView
- (NSInteger) outlineView: (NSOutlineView *)anOutlineView
numberOfChildrenOfItem: (id)item
{
NSArray *subclasses = [classManager subClassesOf: item];
......@@ -1213,7 +1213,7 @@ numberOfChildrenOfItem: (id)item
}
- (id) outlineView: (NSOutlineView *)anOutlineView
child: (int)index
child: (NSInteger)index
ofItem: (id)item
{
NSArray *subclasses = [classManager subClassesOf: item];
......@@ -1309,7 +1309,7 @@ shouldEditTableColumn: (NSTableColumn *)tableColumn
- (void) outlineViewSelectionDidChange: (NSNotification *)notification
{
id object = [notification object];
int row = [object selectedRow];
NSInteger row = [object selectedRow];
if(row != -1)
{
......@@ -1339,7 +1339,7 @@ shouldEditTableColumn: (NSTableColumn *)tableColumn
NSArray *classes = nil;
NSEnumerator *en = nil;
NSString *className = nil;
int i = 0;
NSInteger i = 0;
if (sender != browserView || !matrix || ![matrix isKindOfClass:[NSMatrix class]])
{
......
......@@ -538,7 +538,7 @@ objectValueForTableColumn: (NSTableColumn *)tc
{
if([classManager isCustomClass: name])
{
NSString *title = [NSString stringWithFormat: _(@"Modifying/Reparenting Class")];
NSString *title = _(@"Modifying/Reparenting Class");
NSString *msg = [NSString stringWithFormat: _(@"This action may break existing connections "
@"to instances of class '%@'"
@"and it's subclasses. Continue?"), name];
......@@ -644,8 +644,8 @@ objectValueForTableColumn: (NSTableColumn *)tc
- (void) setObject: (id)anObject
{
int outletsCount = 0;
int actionsCount = 0;
NSInteger outletsCount = 0;
NSInteger actionsCount = 0;
NSTabViewItem *item = nil;
if([anObject isKindOfClass: [GormClassProxy class]])
......@@ -658,9 +658,9 @@ objectValueForTableColumn: (NSTableColumn *)tc
actionsCount = [[classManager allActionsForClassNamed: currentClass] count];
item = [tabView tabViewItemAtIndex: 1]; // actions;
[item setLabel: [NSString stringWithFormat: @"Actions (%d)",actionsCount]];
[item setLabel: [NSString stringWithFormat: @"Actions (%ld)",(long)actionsCount]];
item = [tabView tabViewItemAtIndex: 0]; // outlets;
[item setLabel: [NSString stringWithFormat: @"Outlets (%d)",outletsCount]];
[item setLabel: [NSString stringWithFormat: @"Outlets (%ld)",(long)outletsCount]];
[tabView setNeedsDisplay: YES];
[self _refreshView];
......
......@@ -171,11 +171,11 @@
- (NSString *) uniqueClassNameFrom: (NSString *)name
{
NSString *search = [NSString stringWithString: name];
int i = 1;
NSInteger i = 1;
while([classInformation objectForKey: search])
{
search = [name stringByAppendingString: [NSString stringWithFormat: @"%d",i++]];
search = [name stringByAppendingString: [NSString stringWithFormat: @"%ld",(long)i++]];
}
return search;
......@@ -220,11 +220,11 @@
NSString *newAction = @"newAction";
NSString *search = [newAction stringByAppendingString: @":"];
NSString *new = nil;
int i = 1;
NSInteger i = 1;
while ([combined containsObject: search])
{
new = [newAction stringByAppendingFormat: @"%d", i++];
new = [newAction stringByAppendingFormat: @"%ld", (long)i++];
search = [new stringByAppendingString: @":"];
}
......@@ -237,11 +237,11 @@
NSArray *combined = [self allOutletsForClassNamed: name];
NSString *newOutlet = @"newOutlet";
NSString *new = newOutlet;
int i = 1;
NSInteger i = 1;
while ([combined containsObject: new])
{
new = [newOutlet stringByAppendingFormat: @"%d", i++];
new = [newOutlet stringByAppendingFormat: @"%ld", (long)i++];
}
[self addOutlet: new forClassNamed: name];
......@@ -447,19 +447,19 @@
// replace the action in the appropriate places.
if ([extraActions containsObject: oldAction])
{
int extra_index = [extraActions indexOfObject: oldAction];
NSInteger extra_index = [extraActions indexOfObject: oldAction];
[extraActions replaceObjectAtIndex: extra_index withObject: newAction];
}
if ([actions containsObject: oldAction])
{
int actions_index = [actions indexOfObject: oldAction];
NSInteger actions_index = [actions indexOfObject: oldAction];
[actions replaceObjectAtIndex: actions_index withObject: newAction];
}
if ([allActions containsObject: oldAction])
{
int all_index = [allActions indexOfObject: oldAction];
NSInteger all_index = [allActions indexOfObject: oldAction];
[allActions replaceObjectAtIndex: all_index withObject: newAction];
}
......@@ -498,19 +498,19 @@
// replace outlets in appropriate places...
if ([extraOutlets containsObject: oldOutlet])
{
int extraIndex = [extraOutlets indexOfObject: oldOutlet];
NSInteger extraIndex = [extraOutlets indexOfObject: oldOutlet];
[extraOutlets replaceObjectAtIndex: extraIndex withObject: newOutlet];
}
if ([outlets containsObject: oldOutlet])
{
int outletsIndex = [outlets indexOfObject: oldOutlet];
NSInteger outletsIndex = [outlets indexOfObject: oldOutlet];
[outlets replaceObjectAtIndex: outletsIndex withObject: newOutlet];
}
if ([allOutlets containsObject: oldOutlet])
{
int allIndex = [allOutlets indexOfObject: oldOutlet];
NSInteger allIndex = [allOutlets indexOfObject: oldOutlet];
[allOutlets replaceObjectAtIndex: allIndex withObject: newOutlet];
}
......@@ -1457,11 +1457,9 @@
{
NSDictionary *classInfo = [dict objectForKey: key];
NSMutableDictionary *newInfo;
NSMutableDictionary *oldInfo;
id obj;
newInfo = [[NSMutableDictionary alloc] init];
oldInfo = [classInformation objectForKey: key];
[classInformation setObject: newInfo forKey: key];
......@@ -1921,7 +1919,7 @@
@"actions/outlets to instances of class '%@' "
@"and it's subclasses. Continue?"),
className];
int retval = NSRunAlertPanel(title, msg,_(@"OK"),_(@"Cancel"), nil, nil);
NSInteger retval = NSRunAlertPanel(title, msg,_(@"OK"),_(@"Cancel"), nil, nil);
if (retval == NSAlertDefaultReturn)
{
......@@ -2227,11 +2225,11 @@
NSArray *classNames = [self allClassNames];
NSEnumerator *en = [classNames objectEnumerator];
NSString *className = nil;
int namelen = [name length];
NSInteger namelen = [name length];
while((className = [en nextObject]) != nil)
{
int classlen = [className length];
NSInteger classlen = [className length];
if(namelen < classlen)
{
NSComparisonResult result =
......
......@@ -64,8 +64,8 @@
{
NSSize size = [self frame].size;
NSSize constrainedSize;
int col;
int row; <