--- a/dwt/internal/cocoa/NSPrintPanel.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/internal/cocoa/NSPrintPanel.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,28 +1,24 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *     
  * Port to the D programming language:
- *     Jacob Carlborg <jacob.carlborg@gmail.com>
+ *    Jacob Carlborg <doob@me.com>
  *******************************************************************************/
 module dwt.internal.cocoa.NSPrintPanel;
 
-import dwt.internal.cocoa.id;
-import dwt.internal.cocoa.NSArray;
-import dwt.internal.cocoa.NSInteger;
+import dwt.dwthelper.utils;
+import cocoa = dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSObject;
 import dwt.internal.cocoa.NSPrintInfo;
-import dwt.internal.cocoa.NSString;
-import dwt.internal.cocoa.NSView;
-import dwt.internal.cocoa.NSViewController;
-import dwt.internal.cocoa.NSWindow;
 import dwt.internal.cocoa.OS;
+import dwt.internal.objc.cocoa.Cocoa;
 import objc = dwt.internal.objc.runtime;
 
 enum NSPrintPanelOptions : NSInteger
@@ -36,134 +32,35 @@
     NSPrintPanelShowsPreview = 0x20000
 }
 
-alias NSPrintPanelOptions.NSPrintPanelShowsCopies NSPrintPanelShowsCopies;
-alias NSPrintPanelOptions.NSPrintPanelShowsPageRange NSPrintPanelShowsPageRange;
-alias NSPrintPanelOptions.NSPrintPanelShowsPaperSize NSPrintPanelShowsPaperSize;
-alias NSPrintPanelOptions.NSPrintPanelShowsOrientation NSPrintPanelShowsOrientation;
-alias NSPrintPanelOptions.NSPrintPanelShowsScaling NSPrintPanelShowsScaling;
-alias NSPrintPanelOptions.NSPrintPanelShowsPageSetupAccessory NSPrintPanelShowsPageSetupAccessory;
-alias NSPrintPanelOptions.NSPrintPanelShowsPreview NSPrintPanelShowsPreview;
-
-public class NSPrintPanel : NSObject
-{
+public class NSPrintPanel : NSObject {
 
-    public this ()
-    {
-        super();
-    }
-
-    public this (objc.id id)
-    {
-        super(id);
-    }
-
-    public NSArray accessoryControllers ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_accessoryControllers);
-        return result !is null ? new NSArray(result) : null;
-    }
+public this() {
+    super();
+}
 
-    public NSView accessoryView ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_accessoryView);
-        return result !is null ? new NSView(result) : null;
-    }
-
-    public void addAccessoryController (NSViewController accessoryController)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_addAccessoryController_1, accessoryController !is null ? accessoryController.id_ : null);
-    }
+public this(objc.id id) {
+    super(id);
+}
 
-    public void beginSheetWithPrintInfo (NSPrintInfo printInfo, NSWindow docWindow, id delegatee, objc.SEL didEndSelector, void* contextInfo)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_beginSheetWithPrintInfo_1modalForWindow_1delegate_1didEndSelector_1contextInfo_1,
-                printInfo !is null ? printInfo.id_ : null, docWindow !is null ? docWindow.id_ : null, delegatee !is null ? delegatee.id_ : null,
-                didEndSelector, contextInfo);
-    }
-
-    public NSString defaultButtonTitle ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_defaultButtonTitle);
-        return result !is null ? new NSString(result) : null;
-    }
-
-    public void finalWritePrintInfo ()
-    {
-        OS.objc_msgSend(this.id_, OS.sel_finalWritePrintInfo);
-    }
-
-    public NSString helpAnchor ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_helpAnchor);
-        return result !is null ? new NSString(result) : null;
-    }
+public this(cocoa.id id) {
+    super(id);
+}
 
-    public NSString jobStyleHint ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_jobStyleHint);
-        return result !is null ? new NSString(result) : null;
-    }
-
-    public NSPrintPanelOptions options ()
-    {
-        return cast(NSPrintPanelOptions) OS.objc_msgSend(this.id_, OS.sel_options);
-    }
-
-    public NSPrintInfo printInfo ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_printInfo);
-        return result !is null ? new NSPrintInfo(result) : null;
-    }
-
-    public static NSPrintPanel printPanel ()
-    {
-        objc.id result = OS.objc_msgSend(OS.class_NSPrintPanel, OS.sel_printPanel);
-        return result !is null ? new NSPrintPanel(result) : null;
-    }
-
-    public void removeAccessoryController (NSViewController accessoryController)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_removeAccessoryController_1, accessoryController !is null ? accessoryController.id_ : null);
-    }
-
-    public NSInteger runModal ()
-    {
-        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_runModal);
-    }
+public NSPrintPanelOptions options() {
+    return cast(NSPrintPanelOptions) OS.objc_msgSend(this.id, OS.sel_options);
+}
 
-    public NSInteger runModalWithPrintInfo (NSPrintInfo printInfo)
-    {
-        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_runModalWithPrintInfo_1, printInfo !is null ? printInfo.id_ : null);
-    }
-
-    public void setAccessoryView (NSView accessoryView)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setAccessoryView_1, accessoryView !is null ? accessoryView.id_ : null);
-    }
-
-    public void setDefaultButtonTitle (NSString defaultButtonTitle)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setDefaultButtonTitle_1, defaultButtonTitle !is null ? defaultButtonTitle.id_ : null);
-    }
+public static NSPrintPanel printPanel() {
+    objc.id result = OS.objc_msgSend(OS.class_NSPrintPanel, OS.sel_printPanel);
+    return result !is null ? new NSPrintPanel(result) : null;
+}
 
-    public void setHelpAnchor (NSString helpAnchor)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setHelpAnchor_1, helpAnchor !is null ? helpAnchor.id_ : null);
-    }
-
-    public void setJobStyleHint (NSString hint)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setJobStyleHint_1, hint !is null ? hint.id_ : null);
-    }
+public NSInteger runModalWithPrintInfo(NSPrintInfo printInfo) {
+    return cast(NSInteger) OS.objc_msgSend(this.id, OS.sel_runModalWithPrintInfo_, printInfo !is null ? printInfo.id : null);
+}
 
-    public void setOptions (NSPrintPanelOptions options)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setOptions_1, options);
-    }
-
-    public void updateFromPrintInfo ()
-    {
-        OS.objc_msgSend(this.id_, OS.sel_updateFromPrintInfo);
-    }
+public void setOptions(NSPrintPanelOptions options) {
+    OS.objc_msgSend(this.id, OS.sel_setOptions_, options);
+}
 
 }