--- a/dwt/internal/cocoa/NSPrintInfo.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSPrintInfo.d	Tue Aug 19 17:35:17 2008 +0200
@@ -25,26 +25,6 @@
 import dwt.internal.cocoa.OS;
 import objc = dwt.internal.objc.runtime;
 
-enum NSPrintingPaginationMod
-{
-    NSAutoPagination = 0,
-    NSFitPagination = 1,
-    NSClipPagination = 2
-}
-
-alias NSPrintingPaginationMod.NSAutoPagination NSAutoPagination;
-alias NSPrintingPaginationMod.NSFitPagination NSFitPagination;
-alias NSPrintingPaginationMod.NSClipPagination NSClipPagination;
-
-enum NSPrintingOrientation
-{
-    NSPortraitOrientation = 0,
-    NSLandscapeOrientation = 1
-}
-
-alias NSPrintingOrientation.NSPortraitOrientation NSPortraitOrientation;
-alias NSPrintingOrientation.NSLandscapeOrientation NSLandscapeOrientation;
-
 enum NSPrintingPaginationMode
 {
     NSAutoPagination = 0,
@@ -56,6 +36,15 @@
 alias NSPrintingPaginationMode.NSFitPagination NSFitPagination;
 alias NSPrintingPaginationMode.NSClipPagination NSClipPagination;
 
+enum NSPrintingOrientation
+{
+    NSPortraitOrientation = 0,
+    NSLandscapeOrientation = 1
+}
+
+alias NSPrintingOrientation.NSPortraitOrientation NSPortraitOrientation;
+alias NSPrintingOrientation.NSLandscapeOrientation NSLandscapeOrientation;
+
 public class NSPrintInfo : NSObject
 {
 
@@ -71,22 +60,22 @@
 
     public void* PMPageFormat ()
     {
-        return cast(void*) OS.objc_msgSend(this.id, OS.sel_PMPageFormat);
+        return cast(void*) OS.objc_msgSend(this.id_, OS.sel_PMPageFormat);
     }
 
     public void* PMPrintSession ()
     {
-        return cast(void*) OS.objc_msgSend(this.id, OS.sel_PMPrintSession);
+        return cast(void*) OS.objc_msgSend(this.id_, OS.sel_PMPrintSession);
     }
 
     public void* PMPrintSettings ()
     {
-        return cast(void*) OS.objc_msgSend(this.id, OS.sel_PMPrintSettings);
+        return cast(void*) OS.objc_msgSend(this.id_, OS.sel_PMPrintSettings);
     }
 
     public CGFloat bottomMargin ()
     {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id, OS.sel_bottomMargin);
+        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_bottomMargin);
     }
 
     public static NSPrinter defaultPrinter ()
@@ -97,168 +86,168 @@
 
     public NSMutableDictionary dictionary ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_dictionary);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_dictionary);
         return result !is null ? new NSMutableDictionary(result) : null;
     }
 
     public NSPrintingPaginationMode horizontalPagination ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_horizontalPagination);
+        return cast(NSPrintingPaginationMode) OS.objc_msgSend(this.id_, OS.sel_horizontalPagination);
     }
 
     public NSRect imageablePageBounds ()
     {
         NSRect result;
-        OS.objc_msgSend_stret(result, this.id, OS.sel_imageablePageBounds);
+        OS.objc_msgSend_stret(&result, this.id_, OS.sel_imageablePageBounds);
         return result;
     }
 
     public id initWithDictionary (NSDictionary attributes)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithDictionary_1, attributes !is null ? attributes.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithDictionary_1, attributes !is null ? attributes.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public bool isHorizontallyCentered ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isHorizontallyCentered) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isHorizontallyCentered) !is null;
     }
 
     public bool isVerticallyCentered ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isVerticallyCentered) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isVerticallyCentered) !is null;
     }
 
     public NSString jobDisposition ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_jobDisposition);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_jobDisposition);
         return result !is null ? new NSString(result) : null;
     }
 
     public CGFloat leftMargin ()
     {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id, OS.sel_leftMargin);
+        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_leftMargin);
     }
 
     public NSString localizedPaperName ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_localizedPaperName);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_localizedPaperName);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSPrintingOrientation orientation ()
     {
-        return cast(NSPrintingOrientation) OS.objc_msgSend(this.id, OS.sel_orientation);
+        return cast(NSPrintingOrientation) OS.objc_msgSend(this.id_, OS.sel_orientation);
     }
 
     public NSString paperName ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_paperName);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_paperName);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSSize paperSize ()
     {
         NSSize result;
-        OS.objc_msgSend_stret(result, this.id, OS.sel_paperSize);
+        OS.objc_msgSend_stret(&result, this.id_, OS.sel_paperSize);
         return result;
     }
 
     public NSMutableDictionary printSettings ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_printSettings);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_printSettings);
         return result !is null ? new NSMutableDictionary(result) : null;
     }
 
     public NSPrinter printer ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_printer);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_printer);
         return result !is null ? new NSPrinter(result) : null;
     }
 
     public CGFloat rightMargin ()
     {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id, OS.sel_rightMargin);
