Merge branch 'master' of github.com:gnustep/libs-gui

Headers/AppKit/NSNibLoading.h

@@ -47,6 +47,15 @@
  */
 - (void) awakeFromNib;
 
+#if OS_API_VERSION(MAC_OS_X_VERSION_10_8, GS_API_LATEST)
+/**
+ * This method is called on a designable object to notify it that it
+ * was created at design time.  This allows IB/Gorm to set up the
+ * appearance of the object when loaded into the editor.
+ */
+- (void) prepareForInterfaceBuilder;
+#endif
+
 @end
 
 

Source/NSNib.m

@@ -53,6 +53,21 @@
 #import "AppKit/NSNibLoading.h"
 #import "GNUstepGUI/GSModelLoaderFactory.h"
 
+
+@implementation NSObject (NSNibLoading)
+
+- (void) awakeFromNib
+{
+  // empty implementation, so that all objects respond...
+}
+
+- (void) prepareForInterfaceBuilder
+{
+  // empty implementation, so that all objects respond...
+}
+
+@end
+
 @implementation NSNib
 
 // private method to read in the data...

Source/NSView.m

@@ -5231,10 +5231,6 @@ static NSView* findByTag(NSView *view, NSInteger aTag, NSUInteger *level)
   return 0;
 }
 
-- (void) awakeFromNib
-{
-}
-
 @end
 
 #if OS_API_VERSION(MAC_OS_X_VERSION_10_7, GS_API_LATEST)