Add code to pull object from map so that connections work properly

Plugins/Xib/GormXibWrapperLoader.h

@@ -31,6 +31,7 @@
 
 @interface GormXibWrapperLoader : GormWrapperLoader
 {
+  NSMutableDictionary *_idToName;
   IBObjectContainer *_container;
   id _nibFilesOwner;
 }

Plugins/Xib/GormXibWrapperLoader.m

@@ -49,11 +49,30 @@
  * Xib loader...
  */
 @implementation GormXibWrapperLoader
+
 + (NSString *) fileType
 {
   return @"GSXibFileType";
 }
 
+- (instancetype) init
+{
+  self = [super init];
+  if (self != nil)
+    {
+      _idToName = [[NSMutableDictionary alloc] init];
+      _container = nil;
+      _nibFilesOwner = nil;
+    }
+  return self;
+}
+
+- (void) dealloc
+{
+  RELEASE(_idToName);
+  [super dealloc];
+}
+
 - (id) _replaceProxyInstanceWithRealObject: (id)obj
 			      classManager: (GormClassManager *)classManager
 				    withID: (NSString *)theId
@@ -70,15 +89,6 @@
         {
           return [document firstResponder];
         }
-      else
-	{
-	  [classManager addClassNamed: className
-		  withSuperClassNamed: @"NSObject"
-			  withActions: nil
-			  withOutlets: nil
-			     isCustom: YES];
-	  	  
-	}
     }
   else if ([obj respondsToSelector: @selector(className)])
     {
@@ -87,7 +97,15 @@
     }
   else if (obj == nil)
     {
-      return [document firstResponder];
+      id o = [_idToName objectForKey: theId];
+      if (o != nil)
+	{
+	  return o;
+	}
+      else
+	{
+	  return [document firstResponder];
+	}
     }
   
   return obj;
@@ -135,12 +153,8 @@
 	      //
 	      // Special internal classes
 	      // 
-	      /*
+#pragma GCC diagnostic push
-	      [u setClass: [GormObjectProxy class]
+#pragma GCC diagnostic ignored "-Wreceiver-forward-class"
-		 forClassName: @"NSCustomObject"];
-	      [u setClass: [GormObjectProxy class]
-  	         forClassName: @"NSCustomObject5"];
-	      */
 	      [u setClass: [GormCustomView class] 
 		 forClassName: @"NSCustomView"];
 	      [u setClass: [GormWindowTemplate class] 
@@ -151,6 +165,7 @@
 		 forClassName: @"NSMenu"];
               [u setClass: [IBUserDefinedRuntimeAttribute class]
                  forClassName: @"IBUserDefinedRuntimeAttribute5"];
+#pragma GCC diagnostic pop
 	      
 	      //
 	      // Substitute any classes specified by the palettes...
@@ -348,13 +363,13 @@
 			{
 			  theName = [doc instantiateClassNamed: customClassName];
 			}
-		      
+
-		      /*
+		      // Set up the mapping...
-                      NSDebugLog(@"Assigning %@ as customClass = %@", theName, customClassName);
+		      if (theName != nil)
-                      [classManager setCustomClass: customClassName
+			{
-                                           forName: theName];
+			  [_idToName setObject: theName forKey: theId];
-		      */
+			}
-                    }
+		    }
                   
 		  /*
                    * add connections...