53358

6 files changed, 725 insertions, 664 deletions

diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
index e4d911b5e3..7161607a21 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
@@ -870,6 +870,9 @@ OS_CGDataProviderCreateWithData_3=cast=(void *)
 OS_CGDataProviderRelease=
 OS_CGDataProviderRelease_0=cast=(CGDataProviderRef)
 
+OS_CGDisplayBaseAddress=
+OS_CGDisplayBaseAddress_0=cast=(CGDirectDisplayID)
+
 OS_CGDisplayBitsPerPixel=
 OS_CGDisplayBitsPerPixel_0=cast=(CGDirectDisplayID)
 
@@ -879,6 +882,12 @@ OS_CGDisplayBitsPerSample_0=cast=(CGDirectDisplayID)
 OS_CGDisplayBytesPerRow=
 OS_CGDisplayBytesPerRow_0=cast=(CGDirectDisplayID)
 
+OS_CGDisplayPixelsHigh=
+OS_CGDisplayPixelsHigh_0=cast=(CGDirectDisplayID)
+
+OS_CGDisplayPixelsWide=
+OS_CGDisplayPixelsWide_0=cast=(CGDirectDisplayID)
+
 OS_CGFontCreateWithPlatformFont=
 OS_CGFontCreateWithPlatformFont_0=
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
index 469822f852..63325c212a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
@@ -1457,6 +1457,18 @@ JNIEXPORT void JNICALL OS_NATIVE(CGDataProviderRelease)
 }
 #endif
 
+#ifndef NO_CGDisplayBaseAddress
+JNIEXPORT jint JNICALL OS_NATIVE(CGDisplayBaseAddress)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	OS_NATIVE_ENTER(env, that, CGDisplayBaseAddress_FUNC);
+	rc = (jint)CGDisplayBaseAddress((CGDirectDisplayID)arg0);
+	OS_NATIVE_EXIT(env, that, CGDisplayBaseAddress_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_CGDisplayBitsPerPixel
 JNIEXPORT jint JNICALL OS_NATIVE(CGDisplayBitsPerPixel)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -1493,6 +1505,30 @@ JNIEXPORT jint JNICALL OS_NATIVE(CGDisplayBytesPerRow)
 }
 #endif
 
