--- a/dwt/internal/cocoa/NSSpeechSynthesizer.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSSpeechSynthesizer.d	Tue Aug 19 17:35:17 2008 +0200
@@ -13,8 +13,10 @@
  *******************************************************************************/
 module dwt.internal.cocoa.NSSpeechSynthesizer;
 
+import dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSArray;
 import dwt.internal.cocoa.NSDictionary;
+import dwt.internal.cocoa.NSInteger;
 import dwt.internal.cocoa.NSObject;
 import dwt.internal.cocoa.NSString;
 import dwt.internal.cocoa.NSURL;
@@ -51,12 +53,12 @@
 
     public void addSpeechDictionary (NSDictionary speechDictionary)
     {
-        OS.objc_msgSend(this.id, OS.sel_addSpeechDictionary_1, speechDictionary !is null ? speechDictionary.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_addSpeechDictionary_1, speechDictionary !is null ? speechDictionary.id_ : null);
     }
 
     public static NSDictionary attributesForVoice (NSString voice)
     {
-        objc.id result = OS.objc_msgSend(OS.class_NSSpeechSynthesizer, OS.sel_attributesForVoice_1, voice !is null ? voice.id : null);
+        objc.id result = OS.objc_msgSend(OS.class_NSSpeechSynthesizer, OS.sel_attributesForVoice_1, voice !is null ? voice.id_ : null);
         return result !is null ? new NSDictionary(result) : null;
     }
 
@@ -68,7 +70,7 @@
 
     public void continueSpeaking ()
     {
-        OS.objc_msgSend(this.id, OS.sel_continueSpeaking);
+        OS.objc_msgSend(this.id_, OS.sel_continueSpeaking);
     }
 
     public static NSString defaultVoice ()
@@ -79,13 +81,13 @@
 
     public id delegatee ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_delegate);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_delegate);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithVoice (NSString voice)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithVoice_1, voice !is null ? voice.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithVoice_1, voice !is null ? voice.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
@@ -96,96 +98,96 @@
 
     public bool isSpeaking ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isSpeaking) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isSpeaking) !is null;
     }
 
     public id objectForProperty (NSString property, objc.id** outError)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_objectForProperty_1error_1, property !is null ? property.id : null, outError);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_objectForProperty_1error_1, property !is null ? property.id_ : null, outError);
         return result !is null ? new id(result) : null;
     }
 
     public void pauseSpeakingAtBoundary (NSSpeechBoundar boundary)
     {
-        OS.objc_msgSend(this.id, OS.sel_pauseSpeakingAtBoundary_1, boundary);
+        OS.objc_msgSend(this.id_, OS.sel_pauseSpeakingAtBoundary_1, boundary);
     }
 
     public NSString phonemesFromText (NSString text)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_phonemesFromText_1, text !is null ? text.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_phonemesFromText_1, text !is null ? text.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
     public float rate ()
     {
-        return cast(float) OS.objc_msgSend_fpret(this.id, OS.sel_rate);
+        return cast(float) OS.objc_msgSend_fpret(this.id_, OS.sel_rate);
     }
 
     public void setDelegate (id anObject)
     {
-        OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anObject !is null ? anObject.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setDelegate_1, anObject !is null ? anObject.id_ : null);
     }
 
     public bool setObject (id object, NSString property, objc.id** outError)
     {
-        return OS.objc_msgSend(this.id, OS.sel_setObject_1forProperty_1error_1, object !is null ? object.id : null,
-                property !is null ? property.id : null, outError) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_setObject_1forProperty_1error_1, object !is null ? object.id_ : null,
+                property !is null ? property.id_ : null, outError) !is null;
     }
 
     public void setRate (float rate)
     {
-        OS.objc_msgSend(this.id, OS.sel_setRate_1, rate);
+        OS.objc_msgSend(this.id_, OS.sel_setRate_1, rate);
     }
 
     public void setUsesFeedbackWindow (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setUsesFeedbackWindow_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setUsesFeedbackWindow_1, flag);
     }
 
     public bool setVoice (NSString voice)
     {
-        return OS.objc_msgSend(this.id, OS.sel_setVoice_1, voice !is null ? voice.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_setVoice_1, voice !is null ? voice.id_ : null) !is null;
     }
 
     public void setVolume (float volume)
     {
-        OS.objc_msgSend(this.id, OS.sel_setVolume_1, volume);
+        OS.objc_msgSend(this.id_, OS.sel_setVolume_1, volume);
     }
 
     public bool startSpeakingString_ (NSString string)
     {
-        return OS.objc_msgSend(this.id, OS.sel_startSpeakingString_1, string !is null ? string.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_startSpeakingString_1, string !is null ? string.id_ : null) !is null;
     }
 
     public bool startSpeakingString_toURL_ (NSString string, NSURL url)
     {
-        return OS.objc_msgSend(this.id, OS.sel_startSpeakingString_1toURL_1, string !is null ? string.id : null, url !is null ? url.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_startSpeakingString_1toURL_1, string !is null ? string.id_ : null, url !is null ? url.id_ : null) !is null;
     }
 
     public void stopSpeaking ()
     {
-        OS.objc_msgSend(this.id, OS.sel_stopSpeaking);
+        OS.objc_msgSend(this.id_, OS.sel_stopSpeaking);
     }
 
     public void stopSpeakingAtBoundary (NSSpeechBoundar boundary)
     {
-        OS.objc_msgSend(this.id, OS.sel_stopSpeakingAtBoundary_1, boundary);
+        OS.objc_msgSend(this.id_, OS.sel_stopSpeakingAtBoundary_1, boundary);
     }
 
     public bool usesFeedbackWindow ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_usesFeedbackWindow) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_usesFeedbackWindow) !is null;
     }
 
     public NSString voice ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_voice);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_voice);
         return result !is null ? new NSString(result) : null;
     }
 
     public float volume ()
     {
-        return cast(float) OS.objc_msgSend_fpret(this.id, OS.sel_volume);
+        return cast(float) OS.objc_msgSend_fpret(this.id_, OS.sel_volume);
     }
 
 }