--- a/dstep/foundation/NSNotification.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSNotification.d	Sun Jan 03 22:06:11 2010 +0100
@@ -6,16 +6,40 @@
  */
 module dstep.foundation.NSNotification;
 
+import dstep.foundation.NSCoder;
 import dstep.foundation.NSDictionary;
 import dstep.foundation.NSObject;
 import dstep.foundation.NSString;
+import dstep.foundation.NSZone;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
+
+const TNSNotificationCreation = `
+
+	static Object notificationWithName (NSString aName, Object anObject)
+	{
+		return invokeObjcSuperClass!(Object, "notificationWithName:object:", NSString, Object)(aName, anObject);
+	}
+
+	static Object notificationWithName (NSString aName, Object anObject, NSDictionary aUserInfo)
+	{
+		return invokeObjcSuperClass!(Object, "notificationWithName:object:userInfo:", NSString, Object, NSDictionary)(aName, anObject, aUserInfo);
+	}
+`;
 
 class NSNotification : NSObject, INSCopying, INSCoding
 {
-	mixin ObjcWrap;
-	mixin TNSNotificationCreation;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	NSString name ()
 	{
@@ -49,23 +73,38 @@
 
 	this (NSCoder aDecoder)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithCoder:", NSCoder)(objcObject, aDecoder);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initWithCoder(aDecoder);
+	}
+	
+	// TNSNotificationCreation
+	static Object notificationWithName (NSString aName, Object anObject)
+	{
+		return invokeObjcSuperClass!(Object, "notificationWithName:object:", NSString, Object)(aName, anObject);
+	}
+	
+	static Object notificationWithName (NSString aName, Object anObject, NSDictionary aUserInfo)
+	{
+		return invokeObjcSuperClass!(Object, "notificationWithName:object:userInfo:", NSString, Object, NSDictionary)(aName, anObject, aUserInfo);
 	}
 }
 
 class NSNotificationCenter : NSObject
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	static Object defaultCenter ()
 	{
-		return invokeObjcSelfClass!(Object, "defaultCenter");
+		return invokeObjcSuperClass!(Object, "defaultCenter");
 	}
 
 	void addObserver (Object observer, SEL aSelector, NSString aName, Object anObject)
@@ -97,18 +136,4 @@
 	{
 		return invokeObjcSelf!(void, "removeObserver:name:object:", Object, NSString, Object)(observer, aName, anObject);
 	}
-}
-
-template TNSNotificationCreation ()
-{
-	static Object notificationWithName (NSString aName, Object anObject)
-	{
-		return invokeObjcSelfClass!(Object, "notificationWithName:object:", NSString, Object)(aName, anObject);
-	}
-
-	static Object notificationWithName (NSString aName, Object anObject, NSDictionary aUserInfo)
-	{
-		return invokeObjcSelfClass!(Object, "notificationWithName:object:userInfo:", NSString, Object, NSDictionary)(aName, anObject, aUserInfo);
-	}
-}
-
+}
\ No newline at end of file