* English.lproj/GormDocument.gorm: Correct issue with window.

* GormCore/GormDocument.m
	* GormCore/GormImageEditor.m
	* GormCore/GormObjectEditor.m
	* GormCore/GormSoundEditor.m: Fix memory leak.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@26467 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,11 @@
+2008-04-24 00:54-EDT Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* English.lproj/GormDocument.gorm: Correct issue with window.
+	* GormCore/GormDocument.m
+	* GormCore/GormImageEditor.m
+	* GormCore/GormObjectEditor.m
+	* GormCore/GormSoundEditor.m: Fix memory leak.
+
 2008-04-23 20:03-EDT Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Palettes/1Windows/GormNSWindowInspector.gorm: Connected the

English.lproj/GormDocument.gorm/data.classes

@@ -34,6 +34,13 @@
 	);
 	Super = NSDocument;
     };
+    GormDocumentWindow = {
+	Actions = (
+	);
+	Outlets = (
+	);
+	Super = NSWindow;
+    };
     GormFilePrefsManager = {
 	Actions = (
 	    "showIncompatibilities:",

GormCore/GormDocument.m

@@ -1160,6 +1160,18 @@ static NSImage  *fileImage = nil;
   NSDebugLog(@"Owner changed for %@", sender);
 }
 
+- (void) release
+{
+  [super release];
+}
+
+- (id) retain
+{
+  [super retain];
+  NSLog(@"Retaining document, retain count %d",[self retainCount]);
+  return self;
+}
+
 /**
  * Dealloc all things owned by a GormDocument object.
  */
@@ -1174,8 +1186,6 @@ static NSImage  *fileImage = nil;
   RELEASE(classManager);
   RELEASE(filePrefsManager);
   RELEASE(filePrefsView);
-  RELEASE(savedEditors);
-  RELEASE(openEditors);
   RELEASE(hidden);
 
   if (objToName != 0)
@@ -1196,6 +1206,8 @@ static NSImage  *fileImage = nil;
   RELEASE(topLevelObjects);
   RELEASE(visibleWindows);
   RELEASE(deferredWindows);
+  DESTROY(savedEditors);
+  DESTROY(openEditors);
 
   TEST_RELEASE(scmWrapper);
   [super dealloc];

GormCore/GormImageEditor.m

@@ -38,7 +38,7 @@ static NSMapTable *docMap = 0;
   if (self == [GormImageEditor class])
     {
       docMap = NSCreateMapTable(NSNonRetainedObjectMapKeyCallBacks,
-				NSObjectMapValueCallBacks, 2);
+				NSNonRetainedObjectMapValueCallBacks, 2);
     }
 }
 

GormCore/GormObjectEditor.m

@@ -98,8 +98,8 @@ static NSMapTable	*docMap = 0;
 {
   if (self == [GormObjectEditor class])
     {
-      docMap = NSCreateMapTable(NSObjectMapKeyCallBacks,
+      docMap = NSCreateMapTable(NSNonRetainedObjectMapKeyCallBacks,
-				NSObjectMapValueCallBacks, 
+				NSNonRetainedObjectMapValueCallBacks, 
 				2);
     }
 }

GormCore/GormSoundEditor.m

@@ -38,7 +38,7 @@ static NSMapTable *docMap = 0;
   if (self == [GormSoundEditor class])
     {
       docMap = NSCreateMapTable(NSNonRetainedObjectMapKeyCallBacks,
-				NSObjectMapValueCallBacks, 2);
+				NSNonRetainedObjectMapValueCallBacks, 2);
     }
 }