+        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_rightMargin);
     }
 
     public void setBottomMargin (CGFloat margin)
     {
-        OS.objc_msgSend(this.id, OS.sel_setBottomMargin_1, margin);
+        OS.objc_msgSend(this.id_, OS.sel_setBottomMargin_1, margin);
     }
 
     public static void setDefaultPrinter (NSPrinter printer)
     {
-        OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_setDefaultPrinter_1, printer !is null ? printer.id : null);
+        OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_setDefaultPrinter_1, printer !is null ? printer.id_ : null);
     }
 
     public void setHorizontalPagination (NSPrintingPaginationMode mode)
     {
-        OS.objc_msgSend(this.id, OS.sel_setHorizontalPagination_1, mode);
+        OS.objc_msgSend(this.id_, OS.sel_setHorizontalPagination_1, mode);
     }
 
     public void setHorizontallyCentered (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setHorizontallyCentered_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setHorizontallyCentered_1, flag);
     }
 
     public void setJobDisposition (NSString disposition)
     {
-        OS.objc_msgSend(this.id, OS.sel_setJobDisposition_1, disposition !is null ? disposition.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setJobDisposition_1, disposition !is null ? disposition.id_ : null);
     }
 
     public void setLeftMargin (CGFloat margin)
     {
-        OS.objc_msgSend(this.id, OS.sel_setLeftMargin_1, margin);
+        OS.objc_msgSend(this.id_, OS.sel_setLeftMargin_1, margin);
     }
 
     public void setOrientation (NSPrintingOrientation orientation)
     {
-        OS.objc_msgSend(this.id, OS.sel_setOrientation_1, orientation);
+        OS.objc_msgSend(this.id_, OS.sel_setOrientation_1, orientation);
     }
 
     public void setPaperName (NSString name)
     {
-        OS.objc_msgSend(this.id, OS.sel_setPaperName_1, name !is null ? name.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setPaperName_1, name !is null ? name.id_ : null);
     }
 
     public void setPaperSize (NSSize size)
     {
-        OS.objc_msgSend(this.id, OS.sel_setPaperSize_1, size);
+        OS.objc_msgSend(this.id_, OS.sel_setPaperSize_1, size);
     }
 
     public void setPrinter (NSPrinter printer)
     {
-        OS.objc_msgSend(this.id, OS.sel_setPrinter_1, printer !is null ? printer.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setPrinter_1, printer !is null ? printer.id_ : null);
     }
 
     public void setRightMargin (CGFloat margin)
     {
-        OS.objc_msgSend(this.id, OS.sel_setRightMargin_1, margin);
+        OS.objc_msgSend(this.id_, OS.sel_setRightMargin_1, margin);
     }
 
     public static void setSharedPrintInfo (NSPrintInfo printInfo)
     {
-        OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_setSharedPrintInfo_1, printInfo !is null ? printInfo.id : null);
+        OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_setSharedPrintInfo_1, printInfo !is null ? printInfo.id_ : null);
     }
 
     public void setTopMargin (CGFloat margin)
     {
-        OS.objc_msgSend(this.id, OS.sel_setTopMargin_1, margin);
+        OS.objc_msgSend(this.id_, OS.sel_setTopMargin_1, margin);
     }
 
     public void setUpPrintOperationDefaultValues ()
     {
-        OS.objc_msgSend(this.id, OS.sel_setUpPrintOperationDefaultValues);
+        OS.objc_msgSend(this.id_, OS.sel_setUpPrintOperationDefaultValues);
     }
 
     public void setVerticalPagination (NSPrintingPaginationMode mode)
     {
-        OS.objc_msgSend(this.id, OS.sel_setVerticalPagination_1, mode);
+        OS.objc_msgSend(this.id_, OS.sel_setVerticalPagination_1, mode);
     }
 
     public void setVerticallyCentered (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setVerticallyCentered_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setVerticallyCentered_1, flag);
     }
 
     public static NSPrintInfo sharedPrintInfo ()
@@ -270,28 +259,28 @@
     public static NSSize sizeForPaperName (NSString name)
     {
         NSSize result;
-        OS.objc_msgSend_stret(result, OS.class_NSPrintInfo, OS.sel_sizeForPaperName_1, name !is null ? name.id : null);
+        OS.objc_msgSend_stret(&result, OS.class_NSPrintInfo, OS.sel_sizeForPaperName_1, name !is null ? name.id_ : null);
         return result;
     }
 
     public CGFloat topMargin ()
     {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id, OS.sel_topMargin);
+        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_topMargin);
     }
 
     public void updateFromPMPageFormat ()
     {
-        OS.objc_msgSend(this.id, OS.sel_updateFromPMPageFormat);
+        OS.objc_msgSend(this.id_, OS.sel_updateFromPMPageFormat);
     }
 
     public void updateFromPMPrintSettings ()
     {
-        OS.objc_msgSend(this.id, OS.sel_updateFromPMPrintSettings);
+        OS.objc_msgSend(this.id_, OS.sel_updateFromPMPrintSettings);
     }
 
     public NSPrintingPaginationMode verticalPagination ()
     {
-        return cast(NSPrintingPaginationMode) OS.objc_msgSend(this.id, OS.sel_verticalPagination);
+        return cast(NSPrintingPaginationMode) OS.objc_msgSend(this.id_, OS.sel_verticalPagination);
     }
 
 }