+#ifndef NO_CGDisplayPixelsHigh
+JNIEXPORT jint JNICALL OS_NATIVE(CGDisplayPixelsHigh)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	OS_NATIVE_ENTER(env, that, CGDisplayPixelsHigh_FUNC);
+	rc = (jint)CGDisplayPixelsHigh((CGDirectDisplayID)arg0);
+	OS_NATIVE_EXIT(env, that, CGDisplayPixelsHigh_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_CGDisplayPixelsWide
+JNIEXPORT jint JNICALL OS_NATIVE(CGDisplayPixelsWide)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc;
+	OS_NATIVE_ENTER(env, that, CGDisplayPixelsWide_FUNC);
+	rc = (jint)CGDisplayPixelsWide((CGDirectDisplayID)arg0);
+	OS_NATIVE_EXIT(env, that, CGDisplayPixelsWide_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_CGFontCreateWithPlatformFont
 JNIEXPORT jint JNICALL OS_NATIVE(CGFontCreateWithPlatformFont)
 	(JNIEnv *env, jclass that, jintArray arg0)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c
index 1b567fca4e..02a0fab9b8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c
@@ -14,8 +14,8 @@
 
 #ifdef NATIVE_STATS
 
-int OS_nativeFunctionCount = 743;
-int OS_nativeFunctionCallCount[743];
+int OS_nativeFunctionCount = 746;
+int OS_nativeFunctionCallCount[746];
 char * OS_nativeFunctionNames[] = {
 	"AECountItems", 
 	"AEGetNthPtr", 
@@ -127,9 +127,12 @@ char * OS_nativeFunctionNames[] = {
 	"CGContextTranslateCTM", 
 	"CGDataProviderCreateWithData", 
 	"CGDataProviderRelease", 
+	"CGDisplayBaseAddress", 
 	"CGDisplayBitsPerPixel", 
 	"CGDisplayBitsPerSample", 
 	"CGDisplayBytesPerRow", 
+	"CGDisplayPixelsHigh", 
+	"CGDisplayPixelsWide", 
 	"CGFontCreateWithPlatformFont", 
 	"CGFontRelease", 
 	"CGGetDisplaysWithRect", 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h
index 62c35da051..2559c9ac3c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h
@@ -129,636 +129,639 @@ char* OS_nativeFunctionNames[];
 #define CGContextTranslateCTM_FUNC 107
 #define CGDataProviderCreateWithData_FUNC 108
 #define CGDataProviderRelease_FUNC 109
-#define CGDisplayBitsPerPixel_FUNC 110
-#define CGDisplayBitsPerSample_FUNC 111
-#define CGDisplayBytesPerRow_FUNC 112
-#define CGFontCreateWithPlatformFont_FUNC 113
-#define CGFontRelease_FUNC 114
-#define CGGetDisplaysWithRect_FUNC 115
-#define CGImageCreate_FUNC 116
-#define CGImageGetAlphaInfo_FUNC 117
-#define CGImageGetBitsPerComponent_FUNC 118
-#define CGImageGetBitsPerPixel_FUNC 119
-#define CGImageGetBytesPerRow_FUNC 120
-#define CGImageGetColorSpace_FUNC 121
-#define CGImageGetHeight_FUNC 122
-#define CGImageGetWidth_FUNC 123
-#define CGImageRelease_FUNC 124
-#define CGPostKeyboardEvent_FUNC 125
-#define CGPostMouseEvent_FUNC 126
-#define CGWarpMouseCursorPosition_FUNC 127
-#define CallNextEventHandler_FUNC 128
-#define CharWidth_FUNC 129
-#define ClearCurrentScrap_FUNC 130
-#define ClearKeyboardFocus_FUNC 131
-#define ClearMenuBar_FUNC 132
-#define ClipCGContextToRegion_FUNC 133
-#define CloseDataBrowserContainer_FUNC 134
-#define ClosePoly_FUNC 135
-#define CloseRgn_FUNC 136
-#define CollapseWindow_FUNC 137
-#define ConvertEventRefToEventRecord_FUNC 138
-#define ConvertFromPStringToUnicode_FUNC 139
-#define ConvertFromUnicodeToPString_FUNC 140
-#define CopyBits_FUNC 141
-#define CopyControlTitleAsCFString_FUNC 142
-#define CopyDeepMask_FUNC 143
-#define CopyMenuItemTextAsCFString_FUNC 144
-#define CopyRgn_FUNC 145
-#define CountDragItemFlavors_FUNC 146
-#define CountDragItems_FUNC 147
-#define CountMenuItems_FUNC 148
-#define CountSubControls_FUNC 149
-#define CreateBevelButtonControl_FUNC 150
-#define CreateCGContextForPort_FUNC 151
-#define CreateCheckBoxControl_FUNC 152
-#define CreateDataBrowserControl_FUNC 153
-#define CreateEditUnicodeTextControl_FUNC 154
-#define CreateEvent_FUNC 155
-#define CreateGroupBoxControl_FUNC 156
-#define CreateIconControl_FUNC 157
-#define CreateNewMenu_FUNC 158
-#define CreateNewWindow_FUNC 159
-#define CreatePopupArrowControl_FUNC 160
-#define CreatePopupButtonControl_FUNC 161
-#define CreateProgressBarControl_FUNC 162
-#define CreatePushButtonControl_FUNC 163
-#define CreatePushButtonWithIconControl_FUNC 164
-#define CreateRadioButtonControl_FUNC 165
-#define CreateRootControl_FUNC 166
-#define CreateScrollBarControl_FUNC 167
-#define CreateSeparatorControl_FUNC 168
-#define CreateSliderControl_FUNC 169
-#define CreateStandardAlert_FUNC 170
-#define CreateStaticTextControl_FUNC 171
-#define CreateTabsControl_FUNC 172
-#define CreateTextToUnicodeInfoByEncoding_FUNC 173
-#define CreateUnicodeToTextInfoByEncoding_FUNC 174
-#define CreateUserPaneControl_FUNC 175
-#define CreateWindowGroup_FUNC 176
-#define DMGetFirstScreenDevice_FUNC 177
-#define DMGetNextScreenDevice_FUNC 178
-#define DeleteMenu_FUNC 179
-#define DeleteMenuItem_FUNC 180
-#define DeleteMenuItems_FUNC 181
-#define DiffRgn_FUNC 182
-#define DisableControl_FUNC 183
-#define DisableMenuCommand_FUNC 184
-#define DisableMenuItem_FUNC 185
-#define DisposeControl_FUNC 186
-#define DisposeDrag_FUNC 187
-#define DisposeGWorld_FUNC 188
-#define DisposeHandle_FUNC 189
-#define DisposeMenu_FUNC 190
-#define DisposePtr_FUNC 191
-#define DisposeRgn_FUNC 192
-#define DisposeTextToUnicodeInfo_FUNC 193
-#define DisposeUnicodeToTextInfo_FUNC 194
-#define DisposeWindow_FUNC 195
-#define DrawControlInCurrentPort_FUNC 196
-#define DrawMenuBar_FUNC 197
-#define DrawText_FUNC 198
-#define DrawThemeButton_FUNC 199
-#define DrawThemeEditTextFrame_FUNC 200
-#define DrawThemeFocusRect_FUNC 201
-#define DrawThemePopupArrow_FUNC 202
-#define DrawThemeSeparator_FUNC 203
-#define DrawThemeTextBox_FUNC 204
-#define EmbedControl_FUNC 205
-#define EmptyRect_FUNC 206
-#define EmptyRgn_FUNC 207
-#define EnableControl_FUNC 208
-#define EnableMenuCommand_FUNC 209
-#define EnableMenuItem_FUNC 210
-#define EndUpdate_FUNC 211
-#define EqualRect_FUNC 212
-#define EraseRect_FUNC 213
-#define EraseRgn_FUNC 214
-#define FMCreateFontFamilyInstanceIterator_FUNC 215
-#define FMCreateFontFamilyIterator_FUNC 216
-#define FMDisposeFontFamilyInstanceIterator_FUNC 217
-#define FMDisposeFontFamilyIterator_FUNC 218
-#define FMGetATSFontRefFromFont_FUNC 219
-#define FMGetFontFamilyFromName_FUNC 220
-#define FMGetFontFamilyInstanceFromFont_FUNC 221
-#define FMGetFontFamilyName_FUNC 222
-#define FMGetFontFromFontFamilyInstance_FUNC 223
-#define FMGetNextFontFamily_FUNC 224
-#define FMGetNextFontFamilyInstance_FUNC 225
-#define FPIsFontPanelVisible_FUNC 226
-#define FPShowHideFontPanel_FUNC 227
-#define FSGetCatalogInfo_FUNC 228
-#define FSpGetFInfo_FUNC 229
-#define FSpMakeFSRef_FUNC 230
-#define FetchFontInfo_FUNC 231
-#define FindWindow_FUNC 232
-#define Fix2Long_FUNC 233
-#define FrameOval_FUNC 234
-#define FramePoly_FUNC 235
-#define FrameRect_FUNC 236
-#define FrameRoundRect_FUNC 237
-#define FrontWindow_FUNC 238
-#define Gestalt_FUNC 239
-#define GetAppFont_FUNC 240
-#define GetApplicationEventTarget_FUNC 241
-#define GetAvailableWindowAttributes_FUNC 242
-#define GetAvailableWindowPositioningBounds_FUNC 243
-#define GetBestControlRect_FUNC 244
-#define GetCaretTime_FUNC 245
-#define GetClip_FUNC 246
-#define GetControl32BitMaximum_FUNC 247
-#define GetControl32BitMinimum_FUNC 248
-#define GetControl32BitValue_FUNC 249
-#define GetControlBounds_FUNC 250
-#define GetControlData__ISIILorg_eclipse_swt_internal_carbon_ControlFontStyleRec_2_3I_FUNC 251
-#define GetControlData__ISIILorg_eclipse_swt_internal_carbon_Rect_2_3I_FUNC 252
-#define GetControlData__ISII_3B_3I_FUNC 253
-#define GetControlData__ISII_3I_3I_FUNC 254
-#define GetControlData__ISII_3S_3I_FUNC 255
-#define GetControlEventTarget_FUNC 256
-#define GetControlFeatures_FUNC 257
-#define GetControlOwner_FUNC 258
-#define GetControlProperty_FUNC 259
-#define GetControlReference_FUNC 260
-#define GetControlRegion_FUNC 261
-#define GetControlValue_FUNC 262
-#define GetControlViewSize_FUNC 263
-#define GetCurrentEventButtonState_FUNC 264
-#define GetCurrentEventKeyModifiers_FUNC 265
-#define GetCurrentEventLoop_FUNC 266
-#define GetCurrentEventQueue_FUNC 267
-#define GetCurrentProcess_FUNC 268
-#define GetCurrentScrap_FUNC 269
-#define GetDataBrowserCallbacks_FUNC 270
-#define GetDataBrowserItemCount_FUNC 271
-#define GetDataBrowserItemDataButtonValue_FUNC 272
-#define GetDataBrowserItemPartBounds_FUNC 273
-#define GetDataBrowserItemState_FUNC 274
-#define GetDataBrowserItems_FUNC 275
-#define GetDataBrowserListViewHeaderBtnHeight_FUNC 276
-#define GetDataBrowserListViewHeaderDesc_FUNC 277
-#define GetDataBrowserScrollBarInset_FUNC 278
-#define GetDataBrowserScrollPosition_FUNC 279
-#define GetDataBrowserSelectionAnchor_FUNC 280
-#define GetDataBrowserSelectionFlags_FUNC 281
-#define GetDataBrowserSortProperty_FUNC 282
-#define GetDataBrowserTableViewColumnPosition_FUNC 283
-#define GetDataBrowserTableViewItemID_FUNC 284
-#define GetDataBrowserTableViewItemRow_FUNC 285
-#define GetDataBrowserTableViewNamedColumnWidth_FUNC 286
-#define GetDataBrowserTableViewRowHeight_FUNC 287
-#define GetDblTime_FUNC 288
-#define GetDefFontSize_FUNC 289
-#define GetDeviceList_FUNC 290
-#define GetDragAllowableActions_FUNC 291
-#define GetDragDropAction_FUNC 292
-#define GetDragItemReferenceNumber_FUNC 293
-#define GetDragModifiers_FUNC 294
-#define GetDragMouse_FUNC 295
-#define GetEventClass_FUNC 296
-#define GetEventDispatcherTarget_FUNC 297
-#define GetEventKind_FUNC 298
-#define GetEventParameter__III_3II_3ILorg_eclipse_swt_internal_carbon_CGPoint_2_FUNC 299
-#define GetEventParameter__III_3II_3ILorg_eclipse_swt_internal_carbon_HICommand_2_FUNC 300
-#define GetEventParameter__III_3II_3ILorg_eclipse_swt_internal_carbon_Point_2_FUNC 301
-#define GetEventParameter__III_3II_3ILorg_eclipse_swt_internal_carbon_RGBColor_2_FUNC 302
-#define GetEventParameter__III_3II_3ILorg_eclipse_swt_internal_carbon_Rect_2_FUNC 303
-#define GetEventParameter__III_3II_3I_3B_FUNC 304
-#define GetEventParameter__III_3II_3I_3C_FUNC 305
-#define GetEventParameter__III_3II_3I_3I_FUNC 306
-#define GetEventParameter__III_3II_3I_3S_FUNC 307
-#define GetEventTime_FUNC 308
-#define GetFlavorData_FUNC 309
-#define GetFlavorDataSize_FUNC 310
-#define GetFlavorType_FUNC 311
-#define GetFontInfo_FUNC 312
-#define GetGDevice_FUNC 313
-#define GetGWorld_FUNC 314
-#define GetGlobalMouse_FUNC 315
-#define GetHandleSize_FUNC 316
-#define GetIconFamilyData_FUNC 317
-#define GetIconRef_FUNC 318
-#define GetIndMenuItemWithCommandID_FUNC 319
-#define GetIndexedSubControl_FUNC 320
-#define GetItemMark_FUNC 321
-#define GetKeyboardFocus_FUNC 322
-#define GetLastUserEventTime_FUNC 323
-#define GetMBarHeight_FUNC 324
-#define GetMainDevice_FUNC 325
-#define GetMainEventQueue_FUNC 326
-#define GetMenuCommandMark_FUNC 327
-#define GetMenuEventTarget_FUNC 328
-#define GetMenuFont_FUNC 329
-#define GetMenuHeight_FUNC 330
-#define GetMenuID_FUNC 331
-#define GetMenuItemCommandID_FUNC 332
-#define GetMenuItemHierarchicalMenu_FUNC 333
-#define GetMenuItemRefCon_FUNC 334
-#define GetMenuTrackingData_FUNC 335
-#define GetMenuWidth_FUNC 336
-#define GetMouse_FUNC 337
-#define GetNextDevice_FUNC 338
-#define GetPixBounds_FUNC 339
-#define GetPixDepth_FUNC 340
-#define GetPort_FUNC 341
-#define GetPortBitMapForCopyBits_FUNC 342
-#define GetPortBounds_FUNC 343
-#define GetPortClipRegion_FUNC 344
-#define GetPortVisibleRegion_FUNC 345
-#define GetPtrSize_FUNC 346
-#define GetRegionBounds_FUNC 347
-#define GetRootControl_FUNC 348
-#define GetScrapFlavorCount_FUNC 349
-#define GetScrapFlavorData_FUNC 350
-#define GetScrapFlavorInfoList_FUNC 351
-#define GetScrapFlavorSize_FUNC 352
-#define GetScriptManagerVariable_FUNC 353
-#define GetSuperControl_FUNC 354
-#define GetTabContentRect_FUNC 355
-#define GetThemeBrushAsColor_FUNC 356
-#define GetThemeDrawingState_FUNC 357
-#define GetThemeFont_FUNC 358
-#define GetThemeMenuItemExtra_FUNC 359
-#define GetThemeMetric_FUNC 360
-#define GetThemeTextColor_FUNC 361
-#define GetThemeTextDimensions_FUNC 362
-#define GetUserFocusEventTarget_FUNC 363
-#define GetUserFocusWindow_FUNC 364
-#define GetWRefCon_FUNC 365
-#define GetWindowActivationScope_FUNC 366
-#define GetWindowBounds_FUNC 367
-#define GetWindowDefaultButton_FUNC 368
-#define GetWindowEventTarget_FUNC 369
-#define GetWindowFromPort_FUNC 370
-#define GetWindowGroupOfClass_FUNC 371
-#define GetWindowModality_FUNC 372
-#define GetWindowPort_FUNC 373
-#define GetWindowRegion_FUNC 374
-#define GetWindowStructureWidths_FUNC 375
-#define HIComboBoxAppendTextItem_FUNC 376
-#define HIComboBoxCopyTextItemAtIndex_FUNC 377
-#define HIComboBoxCreate_FUNC 378
-#define HIComboBoxGetItemCount_FUNC 379
-#define HIComboBoxInsertTextItemAtIndex_FUNC 380
-#define HIComboBoxRemoveItemAtIndex_FUNC 381
-#define HIObjectCopyClassID_FUNC 382
-#define HIObjectCreate_FUNC 383
-#define HIObjectRegisterSubclass_FUNC 384
-#define HIViewAddSubview_FUNC 385
-#define HIViewClick_FUNC 386
-#define HIViewConvertPoint_FUNC 387
-#define HIViewCreateOffscreenImage_FUNC 388
-#define HIViewFindByID_FUNC 389
-#define HIViewGetFirstSubview_FUNC 390
-#define HIViewGetFrame_FUNC 391
-#define HIViewGetLastSubview_FUNC 392
-#define HIViewGetNextView_FUNC 393
-#define HIViewGetRoot_FUNC 394
-#define HIViewGetSizeConstraints_FUNC 395
-#define HIViewGetSubviewHit_FUNC 396
-#define HIViewGetViewForMouseEvent_FUNC 397
-#define HIViewIsVisible_FUNC 398
-#define HIViewRemoveFromSuperview_FUNC 399
-#define HIViewSetBoundsOrigin_FUNC 400
-#define HIViewSetDrawingEnabled_FUNC 401
-#define HIViewSetFrame_FUNC 402
-#define HIViewSetNeedsDisplay_FUNC 403
-#define HIViewSetNeedsDisplayInRegion_FUNC 404
-#define HIViewSetVisible_FUNC 405
-#define HIViewSetZOrder_FUNC 406
-#define HIViewSimulateClick_FUNC 407
-#define HLock_FUNC 408
-#define HMGetTagDelay_FUNC 409
-#define HMHideTag_FUNC 410
-#define HMInstallControlContentCallback_FUNC 411
-#define HMSetTagDelay_FUNC 412
-#define HUnlock_FUNC 413
-#define HandleControlClick_FUNC 414
-#define HandleControlSetCursor_FUNC 415
-#define HiWord_FUNC 416
-#define HideWindow_FUNC 417
-#define HiliteMenu_FUNC 418
-#define IconRefToIconFamily_FUNC 419
-#define InitContextualMenus_FUNC 420
-#define InitCursor_FUNC 421
-#define InitDataBrowserCallbacks_FUNC 422
-#define InitDataBrowserCustomCallbacks_FUNC 423
-#define InsertMenu_FUNC 424
-#define InsertMenuItemTextWithCFString_FUNC 425
-#define InstallEventHandler_FUNC 426
-#define InstallEventLoopTimer_FUNC 427
-#define InstallReceiveHandler_FUNC 428
-#define InstallTrackingHandler_FUNC 429
-#define InvalWindowRect_FUNC 430
-#define InvalWindowRgn_FUNC 431
-#define InvertRect_FUNC 432
-#define InvertRgn_FUNC 433
-#define IsControlActive_FUNC 434
-#define IsControlEnabled_FUNC 435
-#define IsControlVisible_FUNC 436
-#define IsDataBrowserItemSelected_FUNC 437
-#define IsMenuCommandEnabled_FUNC 438
-#define IsMenuItemEnabled_FUNC 439
-#define IsValidControlHandle_FUNC 440
-#define IsValidMenu_FUNC 441
-#define IsValidWindowPtr_FUNC 442
-#define IsWindowActive_FUNC 443
-#define IsWindowCollapsed_FUNC 444
-#define IsWindowVisible_FUNC 445
-#define KeyTranslate_FUNC 446
-#define KillPoly_FUNC 447
-#define LineTo_FUNC 448
-#define LoWord_FUNC 449
-#define LockPortBits_FUNC 450
-#define Long2Fix_FUNC 451
-#define MenuSelect_FUNC 452
-#define MoveControl_FUNC 453
-#define MoveTo_FUNC 454
-#define MoveWindow_FUNC 455
-#define NavCreateChooseFolderDialog_FUNC 456
-#define NavCreateGetFileDialog_FUNC 457
-#define NavCreatePutFileDialog_FUNC 458
-#define NavDialogDispose_FUNC 459
-#define NavDialogGetReply_FUNC 460
-#define NavDialogGetSaveFileName_FUNC 461
-#define NavDialogGetUserAction_FUNC 462
-#define NavDialogRun_FUNC 463
-#define NavDialogSetSaveFileName_FUNC 464
-#define NavGetDefaultDialogCreationOptions_FUNC 465
-#define NewControl_FUNC 466
-#define NewDrag_FUNC 467
-#define NewGWorldFromPtr_FUNC 468
-#define NewHandle_FUNC 469
-#define NewHandleClear_FUNC 470
-#define NewPtr_FUNC 471
-#define NewPtrClear_FUNC 472
-#define NewRgn_FUNC 473
-#define OffsetRect_FUNC 474
-#define OffsetRgn_FUNC 475
-#define OpenDataBrowserContainer_FUNC 476
-#define OpenPoly_FUNC 477
-#define OpenRgn_FUNC 478
-#define PMCreatePageFormat_FUNC 479
-#define PMCreatePrintSettings_FUNC 480
-#define PMCreateSession_FUNC 481
-#define PMFlattenPageFormat_FUNC 482
-#define PMFlattenPrintSettings_FUNC 483
-#define PMGetAdjustedPageRect_FUNC 484
-#define PMGetAdjustedPaperRect_FUNC 485
-#define PMGetCollate_FUNC 486
-#define PMGetCopies_FUNC 487
-#define PMGetFirstPage_FUNC 488
-#define PMGetJobNameCFString_FUNC 489
-#define PMGetLastPage_FUNC 490
-#define PMGetPageRange_FUNC 491
-#define PMGetResolution_FUNC 492
-#define PMRelease_FUNC 493
-#define PMSessionBeginDocumentNoDialog_FUNC 494
-#define PMSessionBeginPageNoDialog_FUNC 495
-#define PMSessionCopyDestinationLocation_FUNC 496
-#define PMSessionCreatePrinterList_FUNC 497
-#define PMSessionDefaultPageFormat_FUNC 498
-#define PMSessionDefaultPrintSettings_FUNC 499
-#define PMSessionEndDocumentNoDialog_FUNC 500
-#define PMSessionEndPageNoDialog_FUNC 501
-#define PMSessionError_FUNC 502
-#define PMSessionGetDestinationType_FUNC 503
-#define PMSessionGetGraphicsContext_FUNC 504
-#define PMSessionPageSetupDialog_FUNC 505
-#define PMSessionPrintDialog_FUNC 506
-#define PMSessionSetCurrentPrinter_FUNC 507
-#define PMSessionSetDestination_FUNC 508
-#define PMSessionSetDocumentFormatGeneration_FUNC 509
-#define PMSessionSetError_FUNC 510
-#define PMSessionUseSheets_FUNC 511
-#define PMSessionValidatePageFormat_FUNC 512
-#define PMSessionValidatePrintSettings_FUNC 513
-#define PMSetCollate_FUNC 514
-#define PMSetFirstPage_FUNC 515
-#define PMSetJobNameCFString_FUNC 516
-#define PMSetLastPage_FUNC 517
-#define PMSetPageRange_FUNC 518
-#define PMUnflattenPageFormat_FUNC 519
-#define PMUnflattenPrintSettings_FUNC 520
-#define PaintOval_FUNC 521
-#define PaintPoly_FUNC 522
-#define PaintRect_FUNC 523
-#define PaintRoundRect_FUNC 524
-#define PenSize_FUNC 525
-#define PickColor_FUNC 526
-#define PopUpMenuSelect_FUNC 527
-#define PostEvent_FUNC 528
-#define PostEventToQueue_FUNC 529
-#define PtInRect_FUNC 530
-#define PtInRgn_FUNC 531
-#define PutScrapFlavor_FUNC 532
-#define QDBeginCGContext_FUNC 533
-#define QDEndCGContext_FUNC 534
-#define QDFlushPortBuffer_FUNC 535
-#define QDGlobalToLocalPoint_FUNC 536
-#define QDLocalToGlobalPoint_FUNC 537
-#define QDSetDirtyRegion_FUNC 538
-#define QDSetPatternOrigin_FUNC 539
-#define QDSwapTextFlags_FUNC 540
-#define RGBBackColor_FUNC 541
-#define RGBForeColor_FUNC 542
-#define ReceiveNextEvent_FUNC 543
-#define RectInRgn_FUNC 544
-#define RectRgn_FUNC 545
-#define RegisterAppearanceClient_FUNC 546
-#define ReleaseEvent_FUNC 547
-#define ReleaseIconRef_FUNC 548
-#define ReleaseMenu_FUNC 549
-#define ReleaseWindow_FUNC 550
-#define ReleaseWindowGroup_FUNC 551
-#define RemoveControlProperty_FUNC 552
-#define RemoveDataBrowserItems_FUNC 553
-#define RemoveDataBrowserTableViewColumn_FUNC 554
-#define RemoveEventHandler_FUNC 555
-#define RemoveEventLoopTimer_FUNC 556
-#define RemoveReceiveHandler_FUNC 557
-#define RemoveTrackingHandler_FUNC 558
-#define RepositionWindow_FUNC 559
-#define ReshapeCustomWindow_FUNC 560
-#define RetainEvent_FUNC 561
-#define RetainMenu_FUNC 562
-#define RetainWindow_FUNC 563
-#define RevealDataBrowserItem_FUNC 564
-#define RunStandardAlert_FUNC 565
-#define ScrollRect_FUNC 566
-#define SectRect_FUNC 567
-#define SectRgn_FUNC 568
-#define SelectWindow_FUNC 569
-#define SendBehind_FUNC 570
-#define SendEventToEventTarget_FUNC 571
-#define SetBevelButtonContentInfo_FUNC 572
-#define SetClip_FUNC 573
-#define SetControl32BitMaximum_FUNC 574
-#define SetControl32BitMinimum_FUNC 575
-#define SetControl32BitValue_FUNC 576
-#define SetControlAction_FUNC 577
-#define SetControlBounds_FUNC 578
-#define SetControlColorProc_FUNC 579
-#define SetControlData__IIIII_FUNC 580
-#define SetControlData__IIIILorg_eclipse_swt_internal_carbon_ControlButtonContentInfo_2_FUNC 581
-#define SetControlData__IIIILorg_eclipse_swt_internal_carbon_ControlTabInfoRecV1_2_FUNC 582
-#define SetControlData__IIIILorg_eclipse_swt_internal_carbon_Rect_2_FUNC 583
-#define SetControlData__IIII_3B_FUNC 584
-#define SetControlData__IIII_3I_FUNC 585
-#define SetControlData__IIII_3S_FUNC 586
-#define SetControlFontStyle_FUNC 587
-#define SetControlPopupMenuHandle_FUNC 588
-#define SetControlProperty_FUNC 589
-#define SetControlReference_FUNC 590
-#define SetControlTitleWithCFString_FUNC 591
-#define SetControlViewSize_FUNC 592
-#define SetControlVisibility_FUNC 593
-#define SetCursor_FUNC 594
-#define SetDataBrowserCallbacks_FUNC 595
-#define SetDataBrowserCustomCallbacks_FUNC 596
-#define SetDataBrowserHasScrollBars_FUNC 597
-#define SetDataBrowserItemDataBooleanValue_FUNC 598
-#define SetDataBrowserItemDataButtonValue_FUNC 599
-#define SetDataBrowserItemDataIcon_FUNC 600
-#define SetDataBrowserItemDataItemID_FUNC 601
-#define SetDataBrowserItemDataText_FUNC 602
-#define SetDataBrowserListViewDisclosureColumn_FUNC 603
-#define SetDataBrowserListViewHeaderBtnHeight_FUNC 604
-#define SetDataBrowserListViewHeaderDesc_FUNC 605
-#define SetDataBrowserScrollPosition_FUNC 606
-#define SetDataBrowserSelectedItems_FUNC 607
-#define SetDataBrowserSelectionFlags_FUNC 608
-#define SetDataBrowserSortOrder_FUNC 609
-#define SetDataBrowserTableViewColumnPosition_FUNC 610
-#define SetDataBrowserTableViewHiliteStyle_FUNC 611
-#define SetDataBrowserTableViewItemRow_FUNC 612
-#define SetDataBrowserTableViewNamedColumnWidth_FUNC 613
-#define SetDataBrowserTarget_FUNC 614
-#define SetDragAllowableActions_FUNC 615
-#define SetDragDropAction_FUNC 616
-#define SetDragInputProc_FUNC 617
-#define SetEventLoopTimerNextFireTime_FUNC 618
-#define SetEventParameter__IIII_3C_FUNC 619
-#define SetEventParameter__IIII_3S_FUNC 620
-#define SetFontInfoForSelection_FUNC 621
-#define SetFrontProcess_FUNC 622
-#define SetFrontProcessWithOptions_FUNC 623
-#define SetGWorld_FUNC 624
-#define SetItemMark_FUNC 625
-#define SetKeyboardFocus_FUNC 626
-#define SetMenuCommandMark_FUNC 627
-#define SetMenuFont_FUNC 628
-#define SetMenuItemCommandKey_FUNC 629
-#define SetMenuItemHierarchicalMenu_FUNC 630
-#define SetMenuItemIconHandle_FUNC 631
-#define SetMenuItemKeyGlyph_FUNC 632
-#define SetMenuItemModifiers_FUNC 633
-#define SetMenuItemRefCon_FUNC 634
-#define SetMenuItemTextWithCFString_FUNC 635
-#define SetMenuTitleWithCFString_FUNC 636
-#define SetOrigin_FUNC 637
-#define SetPort_FUNC 638
-#define SetPortBounds_FUNC 639
-#define SetPortWindowPort_FUNC 640
-#define SetPt_FUNC 641
-#define SetRect_FUNC 642
-#define SetRectRgn_FUNC 643
-#define SetRootMenu_FUNC 644
-#define SetThemeBackground_FUNC 645
-#define SetThemeCursor_FUNC 646
-#define SetThemeDrawingState_FUNC 647
-#define SetThemeTextColor_FUNC 648
-#define SetThemeWindowBackground_FUNC 649
-#define SetUpControlBackground_FUNC 650
-#define SetWRefCon_FUNC 651
-#define SetWindowActivationScope_FUNC 652
-#define SetWindowBounds_FUNC 653
-#define SetWindowDefaultButton_FUNC 654
-#define SetWindowGroup_FUNC 655
-#define SetWindowGroupOwner_FUNC 656
-#define SetWindowGroupParent_FUNC 657
-#define SetWindowModality_FUNC 658
-#define SetWindowTitleWithCFString_FUNC 659
-#define ShowWindow_FUNC 660
-#define SizeControl_FUNC 661
-#define SizeWindow_FUNC 662
-#define StillDown_FUNC 663
-#define SyncCGContextOriginWithPort_FUNC 664
-#define SysBeep_FUNC 665
-#define TXNActivate_FUNC 666
-#define TXNAdjustCursor_FUNC 667
-#define TXNClick_FUNC 668
-#define TXNCopy_FUNC 669
-#define TXNCut_FUNC 670
-#define TXNDataSize_FUNC 671
-#define TXNDeleteObject_FUNC 672
-#define TXNDraw_FUNC 673
-#define TXNEchoMode_FUNC 674
-#define TXNFocus_FUNC 675
-#define TXNGetData_FUNC 676
-#define TXNGetLineCount_FUNC 677
-#define TXNGetLineMetrics_FUNC 678
-#define TXNGetRectBounds_FUNC 679
-#define TXNGetSelection_FUNC 680
-#define TXNGetTXNObjectControls_FUNC 681
-#define TXNGetViewRect_FUNC 682
-#define TXNInitTextension_FUNC 683
-#define TXNNewObject_FUNC 684
-#define TXNOffsetToPoint_FUNC 685
-#define TXNPaste_FUNC 686
-#define TXNPointToOffset_FUNC 687
-#define TXNSelectAll_FUNC 688
-#define TXNSetBackground_FUNC 689
-#define TXNSetData_FUNC 690
-#define TXNSetFrameBounds_FUNC 691
-#define TXNSetRectBounds_FUNC 692
-#define TXNSetSelection_FUNC 693
-#define TXNSetTXNObjectControls_FUNC 694
-#define TXNSetTypeAttributes_FUNC 695
-#define TXNShowSelection_FUNC 696
-#define TestControl_FUNC 697
-#define TextFace_FUNC 698
-#define TextFont_FUNC 699
-#define TextMode_FUNC 700
-#define TextSize_FUNC 701
-#define TextWidth_FUNC 702
-#define TrackDrag_FUNC 703
-#define TrackMouseLocationWithOptions_FUNC 704
-#define UnionRect_FUNC 705
-#define UnionRgn_FUNC 706
-#define UnlockPortBits_FUNC 707
-#define UpdateControls_FUNC 708
-#define UpdateDataBrowserItems_FUNC 709
-#define UpgradeScriptInfoToTextEncoding_FUNC 710
-#define WaitMouseMoved_FUNC 711
-#define X2Fix_FUNC 712
-#define ZoomWindowIdeal_FUNC 713
-#define kHIViewWindowContentID_FUNC 714
-#define kPMDocumentFormatPDF_FUNC 715
-#define kPMGraphicsContextCoreGraphics_FUNC 716
-#define memcpy__III_FUNC 717
-#define memcpy__ILorg_eclipse_swt_internal_carbon_ATSUTab_2I_FUNC 718
-#define memcpy__ILorg_eclipse_swt_internal_carbon_BitMap_2I_FUNC 719
-#define memcpy__ILorg_eclipse_swt_internal_carbon_Cursor_2I_FUNC 720
-#define memcpy__ILorg_eclipse_swt_internal_carbon_EventRecord_2I_FUNC 721
-#define memcpy__ILorg_eclipse_swt_internal_carbon_FontSelectionQDStyle_2I_FUNC 722
-#define memcpy__ILorg_eclipse_swt_internal_carbon_HMHelpContentRec_2I_FUNC 723
-#define memcpy__ILorg_eclipse_swt_internal_carbon_PixMap_2I_FUNC 724
-#define memcpy__ILorg_eclipse_swt_internal_carbon_RGBColor_2I_FUNC 725
-#define memcpy__ILorg_eclipse_swt_internal_carbon_Rect_2I_FUNC 726
-#define memcpy__I_3BI_FUNC 727
-#define memcpy__I_3CI_FUNC 728
-#define memcpy__I_3II_FUNC 729
-#define memcpy__Lorg_eclipse_swt_internal_carbon_ATSTrapezoid_2II_FUNC 730
-#define memcpy__Lorg_eclipse_swt_internal_carbon_FontSelectionQDStyle_2II_FUNC 731
-#define memcpy__Lorg_eclipse_swt_internal_carbon_GDevice_2II_FUNC 732
-#define memcpy__Lorg_eclipse_swt_internal_carbon_HMHelpContentRec_2II_FUNC 733
-#define memcpy__Lorg_eclipse_swt_internal_carbon_PixMap_2II_FUNC 734
-#define memcpy__Lorg_eclipse_swt_internal_carbon_Rect_2II_FUNC 735
-#define memcpy___3BII_FUNC 736
-#define memcpy___3B_3CI_FUNC 737
-#define memcpy___3CII_FUNC 738
-#define memcpy___3C_3BI_FUNC 739
-#define memcpy___3FII_FUNC 740
-#define memcpy___3III_FUNC 741
-#define memset_FUNC 742
+#define CGDisplayBaseAddress_FUNC 110
+#define CGDisplayBitsPerPixel_FUNC 111
+#define CGDisplayBitsPerSample_FUNC 112
+#define CGDisplayBytesPerRow_FUNC 113
+#define CGDisplayPixelsHigh_FUNC 114
+#define CGDisplayPixelsWide_FUNC 115
+#define CGFontCreateWithPlatformFont_FUNC 116
+#define CGFontRelease_FUNC 117
+#define CGGetDisplaysWithRect_FUNC 118
+#define CGImageCreate_FUNC 119
+#define CGImageGetAlphaInfo_FUNC 120
+#define CGImageGetBitsPerComponent_FUNC 121
+#define CGImageGetBitsPerPixel_FUNC 122
+#define CGImageGetBytesPerRow_FUNC 123
+#define CGImageGetColorSpace_FUNC 124
+#define CGImageGetHeight_FUNC 125
+#define CGImageGetWidth_FUNC 126
+#define CGImageRelease_FUNC 127
+#define CGPostKeyboardEvent_FUNC 128
+#define CGPostMouseEvent_FUNC 129
+#define CGWarpMouseCursorPosition_FUNC 130
+#define CallNextEventHandler_FUNC 131
+#define CharWidth_FUNC 132
+#define ClearCurrentScrap_FUNC 133
+#define ClearKeyboardFocus_FUNC 134
+#define ClearMenuBar_FUNC 135
+#define ClipCGContextToRegion_FUNC 136
+#define CloseDataBrowserContainer_FUNC 137
+#define ClosePoly_FUNC 138
+#define CloseRgn_FUNC 139
+#define CollapseWindow_FUNC 140
+#define ConvertEventRefToEventRecord_FUNC 141
+#define ConvertFromPStringToUnicode_FUNC 142
+#define ConvertFromUnicodeToPString_FUNC 143
+#define CopyBits_FUNC 144
+#define CopyControlTitleAsCFString_FUNC 145
+#define CopyDeepMask_FUNC 146
+#define CopyMenuItemTextAsCFString_FUNC 147
+#define CopyRgn_FUNC 148
+#define CountDragItemFlavors_FUNC 149
+#define CountDragItems_FUNC 150
+#define CountMenuItems_FUNC 151
+#define CountSubControls_FUNC 152
+#define CreateBevelButtonControl_FUNC 153
+#define CreateCGContextForPort_FUNC 154
+#define CreateCheckBoxControl_FUNC 155
+#define CreateDataBrowserControl_FUNC 156
+#define CreateEditUnicodeTextControl_FUNC 157
+#define CreateEvent_FUNC 158
+#define CreateGroupBoxControl_FUNC 159
+#define CreateIconControl_FUNC 160
+#define CreateNewMenu_FUNC 161
+#define CreateNewWindow_FUNC 162
+#define CreatePopupArrowControl_FUNC 163
+#define CreatePopupButtonControl_FUNC 164
+#define CreateProgressBarControl_FUNC 165
+#define CreatePushButtonControl_FUNC 166
+#define CreatePushButtonWithIconControl_FUNC 167
+#define CreateRadioButtonControl_FUNC 168
+#define CreateRootControl_FUNC 169
+#define CreateScrollBarControl_FUNC 170
+#define CreateSeparatorControl_FUNC 171
+#define CreateSliderControl_FUNC 172
+#define CreateStandardAlert_FUNC 173
+#define CreateStaticTextControl_FUNC 174
+#define CreateTabsControl_FUNC 175
+#define CreateTextToUnicodeInfoByEncoding_FUNC 176
+#define CreateUnicodeToTextInfoByEncoding_FUNC 177
+#define CreateUserPaneControl_FUNC 178
+#define CreateWindowGroup_FUNC 179
+#define DMGetFirstScreenDevice_FUNC 180
+#define DMGetNextScreenDevice_FUNC 181
+#define DeleteMenu_FUNC 182
+#define DeleteMenuItem_FUNC 183
+#define DeleteMenuItems_FUNC 184
+#define DiffRgn_FUNC 185
+#define DisableControl_FUNC 186
+#define DisableMenuCommand_FUNC 187
+#define DisableMenuItem_FUNC 188
+#define DisposeControl_FUNC 189
+#define DisposeDrag_FUNC 190
+#define DisposeGWorld_FUNC 191
+#define DisposeHandle_FUNC 192
+#define DisposeMenu_FUNC 193
+#define DisposePtr_FUNC 194
+#define DisposeRgn_FUNC 195
+#define DisposeTextToUnicodeInfo_FUNC 196
+#define DisposeUnicodeToTextInfo_FUNC 197
+#define DisposeWindow_FUNC 198
+#define DrawControlInCurrentPort_FUNC 199
+#define DrawMenuBar_FUNC 200
+#define DrawText_FUNC 201
+#define DrawThemeButton_FUNC 202
+#define DrawThemeEditTextFrame_FUNC 203
+#define DrawThemeFocusRect_FUNC 204
+#define DrawThemePopupArrow_FUNC 205
+#define DrawThemeSeparator_FUNC 206
+#define DrawThemeTextBox_FUNC 207
+#define EmbedControl_FUNC 208
+#define EmptyRect_FUNC 209
+#define EmptyRgn_FUNC 210
+#define EnableControl_FUNC 211
+#define EnableMenuCommand_FUNC 212
+#define EnableMenuItem_FUNC 213
+#define EndUpdate_FUNC 214
+#define EqualRect_FUNC 215
+#define EraseRect_FUNC 216
+#define EraseRgn_FUNC 217
+#define FMCreateFontFamilyInstanceIterator_FUNC 218
+#define FMCreateFontFamilyIterator_FUNC 219
+#define FMDisposeFontFamilyInstanceIterator_FUNC 220
+#define FMDisposeFontFamilyIterator_FUNC 221
+#define FMGetATSFontRefFromFont_FUNC 222
+#define FMGetFontFamilyFromName_FUNC 223
+#define FMGetFontFamilyInstanceFromFont_FUNC 224
+#define FMGetFontFamilyName_FUNC 225
+#define FMGetFontFromFontFamilyInstance_FUNC 226
+#define FMGetNextFontFamily_FUNC 227
+#define FMGetNextFontFamilyInstance_FUNC 228
+#define FPIsFontPanelVisible_FUNC 229
+#define FPShowHideFontPanel_FUNC 230
+#define FSGetCatalogInfo_FUNC 231
+#define FSpGetFInfo_FUNC 232
+#define FSpMakeFSRef_FUNC 233
+#define FetchFontInfo_FUNC 234
+#define FindWindow_FUNC 235
+#define Fix2Long_FUNC 236
+#define FrameOval_FUNC 237
+#define FramePoly_FUNC 238
+#define FrameRect_FUNC 239
+#define FrameRoundRect_FUNC 240
+#define FrontWindow_FUNC 241
+#define Gestalt_FUNC 242
+#define GetAppFont_FUNC 243
+#define GetApplicationEventTarget_FUNC 244
+#define GetAvailableWindowAttributes_FUNC 245
+#define GetAvailableWindowPositioningBounds_FUNC 246
+#define GetBestControlRect_FUNC 247
+#define GetCaretTime_FUNC 248
+#define GetClip_FUNC 249
+#define GetControl32BitMaximum_FUNC 250
+#define GetControl32BitMinimum_FUNC 251
+#define GetControl32BitValue_FUNC 252
+#define GetControlBounds_FUNC 253
+#define GetControlData__ISIILorg_eclipse_swt_internal_carbon_ControlFontStyleRec_2_3I_FUNC 254
+#define GetControlData__ISIILorg_eclipse_swt_internal_carbon_Rect_2_3I_FUNC 255
+#define GetControlData__ISII_3B_3I_FUNC 256
+#define GetControlData__ISII_3I_3I_FUNC 257
+#define GetControlData__ISII_3S_3I_FUNC 258
+#define GetControlEventTarget_FUNC 259
+#define GetControlFeatures_FUNC 260
+#define GetControlOwner_FUNC 261
+#define GetControlProperty_FUNC 262
+#define GetControlReference_FUNC 263
+#define GetControlRegion_FUNC 264
+#define GetControlValue_FUNC 265
+#define GetControlViewSize_FUNC 266
+#define GetCurrentEventButtonState_FUNC 267
+#define GetCurrentEventKeyModifiers_FUNC 268
+#define GetCurrentEventLoop_FUNC 269
+#define GetCurrentEventQueue_FUNC 270
+#define GetCurrentProcess_FUNC 271
+#define GetCurrentScrap_FUNC 272
+#define GetDataBrowserCallbacks_FUNC 273
+#define GetDataBrowserItemCount_FUNC 274
+#define GetDataBrowserItemDataButtonValue_FUNC 275
+#define GetDataBrowserItemPartBounds_FUNC 276
+#define GetDataBrowserItemState_FUNC 277
+#define GetDataBrowserItems_FUNC 278
+#define GetDataBrowserListViewHeaderBtnHeight_FUNC 279
+#define GetDataBrowserListViewHeaderDesc_FUNC 280
+#define GetDataBrowserScrollBarInset_FUNC 281
+#define GetDataBrowserScrollPosition_FUNC 282
+#define GetDataBrowserSelectionAnchor_FUNC 283
+#define GetDataBrowserSelectionFlags_FUNC 284
+#define GetDataBrowserSortProperty_FUNC 285
+#define GetDataBrowserTableViewColumnPosition_FUNC 286
+#define GetDataBrowserTableViewItemID_FUNC 287
+#define GetDataBrowserTableViewItemRow_FUNC 288
+#define GetDataBrowserTableViewNamedColumnWidth_FUNC 289
+#define GetDataBrowserTableViewRowHeight_FUNC 290
+#define GetDblTime_FUNC 291
+#define GetDefFontSize_FUNC 292
+#define GetDeviceList_FUNC 293
+#define GetDragAllowableActions_FUNC 294
+#define GetDragDropAction_FUNC 295
+#define GetDragItemReferenceNumber_FUNC 296
+#define GetDragModifiers_FUNC 297
+#define GetDragMouse_FUNC 298
+#define GetEventClass_FUNC 299
+#define GetEventDispatcherTarget_FUNC 300
+#define GetEventKind_FUNC 301
+#define GetEventParameter__III_3II_3ILorg_eclipse_swt_internal_carbon_CGPoint_2_FUNC 302
+#define GetEventParameter__III_3II_3ILorg_eclipse_swt_internal_carbon_HICommand_2_FUNC 303
+#define GetEventParameter__III_3II_3ILorg_eclipse_swt_internal_carbon_Point_2_FUNC 304
+#define GetEventParameter__III_3II_3ILorg_eclipse_swt_internal_carbon_RGBColor_2_FUNC 305
+#define GetEventParameter__III_3II_3ILorg_eclipse_swt_internal_carbon_Rect_2_FUNC 306
+#define GetEventParameter__III_3II_3I_3B_FUNC 307
+#define GetEventParameter__III_3II_3I_3C_FUNC 308
+#define GetEventParameter__III_3II_3I_3I_FUNC 309
+#define GetEventParameter__III_3II_3I_3S_FUNC 310
+#define GetEventTime_FUNC 311
+#define GetFlavorData_FUNC 312
+#define GetFlavorDataSize_FUNC 313
+#define GetFlavorType_FUNC 314
+#define GetFontInfo_FUNC 315
+#define GetGDevice_FUNC 316
+#define GetGWorld_FUNC 317
+#define GetGlobalMouse_FUNC 318
+#define GetHandleSize_FUNC 319
+#define GetIconFamilyData_FUNC 320
+#define GetIconRef_FUNC 321
+#define GetIndMenuItemWithCommandID_FUNC 322
+#define GetIndexedSubControl_FUNC 323
+#define GetItemMark_FUNC 324
+#define GetKeyboardFocus_FUNC 325
+#define GetLastUserEventTime_FUNC 326
+#define GetMBarHeight_FUNC 327
+#define GetMainDevice_FUNC 328
+#define GetMainEventQueue_FUNC 329
+#define GetMenuCommandMark_FUNC 330
+#define GetMenuEventTarget_FUNC 331
+#define GetMenuFont_FUNC 332
+#define GetMenuHeight_FUNC 333
+#define GetMenuID_FUNC 334
+#define GetMenuItemCommandID_FUNC 335
+#define GetMenuItemHierarchicalMenu_FUNC 336
+#define GetMenuItemRefCon_FUNC 337
+#define GetMenuTrackingData_FUNC 338
+#define GetMenuWidth_FUNC 339
+#define GetMouse_FUNC 340
+#define GetNextDevice_FUNC 341
+#define GetPixBounds_FUNC 342
+#define GetPixDepth_FUNC 343
+#define GetPort_FUNC 344
+#define GetPortBitMapForCopyBits_FUNC 345
+#define GetPortBounds_FUNC 346
+#define GetPortClipRegion_FUNC 347
+#define GetPortVisibleRegion_FUNC 348
+#define GetPtrSize_FUNC 349
+#define GetRegionBounds_FUNC 350
+#define GetRootControl_FUNC 351
+#define GetScrapFlavorCount_FUNC 352
+#define GetScrapFlavorData_FUNC 353
+#define GetScrapFlavorInfoList_FUNC 354
+#define GetScrapFlavorSize_FUNC 355
+#define GetScriptManagerVariable_FUNC 356
+#define GetSuperControl_FUNC 357
+#define GetTabContentRect_FUNC 358
+#define GetThemeBrushAsColor_FUNC 359
+#define GetThemeDrawingState_FUNC 360
+#define GetThemeFont_FUNC 361
+#define GetThemeMenuItemExtra_FUNC 362
+#define GetThemeMetric_FUNC 363
+#define GetThemeTextColor_FUNC 364
+#define GetThemeTextDimensions_FUNC 365
+#define GetUserFocusEventTarget_FUNC 366
+#define GetUserFocusWindow_FUNC 367
+#define GetWRefCon_FUNC 368
+#define GetWindowActivationScope_FUNC 369
+#define GetWindowBounds_FUNC 370
+#define GetWindowDefaultButton_FUNC 371
+#define GetWindowEventTarget_FUNC 372
+#define GetWindowFromPort_FUNC 373
+#define GetWindowGroupOfClass_FUNC 374
+#define GetWindowModality_FUNC 375
+#define GetWindowPort_FUNC 376
+#define GetWindowRegion_FUNC 377
+#define GetWindowStructureWidths_FUNC 378
+#define HIComboBoxAppendTextItem_FUNC 379
+#define HIComboBoxCopyTextItemAtIndex_FUNC 380
+#define HIComboBoxCreate_FUNC 381
+#define HIComboBoxGetItemCount_FUNC 382
+#define HIComboBoxInsertTextItemAtIndex_FUNC 383
+#define HIComboBoxRemoveItemAtIndex_FUNC 384
+#define HIObjectCopyClassID_FUNC 385
+#define HIObjectCreate_FUNC 386
+#define HIObjectRegisterSubclass_FUNC 387
+#define HIViewAddSubview_FUNC 388
+#define HIViewClick_FUNC 389
+#define HIViewConvertPoint_FUNC 390
+#define HIViewCreateOffscreenImage_FUNC 391
+#define HIViewFindByID_FUNC 392
+#define HIViewGetFirstSubview_FUNC 393
+#define HIViewGetFrame_FUNC 394
+#define HIViewGetLastSubview_FUNC 395
+#define HIViewGetNextView_FUNC 396
+#define HIViewGetRoot_FUNC 397
+#define HIViewGetSizeConstraints_FUNC 398
+#define HIViewGetSubviewHit_FUNC 399
+#define HIViewGetViewForMouseEvent_FUNC 400
+#define HIViewIsVisible_FUNC 401
+#define HIViewRemoveFromSuperview_FUNC 402
+#define HIViewSetBoundsOrigin_FUNC 403
+#define HIViewSetDrawingEnabled_FUNC 404
+#define HIViewSetFrame_FUNC 405
+#define HIViewSetNeedsDisplay_FUNC 406
+#define HIViewSetNeedsDisplayInRegion_FUNC 407
+#define HIViewSetVisible_FUNC 408
+#define HIViewSetZOrder_FUNC 409
+#define HIViewSimulateClick_FUNC 410
+#define HLock_FUNC 411
+#define HMGetTagDelay_FUNC 412
+#define HMHideTag_FUNC 413
+#define HMInstallControlContentCallback_FUNC 414
+#define HMSetTagDelay_FUNC 415
+#define HUnlock_FUNC 416
+#define HandleControlClick_FUNC 417
+#define HandleControlSetCursor_FUNC 418
+#define HiWord_FUNC 419
+#define HideWindow_FUNC 420
+#define HiliteMenu_FUNC 421
+#define IconRefToIconFamily_FUNC 422
+#define InitContextualMenus_FUNC 423
+#define InitCursor_FUNC 424
+#define InitDataBrowserCallbacks_FUNC 425
+#define InitDataBrowserCustomCallbacks_FUNC 426
+#define InsertMenu_FUNC 427
+#define InsertMenuItemTextWithCFString_FUNC 428
+#define InstallEventHandler_FUNC 429
+#define InstallEventLoopTimer_FUNC 430
+#define InstallReceiveHandler_FUNC 431
+#define InstallTrackingHandler_FUNC 432
+#define InvalWindowRect_FUNC 433
+#define InvalWindowRgn_FUNC 434
+#define InvertRect_FUNC 435
+#define InvertRgn_FUNC 436
+#define IsControlActive_FUNC 437
+#define IsControlEnabled_FUNC 438
+#define IsControlVisible_FUNC 439
+#define IsDataBrowserItemSelected_FUNC 440
+#define IsMenuCommandEnabled_FUNC 441
+#define IsMenuItemEnabled_FUNC 442
+#define IsValidControlHandle_FUNC 443
+#define IsValidMenu_FUNC 444
+#define IsValidWindowPtr_FUNC 445
+#define IsWindowActive_FUNC 446
+#define IsWindowCollapsed_FUNC 447
+#define IsWindowVisible_FUNC 448
+#define KeyTranslate_FUNC 449
+#define KillPoly_FUNC 450
+#define LineTo_FUNC 451
+#define LoWord_FUNC 452
+#define LockPortBits_FUNC 453
+#define Long2Fix_FUNC 454
+#define MenuSelect_FUNC 455
+#define MoveControl_FUNC 456
+#define MoveTo_FUNC 457
+#define MoveWindow_FUNC 458
+#define NavCreateChooseFolderDialog_FUNC 459
+#define NavCreateGetFileDialog_FUNC 460
+#define NavCreatePutFileDialog_FUNC 461
+#define NavDialogDispose_FUNC 462
+#define NavDialogGetReply_FUNC 463
+#define NavDialogGetSaveFileName_FUNC 464
+#define NavDialogGetUserAction_FUNC 465
+#define NavDialogRun_FUNC 466
+#define NavDialogSetSaveFileName_FUNC 467
+#define NavGetDefaultDialogCreationOptions_FUNC 468
+#define NewControl_FUNC 469
+#define NewDrag_FUNC 470
+#define NewGWorldFromPtr_FUNC 471
+#define NewHandle_FUNC 472
+#define NewHandleClear_FUNC 473
+#define NewPtr_FUNC 474
+#define NewPtrClear_FUNC 475
+#define NewRgn_FUNC 476
+#define OffsetRect_FUNC 477
+#define OffsetRgn_FUNC 478
+#define OpenDataBrowserContainer_FUNC 479
+#define OpenPoly_FUNC 480
+#define OpenRgn_FUNC 481
+#define PMCreatePageFormat_FUNC 482
+#define PMCreatePrintSettings_FUNC 483
+#define PMCreateSession_FUNC 484
+#define PMFlattenPageFormat_FUNC 485
+#define PMFlattenPrintSettings_FUNC 486
+#define PMGetAdjustedPageRect_FUNC 487
+#define PMGetAdjustedPaperRect_FUNC 488
+#define PMGetCollate_FUNC 489
+#define PMGetCopies_FUNC 490
+#define PMGetFirstPage_FUNC 491
+#define PMGetJobNameCFString_FUNC 492
+#define PMGetLastPage_FUNC 493
+#define PMGetPageRange_FUNC 494
+#define PMGetResolution_FUNC 495
+#define PMRelease_FUNC 496
+#define PMSessionBeginDocumentNoDialog_FUNC 497
+#define PMSessionBeginPageNoDialog_FUNC 498
+#define PMSessionCopyDestinationLocation_FUNC 499
+#define PMSessionCreatePrinterList_FUNC 500
+#define PMSessionDefaultPageFormat_FUNC 501
+#define PMSessionDefaultPrintSettings_FUNC 502
+#define PMSessionEndDocumentNoDialog_FUNC 503
+#define PMSessionEndPageNoDialog_FUNC 504
+#define PMSessionError_FUNC 505
+#define PMSessionGetDestinationType_FUNC 506
+#define PMSessionGetGraphicsContext_FUNC 507
+#define PMSessionPageSetupDialog_FUNC 508
+#define PMSessionPrintDialog_FUNC 509
+#define PMSessionSetCurrentPrinter_FUNC 510
+#define PMSessionSetDestination_FUNC 511
+#define PMSessionSetDocumentFormatGeneration_FUNC 512
+#define PMSessionSetError_FUNC 513
+#define PMSessionUseSheets_FUNC 514
+#define PMSessionValidatePageFormat_FUNC 515
+#define PMSessionValidatePrintSettings_FUNC 516
+#define PMSetCollate_FUNC 517
+#define PMSetFirstPage_FUNC 518
+#define PMSetJobNameCFString_FUNC 519
+#define PMSetLastPage_FUNC 520
+#define PMSetPageRange_FUNC 521
+#define PMUnflattenPageFormat_FUNC 522
+#define PMUnflattenPrintSettings_FUNC 523
+#define PaintOval_FUNC 524
+#define PaintPoly_FUNC 525
+#define PaintRect_FUNC 526
+#define PaintRoundRect_FUNC 527
+#define PenSize_FUNC 528
+#define PickColor_FUNC 529
+#define PopUpMenuSelect_FUNC 530
+#define PostEvent_FUNC 531
+#define PostEventToQueue_FUNC 532
+#define PtInRect_FUNC 533
+#define PtInRgn_FUNC 534
+#define PutScrapFlavor_FUNC 535
+#define QDBeginCGContext_FUNC 536
+#define QDEndCGContext_FUNC 537
+#define QDFlushPortBuffer_FUNC 538
+#define QDGlobalToLocalPoint_FUNC 539
+#define QDLocalToGlobalPoint_FUNC 540
+#define QDSetDirtyRegion_FUNC 541
+#define QDSetPatternOrigin_FUNC 542
+#define QDSwapTextFlags_FUNC 543
+#define RGBBackColor_FUNC 544
+#define RGBForeColor_FUNC 545
+#define ReceiveNextEvent_FUNC 546
+#define RectInRgn_FUNC 547
+#define RectRgn_FUNC 548
+#define RegisterAppearanceClient_FUNC 549
+#define ReleaseEvent_FUNC 550
+#define ReleaseIconRef_FUNC 551
+#define ReleaseMenu_FUNC 552
+#define ReleaseWindow_FUNC 553
+#define ReleaseWindowGroup_FUNC 554
+#define RemoveControlProperty_FUNC 555
+#define RemoveDataBrowserItems_FUNC 556
+#define RemoveDataBrowserTableViewColumn_FUNC 557
+#define RemoveEventHandler_FUNC 558
+#define RemoveEventLoopTimer_FUNC 559
+#define RemoveReceiveHandler_FUNC 560
+#define RemoveTrackingHandler_FUNC 561
+#define RepositionWindow_FUNC 562
+#define ReshapeCustomWindow_FUNC 563
+#define RetainEvent_FUNC 564
+#define RetainMenu_FUNC 565
+#define RetainWindow_FUNC 566
+#define RevealDataBrowserItem_FUNC 567
+#define RunStandardAlert_FUNC 568
+#define ScrollRect_FUNC 569
+#define SectRect_FUNC 570
+#define SectRgn_FUNC 571
+#define SelectWindow_FUNC 572
+#define SendBehind_FUNC 573
+#define SendEventToEventTarget_FUNC 574
+#define SetBevelButtonContentInfo_FUNC 575
+#define SetClip_FUNC 576
+#define SetControl32BitMaximum_FUNC 577
+#define SetControl32BitMinimum_FUNC 578
+#define SetControl32BitValue_FUNC 579
+#define SetControlAction_FUNC 580
+#define SetControlBounds_FUNC 581
+#define SetControlColorProc_FUNC 582
+#define SetControlData__IIIII_FUNC 583
+#define SetControlData__IIIILorg_eclipse_swt_internal_carbon_ControlButtonContentInfo_2_FUNC 584
+#define SetControlData__IIIILorg_eclipse_swt_internal_carbon_ControlTabInfoRecV1_2_FUNC 585
+#define SetControlData__IIIILorg_eclipse_swt_internal_carbon_Rect_2_FUNC 586
+#define SetControlData__IIII_3B_FUNC 587
+#define SetControlData__IIII_3I_FUNC 588
+#define SetControlData__IIII_3S_FUNC 589
+#define SetControlFontStyle_FUNC 590
+#define SetControlPopupMenuHandle_FUNC 591
+#define SetControlProperty_FUNC 592
+#define SetControlReference_FUNC 593
+#define SetControlTitleWithCFString_FUNC 594
+#define SetControlViewSize_FUNC 595
+#define SetControlVisibility_FUNC 596
+#define SetCursor_FUNC 597
+#define SetDataBrowserCallbacks_FUNC 598
+#define SetDataBrowserCustomCallbacks_FUNC 599
+#define SetDataBrowserHasScrollBars_FUNC 600
+#define SetDataBrowserItemDataBooleanValue_FUNC 601
+#define SetDataBrowserItemDataButtonValue_FUNC 602
+#define SetDataBrowserItemDataIcon_FUNC 603
+#define SetDataBrowserItemDataItemID_FUNC 604
+#define SetDataBrowserItemDataText_FUNC 605
+#define SetDataBrowserListViewDisclosureColumn_FUNC 606
+#define SetDataBrowserListViewHeaderBtnHeight_FUNC 607
+#define SetDataBrowserListViewHeaderDesc_FUNC 608
+#define SetDataBrowserScrollPosition_FUNC 609
+#define SetDataBrowserSelectedItems_FUNC 610
+#define SetDataBrowserSelectionFlags_FUNC 611
+#define SetDataBrowserSortOrder_FUNC 612
+#define SetDataBrowserTableViewColumnPosition_FUNC 613
+#define SetDataBrowserTableViewHiliteStyle_FUNC 614
+#define SetDataBrowserTableViewItemRow_FUNC 615
+#define SetDataBrowserTableViewNamedColumnWidth_FUNC 616
+#define SetDataBrowserTarget_FUNC 617
+#define SetDragAllowableActions_FUNC 618
+#define SetDragDropAction_FUNC 619
+#define SetDragInputProc_FUNC 620
+#define SetEventLoopTimerNextFireTime_FUNC 621
+#define SetEventParameter__IIII_3C_FUNC 622
+#define SetEventParameter__IIII_3S_FUNC 623
+#define SetFontInfoForSelection_FUNC 624
+#define SetFrontProcess_FUNC 625
+#define SetFrontProcessWithOptions_FUNC 626
+#define SetGWorld_FUNC 627
+#define SetItemMark_FUNC 628
+#define SetKeyboardFocus_FUNC 629
+#define SetMenuCommandMark_FUNC 630
+#define SetMenuFont_FUNC 631
+#define SetMenuItemCommandKey_FUNC 632
+#define SetMenuItemHierarchicalMenu_FUNC 633
+#define SetMenuItemIconHandle_FUNC 634
+#define SetMenuItemKeyGlyph_FUNC 635
+#define SetMenuItemModifiers_FUNC 636
+#define SetMenuItemRefCon_FUNC 637
+#define SetMenuItemTextWithCFString_FUNC 638
+#define SetMenuTitleWithCFString_FUNC 639
+#define SetOrigin_FUNC 640
+#define SetPort_FUNC 641
+#define SetPortBounds_FUNC 642
+#define SetPortWindowPort_FUNC 643
+#define SetPt_FUNC 644
+#define SetRect_FUNC 645
+#define SetRectRgn_FUNC 646
+#define SetRootMenu_FUNC 647
+#define SetThemeBackground_FUNC 648
+#define SetThemeCursor_FUNC 649
+#define SetThemeDrawingState_FUNC 650
+#define SetThemeTextColor_FUNC 651
+#define SetThemeWindowBackground_FUNC 652
+#define SetUpControlBackground_FUNC 653
+#define SetWRefCon_FUNC 654
+#define SetWindowActivationScope_FUNC 655
+#define SetWindowBounds_FUNC 656
+#define SetWindowDefaultButton_FUNC 657
+#define SetWindowGroup_FUNC 658
+#define SetWindowGroupOwner_FUNC 659
+#define SetWindowGroupParent_FUNC 660
+#define SetWindowModality_FUNC 661
+#define SetWindowTitleWithCFString_FUNC 662
+#define ShowWindow_FUNC 663
+#define SizeControl_FUNC 664
+#define SizeWindow_FUNC 665
+#define StillDown_FUNC 666
+#define SyncCGContextOriginWithPort_FUNC 667
+#define SysBeep_FUNC 668
+#define TXNActivate_FUNC 669
+#define TXNAdjustCursor_FUNC 670
+#define TXNClick_FUNC 671
+#define TXNCopy_FUNC 672
+#define TXNCut_FUNC 673
+#define TXNDataSize_FUNC 674
+#define TXNDeleteObject_FUNC 675
+#define TXNDraw_FUNC 676
+#define TXNEchoMode_FUNC 677
+#define TXNFocus_FUNC 678
+#define TXNGetData_FUNC 679
+#define TXNGetLineCount_FUNC 680
+#define TXNGetLineMetrics_FUNC 681
+#define TXNGetRectBounds_FUNC 682
+#define TXNGetSelection_FUNC 683
+#define TXNGetTXNObjectControls_FUNC 684
+#define TXNGetViewRect_FUNC 685
+#define TXNInitTextension_FUNC 686
+#define TXNNewObject_FUNC 687
+#define TXNOffsetToPoint_FUNC 688
+#define TXNPaste_FUNC 689
+#define TXNPointToOffset_FUNC 690
+#define TXNSelectAll_FUNC 691
+#define TXNSetBackground_FUNC 692
+#define TXNSetData_FUNC 693
+#define TXNSetFrameBounds_FUNC 694
+#define TXNSetRectBounds_FUNC 695
+#define TXNSetSelection_FUNC 696
+#define TXNSetTXNObjectControls_FUNC 697
+#define TXNSetTypeAttributes_FUNC 698
+#define TXNShowSelection_FUNC 699
+#define TestControl_FUNC 700
+#define TextFace_FUNC 701
+#define TextFont_FUNC 702
+#define TextMode_FUNC 703
+#define TextSize_FUNC 704
+#define TextWidth_FUNC 705
+#define TrackDrag_FUNC 706
+#define TrackMouseLocationWithOptions_FUNC 707
+#define UnionRect_FUNC 708
+#define UnionRgn_FUNC 709
+#define UnlockPortBits_FUNC 710
+#define UpdateControls_FUNC 711
+#define UpdateDataBrowserItems_FUNC 712
+#define UpgradeScriptInfoToTextEncoding_FUNC 713
+#define WaitMouseMoved_FUNC 714
+#define X2Fix_FUNC 715
+#define ZoomWindowIdeal_FUNC 716
+#define kHIViewWindowContentID_FUNC 717
+#define kPMDocumentFormatPDF_FUNC 718
+#define kPMGraphicsContextCoreGraphics_FUNC 719
+#define memcpy__III_FUNC 720
+#define memcpy__ILorg_eclipse_swt_internal_carbon_ATSUTab_2I_FUNC 721
+#define memcpy__ILorg_eclipse_swt_internal_carbon_BitMap_2I_FUNC 722
+#define memcpy__ILorg_eclipse_swt_internal_carbon_Cursor_2I_FUNC 723
+#define memcpy__ILorg_eclipse_swt_internal_carbon_EventRecord_2I_FUNC 724
+#define memcpy__ILorg_eclipse_swt_internal_carbon_FontSelectionQDStyle_2I_FUNC 725
+#define memcpy__ILorg_eclipse_swt_internal_carbon_HMHelpContentRec_2I_FUNC 726
+#define memcpy__ILorg_eclipse_swt_internal_carbon_PixMap_2I_FUNC 727
+#define memcpy__ILorg_eclipse_swt_internal_carbon_RGBColor_2I_FUNC 728
+#define memcpy__ILorg_eclipse_swt_internal_carbon_Rect_2I_FUNC 729
+#define memcpy__I_3BI_FUNC 730
+#define memcpy__I_3CI_FUNC 731
+#define memcpy__I_3II_FUNC 732
+#define memcpy__Lorg_eclipse_swt_internal_carbon_ATSTrapezoid_2II_FUNC 733
+#define memcpy__Lorg_eclipse_swt_internal_carbon_FontSelectionQDStyle_2II_FUNC 734
+#define memcpy__Lorg_eclipse_swt_internal_carbon_GDevice_2II_FUNC 735
+#define memcpy__Lorg_eclipse_swt_internal_carbon_HMHelpContentRec_2II_FUNC 736
+#define memcpy__Lorg_eclipse_swt_internal_carbon_PixMap_2II_FUNC 737
+#define memcpy__Lorg_eclipse_swt_internal_carbon_Rect_2II_FUNC 738
+#define memcpy___3BII_FUNC 739
+#define memcpy___3B_3CI_FUNC 740
+#define memcpy___3CII_FUNC 741
+#define memcpy___3C_3BI_FUNC 742
+#define memcpy___3FII_FUNC 743
+#define memcpy___3III_FUNC 744
+#define memset_FUNC 745
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
index 7a51f5f726..c563dd11bb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
@@ -781,9 +781,12 @@ public static final native void CGContextStrokePath (int ctx);
 public static final native void CGContextSynchronize (int ctx);
 public static final native int CGDataProviderCreateWithData (int info, int data, int size, int releaseData);
 public static final native void CGDataProviderRelease (int provider);
+public static final native int CGDisplayBaseAddress (int display);
 public static final native int CGDisplayBitsPerPixel (int display);
 public static final native int CGDisplayBitsPerSample (int display);
 public static final native int CGDisplayBytesPerRow (int display);
+public static final native int CGDisplayPixelsHigh (int display);
+public static final native int CGDisplayPixelsWide (int display);
 public static final native int CGFontCreateWithPlatformFont (int[] platformFontReference);
 public static final native void CGFontRelease (int font);
 public static final native int CGGetDisplaysWithRect (CGRect rect, int maxDisplays, int[] dspys, int[] dspyCnt);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/GC.java
index 4fe0d07b48..57613dc322 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/graphics/GC.java
@@ -173,38 +173,41 @@ public void copyArea(Image image, int x, int y) {
 	if (data.control != 0) {
 		int[] offscreen = new int[1];
 		OS.HIViewCreateOffscreenImage(data.control, 0, null, offscreen);
-		copyArea(image, x, y, offscreen[0]);
+		copyArea(image, x, y, offscreen[0], false);
 		if (offscreen[0] != 0) OS.CGImageRelease(offscreen[0]);
 	} else if (data.image != null) {
-		copyArea(image, x, y, data.image.handle);
+		copyArea(image, x, y, data.image.handle, false);
 	} else if (data.window != 0) {
-//		int imageHandle = image.handle;
-//		CGRect rect = new CGRect();
-//		rect.x = x;
-//		rect.y = y;
-//		rect.width = OS.CGImageGetWidth(imageHandle);
-//		rect.height = OS.CGImageGetHeight(imageHandle);
-//		int[] displays = new int[16];
-//		int[] count = new int[1];
-//		if (OS.CGGetDisplaysWithRect(rect, displays.length, displays, count) != 0) return;
-//		for (int i = 0; i < count[0]; i++) {
-//			int display = displays[i];
-//			if (OS.CGDisplayCapture(display) == 0) {
-//				int address = OS.CGDisplayAddressForPosition (display, x, y);
-//				System.out.println(address);
-//				int colorspace = data.device.colorspace;
-//				int provider = OS.CGDataProviderCreateWithData(0, data, dataSize, 0);
-//				int srcImage = OS.CGImageCreate(width, height, 8, 32, bpr, colorspace, OS.kCGImageAlphaNoneSkipFirst, provider, null, false, 0);
-//				OS.CGDataProviderRelease(provider);
-//				copyArea(image, x, y, srcImage);
-//				if (srcImage != 0) OS.CGImageRelease(srcImage);
-//				OS.CGDisplayRelease(display);
-//			}
-//		}
+		int imageHandle = image.handle;
+		CGRect rect = new CGRect();
+		rect.x = x;
+		rect.y = y;
+		rect.width = OS.CGImageGetWidth(imageHandle);
+		rect.height = OS.CGImageGetHeight(imageHandle);
+		int[] displays = new int[16];
+		int[] count = new int[1];
+		if (OS.CGGetDisplaysWithRect(rect, displays.length, displays, count) != 0) return;
+		for (int i = 0; i < count[0]; i++) {
+			int display = displays[i];
+			int address = OS.CGDisplayBaseAddress(display);
+			if (address != 0) {
+				int width = OS.CGDisplayPixelsWide(display);
+				int height = OS.CGDisplayPixelsHigh(display);
+				int bpr = OS.CGDisplayBytesPerRow(display);
+				int bpp = OS.CGDisplayBitsPerPixel(display);
+				int bps = OS.CGDisplayBitsPerSample(display);
+				System.out.println(width + " " + height + " " + bpr + " " + bpp + " " + bps);
+				int provider = OS.CGDataProviderCreateWithData(0, address, bpr * height, 0);
+				int srcImage = OS.CGImageCreate(width, height, bps, bpp, bpr, data.device.colorspace, OS.kCGImageAlphaNoneSkipFirst, provider, null, false, 0);
+				OS.CGDataProviderRelease(provider);
+				copyArea(image, x, y, srcImage, true);
+				if (srcImage != 0) OS.CGImageRelease(srcImage);
+			}
+		}
 	}	
 }
 
-void copyArea (Image image, int x, int y, int srcImage) {
+void copyArea (Image image, int x, int y, int srcImage, boolean screen) {
 	if (srcImage == 0) return;
 	int imageHandle = image.handle;
 	int bpc = OS.CGImageGetBitsPerComponent(imageHandle);
@@ -213,14 +216,18 @@ void copyArea (Image image, int x, int y, int srcImage) {
 	int bpr = OS.CGImageGetBytesPerRow(imageHandle);
 	int alphaInfo = OS.CGImageGetAlphaInfo(imageHandle);
 	int context = OS.CGBitmapContextCreate(image.data, width, height, bpc, bpr, data.device.colorspace, alphaInfo);
-	if (context != 0) { 
+	if (context != 0) {
 	 	CGRect rect = new CGRect();
 	 	rect.x = -x;
 	 	rect.y = -y;
 	 	rect.width = OS.CGImageGetWidth(srcImage);
 		rect.height = OS.CGImageGetHeight(srcImage);
-		OS.CGContextScaleCTM(context, 1, -1);
-		OS.CGContextTranslateCTM(context, 0, -height);
+		if (screen) {
+			OS.CGContextTranslateCTM(context, 0, -(rect.height - height));
+		} else {	
+			OS.CGContextScaleCTM(context, 1, -1);
+			OS.CGContextTranslateCTM(context, 0, -height);
+		}
 		OS.CGContextDrawImage(context, rect, srcImage);
 		OS.CGContextRelease(context);
 	}