From 5721cfd149c1026b4c21848f64c2b57027ac8c7e Mon Sep 17 00:00:00 2001
From: Silenio Quarti
Date: Mon, 24 Sep 2012 14:45:57 -0400
Subject: Make 64-bit the default source code
---
bundles/org.eclipse.swt.tools/plugin.properties | 2 +-
.../builders/Check64CompilationParticipant.java | 18 +-
bundles/org.eclipse.swt/.classpath_cocoa | 2 +-
bundles/org.eclipse.swt/.classpath_gtk | 2 +-
bundles/org.eclipse.swt/.classpath_gtk_j2me | 2 +-
bundles/org.eclipse.swt/.classpath_win32 | 2 +-
bundles/org.eclipse.swt/.classpath_win32_j2me | 2 +-
.../cocoa/org/eclipse/swt/awt/SWT_AWT.java | 6 +-
.../gtk/org/eclipse/swt/awt/SWT_AWT.java | 10 +-
.../motif/org/eclipse/swt/awt/SWT_AWT.java | 6 +-
.../win32/org/eclipse/swt/awt/SWT_AWT.java | 6 +-
.../org/eclipse/swt/accessibility/Accessible.java | 12 +-
.../swt/accessibility/SWTAccessibleDelegate.java | 16 +-
.../org/eclipse/swt/accessibility/Accessible.java | 10 +-
.../swt/accessibility/AccessibleFactory.java | 82 +-
.../swt/accessibility/AccessibleObject.java | 384 +-
.../org/eclipse/swt/accessibility/Accessible.java | 878 ++--
.../org/eclipse/swt/accessibility/Relation.java | 42 +-
.../win32/org/eclipse/swt/browser/IE.java | 42 +-
.../win32/org/eclipse/swt/browser/WebSite.java | 224 +-
.../cocoa/org/eclipse/swt/dnd/DragSource.java | 44 +-
.../cocoa/org/eclipse/swt/dnd/DropTarget.java | 46 +-
.../org/eclipse/swt/dnd/TableDragSourceEffect.java | 2 +-
.../org/eclipse/swt/dnd/TreeDragSourceEffect.java | 2 +-
.../gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java | 2 +-
.../gtk/org/eclipse/swt/dnd/Clipboard.java | 22 +-
.../gtk/org/eclipse/swt/dnd/ClipboardProxy.java | 18 +-
.../gtk/org/eclipse/swt/dnd/DragSource.java | 22 +-
.../gtk/org/eclipse/swt/dnd/DropTarget.java | 28 +-
.../gtk/org/eclipse/swt/dnd/FileTransfer.java | 30 +-
.../gtk/org/eclipse/swt/dnd/HTMLTransfer.java | 2 +-
.../gtk/org/eclipse/swt/dnd/ImageTransfer.java | 10 +-
.../gtk/org/eclipse/swt/dnd/RTFTransfer.java | 2 +-
.../org/eclipse/swt/dnd/TableDragSourceEffect.java | 24 +-
.../org/eclipse/swt/dnd/TableDropTargetEffect.java | 8 +-
.../gtk/org/eclipse/swt/dnd/TextTransfer.java | 12 +-
.../gtk/org/eclipse/swt/dnd/TransferData.java | 4 +-
.../org/eclipse/swt/dnd/TreeDragSourceEffect.java | 24 +-
.../org/eclipse/swt/dnd/TreeDropTargetEffect.java | 8 +-
.../gtk/org/eclipse/swt/dnd/URLTransfer.java | 2 +-
.../org/eclipse/swt/dnd/ByteArrayTransfer.java | 6 +-
.../win32/org/eclipse/swt/dnd/Clipboard.java | 34 +-
.../win32/org/eclipse/swt/dnd/DragSource.java | 46 +-
.../win32/org/eclipse/swt/dnd/DropTarget.java | 40 +-
.../win32/org/eclipse/swt/dnd/FileTransfer.java | 2 +-
.../win32/org/eclipse/swt/dnd/HTMLTransfer.java | 6 +-
.../win32/org/eclipse/swt/dnd/ImageTransfer.java | 18 +-
.../org/eclipse/swt/dnd/OleEnumFORMATETC.java | 30 +-
.../win32/org/eclipse/swt/dnd/RTFTransfer.java | 6 +-
.../org/eclipse/swt/dnd/TableDragSourceEffect.java | 30 +-
.../org/eclipse/swt/dnd/TableDropTargetEffect.java | 4 +-
.../win32/org/eclipse/swt/dnd/TextTransfer.java | 10 +-
.../win32/org/eclipse/swt/dnd/TransferData.java | 2 +-
.../org/eclipse/swt/dnd/TreeDragSourceEffect.java | 30 +-
.../org/eclipse/swt/dnd/TreeDropTargetEffect.java | 16 +-
.../win32/org/eclipse/swt/dnd/URLTransfer.java | 10 +-
.../org/eclipse/swt/browser/MozillaDelegate.java | 2 +-
.../org/eclipse/swt/browser/MozillaDelegate.java | 10 +-
.../eclipse/swt/browser/AppFileLocProvider.java | 56 +-
.../common/org/eclipse/swt/browser/Download.java | 166 +-
.../org/eclipse/swt/browser/DownloadFactory.java | 30 +-
.../eclipse/swt/browser/DownloadFactory_1_8.java | 30 +-
.../org/eclipse/swt/browser/Download_1_8.java | 186 +-
.../common/org/eclipse/swt/browser/External.java | 214 +-
.../org/eclipse/swt/browser/ExternalFactory.java | 30 +-
.../common/org/eclipse/swt/browser/FilePicker.java | 96 +-
.../org/eclipse/swt/browser/FilePickerFactory.java | 34 +-
.../org/eclipse/swt/browser/FilePicker_10.java | 46 +-
.../org/eclipse/swt/browser/FilePicker_1_8.java | 46 +-
.../swt/browser/HelperAppLauncherDialog.java | 36 +-
.../browser/HelperAppLauncherDialogFactory.java | 34 +-
.../swt/browser/HelperAppLauncherDialog_10.java | 6 +-
.../swt/browser/HelperAppLauncherDialog_1_9.java | 32 +-
.../org/eclipse/swt/browser/InputStream.java | 36 +-
.../common/org/eclipse/swt/browser/Mozilla.java | 524 +--
.../org/eclipse/swt/browser/PromptAuth2.java | 42 +-
.../org/eclipse/swt/browser/PromptDialog.java | 2 +-
.../org/eclipse/swt/browser/PromptFactory.java | 30 +-
.../org/eclipse/swt/browser/PromptService2.java | 128 +-
.../eclipse/swt/browser/PromptService2Factory.java | 32 +-
.../common/org/eclipse/swt/browser/Prompter.java | 98 +-
.../org/eclipse/swt/browser/SimpleEnumerator.java | 32 +-
.../org/eclipse/swt/browser/WindowCreator2.java | 54 +-
.../org/eclipse/swt/internal/mozilla/XPCOM.java | 986 ++--
.../eclipse/swt/internal/mozilla/XPCOMObject.java | 652 +--
.../swt/internal/mozilla/init/GREProperty.java | 4 +-
.../swt/internal/mozilla/init/GREVersionRange.java | 4 +-
.../swt/internal/mozilla/init/XPCOMInit.java | 4 +-
.../internal/mozilla/nsDynamicFunctionLoad.java | 4 +-
.../swt/internal/mozilla/nsEmbedString.java | 6 +-
.../eclipse/swt/internal/mozilla/nsIAppShell.java | 10 +-
.../swt/internal/mozilla/nsIAuthInformation.java | 18 +-
.../swt/internal/mozilla/nsIAuthPrompt2.java | 6 +-
.../swt/internal/mozilla/nsIBadCertListener2.java | 4 +-
.../swt/internal/mozilla/nsIBaseWindow.java | 16 +-
.../swt/internal/mozilla/nsICancelable.java | 2 +-
.../swt/internal/mozilla/nsICategoryManager.java | 10 +-
.../internal/mozilla/nsICertOverrideService.java | 14 +-
.../internal/mozilla/nsICertificateDialogs.java | 14 +-
.../eclipse/swt/internal/mozilla/nsIChannel.java | 34 +-
.../eclipse/swt/internal/mozilla/nsIClassInfo.java | 14 +-
.../swt/internal/mozilla/nsIComponentManager.java | 10 +-
.../internal/mozilla/nsIComponentRegistrar.java | 22 +-
.../internal/mozilla/nsIContextMenuListener.java | 4 +-
.../eclipse/swt/internal/mozilla/nsICookie.java | 14 +-
.../swt/internal/mozilla/nsICookieManager.java | 6 +-
.../swt/internal/mozilla/nsICookieService.java | 10 +-
.../swt/internal/mozilla/nsICookieService_1_9.java | 10 +-
.../org/eclipse/swt/internal/mozilla/nsID.java | 4 +-
.../swt/internal/mozilla/nsIDOMDocument.java | 114 +-
.../swt/internal/mozilla/nsIDOMElement.java | 42 +-
.../eclipse/swt/internal/mozilla/nsIDOMEvent.java | 12 +-
.../swt/internal/mozilla/nsIDOMEventTarget.java | 10 +-
.../swt/internal/mozilla/nsIDOMKeyEvent.java | 4 +-
.../swt/internal/mozilla/nsIDOMMouseEvent.java | 8 +-
.../eclipse/swt/internal/mozilla/nsIDOMNode.java | 68 +-
.../swt/internal/mozilla/nsIDOMSerializer.java | 6 +-
.../swt/internal/mozilla/nsIDOMSerializer_1_7.java | 6 +-
.../swt/internal/mozilla/nsIDOMUIEvent.java | 8 +-
.../eclipse/swt/internal/mozilla/nsIDOMWindow.java | 170 +-
.../internal/mozilla/nsIDOMWindowCollection.java | 6 +-
.../eclipse/swt/internal/mozilla/nsIDataType.java | 2 +-
.../swt/internal/mozilla/nsIDirectoryService.java | 6 +-
.../mozilla/nsIDirectoryServiceProvider.java | 4 +-
.../mozilla/nsIDirectoryServiceProvider2.java | 4 +-
.../eclipse/swt/internal/mozilla/nsIDocShell.java | 38 +-
.../eclipse/swt/internal/mozilla/nsIDownload.java | 22 +-
.../swt/internal/mozilla/nsIDownload_1_8.java | 18 +-
.../internal/mozilla/nsIEmbeddingSiteWindow.java | 6 +-
.../eclipse/swt/internal/mozilla/nsIFactory.java | 4 +-
.../org/eclipse/swt/internal/mozilla/nsIFile.java | 44 +-
.../swt/internal/mozilla/nsIFilePicker.java | 20 +-
.../swt/internal/mozilla/nsIFilePicker_1_8.java | 26 +-
.../swt/internal/mozilla/nsIFocusManager.java | 38 +-
.../swt/internal/mozilla/nsIHelperAppLauncher.java | 16 +-
.../mozilla/nsIHelperAppLauncherDialog.java | 8 +-
.../mozilla/nsIHelperAppLauncherDialog_1_9.java | 6 +-
.../internal/mozilla/nsIHelperAppLauncher_1_8.java | 18 +-
.../internal/mozilla/nsIHelperAppLauncher_1_9.java | 18 +-
.../internal/mozilla/nsIHelperAppLauncher_8.java | 20 +-
.../swt/internal/mozilla/nsIHttpChannel.java | 24 +-
.../swt/internal/mozilla/nsIHttpHeaderVisitor.java | 4 +-
.../eclipse/swt/internal/mozilla/nsIIOService.java | 14 +-
.../swt/internal/mozilla/nsIInputStream.java | 4 +-
.../internal/mozilla/nsIInterfaceRequestor.java | 4 +-
.../swt/internal/mozilla/nsIJSContextStack.java | 8 +-
.../eclipse/swt/internal/mozilla/nsILocalFile.java | 26 +-
.../swt/internal/mozilla/nsIMIMEInputStream.java | 4 +-
.../eclipse/swt/internal/mozilla/nsIMemory.java | 8 +-
.../swt/internal/mozilla/nsIObserverService.java | 10 +-
.../swt/internal/mozilla/nsIPrefBranch.java | 12 +-
.../internal/mozilla/nsIPrefLocalizedString.java | 6 +-
.../swt/internal/mozilla/nsIPrefService.java | 10 +-
.../eclipse/swt/internal/mozilla/nsIPrincipal.java | 48 +-
.../swt/internal/mozilla/nsIProgressDialog.java | 8 +-
.../internal/mozilla/nsIProgressDialog_1_8.java | 12 +-
.../eclipse/swt/internal/mozilla/nsIPrompt.java | 2 +-
.../swt/internal/mozilla/nsIPromptFactory.java | 4 +-
.../swt/internal/mozilla/nsIPromptService.java | 20 +-
.../swt/internal/mozilla/nsIPromptService2.java | 6 +-
.../swt/internal/mozilla/nsIProperties.java | 8 +-
.../eclipse/swt/internal/mozilla/nsIRequest.java | 12 +-
.../eclipse/swt/internal/mozilla/nsISSLStatus.java | 6 +-
.../internal/mozilla/nsIScriptSecurityManager.java | 48 +-
.../swt/internal/mozilla/nsISeekableStream.java | 2 +-
.../swt/internal/mozilla/nsISerializable.java | 6 +-
.../swt/internal/mozilla/nsIServiceManager.java | 6 +-
.../swt/internal/mozilla/nsISimpleEnumerator.java | 4 +-
.../eclipse/swt/internal/mozilla/nsISupports.java | 8 +-
.../internal/mozilla/nsISupportsWeakReference.java | 4 +-
.../swt/internal/mozilla/nsITooltipListener.java | 2 +-
.../eclipse/swt/internal/mozilla/nsITransfer.java | 4 +-
.../org/eclipse/swt/internal/mozilla/nsIURI.java | 58 +-
.../internal/mozilla/nsIURIContentListener.java | 18 +-
.../swt/internal/mozilla/nsIUploadChannel.java | 6 +-
.../eclipse/swt/internal/mozilla/nsIVariant.java | 38 +-
.../swt/internal/mozilla/nsIWeakReference.java | 4 +-
.../swt/internal/mozilla/nsIWebBrowser.java | 16 +-
.../swt/internal/mozilla/nsIWebBrowserChrome.java | 6 +-
.../internal/mozilla/nsIWebBrowserChromeFocus.java | 2 +-
.../swt/internal/mozilla/nsIWebBrowserFocus.java | 10 +-
.../swt/internal/mozilla/nsIWebBrowserSetup.java | 2 +-
.../swt/internal/mozilla/nsIWebBrowserStream.java | 6 +-
.../swt/internal/mozilla/nsIWebNavigation.java | 14 +-
.../swt/internal/mozilla/nsIWebNavigationInfo.java | 4 +-
.../swt/internal/mozilla/nsIWebProgress.java | 8 +-
.../internal/mozilla/nsIWebProgressListener.java | 12 +-
.../internal/mozilla/nsIWebProgressListener2.java | 4 +-
.../swt/internal/mozilla/nsIWindowCreator.java | 4 +-
.../swt/internal/mozilla/nsIWindowCreator2.java | 4 +-
.../swt/internal/mozilla/nsIWindowWatcher.java | 24 +-
.../swt/internal/mozilla/nsIWritableVariant.java | 20 +-
.../eclipse/swt/internal/mozilla/nsIX509Cert.java | 54 +-
.../swt/internal/mozilla/nsIX509CertValidity.java | 18 +-
.../internal/mozilla/nsIXPCSecurityManager.java | 10 +-
.../eclipse/swt/internal/mozilla/nsIXPConnect.java | 6 +-
.../org/eclipse/swt/browser/MozillaDelegate.java | 26 +-
.../org/eclipse/swt/browser/MozillaDelegate.java | 2 +-
.../org/eclipse/swt/browser/MozillaDelegate.java | 20 +-
.../eclipse/swt/internal/ole/win32/COMObject.java | 652 +--
.../win32/org/eclipse/swt/ole/win32/OLE.java | 4 +-
.../org/eclipse/swt/ole/win32/OleAutomation.java | 22 +-
.../org/eclipse/swt/ole/win32/OleClientSite.java | 208 +-
.../org/eclipse/swt/ole/win32/OleControlSite.java | 104 +-
.../org/eclipse/swt/ole/win32/OleEventSink.java | 26 +-
.../win32/org/eclipse/swt/ole/win32/OleFrame.java | 102 +-
.../swt/ole/win32/OlePropertyChangeSink.java | 28 +-
.../win32/org/eclipse/swt/ole/win32/Variant.java | 86 +-
.../cocoa/org/eclipse/swt/opengl/GLCanvas.java | 2 +-
.../org/eclipse/swt/internal/opengl/glx/GLX.java | 70 +-
.../swt/internal/opengl/glx/XVisualInfo.java | 2 +-
.../gtk/org/eclipse/swt/opengl/GLCanvas.java | 34 +-
.../motif/org/eclipse/swt/opengl/GLCanvas.java | 2 +-
.../org/eclipse/swt/internal/opengl/win32/WGL.java | 38 +-
.../win32/org/eclipse/swt/opengl/GLCanvas.java | 10 +-
.../org/eclipse/swt/internal/cairo/Cairo.java | 546 +--
.../eclipse/swt/internal/cairo/cairo_path_t.java | 2 +-
.../carbon/org/eclipse/swt/internal/carbon/OS.java | 2 +-
.../org/eclipse/swt/internal/cocoa/Cocoa.java | 6 +-
.../org/eclipse/swt/internal/cocoa/CFRange.java | 4 +-
.../swt/internal/cocoa/CGAffineTransform.java | 12 +-
.../eclipse/swt/internal/cocoa/CGPathElement.java | 2 +-
.../org/eclipse/swt/internal/cocoa/CGPoint.java | 4 +-
.../org/eclipse/swt/internal/cocoa/CGSize.java | 4 +-
.../internal/cocoa/CTParagraphStyleSetting.java | 4 +-
.../eclipse/swt/internal/cocoa/DOMDocument.java | 4 +-
.../org/eclipse/swt/internal/cocoa/DOMEvent.java | 2 +-
.../swt/internal/cocoa/DOMKeyboardEvent.java | 2 +-
.../eclipse/swt/internal/cocoa/DOMMouseEvent.java | 2 +-
.../org/eclipse/swt/internal/cocoa/DOMUIEvent.java | 2 +-
.../eclipse/swt/internal/cocoa/DOMWheelEvent.java | 2 +-
.../eclipse/swt/internal/cocoa/NSActionCell.java | 8 +-
.../swt/internal/cocoa/NSAffineTransform.java | 12 +-
.../internal/cocoa/NSAffineTransformStruct.java | 4 +-
.../org/eclipse/swt/internal/cocoa/NSAlert.java | 12 +-
.../swt/internal/cocoa/NSAppleEventDescriptor.java | 4 +-
.../eclipse/swt/internal/cocoa/NSApplication.java | 38 +-
.../org/eclipse/swt/internal/cocoa/NSArray.java | 14 +-
.../swt/internal/cocoa/NSAssertionHandler.java | 8 +-
.../swt/internal/cocoa/NSAttributedString.java | 28 +-
.../swt/internal/cocoa/NSAutoreleasePool.java | 2 +-
.../eclipse/swt/internal/cocoa/NSBezierPath.java | 38 +-
.../swt/internal/cocoa/NSBitmapImageRep.java | 38 +-
.../org/eclipse/swt/internal/cocoa/NSBox.java | 20 +-
.../eclipse/swt/internal/cocoa/NSBrowserCell.java | 4 +-
.../org/eclipse/swt/internal/cocoa/NSBundle.java | 24 +-
.../org/eclipse/swt/internal/cocoa/NSButton.java | 18 +-
.../eclipse/swt/internal/cocoa/NSButtonCell.java | 12 +-
.../eclipse/swt/internal/cocoa/NSCalendarDate.java | 26 +-
.../org/eclipse/swt/internal/cocoa/NSCell.java | 28 +-
.../eclipse/swt/internal/cocoa/NSCharacterSet.java | 4 +-
.../org/eclipse/swt/internal/cocoa/NSClipView.java | 4 +-
.../org/eclipse/swt/internal/cocoa/NSCoder.java | 2 +-
.../org/eclipse/swt/internal/cocoa/NSColor.java | 78 +-
.../eclipse/swt/internal/cocoa/NSColorList.java | 12 +-
.../eclipse/swt/internal/cocoa/NSColorPanel.java | 12 +-
.../eclipse/swt/internal/cocoa/NSColorSpace.java | 6 +-
.../org/eclipse/swt/internal/cocoa/NSComboBox.java | 30 +-
.../eclipse/swt/internal/cocoa/NSComboBoxCell.java | 4 +-
.../org/eclipse/swt/internal/cocoa/NSControl.java | 26 +-
.../org/eclipse/swt/internal/cocoa/NSCursor.java | 26 +-
.../org/eclipse/swt/internal/cocoa/NSData.java | 12 +-
.../org/eclipse/swt/internal/cocoa/NSDate.java | 8 +-
.../eclipse/swt/internal/cocoa/NSDatePicker.java | 12 +-
.../eclipse/swt/internal/cocoa/NSDictionary.java | 14 +-
.../swt/internal/cocoa/NSDirectoryEnumerator.java | 2 +-
.../org/eclipse/swt/internal/cocoa/NSDockTile.java | 4 +-
.../eclipse/swt/internal/cocoa/NSEnumerator.java | 4 +-
.../org/eclipse/swt/internal/cocoa/NSError.java | 8 +-
.../org/eclipse/swt/internal/cocoa/NSEvent.java | 42 +-
.../eclipse/swt/internal/cocoa/NSFileManager.java | 14 +-
.../eclipse/swt/internal/cocoa/NSFileWrapper.java | 2 +-
.../org/eclipse/swt/internal/cocoa/NSFont.java | 56 +-
.../eclipse/swt/internal/cocoa/NSFontManager.java | 22 +-
.../eclipse/swt/internal/cocoa/NSFontPanel.java | 12 +-
.../eclipse/swt/internal/cocoa/NSFormatter.java | 4 +-
.../org/eclipse/swt/internal/cocoa/NSGradient.java | 8 +-
.../swt/internal/cocoa/NSGraphicsContext.java | 20 +-
.../eclipse/swt/internal/cocoa/NSHTTPCookie.java | 8 +-
.../swt/internal/cocoa/NSHTTPCookieStorage.java | 8 +-
.../org/eclipse/swt/internal/cocoa/NSImage.java | 28 +-
.../org/eclipse/swt/internal/cocoa/NSImageRep.java | 10 +-
.../eclipse/swt/internal/cocoa/NSImageView.java | 12 +-
.../org/eclipse/swt/internal/cocoa/NSIndexSet.java | 22 +-
.../eclipse/swt/internal/cocoa/NSInputManager.java | 4 +-
.../swt/internal/cocoa/NSKeyedArchiver.java | 4 +-
.../swt/internal/cocoa/NSKeyedUnarchiver.java | 4 +-
.../swt/internal/cocoa/NSLayoutManager.java | 36 +-
.../org/eclipse/swt/internal/cocoa/NSLocale.java | 6 +-
.../org/eclipse/swt/internal/cocoa/NSMenu.java | 26 +-
.../org/eclipse/swt/internal/cocoa/NSMenuItem.java | 36 +-
.../eclipse/swt/internal/cocoa/NSMutableArray.java | 16 +-
.../internal/cocoa/NSMutableAttributedString.java | 8 +-
.../swt/internal/cocoa/NSMutableDictionary.java | 12 +-
.../swt/internal/cocoa/NSMutableIndexSet.java | 10 +-
.../internal/cocoa/NSMutableParagraphStyle.java | 16 +-
.../eclipse/swt/internal/cocoa/NSMutableSet.java | 4 +-
.../swt/internal/cocoa/NSMutableString.java | 14 +-
.../swt/internal/cocoa/NSMutableURLRequest.java | 6 +-
.../eclipse/swt/internal/cocoa/NSNotification.java | 6 +-
.../swt/internal/cocoa/NSNotificationCenter.java | 6 +-
.../org/eclipse/swt/internal/cocoa/NSNumber.java | 22 +-
.../swt/internal/cocoa/NSNumberFormatter.java | 22 +-
.../org/eclipse/swt/internal/cocoa/NSObject.java | 48 +-
.../swt/internal/cocoa/NSOpenGLContext.java | 8 +-
.../swt/internal/cocoa/NSOpenGLPixelFormat.java | 6 +-
.../eclipse/swt/internal/cocoa/NSOpenPanel.java | 14 +-
.../eclipse/swt/internal/cocoa/NSOutlineView.java | 24 +-
.../org/eclipse/swt/internal/cocoa/NSPanel.java | 8 +-
.../swt/internal/cocoa/NSParagraphStyle.java | 6 +-
.../eclipse/swt/internal/cocoa/NSPasteboard.java | 20 +-
.../org/eclipse/swt/internal/cocoa/NSPoint.java | 4 +-
.../eclipse/swt/internal/cocoa/NSPopUpButton.java | 28 +-
.../eclipse/swt/internal/cocoa/NSPrintInfo.java | 20 +-
.../swt/internal/cocoa/NSPrintOperation.java | 8 +-
.../eclipse/swt/internal/cocoa/NSPrintPanel.java | 12 +-
.../org/eclipse/swt/internal/cocoa/NSPrinter.java | 8 +-
.../swt/internal/cocoa/NSProgressIndicator.java | 6 +-
.../org/eclipse/swt/internal/cocoa/NSRange.java | 4 +-
.../org/eclipse/swt/internal/cocoa/NSRect.java | 8 +-
.../eclipse/swt/internal/cocoa/NSResponder.java | 10 +-
.../org/eclipse/swt/internal/cocoa/NSRunLoop.java | 6 +-
.../eclipse/swt/internal/cocoa/NSSavePanel.java | 16 +-
.../org/eclipse/swt/internal/cocoa/NSScreen.java | 12 +-
.../eclipse/swt/internal/cocoa/NSScrollView.java | 12 +-
.../org/eclipse/swt/internal/cocoa/NSScroller.java | 30 +-
.../eclipse/swt/internal/cocoa/NSSearchField.java | 8 +-
.../swt/internal/cocoa/NSSearchFieldCell.java | 6 +-
.../swt/internal/cocoa/NSSecureTextField.java | 6 +-
.../swt/internal/cocoa/NSSegmentedCell.java | 26 +-
.../org/eclipse/swt/internal/cocoa/NSSet.java | 10 +-
.../org/eclipse/swt/internal/cocoa/NSSize.java | 4 +-
.../org/eclipse/swt/internal/cocoa/NSSlider.java | 10 +-
.../eclipse/swt/internal/cocoa/NSStatusBar.java | 12 +-
.../eclipse/swt/internal/cocoa/NSStatusItem.java | 4 +-
.../org/eclipse/swt/internal/cocoa/NSStepper.java | 6 +-
.../org/eclipse/swt/internal/cocoa/NSString.java | 54 +-
.../org/eclipse/swt/internal/cocoa/NSTabView.java | 14 +-
.../eclipse/swt/internal/cocoa/NSTabViewItem.java | 4 +-
.../eclipse/swt/internal/cocoa/NSTableColumn.java | 20 +-
.../swt/internal/cocoa/NSTableHeaderCell.java | 4 +-
.../swt/internal/cocoa/NSTableHeaderView.java | 6 +-
.../eclipse/swt/internal/cocoa/NSTableView.java | 70 +-
.../org/eclipse/swt/internal/cocoa/NSText.java | 12 +-
.../swt/internal/cocoa/NSTextAttachment.java | 4 +-
.../swt/internal/cocoa/NSTextContainer.java | 6 +-
.../eclipse/swt/internal/cocoa/NSTextField.java | 6 +-
.../swt/internal/cocoa/NSTextFieldCell.java | 4 +-
.../eclipse/swt/internal/cocoa/NSTextStorage.java | 6 +-
.../org/eclipse/swt/internal/cocoa/NSTextTab.java | 12 +-
.../org/eclipse/swt/internal/cocoa/NSTextView.java | 20 +-
.../org/eclipse/swt/internal/cocoa/NSThread.java | 6 +-
.../org/eclipse/swt/internal/cocoa/NSTimeZone.java | 4 +-
.../org/eclipse/swt/internal/cocoa/NSTimer.java | 8 +-
.../org/eclipse/swt/internal/cocoa/NSToolbar.java | 10 +-
.../eclipse/swt/internal/cocoa/NSToolbarItem.java | 8 +-
.../org/eclipse/swt/internal/cocoa/NSTouch.java | 6 +-
.../eclipse/swt/internal/cocoa/NSTrackingArea.java | 10 +-
.../eclipse/swt/internal/cocoa/NSTypesetter.java | 6 +-
.../org/eclipse/swt/internal/cocoa/NSURL.java | 14 +-
.../cocoa/NSURLAuthenticationChallenge.java | 10 +-
.../swt/internal/cocoa/NSURLCredential.java | 10 +-
.../eclipse/swt/internal/cocoa/NSURLDownload.java | 2 +-
.../swt/internal/cocoa/NSURLProtectionSpace.java | 8 +-
.../eclipse/swt/internal/cocoa/NSURLRequest.java | 8 +-
.../eclipse/swt/internal/cocoa/NSUndoManager.java | 2 +-
.../eclipse/swt/internal/cocoa/NSUserDefaults.java | 6 +-
.../org/eclipse/swt/internal/cocoa/NSValue.java | 12 +-
.../org/eclipse/swt/internal/cocoa/NSView.java | 28 +-
.../org/eclipse/swt/internal/cocoa/NSWindow.java | 66 +-
.../eclipse/swt/internal/cocoa/NSWorkspace.java | 18 +-
.../cocoa/org/eclipse/swt/internal/cocoa/OS.java | 4396 +++++++++---------
.../org/eclipse/swt/internal/cocoa/Protocol.java | 2 +-
.../swt/internal/cocoa/SFCertificatePanel.java | 8 +-
.../internal/cocoa/SFCertificateTrustPanel.java | 12 +-
.../eclipse/swt/internal/cocoa/WebDataSource.java | 10 +-
.../internal/cocoa/WebDocumentRepresentation.java | 4 +-
.../org/eclipse/swt/internal/cocoa/WebFrame.java | 8 +-
.../eclipse/swt/internal/cocoa/WebFrameView.java | 4 +-
.../internal/cocoa/WebOpenPanelResultListener.java | 2 +-
.../internal/cocoa/WebPolicyDecisionListener.java | 2 +-
.../eclipse/swt/internal/cocoa/WebPreferences.java | 4 +-
.../swt/internal/cocoa/WebScriptObject.java | 4 +-
.../eclipse/swt/internal/cocoa/WebUndefined.java | 4 +-
.../org/eclipse/swt/internal/cocoa/WebView.java | 6 +-
.../cocoa/org/eclipse/swt/internal/cocoa/id.java | 6 +-
.../org/eclipse/swt/internal/cocoa/objc_super.java | 4 +-
.../common/org/eclipse/swt/internal/C.java | 44 +-
.../common/org/eclipse/swt/internal/LONG.java | 4 +-
.../org/eclipse/swt/internal/Library.java | 2 +-
.../swt/internal/accessibility/gtk/ATK.java | 204 +-
.../internal/accessibility/gtk/AtkActionIface.java | 12 +-
.../internal/accessibility/gtk/AtkAttribute.java | 4 +-
.../accessibility/gtk/AtkComponentIface.java | 26 +-
.../accessibility/gtk/AtkEditableTextIface.java | 14 +-
.../accessibility/gtk/AtkHypertextIface.java | 6 +-
.../internal/accessibility/gtk/AtkObjectClass.java | 48 +-
.../accessibility/gtk/AtkObjectFactoryClass.java | 6 +-
.../accessibility/gtk/AtkSelectionIface.java | 16 +-
.../internal/accessibility/gtk/AtkTableIface.java | 72 +-
.../internal/accessibility/gtk/AtkTextIface.java | 44 +-
.../internal/accessibility/gtk/AtkTextRange.java | 2 +-
.../internal/accessibility/gtk/AtkValueIface.java | 8 +-
.../internal/accessibility/gtk/GtkAccessible.java | 2 +-
.../eclipse/swt/internal/gtk/GInterfaceInfo.java | 6 +-
.../org/eclipse/swt/internal/gtk/GObjectClass.java | 14 +-
.../org/eclipse/swt/internal/gtk/GTypeInfo.java | 14 +-
.../org/eclipse/swt/internal/gtk/GTypeQuery.java | 2 +-
.../eclipse/swt/internal/gtk/GdkDragContext.java | 6 +-
.../org/eclipse/swt/internal/gtk/GdkEventAny.java | 2 +-
.../eclipse/swt/internal/gtk/GdkEventButton.java | 6 +-
.../eclipse/swt/internal/gtk/GdkEventCrossing.java | 4 +-
.../eclipse/swt/internal/gtk/GdkEventExpose.java | 4 +-
.../eclipse/swt/internal/gtk/GdkEventFocus.java | 2 +-
.../org/eclipse/swt/internal/gtk/GdkEventKey.java | 4 +-
.../eclipse/swt/internal/gtk/GdkEventMotion.java | 6 +-
.../eclipse/swt/internal/gtk/GdkEventProperty.java | 4 +-
.../eclipse/swt/internal/gtk/GdkEventScroll.java | 4 +-
.../swt/internal/gtk/GdkEventVisibility.java | 2 +-
.../swt/internal/gtk/GdkEventWindowState.java | 2 +-
.../org/eclipse/swt/internal/gtk/GdkGCValues.java | 10 +-
.../gtk/org/eclipse/swt/internal/gtk/GdkImage.java | 8 +-
.../eclipse/swt/internal/gtk/GdkWindowAttr.java | 12 +-
.../swt/internal/gtk/GtkCellRendererClass.java | 4 +-
.../swt/internal/gtk/GtkColorSelectionDialog.java | 8 +-
.../gtk/org/eclipse/swt/internal/gtk/GtkFixed.java | 2 +-
.../eclipse/swt/internal/gtk/GtkSelectionData.java | 8 +-
.../eclipse/swt/internal/gtk/GtkTargetEntry.java | 2 +-
.../eclipse/swt/internal/gtk/GtkTargetPair.java | 2 +-
.../eclipse/swt/internal/gtk/GtkWidgetClass.java | 124 +-
.../gtk/org/eclipse/swt/internal/gtk/OS.java | 4772 ++++++++++----------
.../eclipse/swt/internal/gtk/PangoAttribute.java | 2 +-
.../org/eclipse/swt/internal/gtk/PangoItem.java | 10 +-
.../eclipse/swt/internal/gtk/PangoLayoutLine.java | 4 +-
.../eclipse/swt/internal/gtk/PangoLayoutRun.java | 4 +-
.../org/eclipse/swt/internal/gtk/XAnyEvent.java | 6 +-
.../swt/internal/gtk/XClientMessageEvent.java | 10 +-
.../eclipse/swt/internal/gtk/XCrossingEvent.java | 4 +-
.../swt/internal/gtk/XRenderPictureAttributes.java | 6 +-
.../eclipse/swt/internal/gtk/XWindowChanges.java | 2 +-
.../motif/org/eclipse/swt/internal/motif/OS.java | 52 +-
.../internal/motif/XRenderPictureAttributes.java | 6 +-
.../org/eclipse/swt/internal/gdip/BitmapData.java | 4 +-
.../win32/org/eclipse/swt/internal/gdip/Gdip.java | 368 +-
.../swt/internal/gdip/GdiplusStartupInput.java | 2 +-
.../org/eclipse/swt/internal/ole/win32/CAUUID.java | 2 +-
.../org/eclipse/swt/internal/ole/win32/COM.java | 310 +-
.../swt/internal/ole/win32/CONTROLINFO.java | 2 +-
.../swt/internal/ole/win32/COSERVERINFO.java | 4 +-
.../eclipse/swt/internal/ole/win32/DISPPARAMS.java | 4 +-
.../eclipse/swt/internal/ole/win32/EXCEPINFO.java | 10 +-
.../eclipse/swt/internal/ole/win32/FORMATETC.java | 2 +-
.../eclipse/swt/internal/ole/win32/FUNCDESC.java | 8 +-
.../swt/internal/ole/win32/IAccessible.java | 44 +-
.../swt/internal/ole/win32/IClassFactory2.java | 6 +-
.../swt/internal/ole/win32/IConnectionPoint.java | 4 +-
.../ole/win32/IConnectionPointContainer.java | 4 +-
.../swt/internal/ole/win32/IDataObject.java | 4 +-
.../eclipse/swt/internal/ole/win32/IDispatch.java | 16 +-
.../swt/internal/ole/win32/IDispatchEx.java | 12 +-
.../swt/internal/ole/win32/IDragSourceHelper.java | 6 +-
.../swt/internal/ole/win32/IDragSourceHelper2.java | 2 +-
.../swt/internal/ole/win32/IDropTargetHelper.java | 6 +-
.../org/eclipse/swt/internal/ole/win32/IEnum.java | 6 +-
.../swt/internal/ole/win32/IEnumFORMATETC.java | 2 +-
.../swt/internal/ole/win32/IEnumSTATSTG.java | 2 +-
.../swt/internal/ole/win32/IEnumVARIANT.java | 2 +-
.../org/eclipse/swt/internal/ole/win32/IFont.java | 4 +-
.../eclipse/swt/internal/ole/win32/IMoniker.java | 2 +-
.../swt/internal/ole/win32/IOleCommandTarget.java | 6 +-
.../swt/internal/ole/win32/IOleControl.java | 2 +-
.../swt/internal/ole/win32/IOleDocument.java | 4 +-
.../swt/internal/ole/win32/IOleDocumentView.java | 4 +-
.../ole/win32/IOleInPlaceActiveObject.java | 4 +-
.../swt/internal/ole/win32/IOleInPlaceObject.java | 2 +-
.../eclipse/swt/internal/ole/win32/IOleLink.java | 4 +-
.../eclipse/swt/internal/ole/win32/IOleObject.java | 10 +-
.../eclipse/swt/internal/ole/win32/IOleWindow.java | 4 +-
.../eclipse/swt/internal/ole/win32/IPersist.java | 2 +-
.../swt/internal/ole/win32/IPersistFile.java | 10 +-
.../swt/internal/ole/win32/IPersistStorage.java | 10 +-
.../swt/internal/ole/win32/IPersistStreamInit.java | 4 +-
.../swt/internal/ole/win32/IPropertyBag.java | 4 +-
.../swt/internal/ole/win32/IProvideClassInfo.java | 4 +-
.../swt/internal/ole/win32/IProvideClassInfo2.java | 2 +-
.../swt/internal/ole/win32/IServiceProvider.java | 4 +-
.../internal/ole/win32/ISpecifyPropertyPages.java | 2 +-
.../eclipse/swt/internal/ole/win32/IStorage.java | 20 +-
.../eclipse/swt/internal/ole/win32/IStream.java | 8 +-
.../eclipse/swt/internal/ole/win32/ITypeInfo.java | 40 +-
.../eclipse/swt/internal/ole/win32/IUnknown.java | 8 +-
.../swt/internal/ole/win32/IViewObject2.java | 4 +-
.../internal/ole/win32/OLEINPLACEFRAMEINFO.java | 4 +-
.../eclipse/swt/internal/ole/win32/STATSTG.java | 2 +-
.../eclipse/swt/internal/ole/win32/STGMEDIUM.java | 4 +-
.../eclipse/swt/internal/ole/win32/TYPEATTR.java | 4 +-
.../eclipse/swt/internal/ole/win32/VARDESC.java | 6 +-
.../org/eclipse/swt/internal/win32/ACTCTX.java | 10 +-
.../org/eclipse/swt/internal/win32/BITMAP.java | 2 +-
.../eclipse/swt/internal/win32/BP_PAINTPARAMS.java | 4 +-
.../org/eclipse/swt/internal/win32/BROWSEINFO.java | 12 +-
.../swt/internal/win32/BUTTON_IMAGELIST.java | 2 +-
.../eclipse/swt/internal/win32/CERT_CONTEXT.java | 6 +-
.../org/eclipse/swt/internal/win32/CERT_INFO.java | 2 +-
.../eclipse/swt/internal/win32/CERT_NAME_BLOB.java | 2 +-
.../eclipse/swt/internal/win32/CHOOSECOLOR.java | 12 +-
.../org/eclipse/swt/internal/win32/CHOOSEFONT.java | 16 +-
.../eclipse/swt/internal/win32/COMBOBOXINFO.java | 6 +-
.../eclipse/swt/internal/win32/CREATESTRUCT.java | 12 +-
.../internal/win32/CRYPT_ALGORITHM_IDENTIFIER.java | 2 +-
.../eclipse/swt/internal/win32/CRYPT_BIT_BLOB.java | 2 +-
.../swt/internal/win32/CRYPT_INTEGER_BLOB.java | 2 +-
.../swt/internal/win32/CRYPT_OBJID_BLOB.java | 2 +-
.../org/eclipse/swt/internal/win32/DIBSECTION.java | 2 +-
.../eclipse/swt/internal/win32/DOCHOSTUIINFO.java | 4 +-
.../org/eclipse/swt/internal/win32/DOCINFO.java | 6 +-
.../eclipse/swt/internal/win32/DRAWITEMSTRUCT.java | 6 +-
.../org/eclipse/swt/internal/win32/DTTOPTS.java | 4 +-
.../eclipse/swt/internal/win32/DWM_BLURBEHIND.java | 2 +-
.../org/eclipse/swt/internal/win32/EXTLOGPEN.java | 2 +-
.../eclipse/swt/internal/win32/GCP_RESULTS.java | 12 +-
.../eclipse/swt/internal/win32/GESTUREINFO.java | 2 +-
.../eclipse/swt/internal/win32/GUITHREADINFO.java | 12 +-
.../org/eclipse/swt/internal/win32/HDITEM.java | 8 +-
.../org/eclipse/swt/internal/win32/HDLAYOUT.java | 4 +-
.../org/eclipse/swt/internal/win32/HELPINFO.java | 2 +-
.../eclipse/swt/internal/win32/HIGHCONTRAST.java | 2 +-
.../org/eclipse/swt/internal/win32/ICONINFO.java | 4 +-
.../org/eclipse/swt/internal/win32/KEYBDINPUT.java | 2 +-
.../org/eclipse/swt/internal/win32/LOGBRUSH.java | 2 +-
.../org/eclipse/swt/internal/win32/LRESULT.java | 4 +-
.../org/eclipse/swt/internal/win32/LVCOLUMN.java | 2 +-
.../org/eclipse/swt/internal/win32/LVITEM.java | 6 +-
.../swt/internal/win32/MEASUREITEMSTRUCT.java | 2 +-
.../eclipse/swt/internal/win32/MENUBARINFO.java | 4 +-
.../org/eclipse/swt/internal/win32/MENUINFO.java | 4 +-
.../eclipse/swt/internal/win32/MENUITEMINFO.java | 12 +-
.../org/eclipse/swt/internal/win32/MOUSEINPUT.java | 2 +-
.../win32/org/eclipse/swt/internal/win32/MSG.java | 6 +-
.../eclipse/swt/internal/win32/NMCUSTOMDRAW.java | 6 +-
.../org/eclipse/swt/internal/win32/NMHDR.java | 4 +-
.../org/eclipse/swt/internal/win32/NMHEADER.java | 2 +-
.../org/eclipse/swt/internal/win32/NMLISTVIEW.java | 2 +-
.../eclipse/swt/internal/win32/NMLVDISPINFO.java | 6 +-
.../eclipse/swt/internal/win32/NMLVFINDITEM.java | 4 +-
.../eclipse/swt/internal/win32/NMREBARCHEVRON.java | 4 +-
.../org/eclipse/swt/internal/win32/NMTOOLBAR.java | 6 +-
.../eclipse/swt/internal/win32/NMTTDISPINFO.java | 6 +-
.../eclipse/swt/internal/win32/NMTVDISPINFO.java | 6 +-
.../eclipse/swt/internal/win32/NMTVITEMCHANGE.java | 4 +-
.../eclipse/swt/internal/win32/NOTIFYICONDATA.java | 4 +-
.../org/eclipse/swt/internal/win32/OFNOTIFY.java | 4 +-
.../eclipse/swt/internal/win32/OPENFILENAME.java | 26 +-
.../win32/org/eclipse/swt/internal/win32/OS.java | 1840 ++++----
.../swt/internal/win32/OUTLINETEXTMETRIC.java | 8 +-
.../eclipse/swt/internal/win32/PAINTSTRUCT.java | 2 +-
.../org/eclipse/swt/internal/win32/PRINTDLG.java | 24 +-
.../swt/internal/win32/PROCESS_INFORMATION.java | 4 +-
.../eclipse/swt/internal/win32/REBARBANDINFO.java | 8 +-
.../org/eclipse/swt/internal/win32/SAFEARRAY.java | 2 +-
.../eclipse/swt/internal/win32/SHACTIVATEINFO.java | 2 +-
.../eclipse/swt/internal/win32/SHDRAGIMAGE.java | 2 +-
.../swt/internal/win32/SHELLEXECUTEINFO.java | 22 +-
.../org/eclipse/swt/internal/win32/SHFILEINFO.java | 2 +-
.../eclipse/swt/internal/win32/SHMENUBARINFO.java | 6 +-
.../org/eclipse/swt/internal/win32/SHRGINFO.java | 2 +-
.../org/eclipse/swt/internal/win32/SIPINFO.java | 2 +-
.../eclipse/swt/internal/win32/STARTUPINFO.java | 14 +-
.../org/eclipse/swt/internal/win32/TBBUTTON.java | 4 +-
.../eclipse/swt/internal/win32/TBBUTTONINFO.java | 4 +-
.../org/eclipse/swt/internal/win32/TCITEM.java | 4 +-
.../org/eclipse/swt/internal/win32/TOOLINFO.java | 12 +-
.../org/eclipse/swt/internal/win32/TOUCHINPUT.java | 4 +-
.../swt/internal/win32/TRACKMOUSEEVENT.java | 2 +-
.../eclipse/swt/internal/win32/TVHITTESTINFO.java | 2 +-
.../eclipse/swt/internal/win32/TVINSERTSTRUCT.java | 10 +-
.../org/eclipse/swt/internal/win32/TVITEM.java | 6 +-
.../org/eclipse/swt/internal/win32/TVSORTCB.java | 6 +-
.../org/eclipse/swt/internal/win32/WINDOWPOS.java | 4 +-
.../org/eclipse/swt/internal/win32/WNDCLASS.java | 14 +-
.../swt/internal/win32/PROCESS_INFORMATION.java | 4 +-
.../swt/internal/win32/SHELLEXECUTEINFOW.java | 20 +-
.../eclipse/swt/internal/win32/STARTUPINFOW.java | 14 +-
.../org/eclipse/swt/printing/PrintDialog.java | 16 +-
.../cocoa/org/eclipse/swt/printing/Printer.java | 16 +-
.../gtk/org/eclipse/swt/printing/PrintDialog.java | 28 +-
.../gtk/org/eclipse/swt/printing/Printer.java | 62 +-
.../org/eclipse/swt/printing/PrintDialog.java | 16 +-
.../win32/org/eclipse/swt/printing/Printer.java | 18 +-
.../cde/org/eclipse/swt/internal/cde/CDE.java | 60 +-
.../org/eclipse/swt/internal/cde/DtActionArg.java | 2 +-
.../cocoa/org/eclipse/swt/program/Program.java | 6 +-
.../org/eclipse/swt/internal/gnome/GNOME.java | 66 +-
.../internal/gnome/GnomeVFSMimeApplication.java | 8 +-
.../gtk/org/eclipse/swt/program/Program.java | 134 +-
.../motif/org/eclipse/swt/program/Program.java | 62 +-
.../win32/org/eclipse/swt/program/Program.java | 16 +-
.../eclipse/swt/internal/theme/ButtonDrawData.java | 18 +-
.../eclipse/swt/internal/theme/ComboDrawData.java | 14 +-
.../org/eclipse/swt/internal/theme/DrawData.java | 26 +-
.../swt/internal/theme/ExpanderDrawData.java | 8 +-
.../eclipse/swt/internal/theme/GroupDrawData.java | 6 +-
.../swt/internal/theme/ProgressBarDrawData.java | 6 +-
.../swt/internal/theme/TabFolderDrawData.java | 6 +-
.../swt/internal/theme/TabItemDrawData.java | 10 +-
.../gtk/org/eclipse/swt/internal/theme/Theme.java | 18 +-
.../swt/internal/theme/ToolBarDrawData.java | 6 +-
.../swt/internal/theme/ToolItemDrawData.java | 20 +-
.../eclipse/swt/internal/theme/ButtonDrawData.java | 4 +-
.../eclipse/swt/internal/theme/ComboDrawData.java | 4 +-
.../org/eclipse/swt/internal/theme/DrawData.java | 6 +-
.../swt/internal/theme/ExpanderDrawData.java | 4 +-
.../eclipse/swt/internal/theme/GroupDrawData.java | 2 +-
.../swt/internal/theme/ProgressBarDrawData.java | 2 +-
.../eclipse/swt/internal/theme/ScaleDrawData.java | 2 +-
.../swt/internal/theme/ScrollBarDrawData.java | 8 +-
.../swt/internal/theme/TabFolderDrawData.java | 2 +-
.../swt/internal/theme/TabItemDrawData.java | 4 +-
.../swt/internal/theme/ToolItemDrawData.java | 6 +-
.../carbon/org/eclipse/swt/browser/WebKit.java | 6 +-
.../cocoa/org/eclipse/swt/browser/WebKit.java | 148 +-
.../gtk/org/eclipse/swt/browser/WebKit.java | 258 +-
.../swt/internal/webkit/JSClassDefinition.java | 30 +-
.../org/eclipse/swt/internal/webkit/WebKitGTK.java | 434 +-
.../eclipse/swt/browser/WebDownloadDelegate.java | 58 +-
.../eclipse/swt/browser/WebFrameLoadDelegate.java | 100 +-
.../win32/org/eclipse/swt/browser/WebKit.java | 160 +-
.../org/eclipse/swt/browser/WebPolicyDelegate.java | 36 +-
.../swt/browser/WebResourceLoadDelegate.java | 64 +-
.../org/eclipse/swt/browser/WebUIDelegate.java | 204 +-
.../swt/internal/webkit/IWebCookieManager.java | 4 +-
.../swt/internal/webkit/IWebDataSource.java | 10 +-
.../webkit/IWebDocumentRepresentation.java | 4 +-
.../eclipse/swt/internal/webkit/IWebDownload.java | 4 +-
.../org/eclipse/swt/internal/webkit/IWebError.java | 12 +-
.../swt/internal/webkit/IWebErrorPrivate.java | 4 +-
.../org/eclipse/swt/internal/webkit/IWebFrame.java | 10 +-
.../swt/internal/webkit/IWebFramePrivate.java | 8 +-
.../eclipse/swt/internal/webkit/IWebIBActions.java | 10 +-
.../swt/internal/webkit/IWebMutableURLRequest.java | 10 +-
.../webkit/IWebMutableURLRequestPrivate.java | 4 +-
.../webkit/IWebOpenPanelResultListener.java | 4 +-
.../webkit/IWebPolicyDecisionListener.java | 2 +-
.../swt/internal/webkit/IWebPreferences.java | 4 +-
.../webkit/IWebURLAuthenticationChallenge.java | 8 +-
.../IWebURLAuthenticationChallengeSender.java | 6 +-
.../swt/internal/webkit/IWebURLCredential.java | 8 +-
.../internal/webkit/IWebURLProtectionSpace.java | 6 +-
.../swt/internal/webkit/IWebURLRequest.java | 10 +-
.../swt/internal/webkit/IWebURLResponse.java | 4 +-
.../org/eclipse/swt/internal/webkit/IWebView.java | 30 +-
.../swt/internal/webkit/IWebViewPrivate.java | 4 +-
.../swt/internal/webkit/JSClassDefinition.java | 30 +-
.../eclipse/swt/internal/webkit/WebKit_win32.java | 120 +-
.../cairo/org/eclipse/swt/graphics/Path.java | 22 +-
.../cairo/org/eclipse/swt/graphics/Pattern.java | 4 +-
.../carbon/org/eclipse/swt/graphics/GC.java | 4 +-
.../cocoa/org/eclipse/swt/graphics/Color.java | 10 +-
.../cocoa/org/eclipse/swt/graphics/Device.java | 16 +-
.../cocoa/org/eclipse/swt/graphics/Font.java | 2 +-
.../cocoa/org/eclipse/swt/graphics/GC.java | 142 +-
.../cocoa/org/eclipse/swt/graphics/GCData.java | 8 +-
.../cocoa/org/eclipse/swt/graphics/Image.java | 68 +-
.../cocoa/org/eclipse/swt/graphics/Path.java | 18 +-
.../cocoa/org/eclipse/swt/graphics/Pattern.java | 2 +-
.../cocoa/org/eclipse/swt/graphics/Region.java | 34 +-
.../cocoa/org/eclipse/swt/graphics/TextLayout.java | 80 +-
.../cocoa/org/eclipse/swt/widgets/Button.java | 22 +-
.../cocoa/org/eclipse/swt/widgets/Canvas.java | 62 +-
.../cocoa/org/eclipse/swt/widgets/ColorDialog.java | 10 +-
.../cocoa/org/eclipse/swt/widgets/Combo.java | 48 +-
.../cocoa/org/eclipse/swt/widgets/Composite.java | 30 +-
.../cocoa/org/eclipse/swt/widgets/Control.java | 196 +-
.../cocoa/org/eclipse/swt/widgets/DateTime.java | 10 +-
.../org/eclipse/swt/widgets/DirectoryDialog.java | 2 +-
.../cocoa/org/eclipse/swt/widgets/Display.java | 362 +-
.../cocoa/org/eclipse/swt/widgets/FileDialog.java | 18 +-
.../cocoa/org/eclipse/swt/widgets/FontDialog.java | 12 +-
.../cocoa/org/eclipse/swt/widgets/Group.java | 4 +-
.../cocoa/org/eclipse/swt/widgets/IME.java | 22 +-
.../cocoa/org/eclipse/swt/widgets/Label.java | 14 +-
.../cocoa/org/eclipse/swt/widgets/Link.java | 18 +-
.../cocoa/org/eclipse/swt/widgets/List.java | 42 +-
.../cocoa/org/eclipse/swt/widgets/Menu.java | 28 +-
.../cocoa/org/eclipse/swt/widgets/MenuItem.java | 2 +-
.../cocoa/org/eclipse/swt/widgets/MessageBox.java | 4 +-
.../cocoa/org/eclipse/swt/widgets/ProgressBar.java | 6 +-
.../cocoa/org/eclipse/swt/widgets/Sash.java | 28 +-
.../cocoa/org/eclipse/swt/widgets/Scale.java | 2 +-
.../cocoa/org/eclipse/swt/widgets/ScrollBar.java | 4 +-
.../cocoa/org/eclipse/swt/widgets/Scrollable.java | 6 +-
.../cocoa/org/eclipse/swt/widgets/Shell.java | 88 +-
.../cocoa/org/eclipse/swt/widgets/Spinner.java | 26 +-
.../cocoa/org/eclipse/swt/widgets/TabFolder.java | 8 +-
.../cocoa/org/eclipse/swt/widgets/TabItem.java | 12 +-
.../cocoa/org/eclipse/swt/widgets/Table.java | 128 +-
.../cocoa/org/eclipse/swt/widgets/TableColumn.java | 2 +-
.../cocoa/org/eclipse/swt/widgets/Text.java | 46 +-
.../cocoa/org/eclipse/swt/widgets/ToolBar.java | 16 +-
.../cocoa/org/eclipse/swt/widgets/ToolItem.java | 48 +-
.../cocoa/org/eclipse/swt/widgets/Tracker.java | 12 +-
.../cocoa/org/eclipse/swt/widgets/TrayItem.java | 16 +-
.../cocoa/org/eclipse/swt/widgets/Tree.java | 144 +-
.../cocoa/org/eclipse/swt/widgets/TreeColumn.java | 2 +-
.../cocoa/org/eclipse/swt/widgets/Widget.java | 412 +-
.../common/org/eclipse/swt/graphics/Drawable.java | 4 +-
.../common/org/eclipse/swt/internal/Callback.java | 8 +-
.../common/org/eclipse/swt/widgets/Monitor.java | 2 +-
.../org/eclipse/swt/widgets/TouchSource.java | 4 +-
.../bidi/org/eclipse/swt/internal/BidiUtil.java | 6 +-
.../gtk/org/eclipse/swt/graphics/Color.java | 4 +-
.../gtk/org/eclipse/swt/graphics/Cursor.java | 18 +-
.../gtk/org/eclipse/swt/graphics/Device.java | 40 +-
.../gtk/org/eclipse/swt/graphics/Font.java | 8 +-
.../gtk/org/eclipse/swt/graphics/GC.java | 290 +-
.../gtk/org/eclipse/swt/graphics/GCData.java | 12 +-
.../gtk/org/eclipse/swt/graphics/Image.java | 122 +-
.../gtk/org/eclipse/swt/graphics/Region.java | 14 +-
.../gtk/org/eclipse/swt/graphics/TextLayout.java | 98 +-
.../gtk/org/eclipse/swt/internal/Converter.java | 8 +-
.../gtk/org/eclipse/swt/internal/ImageList.java | 48 +-
.../gtk/org/eclipse/swt/widgets/Button.java | 36 +-
.../gtk/org/eclipse/swt/widgets/Canvas.java | 36 +-
.../gtk/org/eclipse/swt/widgets/Caret.java | 10 +-
.../gtk/org/eclipse/swt/widgets/ColorDialog.java | 20 +-
.../gtk/org/eclipse/swt/widgets/Combo.java | 152 +-
.../gtk/org/eclipse/swt/widgets/Composite.java | 128 +-
.../gtk/org/eclipse/swt/widgets/Control.java | 366 +-
.../gtk/org/eclipse/swt/widgets/DateTime.java | 8 +-
.../gtk/org/eclipse/swt/widgets/Decorations.java | 18 +-
.../org/eclipse/swt/widgets/DirectoryDialog.java | 24 +-
.../gtk/org/eclipse/swt/widgets/Display.java | 298 +-
.../gtk/org/eclipse/swt/widgets/ExpandBar.java | 22 +-
.../gtk/org/eclipse/swt/widgets/ExpandItem.java | 18 +-
.../gtk/org/eclipse/swt/widgets/FileDialog.java | 42 +-
.../gtk/org/eclipse/swt/widgets/FontDialog.java | 16 +-
.../gtk/org/eclipse/swt/widgets/Group.java | 10 +-
.../gtk/org/eclipse/swt/widgets/IME.java | 20 +-
.../gtk/org/eclipse/swt/widgets/Label.java | 26 +-
.../gtk/org/eclipse/swt/widgets/Link.java | 24 +-
.../gtk/org/eclipse/swt/widgets/List.java | 156 +-
.../gtk/org/eclipse/swt/widgets/Menu.java | 40 +-
.../gtk/org/eclipse/swt/widgets/MenuItem.java | 46 +-
.../gtk/org/eclipse/swt/widgets/MessageBox.java | 10 +-
.../gtk/org/eclipse/swt/widgets/ProgressBar.java | 8 +-
.../gtk/org/eclipse/swt/widgets/Sash.java | 40 +-
.../gtk/org/eclipse/swt/widgets/Scale.java | 18 +-
.../gtk/org/eclipse/swt/widgets/ScrollBar.java | 20 +-
.../gtk/org/eclipse/swt/widgets/Scrollable.java | 22 +-
.../gtk/org/eclipse/swt/widgets/Shell.java | 134 +-
.../gtk/org/eclipse/swt/widgets/Slider.java | 40 +-
.../gtk/org/eclipse/swt/widgets/Spinner.java | 114 +-
.../gtk/org/eclipse/swt/widgets/TabFolder.java | 42 +-
.../gtk/org/eclipse/swt/widgets/TabItem.java | 10 +-
.../gtk/org/eclipse/swt/widgets/Table.java | 356 +-
.../gtk/org/eclipse/swt/widgets/TableColumn.java | 28 +-
.../gtk/org/eclipse/swt/widgets/TableItem.java | 92 +-
.../gtk/org/eclipse/swt/widgets/Text.java | 214 +-
.../gtk/org/eclipse/swt/widgets/ToolBar.java | 32 +-
.../gtk/org/eclipse/swt/widgets/ToolItem.java | 72 +-
.../gtk/org/eclipse/swt/widgets/ToolTip.java | 60 +-
.../gtk/org/eclipse/swt/widgets/Tracker.java | 26 +-
.../gtk/org/eclipse/swt/widgets/TrayItem.java | 40 +-
.../gtk/org/eclipse/swt/widgets/Tree.java | 374 +-
.../gtk/org/eclipse/swt/widgets/TreeColumn.java | 28 +-
.../gtk/org/eclipse/swt/widgets/TreeItem.java | 116 +-
.../gtk/org/eclipse/swt/widgets/Widget.java | 244 +-
.../motif/org/eclipse/swt/graphics/Device.java | 2 +-
.../motif/org/eclipse/swt/graphics/GC.java | 102 +-
.../motif/org/eclipse/swt/graphics/GCData.java | 2 +-
.../motif/org/eclipse/swt/graphics/Image.java | 2 +-
.../motif/org/eclipse/swt/widgets/Composite.java | 6 +-
.../win32/org/eclipse/swt/graphics/Color.java | 4 +-
.../win32/org/eclipse/swt/graphics/Cursor.java | 14 +-
.../win32/org/eclipse/swt/graphics/Device.java | 44 +-
.../win32/org/eclipse/swt/graphics/Font.java | 4 +-
.../win32/org/eclipse/swt/graphics/FontData.java | 4 +-
.../win32/org/eclipse/swt/graphics/GC.java | 316 +-
.../win32/org/eclipse/swt/graphics/GCData.java | 22 +-
.../win32/org/eclipse/swt/graphics/Image.java | 174 +-
.../win32/org/eclipse/swt/graphics/Path.java | 12 +-
.../win32/org/eclipse/swt/graphics/Pattern.java | 16 +-
.../win32/org/eclipse/swt/graphics/Region.java | 12 +-
.../win32/org/eclipse/swt/graphics/TextLayout.java | 198 +-
.../win32/org/eclipse/swt/graphics/Transform.java | 2 +-
.../win32/org/eclipse/swt/internal/BidiUtil.java | 48 +-
.../win32/org/eclipse/swt/internal/ImageList.java | 76 +-
.../win32/org/eclipse/swt/widgets/Button.java | 72 +-
.../win32/org/eclipse/swt/widgets/Canvas.java | 28 +-
.../win32/org/eclipse/swt/widgets/Caret.java | 34 +-
.../win32/org/eclipse/swt/widgets/ColorDialog.java | 10 +-
.../win32/org/eclipse/swt/widgets/Combo.java | 190 +-
.../win32/org/eclipse/swt/widgets/Composite.java | 86 +-
.../win32/org/eclipse/swt/widgets/Control.java | 398 +-
.../win32/org/eclipse/swt/widgets/CoolBar.java | 30 +-
.../win32/org/eclipse/swt/widgets/CoolItem.java | 26 +-
.../win32/org/eclipse/swt/widgets/DateTime.java | 40 +-
.../win32/org/eclipse/swt/widgets/Decorations.java | 54 +-
.../org/eclipse/swt/widgets/DirectoryDialog.java | 14 +-
.../win32/org/eclipse/swt/widgets/Display.java | 212 +-
.../win32/org/eclipse/swt/widgets/ExpandBar.java | 50 +-
.../win32/org/eclipse/swt/widgets/ExpandItem.java | 26 +-
.../win32/org/eclipse/swt/widgets/FileDialog.java | 24 +-
.../win32/org/eclipse/swt/widgets/FontDialog.java | 16 +-
.../win32/org/eclipse/swt/widgets/Group.java | 46 +-
.../win32/org/eclipse/swt/widgets/IME.java | 38 +-
.../win32/org/eclipse/swt/widgets/Label.java | 26 +-
.../win32/org/eclipse/swt/widgets/Link.java | 60 +-
.../win32/org/eclipse/swt/widgets/List.java | 42 +-
.../win32/org/eclipse/swt/widgets/Menu.java | 34 +-
.../win32/org/eclipse/swt/widgets/MenuItem.java | 52 +-
.../win32/org/eclipse/swt/widgets/MessageBox.java | 2 +-
.../win32/org/eclipse/swt/widgets/ProgressBar.java | 20 +-
.../win32/org/eclipse/swt/widgets/Sash.java | 36 +-
.../win32/org/eclipse/swt/widgets/Scale.java | 28 +-
.../win32/org/eclipse/swt/widgets/ScrollBar.java | 32 +-
.../win32/org/eclipse/swt/widgets/Scrollable.java | 36 +-
.../win32/org/eclipse/swt/widgets/Shell.java | 138 +-
.../win32/org/eclipse/swt/widgets/Slider.java | 20 +-
.../win32/org/eclipse/swt/widgets/Spinner.java | 72 +-
.../win32/org/eclipse/swt/widgets/TabFolder.java | 52 +-
.../win32/org/eclipse/swt/widgets/TabItem.java | 8 +-
.../win32/org/eclipse/swt/widgets/Table.java | 408 +-
.../win32/org/eclipse/swt/widgets/TableColumn.java | 48 +-
.../win32/org/eclipse/swt/widgets/TableItem.java | 36 +-
.../win32/org/eclipse/swt/widgets/TaskBar.java | 56 +-
.../win32/org/eclipse/swt/widgets/TaskItem.java | 50 +-
.../win32/org/eclipse/swt/widgets/Text.java | 104 +-
.../win32/org/eclipse/swt/widgets/ToolBar.java | 76 +-
.../win32/org/eclipse/swt/widgets/ToolItem.java | 40 +-
.../win32/org/eclipse/swt/widgets/ToolTip.java | 16 +-
.../win32/org/eclipse/swt/widgets/Tracker.java | 30 +-
.../win32/org/eclipse/swt/widgets/TrayItem.java | 4 +-
.../win32/org/eclipse/swt/widgets/Tree.java | 480 +-
.../win32/org/eclipse/swt/widgets/TreeColumn.java | 38 +-
.../win32/org/eclipse/swt/widgets/TreeItem.java | 114 +-
.../win32/org/eclipse/swt/widgets/Widget.java | 104 +-
bundles/org.eclipse.swt/buildFragment.xml | 12 +-
bundles/org.eclipse.swt/buildSWT.xml | 4 +-
839 files changed, 19595 insertions(+), 19595 deletions(-)
(limited to 'bundles')
diff --git a/bundles/org.eclipse.swt.tools/plugin.properties b/bundles/org.eclipse.swt.tools/plugin.properties
index 3065bf1b0c..a7444a35e3 100644
--- a/bundles/org.eclipse.swt.tools/plugin.properties
+++ b/bundles/org.eclipse.swt.tools/plugin.properties
@@ -14,4 +14,4 @@ macViewName = Mac Generator
spyViewName = SWT Spy
sleakViewName = Sleak
jniBuilderName = JNI Builder
-enableCheck64Name = Report 64-bit Problems
+enableCheck64Name = Report 32/64-bit Problems
diff --git a/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/builders/Check64CompilationParticipant.java b/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/builders/Check64CompilationParticipant.java
index f28a2accbb..4a01e75775 100644
--- a/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/builders/Check64CompilationParticipant.java
+++ b/bundles/org.eclipse.swt.tools/src/org/eclipse/swt/tools/builders/Check64CompilationParticipant.java
@@ -157,7 +157,7 @@ void createProblems(IJavaProject project, String root) throws CoreException {
if (resource != null) {
int start = Integer.parseInt(node.getAttribute("charStart"));
int end = Integer.parseInt(node.getAttribute("charEnd"));
- String message = "[64] " + ((Element)node.getElementsByTagName("message").item(0)).getAttribute("value");
+ String message = "[32/64] " + ((Element)node.getElementsByTagName("message").item(0)).getAttribute("value");
IMarker marker = resource.createMarker(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
int severity = IMarker.SEVERITY_ERROR;
marker.setAttributes(
@@ -189,15 +189,15 @@ boolean replace(char[] source, char[] src, char[] dest) {
boolean replace(char[] source) {
boolean changed = false;
- changed |= replace(source, INT_LONG, LONG_INT);
- changed |= replace(source, INT_LONG_ARRAY, LONG_INT_ARRAY);
- changed |= replace(source, FLOAT_DOUBLE, DOUBLE_FLOAT);
- changed |= replace(source, FLOAT_DOUBLE_ARRAY, DOUBLE_FLOAT_ARRAY);
+ changed |= replace(source, LONG_INT, INT_LONG);
+ changed |= replace(source, LONG_INT_ARRAY, INT_LONG_ARRAY);
+ changed |= replace(source, DOUBLE_FLOAT, FLOAT_DOUBLE);
+ changed |= replace(source, DOUBLE_FLOAT_ARRAY, FLOAT_DOUBLE_ARRAY);
if (!changed) {
- changed |= replace(source, LONG_INT, INT_LONG);
- changed |= replace(source, LONG_INT_ARRAY, INT_LONG_ARRAY);
- changed |= replace(source, DOUBLE_FLOAT, FLOAT_DOUBLE);
- changed |= replace(source, DOUBLE_FLOAT_ARRAY, FLOAT_DOUBLE_ARRAY);
+ changed |= replace(source, INT_LONG, LONG_INT);
+ changed |= replace(source, INT_LONG_ARRAY, LONG_INT_ARRAY);
+ changed |= replace(source, FLOAT_DOUBLE, DOUBLE_FLOAT);
+ changed |= replace(source, FLOAT_DOUBLE_ARRAY, DOUBLE_FLOAT_ARRAY);
}
return changed;
}
diff --git a/bundles/org.eclipse.swt/.classpath_cocoa b/bundles/org.eclipse.swt/.classpath_cocoa
index dc8d373a7f..8ed1d226a6 100644
--- a/bundles/org.eclipse.swt/.classpath_cocoa
+++ b/bundles/org.eclipse.swt/.classpath_cocoa
@@ -11,7 +11,7 @@
-
+
diff --git a/bundles/org.eclipse.swt/.classpath_gtk b/bundles/org.eclipse.swt/.classpath_gtk
index c1e7b943ae..babfb2899d 100644
--- a/bundles/org.eclipse.swt/.classpath_gtk
+++ b/bundles/org.eclipse.swt/.classpath_gtk
@@ -10,7 +10,7 @@
-
+
diff --git a/bundles/org.eclipse.swt/.classpath_gtk_j2me b/bundles/org.eclipse.swt/.classpath_gtk_j2me
index c715d37dae..953add3587 100644
--- a/bundles/org.eclipse.swt/.classpath_gtk_j2me
+++ b/bundles/org.eclipse.swt/.classpath_gtk_j2me
@@ -10,7 +10,7 @@
-
+
diff --git a/bundles/org.eclipse.swt/.classpath_win32 b/bundles/org.eclipse.swt/.classpath_win32
index 376d93086d..c981b48520 100644
--- a/bundles/org.eclipse.swt/.classpath_win32
+++ b/bundles/org.eclipse.swt/.classpath_win32
@@ -7,7 +7,7 @@
-
+
diff --git a/bundles/org.eclipse.swt/.classpath_win32_j2me b/bundles/org.eclipse.swt/.classpath_win32_j2me
index 6708817916..37584b3c82 100644
--- a/bundles/org.eclipse.swt/.classpath_win32_j2me
+++ b/bundles/org.eclipse.swt/.classpath_win32_j2me
@@ -12,7 +12,7 @@
-
+
diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java
index 00ba391ca8..47065c2235 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java
@@ -52,7 +52,7 @@ public class SWT_AWT {
static boolean loaded, swingInitialized;
- static native final int /*long*/ getAWTHandle (Canvas canvas);
+ static native final long /*int*/ getAWTHandle (Canvas canvas);
static synchronized void loadLibrary () {
if (loaded) return;
@@ -131,7 +131,7 @@ public static Frame new_Frame(final Composite parent) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
- final int /*long*/ handle = parent.view.id;
+ final long /*int*/ handle = parent.view.id;
Class clazz = null;
try {
@@ -279,7 +279,7 @@ public static Frame new_Frame(final Composite parent) {
public static Shell new_Shell(final Display display, final Canvas parent) {
if (display == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
if (parent == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
- int /*long*/ handle = 0;
+ long /*int*/ handle = 0;
try {
loadLibrary ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java
index 5aec4a5379..83145d88e1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java
@@ -64,7 +64,7 @@ public class SWT_AWT {
static boolean loaded, swingInitialized;
-static native final int /*long*/ getAWTHandle (Object canvas);
+static native final long /*int*/ getAWTHandle (Object canvas);
static native final void setDebug (Frame canvas, boolean debug);
static synchronized void loadLibrary () {
@@ -152,7 +152,7 @@ public static Frame new_Frame (final Composite parent) {
if ((parent.getStyle () & SWT.EMBEDDED) == 0) {
SWT.error (SWT.ERROR_INVALID_ARGUMENT);
}
- int /*long*/ handle = parent.embeddedHandle;
+ long /*int*/ handle = parent.embeddedHandle;
/*
* Some JREs have implemented the embedded frame constructor to take an integer
* and other JREs take a long. To handle this binary incompatibility, use
@@ -200,9 +200,9 @@ public static Frame new_Frame (final Composite parent) {
if (parent.isDisposed()) return;
Shell shell = parent.getShell();
loadLibrary();
- int /*long*/ awtHandle = getAWTHandle(window);
+ long /*int*/ awtHandle = getAWTHandle(window);
if (awtHandle == 0) return;
- int /*long*/ xWindow;
+ long /*int*/ xWindow;
if (OS.GTK_VERSION >= OS.VERSION(2, 14, 0)){
xWindow = OS.gdk_x11_drawable_get_xid(OS.gtk_widget_get_window(OS.gtk_widget_get_toplevel(shell.handle)));
} else {
@@ -305,7 +305,7 @@ public static Frame new_Frame (final Composite parent) {
public static Shell new_Shell (final Display display, final Canvas parent) {
if (display == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
if (parent == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
- int /*long*/ handle = 0;
+ long /*int*/ handle = 0;
try {
loadLibrary ();
handle = getAWTHandle (parent);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/motif/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/motif/org/eclipse/swt/awt/SWT_AWT.java
index f8e51f124c..1a9ffe9182 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT AWT/motif/org/eclipse/swt/awt/SWT_AWT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/motif/org/eclipse/swt/awt/SWT_AWT.java
@@ -64,7 +64,7 @@ public class SWT_AWT {
static boolean loaded, swingInitialized;
-static native final int /*long*/ getAWTHandle (Object canvas);
+static native final long /*int*/ getAWTHandle (Object canvas);
static native final void setDebug (Frame canvas, boolean debug);
static synchronized void loadLibrary () {
@@ -142,7 +142,7 @@ public static Frame new_Frame (final Composite parent) {
if ((parent.getStyle () & SWT.EMBEDDED) == 0) {
SWT.error (SWT.ERROR_INVALID_ARGUMENT);
}
- int /*long*/ handle = parent.embeddedHandle;
+ long /*int*/ handle = parent.embeddedHandle;
/*
* Some JREs have implemented the embedded frame constructor to take an integer
* and other JREs take a long. To handle this binary incompatability, use
@@ -292,7 +292,7 @@ public static Frame new_Frame (final Composite parent) {
public static Shell new_Shell (final Display display, final Canvas parent) {
if (display == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
if (parent == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
- int /*long*/ handle = 0;
+ long /*int*/ handle = 0;
try {
loadLibrary ();
handle = getAWTHandle (parent);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java
index 8d1d39d5e0..40c36a5b47 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java
@@ -62,7 +62,7 @@ public class SWT_AWT {
static boolean loaded, swingInitialized;
-static native final int /*long*/ getAWTHandle (Canvas canvas);
+static native final long /*int*/ getAWTHandle (Canvas canvas);
static synchronized void loadLibrary () {
if (loaded) return;
@@ -140,7 +140,7 @@ public static Frame new_Frame (final Composite parent) {
if ((parent.getStyle () & SWT.EMBEDDED) == 0) {
SWT.error (SWT.ERROR_INVALID_ARGUMENT);
}
- final int /*long*/ handle = parent.handle;
+ final long /*int*/ handle = parent.handle;
final Frame[] result = new Frame[1];
final Throwable[] exception = new Throwable[1];
Runnable runnable = new Runnable () {
@@ -365,7 +365,7 @@ public static Frame new_Frame (final Composite parent) {
public static Shell new_Shell (final Display display, final Canvas parent) {
if (display == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
if (parent == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
- int /*long*/ handle = 0;
+ long /*int*/ handle = 0;
try {
loadLibrary ();
handle = getAWTHandle (parent);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java
index de614bcf19..4ce57e770f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java
@@ -143,7 +143,7 @@ public class Accessible {
if (accessible.delegate != null) return accessible.delegate;
if (accessible.control != null) {
NSView view = accessible.control.view;
- int /*long*/ handle = OS.objc_msgSend(view.id, OS.sel_accessibleHandle);
+ long /*int*/ handle = OS.objc_msgSend(view.id, OS.sel_accessibleHandle);
return new id(handle);
}
return null;
@@ -426,9 +426,9 @@ public class Accessible {
accessibleAttributeListeners.addElement(listener);
}
- void addCGColor(float /*double*/ [] comps, NSMutableAttributedString inAttribString, NSString inAttribute, NSRange inRange) {
- int /*long*/ cgColorSpace = OS.CGColorSpaceCreateDeviceRGB();
- int /*long*/ cgColor = OS.CGColorCreate(cgColorSpace, comps);
+ void addCGColor(double /*float*/ [] comps, NSMutableAttributedString inAttribString, NSString inAttribute, NSRange inRange) {
+ long /*int*/ cgColorSpace = OS.CGColorSpaceCreateDeviceRGB();
+ long /*int*/ cgColor = OS.CGColorCreate(cgColorSpace, comps);
OS.CGColorSpaceRelease(cgColorSpace);
inAttribString.addAttribute(inAttribute, new id(cgColor), inRange);
OS.CGColorRelease(cgColor);
@@ -1592,7 +1592,7 @@ public class Accessible {
fontInfoDict.setValue(familyName, OS.NSAccessibilityFontFamilyKey);
NSString displayName = fontUsed.displayName();
fontInfoDict.setValue(displayName, OS.NSAccessibilityVisibleNameKey);
- float /*double*/ fontSize = fontUsed.pointSize();
+ double /*float*/ fontSize = fontUsed.pointSize();
fontInfoDict.setValue(NSNumber.numberWithDouble(fontSize), OS.NSAccessibilityFontSizeKey);
attribString.addAttribute(OS.NSAccessibilityFontTextAttribute, fontInfoDict, attributeRange);
@@ -3481,7 +3481,7 @@ public class Accessible {
*
* @noreference This method is not intended to be referenced by clients.
*/
- public int /*long*/ internal_addRelationAttributes(int /*long*/ defaultAttributes) {
+ public long /*int*/ internal_addRelationAttributes(long /*int*/ defaultAttributes) {
NSArray attributes = new NSArray(defaultAttributes);
NSMutableArray returnArray = NSMutableArray.arrayWithCapacity(attributes.count());
returnArray.addObjectsFromArray(attributes);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/SWTAccessibleDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/SWTAccessibleDelegate.java
index 68d0bfd7fe..1b744ec591 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/SWTAccessibleDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/SWTAccessibleDelegate.java
@@ -27,10 +27,10 @@ class SWTAccessibleDelegate extends NSObject {
static final byte[] SWT_OBJECT = {'S', 'W', 'T', '_', 'O', 'B', 'J', 'E', 'C', 'T', '\0'};
static Callback accessible2Args, accessible3Args, accessible4Args;
- static int /*long*/ proc2Args, proc3Args, proc4Args;
+ static long /*int*/ proc2Args, proc3Args, proc4Args;
Accessible accessible;
- int /*long*/ delegateJniRef;
+ long /*int*/ delegateJniRef;
int childID;
NSArray attributeNames = null;
@@ -63,7 +63,7 @@ class SWTAccessibleDelegate extends NSObject {
byte[] types = {'*','\0'};
int size = C.PTR_SIZEOF, align = C.PTR_SIZEOF == 4 ? 2 : 3;
- int /*long*/ cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
+ long /*int*/ cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types);
// Add the NSAccessibility overrides
@@ -172,7 +172,7 @@ class SWTAccessibleDelegate extends NSObject {
return new NSArray(temp2.id);
}
- static int /*long*/ accessibleProc(int /*long*/ id, int /*long*/ sel) {
+ static long /*int*/ accessibleProc(long /*int*/ id, long /*int*/ sel) {
SWTAccessibleDelegate swtAcc = getAccessibleDelegate(id);
if (swtAcc == null) return 0;
@@ -196,7 +196,7 @@ class SWTAccessibleDelegate extends NSObject {
return 0;
}
- static int /*long*/ accessibleProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+ static long /*int*/ accessibleProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
SWTAccessibleDelegate swtAcc = getAccessibleDelegate(id);
if (swtAcc == null) return 0;
@@ -224,7 +224,7 @@ class SWTAccessibleDelegate extends NSObject {
return 0;
}
- static int /*long*/ accessibleProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
+ static long /*int*/ accessibleProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
SWTAccessibleDelegate swtAcc = getAccessibleDelegate(id);
if (swtAcc == null) return 0;
@@ -242,9 +242,9 @@ class SWTAccessibleDelegate extends NSObject {
return 0;
}
- static SWTAccessibleDelegate getAccessibleDelegate(int /*long*/ id) {
+ static SWTAccessibleDelegate getAccessibleDelegate(long /*int*/ id) {
if (id == 0) return null;
- int /*long*/ [] jniRef = new int /*long*/ [1];
+ long /*int*/ [] jniRef = new long /*int*/ [1];
OS.object_getInstanceVariable(id, SWT_OBJECT, jniRef);
if (jniRef[0] == 0) return null;
return (SWTAccessibleDelegate)OS.JNIGetObject(jniRef[0]);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java
index 114bd1a926..4b0c5f66fe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/Accessible.java
@@ -468,14 +468,14 @@ public class Accessible {
return accessibleObject;
}
- int /*long*/ getControlHandle () {
- int /*long*/ result = control.handle;
+ long /*int*/ getControlHandle () {
+ long /*int*/ result = control.handle;
if (control instanceof Label) {
- int /*long*/ list = OS.gtk_container_get_children (result);
+ long /*int*/ list = OS.gtk_container_get_children (result);
if (list != 0) {
- int /*long*/ temp = list;
+ long /*int*/ temp = list;
while (temp != 0) {
- int /*long*/ widget = OS.g_list_data( temp);
+ long /*int*/ widget = OS.g_list_data( temp);
if (OS.GTK_VERSION >= OS.VERSION (2, 18, 0) ? OS.gtk_widget_get_visible (widget) : OS.GTK_WIDGET_VISIBLE (widget)) {
result = widget;
break;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java
index 03e4031c06..585d12c352 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java
@@ -157,14 +157,14 @@ class AccessibleFactory {
static final Callback InitValueIfaceCB;
static final Callback GTypeInfo_base_init_factory;
/* interface definitions */
- static final int /*long*/ ActionIfaceDefinition;
- static final int /*long*/ ComponentIfaceDefinition;
- static final int /*long*/ EditableTextIfaceDefinition;
- static final int /*long*/ HypertextIfaceDefinition;
- static final int /*long*/ SelectionIfaceDefinition;
- static final int /*long*/ TableIfaceDefinition;
- static final int /*long*/ TextIfaceDefinition;
- static final int /*long*/ ValueIfaceDefinition;
+ static final long /*int*/ ActionIfaceDefinition;
+ static final long /*int*/ ComponentIfaceDefinition;
+ static final long /*int*/ EditableTextIfaceDefinition;
+ static final long /*int*/ HypertextIfaceDefinition;
+ static final long /*int*/ SelectionIfaceDefinition;
+ static final long /*int*/ TableIfaceDefinition;
+ static final long /*int*/ TextIfaceDefinition;
+ static final long /*int*/ ValueIfaceDefinition;
static {
AtkActionCB_do_action = newCallback (AccessibleObject.class, "atkAction_do_action", 2); //$NON-NLS-1$
AtkActionCB_get_n_actions = newCallback (AccessibleObject.class, "atkAction_get_n_actions", 1); //$NON-NLS-1$
@@ -301,15 +301,15 @@ class AccessibleFactory {
return callback;
}
- static String getTypeName (int /*long*/ type) {
- int /*long*/ typeName = OS.g_type_name (type);
+ static String getTypeName (long /*int*/ type) {
+ long /*int*/ typeName = OS.g_type_name (type);
int widgetTypeNameLength = OS.strlen (typeName);
byte[] buffer = new byte [widgetTypeNameLength];
OS.memmove (buffer, typeName, widgetTypeNameLength);
return new String(Converter.mbcsToWcs(null, buffer));
}
- static int /*long*/ getParentType (int /*long*/ widgetType) {
+ static long /*int*/ getParentType (long /*int*/ widgetType) {
LONG type = null;
while (widgetType != 0 && (type = (LONG)Factories.get(new LONG(widgetType))) == null) {
widgetType = OS.g_type_parent (widgetType);
@@ -318,14 +318,14 @@ class AccessibleFactory {
return ((LONG)type).value;
}
- static int /*long*/ atkObjectFactory_create_accessible (int /*long*/ widget) {
+ static long /*int*/ atkObjectFactory_create_accessible (long /*int*/ widget) {
Accessible accessible = (Accessible) Accessibles.get (new LONG (widget));
if (accessible == null) {
/*
* we don't care about this control, so create it with the parent's
* type so that its accessibility callbacks will not pass though here
*/
- int /*long*/ result = OS.g_object_new (getParentType(OS.G_OBJECT_TYPE (widget)), 0);
+ long /*int*/ result = OS.g_object_new (getParentType(OS.G_OBJECT_TYPE (widget)), 0);
ATK.atk_object_initialize (result, widget);
return result;
}
@@ -333,10 +333,10 @@ class AccessibleFactory {
if (accessible.accessibleObject != null) {
return accessible.accessibleObject.handle;
}
- int /*long*/ widgetType = OS.G_OBJECT_TYPE (widget);
- int /*long*/ parentType = getParentType (widgetType);
+ long /*int*/ widgetType = OS.G_OBJECT_TYPE (widget);
+ long /*int*/ parentType = getParentType (widgetType);
if (parentType == 0) parentType = ATK.GTK_TYPE_ACCESSIBLE();
- int /*long*/ type = getType (getTypeName(widgetType), accessible, parentType, ACC.CHILDID_SELF);
+ long /*int*/ type = getType (getTypeName(widgetType), accessible, parentType, ACC.CHILDID_SELF);
AccessibleObject object = new AccessibleObject (type, widget, accessible, false);
accessible.accessibleObject = object;
accessible.addRelations ();
@@ -344,16 +344,16 @@ class AccessibleFactory {
}
static AccessibleObject createChildAccessible (Accessible accessible, int childId) {
- int /*long*/ childType = getType (CHILD_TYPENAME, accessible, ATK.GTK_TYPE_ACCESSIBLE(), childId);
+ long /*int*/ childType = getType (CHILD_TYPENAME, accessible, ATK.GTK_TYPE_ACCESSIBLE(), childId);
return new AccessibleObject(childType, 0, accessible, true);
}
static void createAccessible (Accessible accessible) {
- int /*long*/ controlHandle = accessible.getControlHandle ();
+ long /*int*/ controlHandle = accessible.getControlHandle ();
OS.gtk_widget_get_accessible(controlHandle);
}
- static int /*long*/ getType (String widgetTypeName, Accessible accessible, int /*long*/ parentType, int childId) {
+ static long /*int*/ getType (String widgetTypeName, Accessible accessible, long /*int*/ parentType, int childId) {
AccessibleControlEvent event = new AccessibleControlEvent (accessible);
event.childID = childId;
Vector listeners = accessible.accessibleControlListeners;
@@ -418,11 +418,11 @@ class AccessibleFactory {
if (value) swtTypeName += "Value"; //$NON-NLS-1$
byte[] nameBytes = Converter.wcsToMbcs(null, swtTypeName, true);
- int /*long*/ type = OS.g_type_from_name(nameBytes);
+ long /*int*/ type = OS.g_type_from_name(nameBytes);
if (type == 0) {
if (AccessibleObject.DEBUG) AccessibleObject.print("-->New Type=" + swtTypeName); //$NON-NLS-1$
/* define the type */
- int /*long*/ queryPtr = OS.g_malloc (GTypeQuery.sizeof);
+ long /*int*/ queryPtr = OS.g_malloc (GTypeQuery.sizeof);
OS.g_type_query (parentType, queryPtr);
GTypeQuery query = new GTypeQuery ();
OS.memmove (query, queryPtr, GTypeQuery.sizeof);
@@ -431,7 +431,7 @@ class AccessibleFactory {
typeInfo.base_init = GTypeInfo_base_init_type.getAddress ();
typeInfo.class_size = (short) query.class_size;
typeInfo.instance_size = (short) query.instance_size;
- int /*long*/ definition = OS.g_malloc (GTypeInfo.sizeof);
+ long /*int*/ definition = OS.g_malloc (GTypeInfo.sizeof);
OS.memmove (definition, typeInfo, GTypeInfo.sizeof);
type = OS.g_type_register_static (parentType, nameBytes, definition, 0);
OS.g_type_add_interface_static (type, ATK.ATK_TYPE_COMPONENT(), ComponentIfaceDefinition);
@@ -446,7 +446,7 @@ class AccessibleFactory {
return type;
}
- static int /*long*/ gTypeInfo_base_init_factory (int /*long*/ klass) {
+ static long /*int*/ gTypeInfo_base_init_factory (long /*int*/ klass) {
AtkObjectFactoryClass objectClass = new AtkObjectFactoryClass ();
ATK.memmove (objectClass, klass);
objectClass.create_accessible = AtkObjectFactoryCB_create_accessible.getAddress ();
@@ -454,7 +454,7 @@ class AccessibleFactory {
return 0;
}
- static int /*long*/ gTypeInfo_base_init_type (int /*long*/ klass) {
+ static long /*int*/ gTypeInfo_base_init_type (long /*int*/ klass) {
AtkObjectClass objectClass = new AtkObjectClass ();
ATK.memmove (objectClass, klass);
objectClass.get_name = AtkObjectCB_get_name.getAddress ();
@@ -466,7 +466,7 @@ class AccessibleFactory {
objectClass.get_index_in_parent = AtkObjectCB_get_index_in_parent.getAddress ();
objectClass.ref_child = AtkObjectCB_ref_child.getAddress ();
objectClass.get_attributes = AtkObjectCB_get_attributes.getAddress ();
- int /*long*/ gObjectClass = OS.G_OBJECT_CLASS (klass);
+ long /*int*/ gObjectClass = OS.G_OBJECT_CLASS (klass);
GObjectClass objectClassStruct = new GObjectClass ();
OS.memmove (objectClassStruct, gObjectClass);
objectClassStruct.finalize = GObjectClass_finalize.getAddress ();
@@ -475,7 +475,7 @@ class AccessibleFactory {
return 0;
}
- static int /*long*/ initActionIfaceCB (int /*long*/ iface) {
+ static long /*int*/ initActionIfaceCB (long /*int*/ iface) {
AtkActionIface inter = new AtkActionIface ();
ATK.memmove (inter, iface);
inter.do_action = AtkActionCB_do_action.getAddress ();
@@ -487,7 +487,7 @@ class AccessibleFactory {
return 0;
}
- static int /*long*/ initComponentIfaceCB (int /*long*/ iface) {
+ static long /*int*/ initComponentIfaceCB (long /*int*/ iface) {
AtkComponentIface inter = new AtkComponentIface ();
ATK.memmove (inter, iface);
inter.get_extents = AtkComponentCB_get_extents.getAddress ();
@@ -498,7 +498,7 @@ class AccessibleFactory {
return 0;
}
- static int /*long*/ initEditableTextIfaceCB (int /*long*/ iface) {
+ static long /*int*/ initEditableTextIfaceCB (long /*int*/ iface) {
AtkEditableTextIface inter = new AtkEditableTextIface ();
ATK.memmove (inter, iface);
inter.set_run_attributes = AtkEditableTextCB_set_run_attributes.getAddress ();
@@ -512,7 +512,7 @@ class AccessibleFactory {
return 0;
}
- static int /*long*/ initHypertextIfaceCB (int /*long*/ iface) {
+ static long /*int*/ initHypertextIfaceCB (long /*int*/ iface) {
AtkHypertextIface inter = new AtkHypertextIface ();
ATK.memmove (inter, iface);
inter.get_link = AtkHypertextCB_get_link.getAddress ();
@@ -522,7 +522,7 @@ class AccessibleFactory {
return 0;
}
- static int /*long*/ initSelectionIfaceCB (int /*long*/ iface) {
+ static long /*int*/ initSelectionIfaceCB (long /*int*/ iface) {
AtkSelectionIface inter = new AtkSelectionIface ();
ATK.memmove (inter, iface);
inter.is_child_selected = AtkSelectionCB_is_child_selected.getAddress ();
@@ -531,7 +531,7 @@ class AccessibleFactory {
return 0;
}
- static int /*long*/ initTableIfaceCB (int /*long*/ iface) {
+ static long /*int*/ initTableIfaceCB (long /*int*/ iface) {
AtkTableIface inter = new AtkTableIface ();
ATK.memmove (inter, iface);
inter.ref_at = AtkTableCB_ref_at.getAddress();
@@ -561,7 +561,7 @@ class AccessibleFactory {
return 0;
}
- static int /*long*/ initTextIfaceCB (int /*long*/ iface) {
+ static long /*int*/ initTextIfaceCB (long /*int*/ iface) {
AtkTextIface inter = new AtkTextIface ();
ATK.memmove (inter, iface);
inter.get_range_extents = AtkTextCB_get_range_extents.getAddress ();
@@ -586,7 +586,7 @@ class AccessibleFactory {
return 0;
}
- static int /*long*/ initValueIfaceCB (int /*long*/ iface) {
+ static long /*int*/ initValueIfaceCB (long /*int*/ iface) {
AtkValueIface inter = new AtkValueIface ();
ATK.memmove (inter, iface);
inter.get_current_value = AtkValueCB_get_current_value.getAddress ();
@@ -598,10 +598,10 @@ class AccessibleFactory {
}
static void registerAccessible (Accessible accessible) {
- int /*long*/ widget = accessible.getControlHandle ();
- int /*long*/ widgetType = OS.G_OBJECT_TYPE (widget);
- int /*long*/ registry = ATK.atk_get_default_registry ();
- int /*long*/ factory = ATK.atk_registry_get_factory (registry, widgetType);
+ long /*int*/ widget = accessible.getControlHandle ();
+ long /*int*/ widgetType = OS.G_OBJECT_TYPE (widget);
+ long /*int*/ registry = ATK.atk_get_default_registry ();
+ long /*int*/ factory = ATK.atk_registry_get_factory (registry, widgetType);
/* If NO_OP factory is registered then OS accessibility is not active */
if (ATK.ATK_IS_NO_OP_OBJECT_FACTORY(factory)) return;
String name = FACTORY_TYPENAME + getTypeName(widgetType);
@@ -613,10 +613,10 @@ class AccessibleFactory {
typeInfo.base_init = GTypeInfo_base_init_factory.getAddress ();
typeInfo.class_size = (short)ATK.AtkObjectFactoryClass_sizeof ();
typeInfo.instance_size = (short)ATK.AtkObjectFactory_sizeof ();
- int /*long*/ info = OS.g_malloc (GTypeInfo.sizeof);
+ long /*int*/ info = OS.g_malloc (GTypeInfo.sizeof);
OS.memmove (info, typeInfo, GTypeInfo.sizeof);
- int /*long*/ swtFactoryType = OS.g_type_register_static (ATK.ATK_TYPE_OBJECT_FACTORY(), factoryName, info, 0);
- int /*long*/ parentType = ATK.atk_object_factory_get_accessible_type(factory);
+ long /*int*/ swtFactoryType = OS.g_type_register_static (ATK.ATK_TYPE_OBJECT_FACTORY(), factoryName, info, 0);
+ long /*int*/ parentType = ATK.atk_object_factory_get_accessible_type(factory);
ATK.atk_registry_set_factory_type (registry, widgetType, swtFactoryType);
Factories.put (new LONG (widgetType), new LONG (parentType));
}
@@ -625,7 +625,7 @@ class AccessibleFactory {
}
static void unregisterAccessible (Accessible accessible) {
- int /*long*/ widget = accessible.getControlHandle ();
+ long /*int*/ widget = accessible.getControlHandle ();
Accessibles.remove (new LONG (widget));
if (AccessibleObject.DEBUG) AccessibleObject.print("-->Deregister=" + accessible.control + " " + widget); //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
index 0499c3ea4e..0e77b48472 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
@@ -21,7 +21,7 @@ import org.eclipse.swt.internal.accessibility.gtk.*;
import org.eclipse.swt.internal.gtk.*;
class AccessibleObject {
- int /*long*/ handle;
+ long /*int*/ handle;
int index = -1, id = ACC.CHILDID_SELF;
Accessible accessible;
AccessibleObject parent;
@@ -32,10 +32,10 @@ class AccessibleObject {
*/
boolean isLightweight = false;
- static int /*long*/ actionNamePtr = -1;
- static int /*long*/ descriptionPtr = -1;
- static int /*long*/ keybindingPtr = -1;
- static int /*long*/ namePtr = -1;
+ static long /*int*/ actionNamePtr = -1;
+ static long /*int*/ descriptionPtr = -1;
+ static long /*int*/ keybindingPtr = -1;
+ static long /*int*/ namePtr = -1;
static final Hashtable AccessibleObjects = new Hashtable (9);
static final boolean DEBUG = Device.DEBUG;
@@ -45,7 +45,7 @@ class AccessibleObject {
COLUMN_ROLE = ATK.atk_role_register(Converter.wcsToMbcs(null, "column", true)); //$NON-NLS-1$
}
- AccessibleObject (int /*long*/ type, int /*long*/ widget, Accessible accessible, boolean isLightweight) {
+ AccessibleObject (long /*int*/ type, long /*int*/ widget, Accessible accessible, boolean isLightweight) {
super ();
handle = ATK.g_object_new (type, 0);
ATK.atk_object_initialize (handle, widget);
@@ -59,7 +59,7 @@ class AccessibleObject {
System.out.println (str);
}
- static AtkActionIface getActionIface (int /*long*/ atkObject) {
+ static AtkActionIface getActionIface (long /*int*/ atkObject) {
if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_ACTION())) {
AtkActionIface iface = new AtkActionIface ();
ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_ACTION_GET_IFACE (atkObject)));
@@ -68,7 +68,7 @@ class AccessibleObject {
return null;
}
- static int /*long*/ atkAction_do_action (int /*long*/ atkObject, int /*long*/ index) {
+ static long /*int*/ atkAction_do_action (long /*int*/ atkObject, long /*int*/ index) {
if (DEBUG) print ("-->atkAction_do_action");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -85,7 +85,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkActionIface iface = getActionIface (atkObject);
if (iface != null && iface.do_action != 0) {
parentResult = ATK.call (iface.do_action, atkObject, index);
@@ -93,7 +93,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkAction_get_n_actions (int /*long*/ atkObject) {
+ static long /*int*/ atkAction_get_n_actions (long /*int*/ atkObject) {
if (DEBUG) print ("-->atkAction_get_n_actions");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -109,7 +109,7 @@ class AccessibleObject {
return event.count;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkActionIface iface = getActionIface (atkObject);
if (iface != null && iface.get_n_actions != 0) {
parentResult = ATK.call (iface.get_n_actions, atkObject);
@@ -117,7 +117,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkAction_get_description (int /*long*/ atkObject, int /*long*/ index) {
+ static long /*int*/ atkAction_get_description (long /*int*/ atkObject, long /*int*/ index) {
if (DEBUG) print ("-->atkAction_get_description");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -136,7 +136,7 @@ class AccessibleObject {
return descriptionPtr = getStringPtr (event.result);
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkActionIface iface = getActionIface (atkObject);
if (iface != null && iface.get_description != 0) {
parentResult = ATK.call (iface.get_description, atkObject, index);
@@ -144,10 +144,10 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkAction_get_keybinding (int /*long*/ atkObject, int /*long*/ index) {
+ static long /*int*/ atkAction_get_keybinding (long /*int*/ atkObject, long /*int*/ index) {
if (DEBUG) print ("-->atkAction_get_keybinding");
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkActionIface iface = getActionIface (atkObject);
if (iface != null && iface.get_keybinding != 0) {
parentResult = ATK.call (iface.get_keybinding, atkObject, index);
@@ -187,10 +187,10 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkAction_get_name (int /*long*/ atkObject, int /*long*/ index) {
+ static long /*int*/ atkAction_get_name (long /*int*/ atkObject, long /*int*/ index) {
if (DEBUG) print ("-->atkAction_get_name");
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkActionIface iface = getActionIface (atkObject);
if (iface != null && iface.get_name != 0) {
parentResult = ATK.call (iface.get_name, atkObject, index);
@@ -232,7 +232,7 @@ class AccessibleObject {
return parentResult;
}
- static AtkComponentIface getComponentIface (int /*long*/ atkObject) {
+ static AtkComponentIface getComponentIface (long /*int*/ atkObject) {
if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_COMPONENT())) {
AtkComponentIface iface = new AtkComponentIface ();
ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (atkObject)));
@@ -241,7 +241,7 @@ class AccessibleObject {
return null;
}
- static int /*long*/ atkComponent_get_extents (int /*long*/ atkObject, int /*long*/ x, int /*long*/ y, int /*long*/ width, int /*long*/ height, int /*long*/ coord_type) {
+ static long /*int*/ atkComponent_get_extents (long /*int*/ atkObject, long /*int*/ x, long /*int*/ y, long /*int*/ width, long /*int*/ height, long /*int*/ coord_type) {
if (DEBUG) print ("-->atkComponent_get_extents: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
OS.memmove (x, new int[] {0}, 4);
@@ -291,7 +291,7 @@ class AccessibleObject {
return 0;
}
- static int /*long*/ atkComponent_get_position (int /*long*/ atkObject, int /*long*/ x, int /*long*/ y, int /*long*/ coord_type) {
+ static long /*int*/ atkComponent_get_position (long /*int*/ atkObject, long /*int*/ x, long /*int*/ y, long /*int*/ coord_type) {
if (DEBUG) print ("-->atkComponent_get_position, object: " + atkObject + " x: " + x + " y: " + y + " coord: " + coord_type);
AccessibleObject object = getAccessibleObject (atkObject);
OS.memmove (x, new int[] {0}, 4);
@@ -332,7 +332,7 @@ class AccessibleObject {
return 0;
}
- static int /*long*/ atkComponent_get_size (int /*long*/ atkObject, int /*long*/ width, int /*long*/ height, int /*long*/ coord_type) {
+ static long /*int*/ atkComponent_get_size (long /*int*/ atkObject, long /*int*/ width, long /*int*/ height, long /*int*/ coord_type) {
if (DEBUG) print ("-->atkComponent_get_size");
AccessibleObject object = getAccessibleObject (atkObject);
OS.memmove (width, new int[] {0}, 4);
@@ -363,7 +363,7 @@ class AccessibleObject {
return 0;
}
- static int /*long*/ atkComponent_ref_accessible_at_point (int /*long*/ atkObject, int /*long*/ x, int /*long*/ y, int /*long*/ coord_type) {
+ static long /*int*/ atkComponent_ref_accessible_at_point (long /*int*/ atkObject, long /*int*/ x, long /*int*/ y, long /*int*/ coord_type) {
if (DEBUG) print ("-->atkComponent_ref_accessible_at_point: " + atkObject + " " + x + "," + y);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -392,7 +392,7 @@ class AccessibleObject {
}
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkComponentIface iface = getComponentIface (atkObject);
if (iface != null && iface.ref_accessible_at_point != 0) {
parentResult = ATK.call (iface.ref_accessible_at_point, atkObject, x, y, coord_type);
@@ -401,7 +401,7 @@ class AccessibleObject {
}
- static AtkEditableTextIface getEditableTextIface (int /*long*/ atkObject) {
+ static AtkEditableTextIface getEditableTextIface (long /*int*/ atkObject) {
if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_EDITABLE_TEXT())) {
AtkEditableTextIface iface = new AtkEditableTextIface ();
ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_EDITABLE_TEXT_GET_IFACE (atkObject)));
@@ -411,7 +411,7 @@ class AccessibleObject {
}
// gboolean atk_editable_text_set_run_attributes(AtkEditableText *text, AtkAttributeSet *attrib_set, gint start_offset, gint end_offset);
- static int /*long*/ atkEditableText_set_run_attributes (int /*long*/ atkObject, int /*long*/ attrib_set, int /*long*/ start_offset, int /*long*/ end_offset) {
+ static long /*int*/ atkEditableText_set_run_attributes (long /*int*/ atkObject, long /*int*/ attrib_set, long /*int*/ start_offset, long /*int*/ end_offset) {
if (DEBUG) print ("-->atkEditableText_set_run_attributes");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -420,14 +420,14 @@ class AccessibleObject {
int length = listeners.size();
if (length > 0) {
Display display = accessible.control.getDisplay();
- int /*long*/ fontDesc = OS.pango_font_description_new ();
+ long /*int*/ fontDesc = OS.pango_font_description_new ();
boolean createFont = false;
TextStyle style = new TextStyle();
String [] attributes = new String [0];
- int /*long*/ current = attrib_set;
+ long /*int*/ current = attrib_set;
int listLength = OS.g_slist_length (attrib_set);
for (int i = 0; i < listLength; i++) {
- int /*long*/ attrPtr = OS.g_slist_data (current);
+ long /*int*/ attrPtr = OS.g_slist_data (current);
if (attrPtr != 0) {
AtkAttribute attr = new AtkAttribute();
ATK.memmove(attr, attrPtr, AtkAttribute.sizeof);
@@ -550,7 +550,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkEditableTextIface iface = getEditableTextIface (atkObject);
if (iface != null && iface.set_run_attributes != 0) {
parentResult = ATK.call (iface.set_run_attributes, atkObject, attrib_set, start_offset, end_offset);
@@ -576,7 +576,7 @@ class AccessibleObject {
}
// void atk_editable_text_set_text_contents (AtkEditableText *text, const gchar *string);
- static int /*long*/ atkEditableText_set_text_contents (int /*long*/ atkObject, int /*long*/ string) {
+ static long /*int*/ atkEditableText_set_text_contents (long /*int*/ atkObject, long /*int*/ string) {
if (DEBUG) print ("-->atkEditableText_set_text_contents");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -596,7 +596,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkEditableTextIface iface = getEditableTextIface (atkObject);
if (iface != null && iface.set_text_contents != 0) {
parentResult = ATK.call (iface.set_text_contents, atkObject, string);
@@ -605,7 +605,7 @@ class AccessibleObject {
}
// void atk_editable_text_insert_text (AtkEditableText *text, const gchar *string, gint length, gint *position);
- static int /*long*/ atkEditableText_insert_text (int /*long*/ atkObject, int /*long*/ string, int /*long*/ string_length, int /*long*/ position) {
+ static long /*int*/ atkEditableText_insert_text (long /*int*/ atkObject, long /*int*/ string, long /*int*/ string_length, long /*int*/ position) {
if (DEBUG) print ("-->atkEditableText_insert_text");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -625,7 +625,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkEditableTextIface iface = getEditableTextIface (atkObject);
if (iface != null && iface.insert_text != 0) {
parentResult = ATK.call (iface.insert_text, atkObject, string, string_length, position);
@@ -634,7 +634,7 @@ class AccessibleObject {
}
// void atk_editable_text_copy_text (AtkEditableText *text, gint start_pos, gint end_pos);
- static int /*long*/ atkEditableText_copy_text(int /*long*/ atkObject, int /*long*/ start_pos, int /*long*/ end_pos) {
+ static long /*int*/ atkEditableText_copy_text(long /*int*/ atkObject, long /*int*/ start_pos, long /*int*/ end_pos) {
if (DEBUG) print ("-->atkEditableText_copy_text");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -652,7 +652,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkEditableTextIface iface = getEditableTextIface (atkObject);
if (iface != null && iface.copy_text != 0) {
parentResult = ATK.call (iface.copy_text, atkObject, start_pos, end_pos);
@@ -661,7 +661,7 @@ class AccessibleObject {
}
// void atk_editable_text_cut_text (AtkEditableText *text, gint start_pos, gint end_pos);
- static int /*long*/ atkEditableText_cut_text (int /*long*/ atkObject, int /*long*/ start_pos, int /*long*/ end_pos) {
+ static long /*int*/ atkEditableText_cut_text (long /*int*/ atkObject, long /*int*/ start_pos, long /*int*/ end_pos) {
if (DEBUG) print ("-->atkEditableText_cut_text");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -679,7 +679,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkEditableTextIface iface = getEditableTextIface (atkObject);
if (iface != null && iface.cut_text != 0) {
parentResult = ATK.call (iface.cut_text, atkObject, start_pos, end_pos);
@@ -688,7 +688,7 @@ class AccessibleObject {
}
// void atk_editable_text_delete_text (AtkEditableText *text, gint start_pos, gint end_pos);
- static int /*long*/ atkEditableText_delete_text (int /*long*/ atkObject, int /*long*/ start_pos, int /*long*/ end_pos) {
+ static long /*int*/ atkEditableText_delete_text (long /*int*/ atkObject, long /*int*/ start_pos, long /*int*/ end_pos) {
if (DEBUG) print ("-->atkEditableText_delete_text");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -707,7 +707,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkEditableTextIface iface = getEditableTextIface (atkObject);
if (iface != null && iface.delete_text != 0) {
parentResult = ATK.call (iface.delete_text, atkObject, start_pos, end_pos);
@@ -716,7 +716,7 @@ class AccessibleObject {
}
// void atk_editable_text_paste_text (AtkEditableText *text, gint position);
- static int /*long*/ atkEditableText_paste_text (int /*long*/ atkObject, int /*long*/ position) {
+ static long /*int*/ atkEditableText_paste_text (long /*int*/ atkObject, long /*int*/ position) {
if (DEBUG) print ("-->atkEditableText_paste_text");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -733,7 +733,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkEditableTextIface iface = getEditableTextIface (atkObject);
if (iface != null && iface.paste_text != 0) {
parentResult = ATK.call (iface.paste_text, atkObject, position);
@@ -741,7 +741,7 @@ class AccessibleObject {
return parentResult;
}
- static AtkHypertextIface getHypertextIface (int /*long*/ atkObject) {
+ static AtkHypertextIface getHypertextIface (long /*int*/ atkObject) {
if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_HYPERTEXT())) {
AtkHypertextIface iface = new AtkHypertextIface ();
ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_HYPERTEXT_GET_IFACE (atkObject)));
@@ -750,7 +750,7 @@ class AccessibleObject {
return null;
}
- static int /*long*/ atkHypertext_get_link (int /*long*/ atkObject, int /*long*/ link_index) {
+ static long /*int*/ atkHypertext_get_link (long /*int*/ atkObject, long /*int*/ link_index) {
if (DEBUG) print ("-->atkHypertext_get_link");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -768,7 +768,7 @@ class AccessibleObject {
return result != null ? result.getAccessibleObject().handle : 0;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkHypertextIface iface = getHypertextIface (atkObject);
if (iface != null && iface.get_link != 0) {
parentResult = ATK.call (iface.get_link, atkObject, link_index);
@@ -776,7 +776,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkHypertext_get_n_links (int /*long*/ atkObject) {
+ static long /*int*/ atkHypertext_get_n_links (long /*int*/ atkObject) {
if (DEBUG) print ("-->atkHypertext_get_n_links");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -792,7 +792,7 @@ class AccessibleObject {
return event.count;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkHypertextIface iface = getHypertextIface (atkObject);
if (iface != null && iface.get_n_links != 0) {
parentResult = ATK.call (iface.get_n_links, atkObject);
@@ -800,7 +800,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkHypertext_get_link_index (int /*long*/ atkObject, int /*long*/ char_index) {
+ static long /*int*/ atkHypertext_get_link_index (long /*int*/ atkObject, long /*int*/ char_index) {
if (DEBUG) print ("-->atkHypertext_get_link_index");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -818,7 +818,7 @@ class AccessibleObject {
return event.index;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkHypertextIface iface = getHypertextIface (atkObject);
if (iface != null && iface.get_link_index != 0) {
parentResult = ATK.call (iface.get_link_index, atkObject, char_index);
@@ -826,16 +826,16 @@ class AccessibleObject {
return parentResult;
}
- static AtkObjectClass getObjectClass (int /*long*/ atkObject) {
+ static AtkObjectClass getObjectClass (long /*int*/ atkObject) {
AtkObjectClass objectClass = new AtkObjectClass ();
ATK.memmove (objectClass, ATK.g_type_class_peek (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject))));
return objectClass;
}
- static int /*long*/ atkObject_get_description (int /*long*/ atkObject) {
+ static long /*int*/ atkObject_get_description (long /*int*/ atkObject) {
if (DEBUG) print ("-->atkObject_get_description: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkObjectClass objectClass = getObjectClass (atkObject);
if (objectClass.get_description != 0) {
parentResult = ATK.call (objectClass.get_description, atkObject);
@@ -861,10 +861,10 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkObject_get_attributes (int /*long*/ atkObject) {
+ static long /*int*/ atkObject_get_attributes (long /*int*/ atkObject) {
if (DEBUG) print ("-->atkObject_get_attributes: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkObjectClass objectClass = getObjectClass (atkObject);
if (objectClass.get_attributes != 0) {
parentResult = ATK.call (objectClass.get_attributes, atkObject);
@@ -882,48 +882,48 @@ class AccessibleObject {
}
AtkAttribute attr = new AtkAttribute();
if (event.leftMargin != -1) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_LEFT_MARGIN));
attr.value = getStringPtr (String.valueOf(event.leftMargin));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.rightMargin != -1) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_RIGHT_MARGIN));
attr.value = getStringPtr (String.valueOf(event.rightMargin));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.topMargin != -1) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = getStringPtr ("top-margin"); //$NON-NLS-1$
attr.value = getStringPtr (String.valueOf(event.topMargin));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.bottomMargin != -1) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = getStringPtr ("bottom-margin"); //$NON-NLS-1$
attr.value = getStringPtr (String.valueOf(event.bottomMargin));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.indent != -1) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_INDENT));
attr.value = getStringPtr (String.valueOf(event.indent));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
parentResult = OS.g_slist_append(parentResult, attrPtr);
}
if (event.justify) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_JUSTIFICATION));
attr.value = getStringPtr ("fill"); //$NON-NLS-1$
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
parentResult = OS.g_slist_append(parentResult, attrPtr);
} else if (event.alignment != -1) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_JUSTIFICATION));
String str = "left"; //$NON-NLS-1$
switch (event.alignment) {
@@ -939,7 +939,7 @@ class AccessibleObject {
if (event.attributes != null) {
int end = event.attributes.length / 2 * 2;
for (int i = 0; i < end; i+= 2) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = getStringPtr (event.attributes[i]);
attr.value = getStringPtr (event.attributes[i + 1]);
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
@@ -951,10 +951,10 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkObject_get_name (int /*long*/ atkObject) {
+ static long /*int*/ atkObject_get_name (long /*int*/ atkObject) {
if (DEBUG) print ("-->atkObject_get_name: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkObjectClass objectClass = getObjectClass (atkObject);
if (objectClass.get_name != 0) {
parentResult = ATK.call (objectClass.get_name, atkObject);
@@ -980,10 +980,10 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkObject_get_n_children (int /*long*/ atkObject) {
+ static long /*int*/ atkObject_get_n_children (long /*int*/ atkObject) {
if (DEBUG) print ("-->atkObject_get_n_children: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkObjectClass objectClass = getObjectClass (atkObject);
if (objectClass.get_n_children != 0) {
parentResult = ATK.call (objectClass.get_n_children, atkObject);
@@ -1007,7 +1007,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkObject_get_index_in_parent (int /*long*/ atkObject) {
+ static long /*int*/ atkObject_get_index_in_parent (long /*int*/ atkObject) {
if (DEBUG) print ("-->atkObject_get_index_in_parent: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1031,12 +1031,12 @@ class AccessibleObject {
}
AtkObjectClass objectClass = getObjectClass (atkObject);
if (objectClass.get_index_in_parent == 0) return 0;
- int /*long*/ result = ATK.call (objectClass.get_index_in_parent, atkObject);
+ long /*int*/ result = ATK.call (objectClass.get_index_in_parent, atkObject);
if (DEBUG) print ("---*> " + result);
return result;
}
- static int /*long*/ atkObject_get_parent (int /*long*/ atkObject) {
+ static long /*int*/ atkObject_get_parent (long /*int*/ atkObject) {
if (DEBUG) print ("-->atkObject_get_parent: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1047,12 +1047,12 @@ class AccessibleObject {
}
AtkObjectClass objectClass = getObjectClass (atkObject);
if (objectClass.get_parent == 0) return 0;
- int /*long*/ parentResult = ATK.call (objectClass.get_parent, atkObject);
+ long /*int*/ parentResult = ATK.call (objectClass.get_parent, atkObject);
if (DEBUG) print ("---> " + parentResult);
return parentResult;
}
- static int /*long*/ atkObject_get_role (int /*long*/ atkObject) {
+ static long /*int*/ atkObject_get_role (long /*int*/ atkObject) {
if (DEBUG) print ("-->atkObject_get_role: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1132,7 +1132,7 @@ class AccessibleObject {
return ATK.call (objectClass.get_role, atkObject);
}
- static int /*long*/ atkObject_ref_child (int /*long*/ atkObject, int /*long*/ index) {
+ static long /*int*/ atkObject_ref_child (long /*int*/ atkObject, long /*int*/ index) {
if (DEBUG) print ("-->atkObject_ref_child: " + index + " of: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null && object.id == ACC.CHILDID_SELF) {
@@ -1165,10 +1165,10 @@ class AccessibleObject {
return ATK.call (objectClass.ref_child, atkObject, index);
}
- static int /*long*/ atkObject_ref_state_set (int /*long*/ atkObject) {
+ static long /*int*/ atkObject_ref_state_set (long /*int*/ atkObject) {
if (DEBUG) print ("-->atkObject_ref_state_set: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkObjectClass objectClass = getObjectClass (atkObject);
if (objectClass.ref_state_set != 0) {
parentResult = ATK.call (objectClass.ref_state_set, atkObject);
@@ -1178,7 +1178,7 @@ class AccessibleObject {
Vector listeners = accessible.accessibleControlListeners;
int length = listeners.size();
if (length > 0) {
- int /*long*/ set = parentResult;
+ long /*int*/ set = parentResult;
AccessibleControlEvent event = new AccessibleControlEvent (accessible);
event.childID = object.id;
event.detail = -1;
@@ -1218,7 +1218,7 @@ class AccessibleObject {
return parentResult;
}
- static AtkSelectionIface getSelectionIface (int /*long*/ atkObject) {
+ static AtkSelectionIface getSelectionIface (long /*int*/ atkObject) {
if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_SELECTION())) {
AtkSelectionIface iface = new AtkSelectionIface ();
ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_SELECTION_GET_IFACE (atkObject)));
@@ -1227,10 +1227,10 @@ class AccessibleObject {
return null;
}
- static int /*long*/ atkSelection_is_child_selected (int /*long*/ atkObject, int /*long*/ index) {
+ static long /*int*/ atkSelection_is_child_selected (long /*int*/ atkObject, long /*int*/ index) {
if (DEBUG) print ("-->atkSelection_is_child_selected");
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkSelectionIface iface = getSelectionIface (atkObject);
if (iface != null && iface.is_child_selected != 0) {
parentResult = ATK.call (iface.is_child_selected, atkObject, index);
@@ -1256,10 +1256,10 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkSelection_ref_selection (int /*long*/ atkObject, int /*long*/ index) {
+ static long /*int*/ atkSelection_ref_selection (long /*int*/ atkObject, long /*int*/ index) {
if (DEBUG) print ("-->atkSelection_ref_selection");
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkSelectionIface iface = getSelectionIface (atkObject);
if (iface != null && iface.ref_selection != 0) {
parentResult = ATK.call (iface.ref_selection, atkObject, index);
@@ -1286,7 +1286,7 @@ class AccessibleObject {
return parentResult;
}
- static AtkTableIface getTableIface (int /*long*/ atkObject) {
+ static AtkTableIface getTableIface (long /*int*/ atkObject) {
if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_TABLE())) {
AtkTableIface iface = new AtkTableIface ();
ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_TABLE_GET_IFACE (atkObject)));
@@ -1295,7 +1295,7 @@ class AccessibleObject {
return null;
}
- static int /*long*/ atkTable_ref_at (int /*long*/ atkObject, int /*long*/ row, int /*long*/ column) {
+ static long /*int*/ atkTable_ref_at (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) {
if (DEBUG) print ("-->atkTable_ref_at");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1318,7 +1318,7 @@ class AccessibleObject {
}
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.ref_at != 0) {
parentResult = ATK.call (iface.ref_at, atkObject, row, column);
@@ -1326,7 +1326,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_get_index_at (int /*long*/ atkObject, int /*long*/ row, int /*long*/ column) {
+ static long /*int*/ atkTable_get_index_at (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) {
if (DEBUG) print ("-->atkTable_get_index_at");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1351,7 +1351,7 @@ class AccessibleObject {
return row * event.count + column;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_index_at != 0) {
parentResult = ATK.call (iface.get_index_at, atkObject, row, column);
@@ -1359,7 +1359,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_get_column_at_index (int /*long*/ atkObject, int /*long*/ index) {
+ static long /*int*/ atkTable_get_column_at_index (long /*int*/ atkObject, long /*int*/ index) {
if (DEBUG) print ("-->atkTable_get_column_at_index: " + atkObject + " " + index);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1372,12 +1372,12 @@ class AccessibleObject {
AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
listener.getColumnCount(event);
}
- int /*long*/ result = event.count == 0 ? -1 : index % event.count;
+ long /*int*/ result = event.count == 0 ? -1 : index % event.count;
if (DEBUG) print ("---> " + result);
return result;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_column_at_index != 0) {
parentResult = ATK.call (iface.get_column_at_index, atkObject, index);
@@ -1385,7 +1385,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_get_row_at_index (int /*long*/ atkObject, int /*long*/ index) {
+ static long /*int*/ atkTable_get_row_at_index (long /*int*/ atkObject, long /*int*/ index) {
if (DEBUG) print ("-->atkTable_get_row_at_index: " + atkObject + " " + index);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1398,12 +1398,12 @@ class AccessibleObject {
AccessibleTableListener listener = (AccessibleTableListener) listeners.elementAt(i);
listener.getColumnCount(event);
}
- int /*long*/ result = event.count == 0 ? -1 : index / event.count;
+ long /*int*/ result = event.count == 0 ? -1 : index / event.count;
if (DEBUG) print ("---> " + result);
return result;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_row_at_index != 0) {
parentResult = ATK.call (iface.get_row_at_index, atkObject, index);
@@ -1411,10 +1411,10 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_get_n_columns (int /*long*/ atkObject) {
+ static long /*int*/ atkTable_get_n_columns (long /*int*/ atkObject) {
if (DEBUG) print ("-->atkTable_get_n_columns");
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_n_columns != 0) {
parentResult = ATK.call (iface.get_n_columns, atkObject);
@@ -1436,10 +1436,10 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_get_n_rows (int /*long*/ atkObject) {
+ static long /*int*/ atkTable_get_n_rows (long /*int*/ atkObject) {
if (DEBUG) print ("-->atkTable_get_n_rows");
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_n_rows != 0) {
parentResult = ATK.call (iface.get_n_rows, atkObject);
@@ -1461,10 +1461,10 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_get_column_extent_at (int /*long*/ atkObject, int /*long*/ row, int /*long*/ column) {
+ static long /*int*/ atkTable_get_column_extent_at (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) {
if (DEBUG) print ("-->atkTable_get_column_extent_at");
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_column_extent_at != 0) {
parentResult = ATK.call (iface.get_column_extent_at, atkObject, row, column);
@@ -1500,10 +1500,10 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_get_row_extent_at (int /*long*/ atkObject, int /*long*/ row, int /*long*/ column) {
+ static long /*int*/ atkTable_get_row_extent_at (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) {
if (DEBUG) print ("-->atkTable_get_row_extent_at");
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_row_extent_at != 0) {
parentResult = ATK.call (iface.get_row_extent_at, atkObject, row, column);
@@ -1539,7 +1539,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_get_caption (int /*long*/ atkObject) {
+ static long /*int*/ atkTable_get_caption (long /*int*/ atkObject) {
if (DEBUG) print ("-->atkTable_get_caption");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1556,7 +1556,7 @@ class AccessibleObject {
if (result != null) return result.getAccessibleObject().handle;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_caption != 0) {
parentResult = ATK.call (iface.get_caption, atkObject);
@@ -1564,7 +1564,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_get_summary (int /*long*/ atkObject) {
+ static long /*int*/ atkTable_get_summary (long /*int*/ atkObject) {
if (DEBUG) print ("-->atkTable_get_summary");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1581,7 +1581,7 @@ class AccessibleObject {
if (result != null) return result.getAccessibleObject().handle;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_summary != 0) {
parentResult = ATK.call (iface.get_summary, atkObject);
@@ -1589,10 +1589,10 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_get_column_description (int /*long*/ atkObject, int /*long*/ column) {
+ static long /*int*/ atkTable_get_column_description (long /*int*/ atkObject, long /*int*/ column) {
if (DEBUG) print ("-->atkTable_get_column_description");
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_column_description != 0) {
parentResult = ATK.call (iface.get_column_description, atkObject, column);
@@ -1617,7 +1617,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_get_column_header (int /*long*/ atkObject, int /*long*/ column) {
+ static long /*int*/ atkTable_get_column_header (long /*int*/ atkObject, long /*int*/ column) {
if (DEBUG) print ("-->atkTable_get_column_header");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1638,7 +1638,7 @@ class AccessibleObject {
}
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_column_header != 0) {
parentResult = ATK.call (iface.get_column_header, atkObject, column);
@@ -1646,10 +1646,10 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_get_row_description (int /*long*/ atkObject, int /*long*/ row) {
+ static long /*int*/ atkTable_get_row_description (long /*int*/ atkObject, long /*int*/ row) {
if (DEBUG) print ("-->atkTable_get_row_description");
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_row_description != 0) {
parentResult = ATK.call (iface.get_row_description, atkObject, row);
@@ -1674,7 +1674,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_get_row_header (int /*long*/ atkObject, int /*long*/ row) {
+ static long /*int*/ atkTable_get_row_header (long /*int*/ atkObject, long /*int*/ row) {
if (DEBUG) print ("-->atkTable_get_row_header");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1695,7 +1695,7 @@ class AccessibleObject {
}
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_row_header != 0) {
parentResult = ATK.call (iface.get_row_header, atkObject, row);
@@ -1703,7 +1703,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_get_selected_columns (int /*long*/ atkObject, int /*long*/ selected) {
+ static long /*int*/ atkTable_get_selected_columns (long /*int*/ atkObject, long /*int*/ selected) {
if (DEBUG) print ("-->atkTable_get_selected_columns");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1717,13 +1717,13 @@ class AccessibleObject {
listener.getSelectedColumns(event);
}
int count = event.selected != null ? event.selected.length : 0;
- int /*long*/ result = OS.g_malloc(count * 4);
+ long /*int*/ result = OS.g_malloc(count * 4);
if (event.selected != null) OS.memmove(result, event.selected, count * 4);
- if (selected != 0) OS.memmove(selected, new int /*long*/[]{result}, C.PTR_SIZEOF);
+ if (selected != 0) OS.memmove(selected, new long /*int*/[]{result}, C.PTR_SIZEOF);
return count;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_selected_columns != 0) {
parentResult = ATK.call (iface.get_selected_columns, atkObject, selected);
@@ -1731,7 +1731,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_get_selected_rows (int /*long*/ atkObject, int /*long*/ selected) {
+ static long /*int*/ atkTable_get_selected_rows (long /*int*/ atkObject, long /*int*/ selected) {
if (DEBUG) print ("-->atkTable_get_selected_rows");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1745,13 +1745,13 @@ class AccessibleObject {
listener.getSelectedRows(event);
}
int count = event.selected != null ? event.selected.length : 0;
- int /*long*/ result = OS.g_malloc(count * 4);
+ long /*int*/ result = OS.g_malloc(count * 4);
if (event.selected != null) OS.memmove(result, event.selected, count * 4);
- if (selected != 0) OS.memmove(selected, new int /*long*/[]{result}, C.PTR_SIZEOF);
+ if (selected != 0) OS.memmove(selected, new long /*int*/[]{result}, C.PTR_SIZEOF);
return count;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.get_selected_rows != 0) {
parentResult = ATK.call (iface.get_selected_rows, atkObject, selected);
@@ -1759,10 +1759,10 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_is_column_selected (int /*long*/ atkObject, int /*long*/ column) {
+ static long /*int*/ atkTable_is_column_selected (long /*int*/ atkObject, long /*int*/ column) {
if (DEBUG) print ("-->atkTable_is_column_selected");
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.is_column_selected != 0) {
parentResult = ATK.call (iface.is_column_selected, atkObject, column);
@@ -1785,10 +1785,10 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_is_row_selected (int /*long*/ atkObject, int /*long*/ row) {
+ static long /*int*/ atkTable_is_row_selected (long /*int*/ atkObject, long /*int*/ row) {
if (DEBUG) print ("-->atkTable_is_row_selected");
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.is_row_selected != 0) {
parentResult = ATK.call (iface.is_row_selected, atkObject, row);
@@ -1811,10 +1811,10 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_is_selected (int /*long*/ atkObject, int /*long*/ row, int /*long*/ column) {
+ static long /*int*/ atkTable_is_selected (long /*int*/ atkObject, long /*int*/ row, long /*int*/ column) {
if (DEBUG) print ("-->atkTable_is_selected");
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.is_selected != 0) {
parentResult = ATK.call (iface.is_selected, atkObject, row, column);
@@ -1850,7 +1850,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_add_row_selection (int /*long*/ atkObject, int /*long*/ row) {
+ static long /*int*/ atkTable_add_row_selection (long /*int*/ atkObject, long /*int*/ row) {
if (DEBUG) print ("-->atkTable_add_row_selection");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1867,7 +1867,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.add_row_selection != 0) {
parentResult = ATK.call (iface.add_row_selection, atkObject, row);
@@ -1875,7 +1875,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_remove_row_selection (int /*long*/ atkObject, int /*long*/ row) {
+ static long /*int*/ atkTable_remove_row_selection (long /*int*/ atkObject, long /*int*/ row) {
if (DEBUG) print ("-->atkTable_remove_row_selection");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1892,7 +1892,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.remove_row_selection != 0) {
parentResult = ATK.call (iface.remove_row_selection, atkObject, row);
@@ -1900,7 +1900,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_add_column_selection (int /*long*/ atkObject, int /*long*/ column) {
+ static long /*int*/ atkTable_add_column_selection (long /*int*/ atkObject, long /*int*/ column) {
if (DEBUG) print ("-->atkTable_add_column_selection");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1917,7 +1917,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.add_column_selection != 0) {
parentResult = ATK.call (iface.add_column_selection, atkObject, column);
@@ -1925,7 +1925,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkTable_remove_column_selection (int /*long*/ atkObject, int /*long*/ column) {
+ static long /*int*/ atkTable_remove_column_selection (long /*int*/ atkObject, long /*int*/ column) {
if (DEBUG) print ("-->atkTable_remove_column_selection");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1942,7 +1942,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTableIface iface = getTableIface (atkObject);
if (iface != null && iface.remove_column_selection != 0) {
parentResult = ATK.call (iface.remove_column_selection, atkObject, column);
@@ -1950,7 +1950,7 @@ class AccessibleObject {
return parentResult;
}
- static AtkTextIface getTextIface (int /*long*/ atkObject) {
+ static AtkTextIface getTextIface (long /*int*/ atkObject) {
if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_TEXT())) {
AtkTextIface iface = new AtkTextIface ();
ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (atkObject)));
@@ -1959,7 +1959,7 @@ class AccessibleObject {
return null;
}
- static int /*long*/ atkText_get_character_extents (int /*long*/ atkObject, int /*long*/ offset, int /*long*/ x, int /*long*/ y, int /*long*/ width, int /*long*/ height, int /*long*/ coords) {
+ static long /*int*/ atkText_get_character_extents (long /*int*/ atkObject, long /*int*/ offset, long /*int*/ x, long /*int*/ y, long /*int*/ width, long /*int*/ height, long /*int*/ coords) {
if (DEBUG) print ("-->atkText_get_character_extents");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -1994,21 +1994,21 @@ class AccessibleObject {
return 0;
}
- static String getString (int /*long*/ strPtr) {
+ static String getString (long /*int*/ strPtr) {
int length = OS.strlen (strPtr);
byte [] buffer = new byte [length];
OS.memmove (buffer, strPtr, length);
return new String (Converter.mbcsToWcs (null, buffer));
}
- static int /*long*/ getStringPtr (String str) {
+ static long /*int*/ getStringPtr (String str) {
byte [] buffer = Converter.wcsToMbcs(null, str != null ? str : "", true);
- int /*long*/ ptr = OS.g_malloc(buffer.length);
+ long /*int*/ ptr = OS.g_malloc(buffer.length);
OS.memmove(ptr, buffer, buffer.length);
return ptr;
}
- static int /*long*/ atkText_get_range_extents (int /*long*/ atkObject, int /*long*/ start_offset, int /*long*/ end_offset, int /*long*/ coord_type, int /*long*/ rect) {
+ static long /*int*/ atkText_get_range_extents (long /*int*/ atkObject, long /*int*/ start_offset, long /*int*/ end_offset, long /*int*/ coord_type, long /*int*/ rect) {
if (DEBUG) print ("-->atkText_get_range_extents");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -2045,7 +2045,7 @@ class AccessibleObject {
return 0;
}
- static int /*long*/ atkText_get_run_attributes (int /*long*/ atkObject, int /*long*/ offset, int /*long*/ start_offset, int /*long*/ end_offset) {
+ static long /*int*/ atkText_get_run_attributes (long /*int*/ atkObject, long /*int*/ offset, long /*int*/ start_offset, long /*int*/ end_offset) {
if (DEBUG) print ("-->atkText_get_run_attributes");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -2062,18 +2062,18 @@ class AccessibleObject {
OS.memmove (start_offset, new int []{event.start}, 4);
OS.memmove (end_offset, new int []{event.end}, 4);
TextStyle style = event.textStyle;
- int /*long*/ result = 0;
+ long /*int*/ result = 0;
AtkAttribute attr = new AtkAttribute();
if (style != null) {
if (style.rise != 0) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_RISE));
attr.value = getStringPtr (String.valueOf(style.rise));
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
result = OS.g_slist_append(result, attrPtr);
}
if (style.underline) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_UNDERLINE));
String str = "none"; //$NON-NLS-1$
switch (style.underlineStyle) {
@@ -2087,7 +2087,7 @@ class AccessibleObject {
result = OS.g_slist_append(result, attrPtr);
}
if (style.strikeout) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_STRIKETHROUGH));
attr.value = getStringPtr ("1");
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
@@ -2096,7 +2096,7 @@ class AccessibleObject {
Font font = style.font;
if (font != null && !font.isDisposed()) {
//TODO language and direction
- int /*long*/ attrPtr;
+ long /*int*/ attrPtr;
attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_FAMILY_NAME));
attr.value = ATK.g_strdup (OS.pango_font_description_get_family (font.handle));
@@ -2135,7 +2135,7 @@ class AccessibleObject {
}
Color color = style.foreground;
if (color != null && !color.isDisposed()) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_FG_COLOR));
attr.value = getStringPtr ((color.handle.red & 0xFFFF) + "," + (color.handle.blue & 0xFFFF) + "," + (color.handle.blue & 0xFFFF)); //$NON-NLS-1$ //$NON-NLS-2$
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
@@ -2143,7 +2143,7 @@ class AccessibleObject {
}
color = style.background;
if (color != null && !color.isDisposed()) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = ATK.g_strdup (ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_BG_COLOR));
attr.value = getStringPtr ((color.handle.red & 0xFFFF) + "," + (color.handle.blue & 0xFFFF) + "," + (color.handle.blue & 0xFFFF)); //$NON-NLS-1$ //$NON-NLS-2$
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
@@ -2153,7 +2153,7 @@ class AccessibleObject {
if (event.attributes != null) {
int end = event.attributes.length / 2 * 2;
for (int i = 0; i < end; i+= 2) {
- int /*long*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
+ long /*int*/ attrPtr = OS.g_malloc(AtkAttribute.sizeof);
attr.name = getStringPtr (event.attributes[i]);
attr.value = getStringPtr (event.attributes[i + 1]);
ATK.memmove(attrPtr, attr, AtkAttribute.sizeof);
@@ -2163,7 +2163,7 @@ class AccessibleObject {
return result;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTextIface iface = getTextIface (atkObject);
if (iface != null && iface.get_run_attributes != 0) {
parentResult = ATK.call (iface.get_run_attributes, atkObject, offset, start_offset, end_offset);
@@ -2171,7 +2171,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkText_get_offset_at_point (int /*long*/ atkObject, int /*long*/ x, int /*long*/ y, int /*long*/ coords) {
+ static long /*int*/ atkText_get_offset_at_point (long /*int*/ atkObject, long /*int*/ x, long /*int*/ y, long /*int*/ coords) {
if (DEBUG) print ("-->atkText_get_offset_at_point");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -2195,7 +2195,7 @@ class AccessibleObject {
return event.offset;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTextIface iface = getTextIface (atkObject);
if (iface != null && iface.get_offset_at_point != 0) {
parentResult = ATK.call (iface.get_offset_at_point, atkObject, x, y, coords);
@@ -2203,7 +2203,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkText_add_selection (int /*long*/ atkObject, int /*long*/ start_offset, int /*long*/ end_offset) {
+ static long /*int*/ atkText_add_selection (long /*int*/ atkObject, long /*int*/ start_offset, long /*int*/ end_offset) {
if (DEBUG) print ("-->atkText_add_selection");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -2221,7 +2221,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTextIface iface = getTextIface (atkObject);
if (iface != null && iface.add_selection != 0) {
parentResult = ATK.call (iface.add_selection, atkObject, start_offset, end_offset);
@@ -2229,7 +2229,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkText_remove_selection (int /*long*/ atkObject, int /*long*/ selection_num) {
+ static long /*int*/ atkText_remove_selection (long /*int*/ atkObject, long /*int*/ selection_num) {
if (DEBUG) print ("-->atkText_remove_selection");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -2246,7 +2246,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTextIface iface = getTextIface (atkObject);
if (iface != null && iface.remove_selection != 0) {
parentResult = ATK.call (iface.remove_selection, atkObject, selection_num);
@@ -2254,7 +2254,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkText_set_caret_offset (int /*long*/ atkObject, int /*long*/ offset) {
+ static long /*int*/ atkText_set_caret_offset (long /*int*/ atkObject, long /*int*/ offset) {
if (DEBUG) print ("-->atkText_set_caret_offset");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -2278,7 +2278,7 @@ class AccessibleObject {
return 0;
}
- static int /*long*/ atkText_set_selection (int /*long*/ atkObject, int /*long*/ selection_num, int /*long*/ start_offset, int /*long*/ end_offset) {
+ static long /*int*/ atkText_set_selection (long /*int*/ atkObject, long /*int*/ selection_num, long /*int*/ start_offset, long /*int*/ end_offset) {
if (DEBUG) print ("-->atkText_set_selection");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -2297,7 +2297,7 @@ class AccessibleObject {
return ACC.OK.equals(event.result) ? 1 : 0;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTextIface iface = getTextIface (atkObject);
if (iface != null && iface.set_selection != 0) {
parentResult = ATK.call (iface.set_selection, atkObject, selection_num, start_offset, end_offset);
@@ -2305,10 +2305,10 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkText_get_caret_offset (int /*long*/ atkObject) {
+ static long /*int*/ atkText_get_caret_offset (long /*int*/ atkObject) {
if (DEBUG) print ("-->atkText_get_caret_offset");
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTextIface iface = getTextIface (atkObject);
if (iface != null && iface.get_caret_offset != 0) {
parentResult = ATK.call (iface.get_caret_offset, atkObject);
@@ -2341,7 +2341,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkText_get_bounded_ranges (int /*long*/ atkObject, int /*long*/ rect, int /*long*/ coord_type, int /*long*/ x_clip_type, int /*long*/ y_clip_type) {
+ static long /*int*/ atkText_get_bounded_ranges (long /*int*/ atkObject, long /*int*/ rect, long /*int*/ coord_type, long /*int*/ x_clip_type, long /*int*/ y_clip_type) {
if (DEBUG) print ("-->atkText_get_bounded_ranges");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -2362,7 +2362,7 @@ class AccessibleObject {
}
int [] ranges = event.ranges;
int size = ranges == null ? 1 : ranges.length / 2;
- int /*long*/ result = OS.malloc(size * AtkTextRange.sizeof);
+ long /*int*/ result = OS.malloc(size * AtkTextRange.sizeof);
AtkTextRange range = new AtkTextRange();
for (int j = 0, end = (ranges != null ? ranges.length / 2 : 1); j < end; j++) {
if (ranges != null) {
@@ -2394,7 +2394,7 @@ class AccessibleObject {
return result;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTextIface iface = getTextIface (atkObject);
if (iface != null && iface.get_bounded_ranges != 0) {
parentResult = ATK.call (iface.get_bounded_ranges, atkObject);
@@ -2402,7 +2402,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkText_get_character_at_offset (int /*long*/ atkObject, int /*long*/ offset) {
+ static long /*int*/ atkText_get_character_at_offset (long /*int*/ atkObject, long /*int*/ offset) {
if (DEBUG) print ("-->atkText_get_character_at_offset");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -2431,7 +2431,7 @@ class AccessibleObject {
return 0;
}
- static int /*long*/ atkText_get_character_count (int /*long*/ atkObject) {
+ static long /*int*/ atkText_get_character_count (long /*int*/ atkObject) {
if (DEBUG) print ("-->atkText_get_character_count");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -2456,7 +2456,7 @@ class AccessibleObject {
return 0;
}
- static int /*long*/ atkText_get_n_selections (int /*long*/ atkObject) {
+ static long /*int*/ atkText_get_n_selections (long /*int*/ atkObject) {
if (DEBUG) print ("-->atkText_get_n_selections");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -2483,7 +2483,7 @@ class AccessibleObject {
if (event.length > 0) return 1;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkTextIface iface = getTextIface (atkObject);
if (iface != null && iface.get_n_selections != 0) {
parentResult = ATK.call (iface.get_n_selections, atkObject);
@@ -2491,10 +2491,10 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkText_get_selection (int /*long*/ atkObject, int /*long*/ selection_num, int /*long*/ start_offset, int /*long*/ end_offset) {
+ static long /*int*/ atkText_get_selection (long /*int*/ atkObject, long /*int*/ selection_num, long /*int*/ start_offset, long /*int*/ end_offset) {
if (DEBUG) print ("-->atkText_get_selection");
AccessibleObject object = getAccessibleObject (atkObject);
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
OS.memmove (start_offset, new int[] {0}, 4);
OS.memmove (end_offset, new int[] {0}, 4);
AtkTextIface iface = getTextIface (atkObject);
@@ -2560,7 +2560,7 @@ class AccessibleObject {
return parentResult;
}
- static int /*long*/ atkText_get_text (int /*long*/ atkObject, int /*long*/ start_offset, int /*long*/ end_offset) {
+ static long /*int*/ atkText_get_text (long /*int*/ atkObject, long /*int*/ start_offset, long /*int*/ end_offset) {
if (DEBUG) print ("-->atkText_get_text: " + atkObject + " " + start_offset + "," + end_offset);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -2597,7 +2597,7 @@ class AccessibleObject {
return 0;
}
- static int /*long*/ atkText_get_text_after_offset (int /*long*/ atkObject, int /*long*/ offset_value, int /*long*/ boundary_type, int /*long*/ start_offset, int /*long*/ end_offset) {
+ static long /*int*/ atkText_get_text_after_offset (long /*int*/ atkObject, long /*int*/ offset_value, long /*int*/ boundary_type, long /*int*/ start_offset, long /*int*/ end_offset) {
if (DEBUG) print ("-->atkText_get_text_after_offset");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -2605,7 +2605,7 @@ class AccessibleObject {
Vector listeners = accessible.accessibleTextExtendedListeners;
int length = listeners.size();
if (length > 0) {
- int /*long*/ charCount = atkText_get_character_count (atkObject);
+ long /*int*/ charCount = atkText_get_character_count (atkObject);
AccessibleTextEvent event = new AccessibleTextEvent(accessible);
event.start = event.end = (int)/*64*/offset_value;
event.count = 1;
@@ -2845,7 +2845,7 @@ class AccessibleObject {
return 0;
}
- static int /*long*/ atkText_get_text_at_offset (int /*long*/ atkObject, int /*long*/ offset_value, int /*long*/ boundary_type, int /*long*/ start_offset, int /*long*/ end_offset) {
+ static long /*int*/ atkText_get_text_at_offset (long /*int*/ atkObject, long /*int*/ offset_value, long /*int*/ boundary_type, long /*int*/ start_offset, long /*int*/ end_offset) {
if (DEBUG) print ("-->atkText_get_text_at_offset: " + offset_value + " start: " + start_offset + " end: " + end_offset);
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -2853,7 +2853,7 @@ class AccessibleObject {
Vector listeners = accessible.accessibleTextExtendedListeners;
int length = listeners.size();
if (length > 0) {
- int /*long*/ charCount = atkText_get_character_count (atkObject);
+ long /*int*/ charCount = atkText_get_character_count (atkObject);
AccessibleTextEvent event = new AccessibleTextEvent(accessible);
event.start = event.end = (int)/*64*/offset_value;
event.count = 0;
@@ -3036,7 +3036,7 @@ class AccessibleObject {
return 0;
}
- static int /*long*/ atkText_get_text_before_offset (int /*long*/ atkObject, int /*long*/ offset_value, int /*long*/ boundary_type, int /*long*/ start_offset, int /*long*/ end_offset) {
+ static long /*int*/ atkText_get_text_before_offset (long /*int*/ atkObject, long /*int*/ offset_value, long /*int*/ boundary_type, long /*int*/ start_offset, long /*int*/ end_offset) {
if (DEBUG) print ("-->atkText_get_text_before_offset");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -3044,7 +3044,7 @@ class AccessibleObject {
Vector listeners = accessible.accessibleTextExtendedListeners;
int length = listeners.size();
if (length > 0) {
- int /*long*/ charCount = atkText_get_character_count (atkObject);
+ long /*int*/ charCount = atkText_get_character_count (atkObject);
AccessibleTextEvent event = new AccessibleTextEvent(accessible);
event.start = event.end = (int)/*64*/offset_value;
event.count = -1;
@@ -3232,7 +3232,7 @@ class AccessibleObject {
return 0;
}
- static void setGValue (int /*long*/ value, Number number) {
+ static void setGValue (long /*int*/ value, Number number) {
if (number == null) return;
if (OS.G_VALUE_TYPE(value) != 0) OS.g_value_unset(value);
if (number instanceof Double) {
@@ -3250,8 +3250,8 @@ class AccessibleObject {
}
}
- static Number getGValue (int /*long*/ value) {
- int /*long*/ type = OS.G_VALUE_TYPE(value);
+ static Number getGValue (long /*int*/ value) {
+ long /*int*/ type = OS.G_VALUE_TYPE(value);
if (type == 0) return null;
if (type == OS.G_TYPE_DOUBLE()) return new Double(OS.g_value_get_double(value));
if (type == OS.G_TYPE_FLOAT()) return new Float(OS.g_value_get_float(value));
@@ -3259,7 +3259,7 @@ class AccessibleObject {
return new Integer(OS.g_value_get_int(value));
}
- static AtkValueIface getValueIface (int /*long*/ atkObject) {
+ static AtkValueIface getValueIface (long /*int*/ atkObject) {
if (ATK.g_type_is_a (OS.g_type_parent (OS.G_OBJECT_TYPE (atkObject)), ATK.ATK_TYPE_VALUE())) {
AtkValueIface iface = new AtkValueIface ();
ATK.memmove (iface, ATK.g_type_interface_peek_parent (ATK.ATK_VALUE_GET_IFACE (atkObject)));
@@ -3267,7 +3267,7 @@ class AccessibleObject {
}
return null;
}
- static int /*long*/ atkValue_get_current_value (int /*long*/ atkObject, int /*long*/ value) {
+ static long /*int*/ atkValue_get_current_value (long /*int*/ atkObject, long /*int*/ value) {
if (DEBUG) print ("-->atkValue_get_current_value");
AccessibleObject object = getAccessibleObject (atkObject);
AtkValueIface iface = getValueIface (atkObject);
@@ -3291,7 +3291,7 @@ class AccessibleObject {
return 0;
}
- static int /*long*/ atkValue_get_maximum_value (int /*long*/ atkObject, int /*long*/ value) {
+ static long /*int*/ atkValue_get_maximum_value (long /*int*/ atkObject, long /*int*/ value) {
if (DEBUG) print ("-->atkValue_get_maximum_value");
AccessibleObject object = getAccessibleObject (atkObject);
AtkValueIface iface = getValueIface (atkObject);
@@ -3315,7 +3315,7 @@ class AccessibleObject {
return 0;
}
- static int /*long*/ atkValue_get_minimum_value (int /*long*/ atkObject, int /*long*/ value) {
+ static long /*int*/ atkValue_get_minimum_value (long /*int*/ atkObject, long /*int*/ value) {
if (DEBUG) print ("-->atkValue_get_minimum_value");
AccessibleObject object = getAccessibleObject (atkObject);
AtkValueIface iface = getValueIface (atkObject);
@@ -3339,7 +3339,7 @@ class AccessibleObject {
return 0;
}
- static int /*long*/ atkValue_set_current_value (int /*long*/ atkObject, int /*long*/ value) {
+ static long /*int*/ atkValue_set_current_value (long /*int*/ atkObject, long /*int*/ value) {
if (DEBUG) print ("-->atkValue_set_current_value");
AccessibleObject object = getAccessibleObject (atkObject);
if (object != null) {
@@ -3356,7 +3356,7 @@ class AccessibleObject {
return event.value != null ? 1 : 0;
}
}
- int /*long*/ parentResult = 0;
+ long /*int*/ parentResult = 0;
AtkValueIface iface = getValueIface (atkObject);
if (iface != null && iface.set_current_value != 0) {
parentResult = ATK.call (iface.set_current_value, atkObject, value);
@@ -3364,7 +3364,7 @@ class AccessibleObject {
return parentResult;
}
- static AccessibleObject getAccessibleObject (int /*long*/ atkObject) {
+ static AccessibleObject getAccessibleObject (long /*int*/ atkObject) {
AccessibleObject object = (AccessibleObject)AccessibleObjects.get (new LONG (atkObject));
if (object == null) return null;
if (object.accessible == null) return null;
@@ -3397,9 +3397,9 @@ class AccessibleObject {
String parentText = ""; //$NON-NLS-1$
AtkTextIface iface = getTextIface (handle);
if (iface != null && iface.get_character_count != 0) {
- int /*long*/ characterCount = ATK.call (iface.get_character_count, handle);
+ long /*int*/ characterCount = ATK.call (iface.get_character_count, handle);
if (characterCount > 0 && iface.get_text != 0) {
- int /*long*/ parentResult = ATK.call (iface.get_text, handle, 0, characterCount);
+ long /*int*/ parentResult = ATK.call (iface.get_text, handle, 0, characterCount);
if (parentResult != 0) {
parentText = getString (parentResult);
OS.g_free(parentResult);
@@ -3418,10 +3418,10 @@ class AccessibleObject {
return null;
}
- static int /*long*/ gObjectClass_finalize (int /*long*/ atkObject) {
+ static long /*int*/ gObjectClass_finalize (long /*int*/ atkObject) {
if (DEBUG) print ("-->gObjectClass_finalize: " + atkObject);
- int /*long*/ superType = ATK.g_type_class_peek_parent (ATK.G_OBJECT_GET_CLASS (atkObject));
- int /*long*/ gObjectClass = ATK.G_OBJECT_CLASS (superType);
+ long /*int*/ superType = ATK.g_type_class_peek_parent (ATK.G_OBJECT_GET_CLASS (atkObject));
+ long /*int*/ gObjectClass = ATK.G_OBJECT_CLASS (superType);
GObjectClass objectClassStruct = new GObjectClass ();
ATK.memmove (objectClassStruct, gObjectClass);
ATK.call (objectClassStruct.finalize, atkObject);
@@ -3461,8 +3461,8 @@ class AccessibleObject {
ATK.memmove (gtkAccessible, object.handle);
}
if (gtkAccessible.widget == 0) return;
- int /*long*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget);
- int /*long*/ window;
+ long /*int*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget);
+ long /*int*/ window;
if (OS.GTK_VERSION >= OS.VERSION(2, 14, 0)){
window = OS.gtk_widget_get_window (topLevel);
} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java
index 52c1efd6d8..3ee3e263fe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java
@@ -115,7 +115,7 @@ public class Accessible {
Accessible(Control control) {
this.control = control;
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
/* CreateStdAccessibleObject([in] hwnd, [in] idObject, [in] riidInterface, [out] ppvObject).
* AddRef has already been called on ppvObject by the callee and must be released by the caller.
*/
@@ -130,7 +130,7 @@ public class Accessible {
AddRef();
}
- Accessible(Accessible parent, int /*long*/ iaccessible_address) {
+ Accessible(Accessible parent, long /*int*/ iaccessible_address) {
this(parent);
iaccessible = new IAccessible(iaccessible_address);
}
@@ -142,44 +142,44 @@ public class Accessible {
void createIAccessible() {
objIAccessible = new COMObject(new int[] {2,0,0,1,3,5,8,1,1,2,2,2,2,2,2,2,3,2,1,1,2,2,5,3,3,1,2,2}) {
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
// method3 GetTypeInfoCount - not implemented
// method4 GetTypeInfo - not implemented
// method5 GetIDsOfNames - not implemented
// method6 Invoke - not implemented
- public int /*long*/ method7(int /*long*/[] args) {return get_accParent(args[0]);}
- public int /*long*/ method8(int /*long*/[] args) {return get_accChildCount(args[0]);}
- public int /*long*/ method9(int /*long*/[] args) {return get_accChild(args[0], args[1]);}
- public int /*long*/ method10(int /*long*/[] args) {return get_accName(args[0], args[1]);}
- public int /*long*/ method11(int /*long*/[] args) {return get_accValue(args[0], args[1]);}
- public int /*long*/ method12(int /*long*/[] args) {return get_accDescription(args[0], args[1]);}
- public int /*long*/ method13(int /*long*/[] args) {return get_accRole(args[0], args[1]);}
- public int /*long*/ method14(int /*long*/[] args) {return get_accState(args[0], args[1]);}
- public int /*long*/ method15(int /*long*/[] args) {return get_accHelp(args[0], args[1]);}
- public int /*long*/ method16(int /*long*/[] args) {return get_accHelpTopic(args[0], args[1], args[2]);}
- public int /*long*/ method17(int /*long*/[] args) {return get_accKeyboardShortcut(args[0], args[1]);}
- public int /*long*/ method18(int /*long*/[] args) {return get_accFocus(args[0]);}
- public int /*long*/ method19(int /*long*/[] args) {return get_accSelection(args[0]);}
- public int /*long*/ method20(int /*long*/[] args) {return get_accDefaultAction(args[0], args[1]);}
- public int /*long*/ method21(int /*long*/[] args) {return accSelect((int)/*64*/args[0], args[1]);}
- public int /*long*/ method22(int /*long*/[] args) {return accLocation(args[0], args[1], args[2], args[3], args[4]);}
- public int /*long*/ method23(int /*long*/[] args) {return accNavigate((int)/*64*/args[0], args[1], args[2]);}
- public int /*long*/ method24(int /*long*/[] args) {return accHitTest((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}
- public int /*long*/ method25(int /*long*/[] args) {return accDoDefaultAction(args[0]);}
- public int /*long*/ method26(int /*long*/[] args) {return put_accName(args[0], args[1]);}
- public int /*long*/ method27(int /*long*/[] args) {return put_accValue(args[0], args[1]);}
+ public long /*int*/ method7(long /*int*/[] args) {return get_accParent(args[0]);}
+ public long /*int*/ method8(long /*int*/[] args) {return get_accChildCount(args[0]);}
+ public long /*int*/ method9(long /*int*/[] args) {return get_accChild(args[0], args[1]);}
+ public long /*int*/ method10(long /*int*/[] args) {return get_accName(args[0], args[1]);}
+ public long /*int*/ method11(long /*int*/[] args) {return get_accValue(args[0], args[1]);}
+ public long /*int*/ method12(long /*int*/[] args) {return get_accDescription(args[0], args[1]);}
+ public long /*int*/ method13(long /*int*/[] args) {return get_accRole(args[0], args[1]);}
+ public long /*int*/ method14(long /*int*/[] args) {return get_accState(args[0], args[1]);}
+ public long /*int*/ method15(long /*int*/[] args) {return get_accHelp(args[0], args[1]);}
+ public long /*int*/ method16(long /*int*/[] args) {return get_accHelpTopic(args[0], args[1], args[2]);}
+ public long /*int*/ method17(long /*int*/[] args) {return get_accKeyboardShortcut(args[0], args[1]);}
+ public long /*int*/ method18(long /*int*/[] args) {return get_accFocus(args[0]);}
+ public long /*int*/ method19(long /*int*/[] args) {return get_accSelection(args[0]);}
+ public long /*int*/ method20(long /*int*/[] args) {return get_accDefaultAction(args[0], args[1]);}
+ public long /*int*/ method21(long /*int*/[] args) {return accSelect((int)/*64*/args[0], args[1]);}
+ public long /*int*/ method22(long /*int*/[] args) {return accLocation(args[0], args[1], args[2], args[3], args[4]);}
+ public long /*int*/ method23(long /*int*/[] args) {return accNavigate((int)/*64*/args[0], args[1], args[2]);}
+ public long /*int*/ method24(long /*int*/[] args) {return accHitTest((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}
+ public long /*int*/ method25(long /*int*/[] args) {return accDoDefaultAction(args[0]);}
+ public long /*int*/ method26(long /*int*/[] args) {return put_accName(args[0], args[1]);}
+ public long /*int*/ method27(long /*int*/[] args) {return put_accValue(args[0], args[1]);}
};
/* If the callback takes a struct parameter (for example, a VARIANT),
* then create a custom callback that dereferences the struct and
* passes a pointer to the original callback.
*/
- int /*long*/ ppVtable = objIAccessible.ppVtable;
- int /*long*/[] pVtable = new int /*long*/[1];
+ long /*int*/ ppVtable = objIAccessible.ppVtable;
+ long /*int*/[] pVtable = new long /*int*/[1];
COM.MoveMemory(pVtable, ppVtable, OS.PTR_SIZEOF);
- int /*long*/[] funcs = new int /*long*/[28];
+ long /*int*/[] funcs = new long /*int*/[28];
COM.MoveMemory(funcs, pVtable[0], OS.PTR_SIZEOF * funcs.length);
funcs[9] = COM.get_accChild_CALLBACK(funcs[9]);
funcs[10] = COM.get_accName_CALLBACK(funcs[10]);
@@ -202,9 +202,9 @@ public class Accessible {
void createIAccessible2() {
objIAccessible2 = new COMObject(new int[] {2,0,0,/*IA>>*/1,3,5,8,1,1,2,2,2,2,2,2,2,3,2,1,1,2,2,5,3,3,1,2,2,/*<>*/1,1,2,4,2,2,/*<>*/2,4,1,6,1,4,3,3,5,5,5,1,1,3,1,3,5,1,1,/*< 0 || getRelationCount() > 0
|| (control instanceof Button && ((control.getStyle() & SWT.RADIO) != 0))) {
if (objIServiceProvider == null) createIServiceProvider();
- COM.MoveMemory(ppvObject, new int /*long*/[] { objIServiceProvider.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] { objIServiceProvider.getAddress() }, OS.PTR_SIZEOF);
AddRef();
if (DEBUG) print(this + ".QueryInterface guid=" + guidString(guid) + " returning " + objIServiceProvider.getAddress() + hresult(COM.S_OK));
return COM.S_OK;
@@ -1578,7 +1578,7 @@ public class Accessible {
if (iaccessible != null) {
/* Forward any other GUIDs to the OS proxy. */
- int /*long*/[] ppv = new int /*long*/[1];
+ long /*int*/[] ppv = new long /*int*/[1];
code = iaccessible.QueryInterface(guid, ppv);
COM.MoveMemory(ppvObject, ppv, OS.PTR_SIZEOF);
if (DEBUG) if (interesting(guid)) print("QueryInterface guid=" + guidString(guid) + " returning super" + hresult(code));
@@ -1669,8 +1669,8 @@ public class Accessible {
}
/* QueryService([in] guidService, [in] riid, [out] ppvObject) */
- int QueryService(int /*long*/ guidService, int /*long*/ riid, int /*long*/ ppvObject) {
- COM.MoveMemory(ppvObject, new int /*long*/[] { 0 }, OS.PTR_SIZEOF);
+ int QueryService(long /*int*/ guidService, long /*int*/ riid, long /*int*/ ppvObject) {
+ COM.MoveMemory(ppvObject, new long /*int*/[] { 0 }, OS.PTR_SIZEOF);
GUID service = new GUID();
COM.MoveMemory(service, guidService, GUID.sizeof);
GUID guid = new GUID();
@@ -1680,7 +1680,7 @@ public class Accessible {
if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIDispatch) | COM.IsEqualGUID(guid, COM.IIDIAccessible)) {
if (objIAccessible == null) createIAccessible();
if (DEBUG) print(this + ".QueryService service=" + guidString(service) + " guid=" + guidString(guid) + " returning " + objIAccessible.getAddress() + hresult(COM.S_OK));
- COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessible.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessible.getAddress() }, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
@@ -1701,11 +1701,11 @@ public class Accessible {
if (iaccessible != null) {
/* Forward any other GUIDs to the OS proxy. */
- int /*long*/ [] ppv = new int /*long*/ [1];
+ long /*int*/ [] ppv = new long /*int*/ [1];
int code = iaccessible.QueryInterface(COM.IIDIServiceProvider, ppv);
if (code == COM.S_OK) {
IServiceProvider iserviceProvider = new IServiceProvider(ppv[0]);
- int /*long*/ [] ppvx = new int /*long*/ [1];
+ long /*int*/ [] ppvx = new long /*int*/ [1];
code = iserviceProvider.QueryService(service, guid, ppvx);
COM.MoveMemory(ppvObject, ppvx, OS.PTR_SIZEOF);
if (DEBUG) if (interesting(service) && interesting(guid)) print("QueryService service=" + guidString(service) + " guid=" + guidString(guid) + " returning super" + hresult(code));
@@ -1717,7 +1717,7 @@ public class Accessible {
return COM.E_NOINTERFACE;
}
- int queryAccessible2Interfaces(GUID guid, int /*long*/ ppvObject) {
+ int queryAccessible2Interfaces(GUID guid, long /*int*/ ppvObject) {
if (COM.IsEqualGUID(guid, COM.IIDIAccessible2)) {
if (accessibleActionListeners.size() > 0 || accessibleAttributeListeners.size() > 0 ||
accessibleHyperlinkListeners.size() > 0 || accessibleTableListeners.size() > 0 ||
@@ -1725,7 +1725,7 @@ public class Accessible {
accessibleValueListeners.size() > 0 || getRelationCount() > 0
|| (control instanceof Button && ((control.getStyle() & SWT.RADIO) != 0))) {
if (objIAccessible2 == null) createIAccessible2();
- COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessible2.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessible2.getAddress() }, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
@@ -1735,7 +1735,7 @@ public class Accessible {
if (COM.IsEqualGUID(guid, COM.IIDIAccessibleAction)) {
if (accessibleActionListeners.size() > 0) {
if (objIAccessibleAction == null) createIAccessibleAction();
- COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleAction.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleAction.getAddress() }, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
@@ -1744,7 +1744,7 @@ public class Accessible {
if (COM.IsEqualGUID(guid, COM.IIDIAccessibleApplication)) {
if (objIAccessibleApplication == null) createIAccessibleApplication();
- COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleApplication.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleApplication.getAddress() }, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
@@ -1753,7 +1753,7 @@ public class Accessible {
// The following lines are intentionally commented. We are not supporting IAccessibleComponent at this time.
// if (accessibleControlListeners.size() > 0) { // TO DO: can we reduce the scope of this somehow?
// if (objIAccessibleComponent == null) createIAccessibleComponent();
-// COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleComponent.getAddress() }, OS.PTR_SIZEOF);
+// COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleComponent.getAddress() }, OS.PTR_SIZEOF);
// AddRef();
// return COM.S_OK;
// }
@@ -1763,7 +1763,7 @@ public class Accessible {
if (COM.IsEqualGUID(guid, COM.IIDIAccessibleEditableText)) {
if (accessibleEditableTextListeners.size() > 0) {
if (objIAccessibleEditableText == null) createIAccessibleEditableText();
- COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleEditableText.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleEditableText.getAddress() }, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
@@ -1773,7 +1773,7 @@ public class Accessible {
if (COM.IsEqualGUID(guid, COM.IIDIAccessibleHyperlink)) {
if (accessibleHyperlinkListeners.size() > 0) {
if (objIAccessibleHyperlink == null) createIAccessibleHyperlink();
- COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleHyperlink.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleHyperlink.getAddress() }, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
@@ -1783,7 +1783,7 @@ public class Accessible {
if (COM.IsEqualGUID(guid, COM.IIDIAccessibleHypertext)) {
if (accessibleTextExtendedListeners.size() > 0) {
if (objIAccessibleHypertext == null) createIAccessibleHypertext();
- COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleHypertext.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleHypertext.getAddress() }, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
@@ -1794,7 +1794,7 @@ public class Accessible {
// The following lines are intentionally commented. We are not supporting IAccessibleImage at this time.
// if (getRole() == ACC.ROLE_GRAPHIC && (accessibleListeners.size() > 0 || accessibleControlListeners.size() > 0)) {
// if (objIAccessibleImage == null) createIAccessibleImage();
-// COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleImage.getAddress() }, OS.PTR_SIZEOF);
+// COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleImage.getAddress() }, OS.PTR_SIZEOF);
// AddRef();
// return COM.S_OK;
// }
@@ -1809,7 +1809,7 @@ public class Accessible {
if (COM.IsEqualGUID(guid, COM.IIDIAccessibleTable2)) {
if (accessibleTableListeners.size() > 0) {
if (objIAccessibleTable2 == null) createIAccessibleTable2();
- COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleTable2.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleTable2.getAddress() }, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
@@ -1819,7 +1819,7 @@ public class Accessible {
if (COM.IsEqualGUID(guid, COM.IIDIAccessibleTableCell)) {
if (accessibleTableCellListeners.size() > 0) {
if (objIAccessibleTableCell == null) createIAccessibleTableCell();
- COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleTableCell.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleTableCell.getAddress() }, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
@@ -1829,7 +1829,7 @@ public class Accessible {
if (COM.IsEqualGUID(guid, COM.IIDIAccessibleText)) {
if (accessibleTextExtendedListeners.size() > 0 /* || accessibleAttributeListeners.size() > 0*/) {
if (objIAccessibleText == null) createIAccessibleText();
- COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleText.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleText.getAddress() }, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
@@ -1839,7 +1839,7 @@ public class Accessible {
if (COM.IsEqualGUID(guid, COM.IIDIAccessibleValue)) {
if (accessibleValueListeners.size() > 0) {
if (objIAccessibleValue == null) createIAccessibleValue();
- COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessibleValue.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] { objIAccessibleValue.getAddress() }, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
@@ -1850,7 +1850,7 @@ public class Accessible {
}
/* IAccessible::accDoDefaultAction([in] varChild) */
- int accDoDefaultAction(int /*long*/ varChild) {
+ int accDoDefaultAction(long /*int*/ varChild) {
if (DEBUG) print(this + ".IAccessible::accDoDefaultAction");
if (accessibleActionListeners.size() > 0) {
VARIANT v = getVARIANT(varChild);
@@ -1867,9 +1867,9 @@ public class Accessible {
}
/* IAccessible::accHitTest([in] xLeft, [in] yTop, [out] pvarChild) */
- int accHitTest(int xLeft, int yTop, int /*long*/ pvarChild) {
+ int accHitTest(int xLeft, int yTop, long /*int*/ pvarChild) {
int osChild = ACC.CHILDID_NONE;
- int /*long*/ osChildObject = 0;
+ long /*int*/ osChildObject = 0;
if (iaccessible != null) {
/* Get the default child at point (left, top) from the OS. */
int code = iaccessible.accHitTest(xLeft, yTop, pvarChild);
@@ -1919,7 +1919,7 @@ public class Accessible {
}
/* IAccessible::accLocation([out] pxLeft, [out] pyTop, [out] pcxWidth, [out] pcyHeight, [in] varChild) */
- int accLocation(int /*long*/ pxLeft, int /*long*/ pyTop, int /*long*/ pcxWidth, int /*long*/ pcyHeight, int /*long*/ varChild) {
+ int accLocation(long /*int*/ pxLeft, long /*int*/ pyTop, long /*int*/ pcxWidth, long /*int*/ pcyHeight, long /*int*/ varChild) {
VARIANT v = getVARIANT(varChild);
if (v.vt != COM.VT_I4) return COM.E_INVALIDARG;
int osLeft = 0, osTop = 0, osWidth = 0, osHeight = 0;
@@ -1960,7 +1960,7 @@ public class Accessible {
}
/* IAccessible::accNavigate([in] navDir, [in] varStart, [out] pvarEndUpAt) */
- int accNavigate(int navDir, int /*long*/ varStart, int /*long*/ pvarEndUpAt) {
+ int accNavigate(int navDir, long /*int*/ varStart, long /*int*/ pvarEndUpAt) {
if (DEBUG) print(this + ".IAccessible::accNavigate");
/* MSAA: "The accNavigate method is deprecated and should not be used." */
int code = COM.DISP_E_MEMBERNOTFOUND;
@@ -1975,7 +1975,7 @@ public class Accessible {
// TODO: Consider supporting this in future.
/* IAccessible::accSelect([in] flagsSelect, [in] varChild) */
- int accSelect(int flagsSelect, int /*long*/ varChild) {
+ int accSelect(int flagsSelect, long /*int*/ varChild) {
int code = COM.DISP_E_MEMBERNOTFOUND;
if (iaccessible != null) {
/* Currently, we don't expose this as API. Forward to the proxy. */
@@ -1990,13 +1990,13 @@ public class Accessible {
* Ownership of ppdispChild transfers from callee to caller so reference count on ppdispChild
* must be incremented before returning. The caller is responsible for releasing ppdispChild.
*/
- int get_accChild(int /*long*/ varChild, int /*long*/ ppdispChild) {
+ int get_accChild(long /*int*/ varChild, long /*int*/ ppdispChild) {
VARIANT v = getVARIANT(varChild);
if (v.vt != COM.VT_I4) return COM.E_INVALIDARG;
if (v.lVal == COM.CHILDID_SELF) {
if (DEBUG) print(this + ".IAccessible::get_accChild(" + v.lVal + ") returning " + getAddress() + hresult(COM.S_OK));
AddRef();
- COM.MoveMemory(ppdispChild, new int /*long*/[] { getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppdispChild, new long /*int*/[] { getAddress() }, OS.PTR_SIZEOF);
return COM.S_OK;
}
final int childID = osToChildID(v.lVal);
@@ -2010,7 +2010,7 @@ public class Accessible {
ToolBar toolBar = (ToolBar) control;
final ToolItem item = toolBar.getItem(childID);
if (item != null && (item.getStyle() & SWT.DROP_DOWN) != 0) {
- int /*long*/[] addr = new int /*long*/[1];
+ long /*int*/[] addr = new long /*int*/[1];
COM.MoveMemory(addr, ppdispChild, OS.PTR_SIZEOF);
boolean found = false;
for (int i = 0; i < children.size(); i++) {
@@ -2068,7 +2068,7 @@ public class Accessible {
if (accessible != null) {
if (DEBUG) print(this + ".IAccessible::get_accChild(" + v.lVal + ") returning " + accessible.getAddress() + hresult(COM.S_OK));
accessible.AddRef();
- COM.MoveMemory(ppdispChild, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppdispChild, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
return COM.S_OK;
}
if (DEBUG) print(this + ".IAccessible::get_accChild(" + v.lVal + ") returning from super" + hresult(code));
@@ -2076,7 +2076,7 @@ public class Accessible {
}
/* IAccessible::get_accChildCount([out] pcountChildren) */
- int get_accChildCount(int /*long*/ pcountChildren) {
+ int get_accChildCount(long /*int*/ pcountChildren) {
int osChildCount = 0;
if (iaccessible != null) {
/* Get the default child count from the OS. */
@@ -2105,7 +2105,7 @@ public class Accessible {
}
/* IAccessible::get_accDefaultAction([in] varChild, [out] pszDefaultAction) */
- int get_accDefaultAction(int /*long*/ varChild, int /*long*/ pszDefaultAction) {
+ int get_accDefaultAction(long /*int*/ varChild, long /*int*/ pszDefaultAction) {
if (DEBUG) print(this + ".IAccessible::get_accDefaultAction");
VARIANT v = getVARIANT(varChild);
if (v.vt != COM.VT_I4) return COM.E_INVALIDARG;
@@ -2117,7 +2117,7 @@ public class Accessible {
if (code == COM.E_INVALIDARG) code = COM.S_FALSE; // proxy doesn't know about app childID
if (accessibleControlListeners.size() == 0) return code;
if (code == COM.S_OK) {
- int /*long*/[] pDefaultAction = new int /*long*/[1];
+ long /*int*/[] pDefaultAction = new long /*int*/[1];
COM.MoveMemory(pDefaultAction, pszDefaultAction, OS.PTR_SIZEOF);
int size = COM.SysStringByteLen(pDefaultAction[0]);
if (size > 0) {
@@ -2145,7 +2145,7 @@ public class Accessible {
}
/* IAccessible::get_accDescription([in] varChild, [out] pszDescription) */
- int get_accDescription(int /*long*/ varChild, int /*long*/ pszDescription) {
+ int get_accDescription(long /*int*/ varChild, long /*int*/ pszDescription) {
if (DEBUG) print(this + ".IAccessible::get_accDescription");
/*
* MSAA: "The accDescription property is not supported in the transition to
@@ -2168,7 +2168,7 @@ public class Accessible {
// TEMPORARY CODE - process tree even if there are no apps listening
if (accessibleListeners.size() == 0 && !(control instanceof Tree)) return code;
if (code == COM.S_OK) {
- int /*long*/[] pDescription = new int /*long*/[1];
+ long /*int*/[] pDescription = new long /*int*/[1];
COM.MoveMemory(pDescription, pszDescription, OS.PTR_SIZEOF);
int size = COM.SysStringByteLen(pDescription[0]);
if (size > 0) {
@@ -2192,7 +2192,7 @@ public class Accessible {
Tree tree = (Tree) control;
int columnCount = tree.getColumnCount ();
if (columnCount > 1) {
- int /*long*/ hwnd = control.handle, hItem = 0;
+ long /*int*/ hwnd = control.handle, hItem = 0;
if (OS.COMCTL32_MAJOR >= 6) {
hItem = OS.SendMessage (hwnd, OS.TVM_MAPACCIDTOHTREEITEM, v.lVal, 0);
} else {
@@ -2224,7 +2224,7 @@ public class Accessible {
* Ownership of pvarChild transfers from callee to caller so reference count on pvarChild
* must be incremented before returning. The caller is responsible for releasing pvarChild.
*/
- int get_accFocus(int /*long*/ pvarChild) {
+ int get_accFocus(long /*int*/ pvarChild) {
int osChild = ACC.CHILDID_NONE;
if (iaccessible != null) {
/* Get the default focus child from the OS. */
@@ -2272,7 +2272,7 @@ public class Accessible {
}
/* IAccessible::get_accHelp([in] varChild, [out] pszHelp) */
- int get_accHelp(int /*long*/ varChild, int /*long*/ pszHelp) {
+ int get_accHelp(long /*int*/ varChild, long /*int*/ pszHelp) {
if (DEBUG) print(this + ".IAccessible::get_accHelp");
VARIANT v = getVARIANT(varChild);
if (v.vt != COM.VT_I4) return COM.E_INVALIDARG;
@@ -2284,7 +2284,7 @@ public class Accessible {
if (code == COM.E_INVALIDARG) code = COM.S_FALSE; // proxy doesn't know about app childID
if (accessibleListeners.size() == 0) return code;
if (code == COM.S_OK) {
- int /*long*/[] pHelp = new int /*long*/[1];
+ long /*int*/[] pHelp = new long /*int*/[1];
COM.MoveMemory(pHelp, pszHelp, OS.PTR_SIZEOF);
int size = COM.SysStringByteLen(pHelp[0]);
if (size > 0) {
@@ -2309,7 +2309,7 @@ public class Accessible {
}
/* IAccessible::get_accHelpTopic([out] pszHelpFile, [in] varChild, [out] pidTopic) */
- int get_accHelpTopic(int /*long*/ pszHelpFile, int /*long*/ varChild, int /*long*/ pidTopic) {
+ int get_accHelpTopic(long /*int*/ pszHelpFile, long /*int*/ varChild, long /*int*/ pidTopic) {
if (DEBUG) print(this + ".IAccessible::get_accHelpTopic");
/* MSAA: "The accHelpTopic property is deprecated and should not be used." */
int code = COM.DISP_E_MEMBERNOTFOUND;
@@ -2323,7 +2323,7 @@ public class Accessible {
}
/* IAccessible::get_accKeyboardShortcut([in] varChild, [out] pszKeyboardShortcut) */
- int get_accKeyboardShortcut(int /*long*/ varChild, int /*long*/ pszKeyboardShortcut) {
+ int get_accKeyboardShortcut(long /*int*/ varChild, long /*int*/ pszKeyboardShortcut) {
if (DEBUG) print(this + ".IAccessible::get_accKeyboardShortcut");
VARIANT v = getVARIANT(varChild);
if (v.vt != COM.VT_I4) return COM.E_INVALIDARG;
@@ -2336,7 +2336,7 @@ public class Accessible {
/* Process TabFolder even if there are no apps listening. */
if (accessibleListeners.size() == 0 && !(control instanceof TabFolder)) return code;
if (code == COM.S_OK) {
- int /*long*/[] pKeyboardShortcut = new int /*long*/[1];
+ long /*int*/[] pKeyboardShortcut = new long /*int*/[1];
COM.MoveMemory(pKeyboardShortcut, pszKeyboardShortcut, OS.PTR_SIZEOF);
int size = COM.SysStringByteLen(pKeyboardShortcut[0]);
if (size > 0) {
@@ -2365,7 +2365,7 @@ public class Accessible {
}
/* IAccessible::get_accName([in] varChild, [out] pszName) */
- int get_accName(int /*long*/ varChild, int /*long*/ pszName) {
+ int get_accName(long /*int*/ varChild, long /*int*/ pszName) {
VARIANT v = getVARIANT(varChild);
if (v.vt != COM.VT_I4) return COM.E_INVALIDARG;
int code = COM.S_FALSE;
@@ -2374,7 +2374,7 @@ public class Accessible {
/* Get the default name from the OS. */
code = iaccessible.get_accName(varChild, pszName);
if (code == COM.S_OK) {
- int /*long*/[] pName = new int /*long*/[1];
+ long /*int*/[] pName = new long /*int*/[1];
COM.MoveMemory(pName, pszName, OS.PTR_SIZEOF);
int size = COM.SysStringByteLen(pName[0]);
if (size > 0) {
@@ -2418,7 +2418,7 @@ public class Accessible {
* Ownership of ppdispParent transfers from callee to caller so reference count on ppdispParent
* must be incremented before returning. The caller is responsible for releasing ppdispParent.
*/
- int get_accParent(int /*long*/ ppdispParent) {
+ int get_accParent(long /*int*/ ppdispParent) {
int code = COM.DISP_E_MEMBERNOTFOUND;
if (iaccessible != null) {
/* Currently, we don't expose this as API. Forward to the proxy. */
@@ -2427,7 +2427,7 @@ public class Accessible {
if (parent != null) {
/* For lightweight accessibles, return the accessible's parent. */
parent.AddRef();
- COM.MoveMemory(ppdispParent, new int /*long*/[] { parent.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppdispParent, new long /*int*/[] { parent.getAddress() }, OS.PTR_SIZEOF);
code = COM.S_OK;
}
if (DEBUG) print(this + ".IAccessible::get_accParent() returning" + (parent != null ? " " + parent.getAddress() : " from super") + hresult(code));
@@ -2435,7 +2435,7 @@ public class Accessible {
}
/* IAccessible::get_accRole([in] varChild, [out] pvarRole) */
- int get_accRole(int /*long*/ varChild, int /*long*/ pvarRole) {
+ int get_accRole(long /*int*/ varChild, long /*int*/ pvarRole) {
VARIANT v = getVARIANT(varChild);
if (v.vt != COM.VT_I4) return COM.E_INVALIDARG;
int osRole = COM.ROLE_SYSTEM_CLIENT;
@@ -2470,10 +2470,10 @@ public class Accessible {
* Ownership of pvarChildren transfers from callee to caller so reference count on pvarChildren
* must be incremented before returning. The caller is responsible for releasing pvarChildren.
*/
- int get_accSelection(int /*long*/ pvarChildren) {
+ int get_accSelection(long /*int*/ pvarChildren) {
if (DEBUG) print(this + ".IAccessible::get_accSelection");
int osChild = ACC.CHILDID_NONE;
- int /*long*/ osChildObject = 0;
+ long /*int*/ osChildObject = 0;
if (iaccessible != null) {
/* Get the default selection from the OS. */
int code = iaccessible.get_accSelection(pvarChildren);
@@ -2525,7 +2525,7 @@ public class Accessible {
}
/* IAccessible::get_accState([in] varChild, [out] pvarState) */
- int get_accState(int /*long*/ varChild, int /*long*/ pvarState) {
+ int get_accState(long /*int*/ varChild, long /*int*/ pvarState) {
VARIANT v = getVARIANT(varChild);
if (v.vt != COM.VT_I4) return COM.E_INVALIDARG;
int osState = 0;
@@ -2547,7 +2547,7 @@ public class Accessible {
* images, so we need to determine if the item state is 'checked'. */
if (v.lVal != COM.CHILDID_SELF) {
if (control instanceof Tree && (control.getStyle() & SWT.CHECK) != 0) {
- int /*long*/ hwnd = control.handle;
+ long /*int*/ hwnd = control.handle;
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE;
tvItem.stateMask = OS.TVIS_STATEIMAGEMASK;
@@ -2556,7 +2556,7 @@ public class Accessible {
} else {
tvItem.hItem = v.lVal;
}
- int /*long*/ result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem);
+ long /*int*/ result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem);
boolean checked = (result != 0) && (((tvItem.state >> 12) & 1) == 0);
if (checked) event.detail |= ACC.STATE_CHECKED;
grayed = tvItem.state >> 12 > 2;
@@ -2585,7 +2585,7 @@ public class Accessible {
}
/* IAccessible::get_accValue([in] varChild, [out] pszValue) */
- int get_accValue(int /*long*/ varChild, int /*long*/ pszValue) {
+ int get_accValue(long /*int*/ varChild, long /*int*/ pszValue) {
VARIANT v = getVARIANT(varChild);
if (v.vt != COM.VT_I4) return COM.E_INVALIDARG;
int code = COM.DISP_E_MEMBERNOTFOUND;
@@ -2594,7 +2594,7 @@ public class Accessible {
/* Get the default value string from the OS. */
code = iaccessible.get_accValue(varChild, pszValue);
if (code == COM.S_OK) {
- int /*long*/[] pValue = new int /*long*/[1];
+ long /*int*/[] pValue = new long /*int*/[1];
COM.MoveMemory(pValue, pszValue, OS.PTR_SIZEOF);
int size = COM.SysStringByteLen(pValue[0]);
if (size > 0) {
@@ -2635,13 +2635,13 @@ public class Accessible {
}
/* put_accName([in] varChild, [in] szName) */
- int put_accName(int /*long*/ varChild, int /*long*/ szName) {
+ int put_accName(long /*int*/ varChild, long /*int*/ szName) {
/* MSAA: "The IAccessible::put_accName method is no longer supported. Servers should return E_NOTIMPL." */
return COM.E_NOTIMPL;
}
/* put_accValue([in] varChild, [in] szValue) */
- int put_accValue(int /*long*/ varChild, int /*long*/ szValue) {
+ int put_accValue(long /*int*/ varChild, long /*int*/ szValue) {
/* MSAA: this method is supported for some UI elements (usually edit controls). */
VARIANT v = getVARIANT(varChild);
if (v.vt != COM.VT_I4) return COM.E_INVALIDARG;
@@ -2688,13 +2688,13 @@ public class Accessible {
* Ownership of rgvar transfers from callee to caller so reference count on rgvar
* must be incremented before returning. The caller is responsible for releasing rgvar.
*/
- int Next(int celt, int /*long*/ rgvar, int /*long*/ pceltFetched) {
+ int Next(int celt, long /*int*/ rgvar, long /*int*/ pceltFetched) {
if (DEBUG) print(this + ".IEnumVARIANT::Next");
/* If there are no listeners, query the proxy for
* its IEnumVariant, and get the Next items from it.
*/
if (iaccessible != null && accessibleControlListeners.size() == 0) {
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
int code = iaccessible.QueryInterface(COM.IIDIEnumVARIANT, ppvObject);
if (code != COM.S_OK) return code;
IEnumVARIANT ienumvariant = new IEnumVARIANT(ppvObject[0]);
@@ -2762,7 +2762,7 @@ public class Accessible {
* for its IEnumVariant, and tell it to Skip.
*/
if (iaccessible != null && accessibleControlListeners.size() == 0) {
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
int code = iaccessible.QueryInterface(COM.IIDIEnumVARIANT, ppvObject);
if (code != COM.S_OK) return code;
IEnumVARIANT ienumvariant = new IEnumVARIANT(ppvObject[0]);
@@ -2787,7 +2787,7 @@ public class Accessible {
* for its IEnumVariant, and tell it to Reset.
*/
if (iaccessible != null && accessibleControlListeners.size() == 0) {
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
int code = (int)/*64*/iaccessible.QueryInterface(COM.IIDIEnumVARIANT, ppvObject);
if (code != COM.S_OK) return code;
IEnumVARIANT ienumvariant = new IEnumVARIANT(ppvObject[0]);
@@ -2804,17 +2804,17 @@ public class Accessible {
* Ownership of ppEnum transfers from callee to caller so reference count on ppEnum
* must be incremented before returning. The caller is responsible for releasing ppEnum.
*/
- int Clone(int /*long*/ ppEnum) {
+ int Clone(long /*int*/ ppEnum) {
if (DEBUG) print(this + ".IEnumVARIANT::Clone");
/* If there are no listeners, query the proxy for
* its IEnumVariant, and get the Clone from it.
*/
if (iaccessible != null && accessibleControlListeners.size() == 0) {
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
int code = iaccessible.QueryInterface(COM.IIDIEnumVARIANT, ppvObject);
if (code != COM.S_OK) return code;
IEnumVARIANT ienumvariant = new IEnumVARIANT(ppvObject[0]);
- int /*long*/ [] pEnum = new int /*long*/ [1];
+ long /*int*/ [] pEnum = new long /*int*/ [1];
code = ienumvariant.Clone(pEnum);
ienumvariant.Release();
COM.MoveMemory(ppEnum, pEnum, OS.PTR_SIZEOF);
@@ -2822,13 +2822,13 @@ public class Accessible {
}
if (ppEnum == 0) return COM.E_INVALIDARG;
- COM.MoveMemory(ppEnum, new int /*long*/[] { objIEnumVARIANT.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppEnum, new long /*int*/[] { objIEnumVARIANT.getAddress() }, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
/* IAccessible2::get_nRelations([out] pNRelations) */
- int get_nRelations(int /*long*/ pNRelations) {
+ int get_nRelations(long /*int*/ pNRelations) {
int count = getRelationCount();
if (DEBUG) print(this + ".IAccessible2::get_nRelations returning " + count + hresult(COM.S_OK));
COM.MoveMemory(pNRelations, new int [] { count }, 4);
@@ -2836,7 +2836,7 @@ public class Accessible {
}
/* IAccessible2::get_relation([in] relationIndex, [out] ppRelation) */
- int get_relation(int relationIndex, int /*long*/ ppRelation) {
+ int get_relation(int relationIndex, long /*int*/ ppRelation) {
int i = -1;
for (int type = 0; type < MAX_RELATION_TYPES; type++) {
Relation relation = (Relation)relations[type];
@@ -2844,7 +2844,7 @@ public class Accessible {
if (i == relationIndex) {
if (DEBUG) print(this + ".IAccessible2::get_relation(" + relationIndex + ") returning " + relation.getAddress() + hresult(COM.S_OK));
relation.AddRef();
- COM.MoveMemory(ppRelation, new int /*long*/[] { relation.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppRelation, new long /*int*/[] { relation.getAddress() }, OS.PTR_SIZEOF);
return COM.S_OK;
}
}
@@ -2853,14 +2853,14 @@ public class Accessible {
}
/* IAccessible2::get_relations([in] maxRelations, [out] ppRelations, [out] pNRelations) */
- int get_relations(int maxRelations, int /*long*/ ppRelations, int /*long*/ pNRelations) {
+ int get_relations(int maxRelations, long /*int*/ ppRelations, long /*int*/ pNRelations) {
int count = 0;
for (int type = 0; type < MAX_RELATION_TYPES; type++) {
if (count == maxRelations) break;
Relation relation = (Relation)relations[type];
if (relation != null) {
relation.AddRef();
- COM.MoveMemory(ppRelations + count * OS.PTR_SIZEOF, new int /*long*/[] { relation.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppRelations + count * OS.PTR_SIZEOF, new long /*int*/[] { relation.getAddress() }, OS.PTR_SIZEOF);
count++;
}
}
@@ -2870,7 +2870,7 @@ public class Accessible {
}
/* IAccessible2::get_role([out] pRole) */
- int get_role(int /*long*/ pRole) {
+ int get_role(long /*int*/ pRole) {
int role = getRole();
if (role == 0) role = getDefaultRole();
if (DEBUG) print(this + ".IAccessible2::get_role() returning " + getRoleString(role) + hresult(COM.S_OK));
@@ -2893,7 +2893,7 @@ public class Accessible {
}
/* IAccessible2::get_groupPosition([out] pGroupLevel, [out] pSimilarItemsInGroup, [out] pPositionInGroup) */
- int get_groupPosition(int /*long*/ pGroupLevel, int /*long*/ pSimilarItemsInGroup, int /*long*/ pPositionInGroup) {
+ int get_groupPosition(long /*int*/ pGroupLevel, long /*int*/ pSimilarItemsInGroup, long /*int*/ pPositionInGroup) {
// TODO: handle where possible - maybe add AccessibleGroup later
//get the role
//if it has role tree, then the level is the value else 0 (for N/A)
@@ -2925,7 +2925,7 @@ public class Accessible {
}
/* IAccessible2::get_states([out] pStates) */
- int get_states(int /*long*/ pStates) {
+ int get_states(long /*int*/ pStates) {
AccessibleControlEvent event = new AccessibleControlEvent(this);
event.childID = ACC.CHILDID_SELF;
for (int i = 0; i < accessibleControlListeners.size(); i++) {
@@ -2954,28 +2954,28 @@ public class Accessible {
}
/* IAccessible2::get_extendedRole([out] pbstrExtendedRole) */
- int get_extendedRole(int /*long*/ pbstrExtendedRole) {
+ int get_extendedRole(long /*int*/ pbstrExtendedRole) {
/* This feature is not supported. */
setString(pbstrExtendedRole, null);
return COM.S_FALSE;
}
/* IAccessible2::get_localizedExtendedRole([out] pbstrLocalizedExtendedRole) */
- int get_localizedExtendedRole(int /*long*/ pbstrLocalizedExtendedRole) {
+ int get_localizedExtendedRole(long /*int*/ pbstrLocalizedExtendedRole) {
/* This feature is not supported. */
setString(pbstrLocalizedExtendedRole, null);
return COM.S_FALSE;
}
/* IAccessible2::get_nExtendedStates([out] pNExtendedStates) */
- int get_nExtendedStates(int /*long*/ pNExtendedStates) {
+ int get_nExtendedStates(long /*int*/ pNExtendedStates) {
/* This feature is not supported. */
COM.MoveMemory(pNExtendedStates, new int [] { 0 }, 4);
return COM.S_OK;
}
/* IAccessible2::get_extendedStates([in] maxExtendedStates, [out] ppbstrExtendedStates, [out] pNExtendedStates) */
- int get_extendedStates(int maxExtendedStates, int /*long*/ ppbstrExtendedStates, int /*long*/ pNExtendedStates) {
+ int get_extendedStates(int maxExtendedStates, long /*int*/ ppbstrExtendedStates, long /*int*/ pNExtendedStates) {
/* This feature is not supported. */
setString(ppbstrExtendedStates, null);
COM.MoveMemory(pNExtendedStates, new int [] { 0 }, 4);
@@ -2983,7 +2983,7 @@ public class Accessible {
}
/* IAccessible2::get_localizedExtendedStates([in] maxLocalizedExtendedStates, [out] ppbstrLocalizedExtendedStates, [out] pNLocalizedExtendedStates) */
- int get_localizedExtendedStates(int maxLocalizedExtendedStates, int /*long*/ ppbstrLocalizedExtendedStates, int /*long*/ pNLocalizedExtendedStates) {
+ int get_localizedExtendedStates(int maxLocalizedExtendedStates, long /*int*/ ppbstrLocalizedExtendedStates, long /*int*/ pNLocalizedExtendedStates) {
/* This feature is not supported. */
setString(ppbstrLocalizedExtendedStates, null);
COM.MoveMemory(pNLocalizedExtendedStates, new int [] { 0 }, 4);
@@ -2991,22 +2991,22 @@ public class Accessible {
}
/* IAccessible2::get_uniqueID([out] pUniqueID) */
- int get_uniqueID(int /*long*/ pUniqueID) {
+ int get_uniqueID(long /*int*/ pUniqueID) {
if (uniqueID == -1) uniqueID = UniqueID--;
if (DEBUG) print(this + ".IAccessible2::get_uniqueID returning " + uniqueID + hresult(COM.S_OK));
- COM.MoveMemory(pUniqueID, new int /*long*/ [] { uniqueID }, 4);
+ COM.MoveMemory(pUniqueID, new long /*int*/ [] { uniqueID }, 4);
return COM.S_OK;
}
/* IAccessible2::get_windowHandle([out] pWindowHandle) */
- int get_windowHandle(int /*long*/ pWindowHandle) {
+ int get_windowHandle(long /*int*/ pWindowHandle) {
if (DEBUG) print(this + ".IAccessible2::get_windowHandle returning " + control.handle + hresult(COM.S_OK));
- COM.MoveMemory(pWindowHandle, new int /*long*/ [] { control.handle }, OS.PTR_SIZEOF);
+ COM.MoveMemory(pWindowHandle, new long /*int*/ [] { control.handle }, OS.PTR_SIZEOF);
return COM.S_OK;
}
/* IAccessible2::get_indexInParent([out] pIndexInParent) */
- int get_indexInParent(int /*long*/ pIndexInParent) {
+ int get_indexInParent(long /*int*/ pIndexInParent) {
AccessibleControlEvent event = new AccessibleControlEvent(this);
event.childID = ACC.CHILDID_CHILD_INDEX;
event.detail = -1;
@@ -3024,20 +3024,20 @@ public class Accessible {
// */
// // TODO: finish this. See also get_groupPosition
// this won't work because VARIANT.sizeof isn't big enough on 64-bit machines.
- // just create an int /*long*/ [] ppdispParent - it's not a variant anyhow...
-// int /*long*/ ppdispParent = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof);
+ // just create an long /*int*/ [] ppdispParent - it's not a variant anyhow...
+// long /*int*/ ppdispParent = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof);
// int code = get_accParent(ppdispParent);
// if (code == COM.S_OK) {
// VARIANT v = getVARIANT(ppdispParent);
// if (v.vt == COM.VT_DISPATCH) {
// IAccessible accParent = new IAccessible(v.lVal);
-// int /*long*/ pcountChildren = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, 4);
+// long /*int*/ pcountChildren = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, 4);
// code = accParent.get_accChildCount(pcountChildren);
// if (code == COM.S_OK) {
// int [] childCount = new int[1];
// OS.MoveMemory(childCount, pcountChildren, 4);
// int[] pcObtained = new int[1];
-// int /*long*/ rgVarChildren = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof * childCount[0]);
+// long /*int*/ rgVarChildren = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof * childCount[0]);
// System.out.println("Asking for AccessibleChildren");
// code = COM.AccessibleChildren(accParent.getAddress(), 0, childCount[0], rgVarChildren, pcObtained);
// if (code == COM.S_OK) {
@@ -3066,28 +3066,28 @@ public class Accessible {
}
/* IAccessible2::get_locale([out] pLocale) */
- int get_locale(int /*long*/ pLocale) {
+ int get_locale(long /*int*/ pLocale) {
/* Return the default locale for the JVM. */
Locale locale = Locale.getDefault();
char[] data = (locale.getLanguage()+"\0").toCharArray();
- int /*long*/ ptr = COM.SysAllocString(data);
- COM.MoveMemory(pLocale, new int /*long*/[] {ptr}, OS.PTR_SIZEOF);
+ long /*int*/ ptr = COM.SysAllocString(data);
+ COM.MoveMemory(pLocale, new long /*int*/[] {ptr}, OS.PTR_SIZEOF);
data = (locale.getCountry()+"\0").toCharArray();
ptr = COM.SysAllocString(data);
- COM.MoveMemory(pLocale + OS.PTR_SIZEOF, new int /*long*/[] {ptr}, OS.PTR_SIZEOF);
+ COM.MoveMemory(pLocale + OS.PTR_SIZEOF, new long /*int*/[] {ptr}, OS.PTR_SIZEOF);
data = (locale.getVariant()+"\0").toCharArray();
ptr = COM.SysAllocString(data);
- COM.MoveMemory(pLocale + 2 * OS.PTR_SIZEOF, new int /*long*/[] {ptr}, OS.PTR_SIZEOF);
+ COM.MoveMemory(pLocale + 2 * OS.PTR_SIZEOF, new long /*int*/[] {ptr}, OS.PTR_SIZEOF);
if (DEBUG) print(this + ".IAccessible2::get_locale() returning" + hresult(COM.S_OK));
return COM.S_OK;
}
/* IAccessible2::get_attributes([out] pbstrAttributes) */
- int get_attributes(int /*long*/ pbstrAttributes) {
+ int get_attributes(long /*int*/ pbstrAttributes) {
AccessibleAttributeEvent event = new AccessibleAttributeEvent(this);
for (int i = 0; i < accessibleAttributeListeners.size(); i++) {
AccessibleAttributeListener listener = (AccessibleAttributeListener) accessibleAttributeListeners.elementAt(i);
@@ -3123,7 +3123,7 @@ public class Accessible {
}
/* IAccessibleAction::get_nActions([out] pNActions) */
- int get_nActions(int /*long*/ pNActions) {
+ int get_nActions(long /*int*/ pNActions) {
AccessibleActionEvent event = new AccessibleActionEvent(this);
for (int i = 0; i < accessibleActionListeners.size(); i++) {
AccessibleActionListener listener = (AccessibleActionListener) accessibleActionListeners.elementAt(i);
@@ -3148,7 +3148,7 @@ public class Accessible {
}
/* IAccessibleAction::get_description([in] actionIndex, [out] pbstrDescription) */
- int get_description(int actionIndex, int /*long*/ pbstrDescription) {
+ int get_description(int actionIndex, long /*int*/ pbstrDescription) {
AccessibleActionEvent event = new AccessibleActionEvent(this);
event.index = actionIndex;
for (int i = 0; i < accessibleActionListeners.size(); i++) {
@@ -3162,7 +3162,7 @@ public class Accessible {
}
/* IAccessibleAction::get_keyBinding([in] actionIndex, [in] nMaxBindings, [out] ppbstrKeyBindings, [out] pNBindings) */
- int get_keyBinding(int actionIndex, int nMaxBindings, int /*long*/ ppbstrKeyBindings, int /*long*/ pNBindings) {
+ int get_keyBinding(int actionIndex, int nMaxBindings, long /*int*/ ppbstrKeyBindings, long /*int*/ pNBindings) {
AccessibleActionEvent event = new AccessibleActionEvent(this);
event.index = actionIndex;
for (int i = 0; i < accessibleActionListeners.size(); i++) {
@@ -3194,7 +3194,7 @@ public class Accessible {
}
/* IAccessibleAction::get_name([in] actionIndex, [out] pbstrName) */
- int get_name(int actionIndex, int /*long*/ pbstrName) {
+ int get_name(int actionIndex, long /*int*/ pbstrName) {
AccessibleActionEvent event = new AccessibleActionEvent(this);
event.index = actionIndex;
event.localized = false;
@@ -3212,7 +3212,7 @@ public class Accessible {
}
/* IAccessibleAction::get_localizedName([in] actionIndex, [out] pbstrLocalizedName) */
- int get_localizedName(int actionIndex, int /*long*/ pbstrLocalizedName) {
+ int get_localizedName(int actionIndex, long /*int*/ pbstrLocalizedName) {
AccessibleActionEvent event = new AccessibleActionEvent(this);
event.index = actionIndex;
event.localized = true;
@@ -3230,7 +3230,7 @@ public class Accessible {
}
/* IAccessibleApplication::get_appName([out] pbstrName) */
- int get_appName(int /*long*/ pbstrName) {
+ int get_appName(long /*int*/ pbstrName) {
String appName = Display.getAppName();
if (DEBUG) print(this + ".IAccessibleApplication::get_appName() returning " + appName + hresult(appName == null || appName.length() == 0 ? COM.S_FALSE : COM.S_OK));
if (appName == null || appName.length() == 0) {
@@ -3242,7 +3242,7 @@ public class Accessible {
}
/* IAccessibleApplication::get_appVersion([out] pbstrVersion) */
- int get_appVersion(int /*long*/ pbstrVersion) {
+ int get_appVersion(long /*int*/ pbstrVersion) {
String appVersion = Display.getAppVersion();
if (DEBUG) print(this + ".IAccessibleApplication::get_appVersion() returning" + appVersion + hresult(appVersion == null || appVersion.length() == 0 ? COM.S_FALSE : COM.S_OK));
if (appVersion == null || appVersion.length() == 0) {
@@ -3254,7 +3254,7 @@ public class Accessible {
}
/* IAccessibleApplication::get_toolkitName([out] pbstrName) */
- int get_toolkitName(int /*long*/ pbstrName) {
+ int get_toolkitName(long /*int*/ pbstrName) {
String toolkitName = "SWT";
if (DEBUG) print(this + ".IAccessibleApplication::get_toolkitName() returning" + toolkitName + hresult(COM.S_OK));
setString(pbstrName, toolkitName);
@@ -3262,7 +3262,7 @@ public class Accessible {
}
/* IAccessibleApplication::get_toolkitVersion([out] pbstrVersion) */
- int get_toolkitVersion(int /*long*/ pbstrVersion) {
+ int get_toolkitVersion(long /*int*/ pbstrVersion) {
String toolkitVersion = "" + SWT.getVersion(); //$NON-NLS-1$
if (DEBUG) print(this + ".IAccessibleApplication::get_toolkitVersion() returning" + toolkitVersion + hresult(COM.S_OK));
setString(pbstrVersion, toolkitVersion);
@@ -3271,7 +3271,7 @@ public class Accessible {
// The following 3 method are intentionally commented. We are not providing IAccessibleComponent at this time.
// /* IAccessibleComponent::get_locationInParent([out] pX, [out] pY) */
-// int get_locationInParent(int /*long*/ pX, int /*long*/ pY) {
+// int get_locationInParent(long /*int*/ pX, long /*int*/ pY) {
// if (DEBUG) print(this + ".IAccessibleComponent::get_locationInParent");
// // TO DO: support transparently (hard for lightweight parents - screen vs. parent coords)
// AccessibleControlEvent event = new AccessibleControlEvent(this);
@@ -3285,7 +3285,7 @@ public class Accessible {
// }
//
// /* IAccessibleComponent::get_foreground([out] pForeground) */
-// int get_foreground(int /*long*/ pForeground) {
+// int get_foreground(long /*int*/ pForeground) {
// Color color = control.getForeground();
// if (DEBUG) print(this + ".IAccessibleComponent::get_foreground returning " + color.handle);
// COM.MoveMemory(pForeground, new int [] { color.handle }, 4);
@@ -3293,7 +3293,7 @@ public class Accessible {
// }
//
// /* IAccessibleComponent::get_background([out] pBackground) */
-// int get_background(int /*long*/ pBackground) {
+// int get_background(long /*int*/ pBackground) {
// Color color = control.getBackground();
// if (DEBUG) print(this + ".IAccessibleComponent::get_background returning " + color.handle);
// COM.MoveMemory(pBackground, new int [] { color.handle }, 4);
@@ -3330,7 +3330,7 @@ public class Accessible {
}
/* IAccessibleEditableText::insertText([in] offset, [in] pbstrText) */
- int insertText(int offset, int /*long*/ pbstrText) {
+ int insertText(int offset, long /*int*/ pbstrText) {
if (DEBUG) print(this + ".IAccessibleEditableText::insertText, offset=" + offset + ", pbstrText=" + pbstrText);
AccessibleEditableTextEvent event = new AccessibleEditableTextEvent(this);
event.start = offset == COM.IA2_TEXT_OFFSET_LENGTH ? getCharacterCount() : offset;
@@ -3373,7 +3373,7 @@ public class Accessible {
}
/* IAccessibleEditableText::replaceText([in] startOffset, [in] endOffset, [in] pbstrText) */
- int replaceText(int startOffset, int endOffset, int /*long*/ pbstrText) {
+ int replaceText(int startOffset, int endOffset, long /*int*/ pbstrText) {
if (DEBUG) print(this + ".IAccessibleEditableText::replaceText, start=" + startOffset + ", end=" + endOffset + ", pbstrText=" + pbstrText);
AccessibleEditableTextEvent event = new AccessibleEditableTextEvent(this);
event.start = startOffset == COM.IA2_TEXT_OFFSET_LENGTH ? getCharacterCount() : startOffset;
@@ -3388,7 +3388,7 @@ public class Accessible {
}
/* IAccessibleEditableText::setAttributes([in] startOffset, [in] endOffset, [in] pbstrAttributes) */
- int setAttributes(int startOffset, int endOffset, int /*long*/ pbstrAttributes) {
+ int setAttributes(int startOffset, int endOffset, long /*int*/ pbstrAttributes) {
if (DEBUG) print(this + ".IAccessibleEditableText::setAttributes, start=" + startOffset + ", end=" + endOffset + ", pbstrAttributes=" + pbstrAttributes);
AccessibleTextAttributeEvent event = new AccessibleTextAttributeEvent(this);
String string = getString(pbstrAttributes);
@@ -3496,7 +3496,7 @@ public class Accessible {
}
/* IAccessibleHyperlink::get_anchor([in] index, [out] pAnchor) */
- int get_anchor(int index, int /*long*/ pAnchor) {
+ int get_anchor(int index, long /*int*/ pAnchor) {
if (DEBUG) print(this + ".IAccessibleHyperlink::get_anchor");
AccessibleHyperlinkEvent event = new AccessibleHyperlinkEvent(this);
event.index = index;
@@ -3516,7 +3516,7 @@ public class Accessible {
}
/* IAccessibleHyperlink::get_anchorTarget([in] index, [out] pAnchorTarget) */
- int get_anchorTarget(int index, int /*long*/ pAnchorTarget) {
+ int get_anchorTarget(int index, long /*int*/ pAnchorTarget) {
if (DEBUG) print(this + ".IAccessibleHyperlink::get_anchorTarget");
AccessibleHyperlinkEvent event = new AccessibleHyperlinkEvent(this);
event.index = index;
@@ -3536,7 +3536,7 @@ public class Accessible {
}
/* IAccessibleHyperlink::get_startIndex([out] pIndex) */
- int get_startIndex(int /*long*/ pIndex) {
+ int get_startIndex(long /*int*/ pIndex) {
if (DEBUG) print(this + ".IAccessibleHyperlink::get_startIndex");
AccessibleHyperlinkEvent event = new AccessibleHyperlinkEvent(this);
for (int i = 0; i < accessibleHyperlinkListeners.size(); i++) {
@@ -3548,7 +3548,7 @@ public class Accessible {
}
/* IAccessibleHyperlink::get_endIndex([out] pIndex) */
- int get_endIndex(int /*long*/ pIndex) {
+ int get_endIndex(long /*int*/ pIndex) {
if (DEBUG) print(this + ".IAccessibleHyperlink::get_endIndex");
AccessibleHyperlinkEvent event = new AccessibleHyperlinkEvent(this);
for (int i = 0; i < accessibleHyperlinkListeners.size(); i++) {
@@ -3560,13 +3560,13 @@ public class Accessible {
}
/* IAccessibleHyperlink::get_valid([out] pValid) */
- int get_valid(int /*long*/ pValid) {
+ int get_valid(long /*int*/ pValid) {
/* Deprecated. */
return COM.E_NOTIMPL;
}
/* IAccessibleHypertext::get_nHyperlinks([out] pHyperlinkCount) */
- int get_nHyperlinks(int /*long*/ pHyperlinkCount) {
+ int get_nHyperlinks(long /*int*/ pHyperlinkCount) {
if (DEBUG) print(this + ".IAccessibleHypertext::get_nHyperlinks");
AccessibleTextEvent event = new AccessibleTextEvent(this);
for (int i = 0; i < accessibleTextExtendedListeners.size(); i++) {
@@ -3578,7 +3578,7 @@ public class Accessible {
}
/* IAccessibleHypertext::get_hyperlink([in] index, [out] ppHyperlink) */
- int get_hyperlink(int index, int /*long*/ ppHyperlink) {
+ int get_hyperlink(int index, long /*int*/ ppHyperlink) {
if (DEBUG) print(this + ".IAccessibleHypertext::get_hyperlink");
AccessibleTextEvent event = new AccessibleTextEvent(this);
event.index = index;
@@ -3592,12 +3592,12 @@ public class Accessible {
return COM.E_INVALIDARG;
}
accessible.AddRef();
- COM.MoveMemory(ppHyperlink, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppHyperlink, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
return COM.S_OK;
}
/* IAccessibleHypertext::get_hyperlinkIndex([in] charIndex, [out] pHyperlinkIndex) */
- int get_hyperlinkIndex(int charIndex, int /*long*/ pHyperlinkIndex) {
+ int get_hyperlinkIndex(int charIndex, long /*int*/ pHyperlinkIndex) {
if (DEBUG) print(this + ".IAccessibleHypertext::get_hyperlinkIndex");
AccessibleTextEvent event = new AccessibleTextEvent(this);
event.offset = charIndex;
@@ -3613,7 +3613,7 @@ public class Accessible {
// The following 3 method are intentionally commented. We are not providing IAccessibleImage at this time.
// /* IAccessibleImage::get_description([out] pbstrDescription) */
-// int get_description(int /*long*/ pbstrDescription) {
+// int get_description(long /*int*/ pbstrDescription) {
// if (DEBUG) print(this + ".IAccessibleImage::get_description");
// // TO DO: Does it make sense to just reuse description?
// AccessibleEvent event = new AccessibleEvent(this);
@@ -3628,7 +3628,7 @@ public class Accessible {
// }
//
// /* IAccessibleImage::get_imagePosition([in] coordinateType, [out] pX, [out] pY) */
-// int get_imagePosition(int coordinateType, int /*long*/ pX, int /*long*/ pY) {
+// int get_imagePosition(int coordinateType, long /*int*/ pX, long /*int*/ pY) {
// if (DEBUG) print(this + ".IAccessibleImage::get_imagePosition");
// // TO DO: does it make sense to just reuse getLocation?
// AccessibleControlEvent event = new AccessibleControlEvent(this);
@@ -3643,7 +3643,7 @@ public class Accessible {
// }
//
// /* IAccessibleImage::get_imageSize([out] pHeight, [out] pWidth) */
-// int get_imageSize(int /*long*/ pHeight, int /*long*/ pWidth) {
+// int get_imageSize(long /*int*/ pHeight, long /*int*/ pWidth) {
// if (DEBUG) print(this + ".IAccessibleImage::get_imageSize");
// // TO DO: does it make sense to just reuse getLocation?
// AccessibleControlEvent event = new AccessibleControlEvent(this);
@@ -3657,7 +3657,7 @@ public class Accessible {
// }
/* IAccessibleTable2::get_cellAt([in] row, [in] column, [out] ppCell) */
- int get_cellAt(int row, int column, int /*long*/ ppCell) {
+ int get_cellAt(int row, int column, long /*int*/ ppCell) {
AccessibleTableEvent event = new AccessibleTableEvent(this);
event.row = row;
event.column = column;
@@ -3669,12 +3669,12 @@ public class Accessible {
if (DEBUG) print(this + ".IAccessibleTable2::get_cellAt(row=" + row + ", column=" + column + ") returning " + accessible);
if (accessible == null) return COM.E_INVALIDARG;
accessible.AddRef();
- COM.MoveMemory(ppCell, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppCell, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
return COM.S_OK;
}
/* IAccessibleTable2::get_caption([out] ppAccessible) */
- int get_caption(int /*long*/ ppAccessible) {
+ int get_caption(long /*int*/ ppAccessible) {
AccessibleTableEvent event = new AccessibleTableEvent(this);
for (int i = 0; i < accessibleTableListeners.size(); i++) {
AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i);
@@ -3683,16 +3683,16 @@ public class Accessible {
Accessible accessible = event.accessible;
if (DEBUG) print(this + ".IAccessibleTable2::get_caption() returning " + accessible);
if (accessible == null) {
- COM.MoveMemory(ppAccessible, new int /*long*/[] { 0 }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppAccessible, new long /*int*/[] { 0 }, OS.PTR_SIZEOF);
return COM.S_FALSE;
}
accessible.AddRef();
- COM.MoveMemory(ppAccessible, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppAccessible, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
return COM.S_OK;
}
/* IAccessibleTable2::get_columnDescription([in] column, [out] pbstrDescription) */
- int get_columnDescription(int column, int /*long*/ pbstrDescription) {
+ int get_columnDescription(int column, long /*int*/ pbstrDescription) {
AccessibleTableEvent event = new AccessibleTableEvent(this);
event.column = column;
for (int i = 0; i < accessibleTableListeners.size(); i++) {
@@ -3706,7 +3706,7 @@ public class Accessible {
}
/* IAccessibleTable2::get_nColumns([out] pColumnCount) */
- int get_nColumns(int /*long*/ pColumnCount) {
+ int get_nColumns(long /*int*/ pColumnCount) {
AccessibleTableEvent event = new AccessibleTableEvent(this);
for (int i = 0; i < accessibleTableListeners.size(); i++) {
AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i);
@@ -3718,7 +3718,7 @@ public class Accessible {
}
/* IAccessibleTable2::get_nRows([out] pRowCount) */
- int get_nRows(int /*long*/ pRowCount) {
+ int get_nRows(long /*int*/ pRowCount) {
AccessibleTableEvent event = new AccessibleTableEvent(this);
for (int i = 0; i < accessibleTableListeners.size(); i++) {
AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i);
@@ -3730,7 +3730,7 @@ public class Accessible {
}
/* IAccessibleTable2::get_nSelectedCells([out] pCellCount) */
- int get_nSelectedCells(int /*long*/ pCellCount) {
+ int get_nSelectedCells(long /*int*/ pCellCount) {
AccessibleTableEvent event = new AccessibleTableEvent(this);
for (int i = 0; i < accessibleTableListeners.size(); i++) {
AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i);
@@ -3742,7 +3742,7 @@ public class Accessible {
}
/* IAccessibleTable2::get_nSelectedColumns([out] pColumnCount) */
- int get_nSelectedColumns(int /*long*/ pColumnCount) {
+ int get_nSelectedColumns(long /*int*/ pColumnCount) {
AccessibleTableEvent event = new AccessibleTableEvent(this);
for (int i = 0; i < accessibleTableListeners.size(); i++) {
AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i);
@@ -3754,7 +3754,7 @@ public class Accessible {
}
/* IAccessibleTable2::get_nSelectedRows([out] pRowCount) */
- int get_nSelectedRows(int /*long*/ pRowCount) {
+ int get_nSelectedRows(long /*int*/ pRowCount) {
AccessibleTableEvent event = new AccessibleTableEvent(this);
for (int i = 0; i < accessibleTableListeners.size(); i++) {
AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i);
@@ -3766,7 +3766,7 @@ public class Accessible {
}
/* IAccessibleTable2::get_rowDescription([in] row, [out] pbstrDescription) */
- int get_rowDescription(int row, int /*long*/ pbstrDescription) {
+ int get_rowDescription(int row, long /*int*/ pbstrDescription) {
AccessibleTableEvent event = new AccessibleTableEvent(this);
event.row = row;
for (int i = 0; i < accessibleTableListeners.size(); i++) {
@@ -3780,7 +3780,7 @@ public class Accessible {
}
/* IAccessibleTable2::get_selectedCells([out] ppCells, [out] pNSelectedCells) */
- int get_selectedCells(int /*long*/ ppCells, int /*long*/ pNSelectedCells) {
+ int get_selectedCells(long /*int*/ ppCells, long /*int*/ pNSelectedCells) {
AccessibleTableEvent event = new AccessibleTableEvent(this);
for (int i = 0; i < accessibleTableListeners.size(); i++) {
AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i);
@@ -3788,28 +3788,28 @@ public class Accessible {
}
if (DEBUG) print(this + ".IAccessibleTable2::get_selectedCells() returning " + (event.accessibles == null ? "null" : "accessibles[" + event.accessibles.length + "]"));
if (event.accessibles == null || event.accessibles.length == 0) {
- COM.MoveMemory(ppCells, new int /*long*/[] { 0 }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppCells, new long /*int*/[] { 0 }, OS.PTR_SIZEOF);
COM.MoveMemory(pNSelectedCells, new int [] { 0 }, 4);
return COM.S_FALSE;
}
int length = event.accessibles.length;
- int /*long*/ pv = COM.CoTaskMemAlloc(length * OS.PTR_SIZEOF);
+ long /*int*/ pv = COM.CoTaskMemAlloc(length * OS.PTR_SIZEOF);
int count = 0;
for (int i = 0; i < length; i++) {
Accessible accessible = event.accessibles[i];
if (accessible != null) {
accessible.AddRef();
- COM.MoveMemory(pv + i * OS.PTR_SIZEOF, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(pv + i * OS.PTR_SIZEOF, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
count++;
}
}
- COM.MoveMemory(ppCells, new int /*long*/ [] { pv }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppCells, new long /*int*/ [] { pv }, OS.PTR_SIZEOF);
COM.MoveMemory(pNSelectedCells, new int [] { count }, 4);
return COM.S_OK;
}
/* IAccessibleTable2::get_selectedColumns([out] ppSelectedColumns, [out] pNColumns) */
- int get_selectedColumns(int /*long*/ ppSelectedColumns, int /*long*/ pNColumns) {
+ int get_selectedColumns(long /*int*/ ppSelectedColumns, long /*int*/ pNColumns) {
AccessibleTableEvent event = new AccessibleTableEvent(this);
for (int i = 0; i < accessibleTableListeners.size(); i++) {
AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i);
@@ -3818,19 +3818,19 @@ public class Accessible {
int count = event.selected == null ? 0 : event.selected.length;
if (DEBUG) print(this + ".IAccessibleTable2::get_selectedColumns() returning " + (count == 0 ? "null" : "selected[" + count + "]"));
if (count == 0) {
- COM.MoveMemory(ppSelectedColumns, new int /*long*/[] { 0 }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppSelectedColumns, new long /*int*/[] { 0 }, OS.PTR_SIZEOF);
COM.MoveMemory(pNColumns, new int [] { 0 }, 4);
return COM.S_FALSE;
}
- int /*long*/ pv = COM.CoTaskMemAlloc(count * 4);
+ long /*int*/ pv = COM.CoTaskMemAlloc(count * 4);
COM.MoveMemory(pv, event.selected, count * 4);
- COM.MoveMemory(ppSelectedColumns, new int /*long*/ [] { pv }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppSelectedColumns, new long /*int*/ [] { pv }, OS.PTR_SIZEOF);
COM.MoveMemory(pNColumns, new int [] { count }, 4);
return COM.S_OK;
}
/* IAccessibleTable2::get_selectedRows([out] ppSelectedRows, [out] pNRows) */
- int get_selectedRows(int /*long*/ ppSelectedRows, int /*long*/ pNRows) {
+ int get_selectedRows(long /*int*/ ppSelectedRows, long /*int*/ pNRows) {
AccessibleTableEvent event = new AccessibleTableEvent(this);
for (int i = 0; i < accessibleTableListeners.size(); i++) {
AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i);
@@ -3839,19 +3839,19 @@ public class Accessible {
int count = event.selected == null ? 0 : event.selected.length;
if (DEBUG) print(this + ".IAccessibleTable2::get_selectedRows() returning " + (count == 0 ? "null" : "selected[" + count + "]"));
if (count == 0) {
- COM.MoveMemory(ppSelectedRows, new int /*long*/[] { 0 }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppSelectedRows, new long /*int*/[] { 0 }, OS.PTR_SIZEOF);
COM.MoveMemory(pNRows, new int [] { 0 }, 4);
return COM.S_FALSE;
}
- int /*long*/ pv = COM.CoTaskMemAlloc(count * 4);
+ long /*int*/ pv = COM.CoTaskMemAlloc(count * 4);
COM.MoveMemory(pv, event.selected, count * 4);
- COM.MoveMemory(ppSelectedRows, new int /*long*/ [] { pv }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppSelectedRows, new long /*int*/ [] { pv }, OS.PTR_SIZEOF);
COM.MoveMemory(pNRows, new int [] { count }, 4);
return COM.S_OK;
}
/* IAccessibleTable2::get_summary([out] ppAccessible) */
- int get_summary(int /*long*/ ppAccessible) {
+ int get_summary(long /*int*/ ppAccessible) {
AccessibleTableEvent event = new AccessibleTableEvent(this);
for (int i = 0; i < accessibleTableListeners.size(); i++) {
AccessibleTableListener listener = (AccessibleTableListener) accessibleTableListeners.elementAt(i);
@@ -3860,16 +3860,16 @@ public class Accessible {
Accessible accessible = event.accessible;
if (DEBUG) print(this + ".IAccessibleTable2::get_summary() returning " + accessible);
if (accessible == null) {
- COM.MoveMemory(ppAccessible, new int /*long*/[] { 0 }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppAccessible, new long /*int*/[] { 0 }, OS.PTR_SIZEOF);
return COM.S_FALSE;
}
accessible.AddRef();
- COM.MoveMemory(ppAccessible, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppAccessible, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
return COM.S_OK;
}
/* IAccessibleTable2::get_isColumnSelected([in] column, [out] pIsSelected) */
- int get_isColumnSelected(int column, int /*long*/ pIsSelected) {
+ int get_isColumnSelected(int column, long /*int*/ pIsSelected) {
AccessibleTableEvent event = new AccessibleTableEvent(this);
event.column = column;
for (int i = 0; i < accessibleTableListeners.size(); i++) {
@@ -3882,7 +3882,7 @@ public class Accessible {
}
/* IAccessibleTable2::get_isRowSelected([in] row, [out] pIsSelected) */
- int get_isRowSelected(int row, int /*long*/ pIsSelected) {
+ int get_isRowSelected(int row, long /*int*/ pIsSelected) {
AccessibleTableEvent event = new AccessibleTableEvent(this);
event.row = row;
for (int i = 0; i < accessibleTableListeners.size(); i++) {
@@ -3947,10 +3947,10 @@ public class Accessible {
}
/* IAccessibleTable2::get_modelChange([out] pModelChange) */
- int get_modelChange(int /*long*/ pModelChange) {
+ int get_modelChange(long /*int*/ pModelChange) {
if (DEBUG) print(this + ".IAccessibleTable2::get_modelChange() returning " + (tableChange == null ? "null" : "tableChange=" + tableChange[0] + ", " + tableChange[1] + ", " + tableChange[2] + ", " + tableChange[3]));
if (tableChange == null) {
- COM.MoveMemory(pModelChange, new int /*long*/ [] { 0 }, OS.PTR_SIZEOF);
+ COM.MoveMemory(pModelChange, new long /*int*/ [] { 0 }, OS.PTR_SIZEOF);
return COM.S_FALSE;
}
COM.MoveMemory(pModelChange, tableChange, tableChange.length * 4);
@@ -3958,7 +3958,7 @@ public class Accessible {
}
/* IAccessibleTableCell::get_columnExtent([out] pNColumnsSpanned) */
- int get_columnExtent(int /*long*/ pNColumnsSpanned) {
+ int get_columnExtent(long /*int*/ pNColumnsSpanned) {
AccessibleTableCellEvent event = new AccessibleTableCellEvent(this);
for (int i = 0; i < accessibleTableCellListeners.size(); i++) {
AccessibleTableCellListener listener = (AccessibleTableCellListener) accessibleTableCellListeners.elementAt(i);
@@ -3970,7 +3970,7 @@ public class Accessible {
}
/* IAccessibleTableCell::get_columnHeaderCells([out] ppCellAccessibles, [out] pNColumnHeaderCells) */
- int get_columnHeaderCells(int /*long*/ ppCellAccessibles, int /*long*/ pNColumnHeaderCells) {
+ int get_columnHeaderCells(long /*int*/ ppCellAccessibles, long /*int*/ pNColumnHeaderCells) {
AccessibleTableCellEvent event = new AccessibleTableCellEvent(this);
for (int i = 0; i < accessibleTableCellListeners.size(); i++) {
AccessibleTableCellListener listener = (AccessibleTableCellListener) accessibleTableCellListeners.elementAt(i);
@@ -3978,28 +3978,28 @@ public class Accessible {
}
if (DEBUG) print(this + ".IAccessibleTableCell::get_columnHeaderCells() returning " + (event.accessibles == null ? "null" : "accessibles[" + event.accessibles.length + "]"));
if (event.accessibles == null || event.accessibles.length == 0) {
- COM.MoveMemory(ppCellAccessibles, new int /*long*/[] { 0 }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppCellAccessibles, new long /*int*/[] { 0 }, OS.PTR_SIZEOF);
COM.MoveMemory(pNColumnHeaderCells, new int [] { 0 }, 4);
return COM.S_FALSE;
}
int length = event.accessibles.length;
- int /*long*/ pv = COM.CoTaskMemAlloc(length * OS.PTR_SIZEOF);
+ long /*int*/ pv = COM.CoTaskMemAlloc(length * OS.PTR_SIZEOF);
int count = 0;
for (int i = 0; i < length; i++) {
Accessible accessible = event.accessibles[i];
if (accessible != null) {
accessible.AddRef();
- COM.MoveMemory(pv + i * OS.PTR_SIZEOF, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(pv + i * OS.PTR_SIZEOF, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
count++;
}
}
- COM.MoveMemory(ppCellAccessibles, new int /*long*/ [] { pv }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppCellAccessibles, new long /*int*/ [] { pv }, OS.PTR_SIZEOF);
COM.MoveMemory(pNColumnHeaderCells, new int [] { count }, 4);
return COM.S_OK;
}
/* IAccessibleTableCell::get_columnIndex([out] pColumnIndex) */
- int get_columnIndex(int /*long*/ pColumnIndex) {
+ int get_columnIndex(long /*int*/ pColumnIndex) {
AccessibleTableCellEvent event = new AccessibleTableCellEvent(this);
for (int i = 0; i < accessibleTableCellListeners.size(); i++) {
AccessibleTableCellListener listener = (AccessibleTableCellListener) accessibleTableCellListeners.elementAt(i);
@@ -4011,7 +4011,7 @@ public class Accessible {
}
/* IAccessibleTableCell::get_rowExtent([out] pNRowsSpanned) */
- int get_rowExtent(int /*long*/ pNRowsSpanned) {
+ int get_rowExtent(long /*int*/ pNRowsSpanned) {
AccessibleTableCellEvent event = new AccessibleTableCellEvent(this);
for (int i = 0; i < accessibleTableCellListeners.size(); i++) {
AccessibleTableCellListener listener = (AccessibleTableCellListener) accessibleTableCellListeners.elementAt(i);
@@ -4023,7 +4023,7 @@ public class Accessible {
}
/* IAccessibleTableCell::get_rowHeaderCells([out] ppCellAccessibles, [out] pNRowHeaderCells) */
- int get_rowHeaderCells(int /*long*/ ppCellAccessibles, int /*long*/ pNRowHeaderCells) {
+ int get_rowHeaderCells(long /*int*/ ppCellAccessibles, long /*int*/ pNRowHeaderCells) {
AccessibleTableCellEvent event = new AccessibleTableCellEvent(this);
for (int i = 0; i < accessibleTableCellListeners.size(); i++) {
AccessibleTableCellListener listener = (AccessibleTableCellListener) accessibleTableCellListeners.elementAt(i);
@@ -4031,28 +4031,28 @@ public class Accessible {
}
if (DEBUG) print(this + ".IAccessibleTableCell::get_rowHeaderCells() returning " + (event.accessibles == null ? "null" : "accessibles[" + event.accessibles.length + "]"));
if (event.accessibles == null || event.accessibles.length == 0) {
- COM.MoveMemory(ppCellAccessibles, new int /*long*/[] { 0 }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppCellAccessibles, new long /*int*/[] { 0 }, OS.PTR_SIZEOF);
COM.MoveMemory(pNRowHeaderCells, new int [] { 0 }, 4);
return COM.S_FALSE;
}
int length = event.accessibles.length;
- int /*long*/ pv = COM.CoTaskMemAlloc(length * OS.PTR_SIZEOF);
+ long /*int*/ pv = COM.CoTaskMemAlloc(length * OS.PTR_SIZEOF);
int count = 0;
for (int i = 0; i < length; i++) {
Accessible accessible = event.accessibles[i];
if (accessible != null) {
accessible.AddRef();
- COM.MoveMemory(pv + i * OS.PTR_SIZEOF, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(pv + i * OS.PTR_SIZEOF, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
count++;
}
}
- COM.MoveMemory(ppCellAccessibles, new int /*long*/ [] { pv }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppCellAccessibles, new long /*int*/ [] { pv }, OS.PTR_SIZEOF);
COM.MoveMemory(pNRowHeaderCells, new int [] { count }, 4);
return COM.S_OK;
}
/* IAccessibleTableCell::get_rowIndex([out] pRowIndex) */
- int get_rowIndex(int /*long*/ pRowIndex) {
+ int get_rowIndex(long /*int*/ pRowIndex) {
AccessibleTableCellEvent event = new AccessibleTableCellEvent(this);
for (int i = 0; i < accessibleTableCellListeners.size(); i++) {
AccessibleTableCellListener listener = (AccessibleTableCellListener) accessibleTableCellListeners.elementAt(i);
@@ -4064,7 +4064,7 @@ public class Accessible {
}
/* IAccessibleTableCell::get_isSelected([out] pIsSelected) */
- int get_isSelected(int /*long*/ pIsSelected) {
+ int get_isSelected(long /*int*/ pIsSelected) {
AccessibleTableCellEvent event = new AccessibleTableCellEvent(this);
for (int i = 0; i < accessibleTableCellListeners.size(); i++) {
AccessibleTableCellListener listener = (AccessibleTableCellListener) accessibleTableCellListeners.elementAt(i);
@@ -4076,7 +4076,7 @@ public class Accessible {
}
/* IAccessibleTableCell::get_rowColumnExtents([out] pRow, [out] pColumn, [out] pRowExtents, [out] pColumnExtents, [out] pIsSelected) */
- int get_rowColumnExtents(int /*long*/ pRow, int /*long*/ pColumn, int /*long*/ pRowExtents, int /*long*/ pColumnExtents, int /*long*/ pIsSelected) {
+ int get_rowColumnExtents(long /*int*/ pRow, long /*int*/ pColumn, long /*int*/ pRowExtents, long /*int*/ pColumnExtents, long /*int*/ pIsSelected) {
if (DEBUG) print(this + ".IAccessibleTableCell::get_rowColumnExtents");
// TODO: should we implement this? It is just a convenience function.
return COM.DISP_E_MEMBERNOTFOUND;
@@ -4093,7 +4093,7 @@ public class Accessible {
}
/* IAccessibleTableCell::get_table([out] ppTable) */
- int get_table(int /*long*/ ppTable) {
+ int get_table(long /*int*/ ppTable) {
AccessibleTableCellEvent event = new AccessibleTableCellEvent(this);
for (int i = 0; i < accessibleTableCellListeners.size(); i++) {
AccessibleTableCellListener listener = (AccessibleTableCellListener) accessibleTableCellListeners.elementAt(i);
@@ -4103,11 +4103,11 @@ public class Accessible {
if (DEBUG) print(this + ".IAccessibleTableCell::get_table() returning " + accessible);
if (accessible == null) {
// TODO: This is not supposed to return S_FALSE. We need to lookup the table role parent and return that.
- COM.MoveMemory(ppTable, new int /*long*/[] { 0 }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppTable, new long /*int*/[] { 0 }, OS.PTR_SIZEOF);
return COM.S_FALSE;
}
accessible.AddRef();
- COM.MoveMemory(ppTable, new int /*long*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppTable, new long /*int*/[] { accessible.getAddress() }, OS.PTR_SIZEOF);
return COM.S_OK;
}
@@ -4126,7 +4126,7 @@ public class Accessible {
}
/* IAccessibleText::get_attributes([in] offset, [out] pStartOffset, [out] pEndOffset, [out] pbstrTextAttributes) */
- int get_attributes(int offset, int /*long*/ pStartOffset, int /*long*/ pEndOffset, int /*long*/ pbstrTextAttributes) {
+ int get_attributes(int offset, long /*int*/ pStartOffset, long /*int*/ pEndOffset, long /*int*/ pbstrTextAttributes) {
AccessibleTextAttributeEvent event = new AccessibleTextAttributeEvent(this);
event.offset = offset == COM.IA2_TEXT_OFFSET_LENGTH ? getCharacterCount() : offset;
for (int i = 0; i < accessibleAttributeListeners.size(); i++) {
@@ -4187,7 +4187,7 @@ public class Accessible {
}
/* IAccessibleText::get_caretOffset([out] pOffset) */
- int get_caretOffset(int /*long*/ pOffset) {
+ int get_caretOffset(long /*int*/ pOffset) {
int offset = getCaretOffset();
if (DEBUG) print(this + ".IAccessibleText::get_caretOffset returning " + offset + hresult(offset == -1 ? COM.S_FALSE : COM.S_OK));
COM.MoveMemory(pOffset, new int [] { offset }, 4);
@@ -4196,7 +4196,7 @@ public class Accessible {
}
/* IAccessibleText::get_characterExtents([in] offset, [in] coordType, [out] pX, [out] pY, [out] pWidth, [out] pHeight) */
- int get_characterExtents(int offset, int coordType, int /*long*/ pX, int /*long*/ pY, int /*long*/ pWidth, int /*long*/ pHeight) {
+ int get_characterExtents(int offset, int coordType, long /*int*/ pX, long /*int*/ pY, long /*int*/ pWidth, long /*int*/ pHeight) {
int length = getCharacterCount();
AccessibleTextEvent event = new AccessibleTextEvent(this);
event.start = offset == COM.IA2_TEXT_OFFSET_LENGTH ? length : offset < 0 ? 0 : offset;
@@ -4216,7 +4216,7 @@ public class Accessible {
}
/* IAccessibleText::get_nSelections([out] pNSelections) */
- int get_nSelections(int /*long*/ pNSelections) {
+ int get_nSelections(long /*int*/ pNSelections) {
AccessibleTextEvent event = new AccessibleTextEvent(this);
event.count = -1;
for (int i = 0; i < accessibleTextExtendedListeners.size(); i++) {
@@ -4239,7 +4239,7 @@ public class Accessible {
}
/* IAccessibleText::get_offsetAtPoint([in] x, [in] y, [in] coordType, [out] pOffset) */
- int get_offsetAtPoint(int x, int y, int coordType, int /*long*/ pOffset) {
+ int get_offsetAtPoint(int x, int y, int coordType, long /*int*/ pOffset) {
AccessibleTextEvent event = new AccessibleTextEvent(this);
event.x = x;
event.y = y;
@@ -4259,7 +4259,7 @@ public class Accessible {
}
/* IAccessibleText::get_selection([in] selectionIndex, [out] pStartOffset, [out] pEndOffset) */
- int get_selection(int selectionIndex, int /*long*/ pStartOffset, int /*long*/ pEndOffset) {
+ int get_selection(int selectionIndex, long /*int*/ pStartOffset, long /*int*/ pEndOffset) {
AccessibleTextEvent event = new AccessibleTextEvent(this);
event.index = selectionIndex;
event.start = -1;
@@ -4291,7 +4291,7 @@ public class Accessible {
}
/* IAccessibleText::get_text([in] startOffset, [in] endOffset, [out] pbstrText) */
- int get_text(int startOffset, int endOffset, int /*long*/ pbstrText) {
+ int get_text(int startOffset, int endOffset, long /*int*/ pbstrText) {
AccessibleTextEvent event = new AccessibleTextEvent(this);
event.start = startOffset == COM.IA2_TEXT_OFFSET_LENGTH ? getCharacterCount() : startOffset;
event.end = endOffset == COM.IA2_TEXT_OFFSET_LENGTH ? getCharacterCount() : endOffset;
@@ -4327,7 +4327,7 @@ public class Accessible {
}
/* IAccessibleText::get_textBeforeOffset([in] offset, [in] boundaryType, [out] pStartOffset, [out] pEndOffset, [out] pbstrText) */
- int get_textBeforeOffset(int offset, int boundaryType, int /*long*/ pStartOffset, int /*long*/ pEndOffset, int /*long*/ pbstrText) {
+ int get_textBeforeOffset(int offset, int boundaryType, long /*int*/ pStartOffset, long /*int*/ pEndOffset, long /*int*/ pbstrText) {
AccessibleTextEvent event = new AccessibleTextEvent(this);
int charCount = getCharacterCount();
event.start = offset == COM.IA2_TEXT_OFFSET_LENGTH ? charCount : offset == COM.IA2_TEXT_OFFSET_CARET ? getCaretOffset() : offset;
@@ -4380,7 +4380,7 @@ public class Accessible {
}
/* IAccessibleText::get_textAfterOffset([in] offset, [in] boundaryType, [out] pStartOffset, [out] pEndOffset, [out] pbstrText) */
- int get_textAfterOffset(int offset, int boundaryType, int /*long*/ pStartOffset, int /*long*/ pEndOffset, int /*long*/ pbstrText) {
+ int get_textAfterOffset(int offset, int boundaryType, long /*int*/ pStartOffset, long /*int*/ pEndOffset, long /*int*/ pbstrText) {
AccessibleTextEvent event = new AccessibleTextEvent(this);
int charCount = getCharacterCount();
event.start = offset == COM.IA2_TEXT_OFFSET_LENGTH ? charCount : offset == COM.IA2_TEXT_OFFSET_CARET ? getCaretOffset() : offset;
@@ -4433,7 +4433,7 @@ public class Accessible {
}
/* IAccessibleText::get_textAtOffset([in] offset, [in] boundaryType, [out] pStartOffset, [out] pEndOffset, [out] pbstrText) */
- int get_textAtOffset(int offset, int boundaryType, int /*long*/ pStartOffset, int /*long*/ pEndOffset, int /*long*/ pbstrText) {
+ int get_textAtOffset(int offset, int boundaryType, long /*int*/ pStartOffset, long /*int*/ pEndOffset, long /*int*/ pbstrText) {
AccessibleTextEvent event = new AccessibleTextEvent(this);
int charCount = getCharacterCount();
event.start = offset == COM.IA2_TEXT_OFFSET_LENGTH ? charCount : offset == COM.IA2_TEXT_OFFSET_CARET ? getCaretOffset() : offset;
@@ -4534,7 +4534,7 @@ public class Accessible {
}
/* IAccessibleText::get_nCharacters([out] pNCharacters) */
- int get_nCharacters(int /*long*/ pNCharacters) {
+ int get_nCharacters(long /*int*/ pNCharacters) {
int count = getCharacterCount();
COM.MoveMemory(pNCharacters, new int [] { count }, 4);
if (DEBUG) print(this + ".IAccessibleText::get_nCharacters returning " + count);
@@ -4582,7 +4582,7 @@ public class Accessible {
}
/* IAccessibleText::get_newText([out] pNewText) */
- int get_newText(int /*long*/ pNewText) {
+ int get_newText(long /*int*/ pNewText) {
if (DEBUG) print(this + ".IAccessibleText::get_newText");
String text = null;
int start = 0;
@@ -4600,7 +4600,7 @@ public class Accessible {
}
/* IAccessibleText::get_oldText([out] pOldText) */
- int get_oldText(int /*long*/ pOldText) {
+ int get_oldText(long /*int*/ pOldText) {
if (DEBUG) print(this + ".IAccessibleText::get_oldText");
String text = null;
int start = 0;
@@ -4618,7 +4618,7 @@ public class Accessible {
}
/* IAccessibleValue::get_currentValue([out] pCurrentValue) */
- int get_currentValue(int /*long*/ pCurrentValue) {
+ int get_currentValue(long /*int*/ pCurrentValue) {
AccessibleValueEvent event = new AccessibleValueEvent(this);
for (int i = 0; i < accessibleValueListeners.size(); i++) {
AccessibleValueListener listener = (AccessibleValueListener) accessibleValueListeners.elementAt(i);
@@ -4630,7 +4630,7 @@ public class Accessible {
}
/* IAccessibleValue::setCurrentValue([in] value) */
- int setCurrentValue(int /*long*/ value) {
+ int setCurrentValue(long /*int*/ value) {
if (DEBUG) print(this + ".IAccessibleValue::setCurrentValue");
AccessibleValueEvent event = new AccessibleValueEvent(this);
event.value = getNumberVARIANT(value);
@@ -4643,7 +4643,7 @@ public class Accessible {
}
/* IAccessibleValue::get_maximumValue([out] pMaximumValue) */
- int get_maximumValue(int /*long*/ pMaximumValue) {
+ int get_maximumValue(long /*int*/ pMaximumValue) {
AccessibleValueEvent event = new AccessibleValueEvent(this);
for (int i = 0; i < accessibleValueListeners.size(); i++) {
AccessibleValueListener listener = (AccessibleValueListener) accessibleValueListeners.elementAt(i);
@@ -4655,7 +4655,7 @@ public class Accessible {
}
/* IAccessibleValue::get_minimumValue([out] pMinimumValue) */
- int get_minimumValue(int /*long*/ pMinimumValue) {
+ int get_minimumValue(long /*int*/ pMinimumValue) {
AccessibleValueEvent event = new AccessibleValueEvent(this);
for (int i = 0; i < accessibleValueListeners.size(); i++) {
AccessibleValueListener listener = (AccessibleValueListener) accessibleValueListeners.elementAt(i);
@@ -4953,9 +4953,9 @@ public class Accessible {
role = COM.ROLE_SYSTEM_CLIENT;
if (iaccessible != null) {
/* Get the default role from the OS. */
- int /*long*/ varChild = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof);
+ long /*int*/ varChild = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof);
setIntVARIANT(varChild, COM.VT_I4, COM.CHILDID_SELF);
- int /*long*/ pvarRole = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof);
+ long /*int*/ pvarRole = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof);
int code = iaccessible.get_accRole(varChild, pvarRole);
if (code == COM.S_OK) {
VARIANT v = getVARIANT(pvarRole);
@@ -4967,8 +4967,8 @@ public class Accessible {
return role;
}
- String getString(int /*long*/ psz) {
- int /*long*/ [] ptr = new int /*long*/ [1];
+ String getString(long /*int*/ psz) {
+ long /*int*/ [] ptr = new long /*int*/ [1];
OS.MoveMemory (ptr, psz, OS.PTR_SIZEOF);
int size = COM.SysStringByteLen(ptr [0]);
if (size == 0) return "";
@@ -4977,34 +4977,34 @@ public class Accessible {
return new String (buffer);
}
- VARIANT getVARIANT(int /*long*/ variant) {
+ VARIANT getVARIANT(long /*int*/ variant) {
VARIANT v = new VARIANT();
COM.MoveMemory(v, variant, VARIANT.sizeof);
return v;
}
- Number getNumberVARIANT(int /*long*/ variant) {
+ Number getNumberVARIANT(long /*int*/ variant) {
VARIANT v = new VARIANT();
COM.MoveMemory(v, variant, VARIANT.sizeof);
if (v.vt == COM.VT_I8) return new Long(v.lVal); // TODO: Fix this - v.lVal is an int - don't use struct
return new Integer(v.lVal);
}
- void setIntVARIANT(int /*long*/ variant, short vt, int lVal) {
+ void setIntVARIANT(long /*int*/ variant, short vt, int lVal) {
if (vt == COM.VT_I4 || vt == COM.VT_EMPTY) {
COM.MoveMemory(variant, new short[] { vt }, 2);
COM.MoveMemory(variant + 8, new int[] { lVal }, 4);
}
}
- void setPtrVARIANT(int /*long*/ variant, short vt, int /*long*/ lVal) {
+ void setPtrVARIANT(long /*int*/ variant, short vt, long /*int*/ lVal) {
if (vt == COM.VT_DISPATCH || vt == COM.VT_UNKNOWN) {
COM.MoveMemory(variant, new short[] { vt }, 2);
- COM.MoveMemory(variant + 8, new int /*long*/ [] { lVal }, OS.PTR_SIZEOF);
+ COM.MoveMemory(variant + 8, new long /*int*/ [] { lVal }, OS.PTR_SIZEOF);
}
}
- void setNumberVARIANT(int /*long*/ variant, Number number) {
+ void setNumberVARIANT(long /*int*/ variant, Number number) {
if (number == null) {
COM.MoveMemory(variant, new short[] { COM.VT_EMPTY }, 2);
COM.MoveMemory(variant + 8, new int[] { 0 }, 4);
@@ -5023,23 +5023,23 @@ public class Accessible {
}
}
- void setString(int /*long*/ psz, String string) {
- int /*long*/ ptr = 0;
+ void setString(long /*int*/ psz, String string) {
+ long /*int*/ ptr = 0;
if (string != null) {
char[] data = (string + "\0").toCharArray();
ptr = COM.SysAllocString(data);
}
- COM.MoveMemory(psz, new int /*long*/ [] { ptr }, OS.PTR_SIZEOF);
+ COM.MoveMemory(psz, new long /*int*/ [] { ptr }, OS.PTR_SIZEOF);
}
- void setStringVARIANT(int /*long*/ variant, String string) {
- int /*long*/ ptr = 0;
+ void setStringVARIANT(long /*int*/ variant, String string) {
+ long /*int*/ ptr = 0;
if (string != null) {
char[] data = (string + "\0").toCharArray();
ptr = COM.SysAllocString(data);
}
COM.MoveMemory(variant, new short[] { ptr == 0 ? COM.VT_EMPTY : COM.VT_BSTR }, 2);
- COM.MoveMemory(variant + 8, new int /*long*/ [] { ptr }, OS.PTR_SIZEOF);
+ COM.MoveMemory(variant + 8, new long /*int*/ [] { ptr }, OS.PTR_SIZEOF);
}
/* checkWidget was copied from Widget, and rewritten to work in this package */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Relation.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Relation.java
index 1e72c7a987..d286fbb358 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Relation.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Relation.java
@@ -62,7 +62,7 @@ class Relation {
AddRef();
}
- int /*long*/ getAddress() {
+ long /*int*/ getAddress() {
/* The address of a Relation is the address of its IAccessibleRelation COMObject. */
if (objIAccessibleRelation == null) createIAccessibleRelation();
return objIAccessibleRelation.getAddress();
@@ -70,14 +70,14 @@ class Relation {
void createIAccessibleRelation() {
objIAccessibleRelation = new COMObject(new int[] {2,0,0,1,1,1,2,3}) {
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return get_relationType(args[0]);}
- public int /*long*/ method4(int /*long*/[] args) {return get_localizedRelationType(args[0]);}
- public int /*long*/ method5(int /*long*/[] args) {return get_nTargets(args[0]);}
- public int /*long*/ method6(int /*long*/[] args) {return get_target((int)/*64*/args[0], args[1]);}
- public int /*long*/ method7(int /*long*/[] args) {return get_targets((int)/*64*/args[0], args[1], args[2]);}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return get_relationType(args[0]);}
+ public long /*int*/ method4(long /*int*/[] args) {return get_localizedRelationType(args[0]);}
+ public long /*int*/ method5(long /*int*/[] args) {return get_nTargets(args[0]);}
+ public long /*int*/ method6(long /*int*/[] args) {return get_target((int)/*64*/args[0], args[1]);}
+ public long /*int*/ method7(long /*int*/[] args) {return get_targets((int)/*64*/args[0], args[1], args[2]);}
};
}
@@ -85,12 +85,12 @@ class Relation {
* Ownership of ppvObject transfers from callee to caller so reference count on ppvObject
* must be incremented before returning. Caller is responsible for releasing ppvObject.
*/
- int QueryInterface(int /*long*/ iid, int /*long*/ ppvObject) {
+ int QueryInterface(long /*int*/ iid, long /*int*/ ppvObject) {
GUID guid = new GUID();
COM.MoveMemory(guid, iid, GUID.sizeof);
if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIAccessibleRelation)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] { getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] { getAddress() }, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
@@ -115,39 +115,39 @@ class Relation {
}
/* IAccessibleRelation::get_relationType([out] pbstrRelationType) */
- int get_relationType(int /*long*/ pbstrRelationType) {
+ int get_relationType(long /*int*/ pbstrRelationType) {
setString(pbstrRelationType, relationTypeString[type]);
return COM.S_OK;
}
/* IAccessibleRelation::get_localizedRelationType([out] pbstrLocalizedRelationType) */
- int get_localizedRelationType(int /*long*/ pbstrLocalizedRelationType) {
+ int get_localizedRelationType(long /*int*/ pbstrLocalizedRelationType) {
setString(pbstrLocalizedRelationType, localizedRelationTypeString[type]);
return COM.S_OK;
}
/* IAccessibleRelation::get_nTargets([out] pNTargets) */
- int get_nTargets(int /*long*/ pNTargets) {
+ int get_nTargets(long /*int*/ pNTargets) {
COM.MoveMemory(pNTargets, new int [] { targets.length }, 4);
return COM.S_OK;
}
/* IAccessibleRelation::get_target([in] targetIndex, [out] ppTarget) */
- int get_target(int targetIndex, int /*long*/ ppTarget) {
+ int get_target(int targetIndex, long /*int*/ ppTarget) {
if (targetIndex < 0 || targetIndex >= targets.length) return COM.E_INVALIDARG;
Accessible target = targets[targetIndex];
target.AddRef();
- COM.MoveMemory(ppTarget, new int /*long*/[] { target.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppTarget, new long /*int*/[] { target.getAddress() }, OS.PTR_SIZEOF);
return COM.S_OK;
}
/* IAccessibleRelation::get_targets([in] maxTargets, [out] ppTargets, [out] pNTargets) */
- int get_targets(int maxTargets, int /*long*/ ppTargets, int /*long*/ pNTargets) {
+ int get_targets(int maxTargets, long /*int*/ ppTargets, long /*int*/ pNTargets) {
int count = Math.min(targets.length, maxTargets);
for (int i = 0; i < count; i++) {
Accessible target = targets[i];
target.AddRef();
- COM.MoveMemory(ppTargets + i * OS.PTR_SIZEOF, new int /*long*/[] { target.getAddress() }, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppTargets + i * OS.PTR_SIZEOF, new long /*int*/[] { target.getAddress() }, OS.PTR_SIZEOF);
}
COM.MoveMemory(pNTargets, new int [] { count }, 4);
return COM.S_OK;
@@ -185,9 +185,9 @@ class Relation {
}
// setString copied from Accessible class
- void setString(int /*long*/ psz, String string) {
+ void setString(long /*int*/ psz, String string) {
char[] data = (string + "\0").toCharArray();
- int /*long*/ ptr = COM.SysAllocString(data);
- COM.MoveMemory(psz, new int /*long*/ [] { ptr }, OS.PTR_SIZEOF);
+ long /*int*/ ptr = COM.SysAllocString(data);
+ COM.MoveMemory(psz, new long /*int*/ [] { ptr }, OS.PTR_SIZEOF);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
index 890781fad3..45d1bb4e31 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/IE.java
@@ -34,7 +34,7 @@ class IE extends WebBrowser {
Point location;
Point size;
boolean addressBar = true, menuBar = true, statusBar = true, toolBar = true;
- int /*long*/ globalDispatch;
+ long /*int*/ globalDispatch;
String html, lastNavigateURL, uncRedirect;
Object[] pendingText, pendingUrl;
int style, lastKeyCode, lastCharCode;
@@ -193,7 +193,7 @@ class IE extends WebBrowser {
* features that can be enabled.
*/
TCHAR key = new TCHAR (0, "Software\\Microsoft\\Internet Explorer", true); //$NON-NLS-1$
- int /*long*/ [] phkResult = new int /*long*/ [1];
+ long /*int*/ [] phkResult = new long /*int*/ [1];
if (OS.RegOpenKeyEx (OS.HKEY_LOCAL_MACHINE, key, 0, OS.KEY_READ, phkResult) == 0) {
int [] lpcbData = new int [1];
TCHAR buffer = new TCHAR (0, "Version", true); //$NON-NLS-1$
@@ -229,7 +229,7 @@ class IE extends WebBrowser {
* will be embedded to explicitly specify Shell.Explorer.2.
*/
key = new TCHAR (0, "Shell.Explorer\\CLSID", true); //$NON-NLS-1$
- phkResult = new int /*long*/ [1];
+ phkResult = new long /*int*/ [1];
if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) == 0) {
int [] lpcbData = new int [1];
int result = OS.RegQueryValueEx (phkResult [0], null, 0, null, (TCHAR) null, lpcbData);
@@ -241,7 +241,7 @@ class IE extends WebBrowser {
if (clsid.equals (CLSID_SHELLEXPLORER1)) {
/* Shell.Explorer.1 is the default, ensure that Shell.Explorer.2 is available */
key = new TCHAR (0, "Shell.Explorer.2", true); //$NON-NLS-1$
- int /*long*/ [] phkResult2 = new int /*long*/ [1];
+ long /*int*/ [] phkResult2 = new long /*int*/ [1];
if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult2) == 0) {
/* specify that Shell.Explorer.2 is to be used */
OS.RegCloseKey (phkResult2 [0]);
@@ -297,7 +297,7 @@ public void create(Composite parent, int style) {
}
if (version != -1) {
- int /*long*/[] key = new int /*long*/[1];
+ long /*int*/[] key = new long /*int*/[1];
final TCHAR subkey = new TCHAR(0, "Software\\Microsoft\\Internet Explorer\\Main\\FeatureControl\\FEATURE_BROWSER_EMULATION", true); //$NON-NLS-1$
if (OS.RegCreateKeyEx(OS.HKEY_CURRENT_USER, subkey, 0, null, OS.REG_OPTION_VOLATILE, OS.KEY_WRITE | OS.KEY_QUERY_VALUE, 0, key, null) == 0) {
TCHAR lpszFile = new TCHAR(0, OS.MAX_PATH);
@@ -310,7 +310,7 @@ public void create(Composite parent, int style) {
if (OS.RegSetValueEx(key[0], lpValueName, 0, OS.REG_DWORD, new int[] {version}, 4) == 0) {
parent.getDisplay().addListener(SWT.Dispose, new Listener() {
public void handleEvent(Event event) {
- int /*long*/[] key = new int /*long*/[1];
+ long /*int*/[] key = new long /*int*/[1];
if (OS.RegOpenKeyEx(OS.HKEY_CURRENT_USER, subkey, 0, OS.KEY_WRITE, key) == 0) {
OS.RegDeleteValue(key[0], lpValueName);
}
@@ -457,7 +457,7 @@ public void create(Composite parent, int style) {
if (uncRedirect.equals(url) || (uncRedirect.startsWith(url) && uncRedirect.indexOf('\\', 2) == url.length())) {
Variant cancel = event.arguments[6];
if (cancel != null) {
- int /*long*/ pCancel = cancel.getByRef();
+ long /*int*/ pCancel = cancel.getByRef();
COM.MoveMemory(pCancel, new short[] {COM.VARIANT_FALSE}, 2);
}
break;
@@ -491,7 +491,7 @@ public void create(Composite parent, int style) {
if (url.startsWith(PROTOCOL_FILE) && _getUrl().startsWith(ABOUT_BLANK) && untrustedText) {
Variant cancel = event.arguments[6];
if (cancel != null) {
- int /*long*/ pCancel = cancel.getByRef();
+ long /*int*/ pCancel = cancel.getByRef();
COM.MoveMemory(pCancel, new short[] {COM.VARIANT_TRUE}, 2);
}
break;
@@ -508,7 +508,7 @@ public void create(Composite parent, int style) {
boolean doit = newEvent.doit && !browser.isDisposed();
Variant cancel = event.arguments[6];
if (cancel != null) {
- int /*long*/ pCancel = cancel.getByRef();
+ long /*int*/ pCancel = cancel.getByRef();
COM.MoveMemory(pCancel, new short[] {doit ? COM.VARIANT_FALSE : COM.VARIANT_TRUE}, 2);
}
if (doit) {
@@ -769,7 +769,7 @@ public void create(Composite parent, int style) {
final String host = url.substring(0, index);
Variant cancel = event.arguments[4];
if (cancel != null) {
- int /*long*/ pCancel = cancel.getByRef();
+ long /*int*/ pCancel = cancel.getByRef();
COM.MoveMemory(pCancel, new short[] {COM.VARIANT_TRUE}, 2);
}
browser.getDisplay().asyncExec(new Runnable() {
@@ -796,7 +796,7 @@ public void create(Composite parent, int style) {
}
case NewWindow2: {
Variant cancel = event.arguments[1];
- int /*long*/ pCancel = cancel.getByRef();
+ long /*int*/ pCancel = cancel.getByRef();
WindowEvent newEvent = new WindowEvent(browser);
newEvent.display = browser.getDisplay();
newEvent.widget = browser;
@@ -821,8 +821,8 @@ public void create(Composite parent, int style) {
Variant variant = new Variant(browser.auto);
IDispatch iDispatch = variant.getDispatch();
Variant ppDisp = event.arguments[0];
- int /*long*/ byref = ppDisp.getByRef();
- if (byref != 0) COM.MoveMemory(byref, new int /*long*/[] {iDispatch.getAddress()}, OS.PTR_SIZEOF);
+ long /*int*/ byref = ppDisp.getByRef();
+ if (byref != 0) COM.MoveMemory(byref, new long /*int*/[] {iDispatch.getAddress()}, OS.PTR_SIZEOF);
/*
* This code is intentionally commented. A Variant constructed from an
* OleAutomation object does not increase its reference count. The IDispatch
@@ -978,7 +978,7 @@ public void create(Composite parent, int style) {
}
});
Variant cancel = event.arguments[1];
- int /*long*/ pCancel = cancel.getByRef();
+ long /*int*/ pCancel = cancel.getByRef();
Variant arg1 = event.arguments[0];
boolean isChildWindow = arg1.getBoolean();
COM.MoveMemory(pCancel, new short[]{isChildWindow ? COM.VARIANT_FALSE : COM.VARIANT_TRUE}, 2);
@@ -1112,12 +1112,12 @@ static Variant createSafeArray(String string) {
/* Create a pointer and copy the data into it */
byte[] bytes = string.getBytes();
int length = bytes.length;
- int /*long*/ pvData = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, length);
+ long /*int*/ pvData = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, length);
C.memmove(pvData, bytes, length);
int cElements1 = length;
/* Create a SAFEARRAY in memory */
- int /*long*/ pSafeArray = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, SAFEARRAY.sizeof);
+ long /*int*/ pSafeArray = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, SAFEARRAY.sizeof);
SAFEARRAY safeArray = new SAFEARRAY();
safeArray.cDims = 1;
safeArray.fFeatures = OS.FADF_FIXEDSIZE;
@@ -1129,10 +1129,10 @@ static Variant createSafeArray(String string) {
OS.MoveMemory (pSafeArray, safeArray, SAFEARRAY.sizeof);
/* Return a Variant that holds the SAFEARRAY */
- int /*long*/ pVariant = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, Variant.sizeof);
+ long /*int*/ pVariant = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, Variant.sizeof);
short vt = (short)(OLE.VT_ARRAY | OLE.VT_UI1);
OS.MoveMemory(pVariant, new short[] {vt}, 2);
- OS.MoveMemory(pVariant + 8, new int /*long*/[] {pSafeArray}, C.PTR_SIZEOF);
+ OS.MoveMemory(pVariant + 8, new long /*int*/[] {pSafeArray}, C.PTR_SIZEOF);
return new Variant(pVariant, (short)(OLE.VT_BYREF | OLE.VT_VARIANT));
}
@@ -1356,11 +1356,11 @@ void setHTML (String string) {
* prepend the UTF-8 Byte Order Mark signature to the data.
*/
byte[] UTF8BOM = {(byte)0xEF, (byte)0xBB, (byte)0xBF};
- int /*long*/ hGlobal = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, UTF8BOM.length + byteCount);
+ long /*int*/ hGlobal = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, UTF8BOM.length + byteCount);
if (hGlobal != 0) {
OS.MoveMemory(hGlobal, UTF8BOM, UTF8BOM.length);
OS.WideCharToMultiByte(OS.CP_UTF8, 0, chars, charCount, hGlobal + UTF8BOM.length, byteCount, null, null);
- int /*long*/ [] ppstm = new int /*long*/ [1];
+ long /*int*/ [] ppstm = new long /*int*/ [1];
/*
* CreateStreamOnHGlobal is called with the flag fDeleteOnRelease.
* If the call succeeds the buffer hGlobal is freed automatically
@@ -1371,7 +1371,7 @@ void setHTML (String string) {
int[] rgdispid = auto.getIDsOfNames(new String[] {PROPERTY_DOCUMENT});
Variant pVarResult = auto.getProperty(rgdispid[0]);
IDispatch dispatchDocument = pVarResult.getDispatch();
- int /*long*/ [] ppvObject = new int /*long*/ [1];
+ long /*int*/ [] ppvObject = new long /*int*/ [1];
int result = dispatchDocument.QueryInterface(COM.IIDIPersistStreamInit, ppvObject);
if (result == OS.S_OK) {
IPersistStreamInit persistStreamInit = new IPersistStreamInit(ppvObject[0]);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java
index c86e21076b..d823a5457c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/WebSite.java
@@ -41,31 +41,31 @@ public WebSite(Composite parent, int style, String progId) {
protected void createCOMInterfaces () {
super.createCOMInterfaces();
iDocHostUIHandler = new COMObject(new int[]{2, 0, 0, 4, 1, 5, 0, 0, 1, 1, 1, 3, 3, 2, 2, 1, 3, 2}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return ShowContextMenu((int)/*64*/args[0], args[1], args[2], args[3]);}
- public int /*long*/ method4(int /*long*/[] args) {return GetHostInfo(args[0]);}
- public int /*long*/ method5(int /*long*/[] args) {return ShowUI((int)/*64*/args[0], args[1], args[2], args[3], args[4]);}
- public int /*long*/ method6(int /*long*/[] args) {return HideUI();}
- public int /*long*/ method7(int /*long*/[] args) {return UpdateUI();}
- public int /*long*/ method8(int /*long*/[] args) {return EnableModeless((int)/*64*/args[0]);}
- public int /*long*/ method9(int /*long*/[] args) {return OnDocWindowActivate((int)/*64*/args[0]);}
- public int /*long*/ method10(int /*long*/[] args) {return OnFrameWindowActivate((int)/*64*/args[0]);}
- public int /*long*/ method11(int /*long*/[] args) {return ResizeBorder(args[0], args[1], (int)/*64*/args[2]);}
- public int /*long*/ method12(int /*long*/[] args) {return TranslateAccelerator(args[0], args[1], (int)/*64*/args[2]);}
- public int /*long*/ method13(int /*long*/[] args) {return GetOptionKeyPath(args[0], (int)/*64*/args[1]);}
- public int /*long*/ method14(int /*long*/[] args) {return GetDropTarget(args[0], args[1]);}
- public int /*long*/ method15(int /*long*/[] args) {return GetExternal(args[0]);}
- public int /*long*/ method16(int /*long*/[] args) {return TranslateUrl((int)/*64*/args[0], args[1], args[2]);}
- public int /*long*/ method17(int /*long*/[] args) {return FilterDataObject(args[0], args[1]);}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return ShowContextMenu((int)/*64*/args[0], args[1], args[2], args[3]);}
+ public long /*int*/ method4(long /*int*/[] args) {return GetHostInfo(args[0]);}
+ public long /*int*/ method5(long /*int*/[] args) {return ShowUI((int)/*64*/args[0], args[1], args[2], args[3], args[4]);}
+ public long /*int*/ method6(long /*int*/[] args) {return HideUI();}
+ public long /*int*/ method7(long /*int*/[] args) {return UpdateUI();}
+ public long /*int*/ method8(long /*int*/[] args) {return EnableModeless((int)/*64*/args[0]);}
+ public long /*int*/ method9(long /*int*/[] args) {return OnDocWindowActivate((int)/*64*/args[0]);}
+ public long /*int*/ method10(long /*int*/[] args) {return OnFrameWindowActivate((int)/*64*/args[0]);}
+ public long /*int*/ method11(long /*int*/[] args) {return ResizeBorder(args[0], args[1], (int)/*64*/args[2]);}
+ public long /*int*/ method12(long /*int*/[] args) {return TranslateAccelerator(args[0], args[1], (int)/*64*/args[2]);}
+ public long /*int*/ method13(long /*int*/[] args) {return GetOptionKeyPath(args[0], (int)/*64*/args[1]);}
+ public long /*int*/ method14(long /*int*/[] args) {return GetDropTarget(args[0], args[1]);}
+ public long /*int*/ method15(long /*int*/[] args) {return GetExternal(args[0]);}
+ public long /*int*/ method16(long /*int*/[] args) {return TranslateUrl((int)/*64*/args[0], args[1], args[2]);}
+ public long /*int*/ method17(long /*int*/[] args) {return FilterDataObject(args[0], args[1]);}
};
iDocHostShowUI = new COMObject(new int[]{2, 0, 0, 7, C.PTR_SIZEOF == 4 ? 7 : 6}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return ShowMessage(args[0], args[1], args[2], (int)/*64*/args[3], args[4], (int)/*64*/args[5], args[6]);}
- public int /*long*/ method4(int /*long*/[] args) {
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return ShowMessage(args[0], args[1], args[2], (int)/*64*/args[3], args[4], (int)/*64*/args[5], args[6]);}
+ public long /*int*/ method4(long /*int*/[] args) {
if (args.length == 7) {
return ShowHelp(args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5], args[6]);
} else {
@@ -74,39 +74,39 @@ protected void createCOMInterfaces () {
}
};
iServiceProvider = new COMObject(new int[]{2, 0, 0, 3}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return QueryService(args[0], args[1], args[2]);}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return QueryService(args[0], args[1], args[2]);}
};
iInternetSecurityManager = new COMObject(new int[]{2, 0, 0, 1, 1, 3, 4, 8, 7, 3, 3}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return SetSecuritySite(args[0]);}
- public int /*long*/ method4(int /*long*/[] args) {return GetSecuritySite(args[0]);}
- public int /*long*/ method5(int /*long*/[] args) {return MapUrlToZone(args[0], args[1], (int)/*64*/args[2]);}
- public int /*long*/ method6(int /*long*/[] args) {return GetSecurityId(args[0], args[1], args[2], args[3]);}
- public int /*long*/ method7(int /*long*/[] args) {return ProcessUrlAction(args[0], (int)/*64*/args[1], args[2], (int)/*64*/args[3], args[4], (int)/*64*/args[5], (int)/*64*/args[6], (int)/*64*/args[7]);}
- public int /*long*/ method8(int /*long*/[] args) {return QueryCustomPolicy(args[0], args[1], args[2], args[3], args[4], (int)/*64*/args[5], (int)/*64*/args[6]);}
- public int /*long*/ method9(int /*long*/[] args) {return SetZoneMapping((int)/*64*/args[0], args[1], (int)/*64*/args[2]);}
- public int /*long*/ method10(int /*long*/[] args) {return GetZoneMappings((int)/*64*/args[0], args[1], (int)/*64*/args[2]);}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return SetSecuritySite(args[0]);}
+ public long /*int*/ method4(long /*int*/[] args) {return GetSecuritySite(args[0]);}
+ public long /*int*/ method5(long /*int*/[] args) {return MapUrlToZone(args[0], args[1], (int)/*64*/args[2]);}
+ public long /*int*/ method6(long /*int*/[] args) {return GetSecurityId(args[0], args[1], args[2], args[3]);}
+ public long /*int*/ method7(long /*int*/[] args) {return ProcessUrlAction(args[0], (int)/*64*/args[1], args[2], (int)/*64*/args[3], args[4], (int)/*64*/args[5], (int)/*64*/args[6], (int)/*64*/args[7]);}
+ public long /*int*/ method8(long /*int*/[] args) {return QueryCustomPolicy(args[0], args[1], args[2], args[3], args[4], (int)/*64*/args[5], (int)/*64*/args[6]);}
+ public long /*int*/ method9(long /*int*/[] args) {return SetZoneMapping((int)/*64*/args[0], args[1], (int)/*64*/args[2]);}
+ public long /*int*/ method10(long /*int*/[] args) {return GetZoneMappings((int)/*64*/args[0], args[1], (int)/*64*/args[2]);}
};
iOleCommandTarget = new COMObject(new int[]{2, 0, 0, 4, 5}) {
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return QueryStatus(args[0], (int)/*64*/args[1], args[2], args[3]);}
- public int /*long*/ method4(int /*long*/[] args) {return Exec(args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3], args[4]);}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return QueryStatus(args[0], (int)/*64*/args[1], args[2], args[3]);}
+ public long /*int*/ method4(long /*int*/[] args) {return Exec(args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3], args[4]);}
};
iAuthenticate = new COMObject(new int[]{2, 0, 0, 3}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return Authenticate(args[0], args[1], args[2]);}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return Authenticate(args[0], args[1], args[2]);}
};
iDispatch = new COMObject (new int[] {2, 0, 0, 1, 3, 5, 8}) {
- public int /*long*/ method0 (int /*long*/[] args) {
+ public long /*int*/ method0 (long /*int*/[] args) {
/*
* IDispatch check must be done here instead of in the shared QueryInterface
* implementation, to avoid answering the superclass's IDispatch implementation
@@ -115,18 +115,18 @@ protected void createCOMInterfaces () {
GUID guid = new GUID ();
COM.MoveMemory (guid, args[0], GUID.sizeof);
if (COM.IsEqualGUID (guid, COM.IIDIDispatch)) {
- COM.MoveMemory (args[1], new int /*long*/[] {iDispatch.getAddress ()}, OS.PTR_SIZEOF);
+ COM.MoveMemory (args[1], new long /*int*/[] {iDispatch.getAddress ()}, OS.PTR_SIZEOF);
AddRef ();
return COM.S_OK;
}
return QueryInterface (args[0], args[1]);
}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return GetTypeInfoCount (args[0]);}
- public int /*long*/ method4 (int /*long*/[] args) {return GetTypeInfo ((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}
- public int /*long*/ method5 (int /*long*/[] args) {return GetIDsOfNames ((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4]);}
- public int /*long*/ method6 (int /*long*/[] args) {return Invoke ((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return GetTypeInfoCount (args[0]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return GetTypeInfo ((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return GetIDsOfNames ((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return Invoke ((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);}
};
}
@@ -167,38 +167,38 @@ protected int AddRef() {
return super.AddRef();
}
-protected int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) {
+protected int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) {
int result = super.QueryInterface(riid, ppvObject);
if (result == COM.S_OK) return result;
if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG;
GUID guid = new GUID();
COM.MoveMemory(guid, riid, GUID.sizeof);
if (COM.IsEqualGUID(guid, COM.IIDIDocHostUIHandler)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iDocHostUIHandler.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iDocHostUIHandler.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
if (COM.IsEqualGUID(guid, COM.IIDIDocHostShowUI)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iDocHostShowUI.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iDocHostShowUI.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
if (COM.IsEqualGUID(guid, COM.IIDIServiceProvider)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iServiceProvider.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iServiceProvider.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
if (COM.IsEqualGUID(guid, COM.IIDIInternetSecurityManager)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iInternetSecurityManager.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iInternetSecurityManager.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
if (COM.IsEqualGUID(guid, COM.IIDIOleCommandTarget)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iOleCommandTarget.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iOleCommandTarget.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
- COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
@@ -208,21 +208,21 @@ int EnableModeless(int EnableModeless) {
return COM.E_NOTIMPL;
}
-int FilterDataObject(int /*long*/ pDO, int /*long*/ ppDORet) {
+int FilterDataObject(long /*int*/ pDO, long /*int*/ ppDORet) {
return COM.E_NOTIMPL;
}
-int GetDropTarget(int /*long*/ pDropTarget, int /*long*/ ppDropTarget) {
+int GetDropTarget(long /*int*/ pDropTarget, long /*int*/ ppDropTarget) {
return COM.E_NOTIMPL;
}
-int GetExternal(int /*long*/ ppDispatch) {
- OS.MoveMemory (ppDispatch, new int /*long*/[] {iDispatch.getAddress()}, C.PTR_SIZEOF);
+int GetExternal(long /*int*/ ppDispatch) {
+ OS.MoveMemory (ppDispatch, new long /*int*/[] {iDispatch.getAddress()}, C.PTR_SIZEOF);
AddRef ();
return COM.S_OK;
}
-int GetHostInfo(int /*long*/ pInfo) {
+int GetHostInfo(long /*int*/ pInfo) {
int info = IE.DOCHOSTUIFLAG_THEME;
IE browser = (IE)((Browser)getParent().getParent()).webBrowser;
if ((browser.style & SWT.BORDER) == 0) info |= IE.DOCHOSTUIFLAG_NO3DOUTERBORDER;
@@ -233,7 +233,7 @@ int GetHostInfo(int /*long*/ pInfo) {
return COM.S_OK;
}
-int GetOptionKeyPath(int /*long*/ pchKey, int dw) {
+int GetOptionKeyPath(long /*int*/ pchKey, int dw) {
return COM.E_NOTIMPL;
}
@@ -254,11 +254,11 @@ protected int Release() {
return super.Release();
}
-int ResizeBorder(int /*long*/ prcBorder, int /*long*/ pUIWindow, int fFrameWindow) {
+int ResizeBorder(long /*int*/ prcBorder, long /*int*/ pUIWindow, int fFrameWindow) {
return COM.E_NOTIMPL;
}
-int ShowContextMenu(int dwID, int /*long*/ ppt, int /*long*/ pcmdtReserved, int /*long*/ pdispReserved) {
+int ShowContextMenu(int dwID, long /*int*/ ppt, long /*int*/ pcmdtReserved, long /*int*/ pdispReserved) {
Browser browser = (Browser)getParent().getParent();
Event event = new Event();
POINT pt = new POINT();
@@ -279,11 +279,11 @@ int ShowContextMenu(int dwID, int /*long*/ ppt, int /*long*/ pcmdtReserved, int
return COM.S_FALSE;
}
-int ShowUI(int dwID, int /*long*/ pActiveObject, int /*long*/ pCommandTarget, int /*long*/ pFrame, int /*long*/ pDoc) {
+int ShowUI(int dwID, long /*int*/ pActiveObject, long /*int*/ pCommandTarget, long /*int*/ pFrame, long /*int*/ pDoc) {
return COM.S_FALSE;
}
-int TranslateAccelerator(int /*long*/ lpMsg, int /*long*/ pguidCmdGroup, int nCmdID) {
+int TranslateAccelerator(long /*int*/ lpMsg, long /*int*/ pguidCmdGroup, int nCmdID) {
/*
* Feature in Internet Explorer. By default the embedded Internet Explorer control runs
* the Internet Explorer shortcuts (e.g. Ctrl+F for Find). This overrides the shortcuts
@@ -293,8 +293,8 @@ int TranslateAccelerator(int /*long*/ lpMsg, int /*long*/ pguidCmdGroup, int nCm
Menu menubar = getShell().getMenuBar();
if (menubar != null && !menubar.isDisposed() && menubar.isEnabled()) {
Shell shell = menubar.getShell();
- int /*long*/ hwnd = shell.handle;
- int /*long*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0);
+ long /*int*/ hwnd = shell.handle;
+ long /*int*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0);
if (hAccel != 0) {
MSG msg = new MSG();
OS.MoveMemory(msg, lpMsg, MSG.sizeof);
@@ -419,7 +419,7 @@ int TranslateAccelerator(int /*long*/ lpMsg, int /*long*/ pguidCmdGroup, int nCm
return result;
}
-int TranslateUrl(int dwTranslate, int /*long*/ pchURLIn, int /*long*/ ppchURLOut) {
+int TranslateUrl(int dwTranslate, long /*int*/ pchURLIn, long /*int*/ ppchURLOut) {
return COM.E_NOTIMPL;
}
@@ -429,13 +429,13 @@ int UpdateUI() {
/* IDocHostShowUI */
-int ShowMessage(int /*long*/ hwnd, int /*long*/ lpstrText, int /*long*/ lpstrCaption, int dwType, int /*long*/ lpstrHelpFile, int dwHelpContext, int /*long*/ plResult) {
+int ShowMessage(long /*int*/ hwnd, long /*int*/ lpstrText, long /*int*/ lpstrCaption, int dwType, long /*int*/ lpstrHelpFile, int dwHelpContext, long /*int*/ plResult) {
boolean ignore = ignoreNextMessage || ignoreAllMessages;
ignoreNextMessage = false;
return ignore ? COM.S_OK : COM.S_FALSE;
}
-int ShowHelp_64(int /*long*/ hwnd, int /*long*/ pszHelpFile, int uCommand, int dwData, long pt, int /*long*/ pDispatchObjectHit) {
+int ShowHelp_64(long /*int*/ hwnd, long /*int*/ pszHelpFile, int uCommand, int dwData, long pt, long /*int*/ pDispatchObjectHit) {
POINT point = new POINT();
OS.MoveMemory(point, new long[]{pt}, 8);
return ShowHelp(hwnd, pszHelpFile, uCommand, dwData, point.x, point.y, pDispatchObjectHit);
@@ -446,7 +446,7 @@ int ShowHelp_64(int /*long*/ hwnd, int /*long*/ pszHelpFile, int uCommand, int d
* ptMouse_x and ptMouse_y. Otherwise the Browser crashes when the user presses F1 to invoke
* the help.
*/
-int ShowHelp(int /*long*/ hwnd, int /*long*/ pszHelpFile, int uCommand, int dwData, int ptMouse_x, int ptMouse_y, int /*long*/ pDispatchObjectHit) {
+int ShowHelp(long /*int*/ hwnd, long /*int*/ pszHelpFile, int uCommand, int dwData, int ptMouse_x, int ptMouse_y, long /*int*/ pDispatchObjectHit) {
Browser browser = (Browser)getParent().getParent();
Event event = new Event();
event.type = SWT.Help;
@@ -467,35 +467,35 @@ int ShowHelp(int /*long*/ hwnd, int /*long*/ pszHelpFile, int uCommand, int dwDa
/* IServiceProvider */
-int QueryService(int /*long*/ guidService, int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryService(long /*int*/ guidService, long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG;
GUID guid = new GUID();
COM.MoveMemory(guid, riid, GUID.sizeof);
if (COM.IsEqualGUID(guid, COM.IIDIInternetSecurityManager)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iInternetSecurityManager.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iInternetSecurityManager.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
if (COM.IsEqualGUID(guid, COM.IIDIAuthenticate)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iAuthenticate.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iAuthenticate.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
- COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
/* IInternetSecurityManager */
-int SetSecuritySite(int /*long*/ pSite) {
+int SetSecuritySite(long /*int*/ pSite) {
return IE.INET_E_DEFAULT_ACTION;
}
-int GetSecuritySite(int /*long*/ ppSite) {
+int GetSecuritySite(long /*int*/ ppSite) {
return IE.INET_E_DEFAULT_ACTION;
}
-int MapUrlToZone(int /*long*/ pwszUrl, int /*long*/ pdwZone, int dwFlags) {
+int MapUrlToZone(long /*int*/ pwszUrl, long /*int*/ pdwZone, int dwFlags) {
/*
* Feature in IE. HTML rendered in memory does not enable local links
* but the same HTML document loaded through a local file is permitted
@@ -514,11 +514,11 @@ int MapUrlToZone(int /*long*/ pwszUrl, int /*long*/ pdwZone, int dwFlags) {
return IE.INET_E_DEFAULT_ACTION;
}
-int GetSecurityId(int /*long*/ pwszUrl, int /*long*/ pbSecurityId, int /*long*/ pcbSecurityId, int /*long*/ dwReserved) {
+int GetSecurityId(long /*int*/ pwszUrl, long /*int*/ pbSecurityId, long /*int*/ pcbSecurityId, long /*int*/ dwReserved) {
return IE.INET_E_DEFAULT_ACTION;
}
-int ProcessUrlAction(int /*long*/ pwszUrl, int dwAction, int /*long*/ pPolicy, int cbPolicy, int /*long*/ pContext, int cbContext, int dwFlags, int dwReserved) {
+int ProcessUrlAction(long /*int*/ pwszUrl, int dwAction, long /*int*/ pPolicy, int cbPolicy, long /*int*/ pContext, int cbContext, int dwFlags, int dwReserved) {
ignoreNextMessage = false;
/*
@@ -602,24 +602,24 @@ boolean canExecuteApplets () {
return canExecuteApplets.booleanValue ();
}
-int QueryCustomPolicy(int /*long*/ pwszUrl, int /*long*/ guidKey, int /*long*/ ppPolicy, int /*long*/ pcbPolicy, int /*long*/ pContext, int cbContext, int dwReserved) {
+int QueryCustomPolicy(long /*int*/ pwszUrl, long /*int*/ guidKey, long /*int*/ ppPolicy, long /*int*/ pcbPolicy, long /*int*/ pContext, int cbContext, int dwReserved) {
return IE.INET_E_DEFAULT_ACTION;
}
-int SetZoneMapping(int dwZone, int /*long*/ lpszPattern, int dwFlags) {
+int SetZoneMapping(int dwZone, long /*int*/ lpszPattern, int dwFlags) {
return IE.INET_E_DEFAULT_ACTION;
}
-int GetZoneMappings(int dwZone, int /*long*/ ppenumString, int dwFlags) {
+int GetZoneMappings(int dwZone, long /*int*/ ppenumString, int dwFlags) {
return COM.E_NOTIMPL;
}
/* IOleCommandTarget */
-int QueryStatus(int /*long*/ pguidCmdGroup, int cCmds, int /*long*/ prgCmds, int /*long*/ pCmdText) {
+int QueryStatus(long /*int*/ pguidCmdGroup, int cCmds, long /*int*/ prgCmds, long /*int*/ pCmdText) {
return COM.E_NOTSUPPORTED;
}
-int Exec(int /*long*/ pguidCmdGroup, int nCmdID, int nCmdExecOpt, int /*long*/ pvaIn, int /*long*/ pvaOut) {
+int Exec(long /*int*/ pguidCmdGroup, int nCmdID, int nCmdExecOpt, long /*int*/ pvaIn, long /*int*/ pvaOut) {
if (pguidCmdGroup != 0) {
GUID guid = new GUID();
COM.MoveMemory(guid, pguidCmdGroup, GUID.sizeof);
@@ -648,7 +648,7 @@ int Exec(int /*long*/ pguidCmdGroup, int nCmdID, int nCmdExecOpt, int /*long*/ p
/* IAuthenticate */
-int Authenticate (int /*long*/ hwnd, int /*long*/ szUsername, int /*long*/ szPassword) {
+int Authenticate (long /*int*/ hwnd, long /*int*/ szUsername, long /*int*/ szPassword) {
IE browser = (IE)((Browser)getParent ().getParent ()).webBrowser;
for (int i = 0; i < browser.authenticationListeners.length; i++) {
AuthenticationEvent event = new AuthenticationEvent (browser.browser);
@@ -658,37 +658,37 @@ int Authenticate (int /*long*/ hwnd, int /*long*/ szUsername, int /*long*/ szPas
if (event.user != null && event.password != null) {
TCHAR user = new TCHAR (0, event.user, true);
int size = user.length () * TCHAR.sizeof;
- int /*long*/ userPtr = COM.CoTaskMemAlloc (size);
+ long /*int*/ userPtr = COM.CoTaskMemAlloc (size);
OS.MoveMemory (userPtr, user, size);
TCHAR password = new TCHAR (0, event.password, true);
size = password.length () * TCHAR.sizeof;
- int /*long*/ passwordPtr = COM.CoTaskMemAlloc (size);
+ long /*int*/ passwordPtr = COM.CoTaskMemAlloc (size);
OS.MoveMemory (passwordPtr, password, size);
- C.memmove (hwnd, new int /*long*/[] {0}, C.PTR_SIZEOF);
- C.memmove (szUsername, new int /*long*/[] {userPtr}, C.PTR_SIZEOF);
- C.memmove (szPassword, new int /*long*/[] {passwordPtr}, C.PTR_SIZEOF);
+ C.memmove (hwnd, new long /*int*/[] {0}, C.PTR_SIZEOF);
+ C.memmove (szUsername, new long /*int*/[] {userPtr}, C.PTR_SIZEOF);
+ C.memmove (szPassword, new long /*int*/[] {passwordPtr}, C.PTR_SIZEOF);
return COM.S_OK;
}
}
/* no listener handled the challenge, so defer to the native dialog */
- C.memmove (hwnd, new int /*long*/[] {getShell().handle}, C.PTR_SIZEOF);
+ C.memmove (hwnd, new long /*int*/[] {getShell().handle}, C.PTR_SIZEOF);
return COM.S_OK;
}
/* IDispatch */
-int GetTypeInfoCount (int /*long*/ pctinfo) {
+int GetTypeInfoCount (long /*int*/ pctinfo) {
C.memmove (pctinfo, new int[] {0}, 4);
return COM.S_OK;
}
-int GetTypeInfo (int iTInfo, int lcid, int /*long*/ ppTInfo) {
+int GetTypeInfo (int iTInfo, int lcid, long /*int*/ ppTInfo) {
return COM.S_OK;
}
-int GetIDsOfNames (int riid, int /*long*/ rgszNames, int cNames, int lcid, int /*long*/ rgDispId) {
- int /*long*/[] ptr = new int /*long*/[1];
+int GetIDsOfNames (int riid, long /*int*/ rgszNames, int cNames, int lcid, long /*int*/ rgDispId) {
+ long /*int*/[] ptr = new long /*int*/[1];
OS.MoveMemory (ptr, rgszNames, C.PTR_SIZEOF);
int length = OS.wcslen (ptr[0]);
char[] buffer = new char[length];
@@ -710,12 +710,12 @@ int GetIDsOfNames (int riid, int /*long*/ rgszNames, int cNames, int lcid, int /
return result;
}
-int Invoke (int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, int /*long*/ pDispParams, int /*long*/ pVarResult, int /*long*/ pExcepInfo, int /*long*/ pArgErr) {
+int Invoke (int dispIdMember, long /*int*/ riid, int lcid, int dwFlags, long /*int*/ pDispParams, long /*int*/ pVarResult, long /*int*/ pExcepInfo, long /*int*/ pArgErr) {
IE ie = (IE)((Browser)getParent ().getParent ()).webBrowser;
Hashtable functions = ie.functions;
if (functions == null) {
if (pVarResult != 0) {
- COM.MoveMemory (pVarResult, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ COM.MoveMemory (pVarResult, new long /*int*/[] {0}, C.PTR_SIZEOF);
}
return COM.S_OK;
}
@@ -724,17 +724,17 @@ int Invoke (int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, int /*lo
COM.MoveMemory (dispParams, pDispParams, DISPPARAMS.sizeof);
if (dispParams.cArgs != 3) {
if (pVarResult != 0) {
- COM.MoveMemory (pVarResult, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ COM.MoveMemory (pVarResult, new long /*int*/[] {0}, C.PTR_SIZEOF);
}
return COM.S_OK;
}
- int /*long*/ ptr = dispParams.rgvarg + 2 * Variant.sizeof;
+ long /*int*/ ptr = dispParams.rgvarg + 2 * Variant.sizeof;
Variant variant = Variant.win32_new (ptr);
if (variant.getType () != COM.VT_I4) {
variant.dispose ();
if (pVarResult != 0) {
- COM.MoveMemory (pVarResult, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ COM.MoveMemory (pVarResult, new long /*int*/[] {0}, C.PTR_SIZEOF);
}
return COM.S_OK;
}
@@ -742,7 +742,7 @@ int Invoke (int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, int /*lo
variant.dispose ();
if (index <= 0) {
if (pVarResult != 0) {
- COM.MoveMemory (pVarResult, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ COM.MoveMemory (pVarResult, new long /*int*/[] {0}, C.PTR_SIZEOF);
}
return COM.S_OK;
}
@@ -753,7 +753,7 @@ int Invoke (int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, int /*lo
if (type != COM.VT_BSTR) {
variant.dispose ();
if (pVarResult != 0) {
- COM.MoveMemory (pVarResult, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ COM.MoveMemory (pVarResult, new long /*int*/[] {0}, C.PTR_SIZEOF);
}
return COM.S_OK;
}
@@ -911,14 +911,14 @@ Variant convertToJS (Object value) {
Variant arrayType = ihtmlWindow2.getProperty (rgdispid[0]);
ihtmlWindow2.dispose ();
IDispatch arrayTypeDispatch = arrayType.getDispatch ();
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = arrayTypeDispatch.QueryInterface (COM.IIDIDispatchEx, result);
arrayType.dispose ();
if (rc != COM.S_OK) return new Variant ();
IDispatchEx arrayTypeDispatchEx = new IDispatchEx (result[0]);
result[0] = 0;
- int /*long*/ resultPtr = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof);
+ long /*int*/ resultPtr = OS.GlobalAlloc (OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof);
DISPPARAMS params = new DISPPARAMS ();
rc = arrayTypeDispatchEx.InvokeEx (COM.DISPID_VALUE, COM.LOCALE_USER_DEFAULT, COM.DISPATCH_CONSTRUCT, params, resultPtr, null, 0);
if (rc != COM.S_OK) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DragSource.java
index 28d0696e46..04f7e2efef 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DragSource.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DragSource.java
@@ -105,7 +105,7 @@ public class DragSource extends Widget {
static Callback dragSource2Args, dragSource3Args, dragSource4Args, dragSource5Args, dragSource6Args;
static final byte[] SWT_OBJECT = {'S', 'W', 'T', '_', 'O', 'B', 'J', 'E', 'C', 'T', '\0'};
- static int /*long*/ proc2 = 0, proc3 = 0, proc4 = 0, proc5 = 0, proc6 = 0;
+ static long /*int*/ proc2 = 0, proc3 = 0, proc4 = 0, proc5 = 0, proc6 = 0;
NSString paths[];
boolean exist[];
@@ -135,10 +135,10 @@ public class DragSource extends Widget {
proc6 = dragSource6Args.getAddress();
if (proc6 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
- int /*long*/ cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
+ long /*int*/ cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types);
- int /*long*/ draggedImage_endedAt_operationProc = OS.CALLBACK_draggedImage_endedAt_operation_(proc5);
+ long /*int*/ draggedImage_endedAt_operationProc = OS.CALLBACK_draggedImage_endedAt_operation_(proc5);
// Add the NSDraggingSource callbacks
OS.class_addMethod(cls, OS.sel_draggingSourceOperationMaskForLocal_, proc3, "@:I");
@@ -163,7 +163,7 @@ public class DragSource extends Widget {
static final String DEFAULT_DRAG_SOURCE_EFFECT = "DEFAULT_DRAG_SOURCE_EFFECT"; //$NON-NLS-1$
- private int /*long*/ delegateJniRef;
+ private long /*int*/ delegateJniRef;
private Point dragOffset;
/**
@@ -249,17 +249,17 @@ public DragSource(Control control, int style) {
// Tables and trees already implement dragging, so we need to override their drag methods instead of creating a dragging source.
if (control instanceof Tree || control instanceof Table) {
- int /*long*/ cls = OS.object_getClass(control.view.id);
+ long /*int*/ cls = OS.object_getClass(control.view.id);
if (cls == 0) {
DND.error(DND.ERROR_CANNOT_INIT_DRAG);
}
// If we already added it, no need to do it again.
- int /*long*/ procPtr = OS.class_getMethodImplementation(cls, OS.sel_draggingSourceOperationMaskForLocal_);
+ long /*int*/ procPtr = OS.class_getMethodImplementation(cls, OS.sel_draggingSourceOperationMaskForLocal_);
if (procPtr == proc3) return;
- int /*long*/ draggedImage_endedAt_operationProc = OS.CALLBACK_draggedImage_endedAt_operation_(proc5);
+ long /*int*/ draggedImage_endedAt_operationProc = OS.CALLBACK_draggedImage_endedAt_operation_(proc5);
// Add the NSDraggingSource overrides.
OS.class_addMethod(cls, OS.sel_draggingSourceOperationMaskForLocal_, proc3, "@:I");
@@ -312,21 +312,21 @@ public void addDragListener(DragSourceListener listener) {
addListener (DND.DragEnd, typedListener);
}
-void dndCallSuper(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1, int /*long*/ arg2) {
+void dndCallSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1, long /*int*/ arg2) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
OS.objc_msgSendSuper(super_struct, sel, arg0, arg1, arg2);
}
-void dndCallSuper(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
+void dndCallSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
OS.objc_msgSendSuper(super_struct, sel, arg0, arg1);
}
-int /*long*/ dndCallSuperObject(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3) {
+long /*int*/ dndCallSuperObject(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -413,13 +413,13 @@ void dragOutlineViewStart(Event dragDetectEvent) {
dragOffset = new Point(event.offsetX, event.offsetY);
}
-void draggedImage_beganAt(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
+void draggedImage_beganAt(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
if (new NSObject(id).isKindOfClass(OS.class_NSTableView)) {
dndCallSuper(id, sel, arg0, arg1);
}
}
-void draggedImage_endedAt_operation(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1, int /*long*/ arg2) {
+void draggedImage_endedAt_operation(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1, long /*int*/ arg2) {
int swtOperation = osOpToOp(arg2);
NSFileManager fileManager = NSFileManager.defaultManager();
if (paths != null) {
@@ -452,7 +452,7 @@ void draggedImage_endedAt_operation(int /*long*/ id, int /*long*/ sel, int /*lon
}
}
-int /*long*/ dragImageForRowsWithIndexes_tableColumns_event_offset(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3) {
+long /*int*/ dragImageForRowsWithIndexes_tableColumns_event_offset(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) {
if (dragImageFromListener != null) {
NSPoint point = new NSPoint();
point.x = dragOffset.x;
@@ -467,12 +467,12 @@ int /*long*/ dragImageForRowsWithIndexes_tableColumns_event_offset(int /*long*/
/**
* Cocoa NSDraggingSource implementations
*/
-int /*long*/ draggingSourceOperationMaskForLocal(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+long /*int*/ draggingSourceOperationMaskForLocal(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
// Drag operations are same for local or remote drags.
return dragOperations;
}
-static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel) {
+static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel) {
Display display = Display.findDisplay(Thread.currentThread());
if (display == null || display.isDisposed()) return 0;
Widget widget = display.findWidget(id);
@@ -494,7 +494,7 @@ static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel) {
return 0;
}
-static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
Display display = Display.findDisplay(Thread.currentThread());
if (display == null || display.isDisposed()) return 0;
Widget widget = display.findWidget(id);
@@ -516,7 +516,7 @@ static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel, int /*long
return 0;
}
-static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
+static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
Display display = Display.findDisplay(Thread.currentThread());
if (display == null || display.isDisposed()) return 0;
Widget widget = display.findWidget(id);
@@ -540,7 +540,7 @@ static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel, int /*long
return 0;
}
-static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2) {
+static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
Display display = Display.findDisplay(Thread.currentThread());
if (display == null || display.isDisposed()) return 0;
Widget widget = display.findWidget(id);
@@ -564,7 +564,7 @@ static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel, int /*long
return 0;
}
-static int /*long*/ dragSourceProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3) {
+static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) {
Display display = Display.findDisplay(Thread.currentThread());
if (display == null || display.isDisposed()) return 0;
Widget widget = display.findWidget(id);
@@ -658,7 +658,7 @@ public Transfer[] getTransfer(){
/**
* We always want the modifier keys to potentially update the drag.
*/
-boolean ignoreModifierKeysWhileDragging(int /*long*/ id, int /*long*/ sel) {
+boolean ignoreModifierKeysWhileDragging(long /*int*/ id, long /*int*/ sel) {
return false;
}
@@ -701,7 +701,7 @@ int opToOsOp(int operation) {
return osOperation;
}
-int osOpToOp(int /*long*/ osOperation){
+int osOpToOp(long /*int*/ osOperation){
int operation = 0;
if ((osOperation & OS.NSDragOperationCopy) != 0){
operation |= DND.DROP_COPY;
@@ -721,7 +721,7 @@ int osOpToOp(int /*long*/ osOperation){
return operation;
}
-void pasteboard_provideDataForType(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
+void pasteboard_provideDataForType(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
NSPasteboard pasteboard = new NSPasteboard(arg0);
NSString dataType = new NSString(arg1);
if (pasteboard == null || dataType == null) return;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java
index 3c1026ccd3..6383d896df 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java
@@ -77,7 +77,7 @@ import org.eclipse.swt.widgets.*;
public class DropTarget extends Widget {
static Callback dropTarget2Args, dropTarget3Args, dropTarget6Args;
- static int /*long*/ proc2Args, proc3Args, proc6Args;
+ static long /*int*/ proc2Args, proc3Args, proc6Args;
static {
Class clazz = DropTarget.class;
@@ -119,27 +119,27 @@ void addDragHandlers() {
// the types with the Control's NSView and AppKit will call the methods in the protocol
// when a drag goes over the view.
- int /*long*/ cls = OS.object_getClass(control.view.id);
+ long /*int*/ cls = OS.object_getClass(control.view.id);
if (cls == 0) {
DND.error(DND.ERROR_CANNOT_INIT_DROP);
}
// If we already added it, no need to do it again.
- int /*long*/ procPtr = OS.class_getMethodImplementation(cls, OS.sel_draggingEntered_);
+ long /*int*/ procPtr = OS.class_getMethodImplementation(cls, OS.sel_draggingEntered_);
if (procPtr == proc3Args) return;
addDragHandlers(cls);
// If the content view can be image view, then add the dragging methods to image view too.
// This is used by Label so that dragging can work even when the Label has an image set on it.
- int /*long*/ imageView = 0;
+ long /*int*/ imageView = 0;
if ((imageView = OS.objc_msgSend(control.view.id, OS.sel_getImageView)) != 0) {
cls = OS.object_getClass(imageView);
addDragHandlers(cls);
}
}
-void addDragHandlers (int /*long*/ cls) {
+void addDragHandlers (long /*int*/ cls) {
// Add the NSDraggingDestination callbacks
OS.class_addMethod(cls, OS.sel_draggingEntered_, proc3Args, "@:@");
OS.class_addMethod(cls, OS.sel_draggingUpdated_, proc3Args, "@:@");
@@ -201,7 +201,7 @@ public void addDropListener(DropTargetListener listener) {
addListener (DND.DropAccept, typedListener);
}
-int /*long*/ dndCallSuper (int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+long /*int*/ dndCallSuper (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -221,7 +221,7 @@ protected void checkSubclass () {
}
}
-int draggingEntered(int /*long*/ id, int /*long*/ sel, NSObject sender) {
+int draggingEntered(long /*int*/ id, long /*int*/ sel, NSObject sender) {
if (sender == null) return OS.NSDragOperationNone;
DNDEvent event = new DNDEvent();
@@ -272,7 +272,7 @@ int draggingEntered(int /*long*/ id, int /*long*/ sel, NSObject sender) {
return opToOsOp(selectedOperation);
}
-void draggingExited(int /*long*/ id, int /*long*/ sel, NSObject sender) {
+void draggingExited(long /*int*/ id, long /*int*/ sel, NSObject sender) {
clearDropNotAllowed();
if (keyOperation == -1) return;
keyOperation = -1;
@@ -288,7 +288,7 @@ void draggingExited(int /*long*/ id, int /*long*/ sel, NSObject sender) {
}
}
-int draggingUpdated(int /*long*/ id, int /*long*/ sel, NSObject sender) {
+int draggingUpdated(long /*int*/ id, long /*int*/ sel, NSObject sender) {
if (sender == null) return OS.NSDragOperationNone;
int oldKeyOperation = keyOperation;
@@ -417,7 +417,7 @@ public DropTarget(Control control, int style) {
addDragHandlers();
}
-static int /*long*/ dropTargetProc(int /*long*/ id, int /*long*/ sel) {
+static long /*int*/ dropTargetProc(long /*int*/ id, long /*int*/ sel) {
Display display = Display.findDisplay(Thread.currentThread());
if (display == null || display.isDisposed()) return 0;
Widget widget = display.findWidget(id);
@@ -432,7 +432,7 @@ static int /*long*/ dropTargetProc(int /*long*/ id, int /*long*/ sel) {
return 0;
}
-static int /*long*/ dropTargetProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+static long /*int*/ dropTargetProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
Display display = Display.findDisplay(Thread.currentThread());
if (display == null || display.isDisposed()) return 0;
Widget widget = display.findWidget(id);
@@ -457,7 +457,7 @@ static int /*long*/ dropTargetProc(int /*long*/ id, int /*long*/ sel, int /*long
return 0;
}
-static int /*long*/ dropTargetProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3) {
+static long /*int*/ dropTargetProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) {
Display display = Display.findDisplay(Thread.currentThread());
if (display == null || display.isDisposed()) return 0;
Widget widget = display.findWidget(id);
@@ -549,7 +549,7 @@ int getOperationFromKeyState() {
// correct Cocoa behavior. Control + Option or Command is NSDragOperationGeneric,
// or DND.DROP_DEFAULT in the SWT.
NSEvent currEvent = NSApplication.sharedApplication().currentEvent();
- int /*long*/ modifiers = currEvent.modifierFlags();
+ long /*int*/ modifiers = currEvent.modifierFlags();
boolean option = (modifiers & OS.NSAlternateKeyMask) == OS.NSAlternateKeyMask;
boolean control = (modifiers & OS.NSControlKeyMask) == OS.NSControlKeyMask;
if (control && option) return DND.DROP_DEFAULT;
@@ -598,7 +598,7 @@ int opToOsOp(int operation) {
return osOperation;
}
-int osOpToOp(int /*long*/ osOperation){
+int osOpToOp(long /*int*/ osOperation){
int operation = 0;
if ((osOperation & OS.NSDragOperationCopy) != 0){
operation |= DND.DROP_COPY;
@@ -732,7 +732,7 @@ boolean drop(NSObject sender) {
return (selectedOperation != DND.DROP_NONE);
}
-boolean performDragOperation(int /*long*/ id, int /*long*/ sel, NSObject sender) {
+boolean performDragOperation(long /*int*/ id, long /*int*/ sel, NSObject sender) {
if (new NSObject(id).isKindOfClass(OS.class_NSTableView)) {
return dndCallSuper(id, sel, sender.id) != 0;
}
@@ -740,11 +740,11 @@ boolean performDragOperation(int /*long*/ id, int /*long*/ sel, NSObject sender)
return drop (sender);
}
-boolean outlineView_acceptDrop_item_childIndex(int /*long*/ id, int /*long*/ sel, int /*long*/ outlineView, int /*long*/ info, int /*long*/ item, int /*long*/ index) {
+boolean outlineView_acceptDrop_item_childIndex(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ info, long /*int*/ item, long /*int*/ index) {
return drop(new NSObject(info));
}
-int /*long*/ outlineView_validateDrop_proposedItem_proposedChildIndex(int /*long*/ id, int /*long*/ sel, int /*long*/ outlineView, int /*long*/ info, int /*long*/ item, int /*long*/ index) {
+long /*int*/ outlineView_validateDrop_proposedItem_proposedChildIndex(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ info, long /*int*/ item, long /*int*/ index) {
//TODO expansion animation and auto collapse not working because of outlineView:shouldExpandItem:
NSOutlineView widget = new NSOutlineView(outlineView);
NSObject sender = new NSObject(info);
@@ -825,7 +825,7 @@ boolean setEventData(NSObject draggingState, DNDEvent event) {
// get allowed operations
int style = getStyle();
- int /*long*/ allowedActions = draggingState.draggingSourceOperationMask();
+ long /*int*/ allowedActions = draggingState.draggingSourceOperationMask();
int operations = osOpToOp(allowedActions) & style;
if (operations == DND.DROP_NONE) return false;
@@ -846,7 +846,7 @@ boolean setEventData(NSObject draggingState, DNDEvent event) {
NSArray draggedTypes = dragPBoard.types();
if (draggedTypes == null) return false;
- int /*long*/ draggedTypeCount = draggedTypes.count();
+ long /*int*/ draggedTypeCount = draggedTypes.count();
TransferData[] dataTypes = new TransferData[(int)draggedTypeCount];
int index = -1;
@@ -952,16 +952,16 @@ void clearDropNotAllowed() {
}
}
-boolean tableView_acceptDrop_row_dropOperation(int /*long*/ id, int /*long*/ sel, int /*long*/ tableView, int /*long*/ info, int /*long*/ row, int /*long*/ operation) {
+boolean tableView_acceptDrop_row_dropOperation(long /*int*/ id, long /*int*/ sel, long /*int*/ tableView, long /*int*/ info, long /*int*/ row, long /*int*/ operation) {
return drop(new NSObject(info));
}
-int tableView_validateDrop_proposedRow_proposedDropOperation(int /*long*/ id, int /*long*/ sel, int /*long*/ tableView, int /*long*/ info, int /*long*/ row, int /*long*/ operation) {
+int tableView_validateDrop_proposedRow_proposedDropOperation(long /*int*/ id, long /*int*/ sel, long /*int*/ tableView, long /*int*/ info, long /*int*/ row, long /*int*/ operation) {
NSTableView widget = new NSTableView(tableView);
NSObject sender = new NSObject(info);
NSPoint pt = sender.draggingLocation();
pt = widget.convertPoint_fromView_(pt, null);
- int /*long*/ hitRow = widget.rowAtPoint(pt);
+ long /*int*/ hitRow = widget.rowAtPoint(pt);
if (0 <= hitRow && hitRow < widget.numberOfRows()) {
if (feedback == 0) {
widget.setDropRow(-1, OS.NSTableViewDropOn);
@@ -982,7 +982,7 @@ int tableView_validateDrop_proposedRow_proposedDropOperation(int /*long*/ id, in
}
// By returning true we get draggingUpdated messages even when the mouse isn't moving.
-boolean wantsPeriodicDraggingUpdates(int /*long*/ id, int /*long*/ sel) {
+boolean wantsPeriodicDraggingUpdates(long /*int*/ id, long /*int*/ sel) {
return true;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TableDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TableDragSourceEffect.java
index 6d2bcdbc7b..a49c8c27c7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TableDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TableDragSourceEffect.java
@@ -79,7 +79,7 @@ public class TableDragSourceEffect extends DragSourceEffect {
if (dragSourceImage != null) dragSourceImage.dispose();
dragSourceImage = null;
NSPoint point = new NSPoint();
- int /*long*/ ptr = OS.malloc(NSPoint.sizeof);
+ long /*int*/ ptr = OS.malloc(NSPoint.sizeof);
OS.memmove(ptr, point, NSPoint.sizeof);
NSEvent nsEvent = NSApplication.sharedApplication().currentEvent();
NSTableView widget = (NSTableView)control.view;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TreeDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TreeDragSourceEffect.java
index f3f85a9b4e..43fff72ec2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TreeDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TreeDragSourceEffect.java
@@ -78,7 +78,7 @@ public class TreeDragSourceEffect extends DragSourceEffect {
if (dragSourceImage != null) dragSourceImage.dispose();
dragSourceImage = null;
NSPoint point = new NSPoint();
- int /*long*/ ptr = OS.malloc(NSPoint.sizeof);
+ long /*int*/ ptr = OS.malloc(NSPoint.sizeof);
OS.memmove(ptr, point, NSPoint.sizeof);
NSEvent nsEvent = NSApplication.sharedApplication().currentEvent();
NSTableView widget = (NSTableView)control.view;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java
index 6620e7491a..e8baa38ac0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ByteArrayTransfer.java
@@ -155,7 +155,7 @@ protected void javaToNative (Object object, TransferData transferData) {
}
byte[] buffer = (byte[])object;
if (buffer.length == 0) return;
- int /*long*/ pValue = OS.g_malloc(buffer.length);
+ long /*int*/ pValue = OS.g_malloc(buffer.length);
if (pValue == 0) return;
OS.memmove(pValue, buffer, buffer.length);
transferData.length = buffer.length;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java
index 541830fd9e..7b3f563481 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/Clipboard.java
@@ -32,14 +32,14 @@ public class Clipboard {
private Display display;
- static int /*long*/ GTKCLIPBOARD;
- static int /*long*/ GTKPRIMARYCLIPBOARD;
- private static int /*long*/ TARGET;
+ static long /*int*/ GTKCLIPBOARD;
+ static long /*int*/ GTKPRIMARYCLIPBOARD;
+ private static long /*int*/ TARGET;
static {
GTKCLIPBOARD = OS.gtk_clipboard_get(OS.GDK_NONE);
byte[] buffer = Converter.wcsToMbcs(null, "PRIMARY", true);
- int /*long*/ primary = OS.gdk_atom_intern(buffer, false);
+ long /*int*/ primary = OS.gdk_atom_intern(buffer, false);
GTKPRIMARYCLIPBOARD = OS.gtk_clipboard_get(primary);
buffer = Converter.wcsToMbcs(null, "TARGETS", true);
TARGET = OS.gdk_atom_intern(buffer, false);
@@ -287,7 +287,7 @@ public Object getContents(Transfer transfer) {
public Object getContents(Transfer transfer, int clipboards) {
checkWidget();
if (transfer == null) DND.error(SWT.ERROR_NULL_ARGUMENT);
- int /*long*/ selection_data = 0;
+ long /*int*/ selection_data = 0;
int[] typeIds = transfer.getTypeIds();
for (int i = 0; i < typeIds.length; i++) {
if ((clipboards & DND.CLIPBOARD) != 0) {
@@ -563,7 +563,7 @@ public String[] getAvailableTypeNames() {
String[] result = new String[types1.length + types2.length];
int count = 0;
for (int i = 0; i < types1.length; i++) {
- int /*long*/ pName = OS.gdk_atom_name(types1[i]);
+ long /*int*/ pName = OS.gdk_atom_name(types1[i]);
if (pName == 0) {
continue;
}
@@ -573,7 +573,7 @@ public String[] getAvailableTypeNames() {
result[count++] = "GTKCLIPBOARD "+new String (Converter.mbcsToWcs (null, buffer));
}
for (int i = 0; i < types2.length; i++) {
- int /*long*/ pName = OS.gdk_atom_name(types2[i]);
+ long /*int*/ pName = OS.gdk_atom_name(types2[i]);
if (pName == 0) {
continue;
}
@@ -592,7 +592,7 @@ public String[] getAvailableTypeNames() {
private int[] getAvailablePrimaryTypes() {
int[] types = new int[0];
- int /*long*/ selection_data = gtk_clipboard_wait_for_contents(GTKPRIMARYCLIPBOARD, TARGET);
+ long /*int*/ selection_data = gtk_clipboard_wait_for_contents(GTKPRIMARYCLIPBOARD, TARGET);
/*
* This call to gdk_threads_leave() is a temporary work around
* to avoid deadlocks when gdk_threads_init() is called by native
@@ -616,7 +616,7 @@ private int[] getAvailablePrimaryTypes() {
}
private int[] getAvailableClipboardTypes () {
int[] types = new int[0];
- int /*long*/ selection_data = gtk_clipboard_wait_for_contents(GTKCLIPBOARD, TARGET);
+ long /*int*/ selection_data = gtk_clipboard_wait_for_contents(GTKCLIPBOARD, TARGET);
/*
* This call to gdk_threads_leave() is a temporary work around
* to avoid deadlocks when gdk_threads_init() is called by native
@@ -639,11 +639,11 @@ private int[] getAvailableClipboardTypes () {
return types;
}
-int /*long*/ gtk_clipboard_wait_for_contents(int /*long*/ clipboard, int /*long*/ target) {
+long /*int*/ gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*/ target) {
String key = "org.eclipse.swt.internal.gtk.dispatchEvent";
Display display = this.display;
display.setData(key, new int[]{OS.GDK_PROPERTY_NOTIFY, OS.GDK_SELECTION_CLEAR, OS.GDK_SELECTION_REQUEST, OS.GDK_SELECTION_NOTIFY});
- int /*long*/ selection_data = OS.gtk_clipboard_wait_for_contents(clipboard, target);
+ long /*int*/ selection_data = OS.gtk_clipboard_wait_for_contents(clipboard, target);
display.setData(key, null);
return selection_data;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java
index c03768faab..b68c23e1a5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java
@@ -30,7 +30,7 @@ class ClipboardProxy {
Object[] primaryClipboardData;
Transfer[] primaryClipboardDataTypes;
- int /*long*/ clipboardOwner = OS.gtk_window_new(0);
+ long /*int*/ clipboardOwner = OS.gtk_window_new(0);
Display display;
Clipboard activeClipboard = null;
Clipboard activePrimaryClipboard = null;
@@ -72,7 +72,7 @@ void clear (Clipboard owner, int clipboards) {
}
}
-int /*long*/ clearFunc(int /*long*/ clipboard,int /*long*/ user_data_or_owner){
+long /*int*/ clearFunc(long /*int*/ clipboard,long /*int*/ user_data_or_owner){
if (clipboard == Clipboard.GTKCLIPBOARD) {
activeClipboard = null;
clipboardData = null;
@@ -119,7 +119,7 @@ void dispose () {
* This function provides the data to the clipboard on request.
* When this clipboard is disposed, the data will no longer be available.
*/
-int /*long*/ getFunc(int /*long*/ clipboard, int /*long*/ selection_data, int /*long*/ info, int /*long*/ user_data_or_owner){
+long /*int*/ getFunc(long /*int*/ clipboard, long /*int*/ selection_data, long /*int*/ info, long /*int*/ user_data_or_owner){
if (selection_data == 0) return 0;
GtkSelectionData selectionData = new GtkSelectionData();
OS.memmove(selectionData, selection_data, GtkSelectionData.sizeof);
@@ -146,7 +146,7 @@ int /*long*/ getFunc(int /*long*/ clipboard, int /*long*/ selection_data, int /*
boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipboards) {
GtkTargetEntry[] entries = new GtkTargetEntry [0];
- int /*long*/ pTargetsList = 0;
+ long /*int*/ pTargetsList = 0;
try {
for (int i = 0; i < dataTypes.length; i++) {
Transfer transfer = dataTypes[i];
@@ -156,7 +156,7 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo
GtkTargetEntry entry = new GtkTargetEntry();
entry.info = typeIds[j];
byte[] buffer = Converter.wcsToMbcs(null, typeNames[j], true);
- int /*long*/ pName = OS.g_malloc(buffer.length);
+ long /*int*/ pName = OS.g_malloc(buffer.length);
OS.memmove(pName, buffer, buffer.length);
entry.target = pName;
GtkTargetEntry[] tmp = new GtkTargetEntry [entries.length + 1];
@@ -175,8 +175,8 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo
if ((clipboards & DND.CLIPBOARD) != 0) {
clipboardData = data;
clipboardDataTypes = dataTypes;
- int /*long*/ getFuncProc = getFunc.getAddress();
- int /*long*/ clearFuncProc = clearFunc.getAddress();
+ long /*int*/ getFuncProc = getFunc.getAddress();
+ long /*int*/ clearFuncProc = clearFunc.getAddress();
/*
* Feature in GTK. When the contents are set again, clipboard_set_with_data()
* invokes clearFunc and then, getFunc is not sequentially called.
@@ -198,8 +198,8 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo
if ((clipboards & DND.SELECTION_CLIPBOARD) != 0) {
primaryClipboardData = data;
primaryClipboardDataTypes = dataTypes;
- int /*long*/ getFuncProc = getFunc.getAddress();
- int /*long*/ clearFuncProc = clearFunc.getAddress();
+ long /*int*/ getFuncProc = getFunc.getAddress();
+ long /*int*/ clearFuncProc = clearFunc.getAddress();
if (!OS.gtk_clipboard_set_with_owner (Clipboard.GTKPRIMARYCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, clipboardOwner)) {
return false;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java
index 87113a3fcc..f2c713ec68 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java
@@ -106,7 +106,7 @@ public class DragSource extends Widget {
Transfer[] transferAgents = new Transfer[0];
DragSourceEffect dragEffect;
- int /*long*/ targetList;
+ long /*int*/ targetList;
//workaround - remember action performed for DragEnd
boolean moveData = false;
@@ -207,28 +207,28 @@ static int checkStyle (int style) {
return style;
}
-static int /*long*/ DragDataDelete(int /*long*/ widget, int /*long*/ context){
+static long /*int*/ DragDataDelete(long /*int*/ widget, long /*int*/ context){
DragSource source = FindDragSource(widget);
if (source == null) return 0;
source.dragDataDelete(widget, context);
return 0;
}
-static int /*long*/ DragEnd(int /*long*/ widget, int /*long*/ context){
+static long /*int*/ DragEnd(long /*int*/ widget, long /*int*/ context){
DragSource source = FindDragSource(widget);
if (source == null) return 0;
source.dragEnd(widget, context);
return 0;
}
-static int /*long*/ DragGetData(int /*long*/ widget, int /*long*/ context, int /*long*/ selection_data, int /*long*/ info, int /*long*/ time){
+static long /*int*/ DragGetData(long /*int*/ widget, long /*int*/ context, long /*int*/ selection_data, long /*int*/ info, long /*int*/ time){
DragSource source = FindDragSource(widget);
if (source == null) return 0;
source.dragGetData(widget, context, selection_data, (int)/*64*/info, (int)/*64*/time);
return 0;
}
-static DragSource FindDragSource(int /*long*/ handle) {
+static DragSource FindDragSource(long /*int*/ handle) {
Display display = Display.findDisplay(Thread.currentThread());
if (display == null || display.isDisposed()) return null;
Widget widget = display.findWidget(handle);
@@ -297,15 +297,15 @@ void drag(Event dragEvent) {
int actions = opToOsOp(getStyle());
Image image = event.image;
- int /*long*/ context = OS.gtk_drag_begin(control.handle, targetList, actions, 1, 0);
+ long /*int*/ context = OS.gtk_drag_begin(control.handle, targetList, actions, 1, 0);
if (context != 0 && image != null) {
- int /*long*/ pixbuf = ImageList.createPixbuf(image);
+ long /*int*/ pixbuf = ImageList.createPixbuf(image);
OS.gtk_drag_set_icon_pixbuf(context, pixbuf, 0, 0);
OS.g_object_unref(pixbuf);
}
}
-void dragEnd(int /*long*/ widget, int /*long*/ context){
+void dragEnd(long /*int*/ widget, long /*int*/ context){
/*
* Bug in GTK. If a drag is initiated using gtk_drag_begin and the
* mouse is released immediately, the mouse and keyboard remain
@@ -341,7 +341,7 @@ void dragEnd(int /*long*/ widget, int /*long*/ context){
moveData = false;
}
-void dragGetData(int /*long*/ widget, int /*long*/ context, int /*long*/ selection_data, int info, int time){
+void dragGetData(long /*int*/ widget, long /*int*/ context, long /*int*/ selection_data, int info, int time){
if (selection_data == 0) return;
GtkSelectionData gtkSelectionData = new GtkSelectionData();
OS.memmove(gtkSelectionData, selection_data, GtkSelectionData.sizeof);
@@ -376,7 +376,7 @@ void dragGetData(int /*long*/ widget, int /*long*/ context, int /*long*/ selecti
return;
}
-void dragDataDelete(int /*long*/ widget, int /*long*/ context){
+void dragDataDelete(long /*int*/ widget, long /*int*/ context){
moveData = true;
}
@@ -564,7 +564,7 @@ public void setTransfer(Transfer[] transferAgents){
}
}
- int /*long*/ pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof);
+ long /*int*/ pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof);
for (int i = 0; i < targets.length; i++) {
OS.memmove(pTargets + i*GtkTargetEntry.sizeof, targets[i], GtkTargetEntry.sizeof);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java
index eeb43d3019..ba9ced6489 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java
@@ -245,33 +245,33 @@ static int checkStyle (int style) {
return style;
}
-static int /*long*/ Drag_Data_Received ( int /*long*/ widget, int /*long*/ context, int /*long*/ x, int /*long*/ y, int /*long*/ data, int /*long*/ info, int /*long*/ time){
+static long /*int*/ Drag_Data_Received ( long /*int*/ widget, long /*int*/ context, long /*int*/ x, long /*int*/ y, long /*int*/ data, long /*int*/ info, long /*int*/ time){
DropTarget target = FindDropTarget(widget);
if (target == null) return 0;
target.drag_data_received (widget, context, (int)/*64*/x, (int)/*64*/y, data, (int)/*64*/info, (int)/*64*/time);
return 0;
}
-static int /*long*/ Drag_Drop(int /*long*/ widget, int /*long*/ context, int /*long*/ x, int /*long*/ y, int /*long*/ time) {
+static long /*int*/ Drag_Drop(long /*int*/ widget, long /*int*/ context, long /*int*/ x, long /*int*/ y, long /*int*/ time) {
DropTarget target = FindDropTarget(widget);
if (target == null) return 0;
return target.drag_drop (widget, context, (int)/*64*/x, (int)/*64*/y, (int)/*64*/time) ? 1 : 0;
}
-static int /*long*/ Drag_Leave ( int /*long*/ widget, int /*long*/ context, int /*long*/ time){
+static long /*int*/ Drag_Leave ( long /*int*/ widget, long /*int*/ context, long /*int*/ time){
DropTarget target = FindDropTarget(widget);
if (target == null) return 0;
target.drag_leave (widget, context, (int)/*64*/time);
return 0;
}
-static int /*long*/ Drag_Motion ( int /*long*/ widget, int /*long*/ context, int /*long*/ x, int /*long*/ y, int /*long*/ time){
+static long /*int*/ Drag_Motion ( long /*int*/ widget, long /*int*/ context, long /*int*/ x, long /*int*/ y, long /*int*/ time){
DropTarget target = FindDropTarget(widget);
if (target == null) return 0;
return target.drag_motion (widget, context, (int)/*64*/x, (int)/*64*/y, (int)/*64*/time) ? 1 : 0;
}
-static DropTarget FindDropTarget(int /*long*/ handle) {
+static DropTarget FindDropTarget(long /*int*/ handle) {
Display display = Display.findDisplay(Thread.currentThread());
if (display == null || display.isDisposed()) return null;
Widget widget = display.findWidget(handle);
@@ -332,7 +332,7 @@ protected void checkSubclass () {
}
}
-void drag_data_received ( int /*long*/ widget, int /*long*/ context, int x, int y, int /*long*/ data, int info, int time){
+void drag_data_received ( long /*int*/ widget, long /*int*/ context, int x, int y, long /*int*/ data, int info, int time){
DNDEvent event = new DNDEvent();
if (data == 0 || !setEventData(context, x, y, time, event)) {
keyOperation = -1;
@@ -380,7 +380,7 @@ void drag_data_received ( int /*long*/ widget, int /*long*/ context, int x, int
return;
}
-boolean drag_drop(int /*long*/ widget, int /*long*/ context, int x, int y, int time) {
+boolean drag_drop(long /*int*/ widget, long /*int*/ context, int x, int y, int time) {
DNDEvent event = new DNDEvent();
if (!setEventData(context, x, y, time, event)) {
keyOperation = -1;
@@ -417,7 +417,7 @@ boolean drag_drop(int /*long*/ widget, int /*long*/ context, int x, int y, int t
return true;
}
-void drag_leave ( int /*long*/ widget, int /*long*/ context, int time){
+void drag_leave ( long /*int*/ widget, long /*int*/ context, int time){
updateDragOverHover(0, null);
if (keyOperation == -1) return;
@@ -430,7 +430,7 @@ void drag_leave ( int /*long*/ widget, int /*long*/ context, int time){
notifyListeners(DND.DragLeave, event);
}
-boolean drag_motion ( int /*long*/ widget, int /*long*/ context, int x, int y, int time){
+boolean drag_motion ( long /*int*/ widget, long /*int*/ context, int x, int y, int time){
int oldKeyOperation = keyOperation;
/*
@@ -694,7 +694,7 @@ public void setTransfer(Transfer[] transferAgents){
}
}
- int /*long*/ pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof);
+ long /*int*/ pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof);
for (int i = 0; i < targets.length; i++) {
OS.memmove(pTargets + i*GtkTargetEntry.sizeof, targets[i], GtkTargetEntry.sizeof);
}
@@ -702,7 +702,7 @@ public void setTransfer(Transfer[] transferAgents){
int actions = opToOsOp(getStyle());
if (control instanceof Combo) {
if ((control.getStyle() & SWT.READ_ONLY) == 0) {
- int /*long*/ entryHandle = OS.gtk_bin_get_child (control.handle);
+ long /*int*/ entryHandle = OS.gtk_bin_get_child (control.handle);
if (entryHandle != 0) {
OS.gtk_drag_dest_unset(entryHandle);
}
@@ -728,7 +728,7 @@ public void setDropTargetEffect(DropTargetEffect effect) {
dropEffect = effect;
}
-boolean setEventData(int /*long*/ context, int x, int y, int time, DNDEvent event) {
+boolean setEventData(long /*int*/ context, int x, int y, int time, DNDEvent event) {
if (context == 0) return false;
GdkDragContext dragContext = new GdkDragContext();
OS.memmove(dragContext, context, GdkDragContext.sizeof);
@@ -754,7 +754,7 @@ boolean setEventData(int /*long*/ context, int x, int y, int time, DNDEvent even
int length = OS.g_list_length(dragContext.targets);
TransferData[] dataTypes = new TransferData[0];
for (int i = 0; i < length; i++) {
- int /*long*/ pData = OS.g_list_nth(dragContext.targets, i);
+ long /*int*/ pData = OS.g_list_nth(dragContext.targets, i);
GtkTargetPair gtkTargetPair = new GtkTargetPair();
OS.memmove(gtkTargetPair, pData, GtkTargetPair.sizeof);
TransferData data = new TransferData();
@@ -771,7 +771,7 @@ boolean setEventData(int /*long*/ context, int x, int y, int time, DNDEvent even
}
}
if (dataTypes.length == 0) return false;
- int /*long*/ window;
+ long /*int*/ window;
if (OS.GTK_VERSION >= OS.VERSION(2, 14, 0)){
window = OS.gtk_widget_get_window (control.handle);
} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java
index 57958316ea..c8d716fc35 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java
@@ -85,13 +85,13 @@ public void javaToNative(Object object, TransferData transferData) {
if (length == 0) continue;
char[] chars = new char[length];
string.getChars(0, length, chars, 0);
- int /*long*/[] error = new int /*long*/[1];
- int /*long*/ utf8Ptr = OS.g_utf16_to_utf8(chars, chars.length, null, null, error);
+ long /*int*/[] error = new long /*int*/[1];
+ long /*int*/ utf8Ptr = OS.g_utf16_to_utf8(chars, chars.length, null, null, error);
if (error[0] != 0 || utf8Ptr == 0) continue;
- int /*long*/ localePtr = OS.g_filename_from_utf8(utf8Ptr, -1, null, null, error);
+ long /*int*/ localePtr = OS.g_filename_from_utf8(utf8Ptr, -1, null, null, error);
OS.g_free(utf8Ptr);
if (error[0] != 0 || localePtr == 0) continue;
- int /*long*/ uriPtr = OS.g_filename_to_uri(localePtr, 0, error);
+ long /*int*/ uriPtr = OS.g_filename_to_uri(localePtr, 0, error);
OS.g_free(localePtr);
if (error[0] != 0 || uriPtr == 0) continue;
length = OS.strlen(uriPtr);
@@ -111,7 +111,7 @@ public void javaToNative(Object object, TransferData transferData) {
buffer = newBuffer;
}
if (buffer.length == 0) return;
- int /*long*/ ptr = OS.g_malloc(buffer.length+1);
+ long /*int*/ ptr = OS.g_malloc(buffer.length+1);
OS.memset(ptr, '\0', buffer.length+1);
OS.memmove(ptr, buffer, buffer.length);
transferData.pValue = ptr;
@@ -137,7 +137,7 @@ public Object nativeToJava(TransferData transferData) {
OS.memmove(temp, transferData.pValue, length);
boolean gnomeList = transferData.type == GNOME_LIST_ID;
int sepLength = gnomeList ? 1 : 2;
- int /*long*/[] files = new int /*long*/[0];
+ long /*int*/[] files = new long /*int*/[0];
int offset = 0;
for (int i = 0; i < temp.length - 1; i++) {
boolean terminator = gnomeList ? temp[i] == '\n' : temp[i] == '\r' && temp[i+1] == '\n';
@@ -145,11 +145,11 @@ public Object nativeToJava(TransferData transferData) {
if (!(gnomeList && offset == 0)) {
/* The content of the first line in a gnome-list is always either 'copy' or 'cut' */
int size = i - offset;
- int /*long*/ file = OS.g_malloc(size + 1);
+ long /*int*/ file = OS.g_malloc(size + 1);
byte[] fileBuffer = new byte[size + 1];
System.arraycopy(temp, offset, fileBuffer, 0, size);
OS.memmove(file, fileBuffer, size + 1);
- int /*long*/[] newFiles = new int /*long*/[files.length + 1];
+ long /*int*/[] newFiles = new long /*int*/[files.length + 1];
System.arraycopy(files, 0, newFiles, 0, files.length);
newFiles[files.length] = file;
files = newFiles;
@@ -159,27 +159,27 @@ public Object nativeToJava(TransferData transferData) {
}
if (offset < temp.length - sepLength) {
int size = temp.length - offset;
- int /*long*/ file = OS.g_malloc(size + 1);
+ long /*int*/ file = OS.g_malloc(size + 1);
byte[] fileBuffer = new byte[size + 1];
System.arraycopy(temp, offset, fileBuffer, 0, size);
OS.memmove(file, fileBuffer, size + 1);
- int /*long*/[] newFiles = new int /*long*/[files.length + 1];
+ long /*int*/[] newFiles = new long /*int*/[files.length + 1];
System.arraycopy(files, 0, newFiles, 0, files.length);
newFiles[files.length] = file;
files = newFiles;
}
String[] fileNames = new String[0];
for (int i = 0; i < files.length; i++) {
- int /*long*/[] error = new int /*long*/[1];
- int /*long*/ localePtr = OS.g_filename_from_uri(files[i], null, error);
+ long /*int*/[] error = new long /*int*/[1];
+ long /*int*/ localePtr = OS.g_filename_from_uri(files[i], null, error);
OS.g_free(files[i]);
if (error[0] != 0 || localePtr == 0) continue;
- int /*long*/ utf8Ptr = OS.g_filename_to_utf8(localePtr, -1, null, null, null);
+ long /*int*/ utf8Ptr = OS.g_filename_to_utf8(localePtr, -1, null, null, null);
if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (localePtr);
if (localePtr != utf8Ptr) OS.g_free (localePtr);
if (utf8Ptr == 0) continue;
- int /*long*/[] items_written = new int /*long*/[1];
- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16(utf8Ptr, -1, null, items_written, null);
+ long /*int*/[] items_written = new long /*int*/[1];
+ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16(utf8Ptr, -1, null, items_written, null);
OS.g_free(utf8Ptr);
if (utf16Ptr == 0) continue;
length = (int)/*64*/items_written[0];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/HTMLTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/HTMLTransfer.java
index cd7465f614..0fa1abfb54 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/HTMLTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/HTMLTransfer.java
@@ -64,7 +64,7 @@ public void javaToNative (Object object, TransferData transferData){
String string = (String)object;
byte[] utf8 = Converter.wcsToMbcs(null, string, true);
int byteCount = utf8.length;
- int /*long*/ pValue = OS.g_malloc(byteCount);
+ long /*int*/ pValue = OS.g_malloc(byteCount);
if (pValue == 0) return;
OS.memmove(pValue, utf8, byteCount);
transferData.length = byteCount;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ImageTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ImageTransfer.java
index ffc92bbe10..ffa0b07bf6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ImageTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ImageTransfer.java
@@ -89,7 +89,7 @@ public void javaToNative(Object object, TransferData transferData) {
ImageData imgData = (ImageData)object;
if (imgData == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
Image image = new Image(Display.getCurrent(), imgData);
- int /*long*/ pixbuf = ImageList.createPixbuf(image);
+ long /*int*/ pixbuf = ImageList.createPixbuf(image);
if (pixbuf != 0) {
String typeStr = "";
if (transferData.type == JPEG_ID) typeStr = "jpeg";
@@ -104,8 +104,8 @@ public void javaToNative(Object object, TransferData transferData) {
else if (transferData.type == XPM_ID) typeStr = "xpm";
else if (transferData.type == XV_ID) typeStr = "xv";
byte[] type = Converter.wcsToMbcs(null, typeStr , true);
- int /*long*/ [] buffer = new int /*long*/ [1];
- int /*long*/ [] len = new int /*long*/ [1];
+ long /*int*/ [] buffer = new long /*int*/ [1];
+ long /*int*/ [] len = new long /*int*/ [1];
if (type == null) return;
OS.gdk_pixbuf_save_to_bufferv(pixbuf, buffer, len, type, null, null, null);
OS.g_object_unref(pixbuf);
@@ -130,11 +130,11 @@ public void javaToNative(Object object, TransferData transferData) {
public Object nativeToJava(TransferData transferData) {
ImageData imgData = null;
if (transferData.length > 0) {
- int /*long*/ loader = OS.gdk_pixbuf_loader_new();
+ long /*int*/ loader = OS.gdk_pixbuf_loader_new();
try {
OS.gdk_pixbuf_loader_write(loader, transferData.pValue, transferData.length, null);
OS.gdk_pixbuf_loader_close(loader, null);
- int /*long*/ pixbuf = OS.gdk_pixbuf_loader_get_pixbuf(loader);
+ long /*int*/ pixbuf = OS.gdk_pixbuf_loader_get_pixbuf(loader);
if (pixbuf != 0) {
Image img = Image.gtk_new_from_pixbuf(Display.getCurrent(), SWT.BITMAP, pixbuf);
imgData = img.getImageData();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/RTFTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/RTFTransfer.java
index 74aae33125..98284e6ff9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/RTFTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/RTFTransfer.java
@@ -65,7 +65,7 @@ public void javaToNative (Object object, TransferData transferData){
}
String string = (String)object;
byte [] buffer = Converter.wcsToMbcs (null, string, true);
- int /*long*/ pValue = OS.g_malloc(buffer.length);
+ long /*int*/ pValue = OS.g_malloc(buffer.length);
if (pValue == 0) return;
OS.memmove(pValue, buffer, buffer.length);
transferData.length = buffer.length - 1;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java
index 0eb7b5caee..e5917f79f7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragSourceEffect.java
@@ -88,27 +88,27 @@ public class TableDragSourceEffect extends DragSourceEffect {
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
- int /*long*/ handle = table.handle;
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
- int /*long*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new int /*long*/ [1] : null;
- int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);
+ long /*int*/ handle = table.handle;
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new long /*int*/ [1] : null;
+ long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);
if (list == 0) return null;
int count = Math.min(10, OS.g_list_length (list));
Display display = table.getDisplay();
if (count == 1) {
- int /*long*/ path = OS.g_list_nth_data (list, 0);
- int /*long*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path);
+ long /*int*/ path = OS.g_list_nth_data (list, 0);
+ long /*int*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path);
dragSourceImage = Image.gtk_new(display, SWT.ICON, pixmap, 0);
OS.gtk_tree_path_free (path);
} else {
int width = 0, height = 0;
int[] w = new int[1], h = new int[1];
int[] yy = new int[count], hh = new int[count];
- int /*long*/ [] pixmaps = new int /*long*/ [count];
+ long /*int*/ [] pixmaps = new long /*int*/ [count];
GdkRectangle rect = new GdkRectangle ();
for (int i=0; i= OS.VERSION(2, 24, 0)) {
@@ -122,10 +122,10 @@ public class TableDragSourceEffect extends DragSourceEffect {
hh[i] = h[0];
OS.gtk_tree_path_free (path);
}
- int /*long*/ source = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), width, height, -1);
- int /*long*/ gcSource = OS.gdk_gc_new(source);
- int /*long*/ mask = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), width, height, 1);
- int /*long*/ gcMask = OS.gdk_gc_new(mask);
+ long /*int*/ source = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), width, height, -1);
+ long /*int*/ gcSource = OS.gdk_gc_new(source);
+ long /*int*/ mask = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), width, height, 1);
+ long /*int*/ gcMask = OS.gdk_gc_new(mask);
GdkColor color = new GdkColor();
color.pixel = 0;
OS.gdk_gc_set_foreground(gcMask, color);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java
index dc8113624e..58710ce6a1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java
@@ -102,7 +102,7 @@ public class TableDropTargetEffect extends DropTargetEffect {
*/
public void dragLeave(DropTargetEvent event) {
Table table = (Table) control;
- int /*long*/ handle = table.handle;
+ long /*int*/ handle = table.handle;
OS.gtk_tree_view_set_drag_dest_row(handle, 0, OS.GTK_TREE_VIEW_DROP_BEFORE);
scrollBeginTime = 0;
@@ -128,15 +128,15 @@ public class TableDropTargetEffect extends DropTargetEffect {
*/
public void dragOver(DropTargetEvent event) {
Table table = (Table) control;
- int /*long*/ handle = table.handle;
+ long /*int*/ handle = table.handle;
int effect = checkEffect(event.feedback);
Point coordinates = new Point(event.x, event.y);
coordinates = table.toControl(coordinates);
- int /*long*/ [] path = new int /*long*/ [1];
+ long /*int*/ [] path = new long /*int*/ [1];
OS.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);
int index = -1;
if (path[0] != 0) {
- int /*long*/ indices = OS.gtk_tree_path_get_indices (path[0]);
+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path[0]);
if (indices != 0) {
int[] temp = new int[1];
OS.memmove (temp, indices, 4);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java
index 6e2a842c06..96b77d0b0a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java
@@ -72,9 +72,9 @@ public void javaToNative (Object object, TransferData transferData) {
String string = (String)object;
byte[] utf8 = Converter.wcsToMbcs (null, string, true);
if (transferData.type == COMPOUND_TEXT_ID) {
- int /*long*/[] encoding = new int /*long*/[1];
+ long /*int*/[] encoding = new long /*int*/[1];
int[] format = new int[1];
- int /*long*/[] ctext = new int /*long*/[1];
+ long /*int*/[] ctext = new long /*int*/[1];
int[] length = new int[1];
boolean result;
if (OS.GTK_VERSION >= OS.VERSION(2, 24, 0)) {
@@ -90,7 +90,7 @@ public void javaToNative (Object object, TransferData transferData) {
transferData.result = 1;
}
if (transferData.type == UTF8_STRING_ID) {
- int /*long*/ pValue = OS.g_malloc(utf8.length);
+ long /*int*/ pValue = OS.g_malloc(utf8.length);
if (pValue == 0) return;
OS.memmove(pValue, utf8, utf8.length);
transferData.type = UTF8_STRING_ID;
@@ -100,7 +100,7 @@ public void javaToNative (Object object, TransferData transferData) {
transferData.result = 1;
}
if (transferData.type == STRING_ID) {
- int /*long*/ string_target = OS.gdk_utf8_to_string_target(utf8);
+ long /*int*/ string_target = OS.gdk_utf8_to_string_target(utf8);
if (string_target == 0) return;
transferData.type = STRING_ID;
transferData.format = 8;
@@ -121,10 +121,10 @@ public void javaToNative (Object object, TransferData transferData) {
*/
public Object nativeToJava(TransferData transferData){
if (!isSupportedType(transferData) || transferData.pValue == 0) return null;
- int /*long*/[] list = new int /*long*/[1];
+ long /*int*/[] list = new long /*int*/[1];
int count = OS.gdk_text_property_to_utf8_list_for_display(OS.gdk_display_get_default(), transferData.type, transferData.format, transferData.pValue, transferData.length, list);
if (count == 0) return null;
- int /*long*/[] ptr = new int /*long*/[1];
+ long /*int*/[] ptr = new long /*int*/[1];
OS.memmove(ptr, list[0], OS.PTR_SIZEOF);
int length = OS.strlen(ptr[0]);
byte[] utf8 = new byte[length];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TransferData.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TransferData.java
index dc8fcfbe03..efd2f5546a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TransferData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TransferData.java
@@ -40,7 +40,7 @@ public class TransferData {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ type;
+ public long /*int*/ type;
/**
* Specifies the number of units in pValue.
@@ -86,7 +86,7 @@ public class TransferData {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ pValue;
+ public long /*int*/ pValue;
/**
* The result field contains the result of converting a
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java
index 5be5ddad9a..a4f51d4504 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java
@@ -87,27 +87,27 @@ public class TreeDragSourceEffect extends DragSourceEffect {
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
- int /*long*/ handle = tree.handle;
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
- int /*long*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new int /*long*/ [1] : null;
- int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);
+ long /*int*/ handle = tree.handle;
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new long /*int*/ [1] : null;
+ long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model);
if (list == 0) return null;
int count = Math.min(10, OS.g_list_length (list));
Display display = tree.getDisplay();
if (count == 1) {
- int /*long*/ path = OS.g_list_nth_data (list, 0);
- int /*long*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path);
+ long /*int*/ path = OS.g_list_nth_data (list, 0);
+ long /*int*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path);
dragSourceImage = Image.gtk_new(display, SWT.ICON, pixmap, 0);
OS.gtk_tree_path_free (path);
} else {
int width = 0, height = 0;
int[] w = new int[1], h = new int[1];
int[] yy = new int[count], hh = new int[count];
- int /*long*/ [] pixmaps = new int /*long*/ [count];
+ long /*int*/ [] pixmaps = new long /*int*/ [count];
GdkRectangle rect = new GdkRectangle ();
for (int i=0; i= OS.VERSION(2, 24, 0)) {
@@ -121,10 +121,10 @@ public class TreeDragSourceEffect extends DragSourceEffect {
hh[i] = h[0];
OS.gtk_tree_path_free (path);
}
- int /*long*/ source = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), width, height, -1);
- int /*long*/ gcSource = OS.gdk_gc_new(source);
- int /*long*/ mask = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), width, height, 1);
- int /*long*/ gcMask = OS.gdk_gc_new(mask);
+ long /*int*/ source = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), width, height, -1);
+ long /*int*/ gcSource = OS.gdk_gc_new(source);
+ long /*int*/ mask = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), width, height, 1);
+ long /*int*/ gcMask = OS.gdk_gc_new(mask);
GdkColor color = new GdkColor();
color.pixel = 0;
OS.gdk_gc_set_foreground(gcMask, color);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDropTargetEffect.java
index c7c5fd0ef9..b48787fc84 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDropTargetEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDropTargetEffect.java
@@ -111,7 +111,7 @@ public class TreeDropTargetEffect extends DropTargetEffect {
*/
public void dragLeave(DropTargetEvent event) {
Tree tree = (Tree) control;
- int /*long*/ handle = tree.handle;
+ long /*int*/ handle = tree.handle;
OS.gtk_tree_view_set_drag_dest_row(handle, 0, OS.GTK_TREE_VIEW_DROP_BEFORE);
scrollBeginTime = 0;
@@ -142,14 +142,14 @@ public class TreeDropTargetEffect extends DropTargetEffect {
Tree tree = (Tree) control;
int effect = checkEffect(event.feedback);
- int /*long*/ handle = tree.handle;
+ long /*int*/ handle = tree.handle;
Point coordinates = new Point(event.x, event.y);
coordinates = tree.toControl(coordinates);
- int /*long*/ [] path = new int /*long*/ [1];
+ long /*int*/ [] path = new long /*int*/ [1];
OS.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);
int index = -1;
if (path[0] != 0) {
- int /*long*/ indices = OS.gtk_tree_path_get_indices(path[0]);
+ long /*int*/ indices = OS.gtk_tree_path_get_indices(path[0]);
if (indices != 0) {
int depth = OS.gtk_tree_path_get_depth(path[0]);
int[] temp = new int[depth];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/URLTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/URLTransfer.java
index 63226b1416..7e872fbeb0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/URLTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/URLTransfer.java
@@ -66,7 +66,7 @@ public void javaToNative (Object object, TransferData transferData){
char [] chars = new char[charCount +1];
string.getChars(0, charCount , chars, 0);
int byteCount = chars.length*2;
- int /*long*/ pValue = OS.g_malloc(byteCount);
+ long /*int*/ pValue = OS.g_malloc(byteCount);
if (pValue == 0) return;
OS.memmove(pValue, chars, byteCount);
transferData.length = byteCount;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java
index d33f8815ae..40fe5bccc0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java
@@ -166,7 +166,7 @@ protected void javaToNative (Object object, TransferData transferData) {
// The caller of this method must release the data when it is done with it.
byte[] data = (byte[])object;
int size = data.length;
- int /*long*/ newPtr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, size);
+ long /*int*/ newPtr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, size);
OS.MoveMemory(newPtr, data, size);
transferData.stgmedium = new STGMEDIUM();
transferData.stgmedium.tymed = COM.TYMED_HGLOBAL;
@@ -196,10 +196,10 @@ protected Object nativeToJava(TransferData transferData) {
transferData.result = getData(data, formatetc, stgmedium);
data.Release();
if (transferData.result != COM.S_OK) return null;
- int /*long*/ hMem = stgmedium.unionField;
+ long /*int*/ hMem = stgmedium.unionField;
int size = OS.GlobalSize(hMem);
byte[] buffer = new byte[size];
- int /*long*/ ptr = OS.GlobalLock(hMem);
+ long /*int*/ ptr = OS.GlobalLock(hMem);
OS.MoveMemory(buffer, ptr, size);
OS.GlobalUnlock(hMem);
OS.GlobalFree(hMem);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java
index 913d7d839e..5567b2d88c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java
@@ -315,7 +315,7 @@ public Object getContents(Transfer transfer, int clipboards) {
* the clipboard, use PeekMessage() to enable cross thread
* message sends.
*/
- int /*long*/[] ppv = new int /*long*/[1];
+ long /*int*/[] ppv = new long /*int*/[1];
int retryCount = 0;
/* OleGetClipboard([out] ppDataObject).
* AddRef has already been called on ppDataObject by the callee and must be released by the caller.
@@ -517,15 +517,15 @@ private int AddRef() {
private void createCOMInterfaces() {
// register each of the interfaces that this object implements
iDataObject = new COMObject(new int[]{2, 0, 0, 2, 2, 1, 2, 3, 2, 4, 1, 1}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return GetData(args[0], args[1]);}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return GetData(args[0], args[1]);}
// method4 GetDataHere - not implemented
- public int /*long*/ method5(int /*long*/[] args) {return QueryGetData(args[0]);}
+ public long /*int*/ method5(long /*int*/[] args) {return QueryGetData(args[0]);}
// method6 GetCanonicalFormatEtc - not implemented
// method7 SetData - not implemented
- public int /*long*/ method8(int /*long*/[] args) {return EnumFormatEtc((int)/*64*/args[0], args[1]);}
+ public long /*int*/ method8(long /*int*/[] args) {return EnumFormatEtc((int)/*64*/args[0], args[1]);}
// method9 DAdvise - not implemented
// method10 DUnadvise - not implemented
// method11 EnumDAdvise - not implemented
@@ -541,7 +541,7 @@ private void disposeCOMInterfaces() {
* Ownership of ppenumFormatetc transfers from callee to caller so reference count on ppenumFormatetc
* must be incremented before returning. Caller is responsible for releasing ppenumFormatetc.
*/
-private int EnumFormatEtc(int dwDirection, int /*long*/ ppenumFormatetc) {
+private int EnumFormatEtc(int dwDirection, long /*int*/ ppenumFormatetc) {
// only allow getting of data - SetData is not currently supported
if (dwDirection == COM.DATADIR_SET) return COM.E_NOTIMPL;
// what types have been registered?
@@ -567,10 +567,10 @@ private int EnumFormatEtc(int dwDirection, int /*long*/ ppenumFormatetc) {
dropeffect.tymed = COM.TYMED_HGLOBAL;
formats[formats.length -1] = dropeffect;
enumFORMATETC.setFormats(formats);
- OS.MoveMemory(ppenumFormatetc, new int /*long*/[] {enumFORMATETC.getAddress()}, OS.PTR_SIZEOF);
+ OS.MoveMemory(ppenumFormatetc, new long /*int*/[] {enumFORMATETC.getAddress()}, OS.PTR_SIZEOF);
return COM.S_OK;
}
-private int GetData(int /*long*/ pFormatetc, int /*long*/ pmedium) {
+private int GetData(long /*int*/ pFormatetc, long /*int*/ pmedium) {
/* Called by a data consumer to obtain data from a source data object.
The GetData method renders the data described in the specified FORMATETC
structure and transfers it through the specified STGMEDIUM structure.
@@ -612,7 +612,7 @@ private int GetData(int /*long*/ pFormatetc, int /*long*/ pmedium) {
return transferData.result;
}
-private int QueryGetData(int /*long*/ pFormatetc) {
+private int QueryGetData(long /*int*/ pFormatetc) {
if (transferAgents == null) return COM.E_FAIL;
TransferData transferData = new TransferData();
transferData.formatetc = new FORMATETC();
@@ -631,16 +631,16 @@ private int QueryGetData(int /*long*/ pFormatetc) {
* Ownership of ppvObject transfers from callee to caller so reference count on ppvObject
* must be incremented before returning. Caller is responsible for releasing ppvObject.
*/
-private int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) {
+private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG;
GUID guid = new GUID();
COM.MoveMemory(guid, riid, GUID.sizeof);
if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIDataObject) ) {
- OS.MoveMemory(ppvObject, new int /*long*/[] {iDataObject.getAddress()}, OS.PTR_SIZEOF);
+ OS.MoveMemory(ppvObject, new long /*int*/[] {iDataObject.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
- OS.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ OS.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
private int Release() {
@@ -765,13 +765,13 @@ public String[] getAvailableTypeNames() {
private FORMATETC[] _getAvailableTypes() {
FORMATETC[] types = new FORMATETC[0];
- int /*long*/[] ppv = new int /*long*/[1];
+ long /*int*/[] ppv = new long /*int*/[1];
/* OleGetClipboard([out] ppDataObject).
* AddRef has already been called on ppDataObject by the callee and must be released by the caller.
*/
if (COM.OleGetClipboard(ppv) != COM.S_OK) return types;
IDataObject dataObject = new IDataObject(ppv[0]);
- int /*long*/[] ppFormatetc = new int /*long*/[1];
+ long /*int*/[] ppFormatetc = new long /*int*/[1];
/* EnumFormatEtc([in] dwDirection, [out] ppenumFormatetc)
* AddRef has already been called on ppenumFormatetc by the callee and must be released by the caller.
*/
@@ -780,7 +780,7 @@ private FORMATETC[] _getAvailableTypes() {
if (rc != COM.S_OK)return types;
IEnumFORMATETC enumFormatetc = new IEnumFORMATETC(ppFormatetc[0]);
// Loop over enumerator and save any types that match what we are looking for
- int /*long*/ rgelt = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, FORMATETC.sizeof);
+ long /*int*/ rgelt = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, FORMATETC.sizeof);
int[] pceltFetched = new int[1];
enumFormatetc.Reset();
while (enumFormatetc.Next(1, rgelt, pceltFetched) == COM.S_OK && pceltFetched[0] == 1) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java
index 4e83e954f1..592b959aed 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java
@@ -107,7 +107,7 @@ public class DragSource extends Widget {
Transfer[] transferAgents = new Transfer[0];
DragSourceEffect dragEffect;
Composite topControl;
- int /*long*/ hwndDrag;
+ long /*int*/ hwndDrag;
// ole interfaces
COMObject iDropSource;
@@ -245,23 +245,23 @@ private int AddRef() {
private void createCOMInterfaces() {
// register each of the interfaces that this object implements
iDropSource = new COMObject(new int[]{2, 0, 0, 2, 1}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return QueryContinueDrag((int)/*64*/args[0], (int)/*64*/args[1]);}
- public int /*long*/ method4(int /*long*/[] args) {return GiveFeedback((int)/*64*/args[0]);}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return QueryContinueDrag((int)/*64*/args[0], (int)/*64*/args[1]);}
+ public long /*int*/ method4(long /*int*/[] args) {return GiveFeedback((int)/*64*/args[0]);}
};
iDataObject = new COMObject(new int[]{2, 0, 0, 2, 2, 1, 2, 3, 2, 4, 1, 1}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return GetData(args[0], args[1]);}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return GetData(args[0], args[1]);}
// method4 GetDataHere - not implemented
- public int /*long*/ method5(int /*long*/[] args) {return QueryGetData(args[0]);}
+ public long /*int*/ method5(long /*int*/[] args) {return QueryGetData(args[0]);}
// method6 GetCanonicalFormatEtc - not implemented
- public int /*long*/ method7(int /*long*/[] args) {return SetData(args[0], args[1], (int)/*64*/args[2]);}
- public int /*long*/ method8(int /*long*/[] args) {return EnumFormatEtc((int)/*64*/args[0], args[1]);}
+ public long /*int*/ method7(long /*int*/[] args) {return SetData(args[0], args[1], (int)/*64*/args[2]);}
+ public long /*int*/ method8(long /*int*/[] args) {return EnumFormatEtc((int)/*64*/args[0], args[1]);}
// method9 DAdvise - not implemented
// method10 DUnadvise - not implemented
// method11 EnumDAdvise - not implemented
@@ -394,7 +394,7 @@ private void drag(Event dragEvent) {
* Ownership of ppenumFormatetc transfers from callee to caller so reference count on ppenumFormatetc
* must be incremented before returning. Caller is responsible for releasing ppenumFormatetc.
*/
-private int EnumFormatEtc(int dwDirection, int /*long*/ ppenumFormatetc) {
+private int EnumFormatEtc(int dwDirection, long /*int*/ ppenumFormatetc) {
// only allow getting of data - SetData is not currently supported
if (dwDirection == COM.DATADIR_SET) return COM.E_NOTIMPL;
@@ -420,7 +420,7 @@ private int EnumFormatEtc(int dwDirection, int /*long*/ ppenumFormatetc) {
}
enumFORMATETC.setFormats(formats);
- OS.MoveMemory(ppenumFormatetc, new int /*long*/[] {enumFORMATETC.getAddress()}, OS.PTR_SIZEOF);
+ OS.MoveMemory(ppenumFormatetc, new long /*int*/[] {enumFORMATETC.getAddress()}, OS.PTR_SIZEOF);
return COM.S_OK;
}
/**
@@ -433,7 +433,7 @@ public Control getControl() {
return control;
}
-private int GetData(int /*long*/ pFormatetc, int /*long*/ pmedium) {
+private int GetData(long /*int*/ pFormatetc, long /*int*/ pmedium) {
/* Called by a data consumer to obtain data from a source data object.
The GetData method renders the data described in the specified FORMATETC
structure and transfers it through the specified STGMEDIUM structure.
@@ -608,7 +608,7 @@ private int osToOp(int osOperation){
return operation;
}
-private int QueryGetData(int /*long*/ pFormatetc) {
+private int QueryGetData(long /*int*/ pFormatetc) {
if (transferAgents == null) return COM.E_FAIL;
TransferData transferData = new TransferData();
transferData.formatetc = new FORMATETC();
@@ -629,25 +629,25 @@ private int QueryGetData(int /*long*/ pFormatetc) {
* Ownership of ppvObject transfers from callee to caller so reference count on ppvObject
* must be incremented before returning. Caller is responsible for releasing ppvObject.
*/
-private int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) {
+private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0)
return COM.E_INVALIDARG;
GUID guid = new GUID();
COM.MoveMemory(guid, riid, GUID.sizeof);
if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIDropSource)) {
- OS.MoveMemory(ppvObject, new int /*long*/[] {iDropSource.getAddress()}, OS.PTR_SIZEOF);
+ OS.MoveMemory(ppvObject, new long /*int*/[] {iDropSource.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
if (COM.IsEqualGUID(guid, COM.IIDIDataObject) ) {
- OS.MoveMemory(ppvObject, new int /*long*/[] {iDataObject.getAddress()}, OS.PTR_SIZEOF);
+ OS.MoveMemory(ppvObject, new long /*int*/[] {iDataObject.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
- OS.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ OS.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
@@ -687,7 +687,7 @@ public void removeDragListener(DragSourceListener listener) {
removeListener(DND.DragEnd, listener);
}
-private int SetData(int /*long*/ pFormatetc, int /*long*/ pmedium, int fRelease) {
+private int SetData(long /*int*/ pFormatetc, long /*int*/ pmedium, int fRelease) {
if (pFormatetc == 0 || pmedium == 0) return COM.E_INVALIDARG;
FORMATETC formatetc = new FORMATETC();
COM.MoveMemory(formatetc, pFormatetc, FORMATETC.sizeof);
@@ -695,7 +695,7 @@ private int SetData(int /*long*/ pFormatetc, int /*long*/ pmedium, int fRelease)
STGMEDIUM stgmedium = new STGMEDIUM();
COM.MoveMemory(stgmedium, pmedium,STGMEDIUM.sizeof);
//TODO - this should be GlobalLock()
- int /*long*/[] ptrEffect = new int /*long*/[1];
+ long /*int*/[] ptrEffect = new long /*int*/[1];
OS.MoveMemory(ptrEffect, stgmedium.unionField, OS.PTR_SIZEOF);
int[] effect = new int[1];
OS.MoveMemory(effect, ptrEffect[0], 4);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java
index fe7785ec2e..1cb6c67392 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java
@@ -235,25 +235,25 @@ void createCOMInterfaces() {
// register each of the interfaces that this object implements
boolean is32 = C.PTR_SIZEOF == 4;
iDropTarget = new COMObject(new int[]{2, 0, 0, is32 ? 5 : 4, is32 ? 4 : 3, 0, is32 ? 5 : 4}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {
if (args.length == 5) {
return DragEnter(args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4]);
} else {
return DragEnter_64(args[0], (int)/*64*/args[1], args[2], args[3]);
}
}
- public int /*long*/ method4(int /*long*/[] args) {
+ public long /*int*/ method4(long /*int*/[] args) {
if (args.length == 4) {
return DragOver((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3]);
} else {
return DragOver_64((int)/*64*/args[0], args[1], args[2]);
}
}
- public int /*long*/ method5(int /*long*/[] args) {return DragLeave();}
- public int /*long*/ method6(int /*long*/[] args) {
+ public long /*int*/ method5(long /*int*/[] args) {return DragLeave();}
+ public long /*int*/ method6(long /*int*/[] args) {
if (args.length == 5) {
return Drop(args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4]);
} else {
@@ -269,13 +269,13 @@ void disposeCOMInterfaces() {
iDropTarget = null;
}
-int DragEnter_64(int /*long*/ pDataObject, int grfKeyState, long pt, int /*long*/ pdwEffect) {
+int DragEnter_64(long /*int*/ pDataObject, int grfKeyState, long pt, long /*int*/ pdwEffect) {
POINT point = new POINT();
OS.MoveMemory(point, new long[]{pt}, 8);
return DragEnter(pDataObject, grfKeyState, point.x, point.y, pdwEffect);
}
-int DragEnter(int /*long*/ pDataObject, int grfKeyState, int pt_x, int pt_y, int /*long*/ pdwEffect) {
+int DragEnter(long /*int*/ pDataObject, int grfKeyState, int pt_x, int pt_y, long /*int*/ pdwEffect) {
selectedDataType = null;
selectedOperation = DND.DROP_NONE;
if (iDataObject != null) iDataObject.Release();
@@ -334,13 +334,13 @@ int DragLeave() {
return COM.S_OK;
}
-int DragOver_64(int grfKeyState, long pt, int /*long*/ pdwEffect) {
+int DragOver_64(int grfKeyState, long pt, long /*int*/ pdwEffect) {
POINT point = new POINT();
OS.MoveMemory(point, new long[]{pt}, 8);
return DragOver(grfKeyState, point.x, point.y, pdwEffect);
}
-int DragOver(int grfKeyState, int pt_x, int pt_y, int /*long*/ pdwEffect) {
+int DragOver(int grfKeyState, int pt_x, int pt_y, long /*int*/ pdwEffect) {
if (iDataObject == null) return COM.S_FALSE;
int oldKeyOperation = keyOperation;
@@ -386,13 +386,13 @@ int DragOver(int grfKeyState, int pt_x, int pt_y, int /*long*/ pdwEffect) {
return COM.S_OK;
}
-int Drop_64(int /*long*/ pDataObject, int grfKeyState, long pt, int /*long*/ pdwEffect) {
+int Drop_64(long /*int*/ pDataObject, int grfKeyState, long pt, long /*int*/ pdwEffect) {
POINT point = new POINT();
OS.MoveMemory(point, new long[]{pt}, 8);
return Drop(pDataObject, grfKeyState, point.x, point.y, pdwEffect);
}
-int Drop(int /*long*/ pDataObject, int grfKeyState, int pt_x, int pt_y, int /*long*/ pdwEffect) {
+int Drop(long /*int*/ pDataObject, int grfKeyState, int pt_x, int pt_y, long /*int*/ pdwEffect) {
DNDEvent event = new DNDEvent();
event.widget = this;
event.time = OS.GetMessageTime();
@@ -608,19 +608,19 @@ int osToOp(int osOperation){
* Ownership of ppvObject transfers from callee to caller so reference count on ppvObject
* must be incremented before returning. Caller is responsible for releasing ppvObject.
*/
-int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0)
return COM.E_INVALIDARG;
GUID guid = new GUID();
COM.MoveMemory(guid, riid, GUID.sizeof);
if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIDropTarget)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iDropTarget.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iDropTarget.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
- COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
@@ -639,7 +639,7 @@ int Release() {
void refresh() {
if (control == null || control.isDisposed()) return;
- int /*long*/ handle = control.handle;
+ long /*int*/ handle = control.handle;
RECT lpRect = new RECT();
if (OS.GetUpdateRect(handle, lpRect, false)) {
OS.ImageList_DragShowNolock(false);
@@ -689,7 +689,7 @@ public void setDropTargetEffect(DropTargetEffect effect) {
dropEffect = effect;
}
-boolean setEventData(DNDEvent event, int /*long*/ pDataObject, int grfKeyState, int pt_x, int pt_y, int /*long*/ pdwEffect) {
+boolean setEventData(DNDEvent event, long /*int*/ pDataObject, int grfKeyState, int pt_x, int pt_y, long /*int*/ pdwEffect) {
if (pDataObject == 0 || pdwEffect == 0) return false;
// get allowed operations
@@ -715,14 +715,14 @@ boolean setEventData(DNDEvent event, int /*long*/ pDataObject, int grfKeyState,
IDataObject dataObject = new IDataObject(pDataObject);
dataObject.AddRef();
try {
- int /*long*/[] address = new int /*long*/[1];
+ long /*int*/[] address = new long /*int*/[1];
if (dataObject.EnumFormatEtc(COM.DATADIR_GET, address) != COM.S_OK) {
return false;
}
IEnumFORMATETC enumFormatetc = new IEnumFORMATETC(address[0]);
try {
// Loop over enumerator and save any types that match what we are looking for
- int /*long*/ rgelt = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, FORMATETC.sizeof);
+ long /*int*/ rgelt = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, FORMATETC.sizeof);
try {
int[] pceltFetched = new int[1];
enumFormatetc.Reset();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java
index 8acb6456d1..d61488d82a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java
@@ -82,7 +82,7 @@ public void javaToNative(Object object, TransferData transferData) {
// Allocate the memory because the caller (DropTarget) has not handed it in
// The caller of this method must release the data when it is done with it.
int byteCount = buffer.length() * TCHAR.sizeof;
- int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, DROPFILES.sizeof + byteCount);
+ long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, DROPFILES.sizeof + byteCount);
OS.MoveMemory(newPtr, dropfiles, DROPFILES.sizeof);
OS.MoveMemory(newPtr + DROPFILES.sizeof, buffer, byteCount);
transferData.stgmedium = new STGMEDIUM();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java
index 9664d49d67..2de209857a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java
@@ -107,7 +107,7 @@ public void javaToNative (Object object, TransferData transferData){
chars = new char[count + 1];
buffer.getChars(0, count, chars, 0);
cchMultiByte = OS.WideCharToMultiByte(OS.CP_UTF8, 0, chars, -1, null, 0, null, null);
- int /*long*/ lpMultiByteStr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, cchMultiByte);
+ long /*int*/ lpMultiByteStr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, cchMultiByte);
OS.WideCharToMultiByte(OS.CP_UTF8, 0, chars, -1, lpMultiByteStr, cchMultiByte, null, null);
transferData.stgmedium = new STGMEDIUM();
transferData.stgmedium.tymed = COM.TYMED_HGLOBAL;
@@ -137,10 +137,10 @@ public Object nativeToJava(TransferData transferData){
transferData.result = getData(data, formatetc, stgmedium);
data.Release();
if (transferData.result != COM.S_OK) return null;
- int /*long*/ hMem = stgmedium.unionField;
+ long /*int*/ hMem = stgmedium.unionField;
try {
- int /*long*/ lpMultiByteStr = OS.GlobalLock(hMem);
+ long /*int*/ lpMultiByteStr = OS.GlobalLock(hMem);
if (lpMultiByteStr == 0) return null;
try {
/* NOTE: CF_HTML uses UTF-8 encoding.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ImageTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ImageTransfer.java
index 426adf1bcf..5021362050 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ImageTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ImageTransfer.java
@@ -96,9 +96,9 @@ public void javaToNative(Object object, TransferData transferData) {
offset += 4;
}
}
- int /*long*/ newPtr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, BITMAPINFOHEADER.sizeof + colorSize + imageSize);
+ long /*int*/ newPtr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, BITMAPINFOHEADER.sizeof + colorSize + imageSize);
OS.MoveMemory(newPtr, bmi, bmi.length);
- int /*long*/ pBitDest = newPtr + BITMAPINFOHEADER.sizeof + colorSize;
+ long /*int*/ pBitDest = newPtr + BITMAPINFOHEADER.sizeof + colorSize;
if (imageHeight <= 0) {
OS.MoveMemory(pBitDest, imgData.data, imageSize);
@@ -146,18 +146,18 @@ public Object nativeToJava(TransferData transferData) {
transferData.result = getData(dataObject, formatetc, stgmedium);
if (transferData.result != COM.S_OK) return null;
- int /*long*/ hMem = stgmedium.unionField;
+ long /*int*/ hMem = stgmedium.unionField;
dataObject.Release();
try {
- int /*long*/ ptr = OS.GlobalLock(hMem);
+ long /*int*/ ptr = OS.GlobalLock(hMem);
if (ptr == 0) return null;
try {
BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER();
OS.MoveMemory(bmiHeader, ptr, BITMAPINFOHEADER.sizeof);
- int /*long*/[] pBits = new int /*long*/[1];
- int /*long*/ memDib = OS.CreateDIBSection(0, ptr, OS.DIB_RGB_COLORS, pBits, 0, 0);
+ long /*int*/[] pBits = new long /*int*/[1];
+ long /*int*/ memDib = OS.CreateDIBSection(0, ptr, OS.DIB_RGB_COLORS, pBits, 0, 0);
if (memDib == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ bits = ptr + bmiHeader.biSize;
+ long /*int*/ bits = ptr + bmiHeader.biSize;
if (bmiHeader.biBitCount <= 8) {
bits += (bmiHeader.biClrUsed == 0 ? (1 << bmiHeader.biBitCount) : bmiHeader.biClrUsed) * 4;
} else if (bmiHeader.biCompression == OS.BI_BITFIELDS) {
@@ -170,8 +170,8 @@ public Object nativeToJava(TransferData transferData) {
OS.GetObject(memDib, DIBSECTION.sizeof, dib);
int biHeight = dib.biHeight;
int scanline = dib.biSizeImage / biHeight;
- int /*long*/ pDestBits = pBits[0];
- int /*long*/ pSourceBits = bits + scanline * (biHeight - 1);
+ long /*int*/ pDestBits = pBits[0];
+ long /*int*/ pSourceBits = bits + scanline * (biHeight - 1);
for (int i = 0; i < biHeight; i++) {
OS.MoveMemory(pDestBits, pSourceBits, scanline);
pDestBits += scanline;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java
index b4f06ff70e..eb4fd77aa3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java
@@ -35,17 +35,17 @@ int AddRef() {
private void createCOMInterfaces() {
// register each of the interfaces that this object implements
iUnknown = new COMObject(new int[] {2, 0, 0}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
};
iEnumFORMATETC = new COMObject(new int[] {2, 0, 0, 3, 1, 0, 1}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return Next((int)/*64*/args[0], args[1], args[2]);}
- public int /*long*/ method4(int /*long*/[] args) {return Skip((int)/*64*/args[0]);}
- public int /*long*/ method5(int /*long*/[] args) {return Reset();}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return Next((int)/*64*/args[0], args[1], args[2]);}
+ public long /*int*/ method4(long /*int*/[] args) {return Skip((int)/*64*/args[0]);}
+ public long /*int*/ method5(long /*int*/[] args) {return Reset();}
// method6 Clone - not implemented
};
}
@@ -59,7 +59,7 @@ private void disposeCOMInterfaces() {
iEnumFORMATETC.dispose();
iEnumFORMATETC = null;
}
-int /*long*/ getAddress() {
+long /*int*/ getAddress() {
return iEnumFORMATETC.getAddress();
}
private FORMATETC[] getNextItems(int numItems){
@@ -78,7 +78,7 @@ private FORMATETC[] getNextItems(int numItems){
return items;
}
-private int Next(int celt, int /*long*/ rgelt, int /*long*/ pceltFetched) {
+private int Next(int celt, long /*int*/ rgelt, long /*int*/ pceltFetched) {
/* Retrieves the next celt items in the enumeration sequence.
If there are fewer than the requested number of elements left in the sequence,
it retrieves the remaining elements.
@@ -108,7 +108,7 @@ private int Next(int celt, int /*long*/ rgelt, int /*long*/ pceltFetched) {
}
return COM.S_FALSE;
}
-private int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) {
+private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return COM.E_NOINTERFACE;
@@ -116,16 +116,16 @@ private int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) {
COM.MoveMemory(guid, riid, GUID.sizeof);
if (COM.IsEqualGUID(guid, COM.IIDIUnknown)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iUnknown.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iUnknown.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
if (COM.IsEqualGUID(guid, COM.IIDIEnumFORMATETC)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iEnumFORMATETC.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iEnumFORMATETC.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
- COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
int Release() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java
index f8da4986c4..9b21730ad4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java
@@ -70,7 +70,7 @@ public void javaToNative (Object object, TransferData transferData){
transferData.result = COM.DV_E_STGMEDIUM;
return;
}
- int /*long*/ lpMultiByteStr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, cchMultiByte);
+ long /*int*/ lpMultiByteStr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, cchMultiByte);
OS.WideCharToMultiByte(codePage, 0, chars, -1, lpMultiByteStr, cchMultiByte, null, null);
transferData.stgmedium = new STGMEDIUM();
transferData.stgmedium.tymed = COM.TYMED_HGLOBAL;
@@ -100,9 +100,9 @@ public Object nativeToJava(TransferData transferData){
transferData.result = getData(data, formatetc, stgmedium);
data.Release();
if (transferData.result != COM.S_OK) return null;
- int /*long*/ hMem = stgmedium.unionField;
+ long /*int*/ hMem = stgmedium.unionField;
try {
- int /*long*/ lpMultiByteStr = OS.GlobalLock(hMem);
+ long /*int*/ lpMultiByteStr = OS.GlobalLock(hMem);
if (lpMultiByteStr == 0) return null;
try {
int codePage = OS.GetACP();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java
index bc25bd33ae..f3373f7aa3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java
@@ -88,7 +88,7 @@ public class TableDragSourceEffect extends DragSourceEffect {
event.offsetX = shdi.ptOffset.x;
}
event.offsetY = shdi.ptOffset.y;
- int /*long*/ hImage = shdi.hbmpDragImage;
+ long /*int*/ hImage = shdi.hbmpDragImage;
if (hImage != 0) {
BITMAP bm = new BITMAP ();
OS.GetObject (hImage, BITMAP.sizeof, bm);
@@ -96,10 +96,10 @@ public class TableDragSourceEffect extends DragSourceEffect {
int srcHeight = bm.bmHeight;
/* Create resources */
- int /*long*/ hdc = OS.GetDC (0);
- int /*long*/ srcHdc = OS.CreateCompatibleDC (hdc);
- int /*long*/ oldSrcBitmap = OS.SelectObject (srcHdc, hImage);
- int /*long*/ memHdc = OS.CreateCompatibleDC (hdc);
+ long /*int*/ hdc = OS.GetDC (0);
+ long /*int*/ srcHdc = OS.CreateCompatibleDC (hdc);
+ long /*int*/ oldSrcBitmap = OS.SelectObject (srcHdc, hImage);
+ long /*int*/ memHdc = OS.CreateCompatibleDC (hdc);
BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER ();
bmiHeader.biSize = BITMAPINFOHEADER.sizeof;
bmiHeader.biWidth = srcWidth;
@@ -109,10 +109,10 @@ public class TableDragSourceEffect extends DragSourceEffect {
bmiHeader.biCompression = OS.BI_RGB;
byte [] bmi = new byte[BITMAPINFOHEADER.sizeof];
OS.MoveMemory (bmi, bmiHeader, BITMAPINFOHEADER.sizeof);
- int /*long*/ [] pBits = new int /*long*/ [1];
- int /*long*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
+ long /*int*/ [] pBits = new long /*int*/ [1];
+ long /*int*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
if (memDib == 0) SWT.error (SWT.ERROR_NO_HANDLES);
- int /*long*/ oldMemBitmap = OS.SelectObject (memHdc, memDib);
+ long /*int*/ oldMemBitmap = OS.SelectObject (memHdc, memDib);
BITMAP dibBM = new BITMAP ();
OS.GetObject (memDib, BITMAP.sizeof, dibBM);
@@ -158,32 +158,32 @@ public class TableDragSourceEffect extends DragSourceEffect {
if (table.isListening (SWT.EraseItem) || table.isListening (SWT.PaintItem)) return null;
TableItem[] selection = table.getSelection();
if (selection.length == 0) return null;
- int /*long*/ tableImageList = OS.SendMessage (table.handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0);
+ long /*int*/ tableImageList = OS.SendMessage (table.handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0);
if (tableImageList != 0) {
int count = Math.min(selection.length, 10);
Rectangle bounds = selection[0].getBounds(0);
for (int i = 1; i < count; i++) {
bounds = bounds.union(selection[i].getBounds(0));
}
- int /*long*/ hDC = OS.GetDC(0);
- int /*long*/ hDC1 = OS.CreateCompatibleDC(hDC);
+ long /*int*/ hDC = OS.GetDC(0);
+ long /*int*/ hDC1 = OS.CreateCompatibleDC(hDC);
if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION(4, 10)) {
if ((table.getStyle() & SWT.RIGHT_TO_LEFT) != 0) {
OS.SetLayout(hDC1, OS.LAYOUT_RTL | OS.LAYOUT_BITMAPORIENTATIONPRESERVED);
}
}
- int /*long*/ bitmap = OS.CreateCompatibleBitmap(hDC, bounds.width, bounds.height);
- int /*long*/ hOldBitmap = OS.SelectObject(hDC1, bitmap);
+ long /*int*/ bitmap = OS.CreateCompatibleBitmap(hDC, bounds.width, bounds.height);
+ long /*int*/ hOldBitmap = OS.SelectObject(hDC1, bitmap);
RECT rect = new RECT();
rect.right = bounds.width;
rect.bottom = bounds.height;
- int /*long*/ hBrush = OS.GetStockObject(OS.WHITE_BRUSH);
+ long /*int*/ hBrush = OS.GetStockObject(OS.WHITE_BRUSH);
OS.FillRect(hDC1, rect, hBrush);
for (int i = 0; i < count; i++) {
TableItem selected = selection[i];
Rectangle cell = selected.getBounds(0);
POINT pt = new POINT();
- int /*long*/ imageList = OS.SendMessage (table.handle, OS.LVM_CREATEDRAGIMAGE, table.indexOf(selected), pt);
+ long /*int*/ imageList = OS.SendMessage (table.handle, OS.LVM_CREATEDRAGIMAGE, table.indexOf(selected), pt);
OS.ImageList_Draw(imageList, 0, hDC1, cell.x - bounds.x, cell.y - bounds.y, OS.ILD_SELECTED);
OS.ImageList_Destroy(imageList);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java
index c53d8e5e3b..8693f66160 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java
@@ -106,7 +106,7 @@ public class TableDropTargetEffect extends DropTargetEffect {
*/
public void dragLeave(DropTargetEvent event) {
Table table = (Table) control;
- int /*long*/ handle = table.handle;
+ long /*int*/ handle = table.handle;
if (dropHighlight != null) {
LVITEM lvItem = new LVITEM ();
lvItem.stateMask = OS.LVIS_DROPHILITED;
@@ -146,7 +146,7 @@ public class TableDropTargetEffect extends DropTargetEffect {
public void dragOver(DropTargetEvent event) {
Table table = (Table) getControl();
int effect = checkEffect(event.feedback);
- int /*long*/ handle = table.handle;
+ long /*int*/ handle = table.handle;
Point coordinates = new Point(event.x, event.y);
coordinates = table.toControl(coordinates);
LVHITTESTINFO pinfo = new LVHITTESTINFO();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java
index 97b3a177b8..06a1449c53 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java
@@ -74,7 +74,7 @@ public void javaToNative (Object object, TransferData transferData){
char[] chars = new char[charCount+1];
string.getChars (0, charCount, chars, 0);
int byteCount = chars.length * 2;
- int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, byteCount);
+ long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, byteCount);
OS.MoveMemory(newPtr, chars, byteCount);
transferData.stgmedium = new STGMEDIUM();
transferData.stgmedium.tymed = COM.TYMED_HGLOBAL;
@@ -94,7 +94,7 @@ public void javaToNative (Object object, TransferData transferData){
transferData.result = COM.DV_E_STGMEDIUM;
return;
}
- int /*long*/ lpMultiByteStr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, cchMultiByte);
+ long /*int*/ lpMultiByteStr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, cchMultiByte);
OS.WideCharToMultiByte(codePage, 0, chars, -1, lpMultiByteStr, cchMultiByte, null, null);
transferData.stgmedium = new STGMEDIUM();
transferData.stgmedium.tymed = COM.TYMED_HGLOBAL;
@@ -127,7 +127,7 @@ public Object nativeToJava(TransferData transferData){
transferData.result = getData(data, formatetc, stgmedium);
data.Release();
if (transferData.result != COM.S_OK) return null;
- int /*long*/ hMem = stgmedium.unionField;
+ long /*int*/ hMem = stgmedium.unionField;
try {
switch (transferData.type) {
case CF_UNICODETEXTID: {
@@ -135,7 +135,7 @@ public Object nativeToJava(TransferData transferData){
int size = OS.GlobalSize(hMem) / 2 * 2;
if (size == 0) return null;
char[] chars = new char[size/2];
- int /*long*/ ptr = OS.GlobalLock(hMem);
+ long /*int*/ ptr = OS.GlobalLock(hMem);
if (ptr == 0) return null;
try {
OS.MoveMemory(chars, ptr, size);
@@ -152,7 +152,7 @@ public Object nativeToJava(TransferData transferData){
}
}
case CF_TEXTID: {
- int /*long*/ lpMultiByteStr = OS.GlobalLock(hMem);
+ long /*int*/ lpMultiByteStr = OS.GlobalLock(hMem);
if (lpMultiByteStr == 0) return null;
try {
int codePage = OS.GetACP();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java
index aa9fbe7418..b47362fdd3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java
@@ -104,7 +104,7 @@ public class TransferData {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ pIDataObject;
+ public long /*int*/ pIDataObject;
static boolean sameType(TransferData data1, TransferData data2) {
if (data1 == data2) return true;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java
index 645549a14f..43a794fd6e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java
@@ -87,7 +87,7 @@ public class TreeDragSourceEffect extends DragSourceEffect {
event.offsetX = shdi.ptOffset.x;
}
event.offsetY = shdi.ptOffset.y;
- int /*long*/ hImage = shdi.hbmpDragImage;
+ long /*int*/ hImage = shdi.hbmpDragImage;
if (hImage != 0) {
BITMAP bm = new BITMAP ();
OS.GetObject (hImage, BITMAP.sizeof, bm);
@@ -95,10 +95,10 @@ public class TreeDragSourceEffect extends DragSourceEffect {
int srcHeight = bm.bmHeight;
/* Create resources */
- int /*long*/ hdc = OS.GetDC (0);
- int /*long*/ srcHdc = OS.CreateCompatibleDC (hdc);
- int /*long*/ oldSrcBitmap = OS.SelectObject (srcHdc, hImage);
- int /*long*/ memHdc = OS.CreateCompatibleDC (hdc);
+ long /*int*/ hdc = OS.GetDC (0);
+ long /*int*/ srcHdc = OS.CreateCompatibleDC (hdc);
+ long /*int*/ oldSrcBitmap = OS.SelectObject (srcHdc, hImage);
+ long /*int*/ memHdc = OS.CreateCompatibleDC (hdc);
BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER ();
bmiHeader.biSize = BITMAPINFOHEADER.sizeof;
bmiHeader.biWidth = srcWidth;
@@ -108,10 +108,10 @@ public class TreeDragSourceEffect extends DragSourceEffect {
bmiHeader.biCompression = OS.BI_RGB;
byte [] bmi = new byte[BITMAPINFOHEADER.sizeof];
OS.MoveMemory (bmi, bmiHeader, BITMAPINFOHEADER.sizeof);
- int /*long*/ [] pBits = new int /*long*/ [1];
- int /*long*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
+ long /*int*/ [] pBits = new long /*int*/ [1];
+ long /*int*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
if (memDib == 0) SWT.error (SWT.ERROR_NO_HANDLES);
- int /*long*/ oldMemBitmap = OS.SelectObject (memHdc, memDib);
+ long /*int*/ oldMemBitmap = OS.SelectObject (memHdc, memDib);
BITMAP dibBM = new BITMAP ();
OS.GetObject (memDib, BITMAP.sizeof, dibBM);
@@ -158,26 +158,26 @@ public class TreeDragSourceEffect extends DragSourceEffect {
if (tree.isListening (SWT.EraseItem) || tree.isListening (SWT.PaintItem)) return null;
TreeItem[] selection = tree.getSelection();
if (selection.length == 0) return null;
- int /*long*/ treeImageList = OS.SendMessage (tree.handle, OS.TVM_GETIMAGELIST, OS.TVSIL_NORMAL, 0);
+ long /*int*/ treeImageList = OS.SendMessage (tree.handle, OS.TVM_GETIMAGELIST, OS.TVSIL_NORMAL, 0);
if (treeImageList != 0) {
int count = Math.min(selection.length, 10);
Rectangle bounds = selection[0].getBounds(0);
for (int i = 1; i < count; i++) {
bounds = bounds.union(selection[i].getBounds(0));
}
- int /*long*/ hDC = OS.GetDC(tree.handle);
- int /*long*/ hDC1 = OS.CreateCompatibleDC(hDC);
- int /*long*/ bitmap = OS.CreateCompatibleBitmap(hDC, bounds.width, bounds.height);
- int /*long*/ hOldBitmap = OS.SelectObject(hDC1, bitmap);
+ long /*int*/ hDC = OS.GetDC(tree.handle);
+ long /*int*/ hDC1 = OS.CreateCompatibleDC(hDC);
+ long /*int*/ bitmap = OS.CreateCompatibleBitmap(hDC, bounds.width, bounds.height);
+ long /*int*/ hOldBitmap = OS.SelectObject(hDC1, bitmap);
RECT rect = new RECT();
rect.right = bounds.width;
rect.bottom = bounds.height;
- int /*long*/ hBrush = OS.GetStockObject(OS.WHITE_BRUSH);
+ long /*int*/ hBrush = OS.GetStockObject(OS.WHITE_BRUSH);
OS.FillRect(hDC1, rect, hBrush);
for (int i = 0; i < count; i++) {
TreeItem selected = selection[i];
Rectangle cell = selected.getBounds(0);
- int /*long*/ imageList = OS.SendMessage(tree.handle, OS.TVM_CREATEDRAGIMAGE, 0, selected.handle);
+ long /*int*/ imageList = OS.SendMessage(tree.handle, OS.TVM_CREATEDRAGIMAGE, 0, selected.handle);
OS.ImageList_Draw(imageList, 0, hDC1, cell.x - bounds.x, cell.y - bounds.y, OS.ILD_SELECTED);
OS.ImageList_Destroy(imageList);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java
index 04776faaac..f02c7e0c65 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java
@@ -52,10 +52,10 @@ public class TreeDropTargetEffect extends DropTargetEffect {
static final int SCROLL_HYSTERESIS = 200; // milli seconds
static final int EXPAND_HYSTERESIS = 1000; // milli seconds
- int /*long*/ dropIndex;
- int /*long*/ scrollIndex;
+ long /*int*/ dropIndex;
+ long /*int*/ scrollIndex;
long scrollBeginTime;
- int /*long*/ expandIndex;
+ long /*int*/ expandIndex;
long expandBeginTime;
TreeItem insertItem;
boolean insertBefore;
@@ -116,7 +116,7 @@ public class TreeDropTargetEffect extends DropTargetEffect {
*/
public void dragLeave(DropTargetEvent event) {
Tree tree = (Tree) control;
- int /*long*/ handle = tree.handle;
+ long /*int*/ handle = tree.handle;
if (dropIndex != -1) {
TVITEM tvItem = new TVITEM ();
tvItem.hItem = dropIndex;
@@ -157,22 +157,22 @@ public class TreeDropTargetEffect extends DropTargetEffect {
public void dragOver(DropTargetEvent event) {
Tree tree = (Tree) getControl();
int effect = checkEffect(event.feedback);
- int /*long*/ handle = tree.handle;
+ long /*int*/ handle = tree.handle;
Point coordinates = new Point(event.x, event.y);
coordinates = tree.toControl(coordinates);
TVHITTESTINFO lpht = new TVHITTESTINFO ();
lpht.x = coordinates.x;
lpht.y = coordinates.y;
OS.SendMessage (handle, OS.TVM_HITTEST, 0, lpht);
- int /*long*/ hItem = lpht.hItem;
+ long /*int*/ hItem = lpht.hItem;
if ((effect & DND.FEEDBACK_SCROLL) == 0) {
scrollBeginTime = 0;
scrollIndex = -1;
} else {
if (hItem != -1 && scrollIndex == hItem && scrollBeginTime != 0) {
if (System.currentTimeMillis() >= scrollBeginTime) {
- int /*long*/ topItem = OS.SendMessage(handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0);
- int /*long*/ nextItem = OS.SendMessage(handle, OS.TVM_GETNEXTITEM, hItem == topItem ? OS.TVGN_PREVIOUSVISIBLE : OS.TVGN_NEXTVISIBLE, hItem);
+ long /*int*/ topItem = OS.SendMessage(handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0);
+ long /*int*/ nextItem = OS.SendMessage(handle, OS.TVM_GETNEXTITEM, hItem == topItem ? OS.TVGN_PREVIOUSVISIBLE : OS.TVGN_NEXTVISIBLE, hItem);
boolean scroll = true;
if (hItem == topItem) {
scroll = nextItem != 0;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java
index 223677b708..ea2631cb5d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java
@@ -69,7 +69,7 @@ public void javaToNative (Object object, TransferData transferData){
char[] chars = new char[charCount+1];
url.getChars (0, charCount, chars, 0);
int byteCount = chars.length * 2;
- int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, byteCount);
+ long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, byteCount);
OS.MoveMemory(newPtr, chars, byteCount);
transferData.stgmedium = new STGMEDIUM();
transferData.stgmedium.tymed = COM.TYMED_HGLOBAL;
@@ -87,7 +87,7 @@ public void javaToNative (Object object, TransferData transferData){
transferData.result = COM.DV_E_STGMEDIUM;
return;
}
- int /*long*/ lpMultiByteStr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, cchMultiByte);
+ long /*int*/ lpMultiByteStr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, cchMultiByte);
OS.WideCharToMultiByte(codePage, 0, chars, -1, lpMultiByteStr, cchMultiByte, null, null);
transferData.stgmedium = new STGMEDIUM();
transferData.stgmedium.tymed = COM.TYMED_HGLOBAL;
@@ -117,14 +117,14 @@ public Object nativeToJava(TransferData transferData){
transferData.result = getData(data, formatetc, stgmedium);
data.Release();
if (transferData.result != COM.S_OK) return null;
- int /*long*/ hMem = stgmedium.unionField;
+ long /*int*/ hMem = stgmedium.unionField;
try {
if (transferData.type == CFSTR_INETURLIDW) {
/* Ensure byteCount is a multiple of 2 bytes */
int size = OS.GlobalSize(hMem) / 2 * 2;
if (size == 0) return null;
char[] chars = new char[size/2];
- int /*long*/ ptr = OS.GlobalLock(hMem);
+ long /*int*/ ptr = OS.GlobalLock(hMem);
if (ptr == 0) return null;
try {
OS.MoveMemory(chars, ptr, size);
@@ -140,7 +140,7 @@ public Object nativeToJava(TransferData transferData){
OS.GlobalUnlock(hMem);
}
} else if (transferData.type == CFSTR_INETURLID) {
- int /*long*/ lpMultiByteStr = OS.GlobalLock(hMem);
+ long /*int*/ lpMultiByteStr = OS.GlobalLock(hMem);
if (lpMultiByteStr == 0) return null;
try {
int codePage = OS.GetACP();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/carbon/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/carbon/org/eclipse/swt/browser/MozillaDelegate.java
index 149031a74d..6fd353132b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/carbon/org/eclipse/swt/browser/MozillaDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/carbon/org/eclipse/swt/browser/MozillaDelegate.java
@@ -258,7 +258,7 @@ int getHandle () {
return embedHandle;
}
-int /*long*/ getSiteWindow () {
+long /*int*/ getSiteWindow () {
return embedHandle;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java
index b51c6450a7..f699239e83 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java
@@ -30,7 +30,7 @@ MozillaDelegate (Browser browser) {
this.browser = browser;
}
-static Browser findBrowser (int /*long*/ handle) {
+static Browser findBrowser (long /*int*/ handle) {
Display display = Display.getCurrent ();
return (Browser)display.findWidget (handle);
}
@@ -142,11 +142,11 @@ int createBaseWindow (nsIBaseWindow baseWindow) {
return rc;
}
-int /*long*/ getHandle () {
+long /*int*/ getHandle () {
return browser.view.id;
}
-int /*long*/ getSiteWindow () {
+long /*int*/ getSiteWindow () {
return browser.view.id;
}
@@ -188,7 +188,7 @@ boolean hookEnterExit () {
void init () {
}
-void onDispose (int /*long*/ embedHandle) {
+void onDispose (long /*int*/ embedHandle) {
if (listener != null) {
eventShell.getDisplay ().removeFilter (SWT.FocusIn, listener);
eventShell.removeListener (SWT.Deactivate, listener);
@@ -206,7 +206,7 @@ boolean sendTraverse () {
return true;
}
-void setSize (int /*long*/ embedHandle, int width, int height) {
+void setSize (long /*int*/ embedHandle, int width, int height) {
// TODO
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java
index 2be80e937b..4781d213f2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java
@@ -47,7 +47,7 @@ AppFileLocProvider (String mozillaPath, String profilePath, String cacheParentPa
this.cacheParentPath = cacheParentPath;
this.isXULRunner = isXULRunner;
if (!Compatibility.fileExists (profilePath, "")) { //$NON-NLS-1$
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
nsEmbedString pathString = new nsEmbedString (profilePath);
int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
@@ -70,24 +70,24 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
directoryServiceProvider = new XPCOMObject (new int[] {2, 0, 0, 3}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return getFile (args[0], args[1], args[2]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return getFile (args[0], args[1], args[2]);}
};
directoryServiceProvider2 = new XPCOMObject (new int[] {2, 0, 0, 3, 2}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return getFile (args[0], args[1], args[2]);}
- public int /*long*/ method4 (int /*long*/[] args) {return getFiles (args[0], args[1]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return getFile (args[0], args[1], args[2]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return getFiles (args[0], args[1]);}
};
}
@@ -106,32 +106,32 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return directoryServiceProvider.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIDirectoryServiceProvider.NS_IDIRECTORYSERVICEPROVIDER_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {directoryServiceProvider.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {directoryServiceProvider.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIDirectoryServiceProvider2.NS_IDIRECTORYSERVICEPROVIDER2_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {directoryServiceProvider2.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {directoryServiceProvider2.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -143,7 +143,7 @@ int Release () {
/* nsIDirectoryServiceProvider2 */
-int getFiles (int /*long*/ prop, int /*long*/ _retval) {
+int getFiles (long /*int*/ prop, long /*int*/ _retval) {
int size = XPCOM.strlen (prop);
byte[] bytes = new byte[size];
XPCOM.memmove (bytes, prop, size);
@@ -154,7 +154,7 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
if (pluginDirs == null) {
int index = 0;
/* set the first value(s) to the MOZ_PLUGIN_PATH environment variable value if it's defined */
- int /*long*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_PLUGIN_PATH, true));
+ long /*int*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_PLUGIN_PATH, true));
if (ptr != 0) {
int length = C.strlen (ptr);
byte[] buffer = new byte[length];
@@ -205,9 +205,9 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
propertyValues = pluginDirs;
}
- XPCOM.memmove(_retval, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove(_retval, new long /*int*/[] {0}, C.PTR_SIZEOF);
if (propertyValues != null) {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
nsISupports[] files = new nsISupports [propertyValues.length];
int index = 0;
for (int i = 0; i < propertyValues.length; i++) {
@@ -241,7 +241,7 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
SimpleEnumerator enumerator = new SimpleEnumerator (files);
enumerator.AddRef ();
- XPCOM.memmove (_retval, new int /*long*/[] {enumerator.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (_retval, new long /*int*/[] {enumerator.getAddress ()}, C.PTR_SIZEOF);
return XPCOM.NS_OK;
}
@@ -250,7 +250,7 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
/* nsIDirectoryServiceProvider implementation */
-int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) {
+int getFile(long /*int*/ prop, long /*int*/ persistent, long /*int*/ _retval) {
int size = XPCOM.strlen (prop);
byte[] bytes = new byte[size];
XPCOM.memmove (bytes, prop, size);
@@ -304,9 +304,9 @@ int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) {
}
XPCOM.memmove (persistent, new boolean[] {true});
- XPCOM.memmove (_retval, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (_retval, new long /*int*/[] {0}, C.PTR_SIZEOF);
if (propertyValue != null && propertyValue.length () > 0) {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
nsEmbedString pathString = new nsEmbedString (propertyValue);
int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
@@ -319,7 +319,7 @@ int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) {
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
- XPCOM.memmove (_retval, new int /*long*/[] {result[0]}, C.PTR_SIZEOF);
+ XPCOM.memmove (_retval, new long /*int*/[] {result[0]}, C.PTR_SIZEOF);
localFile.Release ();
return XPCOM.NS_OK;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java
index c97c08a330..d4a05b68fe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java
@@ -46,63 +46,63 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
download = new XPCOMObject (new int[] {2, 0, 0, 7, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
- public int /*long*/ method4 (int /*long*/[] args) {return GetSource (args[0]);}
- public int /*long*/ method5 (int /*long*/[] args) {return GetTarget (args[0]);}
- public int /*long*/ method6 (int /*long*/[] args) {return GetPersist (args[0]);}
- public int /*long*/ method7 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
- public int /*long*/ method8 (int /*long*/[] args) {return GetDisplayName (args[0]);}
- public int /*long*/ method9 (int /*long*/[] args) {return SetDisplayName (args[0]);}
- public int /*long*/ method10 (int /*long*/[] args) {return GetStartTime (args[0]);}
- public int /*long*/ method11 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
- public int /*long*/ method12 (int /*long*/[] args) {return GetListener (args[0]);}
- public int /*long*/ method13 (int /*long*/[] args) {return SetListener (args[0]);}
- public int /*long*/ method14 (int /*long*/[] args) {return GetObserver (args[0]);}
- public int /*long*/ method15 (int /*long*/[] args) {return SetObserver (args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return GetSource (args[0]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return GetTarget (args[0]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return GetPersist (args[0]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
+ public long /*int*/ method8 (long /*int*/[] args) {return GetDisplayName (args[0]);}
+ public long /*int*/ method9 (long /*int*/[] args) {return SetDisplayName (args[0]);}
+ public long /*int*/ method10 (long /*int*/[] args) {return GetStartTime (args[0]);}
+ public long /*int*/ method11 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
+ public long /*int*/ method12 (long /*int*/[] args) {return GetListener (args[0]);}
+ public long /*int*/ method13 (long /*int*/[] args) {return SetListener (args[0]);}
+ public long /*int*/ method14 (long /*int*/[] args) {return GetObserver (args[0]);}
+ public long /*int*/ method15 (long /*int*/[] args) {return SetObserver (args[0]);}
};
progressDialog = new XPCOMObject (new int[] {2, 0, 0, 7, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
- public int /*long*/ method4 (int /*long*/[] args) {return GetSource (args[0]);}
- public int /*long*/ method5 (int /*long*/[] args) {return GetTarget (args[0]);}
- public int /*long*/ method6 (int /*long*/[] args) {return GetPersist (args[0]);}
- public int /*long*/ method7 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
- public int /*long*/ method8 (int /*long*/[] args) {return GetDisplayName (args[0]);}
- public int /*long*/ method9 (int /*long*/[] args) {return SetDisplayName (args[0]);}
- public int /*long*/ method10 (int /*long*/[] args) {return GetStartTime (args[0]);}
- public int /*long*/ method11 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
- public int /*long*/ method12 (int /*long*/[] args) {return GetListener (args[0]);}
- public int /*long*/ method13 (int /*long*/[] args) {return SetListener (args[0]);}
- public int /*long*/ method14 (int /*long*/[] args) {return GetObserver (args[0]);}
- public int /*long*/ method15 (int /*long*/[] args) {return SetObserver (args[0]);}
- public int /*long*/ method16 (int /*long*/[] args) {return Open (args[0]);}
- public int /*long*/ method17 (int /*long*/[] args) {return GetCancelDownloadOnClose (args[0]);}
- public int /*long*/ method18 (int /*long*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
- public int /*long*/ method19 (int /*long*/[] args) {return GetDialog (args[0]);}
- public int /*long*/ method20 (int /*long*/[] args) {return SetDialog (args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return GetSource (args[0]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return GetTarget (args[0]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return GetPersist (args[0]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
+ public long /*int*/ method8 (long /*int*/[] args) {return GetDisplayName (args[0]);}
+ public long /*int*/ method9 (long /*int*/[] args) {return SetDisplayName (args[0]);}
+ public long /*int*/ method10 (long /*int*/[] args) {return GetStartTime (args[0]);}
+ public long /*int*/ method11 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
+ public long /*int*/ method12 (long /*int*/[] args) {return GetListener (args[0]);}
+ public long /*int*/ method13 (long /*int*/[] args) {return SetListener (args[0]);}
+ public long /*int*/ method14 (long /*int*/[] args) {return GetObserver (args[0]);}
+ public long /*int*/ method15 (long /*int*/[] args) {return SetObserver (args[0]);}
+ public long /*int*/ method16 (long /*int*/[] args) {return Open (args[0]);}
+ public long /*int*/ method17 (long /*int*/[] args) {return GetCancelDownloadOnClose (args[0]);}
+ public long /*int*/ method18 (long /*int*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
+ public long /*int*/ method19 (long /*int*/[] args) {return GetDialog (args[0]);}
+ public long /*int*/ method20 (long /*int*/[] args) {return SetDialog (args[0]);}
};
webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
- public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
};
}
@@ -125,36 +125,36 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return progressDialog.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIDownload.NS_IDOWNLOAD_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);
AddRef();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIProgressDialog.NS_IPROGRESSDIALOG_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);
AddRef();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);
AddRef();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -167,13 +167,13 @@ int Release () {
/* nsIDownload */
/* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */
-int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, int /*long*/ startTime1, int /*long*/ startTime2, int /*long*/ aPersist) {
+int Init (long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long /*int*/ startTime1, long /*int*/ startTime2, long /*int*/ aPersist) {
nsIURI source = new nsIURI (aSource);
- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
int rc = source.GetHost (aSpec);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
int length = XPCOM.nsEmbedCString_Length (aSpec);
- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
@@ -186,12 +186,12 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName,
*/
String filename = null;
nsISupports supports = new nsISupports (aTarget);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
rc = supports.QueryInterface (!Mozilla.IsPre_4 ? nsIURI.NS_IURI_10_IID : nsIURI.NS_IURI_IID, result);
if (rc == XPCOM.NS_OK) { /* >= 1.7 */
nsIURI target = new nsIURI (result[0]);
result[0] = 0;
- int /*long*/ aPath = XPCOM.nsEmbedCString_new ();
+ long /*int*/ aPath = XPCOM.nsEmbedCString_new ();
rc = target.GetPath (aPath);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
length = XPCOM.nsEmbedCString_Length (aPath);
@@ -205,7 +205,7 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName,
target.Release ();
} else { /* < 1.7 */
nsILocalFile target = new nsILocalFile (aTarget);
- int /*long*/ aNativeTarget = XPCOM.nsEmbedString_new ();
+ long /*int*/ aNativeTarget = XPCOM.nsEmbedString_new ();
rc = target.GetLeafName (aNativeTarget);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
length = XPCOM.nsEmbedString_Length (aNativeTarget);
@@ -259,54 +259,54 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName,
return XPCOM.NS_OK;
}
-int GetSource (int /*long*/ aSource) {
+int GetSource (long /*int*/ aSource) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetTarget (int /*long*/ aTarget) {
+int GetTarget (long /*int*/ aTarget) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetPersist (int /*long*/ aPersist) {
+int GetPersist (long /*int*/ aPersist) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetPercentComplete (int /*long*/ aPercentComplete) {
+int GetPercentComplete (long /*int*/ aPercentComplete) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetDisplayName (int /*long*/ aDisplayName) {
+int GetDisplayName (long /*int*/ aDisplayName) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int SetDisplayName (int /*long*/ aDisplayName) {
+int SetDisplayName (long /*int*/ aDisplayName) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetStartTime (int /*long*/ aStartTime) {
+int GetStartTime (long /*int*/ aStartTime) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetMIMEInfo (int /*long*/ aMIMEInfo) {
+int GetMIMEInfo (long /*int*/ aMIMEInfo) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetListener (int /*long*/ aListener) {
+int GetListener (long /*int*/ aListener) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int SetListener (int /*long*/ aListener) {
+int SetListener (long /*int*/ aListener) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetObserver (int /*long*/ aObserver) {
+int GetObserver (long /*int*/ aObserver) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int SetObserver (int /*long*/ aObserver) {
+int SetObserver (long /*int*/ aObserver) {
if (aObserver != 0) {
nsISupports supports = new nsISupports (aObserver);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = supports.QueryInterface (nsIHelperAppLauncher.NS_IHELPERAPPLAUNCHER_IID, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -316,11 +316,11 @@ int SetObserver (int /*long*/ aObserver) {
}
/* nsIProgressDialog */
-int Open (int /*long*/ aParent) {
+int Open (long /*int*/ aParent) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetCancelDownloadOnClose (int /*long*/ aCancelDownloadOnClose) {
+int GetCancelDownloadOnClose (long /*int*/ aCancelDownloadOnClose) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
@@ -328,17 +328,17 @@ int SetCancelDownloadOnClose (int aCancelDownloadOnClose) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetDialog (int /*long*/ aDialog) {
+int GetDialog (long /*int*/ aDialog) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int SetDialog (int /*long*/ aDialog) {
+int SetDialog (long /*int*/ aDialog) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
/* nsIWebProgressListener */
-int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
+int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {
if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
if (helperAppLauncher != null) helperAppLauncher.Release ();
helperAppLauncher = null;
@@ -348,7 +348,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
return XPCOM.NS_OK;
}
-int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
+int OnProgressChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
int currentKBytes = aCurTotalProgress / 1024;
int totalKBytes = aMaxTotalProgress / 1024;
if (shell != null && !shell.isDisposed ()) {
@@ -361,15 +361,15 @@ int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCur
return XPCOM.NS_OK;
}
-int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) {
+int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) {
return XPCOM.NS_OK;
}
-int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {
+int OnStatusChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, long /*int*/ aMessage) {
return XPCOM.NS_OK;
}
-int OnSecurityChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int state) {
+int OnSecurityChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {
return XPCOM.NS_OK;
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory.java
index 901786c1d3..a0e2f2136b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory.java
@@ -30,17 +30,17 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
};
}
@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return factory.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -87,10 +87,10 @@ int Release () {
/* nsIFactory */
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
Download download = new Download ();
download.AddRef ();
- XPCOM.memmove (result, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (result, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);
return XPCOM.NS_OK;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory_1_8.java
index 1af00696d7..a6bf534ebe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory_1_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/DownloadFactory_1_8.java
@@ -30,17 +30,17 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
};
}
@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return factory.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -87,10 +87,10 @@ int Release () {
/* nsIFactory */
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
Download_1_8 download = new Download_1_8 ();
download.AddRef ();
- XPCOM.memmove (result, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (result, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);
return XPCOM.NS_OK;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download_1_8.java
index 3ec20e77db..2a2e150866 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download_1_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download_1_8.java
@@ -48,97 +48,97 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
download = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3, is32 ? 10 : 6, is32 ? 8 : 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
- public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
- public int /*long*/ method8 (int /*long*/[] args) {
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
+ public long /*int*/ method8 (long /*int*/[] args) {
if (args.length == 10) {
return OnProgressChange64_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]);
} else {
return OnProgressChange64 (args[0], args[1], args[2], args[3], args[4], args[5]);
}
}
- public int /*long*/ method9 (int /*long*/[] args) {
+ public long /*int*/ method9 (long /*int*/[] args) {
if (args.length == 8) {
return Init_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
} else {
return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
}
}
- public int /*long*/ method10 (int /*long*/[] args) {return GetTargetFile (args[0]);}
- public int /*long*/ method11 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
- public int /*long*/ method12 (int /*long*/[] args) {return GetAmountTransferred (args[0]);}
- public int /*long*/ method13 (int /*long*/[] args) {return GetSize (args[0]);}
- public int /*long*/ method14 (int /*long*/[] args) {return GetSource (args[0]);}
- public int /*long*/ method15 (int /*long*/[] args) {return GetTarget (args[0]);}
- public int /*long*/ method16 (int /*long*/[] args) {return GetCancelable (args[0]);}
- public int /*long*/ method17 (int /*long*/[] args) {return GetDisplayName (args[0]);}
- public int /*long*/ method18 (int /*long*/[] args) {return GetStartTime (args[0]);}
- public int /*long*/ method19 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
+ public long /*int*/ method10 (long /*int*/[] args) {return GetTargetFile (args[0]);}
+ public long /*int*/ method11 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
+ public long /*int*/ method12 (long /*int*/[] args) {return GetAmountTransferred (args[0]);}
+ public long /*int*/ method13 (long /*int*/[] args) {return GetSize (args[0]);}
+ public long /*int*/ method14 (long /*int*/[] args) {return GetSource (args[0]);}
+ public long /*int*/ method15 (long /*int*/[] args) {return GetTarget (args[0]);}
+ public long /*int*/ method16 (long /*int*/[] args) {return GetCancelable (args[0]);}
+ public long /*int*/ method17 (long /*int*/[] args) {return GetDisplayName (args[0]);}
+ public long /*int*/ method18 (long /*int*/[] args) {return GetStartTime (args[0]);}
+ public long /*int*/ method19 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
};
progressDialog = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3, is32 ? 10 : 6, is32 ? 8 : 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
- public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
- public int /*long*/ method8 (int /*long*/[] args) {
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
+ public long /*int*/ method8 (long /*int*/[] args) {
if (args.length == 10) {
return OnProgressChange64_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]);
} else {
return OnProgressChange64 (args[0], args[1], args[2], args[3], args[4], args[5]);
}
}
- public int /*long*/ method9 (int /*long*/[] args) {
+ public long /*int*/ method9 (long /*int*/[] args) {
if (args.length == 8) {
return Init_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
} else {
return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
}
}
- public int /*long*/ method10 (int /*long*/[] args) {return GetTargetFile (args[0]);}
- public int /*long*/ method11 (int /*long*/[] args) {return GetPercentComplete (args[0]);}
- public int /*long*/ method12 (int /*long*/[] args) {return GetAmountTransferred (args[0]);}
- public int /*long*/ method13 (int /*long*/[] args) {return GetSize (args[0]);}
- public int /*long*/ method14 (int /*long*/[] args) {return GetSource (args[0]);}
- public int /*long*/ method15 (int /*long*/[] args) {return GetTarget (args[0]);}
- public int /*long*/ method16 (int /*long*/[] args) {return GetCancelable (args[0]);}
- public int /*long*/ method17 (int /*long*/[] args) {return GetDisplayName (args[0]);}
- public int /*long*/ method18 (int /*long*/[] args) {return GetStartTime (args[0]);}
- public int /*long*/ method19 (int /*long*/[] args) {return GetMIMEInfo (args[0]);}
- public int /*long*/ method20 (int /*long*/[] args) {return Open (args[0]);}
- public int /*long*/ method21 (int /*long*/[] args) {return GetCancelDownloadOnClose (args[0]);}
- public int /*long*/ method22 (int /*long*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
- public int /*long*/ method23 (int /*long*/[] args) {return GetObserver (args[0]);}
- public int /*long*/ method24 (int /*long*/[] args) {return SetObserver (args[0]);}
- public int /*long*/ method25 (int /*long*/[] args) {return GetDialog (args[0]);}
- public int /*long*/ method26 (int /*long*/[] args) {return SetDialog (args[0]);}
+ public long /*int*/ method10 (long /*int*/[] args) {return GetTargetFile (args[0]);}
+ public long /*int*/ method11 (long /*int*/[] args) {return GetPercentComplete (args[0]);}
+ public long /*int*/ method12 (long /*int*/[] args) {return GetAmountTransferred (args[0]);}
+ public long /*int*/ method13 (long /*int*/[] args) {return GetSize (args[0]);}
+ public long /*int*/ method14 (long /*int*/[] args) {return GetSource (args[0]);}
+ public long /*int*/ method15 (long /*int*/[] args) {return GetTarget (args[0]);}
+ public long /*int*/ method16 (long /*int*/[] args) {return GetCancelable (args[0]);}
+ public long /*int*/ method17 (long /*int*/[] args) {return GetDisplayName (args[0]);}
+ public long /*int*/ method18 (long /*int*/[] args) {return GetStartTime (args[0]);}
+ public long /*int*/ method19 (long /*int*/[] args) {return GetMIMEInfo (args[0]);}
+ public long /*int*/ method20 (long /*int*/[] args) {return Open (args[0]);}
+ public long /*int*/ method21 (long /*int*/[] args) {return GetCancelDownloadOnClose (args[0]);}
+ public long /*int*/ method22 (long /*int*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);}
+ public long /*int*/ method23 (long /*int*/[] args) {return GetObserver (args[0]);}
+ public long /*int*/ method24 (long /*int*/[] args) {return SetObserver (args[0]);}
+ public long /*int*/ method25 (long /*int*/[] args) {return GetDialog (args[0]);}
+ public long /*int*/ method26 (long /*int*/[] args) {return SetDialog (args[0]);}
};
webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
- public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
};
}
@@ -161,36 +161,36 @@ void disposeCOMInterfaces() {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return progressDialog.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIDownload_1_8.NS_IDOWNLOAD_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF);
AddRef();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIProgressDialog_1_8.NS_IPROGRESSDIALOG_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF);
AddRef();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);
AddRef();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -203,26 +203,26 @@ int Release () {
/* nsIDownload */
/* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */
-int Init_32 (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, int /*long*/ startTime1, int /*long*/ startTime2, int /*long*/ aTempFile, int /*long*/ aCancelable) {
+int Init_32 (long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long /*int*/ startTime1, long /*int*/ startTime2, long /*int*/ aTempFile, long /*int*/ aCancelable) {
long startTime = (startTime2 << 32) + startTime1;
return Init (aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aTempFile, aCancelable);
}
-int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aTempFile, int /*long*/ aCancelable) {
+int Init (long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aTempFile, long /*int*/ aCancelable) {
cancelable = new nsICancelable (aCancelable);
nsIURI source = new nsIURI (aSource);
- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
int rc = source.GetHost (aSpec);
if (rc != XPCOM.NS_OK) Mozilla.error(rc);
int length = XPCOM.nsEmbedCString_Length (aSpec);
- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
String url = new String (dest);
nsIURI target = new nsIURI (aTarget);
- int /*long*/ aPath = XPCOM.nsEmbedCString_new ();
+ long /*int*/ aPath = XPCOM.nsEmbedCString_new ();
rc = target.GetPath (aPath);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
length = XPCOM.nsEmbedCString_Length (aPath);
@@ -277,60 +277,60 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName,
return XPCOM.NS_OK;
}
-int GetAmountTransferred (int /*long*/ arg0) {
+int GetAmountTransferred (long /*int*/ arg0) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetCancelable (int /*long*/ arg0) {
+int GetCancelable (long /*int*/ arg0) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetDisplayName (int /*long*/ aDisplayName) {
+int GetDisplayName (long /*int*/ aDisplayName) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetMIMEInfo (int /*long*/ aMIMEInfo) {
+int GetMIMEInfo (long /*int*/ aMIMEInfo) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetPercentComplete (int /*long*/ aPercentComplete) {
+int GetPercentComplete (long /*int*/ aPercentComplete) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetSize (int /*long*/ arg0) {
+int GetSize (long /*int*/ arg0) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetSource (int /*long*/ aSource) {
+int GetSource (long /*int*/ aSource) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetStartTime (int /*long*/ aStartTime) {
+int GetStartTime (long /*int*/ aStartTime) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetTarget (int /*long*/ aTarget) {
+int GetTarget (long /*int*/ aTarget) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetTargetFile (int /*long*/ arg0) {
+int GetTargetFile (long /*int*/ arg0) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
/* nsIProgressDialog */
-int GetCancelDownloadOnClose (int /*long*/ aCancelDownloadOnClose) {
+int GetCancelDownloadOnClose (long /*int*/ aCancelDownloadOnClose) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetDialog (int /*long*/ aDialog) {
+int GetDialog (long /*int*/ aDialog) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetObserver (int /*long*/ aObserver) {
+int GetObserver (long /*int*/ aObserver) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int Open (int /*long*/ aParent) {
+int Open (long /*int*/ aParent) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
@@ -338,26 +338,26 @@ int SetCancelDownloadOnClose (int aCancelDownloadOnClose) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int SetDialog (int /*long*/ aDialog) {
+int SetDialog (long /*int*/ aDialog) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int SetObserver (int /*long*/ aObserver) {
+int SetObserver (long /*int*/ aObserver) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
/* nsIWebProgressListener */
-int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) {
+int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) {
return XPCOM.NS_OK;
}
-int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
+int OnProgressChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
return OnProgressChange64 (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
}
/* Note. The last 4 args in the original interface are defined as PRInt64. These each translate into two java ints. */
-int OnProgressChange64_32 (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aCurSelfProgress1, int /*long*/ aCurSelfProgress2, int /*long*/ aMaxSelfProgress1, int /*long*/ aMaxSelfProgress2, int /*long*/ aCurTotalProgress1, int /*long*/ aCurTotalProgress2, int /*long*/ aMaxTotalProgress1, int /*long*/ aMaxTotalProgress2) {
+int OnProgressChange64_32 (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aCurSelfProgress1, long /*int*/ aCurSelfProgress2, long /*int*/ aMaxSelfProgress1, long /*int*/ aMaxSelfProgress2, long /*int*/ aCurTotalProgress1, long /*int*/ aCurTotalProgress2, long /*int*/ aMaxTotalProgress1, long /*int*/ aMaxTotalProgress2) {
long aCurSelfProgress = (aCurSelfProgress2 << 32) + aCurSelfProgress1;
long aMaxSelfProgress = (aMaxSelfProgress2 << 32) + aMaxSelfProgress1;
long aCurTotalProgress = (aCurTotalProgress2 << 32) + aCurTotalProgress1;
@@ -365,7 +365,7 @@ int OnProgressChange64_32 (int /*long*/ aWebProgress, int /*long*/ aRequest, int
return OnProgressChange64 (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
}
-int OnProgressChange64 (int /*long*/ aWebProgress, int /*long*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {
+int OnProgressChange64 (long /*int*/ aWebProgress, long /*int*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {
long currentKBytes = aCurTotalProgress / 1024;
long totalKBytes = aMaxTotalProgress / 1024;
if (shell != null && !shell.isDisposed ()) {
@@ -378,11 +378,11 @@ int OnProgressChange64 (int /*long*/ aWebProgress, int /*long*/ aRequest, long a
return XPCOM.NS_OK;
}
-int OnSecurityChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int state) {
+int OnSecurityChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {
return XPCOM.NS_OK;
}
-int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
+int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {
if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
cancelable = null;
if (shell != null && !shell.isDisposed ()) shell.dispose ();
@@ -391,7 +391,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
return XPCOM.NS_OK;
}
-int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {
+int OnStatusChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, long /*int*/ aMessage) {
return XPCOM.NS_OK;
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/External.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/External.java
index cd4201ab9f..c4087df868 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/External.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/External.java
@@ -46,12 +46,12 @@ External () {
* QueryInterface answers an nsIScriptObjectOwner implementation (which points
* at this function) iff the detected XULRunner version is >= 4.
*/
-static int /*long*/ callJava (int /*long*/ cx, int /*long*/ argc, int /*long*/ vp) {
+static long /*int*/ callJava (long /*int*/ cx, long /*int*/ argc, long /*int*/ vp) {
int jsval_sizeof = 8;
- int /*long*/ argsPtr = vp + 2 * jsval_sizeof;
+ long /*int*/ argsPtr = vp + 2 * jsval_sizeof;
nsIVariant resultVariant = null;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
@@ -82,14 +82,14 @@ static int /*long*/ callJava (int /*long*/ cx, int /*long*/ argc, int /*long*/ v
argsPtr += jsval_sizeof;
rc = connect.JSValToVariant (cx, argsPtr, result);
if (rc == XPCOM.NS_OK && result[0] != 0) {
- int /*long*/ tokenVariant = result[0];
+ long /*int*/ tokenVariant = result[0];
result[0] = 0;
/* get the third argument variant (the invocation args) */
argsPtr += jsval_sizeof;
rc = connect.JSValToVariant (cx, argsPtr, result);
if (rc == XPCOM.NS_OK && result[0] != 0) {
- int /*long*/ argsVariant = result[0];
+ long /*int*/ argsVariant = result[0];
result[0] = 0;
/* invoke the BrowserFunction */
@@ -124,14 +124,14 @@ static int /*long*/ callJava (int /*long*/ cx, int /*long*/ argc, int /*long*/ v
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
- int /*long*/ jsVal = memory.Alloc (jsval_sizeof);
+ long /*int*/ jsVal = memory.Alloc (jsval_sizeof);
C.memset (jsVal, 0, jsval_sizeof);
- int /*long*/ globalObject = XPCOM.JS_GetGlobalObject (Mozilla.getJSLibPathBytes (), cx);
+ long /*int*/ globalObject = XPCOM.JS_GetGlobalObject (Mozilla.getJSLibPathBytes (), cx);
rc = connect.VariantToJS (cx, globalObject, resultVariant.getAddress (), jsVal);
resultVariant.Release ();
connect.Release ();
- int /*long*/ returnValue = XPCOM.JS_FALSE;
+ long /*int*/ returnValue = XPCOM.JS_FALSE;
if (rc == XPCOM.NS_OK) {
/* write the jsval to the return value slot */
C.memmove (vp, jsVal, jsval_sizeof);
@@ -143,9 +143,9 @@ static int /*long*/ callJava (int /*long*/ cx, int /*long*/ argc, int /*long*/ v
}
/* this is the BrowserFunction entry point when the detected XULRunner version is < 4 */
-static int callJava (int functionId, int /*long*/ tokenVariant, int /*long*/ argsVariant, int /*long*/ returnPtr) {
- int /*long*/ resultVariant = invokeFunction (functionId, tokenVariant, argsVariant);
- C.memmove (returnPtr, new int /*long*/[] {resultVariant}, C.PTR_SIZEOF);
+static int callJava (int functionId, long /*int*/ tokenVariant, long /*int*/ argsVariant, long /*int*/ returnPtr) {
+ long /*int*/ resultVariant = invokeFunction (functionId, tokenVariant, argsVariant);
+ C.memmove (returnPtr, new long /*int*/[] {resultVariant}, C.PTR_SIZEOF);
return XPCOM.NS_OK;
}
@@ -167,7 +167,7 @@ static Object convertToJava (nsIVariant variant, short type) {
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
return new Double (intResult[0]);
case nsIDataType.VTYPE_DOUBLE:
- int /*long*/ doubleReturn = C.malloc (8);
+ long /*int*/ doubleReturn = C.malloc (8);
rc = variant.GetAsDouble (doubleReturn);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
double[] doubleResult = new double[1];
@@ -176,7 +176,7 @@ static Object convertToJava (nsIVariant variant, short type) {
return new Double (doubleResult[0]);
case nsIDataType.VTYPE_WSTRING_SIZE_IS:
int[] size = new int[1]; /* PRInt32 */
- int /*long*/[] wString = new int /*long*/[1];
+ long /*int*/[] wString = new long /*int*/[1];
rc = variant.GetAsWStringWithSize (size, wString);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
char[] chars = new char[size[0]];
@@ -184,11 +184,11 @@ static Object convertToJava (nsIVariant variant, short type) {
return new String (chars);
case nsIDataType.VTYPE_ARRAY:
Object[] arrayReturn = new Object[0];
- int /*long*/ iid = C.malloc (nsID.sizeof);
+ long /*int*/ iid = C.malloc (nsID.sizeof);
C.memset (iid, 0, nsID.sizeof);
int[] count = new int[1]; /* PRUint32 */
short[] currentType = new short[1];
- int /*long*/[] ptr = new int /*long*/[1];
+ long /*int*/[] ptr = new long /*int*/[1];
rc = variant.GetAsArray (currentType, iid, count, ptr);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (ptr[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
@@ -196,7 +196,7 @@ static Object convertToJava (nsIVariant variant, short type) {
XPCOM.memmove (id, iid, nsID.sizeof);
C.free (iid);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
@@ -215,7 +215,7 @@ static Object convertToJava (nsIVariant variant, short type) {
if (id.Equals (nsIVariant.NS_IVARIANT_IID) || id.Equals (nsIVariant.NS_IVARIANT_10_IID)) {
arrayReturn = new Object[count[0]];
for (int i = 0; i < count[0]; i++) {
- int /*long*/[] arrayPtr = new int /*long*/[1];
+ long /*int*/[] arrayPtr = new long /*int*/[1];
C.memmove (arrayPtr, ptr[0] + i * C.PTR_SIZEOF, C.PTR_SIZEOF);
nsISupports supports = new nsISupports (arrayPtr[0]);
rc = supports.QueryInterface (id, result);
@@ -267,8 +267,8 @@ static Object convertToJava (nsIVariant variant, short type) {
case nsIDataType.VTYPE_WCHAR_STR:
arrayReturn = new Object[count[0]];
for (int i = 0; i < count[0]; i++) {
- int /*long*/ currentPtr = ptr[0] + i * C.PTR_SIZEOF;
- int /*long*/[] stringPtr = new int /*long*/[1];
+ long /*int*/ currentPtr = ptr[0] + i * C.PTR_SIZEOF;
+ long /*int*/[] stringPtr = new long /*int*/[1];
C.memmove (stringPtr, currentPtr, C.PTR_SIZEOF);
int length = XPCOM.strlen_PRUnichar (stringPtr[0]);
char[] dest = new char[length];
@@ -291,7 +291,7 @@ static Object convertToJava (nsIVariant variant, short type) {
}
static nsIVariant convertToJS (Object value, nsIComponentManager componentManager) {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_VARIANT_CONTRACTID, true);
int rc = componentManager.CreateInstanceByContractID (aContractID, 0, nsIWritableVariant.NS_IWRITABLEVARIANT_IID, result);
nsIWritableVariant variant = new nsIWritableVariant (result[0]);
@@ -330,26 +330,26 @@ static nsIVariant convertToJS (Object value, nsIComponentManager componentManage
rc = variant.SetAsEmptyArray ();
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
} else {
- int /*long*/ arrayPtr = C.malloc (C.PTR_SIZEOF * length);
+ long /*int*/ arrayPtr = C.malloc (C.PTR_SIZEOF * length);
for (int i = 0; i < length; i++) {
Object currentObject = arrayValue[i];
try {
nsIVariant currentVariant = convertToJS (currentObject, componentManager);
- C.memmove (arrayPtr + C.PTR_SIZEOF * i, new int /*long*/[] {currentVariant.getAddress ()}, C.PTR_SIZEOF);
+ C.memmove (arrayPtr + C.PTR_SIZEOF * i, new long /*int*/[] {currentVariant.getAddress ()}, C.PTR_SIZEOF);
} catch (SWTException e) {
/* invalid return value type */
C.free (arrayPtr);
variant.Release ();
/* release the variants that had previously been added to the array */
for (int j = 0; j < i; j++) {
- int /*long*/[] ptr = new int /*long*/[1];
+ long /*int*/[] ptr = new long /*int*/[1];
C.memmove (ptr, arrayPtr + C.PTR_SIZEOF * j, C.PTR_SIZEOF);
new nsISupports (ptr[0]).Release ();
}
throw e;
}
}
- int /*long*/ idPtr = C.malloc (nsID.sizeof);
+ long /*int*/ idPtr = C.malloc (nsID.sizeof);
XPCOM.memmove (idPtr, Mozilla.IsPre_4 ? nsIVariant.NS_IVARIANT_IID : nsIVariant.NS_IVARIANT_10_IID, nsID.sizeof);
rc = variant.SetAsArray (nsIDataType.VTYPE_INTERFACE_IS, idPtr, length, arrayPtr);
C.free (idPtr);
@@ -364,7 +364,7 @@ static nsIVariant convertToJS (Object value, nsIComponentManager componentManage
return null;
}
-static int /*long*/ invokeFunction (int functionId, int /*long*/ tokenVariant, int /*long*/ args) {
+static long /*int*/ invokeFunction (int functionId, long /*int*/ tokenVariant, long /*int*/ args) {
Object key = new Integer (functionId);
BrowserFunction function = (BrowserFunction)Mozilla.AllFunctions.get (key);
Object returnValue = null;
@@ -405,7 +405,7 @@ static int /*long*/ invokeFunction (int functionId, int /*long*/ tokenVariant, i
}
}
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetComponentManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
@@ -431,48 +431,48 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
classInfo = new XPCOMObject (new int[] {2, 0, 0, 2, 2, 1, 1, 1, 1, 1, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return getInterfaces (args[0], args[1]);}
- public int /*long*/ method4 (int /*long*/[] args) {return getHelperForLanguage ((int)/*64*/args[0], args[1]);}
- public int /*long*/ method5 (int /*long*/[] args) {return getContractID (args[0]);}
- public int /*long*/ method6 (int /*long*/[] args) {return getClassDescription (args[0]);}
- public int /*long*/ method7 (int /*long*/[] args) {return getClassID (args[0]);}
- public int /*long*/ method8 (int /*long*/[] args) {return getImplementationLanguage (args[0]);}
- public int /*long*/ method9 (int /*long*/[] args) {return getFlags (args[0]);}
- public int /*long*/ method10 (int /*long*/[] args) {return getClassIDNoAlloc (args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return getInterfaces (args[0], args[1]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return getHelperForLanguage ((int)/*64*/args[0], args[1]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return getContractID (args[0]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return getClassDescription (args[0]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return getClassID (args[0]);}
+ public long /*int*/ method8 (long /*int*/[] args) {return getImplementationLanguage (args[0]);}
+ public long /*int*/ method9 (long /*int*/[] args) {return getFlags (args[0]);}
+ public long /*int*/ method10 (long /*int*/[] args) {return getClassIDNoAlloc (args[0]);}
};
securityCheckedComponent = new XPCOMObject (new int[] {2, 0, 0, 2, 3, 3, 3}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return canCreateWrapper (args[0], args[1]);}
- public int /*long*/ method4 (int /*long*/[] args) {return canCallMethod (args[0], args[1], args[2]);}
- public int /*long*/ method5 (int /*long*/[] args) {return canGetProperty (args[0], args[1], args[2]);}
- public int /*long*/ method6 (int /*long*/[] args) {return canSetProperty (args[0], args[1], args[2]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return canCreateWrapper (args[0], args[1]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return canCallMethod (args[0], args[1], args[2]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return canGetProperty (args[0], args[1], args[2]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return canSetProperty (args[0], args[1], args[2]);}
};
external = new XPCOMObject (new int[] {2, 0, 0, 4}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return callJava ((int)/*64*/args[0], args[1], args[2], args[3]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return callJava ((int)/*64*/args[0], args[1], args[2], args[3]);}
};
scriptObjectOwner = new XPCOMObject (new int[] {2, 0, 0, 2, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return getScriptObject (args[0], args[1]);}
- public int /*long*/ method4 (int /*long*/[] args) {return setScriptObject (args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return getScriptObject (args[0], args[1]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return setScriptObject (args[0]);}
};
}
@@ -499,45 +499,45 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return external.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIClassInfo.NS_ICLASSINFO_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {classInfo.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {classInfo.getAddress ()}, C.PTR_SIZEOF);
AddRef();
return XPCOM.NS_OK;
}
if (guid.Equals (XPCOM.NS_ISECURITYCHECKEDCOMPONENT_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {securityCheckedComponent.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {securityCheckedComponent.getAddress ()}, C.PTR_SIZEOF);
AddRef();
return XPCOM.NS_OK;
}
if (guid.Equals (EXTERNAL_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {external.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {external.getAddress ()}, C.PTR_SIZEOF);
AddRef();
return XPCOM.NS_OK;
}
if (!Mozilla.IsPre_4) {
if (guid.Equals(XPCOM.NS_ISCRIPTOBJECTOWNER_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {scriptObjectOwner.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {scriptObjectOwner.getAddress ()}, C.PTR_SIZEOF);
AddRef();
return XPCOM.NS_OK;
}
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -549,8 +549,8 @@ int Release () {
/* nsIClassInfo */
-int getClassDescription (int /*long*/ _retValue) {
- int /*long*/[] result = new int /*long*/[1];
+int getClassDescription (long /*int*/ _retValue) {
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
@@ -566,43 +566,43 @@ int getClassDescription (int /*long*/ _retValue) {
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, "external", true); //$NON-NLS-1$
- int /*long*/ ptr = memory.Alloc (bytes.length);
+ long /*int*/ ptr = memory.Alloc (bytes.length);
C.memmove (ptr, bytes, bytes.length);
- C.memmove (_retValue, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+ C.memmove (_retValue, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
memory.Release ();
return XPCOM.NS_OK;
}
-int getClassID (int /*long*/ _retValue) {
+int getClassID (long /*int*/ _retValue) {
return XPCOM.NS_OK;
}
-int getClassIDNoAlloc (int /*long*/ _retValue) {
+int getClassIDNoAlloc (long /*int*/ _retValue) {
return XPCOM.NS_OK;
}
-int getContractID (int /*long*/ _retValue) {
+int getContractID (long /*int*/ _retValue) {
return XPCOM.NS_OK;
}
-int getFlags (int /*long*/ flags) {
+int getFlags (long /*int*/ flags) {
C.memmove (flags, new int[] {nsIClassInfo.MAIN_THREAD_ONLY}, 4); /* PRUint32 */
return XPCOM.NS_OK;
}
-int getHelperForLanguage (int language, int /*long*/ _retValue) {
- C.memmove (_retValue, new int /*long*/[] {0}, C.PTR_SIZEOF);
+int getHelperForLanguage (int language, long /*int*/ _retValue) {
+ C.memmove (_retValue, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_OK;
}
-int getImplementationLanguage (int /*long*/ _retValue) {
+int getImplementationLanguage (long /*int*/ _retValue) {
C.memmove (_retValue, new int[] {5}, 4); /* nsIProgrammingLanguage.JAVA */ /* PRUint */
return XPCOM.NS_OK;
}
-int getInterfaces (int /*long*/ count, int /*long*/ array) {
- int /*long*/[] result = new int /*long*/[1];
+int getInterfaces (long /*int*/ count, long /*int*/ array) {
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
@@ -617,20 +617,20 @@ int getInterfaces (int /*long*/ count, int /*long*/ array) {
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
- int /*long*/ securityCheckedComponentIID = memory.Alloc (nsID.sizeof);
+ long /*int*/ securityCheckedComponentIID = memory.Alloc (nsID.sizeof);
XPCOM.memmove (securityCheckedComponentIID, XPCOM.NS_ISECURITYCHECKEDCOMPONENT_IID, nsID.sizeof);
- int /*long*/ externalIID = memory.Alloc (nsID.sizeof);
+ long /*int*/ externalIID = memory.Alloc (nsID.sizeof);
XPCOM.memmove (externalIID, EXTERNAL_IID, nsID.sizeof);
- int /*long*/ ptrArray = memory.Alloc (3 * C.PTR_SIZEOF);
- C.memmove (ptrArray, new int /*long*/[] {securityCheckedComponentIID}, C.PTR_SIZEOF);
- C.memmove (ptrArray + C.PTR_SIZEOF, new int /*long*/[] {externalIID}, C.PTR_SIZEOF);
+ long /*int*/ ptrArray = memory.Alloc (3 * C.PTR_SIZEOF);
+ C.memmove (ptrArray, new long /*int*/[] {securityCheckedComponentIID}, C.PTR_SIZEOF);
+ C.memmove (ptrArray + C.PTR_SIZEOF, new long /*int*/[] {externalIID}, C.PTR_SIZEOF);
nsID NS_ASDF_IID = new nsID("a40ce52e-2d8c-400f-9af2-f8784a656070");
- int /*long*/ asdfIID = memory.Alloc (nsID.sizeof);
+ long /*int*/ asdfIID = memory.Alloc (nsID.sizeof);
XPCOM.memmove (asdfIID, NS_ASDF_IID, nsID.sizeof);
- C.memmove (ptrArray + 2 * C.PTR_SIZEOF, new int /*long*/[] {asdfIID}, C.PTR_SIZEOF);
+ C.memmove (ptrArray + 2 * C.PTR_SIZEOF, new long /*int*/[] {asdfIID}, C.PTR_SIZEOF);
- C.memmove (array, new int /*long*/[] {ptrArray}, C.PTR_SIZEOF);
+ C.memmove (array, new long /*int*/[] {ptrArray}, C.PTR_SIZEOF);
memory.Release ();
C.memmove (count, new int[] {3}, 4); /* PRUint */
@@ -639,27 +639,27 @@ int getInterfaces (int /*long*/ count, int /*long*/ array) {
/* nsIScriptObjectOwner */
-int getScriptObject (int /*long*/ aContext, int /*long*/ aScriptObject) {
+int getScriptObject (long /*int*/ aContext, long /*int*/ aScriptObject) {
byte[] jsLibPath = Mozilla.getJSLibPathBytes ();
- int /*long*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (aContext);
- int /*long*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, nativeContext);
- int /*long*/ newObject = XPCOM.JS_NewObject (jsLibPath, nativeContext, 0, 0, globalJSObject);
+ long /*int*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (aContext);
+ long /*int*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, nativeContext);
+ long /*int*/ newObject = XPCOM.JS_NewObject (jsLibPath, nativeContext, 0, 0, globalJSObject);
byte[] functionName = MozillaDelegate.wcsToMbcs (null, "callJava", true); //$NON-NLS-1$
int flags = XPCOM.JSPROP_ENUMERATE | XPCOM.JSPROP_READONLY | XPCOM.JSPROP_PERMANENT;
XPCOM.JS_DefineFunction (jsLibPath, nativeContext, newObject, functionName, XPCOM.CALLBACK_JSNative (CallJavaProc.getAddress ()), 3, flags);
- XPCOM.memmove (aScriptObject, new int /*long*/[] {newObject}, C.PTR_SIZEOF);
+ XPCOM.memmove (aScriptObject, new long /*int*/[] {newObject}, C.PTR_SIZEOF);
return XPCOM.NS_OK;
}
-int setScriptObject (int /*long*/ aScriptObject) {
+int setScriptObject (long /*int*/ aScriptObject) {
return XPCOM.NS_COMFALSE;
}
/* nsISecurityCheckedComponent */
-int canCreateWrapper (int /*long*/ iid, int /*long*/ _retVal) {
- int /*long*/[] result = new int /*long*/[1];
+int canCreateWrapper (long /*int*/ iid, long /*int*/ _retVal) {
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
@@ -675,16 +675,16 @@ int canCreateWrapper (int /*long*/ iid, int /*long*/ _retVal) {
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, "allAccess", true); //$NON-NLS-1$
- int /*long*/ ptr = memory.Alloc (bytes.length);
+ long /*int*/ ptr = memory.Alloc (bytes.length);
C.memmove (ptr, bytes, bytes.length);
- C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+ C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
memory.Release ();
return XPCOM.NS_OK;
}
-int canCallMethod (int /*long*/ iid, int /*long*/ methodName, int /*long*/ _retVal) {
- int /*long*/[] result = new int /*long*/[1];
+int canCallMethod (long /*int*/ iid, long /*int*/ methodName, long /*int*/ _retVal) {
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
@@ -709,16 +709,16 @@ int canCallMethod (int /*long*/ iid, int /*long*/ methodName, int /*long*/ _retV
} else {
bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
}
- int /*long*/ ptr = memory.Alloc (bytes.length);
+ long /*int*/ ptr = memory.Alloc (bytes.length);
C.memmove (ptr, bytes, bytes.length);
- C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+ C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
memory.Release ();
return XPCOM.NS_OK;
}
-int canGetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _retVal) {
- int /*long*/[] result = new int /*long*/[1];
+int canGetProperty (long /*int*/ iid, long /*int*/ propertyName, long /*int*/ _retVal) {
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
@@ -734,16 +734,16 @@ int canGetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _r
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
- int /*long*/ ptr = memory.Alloc (bytes.length);
+ long /*int*/ ptr = memory.Alloc (bytes.length);
C.memmove (ptr, bytes, bytes.length);
- C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+ C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
memory.Release ();
return XPCOM.NS_OK;
}
-int canSetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _retVal) {
- int /*long*/[] result = new int /*long*/[1];
+int canSetProperty (long /*int*/ iid, long /*int*/ propertyName, long /*int*/ _retVal) {
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
@@ -759,9 +759,9 @@ int canSetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _r
nsIMemory memory = new nsIMemory (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
- int /*long*/ ptr = memory.Alloc (bytes.length);
+ long /*int*/ ptr = memory.Alloc (bytes.length);
C.memmove (ptr, bytes, bytes.length);
- C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+ C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
memory.Release ();
return XPCOM.NS_OK;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/ExternalFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/ExternalFactory.java
index 84462ec2f0..f90ef3d0e9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/ExternalFactory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/ExternalFactory.java
@@ -30,17 +30,17 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
};
}
@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return factory.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -87,10 +87,10 @@ int Release () {
/* nsIFactory */
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
External external = new External ();
external.AddRef ();
- XPCOM.memmove (result, new int /*long*/[] {external.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (result, new long /*int*/[] {external.getAddress ()}, C.PTR_SIZEOF);
return XPCOM.NS_OK;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java
index 0203016cb4..44b9e5fece 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java
@@ -21,7 +21,7 @@ class FilePicker {
int refCount = 0;
short mode;
- int /*long*/ parentHandle;
+ long /*int*/ parentHandle;
String[] files, masks;
String defaultFilename, directory, title;
@@ -39,30 +39,30 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
filePicker = new XPCOMObject (new int[] {2, 0, 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], (short)args[2]);}
- public int /*long*/ method4 (int /*long*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
- public int /*long*/ method5 (int /*long*/[] args) {return AppendFilter (args[0], args[1]);}
- public int /*long*/ method6 (int /*long*/[] args) {return GetDefaultString (args[0]);}
- public int /*long*/ method7 (int /*long*/[] args) {return SetDefaultString (args[0]);}
- public int /*long*/ method8 (int /*long*/[] args) {return GetDefaultExtension (args[0]);}
- public int /*long*/ method9 (int /*long*/[] args) {return SetDefaultExtension (args[0]);}
- public int /*long*/ method10 (int /*long*/[] args) {return GetFilterIndex (args[0]);}
- public int /*long*/ method11 (int /*long*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
- public int /*long*/ method12 (int /*long*/[] args) {return GetDisplayDirectory (args[0]);}
- public int /*long*/ method13 (int /*long*/[] args) {return SetDisplayDirectory (args[0]);}
- public int /*long*/ method14 (int /*long*/[] args) {return GetFile (args[0]);}
- public int /*long*/ method15 (int /*long*/[] args) {return GetFileURL (args[0]);}
- public int /*long*/ method16 (int /*long*/[] args) {return GetFiles (args[0]);}
- public int /*long*/ method17 (int /*long*/[] args) {return Show (args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], (short)args[2]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return AppendFilter (args[0], args[1]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return GetDefaultString (args[0]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return SetDefaultString (args[0]);}
+ public long /*int*/ method8 (long /*int*/[] args) {return GetDefaultExtension (args[0]);}
+ public long /*int*/ method9 (long /*int*/[] args) {return SetDefaultExtension (args[0]);}
+ public long /*int*/ method10 (long /*int*/[] args) {return GetFilterIndex (args[0]);}
+ public long /*int*/ method11 (long /*int*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
+ public long /*int*/ method12 (long /*int*/[] args) {return GetDisplayDirectory (args[0]);}
+ public long /*int*/ method13 (long /*int*/[] args) {return SetDisplayDirectory (args[0]);}
+ public long /*int*/ method14 (long /*int*/[] args) {return GetFile (args[0]);}
+ public long /*int*/ method15 (long /*int*/[] args) {return GetFileURL (args[0]);}
+ public long /*int*/ method16 (long /*int*/[] args) {return GetFiles (args[0]);}
+ public long /*int*/ method17 (long /*int*/[] args) {return Show (args[0]);}
};
}
@@ -77,37 +77,37 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return filePicker.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIFilePicker.NS_IFILEPICKER_IID)) {
- XPCOM.memmove(ppvObject, new int /*long*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove(ppvObject, new long /*int*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIFilePicker_1_8.NS_IFILEPICKER_IID)) {
- XPCOM.memmove(ppvObject, new int /*long*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove(ppvObject, new long /*int*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIFilePicker_1_8.NS_IFILEPICKER_10_IID)) {
- XPCOM.memmove(ppvObject, new int /*long*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove(ppvObject, new long /*int*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -117,7 +117,7 @@ int Release () {
return refCount;
}
-Browser getBrowser (int /*long*/ aDOMWindow) {
+Browser getBrowser (long /*int*/ aDOMWindow) {
if (aDOMWindow == 0) return null;
return Mozilla.getBrowser (aDOMWindow);
}
@@ -127,20 +127,20 @@ Browser getBrowser (int /*long*/ aDOMWindow) {
* answers a java string based on the type of string that is appropriate for the Mozilla
* version being used.
*/
-String parseAString (int /*long*/ string) {
+String parseAString (long /*int*/ string) {
return null;
}
/* nsIFilePicker */
-int Init (int /*long*/ parent, int /*long*/ title, short mode) {
+int Init (long /*int*/ parent, long /*int*/ title, short mode) {
parentHandle = parent;
this.mode = mode;
this.title = parseAString (title);
return XPCOM.NS_OK;
}
-int Show (int /*long*/ _retval) {
+int Show (long /*int*/ _retval) {
if (mode == nsIFilePicker.modeGetFolder) {
/* picking a directory */
int result = showDirectoryPicker ();
@@ -190,20 +190,20 @@ int showDirectoryPicker () {
return directory == null ? nsIFilePicker.returnCancel : nsIFilePicker.returnOK;
}
-int GetFiles (int /*long*/ aFiles) {
+int GetFiles (long /*int*/ aFiles) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetFileURL (int /*long*/ aFileURL) {
+int GetFileURL (long /*int*/ aFileURL) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetFile (int /*long*/ aFile) {
+int GetFile (long /*int*/ aFile) {
String filename = ""; //$NON-NLS-1$
if (directory != null) filename += directory + SEPARATOR;
if (files != null && files.length > 0) filename += files[0];
nsEmbedString path = new nsEmbedString (filename);
- int /*long*/[] file = new int /*long*/[1];
+ long /*int*/[] file = new long /*int*/[1];
int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, file);
path.dispose ();
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
@@ -212,14 +212,14 @@ int GetFile (int /*long*/ aFile) {
return XPCOM.NS_OK;
}
-int SetDisplayDirectory (int /*long*/ aDisplayDirectory) {
+int SetDisplayDirectory (long /*int*/ aDisplayDirectory) {
if (aDisplayDirectory == 0) return XPCOM.NS_OK;
nsILocalFile file = new nsILocalFile (aDisplayDirectory);
- int /*long*/ pathname = XPCOM.nsEmbedString_new ();
+ long /*int*/ pathname = XPCOM.nsEmbedString_new ();
int rc = file.GetPath (pathname);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
int length = XPCOM.nsEmbedString_Length (pathname);
- int /*long*/ buffer = XPCOM.nsEmbedString_get (pathname);
+ long /*int*/ buffer = XPCOM.nsEmbedString_get (pathname);
char[] chars = new char[length];
XPCOM.memmove (chars, buffer, length * 2);
XPCOM.nsEmbedString_delete (pathname);
@@ -227,10 +227,10 @@ int SetDisplayDirectory (int /*long*/ aDisplayDirectory) {
return XPCOM.NS_OK;
}
-int GetDisplayDirectory (int /*long*/ aDisplayDirectory) {
+int GetDisplayDirectory (long /*int*/ aDisplayDirectory) {
String directoryName = directory != null ? directory : ""; //$NON-NLS-1$
nsEmbedString path = new nsEmbedString (directoryName);
- int /*long*/[] file = new int /*long*/[1];
+ long /*int*/[] file = new long /*int*/[1];
int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, file);
path.dispose ();
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
@@ -243,31 +243,31 @@ int SetFilterIndex (int aFilterIndex) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetFilterIndex (int /*long*/ aFilterIndex) {
+int GetFilterIndex (long /*int*/ aFilterIndex) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int SetDefaultExtension (int /*long*/ aDefaultExtension) {
+int SetDefaultExtension (long /*int*/ aDefaultExtension) {
/* note that the type of argument 1 changed as of Mozilla 1.8 */
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetDefaultExtension (int /*long*/ aDefaultExtension) {
+int GetDefaultExtension (long /*int*/ aDefaultExtension) {
/* note that the type of argument 1 changed as of Mozilla 1.8 */
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int SetDefaultString (int /*long*/ aDefaultString) {
+int SetDefaultString (long /*int*/ aDefaultString) {
defaultFilename = parseAString (aDefaultString);
return XPCOM.NS_OK;
}
-int GetDefaultString (int /*long*/ aDefaultString) {
+int GetDefaultString (long /*int*/ aDefaultString) {
/* note that the type of argument 1 changed as of Mozilla 1.8 */
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int AppendFilter (int /*long*/ title, int /*long*/ filter) {
+int AppendFilter (long /*int*/ title, long /*int*/ filter) {
/* note that the type of arguments 1 and 2 changed as of Mozilla 1.8 */
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePickerFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePickerFactory.java
index 44fcbd68ce..fcf4a18a2e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePickerFactory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePickerFactory.java
@@ -30,17 +30,17 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
};
}
@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return factory.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -87,19 +87,19 @@ int Release () {
/* nsIFactory */
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
if (!Mozilla.IsPre_4) {
FilePicker_10 picker = new FilePicker_10 ();
picker.AddRef ();
- XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (result, new long /*int*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
} else if (Mozilla.IsXULRunner) {
FilePicker_1_8 picker = new FilePicker_1_8 ();
picker.AddRef ();
- XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (result, new long /*int*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
} else {
FilePicker picker = new FilePicker ();
picker.AddRef ();
- XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (result, new long /*int*/[] {picker.getAddress ()}, C.PTR_SIZEOF);
}
return XPCOM.NS_OK;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker_10.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker_10.java
index b976233bab..5ad410c667 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker_10.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker_10.java
@@ -17,32 +17,32 @@ class FilePicker_10 extends FilePicker_1_8 {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
filePicker = new XPCOMObject (new int[] {2, 0, 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], (short)args[2]);}
- public int /*long*/ method4 (int /*long*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
- public int /*long*/ method5 (int /*long*/[] args) {return AppendFilter (args[0], args[1]);}
- public int /*long*/ method6 (int /*long*/[] args) {return GetDefaultString (args[0]);}
- public int /*long*/ method7 (int /*long*/[] args) {return SetDefaultString (args[0]);}
- public int /*long*/ method8 (int /*long*/[] args) {return GetDefaultExtension (args[0]);}
- public int /*long*/ method9 (int /*long*/[] args) {return SetDefaultExtension (args[0]);}
- public int /*long*/ method10 (int /*long*/[] args) {return GetFilterIndex (args[0]);}
- public int /*long*/ method11 (int /*long*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
- public int /*long*/ method12 (int /*long*/[] args) {return GetDisplayDirectory (args[0]);}
- public int /*long*/ method13 (int /*long*/[] args) {return SetDisplayDirectory (args[0]);}
- public int /*long*/ method14 (int /*long*/[] args) {return GetFile (args[0]);}
- public int /*long*/ method15 (int /*long*/[] args) {return GetFileURL (args[0]);}
- public int /*long*/ method16 (int /*long*/[] args) {return GetFiles (args[0]);}
- public int /*long*/ method17 (int /*long*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
- public int /*long*/ method18 (int /*long*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
- public int /*long*/ method19 (int /*long*/[] args) {return Show (args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], (short)args[2]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return AppendFilter (args[0], args[1]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return GetDefaultString (args[0]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return SetDefaultString (args[0]);}
+ public long /*int*/ method8 (long /*int*/[] args) {return GetDefaultExtension (args[0]);}
+ public long /*int*/ method9 (long /*int*/[] args) {return SetDefaultExtension (args[0]);}
+ public long /*int*/ method10 (long /*int*/[] args) {return GetFilterIndex (args[0]);}
+ public long /*int*/ method11 (long /*int*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
+ public long /*int*/ method12 (long /*int*/[] args) {return GetDisplayDirectory (args[0]);}
+ public long /*int*/ method13 (long /*int*/[] args) {return SetDisplayDirectory (args[0]);}
+ public long /*int*/ method14 (long /*int*/[] args) {return GetFile (args[0]);}
+ public long /*int*/ method15 (long /*int*/[] args) {return GetFileURL (args[0]);}
+ public long /*int*/ method16 (long /*int*/[] args) {return GetFiles (args[0]);}
+ public long /*int*/ method17 (long /*int*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
+ public long /*int*/ method18 (long /*int*/[] args) {return XPCOM.NS_ERROR_NOT_IMPLEMENTED;}
+ public long /*int*/ method19 (long /*int*/[] args) {return Show (args[0]);}
};
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker_1_8.java
index a73840fd8c..19e15e55f6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker_1_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker_1_8.java
@@ -17,30 +17,30 @@ class FilePicker_1_8 extends FilePicker {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
filePicker = new XPCOMObject (new int[] {2, 0, 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return Init (args[0], args[1], (short)args[2]);}
- public int /*long*/ method4 (int /*long*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
- public int /*long*/ method5 (int /*long*/[] args) {return AppendFilter (args[0], args[1]);}
- public int /*long*/ method6 (int /*long*/[] args) {return GetDefaultString (args[0]);}
- public int /*long*/ method7 (int /*long*/[] args) {return SetDefaultString (args[0]);}
- public int /*long*/ method8 (int /*long*/[] args) {return GetDefaultExtension (args[0]);}
- public int /*long*/ method9 (int /*long*/[] args) {return SetDefaultExtension (args[0]);}
- public int /*long*/ method10 (int /*long*/[] args) {return GetFilterIndex (args[0]);}
- public int /*long*/ method11 (int /*long*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
- public int /*long*/ method12 (int /*long*/[] args) {return GetDisplayDirectory (args[0]);}
- public int /*long*/ method13 (int /*long*/[] args) {return SetDisplayDirectory (args[0]);}
- public int /*long*/ method14 (int /*long*/[] args) {return GetFile (args[0]);}
- public int /*long*/ method15 (int /*long*/[] args) {return GetFileURL (args[0]);}
- public int /*long*/ method16 (int /*long*/[] args) {return GetFiles (args[0]);}
- public int /*long*/ method17 (int /*long*/[] args) {return Show (args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return Init (args[0], args[1], (short)args[2]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return AppendFilters ((int)/*64*/args[0]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return AppendFilter (args[0], args[1]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return GetDefaultString (args[0]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return SetDefaultString (args[0]);}
+ public long /*int*/ method8 (long /*int*/[] args) {return GetDefaultExtension (args[0]);}
+ public long /*int*/ method9 (long /*int*/[] args) {return SetDefaultExtension (args[0]);}
+ public long /*int*/ method10 (long /*int*/[] args) {return GetFilterIndex (args[0]);}
+ public long /*int*/ method11 (long /*int*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);}
+ public long /*int*/ method12 (long /*int*/[] args) {return GetDisplayDirectory (args[0]);}
+ public long /*int*/ method13 (long /*int*/[] args) {return SetDisplayDirectory (args[0]);}
+ public long /*int*/ method14 (long /*int*/[] args) {return GetFile (args[0]);}
+ public long /*int*/ method15 (long /*int*/[] args) {return GetFileURL (args[0]);}
+ public long /*int*/ method16 (long /*int*/[] args) {return GetFiles (args[0]);}
+ public long /*int*/ method17 (long /*int*/[] args) {return Show (args[0]);}
};
}
@@ -49,10 +49,10 @@ void createCOMInterfaces () {
* answers a java string based on the type of string that is appropriate for the Mozilla
* version being used.
*/
-String parseAString (int /*long*/ string) {
+String parseAString (long /*int*/ string) {
if (string == 0) return null;
int length = XPCOM.nsEmbedString_Length (string);
- int /*long*/ buffer = XPCOM.nsEmbedString_get (string);
+ long /*int*/ buffer = XPCOM.nsEmbedString_get (string);
char[] chars = new char[length];
XPCOM.memmove (chars, buffer, length * 2);
return new String (chars);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog.java
index 706ec0898e..a8d9d5a011 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog.java
@@ -38,17 +38,17 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
helperAppLauncherDialog = new XPCOMObject (new int[] {2, 0, 0, 3, 5}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return Show (args[0], args[1], (int)/*64*/args[2]);}
- public int /*long*/ method4 (int /*long*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], args[4]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return Show (args[0], args[1], (int)/*64*/args[2]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], args[4]);}
};
}
@@ -63,27 +63,27 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return helperAppLauncherDialog.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIHelperAppLauncherDialog.NS_IHELPERAPPLAUNCHERDIALOG_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -102,14 +102,14 @@ int Release () {
/* nsIHelperAppLauncherDialog */
-int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) {
+int Show (long /*int*/ aLauncher, long /*int*/ aContext, int aReason) {
/*
* The interface for nsIHelperAppLauncher changed as of mozilla 1.8. Query the received
* nsIHelperAppLauncher for the new interface, and if it is not found then fall back to
* the old interface.
*/
nsISupports supports = new nsISupports (aLauncher);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = supports.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result);
if (rc == XPCOM.NS_OK) { /* >= 1.8 */
nsIHelperAppLauncher_1_8 helperAppLauncher = new nsIHelperAppLauncher_1_8 (aLauncher);
@@ -121,8 +121,8 @@ int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) {
return helperAppLauncher.SaveToDisk (0, 0);
}
-int PromptForSaveToFile (int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4) {
- int /*long*/ aDefaultFile, aSuggestedFileExtension, _retval;
+int PromptForSaveToFile (long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4) {
+ long /*int*/ aDefaultFile, aSuggestedFileExtension, _retval;
boolean hasLauncher = false;
/*
@@ -140,7 +140,7 @@ int PromptForSaveToFile (int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2
*/
boolean using_1_8 = false;
nsISupports support = new nsISupports (arg0);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = support.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result);
if (rc == XPCOM.NS_OK) {
using_1_8 = true;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
index 43f96bd06c..80ed72e8ab 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
@@ -30,17 +30,17 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
};
}
@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return factory.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -87,19 +87,19 @@ int Release () {
/* nsIFactory */
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
if (Mozilla.IsPre_1_9) {
HelperAppLauncherDialog helperAppLauncherDialog = new HelperAppLauncherDialog ();
helperAppLauncherDialog.AddRef ();
- XPCOM.memmove (result, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (result, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
} else if (Mozilla.IsPre_4){
HelperAppLauncherDialog_1_9 helperAppLauncherDialog = new HelperAppLauncherDialog_1_9 ();
helperAppLauncherDialog.AddRef ();
- XPCOM.memmove (result, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (result, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
} else {
HelperAppLauncherDialog_10 helperAppLauncherDialog = new HelperAppLauncherDialog_10 ();
helperAppLauncherDialog.AddRef ();
- XPCOM.memmove (result, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (result, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
}
return XPCOM.NS_OK;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_10.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_10.java
index fd30ea1527..38107f57fb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_10.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_10.java
@@ -32,12 +32,12 @@ HelperAppLauncherDialog_10 () {
/* nsIHelperAppLauncherDialog */
-int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) {
+int Show (long /*int*/ aLauncher, long /*int*/ aContext, int aReason) {
nsIHelperAppLauncher_8 helperAppLauncher = new nsIHelperAppLauncher_8 (aLauncher);
return helperAppLauncher.SaveToDisk (0, 0);
}
-int PromptForSaveToFile (int /*long*/ aLauncher, int /*long*/ aWindowContext, int /*long*/ aDefaultFileName, int /*long*/ aSuggestedFileExtension, int aForcePrompt, int /*long*/ _retval) {
+int PromptForSaveToFile (long /*int*/ aLauncher, long /*int*/ aWindowContext, long /*int*/ aDefaultFileName, long /*int*/ aSuggestedFileExtension, int aForcePrompt, long /*int*/ _retval) {
int length = XPCOM.strlen_PRUnichar (aDefaultFileName);
char[] dest = new char[length];
XPCOM.memmove (dest, aDefaultFileName, length * 2);
@@ -61,7 +61,7 @@ int PromptForSaveToFile (int /*long*/ aLauncher, int /*long*/ aWindowContext, in
return XPCOM.NS_ERROR_FAILURE;
}
nsEmbedString path = new nsEmbedString (name);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, result);
path.dispose ();
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
index dd2e0cb89c..5599b9bf2a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
@@ -38,17 +38,17 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
helperAppLauncherDialog = new XPCOMObject (new int[] {2, 0, 0, 3, 6}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return Show (args[0], args[1], (int)/*64*/args[2]);}
- public int /*long*/ method4 (int /*long*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return Show (args[0], args[1], (int)/*64*/args[2]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5]);}
};
}
@@ -63,27 +63,27 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return helperAppLauncherDialog.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIHelperAppLauncherDialog_1_9.NS_IHELPERAPPLAUNCHERDIALOG_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -102,12 +102,12 @@ int Release () {
/* nsIHelperAppLauncherDialog */
-int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) {
+int Show (long /*int*/ aLauncher, long /*int*/ aContext, int aReason) {
nsIHelperAppLauncher_1_9 helperAppLauncher = new nsIHelperAppLauncher_1_9 (aLauncher);
return helperAppLauncher.SaveToDisk (0, 0);
}
-int PromptForSaveToFile (int /*long*/ aLauncher, int /*long*/ aWindowContext, int /*long*/ aDefaultFileName, int /*long*/ aSuggestedFileExtension, int aForcePrompt, int /*long*/ _retval) {
+int PromptForSaveToFile (long /*int*/ aLauncher, long /*int*/ aWindowContext, long /*int*/ aDefaultFileName, long /*int*/ aSuggestedFileExtension, int aForcePrompt, long /*int*/ _retval) {
int length = XPCOM.strlen_PRUnichar (aDefaultFileName);
char[] dest = new char[length];
XPCOM.memmove (dest, aDefaultFileName, length * 2);
@@ -131,7 +131,7 @@ int PromptForSaveToFile (int /*long*/ aLauncher, int /*long*/ aWindowContext, in
return XPCOM.NS_ERROR_FAILURE;
}
nsEmbedString path = new nsEmbedString (name);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, result);
path.dispose ();
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/InputStream.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/InputStream.java
index cc0f34d7c0..1f4a55a328 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/InputStream.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/InputStream.java
@@ -34,14 +34,14 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
inputStream = new XPCOMObject (new int[] {2, 0, 0, 0, 1, 3, 4, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return Close ();}
- public int /*long*/ method4 (int /*long*/[] args) {return Available (args[0]);}
- public int /*long*/ method5 (int /*long*/[] args) {return Read (args[0], (int)/*64*/args[1], args[2]);}
- public int /*long*/ method6 (int /*long*/[] args) {return ReadSegments (args[0], args[1], (int)/*64*/args[2], args[3]);}
- public int /*long*/ method7 (int /*long*/[] args) {return IsNonBlocking (args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return Close ();}
+ public long /*int*/ method4 (long /*int*/[] args) {return Available (args[0]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return Read (args[0], (int)/*64*/args[1], args[2]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return ReadSegments (args[0], args[1], (int)/*64*/args[2], args[3]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return IsNonBlocking (args[0]);}
};
}
@@ -52,26 +52,26 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return inputStream.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIInputStream.NS_IINPUTSTREAM_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -89,13 +89,13 @@ int Close () {
return XPCOM.NS_OK;
}
-int Available (int /*long*/ _retval) {
+int Available (long /*int*/ _retval) {
int available = buffer == null ? 0 : buffer.length - index;
XPCOM.memmove (_retval, new int[] {available}, 4);
return XPCOM.NS_OK;
}
-int Read(int /*long*/ aBuf, int aCount, int /*long*/ _retval) {
+int Read(long /*int*/ aBuf, int aCount, long /*int*/ _retval) {
int max = Math.min (aCount, buffer == null ? 0 : buffer.length - index);
if (max > 0) {
byte[] src = new byte[max];
@@ -107,7 +107,7 @@ int Read(int /*long*/ aBuf, int aCount, int /*long*/ _retval) {
return XPCOM.NS_OK;
}
-int ReadSegments (int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int /*long*/ _retval) {
+int ReadSegments (long /*int*/ aWriter, long /*int*/ aClosure, int aCount, long /*int*/ _retval) {
int max = buffer == null ? 0 : buffer.length - index;
if (aCount != -1) {
max = Math.min (max, aCount);
@@ -115,7 +115,7 @@ int ReadSegments (int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int /
int cnt = max;
while (cnt > 0) {
int[] aWriteCount = new int[1];
- int /*long*/ rc = XPCOM.Call (aWriter, getAddress (), aClosure, buffer, index, cnt, aWriteCount);
+ long /*int*/ rc = XPCOM.Call (aWriter, getAddress (), aClosure, buffer, index, cnt, aWriteCount);
if (rc != XPCOM.NS_OK) break;
index += aWriteCount[0];
cnt -= aWriteCount[0];
@@ -124,7 +124,7 @@ int ReadSegments (int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int /
return XPCOM.NS_OK;
}
-int IsNonBlocking (int /*long*/ _retval) {
+int IsNonBlocking (long /*int*/ _retval) {
/* blocking */
XPCOM.memmove (_retval, new boolean[] {false});
return XPCOM.NS_OK;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
index 07aed67ee9..21aa7f02cc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
@@ -23,7 +23,7 @@ import org.eclipse.swt.internal.mozilla.init.*;
import org.eclipse.swt.layout.*;
class Mozilla extends WebBrowser {
- int /*long*/ embedHandle;
+ long /*int*/ embedHandle;
nsIWebBrowser webBrowser;
Object webBrowserObject;
MozillaDelegate delegate;
@@ -46,7 +46,7 @@ class Mozilla extends WebBrowser {
int chromeFlags = nsIWebBrowserChrome.CHROME_DEFAULT;
int registerFunctionsOnState = 0;
int refCount, lastKeyCode, lastCharCode, authCount;
- int /*long*/ request, badCertRequest;
+ long /*int*/ request, badCertRequest;
Point location, size;
boolean visible, isActive, isChild, ignoreDispose, isRetrievingBadCert, isViewingErrorPage, ignoreAllMessages, untrustedText;
boolean updateLastNavigateUrl;
@@ -124,7 +124,7 @@ class Mozilla extends WebBrowser {
public void handleEvent (Event event) {
if (BrowserCount > 0) return; /* another display is still active */
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -189,18 +189,18 @@ class Mozilla extends WebBrowser {
// int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
// /* alloc memory for two structs, the second is empty to signify the end of the list */
-// int /*long*/ ptr = C.malloc (size * 2);
+// long /*int*/ ptr = C.malloc (size * 2);
// C.memset (ptr, 0, size * 2);
// nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();
// byte[] bytes = MozillaDelegate.wcsToMbcs (null, "XRE_TermEmbedding", true); //$NON-NLS-1$
// functionLoad.functionName = C.malloc (bytes.length);
// C.memmove (functionLoad.functionName, bytes, bytes.length);
// functionLoad.function = C.malloc (C.PTR_SIZEOF);
-// C.memmove (functionLoad.function, new int /*long*/[] {0} , C.PTR_SIZEOF);
+// C.memmove (functionLoad.function, new long /*int*/[] {0} , C.PTR_SIZEOF);
// XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
// XPCOM.XPCOMGlueLoadXULFunctions (ptr);
// C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
-// int /*long*/ functionPtr = result[0];
+// long /*int*/ functionPtr = result[0];
// result[0] = 0;
// C.free (functionLoad.function);
// C.free (functionLoad.functionName);
@@ -222,7 +222,7 @@ class Mozilla extends WebBrowser {
boolean hostSet = oldProxyHostFTP != null || oldProxyHostHTTP != null || oldProxyHostSSL != null;
if (!hostSet && oldProxyPortFTP == -1 && oldProxyPortHTTP == -1 && oldProxyPortSSL == -1 && oldProxyType == -1) return;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
byte[] buffer = new byte[1];
int rc = prefService.GetBranch (buffer, result); /* empty buffer denotes root preference level */
if (rc != XPCOM.NS_OK) error (rc);
@@ -327,7 +327,7 @@ class Mozilla extends WebBrowser {
MozillaClearSessions = new Runnable () {
public void run () {
if (!Initialized) return;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -357,9 +357,9 @@ class Mozilla extends WebBrowser {
rc = cookie.GetExpires (expires);
if (expires[0] == 0) {
/* indicates a session cookie */
- int /*long*/ domain = XPCOM.nsEmbedCString_new ();
- int /*long*/ name = XPCOM.nsEmbedCString_new ();
- int /*long*/ path = XPCOM.nsEmbedCString_new ();
+ long /*int*/ domain = XPCOM.nsEmbedCString_new ();
+ long /*int*/ name = XPCOM.nsEmbedCString_new ();
+ long /*int*/ path = XPCOM.nsEmbedCString_new ();
cookie.GetHost (domain);
cookie.GetName (name);
cookie.GetPath (path);
@@ -382,7 +382,7 @@ class Mozilla extends WebBrowser {
public void run() {
if (!Initialized) return;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -396,7 +396,7 @@ class Mozilla extends WebBrowser {
nsIIOService ioService = new nsIIOService (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);
- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);
+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);
rc = ioService.NewURI (aSpec, null, 0, result);
XPCOM.nsEmbedCString_delete (aSpec);
ioService.Release ();
@@ -410,7 +410,7 @@ class Mozilla extends WebBrowser {
result[0] = 0;
byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_COOKIESERVICE_CONTRACTID, true);
rc = serviceManager.GetServiceByContractID (aContractID, nsICookieService.NS_ICOOKIESERVICE_IID, result);
- int /*long*/ cookieString;
+ long /*int*/ cookieString;
if (rc == XPCOM.NS_OK && result[0] != 0) {
nsICookieService cookieService = new nsICookieService (result[0]);
result[0] = 0;
@@ -485,7 +485,7 @@ class Mozilla extends WebBrowser {
public void run() {
if (!Initialized) return;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -499,7 +499,7 @@ class Mozilla extends WebBrowser {
nsIIOService ioService = new nsIIOService (result[0]);
result[0] = 0;
byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);
- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);
+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);
rc = ioService.NewURI (aSpec, null, 0, result);
XPCOM.nsEmbedCString_delete (aSpec);
ioService.Release ();
@@ -631,7 +631,7 @@ static void LoadLibraries () {
if (Device.DEBUG) System.out.println ("cannot use detected XULRunner: " + MozillaPath); //$NON-NLS-1$
/* attempt to XPCOMGlueStartup the GRE pointed at by MOZILLA_FIVE_HOME */
- int /*long*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true));
+ long /*int*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true));
if (ptr == 0) {
IsXULRunner = false;
} else {
@@ -675,7 +675,7 @@ public void create (Composite parent, int style) {
delegate = new MozillaDelegate (browser);
final Display display = parent.getDisplay ();
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
if (!Initialized) {
LoadLibraries ();
@@ -972,7 +972,7 @@ public void create (Composite parent, int style) {
/* if tabbing onto a page for the first time then full-Browser focus ring should be shown */
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -1059,7 +1059,7 @@ public void create (Composite parent, int style) {
public boolean back () {
htmlBytes = null;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -1089,122 +1089,122 @@ public boolean close () {
void createCOMInterfaces () {
// Create each of the interfaces that this object implements
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
weakReference = new XPCOMObject (new int[] {2, 0, 0, 2}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return QueryReferent (args[0], args[1]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return QueryReferent (args[0], args[1]);}
};
webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
- public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);}
};
webBrowserChrome = new XPCOMObject (new int[] {2, 0, 0, 2, 1, 1, 1, 1, 0, 2, 0, 1, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return SetStatus ((int)/*64*/args[0], args[1]);}
- public int /*long*/ method4 (int /*long*/[] args) {return GetWebBrowser (args[0]);}
- public int /*long*/ method5 (int /*long*/[] args) {return SetWebBrowser (args[0]);}
- public int /*long*/ method6 (int /*long*/[] args) {return GetChromeFlags (args[0]);}
- public int /*long*/ method7 (int /*long*/[] args) {return SetChromeFlags ((int)/*64*/args[0]);}
- public int /*long*/ method8 (int /*long*/[] args) {return DestroyBrowserWindow ();}
- public int /*long*/ method9 (int /*long*/[] args) {return SizeBrowserTo ((int)/*64*/args[0], (int)/*64*/args[1]);}
- public int /*long*/ method10 (int /*long*/[] args) {return ShowAsModal ();}
- public int /*long*/ method11 (int /*long*/[] args) {return IsWindowModal (args[0]);}
- public int /*long*/ method12 (int /*long*/[] args) {return ExitModalEventLoop ((int)/*64*/args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return SetStatus ((int)/*64*/args[0], args[1]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return GetWebBrowser (args[0]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return SetWebBrowser (args[0]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return GetChromeFlags (args[0]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return SetChromeFlags ((int)/*64*/args[0]);}
+ public long /*int*/ method8 (long /*int*/[] args) {return DestroyBrowserWindow ();}
+ public long /*int*/ method9 (long /*int*/[] args) {return SizeBrowserTo ((int)/*64*/args[0], (int)/*64*/args[1]);}
+ public long /*int*/ method10 (long /*int*/[] args) {return ShowAsModal ();}
+ public long /*int*/ method11 (long /*int*/[] args) {return IsWindowModal (args[0]);}
+ public long /*int*/ method12 (long /*int*/[] args) {return ExitModalEventLoop ((int)/*64*/args[0]);}
};
webBrowserChromeFocus = new XPCOMObject (new int[] {2, 0, 0, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return FocusNextElement ();}
- public int /*long*/ method4 (int /*long*/[] args) {return FocusPrevElement ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return FocusNextElement ();}
+ public long /*int*/ method4 (long /*int*/[] args) {return FocusPrevElement ();}
};
embeddingSiteWindow = new XPCOMObject (new int[] {2, 0, 0, 5, 5, 0, 1, 1, 1, 1, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return SetDimensions ((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4]);}
- public int /*long*/ method4 (int /*long*/[] args) {return GetDimensions ((int)/*64*/args[0], args[1], args[2], args[3], args[4]);}
- public int /*long*/ method5 (int /*long*/[] args) {return SetFocus ();}
- public int /*long*/ method6 (int /*long*/[] args) {return GetVisibility (args[0]);}
- public int /*long*/ method7 (int /*long*/[] args) {return SetVisibility ((int)/*64*/args[0]);}
- public int /*long*/ method8 (int /*long*/[] args) {return GetTitle (args[0]);}
- public int /*long*/ method9 (int /*long*/[] args) {return SetTitle (args[0]);}
- public int /*long*/ method10 (int /*long*/[] args) {return GetSiteWindow (args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return SetDimensions ((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return GetDimensions ((int)/*64*/args[0], args[1], args[2], args[3], args[4]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return SetFocus ();}
+ public long /*int*/ method6 (long /*int*/[] args) {return GetVisibility (args[0]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return SetVisibility ((int)/*64*/args[0]);}
+ public long /*int*/ method8 (long /*int*/[] args) {return GetTitle (args[0]);}
+ public long /*int*/ method9 (long /*int*/[] args) {return SetTitle (args[0]);}
+ public long /*int*/ method10 (long /*int*/[] args) {return GetSiteWindow (args[0]);}
};
interfaceRequestor = new XPCOMObject (new int[] {2, 0, 0, 2} ){
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return GetInterface (args[0], args[1]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return GetInterface (args[0], args[1]);}
};
supportsWeakReference = new XPCOMObject (new int[] {2, 0, 0, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return GetWeakReference (args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return GetWeakReference (args[0]);}
};
contextMenuListener = new XPCOMObject (new int[] {2, 0, 0, 3}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return OnShowContextMenu ((int)/*64*/args[0], args[1], args[2]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return OnShowContextMenu ((int)/*64*/args[0], args[1], args[2]);}
};
uriContentListener = new XPCOMObject (new int[] {2, 0, 0, 2, 5, 3, 4, 1, 1, 1, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return OnStartURIOpen (args[0], args[1]);}
- public int /*long*/ method4 (int /*long*/[] args) {return DoContent (args[0], (int)/*64*/args[1], args[2], args[3], args[4]);}
- public int /*long*/ method5 (int /*long*/[] args) {return IsPreferred (args[0], args[1], args[2]);}
- public int /*long*/ method6 (int /*long*/[] args) {return CanHandleContent (args[0], (int)/*64*/args[1], args[2], args[3]);}
- public int /*long*/ method7 (int /*long*/[] args) {return GetLoadCookie (args[0]);}
- public int /*long*/ method8 (int /*long*/[] args) {return SetLoadCookie (args[0]);}
- public int /*long*/ method9 (int /*long*/[] args) {return GetParentContentListener (args[0]);}
- public int /*long*/ method10 (int /*long*/[] args) {return SetParentContentListener (args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return OnStartURIOpen (args[0], args[1]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return DoContent (args[0], (int)/*64*/args[1], args[2], args[3], args[4]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return IsPreferred (args[0], args[1], args[2]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return CanHandleContent (args[0], (int)/*64*/args[1], args[2], args[3]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return GetLoadCookie (args[0]);}
+ public long /*int*/ method8 (long /*int*/[] args) {return SetLoadCookie (args[0]);}
+ public long /*int*/ method9 (long /*int*/[] args) {return GetParentContentListener (args[0]);}
+ public long /*int*/ method10 (long /*int*/[] args) {return SetParentContentListener (args[0]);}
};
tooltipListener = new XPCOMObject (new int[] {2, 0, 0, 3, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return OnShowTooltip ((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}
- public int /*long*/ method4 (int /*long*/[] args) {return OnHideTooltip ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return OnShowTooltip ((int)/*64*/args[0], (int)/*64*/args[1], args[2]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return OnHideTooltip ();}
};
domEventListener = new XPCOMObject (new int[] {2, 0, 0, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return HandleEvent (args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return HandleEvent (args[0]);}
};
badCertListener = new XPCOMObject (new int[] {2, 0, 0, 4}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return NotifyCertProblem (args[0], args[1], args[2], args[3]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return NotifyCertProblem (args[0], args[1], args[2], args[3]);}
};
}
@@ -1283,7 +1283,7 @@ public boolean execute (String script) {
* workaround is to invoke the javascript handler directly via C++, which is
* exposed as of mozilla 1.9.
*/
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
if (!IsPre_1_9) {
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
@@ -1332,13 +1332,13 @@ public boolean execute (String script) {
interfaceRequestor.Release ();
if (rc == XPCOM.NS_OK && result[0] != 0) {
- int /*long*/ scriptGlobalObject = result[0];
+ long /*int*/ scriptGlobalObject = result[0];
result[0] = 0;
rc = (int/*64*/)XPCOM.nsIScriptGlobalObject_EnsureScriptEnvironment (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
if (rc != XPCOM.NS_OK) {
new nsISupports (scriptGlobalObject).Release ();
} else {
- int /*long*/ scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
+ long /*int*/ scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
new nsISupports (scriptGlobalObject).Release ();
if (scriptContext != 0) {
@@ -1361,7 +1361,7 @@ public boolean execute (String script) {
new nsISupports (result[0]).Release ();
result[0] = 0;
- int /*long*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (scriptContext);
+ long /*int*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (scriptContext);
if (nativeContext != 0) {
int length = script.length ();
char[] scriptChars = new char[length];
@@ -1369,11 +1369,11 @@ public boolean execute (String script) {
byte[] urlbytes = MozillaDelegate.wcsToMbcs (null, getUrl (), true);
rc = principal.GetJSPrincipals (nativeContext, result);
if (rc == XPCOM.NS_OK && result[0] != 0) {
- int /*long*/ principals = result[0];
+ long /*int*/ principals = result[0];
result[0] = 0;
byte[] jsLibPath = getJSLibPathBytes ();
- int /*long*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, nativeContext);
+ long /*int*/ globalJSObject = XPCOM.JS_GetGlobalObject (jsLibPath, nativeContext);
if (globalJSObject != 0) {
aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CONTEXTSTACK_CONTRACTID, true);
rc = serviceManager.GetServiceByContractID (aContractID, nsIJSContextStack.NS_IJSCONTEXTSTACK_IID, result);
@@ -1423,12 +1423,12 @@ public boolean execute (String script) {
return rc == XPCOM.NS_OK;
}
-static Browser findBrowser (int /*long*/ handle) {
+static Browser findBrowser (long /*int*/ handle) {
return MozillaDelegate.findBrowser (handle);
}
-static Browser getBrowser (int /*long*/ aDOMWindow) {
- int /*long*/[] result = new int /*long*/[1];
+static Browser getBrowser (long /*int*/ aDOMWindow) {
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
@@ -1448,7 +1448,7 @@ static Browser getBrowser (int /*long*/ aDOMWindow) {
rc = window.GetTop (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
- int /*long*/ topDOMWindow = result[0];
+ long /*int*/ topDOMWindow = result[0];
result[0] = 0;
rc = windowWatcher.GetChromeForWindow (topDOMWindow, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
@@ -1478,7 +1478,7 @@ static Browser getBrowser (int /*long*/ aDOMWindow) {
public boolean forward () {
htmlBytes = null;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -1511,7 +1511,7 @@ static String getMozillaPath () {
if (LocationProvider != null) return LocationProvider.mozillaPath;
if (!Initialized) return "";
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -1541,11 +1541,11 @@ static String getMozillaPath () {
nsIFile mozillaDir = new nsIFile (result[0]);
result[0] = 0;
- int /*long*/ path = XPCOM.nsEmbedString_new ();
+ long /*int*/ path = XPCOM.nsEmbedString_new ();
rc = mozillaDir.GetPath (path);
if (rc != XPCOM.NS_OK) error (rc);
int length = XPCOM.nsEmbedString_Length (path);
- int /*long*/ ptr = XPCOM.nsEmbedString_get (path);
+ long /*int*/ ptr = XPCOM.nsEmbedString_get (path);
char[] chars = new char[length];
XPCOM.memmove (chars, ptr, length * 2);
XPCOM.nsEmbedString_delete (path);
@@ -1559,7 +1559,7 @@ int getNextFunctionIndex () {
}
public String getText () {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.GetContentDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -1571,7 +1571,7 @@ public String getText () {
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
window.Release ();
- int /*long*/ document = result[0];
+ long /*int*/ document = result[0];
result[0] = 0;
rc = XPCOM.NS_GetComponentManager (result);
if (rc != XPCOM.NS_OK) error (rc);
@@ -1588,12 +1588,12 @@ public String getText () {
nsIDOMSerializer_1_7 serializer = new nsIDOMSerializer_1_7 (result[0]);
result[0] = 0;
- int /*long*/ string = XPCOM.nsEmbedString_new ();
+ long /*int*/ string = XPCOM.nsEmbedString_new ();
rc = serializer.SerializeToString (document, string);
serializer.Release ();
int length = XPCOM.nsEmbedString_Length (string);
- int /*long*/ buffer = XPCOM.nsEmbedString_get (string);
+ long /*int*/ buffer = XPCOM.nsEmbedString_get (string);
chars = new char[length];
XPCOM.memmove (chars, buffer, length * 2);
XPCOM.nsEmbedString_delete (string);
@@ -1618,13 +1618,13 @@ public String getText () {
}
public String getUrl () {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
- int /*long*/[] aCurrentURI = new int /*long*/[1];
+ long /*int*/[] aCurrentURI = new long /*int*/[1];
rc = webNavigation.GetCurrentURI (aCurrentURI);
if (rc != XPCOM.NS_OK) error (rc);
webNavigation.Release ();
@@ -1632,11 +1632,11 @@ public String getUrl () {
byte[] dest = null;
if (aCurrentURI[0] != 0) {
nsIURI uri = new nsIURI (aCurrentURI[0]);
- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
rc = uri.GetSpec (aSpec);
if (rc != XPCOM.NS_OK) error (rc);
int length = XPCOM.nsEmbedCString_Length (aSpec);
- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
@@ -1699,29 +1699,29 @@ static String InitDiscoverXULRunner () {
GREVersionRange range = new GREVersionRange ();
byte[] bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER, true);
- int /*long*/ lower = C.malloc (bytes.length);
+ long /*int*/ lower = C.malloc (bytes.length);
C.memmove (lower, bytes, bytes.length);
range.lower = lower;
range.lowerInclusive = LowerRangeInclusive;
bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_UPPER, true);
- int /*long*/ upper = C.malloc (bytes.length);
+ long /*int*/ upper = C.malloc (bytes.length);
C.memmove (upper, bytes, bytes.length);
range.upper = upper;
range.upperInclusive = UpperRangeInclusive;
GREProperty property = new GREProperty ();
bytes = MozillaDelegate.wcsToMbcs (null, PROPERTY_ABI, true);
- int /*long*/ name = C.malloc (bytes.length);
+ long /*int*/ name = C.malloc (bytes.length);
C.memmove (name, bytes, bytes.length);
property.property = name;
bytes = MozillaDelegate.wcsToMbcs (null, Arch () + GCC3, true);
- int /*long*/ value = C.malloc (bytes.length);
+ long /*int*/ value = C.malloc (bytes.length);
C.memmove (value, bytes, bytes.length);
property.value = value;
int length = XPCOMInit.PATH_MAX;
- int /*long*/ greBuffer = C.malloc (length);
+ long /*int*/ greBuffer = C.malloc (length);
int rc = XPCOMInit.GRE_GetGREPathWithProperties (range, 1, property, 1, greBuffer, length);
if (rc != XPCOM.NS_OK) {
@@ -1787,7 +1787,7 @@ void initExternal (String profilePath) {
}
void initFactories (nsIServiceManager serviceManager, nsIComponentManager componentManager, boolean isXULRunner) {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = componentManager.QueryInterface (nsIComponentRegistrar.NS_ICOMPONENTREGISTRAR_IID, result);
if (rc != XPCOM.NS_OK) {
@@ -1921,7 +1921,7 @@ void initJavaXPCOM (String mozillaPath) {
String initMozilla (String mozillaPath) {
/* attempt to use the GRE pointed at by MOZILLA_FIVE_HOME */
- int /*long*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true));
+ long /*int*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true));
if (ptr != 0) {
int length = C.strlen (ptr);
byte[] buffer = new byte[length];
@@ -1975,7 +1975,7 @@ String initMozilla (String mozillaPath) {
}
void initXPCOM (String mozillaPath, boolean isXULRunner) {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
nsEmbedString pathString = new nsEmbedString (mozillaPath);
int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
@@ -1994,7 +1994,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
if (isXULRunner) {
int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
/* alloc memory for two structs, the second is empty to signify the end of the list */
- int /*long*/ ptr = C.malloc (size * 2);
+ long /*int*/ ptr = C.malloc (size * 2);
C.memset (ptr, 0, size * 2);
nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();
@@ -2006,7 +2006,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
functionLoad.functionName = C.malloc (bytes.length);
C.memmove (functionLoad.functionName, bytes, bytes.length);
functionLoad.function = C.malloc (C.PTR_SIZEOF);
- C.memmove (functionLoad.function, new int /*long*/[] {0} , C.PTR_SIZEOF);
+ C.memmove (functionLoad.function, new long /*int*/[] {0} , C.PTR_SIZEOF);
XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
rc = XPCOM.XPCOMGlueLoadXULFunctions (ptr);
if (rc == XPCOM.NS_OK) {
@@ -2029,7 +2029,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
}
C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
- int /*long*/ functionPtr = result[0];
+ long /*int*/ functionPtr = result[0];
result[0] = 0;
C.free (functionLoad.function);
C.free (functionLoad.functionName);
@@ -2058,7 +2058,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
}
void initPreferences (nsIServiceManager serviceManager, nsIComponentManager componentManager) {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
/*
* As a result of using a common profile the user cannot change their locale
@@ -2417,7 +2417,7 @@ void initPreferences (nsIServiceManager serviceManager, nsIComponentManager comp
}
void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
byte[] buffer = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_OBSERVER_CONTRACTID, true);
int rc = serviceManager.GetServiceByContractID (buffer, nsIObserverService.NS_IOBSERVERSERVICE_IID, result);
@@ -2452,18 +2452,18 @@ void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) {
if (isXULRunner) {
int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
/* alloc memory for two structs, the second is empty to signify the end of the list */
- int /*long*/ ptr = C.malloc (size * 2);
+ long /*int*/ ptr = C.malloc (size * 2);
C.memset (ptr, 0, size * 2);
nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();
byte[] bytes = MozillaDelegate.wcsToMbcs (null, "XRE_NotifyProfile", true); //$NON-NLS-1$
functionLoad.functionName = C.malloc (bytes.length);
C.memmove (functionLoad.functionName, bytes, bytes.length);
functionLoad.function = C.malloc (C.PTR_SIZEOF);
- C.memmove (functionLoad.function, new int /*long*/[] {0} , C.PTR_SIZEOF);
+ C.memmove (functionLoad.function, new long /*int*/[] {0} , C.PTR_SIZEOF);
XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
XPCOM.XPCOMGlueLoadXULFunctions (ptr);
C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
- int /*long*/ functionPtr = result[0];
+ long /*int*/ functionPtr = result[0];
result[0] = 0;
C.free (functionLoad.function);
C.free (functionLoad.functionName);
@@ -2481,7 +2481,7 @@ void initProfile (nsIServiceManager serviceManager, boolean isXULRunner) {
void initSpinup (nsIComponentManager componentManager) {
if (MozillaDelegate.needsSpinup ()) {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
/* nsIAppShell is discontinued as of xulrunner 1.9, so do not fail if it is not found */
int rc = componentManager.CreateInstance (XPCOM.NS_APPSHELL_CID, 0, nsIAppShell.NS_IAPPSHELL_IID, result);
@@ -2518,7 +2518,7 @@ void initWebBrowserWindows () {
error (rc);
}
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
if (rc != XPCOM.NS_OK) {
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
@@ -2564,7 +2564,7 @@ void initWindowCreator (nsIServiceManager serviceManager) {
WindowCreator = new WindowCreator2 ();
WindowCreator.AddRef ();
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_WINDOWWATCHER_CONTRACTID, true);
int rc = serviceManager.GetServiceByContractID (aContractID, nsIWindowWatcher.NS_IWINDOWWATCHER_IID, result);
if (rc != XPCOM.NS_OK) {
@@ -2613,7 +2613,7 @@ String initXULRunner (String mozillaPath) {
}
public boolean isBackEnabled () {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -2626,7 +2626,7 @@ public boolean isBackEnabled () {
}
public boolean isForwardEnabled () {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -2668,7 +2668,7 @@ void onDispose (Display display) {
unhookDOMListeners ();
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
if (rc != XPCOM.NS_OK) {
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
@@ -2717,7 +2717,7 @@ void onDispose (Display display) {
void Activate () {
isActive = true;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebBrowserFocus.NS_IWEBBROWSERFOCUS_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -2730,7 +2730,7 @@ void Activate () {
void Deactivate () {
isActive = false;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebBrowserFocus.NS_IWEBBROWSERFOCUS_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -2741,11 +2741,11 @@ void Deactivate () {
webBrowserFocus.Release ();
}
-void navigate (int /*long*/ requestHandle) {
+void navigate (long /*int*/ requestHandle) {
nsIRequest request = new nsIRequest (requestHandle);
/* get the request post data, if any */
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
byte[] postData = null;
final Vector headers = new Vector ();
int rc = request.QueryInterface (nsIUploadChannel.NS_IUPLOADCHANNEL_IID, result);
@@ -2805,37 +2805,37 @@ void navigate (int /*long*/ requestHandle) {
/* get the request headers */
XPCOMObject visitor = new XPCOMObject (new int[] {2, 0, 0, 2}) {
int refCount = 0;
- public int /*long*/ method0 (int /*long*/[] args) {
+ public long /*int*/ method0 (long /*int*/[] args) {
/* QueryInterface */
- int /*long*/ riid = args[0];
- int /*long*/ ppvObject = args[1];
+ long /*int*/ riid = args[0];
+ long /*int*/ ppvObject = args[1];
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID) || guid.Equals (nsIHttpHeaderVisitor.NS_IHTTPHEADERVISITOR_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {getAddress ()}, C.PTR_SIZEOF);
refCount++;
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
- public int /*long*/ method1 (int /*long*/[] args) {
+ public long /*int*/ method1 (long /*int*/[] args) {
/* AddRef */
return ++refCount;
}
- public int /*long*/ method2 (int /*long*/[] args) {
+ public long /*int*/ method2 (long /*int*/[] args) {
/* Release */
if (--refCount == 0) dispose ();
return refCount;
}
- public int /*long*/ method3 (int /*long*/[] args) {
+ public long /*int*/ method3 (long /*int*/[] args) {
/* VisitHeader */
- int /*long*/ aHeader = args[0];
- int /*long*/ aValue = args[1];
+ long /*int*/ aHeader = args[0];
+ long /*int*/ aValue = args[1];
int length = XPCOM.nsEmbedCString_Length (aHeader);
- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aHeader);
+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aHeader);
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
String header = new String (dest);
@@ -2870,11 +2870,11 @@ void navigate (int /*long*/ requestHandle) {
/* a request's name often (but not always) is its url */
String url = lastNavigateURL;
- int /*long*/ name = XPCOM.nsEmbedCString_new ();
+ long /*int*/ name = XPCOM.nsEmbedCString_new ();
rc = request.GetName (name);
if (rc == XPCOM.NS_OK) {
int length = XPCOM.nsEmbedCString_Length (name);
- int /*long*/ buffer = XPCOM.nsEmbedCString_get (name);
+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (name);
byte[] bytes = new byte[length];
XPCOM.memmove (bytes, buffer, length);
String value = new String (bytes);
@@ -2890,7 +2890,7 @@ void onResize () {
int width = Math.max (1, rect.width);
int height = Math.max (1, rect.height);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
if (rc != XPCOM.NS_OK) {
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
@@ -2908,7 +2908,7 @@ void onResize () {
public void refresh () {
htmlBytes = null;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error(rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -2978,7 +2978,7 @@ public boolean setText (String html, boolean trusted) {
*/
delegate.removeWindowSubclass ();
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
if (rc == XPCOM.NS_OK && result[0] != 0) {
/*
@@ -3012,9 +3012,9 @@ public boolean setText (String html, boolean trusted) {
webNavigation.Release ();
} else {
byte[] contentCharsetBuffer = MozillaDelegate.wcsToMbcs (null, "UTF-8", false); //$NON-NLS-1$
- int /*long*/ aContentCharset = XPCOM.nsEmbedCString_new (contentCharsetBuffer, contentCharsetBuffer.length);
+ long /*int*/ aContentCharset = XPCOM.nsEmbedCString_new (contentCharsetBuffer, contentCharsetBuffer.length);
byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", false); // $NON-NLS-1$
- int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
+ long /*int*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
@@ -3034,7 +3034,7 @@ public boolean setText (String html, boolean trusted) {
} else {
aString = MozillaDelegate.wcsToMbcs (null, ABOUT_BLANK, false);
}
- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
rc = ioService.NewURI (aSpec, null, 0, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -3087,7 +3087,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
boolean setUrl (String url, byte[] postData, String[] headers) {
htmlBytes = null;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -3189,7 +3189,7 @@ boolean setUrl (String url, byte[] postData, String[] headers) {
public void stop () {
htmlBytes = null;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -3248,7 +3248,7 @@ void hookDOMListeners (nsIDOMEventTarget target, boolean isTop) {
}
void unhookDOMListeners () {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.GetContentDOMWindow (result);
if (rc != XPCOM.NS_OK || result[0] == 0) return;
@@ -3337,73 +3337,73 @@ void unhookDOMListeners (nsIDOMEventTarget target) {
/* nsISupports */
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIWeakReference.NS_IWEAKREFERENCE_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIWebBrowserChrome.NS_IWEBBROWSERCHROME_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {webBrowserChrome.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {webBrowserChrome.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIWebBrowserChromeFocus.NS_IWEBBROWSERCHROMEFOCUS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {webBrowserChromeFocus.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {webBrowserChromeFocus.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIEmbeddingSiteWindow.NS_IEMBEDDINGSITEWINDOW_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {embeddingSiteWindow.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {embeddingSiteWindow.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {interfaceRequestor.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {interfaceRequestor.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsISupportsWeakReference.NS_ISUPPORTSWEAKREFERENCE_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supportsWeakReference.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supportsWeakReference.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIContextMenuListener.NS_ICONTEXTMENULISTENER_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {contextMenuListener.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {contextMenuListener.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIURIContentListener.NS_IURICONTENTLISTENER_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {uriContentListener.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {uriContentListener.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsITooltipListener.NS_ITOOLTIPLISTENER_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {tooltipListener.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {tooltipListener.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIBadCertListener2.NS_IBADCERTLISTENER2_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {badCertListener.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {badCertListener.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -3420,18 +3420,18 @@ int Release () {
/* nsIWeakReference */
-int QueryReferent (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryReferent (long /*int*/ riid, long /*int*/ ppvObject) {
return QueryInterface (riid, ppvObject);
}
/* nsIInterfaceRequestor */
-int GetInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int GetInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsIDOMWindow.NS_IDOMWINDOW_10_IID) || guid.Equals (nsIDOMWindow.NS_IDOMWINDOW_IID)) {
- int /*long*/[] aContentDOMWindow = new int /*long*/[1];
+ long /*int*/[] aContentDOMWindow = new long /*int*/[1];
int rc = webBrowser.GetContentDOMWindow (aContentDOMWindow);
if (rc != XPCOM.NS_OK) error (rc);
if (aContentDOMWindow[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -3441,15 +3441,15 @@ int GetInterface (int /*long*/ riid, int /*long*/ ppvObject) {
return QueryInterface (riid, ppvObject);
}
-int GetWeakReference (int /*long*/ ppvObject) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF);
+int GetWeakReference (long /*int*/ ppvObject) {
+ XPCOM.memmove (ppvObject, new long /*int*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
/* nsIWebProgressListener */
-int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
+int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {
if (registerFunctionsOnState != 0 && ((aStateFlags & registerFunctionsOnState) == registerFunctionsOnState)) {
registerFunctionsOnState = 0;
Enumeration elements = functions.elements ();
@@ -3480,11 +3480,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
*/
if (updateLastNavigateUrl && aStateFlags == (nsIWebProgressListener.STATE_IS_REQUEST | nsIWebProgressListener.STATE_START)) {
nsIRequest request = new nsIRequest (aRequest);
- int /*long*/ name = XPCOM.nsEmbedCString_new ();
+ long /*int*/ name = XPCOM.nsEmbedCString_new ();
int rc = request.GetName (name);
if (rc == XPCOM.NS_OK) {
int length = XPCOM.nsEmbedCString_Length (name);
- int /*long*/ buffer = XPCOM.nsEmbedCString_get (name);
+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (name);
byte[] bytes = new byte[length];
XPCOM.memmove (bytes, buffer, length);
String value = new String (bytes);
@@ -3495,7 +3495,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
if ((aStateFlags & nsIWebProgressListener.STATE_IS_DOCUMENT) == 0) return XPCOM.NS_OK;
if ((aStateFlags & nsIWebProgressListener.STATE_START) != 0) {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
/*
* When navigating to a site that is known to have a bad certificate, request notification
@@ -3575,13 +3575,13 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
* are typically added.
*/
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc;
LONG ptrObject = new LONG (result[0]);
result[0] = 0;
int index = unhookedDOMWindows.indexOf (ptrObject);
if (index != -1) {
- int /*long*/[] window = new int /*long*/[1];
+ long /*int*/[] window = new long /*int*/[1];
nsIWebProgress progress = new nsIWebProgress (aWebProgress);
rc = progress.GetDOMWindow (window);
if (rc != XPCOM.NS_OK) error (rc);
@@ -3620,11 +3620,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
*/
if (htmlBytes != null) {
nsIRequest req = new nsIRequest (aRequest);
- int /*long*/ name = XPCOM.nsEmbedCString_new ();
+ long /*int*/ name = XPCOM.nsEmbedCString_new ();
rc = req.GetName (name);
if (rc != XPCOM.NS_OK) error (rc);
int length = XPCOM.nsEmbedCString_Length (name);
- int /*long*/ buffer = XPCOM.nsEmbedCString_get (name);
+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (name);
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
String url = new String (dest);
@@ -3657,7 +3657,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
} else {
aString = MozillaDelegate.wcsToMbcs (null, URI_FILEROOT, false);
}
- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
rc = ioService.NewURI (aSpec, null, 0, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -3675,7 +3675,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
result[0] = 0;
byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", false); // $NON-NLS-1$
- int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
+ long /*int*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
rc = stream.OpenStream (uri.getAddress (), aContentType);
if (rc != XPCOM.NS_OK) error (rc);
@@ -3699,11 +3699,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
*/
registerFunctionsOnState = nsIWebProgressListener.STATE_IS_REQUEST | nsIWebProgressListener.STATE_START;
- int /*long*/ ptr = C.malloc (htmlBytes.length);
+ long /*int*/ ptr = C.malloc (htmlBytes.length);
XPCOM.memmove (ptr, htmlBytes, htmlBytes.length);
int pageSize = 8192;
int pageCount = htmlBytes.length / pageSize + 1;
- int /*long*/ current = ptr;
+ long /*int*/ current = ptr;
for (int i = 0; i < pageCount; i++) {
length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;
if (length > 0) {
@@ -3727,7 +3727,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
*/
deferCompleted = true;
- int /*long*/[] window = new int /*long*/[1];
+ long /*int*/[] window = new long /*int*/[1];
nsIWebProgress progress = new nsIWebProgress (aWebProgress);
rc = progress.GetDOMWindow (window);
if (rc != XPCOM.NS_OK) error (rc);
@@ -3801,7 +3801,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
updateLastNavigateUrl = false;
nsIRequest request = new nsIRequest (aRequest);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_10_IID, result);
if (rc != XPCOM.NS_OK) {
rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_IID, result);
@@ -3816,11 +3816,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
nsIURI uri = new nsIURI (result[0]);
result[0] = 0;
- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
rc = uri.GetSpec (aSpec);
if (rc != XPCOM.NS_OK) error (rc);
int length = XPCOM.nsEmbedCString_Length (aSpec);
- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
byte[] bytes = new byte[length];
XPCOM.memmove (bytes, buffer, length);
lastNavigateURL = new String (bytes);
@@ -3833,7 +3833,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
* Hook DOM listeners to the page's nsIDOMWindow here because this is
* the earliest opportunity to do so.
*/
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
nsIWebProgress progress = new nsIWebProgress (aWebProgress);
int rc = progress.GetDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
@@ -3872,7 +3872,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
return XPCOM.NS_OK;
}
-int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
+int OnProgressChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
if (progressListeners.length == 0) return XPCOM.NS_OK;
ProgressEvent event = new ProgressEvent (browser);
event.display = browser.getDisplay ();
@@ -3885,7 +3885,7 @@ int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCur
return XPCOM.NS_OK;
}
-int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) {
+int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) {
/*
* Feature in Mozilla. When a page is loaded via setText before a previous
* setText page load has completed, the expected OnStateChange STATE_STOP for the
@@ -3900,12 +3900,12 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
if (locationListeners.length == 0) return XPCOM.NS_OK;
nsIWebProgress webProgress = new nsIWebProgress (aWebProgress);
- int /*long*/[] aDOMWindow = new int /*long*/[1];
+ long /*int*/[] aDOMWindow = new long /*int*/[1];
int rc = webProgress.GetDOMWindow (aDOMWindow);
if (rc != XPCOM.NS_OK) error (rc);
if (aDOMWindow[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
- int /*long*/[] aTop = new int /*long*/[1];
+ long /*int*/[] aTop = new long /*int*/[1];
nsIDOMWindow domWindow = new nsIDOMWindow (aDOMWindow[0]);
rc = domWindow.GetTop (aTop);
domWindow.Release ();
@@ -3915,10 +3915,10 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
topWindow.Release ();
nsIURI location = new nsIURI (aLocation);
- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
location.GetSpec (aSpec);
int length = XPCOM.nsEmbedCString_Length (aSpec);
- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
@@ -3955,7 +3955,7 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
return XPCOM.NS_OK;
}
-int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {
+int OnStatusChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, long /*int*/ aMessage) {
if (statusTextListeners.length == 0) return XPCOM.NS_OK;
StatusTextEvent event = new StatusTextEvent (browser);
event.display = browser.getDisplay ();
@@ -3970,13 +3970,13 @@ int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatu
return XPCOM.NS_OK;
}
-int OnSecurityChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int state) {
+int OnSecurityChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {
return XPCOM.NS_OK;
}
/* nsIWebBrowserChrome */
-int SetStatus (int statusType, int /*long*/ status) {
+int SetStatus (int statusType, long /*int*/ status) {
if (statusTextListeners.length == 0) return XPCOM.NS_OK;
StatusTextEvent event = new StatusTextEvent (browser);
event.display = browser.getDisplay ();
@@ -3992,8 +3992,8 @@ int SetStatus (int statusType, int /*long*/ status) {
return XPCOM.NS_OK;
}
-int GetWebBrowser (int /*long*/ aWebBrowser) {
- int /*long*/[] ret = new int /*long*/[1];
+int GetWebBrowser (long /*int*/ aWebBrowser) {
+ long /*int*/[] ret = new long /*int*/[1];
if (webBrowser != null) {
webBrowser.AddRef ();
ret[0] = webBrowser.getAddress ();
@@ -4002,13 +4002,13 @@ int GetWebBrowser (int /*long*/ aWebBrowser) {
return XPCOM.NS_OK;
}
-int SetWebBrowser (int /*long*/ aWebBrowser) {
+int SetWebBrowser (long /*int*/ aWebBrowser) {
if (webBrowser != null) webBrowser.Release ();
webBrowser = aWebBrowser != 0 ? new nsIWebBrowser (aWebBrowser) : null;
return XPCOM.NS_OK;
}
-int GetChromeFlags (int /*long*/ aChromeFlags) {
+int GetChromeFlags (long /*int*/ aChromeFlags) {
int[] ret = new int[1];
ret[0] = chromeFlags;
XPCOM.memmove (aChromeFlags, ret, 4); /* PRUint32 */
@@ -4048,7 +4048,7 @@ int SizeBrowserTo (int aCX, int aCY) {
}
int ShowAsModal () {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -4078,7 +4078,7 @@ int ShowAsModal () {
return XPCOM.NS_OK;
}
-int IsWindowModal (int /*long*/ retval) {
+int IsWindowModal (long /*int*/ retval) {
boolean result = (chromeFlags & nsIWebBrowserChrome.CHROME_MODAL) != 0;
XPCOM.memmove (retval, new boolean[] {result});
return XPCOM.NS_OK;
@@ -4112,7 +4112,7 @@ int SetDimensions (int flags, int x, int y, int cx, int cy) {
return XPCOM.NS_OK;
}
-int GetDimensions (int flags, int /*long*/ x, int /*long*/ y, int /*long*/ cx, int /*long*/ cy) {
+int GetDimensions (int flags, long /*int*/ x, long /*int*/ y, long /*int*/ cx, long /*int*/ cy) {
if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_POSITION) != 0) {
Point location = browser.getShell ().getLocation ();
if (x != 0) C.memmove (x, new int[] {location.x}, 4); /* PRInt32 */
@@ -4132,7 +4132,7 @@ int GetDimensions (int flags, int /*long*/ x, int /*long*/ y, int /*long*/ cx, i
}
int SetFocus () {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
if (rc != XPCOM.NS_OK) {
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
@@ -4153,7 +4153,7 @@ int SetFocus () {
return XPCOM.NS_OK;
}
-int GetVisibility (int /*long*/ aVisibility) {
+int GetVisibility (long /*int*/ aVisibility) {
boolean visible = browser.isVisible () && !browser.getShell ().getMinimized ();
XPCOM.memmove (aVisibility, new boolean[] {visible});
return XPCOM.NS_OK;
@@ -4196,11 +4196,11 @@ int SetVisibility (int aVisibility) {
return XPCOM.NS_OK;
}
-int GetTitle (int /*long*/ aTitle) {
+int GetTitle (long /*int*/ aTitle) {
return XPCOM.NS_OK;
}
-int SetTitle (int /*long*/ aTitle) {
+int SetTitle (long /*int*/ aTitle) {
if (titleListeners.length == 0) return XPCOM.NS_OK;
TitleEvent event = new TitleEvent (browser);
event.display = browser.getDisplay ();
@@ -4224,7 +4224,7 @@ int SetTitle (int /*long*/ aTitle) {
return XPCOM.NS_OK;
}
-int GetSiteWindow (int /*long*/ aSiteWindow) {
+int GetSiteWindow (long /*int*/ aSiteWindow) {
/*
* This is expected to be an HWND on Windows, a GtkWidget* on GTK, and
* a WindowPtr on OS X. This callback is invoked on Windows when the
@@ -4232,8 +4232,8 @@ int GetSiteWindow (int /*long*/ aSiteWindow) {
* dialog is shown with XULRunner versions < 4.
*/
- int /*long*/ siteWindow = delegate.getSiteWindow ();
- XPCOM.memmove (aSiteWindow, new int /*long*/[] {siteWindow}, C.PTR_SIZEOF);
+ long /*int*/ siteWindow = delegate.getSiteWindow ();
+ XPCOM.memmove (aSiteWindow, new long /*int*/[] {siteWindow}, C.PTR_SIZEOF);
return XPCOM.NS_OK;
}
@@ -4273,9 +4273,9 @@ int FocusPrevElement () {
/* nsIContextMenuListener */
-int OnShowContextMenu (int aContextFlags, int /*long*/ aEvent, int /*long*/ aNode) {
+int OnShowContextMenu (int aContextFlags, long /*int*/ aEvent, long /*int*/ aNode) {
nsIDOMEvent domEvent = new nsIDOMEvent (aEvent);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_10_IID : nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -4305,15 +4305,15 @@ int OnShowContextMenu (int aContextFlags, int /*long*/ aEvent, int /*long*/ aNod
/* nsIURIContentListener */
-int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
+int OnStartURIOpen (long /*int*/ aURI, long /*int*/ retval) {
if (isRetrievingBadCert) return XPCOM.NS_OK;
authCount = 0;
nsIURI location = new nsIURI (aURI);
- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
location.GetSpec (aSpec);
int length = XPCOM.nsEmbedCString_Length (aSpec);
- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
buffer = XPCOM.nsEmbedCString_get (aSpec);
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
@@ -4368,7 +4368,7 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
if (doit) {
if (jsEnabled != jsEnabledOnNextPage) {
jsEnabled = jsEnabledOnNextPage;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebBrowserSetup.NS_IWEBBROWSERSETUP_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -4387,11 +4387,11 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
return XPCOM.NS_OK;
}
-int DoContent (int /*long*/ aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/ aContentHandler, int /*long*/ retval) {
+int DoContent (long /*int*/ aContentType, int aIsContentPreferred, long /*int*/ aRequest, long /*int*/ aContentHandler, long /*int*/ retval) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, int /*long*/ retval) {
+int IsPreferred (long /*int*/ aContentType, long /*int*/ aDesiredContentType, long /*int*/ retval) {
boolean preferred = false;
int size = XPCOM.strlen (aContentType);
if (size > 0) {
@@ -4402,7 +4402,7 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
/* do not attempt to handle known problematic content types */
if (!contentType.equals (XPCOM.CONTENT_MAYBETEXT) && !contentType.equals (XPCOM.CONTENT_MULTIPART)) {
/* determine whether browser can handle the content type */
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -4414,7 +4414,7 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
rc = serviceManager.GetServiceByContractID (aContractID, nsIWebNavigationInfo.NS_IWEBNAVIGATIONINFO_IID, result);
if (rc == XPCOM.NS_OK) {
byte[] bytes = MozillaDelegate.wcsToMbcs (null, contentType, false);
- int /*long*/ typePtr = XPCOM.nsEmbedCString_new (bytes, bytes.length);
+ long /*int*/ typePtr = XPCOM.nsEmbedCString_new (bytes, bytes.length);
nsIWebNavigationInfo info = new nsIWebNavigationInfo (result[0]);
result[0] = 0;
int[] isSupportedResult = new int[1]; /* PRUint32 */
@@ -4444,34 +4444,34 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
XPCOM.memmove(retval, new boolean[] {preferred});
if (preferred) {
- XPCOM.memmove (aDesiredContentType, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (aDesiredContentType, new long /*int*/[] {0}, C.PTR_SIZEOF);
}
return XPCOM.NS_OK;
}
-int CanHandleContent (int /*long*/ aContentType, int aIsContentPreferred, int /*long*/ aDesiredContentType, int /*long*/ retval) {
+int CanHandleContent (long /*int*/ aContentType, int aIsContentPreferred, long /*int*/ aDesiredContentType, long /*int*/ retval) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetLoadCookie (int /*long*/ aLoadCookie) {
+int GetLoadCookie (long /*int*/ aLoadCookie) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int SetLoadCookie (int /*long*/ aLoadCookie) {
+int SetLoadCookie (long /*int*/ aLoadCookie) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int GetParentContentListener (int /*long*/ aParentContentListener) {
+int GetParentContentListener (long /*int*/ aParentContentListener) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int SetParentContentListener (int /*long*/ aParentContentListener) {
+int SetParentContentListener (long /*int*/ aParentContentListener) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
/* nsITooltipListener */
-int OnShowTooltip (int aXCoords, int aYCoords, int /*long*/ aTipText) {
+int OnShowTooltip (int aXCoords, int aYCoords, long /*int*/ aTipText) {
int length = XPCOM.strlen_PRUnichar (aTipText);
char[] dest = new char[length];
XPCOM.memmove (dest, aTipText, length * 2);
@@ -4507,20 +4507,20 @@ int OnHideTooltip () {
return XPCOM.NS_OK;
}
-int HandleEvent (int /*long*/ event) {
+int HandleEvent (long /*int*/ event) {
nsIDOMEvent domEvent = new nsIDOMEvent (event);
- int /*long*/ type = XPCOM.nsEmbedString_new ();
+ long /*int*/ type = XPCOM.nsEmbedString_new ();
int rc = domEvent.GetType (type);
if (rc != XPCOM.NS_OK) error (rc);
int length = XPCOM.nsEmbedString_Length (type);
- int /*long*/ buffer = XPCOM.nsEmbedString_get (type);
+ long /*int*/ buffer = XPCOM.nsEmbedString_get (type);
char[] chars = new char[length];
XPCOM.memmove (chars, buffer, length * 2);
String typeString = new String (chars);
XPCOM.nsEmbedString_delete (type);
if (XPCOM.DOMEVENT_UNLOAD.equals (typeString)) {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
rc = domEvent.GetCurrentTarget (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -4537,7 +4537,7 @@ int HandleEvent (int /*long*/ event) {
}
if (XPCOM.DOMEVENT_KEYDOWN.equals (typeString)) {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -4645,7 +4645,7 @@ int HandleEvent (int /*long*/ event) {
case SWT.SCROLL_LOCK: return XPCOM.NS_OK;
}
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -4701,7 +4701,7 @@ int HandleEvent (int /*long*/ event) {
}
if (XPCOM.DOMEVENT_KEYUP.equals (typeString)) {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -4758,7 +4758,7 @@ int HandleEvent (int /*long*/ event) {
/* mouse event */
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_10_IID : nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -4876,10 +4876,10 @@ int HandleEvent (int /*long*/ event) {
/* nsIBadCertListener2 */
-int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*/ targetSite, int /*long*/ _suppressError) {
+int NotifyCertProblem (long /*int*/ socketInfo, long /*int*/ status, long /*int*/ targetSite, long /*int*/ _suppressError) {
/* determine the host name and port */
int length = XPCOM.nsEmbedCString_Length (targetSite);
- int /*long*/ buffer = XPCOM.nsEmbedCString_get (targetSite);
+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (targetSite);
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
final String urlPort = new String (dest);
@@ -4889,7 +4889,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
/* create text descriptions of the certificate problem(s) */
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
nsISupports supports = new nsISupports (status);
int rc = supports.QueryInterface (nsISSLStatus.NS_ISSLSTATUS_10_IID, result);
if (rc != XPCOM.NS_OK) {
@@ -4912,7 +4912,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
rc = sslStatus.GetIsDomainMismatch (intResult);
if (intResult[0] != 0) {
- int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+ long /*int*/ ptr = XPCOM.nsEmbedString_new ();
rc = cert.GetCommonName (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedString_Length (ptr);
@@ -4935,7 +4935,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
nsIX509CertValidity validity = new nsIX509CertValidity(result[0]);
result[0] = 0;
- int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+ long /*int*/ ptr = XPCOM.nsEmbedString_new ();
rc = validity.GetNotBeforeGMT (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedString_Length (ptr);
@@ -4964,7 +4964,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
rc = sslStatus.GetIsUntrusted (intResult);
if (intResult[0] != 0) {
- int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+ long /*int*/ ptr = XPCOM.nsEmbedString_new ();
rc = cert.GetIssuerCommonName (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedString_Length (ptr);
@@ -4993,7 +4993,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
if (url.equals (lastNavigateURL)) {
String message = Compatibility.getMessage ("SWT_InvalidCert_Message", new String[] {urlPort}); //$NON-NLS-1$
if (new PromptDialog (browser.getShell ()).invalidCert (browser, message, finalProblems, cert)) {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
@@ -5009,7 +5009,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
nsICertOverrideService overrideService = new nsICertOverrideService (result[0]);
result[0] = 0;
byte[] hostBytes = MozillaDelegate.wcsToMbcs (null, host, false);
- int /*long*/ hostString = XPCOM.nsEmbedCString_new (hostBytes, hostBytes.length);
+ long /*int*/ hostString = XPCOM.nsEmbedCString_new (hostBytes, hostBytes.length);
rc = overrideService.RememberValidityOverride (hostString, port, cert.getAddress (), finalFlags, 1);
navigate (badCertRequest);
XPCOM.nsEmbedCString_delete (hostString);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptAuth2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptAuth2.java
index 40d9855e71..abef771eec 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptAuth2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptAuth2.java
@@ -19,7 +19,7 @@ class PromptAuth2 {
XPCOMObject supports;
XPCOMObject promptAuth;
int refCount = 0;
- int /*long*/ parent;
+ long /*int*/ parent;
PromptAuth2 () {
createCOMInterfaces ();
@@ -33,17 +33,17 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
promptAuth = new XPCOMObject (new int[] {2, 0, 0, 4, 6}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return PromptAuth (args[0], (int)/*64*/args[1], args[2], args[3]);}
- public int /*long*/ method4 (int /*long*/[] args) {return AsyncPromptAuth (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return PromptAuth (args[0], (int)/*64*/args[1], args[2], args[3]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return AsyncPromptAuth (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5]);}
};
}
@@ -58,27 +58,27 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return promptAuth.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIAuthPrompt2.NS_IAUTHPROMPT2_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {promptAuth.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {promptAuth.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -93,11 +93,11 @@ Browser getBrowser () {
return Mozilla.getBrowser (parent);
}
-void setParent(int /*long*/ aParent) {
+void setParent(long /*int*/ aParent) {
parent = aParent;
}
-int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*long*/ _retval) {
+int PromptAuth(long /*int*/ aChannel, int level, long /*int*/ authInfo, long /*int*/ _retval) {
nsIAuthInformation auth = new nsIAuthInformation (authInfo);
Browser browser = getBrowser ();
@@ -143,11 +143,11 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
/* get initial username and password values */
- int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+ long /*int*/ ptr = XPCOM.nsEmbedString_new ();
int rc = auth.GetUsername (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
int length = XPCOM.nsEmbedString_Length (ptr);
- int /*long*/ buffer = XPCOM.nsEmbedString_get (ptr);
+ long /*int*/ buffer = XPCOM.nsEmbedString_get (ptr);
char[] chars = new char[length];
XPCOM.memmove (chars, buffer, length * 2);
userLabel[0] = new String (chars);
@@ -176,13 +176,13 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
XPCOM.nsEmbedString_delete (ptr);
nsIChannel channel = new nsIChannel (aChannel);
- int /*long*/[] uri = new int /*long*/[1];
+ long /*int*/[] uri = new long /*int*/[1];
rc = channel.GetURI (uri);
if (rc != XPCOM.NS_OK) SWT.error (rc);
if (uri[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
nsIURI nsURI = new nsIURI (uri[0]);
- int /*long*/ host = XPCOM.nsEmbedCString_new ();
+ long /*int*/ host = XPCOM.nsEmbedCString_new ();
rc = nsURI.GetHost (host);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedCString_Length (host);
@@ -222,7 +222,7 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
return XPCOM.NS_OK;
}
-int AsyncPromptAuth(int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, int /*long*/ _retval) {
+int AsyncPromptAuth(long /*int*/ aChannel, long /*int*/ aCallback, long /*int*/ aContext, int level, long /*int*/ authInfo, long /*int*/ _retval) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptDialog.java
index ad271ebbab..4a8c186949 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptDialog.java
@@ -141,7 +141,7 @@ class PromptDialog extends Dialog {
viewCertButton.setText(Compatibility.getMessage("SWT_ViewCertificate")); //$NON-NLS-1$
viewCertButton.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event event) {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptFactory.java
index 001bd1b085..3f3da8e90e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptFactory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptFactory.java
@@ -30,16 +30,16 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return GetPrompt (args[0], args[1], args[2]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return GetPrompt (args[0], args[1], args[2]);}
};
}
@@ -54,27 +54,27 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return factory.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIPromptFactory.NS_IPROMPTFACTORY_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -86,7 +86,7 @@ int Release () {
/* nsIPromptFactory */
-int GetPrompt (int /*long*/ aParent, int /*long*/ iid, int /*long*/ result) {
+int GetPrompt (long /*int*/ aParent, long /*int*/ iid, long /*int*/ result) {
nsID guid = new nsID ();
XPCOM.memmove (guid, iid, nsID.sizeof);
@@ -94,7 +94,7 @@ int GetPrompt (int /*long*/ aParent, int /*long*/ iid, int /*long*/ result) {
Prompter prompter = new Prompter ();
prompter.AddRef ();
prompter.setParent (aParent);
- XPCOM.memmove (result, new int /*long*/[] {prompter.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (result, new long /*int*/[] {prompter.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
@@ -102,7 +102,7 @@ int GetPrompt (int /*long*/ aParent, int /*long*/ iid, int /*long*/ result) {
PromptAuth2 promptAuth = new PromptAuth2();
promptAuth.AddRef ();
promptAuth.setParent (aParent);
- XPCOM.memmove (result, new int /*long*/[] {promptAuth.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (result, new long /*int*/[] {promptAuth.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java
index 16cbe4fd6b..bb8f380c53 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java
@@ -33,41 +33,41 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
promptService = new XPCOMObject (new int[] {2, 0, 0, 3, 5, 4, 6, 10, 7, 8, 7, 7}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return Alert (args[0], args[1], args[2]);}
- public int /*long*/ method4 (int /*long*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);}
- public int /*long*/ method5 (int /*long*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);}
- public int /*long*/ method6 (int /*long*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);}
- public int /*long*/ method7 (int /*long*/[] args) {return ConfirmEx (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7], args[8], args[9]);}
- public int /*long*/ method8 (int /*long*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
- public int /*long*/ method9 (int /*long*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);}
- public int /*long*/ method10 (int /*long*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
- public int /*long*/ method11 (int /*long*/[] args) {return Select (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return Alert (args[0], args[1], args[2]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return ConfirmEx (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7], args[8], args[9]);}
+ public long /*int*/ method8 (long /*int*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
+ public long /*int*/ method9 (long /*int*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);}
+ public long /*int*/ method10 (long /*int*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
+ public long /*int*/ method11 (long /*int*/[] args) {return Select (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6]);}
};
promptService2 = new XPCOMObject (new int[] {2, 0, 0, 3, 5, 4, 6, 10, 7, 8, 7, 7, 7, 9}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return Alert (args[0], args[1], args[2]);}
- public int /*long*/ method4 (int /*long*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);}
- public int /*long*/ method5 (int /*long*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);}
- public int /*long*/ method6 (int /*long*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);}
- public int /*long*/ method7 (int /*long*/[] args) {return ConfirmEx (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7], args[8], args[9]);}
- public int /*long*/ method8 (int /*long*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
- public int /*long*/ method9 (int /*long*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);}
- public int /*long*/ method10 (int /*long*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
- public int /*long*/ method11 (int /*long*/[] args) {return Select (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6]);}
- public int /*long*/ method12 (int /*long*/[] args) {return PromptAuth (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5], args[6]);}
- public int /*long*/ method13 (int /*long*/[] args) {return AsyncPromptAuth (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5], args[6], args[7], args[8]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return Alert (args[0], args[1], args[2]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return ConfirmEx (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7], args[8], args[9]);}
+ public long /*int*/ method8 (long /*int*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
+ public long /*int*/ method9 (long /*int*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);}
+ public long /*int*/ method10 (long /*int*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
+ public long /*int*/ method11 (long /*int*/[] args) {return Select (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6]);}
+ public long /*int*/ method12 (long /*int*/[] args) {return PromptAuth (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5], args[6]);}
+ public long /*int*/ method13 (long /*int*/[] args) {return AsyncPromptAuth (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5], args[6], args[7], args[8]);}
};
}
@@ -86,32 +86,32 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return promptService2.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIPromptService.NS_IPROMPTSERVICE_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIPromptService2.NS_IPROMPTSERVICE2_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {promptService2.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {promptService2.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -121,12 +121,12 @@ int Release () {
return refCount;
}
-Browser getBrowser (int /*long*/ aDOMWindow) {
+Browser getBrowser (long /*int*/ aDOMWindow) {
if (aDOMWindow == 0) return null;
return Mozilla.getBrowser (aDOMWindow);
}
-String getLabel (int buttonFlag, int index, int /*long*/ buttonTitle) {
+String getLabel (int buttonFlag, int index, long /*int*/ buttonTitle) {
String label = null;
int flag = (buttonFlag & (0xff * index)) / index;
switch (flag) {
@@ -147,7 +147,7 @@ String getLabel (int buttonFlag, int index, int /*long*/ buttonTitle) {
/* nsIPromptService */
-int Alert (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText) {
+int Alert (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText) {
final Browser browser = getBrowser (aParent);
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
@@ -177,7 +177,7 @@ int Alert (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText)
return XPCOM.NS_OK;
}
-int AlertCheck (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aCheckMsg, int /*long*/ aCheckState) {
+int AlertCheck (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aCheckMsg, long /*int*/ aCheckState) {
Browser browser = getBrowser (aParent);
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
@@ -204,11 +204,11 @@ int AlertCheck (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aT
return XPCOM.NS_OK;
}
-int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, int /*long*/ checkboxLabel, int /*long*/ checkValue, int /*long*/ _retval) {
+int AsyncPromptAuth(long /*int*/ aParent, long /*int*/ aChannel, long /*int*/ aCallback, long /*int*/ aContext, int level, long /*int*/ authInfo, long /*int*/ checkboxLabel, long /*int*/ checkValue, long /*int*/ _retval) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int Confirm (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ _retval) {
+int Confirm (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ _retval) {
Browser browser = getBrowser (aParent);
if (browser != null && ((Mozilla)browser.webBrowser).ignoreAllMessages) {
@@ -236,11 +236,11 @@ int Confirm (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText
return XPCOM.NS_OK;
}
-int ConfirmCheck (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+int ConfirmCheck (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int ConfirmEx (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int aButtonFlags, int /*long*/ aButton0Title, int /*long*/ aButton1Title, int /*long*/ aButton2Title, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+int ConfirmEx (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, int aButtonFlags, long /*int*/ aButton0Title, long /*int*/ aButton1Title, long /*int*/ aButton2Title, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
Browser browser = getBrowser (aParent);
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
@@ -283,7 +283,7 @@ int ConfirmEx (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aTe
return XPCOM.NS_OK;
}
-int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+int Prompt (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aValue, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
Browser browser = getBrowser (aParent);
String titleLabel = null, textLabel, checkLabel = null;
String[] valueLabel = new String[1];
@@ -301,7 +301,7 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText,
XPCOM.memmove (dest, aText, length * 2);
textLabel = new String (dest);
- int /*long*/[] valueAddr = new int /*long*/[1];
+ long /*int*/[] valueAddr = new long /*int*/[1];
XPCOM.memmove (valueAddr, aValue, C.PTR_SIZEOF);
if (valueAddr[0] != 0) {
length = XPCOM.strlen_PRUnichar (valueAddr[0]);
@@ -332,7 +332,7 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText,
* value that we override must be freed using the nsIMemory service.
*/
if (valueLabel[0] != null) {
- int /*long*/[] result2 = new int /*long*/[1];
+ long /*int*/[] result2 = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result2);
if (rc != XPCOM.NS_OK) SWT.error (rc);
if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
@@ -352,9 +352,9 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText,
char[] buffer = new char[cnt + 1];
valueLabel[0].getChars (0, cnt, buffer, 0);
int size = buffer.length * 2;
- int /*long*/ ptr = memory.Alloc (size);
+ long /*int*/ ptr = memory.Alloc (size);
XPCOM.memmove (ptr, buffer, size);
- XPCOM.memmove (aValue, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+ XPCOM.memmove (aValue, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
if (valueAddr[0] != 0) {
memory.Free (valueAddr[0]);
@@ -366,7 +366,7 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText,
return XPCOM.NS_OK;
}
-int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*long*/ checkboxLabel, int /*long*/ checkboxValue, int /*long*/ _retval) {
+int PromptAuth(long /*int*/ aParent, long /*int*/ aChannel, int level, long /*int*/ authInfo, long /*int*/ checkboxLabel, long /*int*/ checkboxValue, long /*int*/ _retval) {
nsIAuthInformation auth = new nsIAuthInformation (authInfo);
Browser browser = getBrowser (aParent);
@@ -420,11 +420,11 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
/* get initial username and password values */
- int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+ long /*int*/ ptr = XPCOM.nsEmbedString_new ();
int rc = auth.GetUsername (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
int length = XPCOM.nsEmbedString_Length (ptr);
- int /*long*/ buffer = XPCOM.nsEmbedString_get (ptr);
+ long /*int*/ buffer = XPCOM.nsEmbedString_get (ptr);
char[] chars = new char[length];
XPCOM.memmove (chars, buffer, length * 2);
userLabel[0] = new String (chars);
@@ -453,13 +453,13 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
XPCOM.nsEmbedString_delete (ptr);
nsIChannel channel = new nsIChannel (aChannel);
- int /*long*/[] uri = new int /*long*/[1];
+ long /*int*/[] uri = new long /*int*/[1];
rc = channel.GetURI (uri);
if (rc != XPCOM.NS_OK) SWT.error (rc);
if (uri[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
nsIURI nsURI = new nsIURI (uri[0]);
- int /*long*/ host = XPCOM.nsEmbedCString_new ();
+ long /*int*/ host = XPCOM.nsEmbedCString_new ();
rc = nsURI.GetHost (host);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedCString_Length (host);
@@ -500,7 +500,7 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
return XPCOM.NS_OK;
}
-int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aUsername, int /*long*/ aPassword, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+int PromptUsernameAndPassword (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aUsername, long /*int*/ aPassword, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
Browser browser = getBrowser (aParent);
String user = null, password = null;
@@ -551,7 +551,7 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle,
XPCOM.memmove (dest, aText, length * 2);
textLabel = new String (dest);
- int /*long*/[] userAddr = new int /*long*/[1];
+ long /*int*/[] userAddr = new long /*int*/[1];
XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
if (userAddr[0] != 0) {
length = XPCOM.strlen_PRUnichar (userAddr[0]);
@@ -560,7 +560,7 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle,
userLabel[0] = new String (dest);
}
- int /*long*/[] passAddr = new int /*long*/[1];
+ long /*int*/[] passAddr = new long /*int*/[1];
XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
if (passAddr[0] != 0) {
length = XPCOM.strlen_PRUnichar (passAddr[0]);
@@ -598,12 +598,12 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle,
* User name and password are returned as PRUnichar values. Any default
* value that we override must be freed using the nsIMemory service.
*/
- int /*long*/[] userAddr = new int /*long*/[1];
+ long /*int*/[] userAddr = new long /*int*/[1];
XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
- int /*long*/[] passAddr = new int /*long*/[1];
+ long /*int*/[] passAddr = new long /*int*/[1];
XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) SWT.error (rc);
if (result[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
@@ -628,9 +628,9 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle,
char[] buffer = new char[cnt + 1];
user.getChars (0, cnt, buffer, 0);
int size = buffer.length * 2;
- int /*long*/ ptr = C.malloc (size);
+ long /*int*/ ptr = C.malloc (size);
XPCOM.memmove (ptr, buffer, size);
- XPCOM.memmove (aUsername, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+ XPCOM.memmove (aUsername, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
cnt = password.length ();
buffer = new char[cnt + 1];
@@ -638,17 +638,17 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle,
size = buffer.length * 2;
ptr = C.malloc (size);
XPCOM.memmove (ptr, buffer, size);
- XPCOM.memmove (aPassword, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+ XPCOM.memmove (aPassword, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
}
return XPCOM.NS_OK;
}
-int PromptPassword (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aPassword, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+int PromptPassword (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aPassword, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int Select (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int aCount, int /*long*/ aSelectList, int /*long*/ aOutSelection, int /*long*/ _retval) {
+int Select (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, int aCount, long /*int*/ aSelectList, long /*int*/ aOutSelection, long /*int*/ _retval) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2Factory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2Factory.java
index 3ec1c359ee..8c7c18921a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2Factory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2Factory.java
@@ -30,17 +30,17 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
};
}
@@ -55,27 +55,27 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return factory.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -87,19 +87,19 @@ int Release () {
/* nsIFactory */
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
nsID guid = new nsID ();
XPCOM.memmove (guid, iid, nsID.sizeof);
if (guid.Equals (nsIPromptService2.NS_IPROMPTSERVICE2_IID) || guid.Equals(nsIPromptService.NS_IPROMPTSERVICE_IID)) {
PromptService2 promptService = new PromptService2 ();
promptService.AddRef ();
- XPCOM.memmove (result, new int /*long*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (result, new long /*int*/[] {promptService.getAddress ()}, C.PTR_SIZEOF);
return XPCOM.NS_OK;
}
if (guid.Equals (nsIPromptFactory.NS_IPROMPTFACTORY_IID)) {
PromptFactory promptFactory = new PromptFactory();
promptFactory.AddRef ();
- XPCOM.memmove (result, new int /*long*/[] {promptFactory.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (result, new long /*int*/[] {promptFactory.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Prompter.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Prompter.java
index c8274d0113..a7b9848679 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Prompter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Prompter.java
@@ -19,7 +19,7 @@ class Prompter {
XPCOMObject supports;
XPCOMObject prompt;
int refCount = 0;
- int /*long*/ parent;
+ long /*int*/ parent;
Prompter () {
createCOMInterfaces ();
@@ -33,24 +33,24 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
prompt = new XPCOMObject (new int[] {2, 0, 0, 2, 4, 3, 5, 9, 6, 6, 7, 6}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return Alert (args[0], args[1] );}
- public int /*long*/ method4 (int /*long*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3]);}
- public int /*long*/ method5 (int /*long*/[] args) {return Confirm (args[0], args[1], args[2]);}
- public int /*long*/ method6 (int /*long*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4]);}
- public int /*long*/ method7 (int /*long*/[] args) {return ConfirmEx (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5], args[6], args[7], args[8]);}
- public int /*long*/ method8 (int /*long*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5]);}
- public int /*long*/ method9 (int /*long*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5]);}
- public int /*long*/ method10 (int /*long*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
- public int /*long*/ method11 (int /*long*/[] args) {return Select (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return Alert (args[0], args[1] );}
+ public long /*int*/ method4 (long /*int*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return Confirm (args[0], args[1], args[2]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return ConfirmEx (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5], args[6], args[7], args[8]);}
+ public long /*int*/ method8 (long /*int*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5]);}
+ public long /*int*/ method9 (long /*int*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5]);}
+ public long /*int*/ method10 (long /*int*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);}
+ public long /*int*/ method11 (long /*int*/[] args) {return Select (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5]);}
};
}
@@ -65,26 +65,26 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return prompt.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIPrompt.NS_IPROMPT_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {prompt.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {prompt.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -99,7 +99,7 @@ Browser getBrowser () {
return Mozilla.getBrowser (parent);
}
-String getLabel (int buttonFlag, int index, int /*long*/ buttonTitle) {
+String getLabel (int buttonFlag, int index, long /*int*/ buttonTitle) {
String label = null;
int flag = (buttonFlag & (0xff * index)) / index;
switch (flag) {
@@ -118,13 +118,13 @@ String getLabel (int buttonFlag, int index, int /*long*/ buttonTitle) {
return label;
}
-void setParent(int /*long*/ aParent) {
+void setParent(long /*int*/ aParent) {
parent = aParent;
}
/* nsIPrompt */
-int Alert (int /*long*/ aDialogTitle, int /*long*/ aText) {
+int Alert (long /*int*/ aDialogTitle, long /*int*/ aText) {
final Browser browser = getBrowser ();
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
@@ -154,7 +154,7 @@ int Alert (int /*long*/ aDialogTitle, int /*long*/ aText) {
return XPCOM.NS_OK;
}
-int AlertCheck (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aCheckMsg, int /*long*/ aCheckState) {
+int AlertCheck (long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aCheckMsg, long /*int*/ aCheckState) {
Browser browser = getBrowser ();
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
@@ -181,7 +181,7 @@ int AlertCheck (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aChe
return XPCOM.NS_OK;
}
-int Confirm (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ _retval) {
+int Confirm (long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ _retval) {
Browser browser = getBrowser ();
if (browser != null && ((Mozilla)browser.webBrowser).ignoreAllMessages) {
@@ -209,11 +209,11 @@ int Confirm (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ _retval
return XPCOM.NS_OK;
}
-int ConfirmCheck (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+int ConfirmCheck (long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int ConfirmEx (int /*long*/ aDialogTitle, int /*long*/ aText, int aButtonFlags, int /*long*/ aButton0Title, int /*long*/ aButton1Title, int /*long*/ aButton2Title, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+int ConfirmEx (long /*int*/ aDialogTitle, long /*int*/ aText, int aButtonFlags, long /*int*/ aButton0Title, long /*int*/ aButton1Title, long /*int*/ aButton2Title, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
Browser browser = getBrowser ();
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
@@ -256,7 +256,7 @@ int ConfirmEx (int /*long*/ aDialogTitle, int /*long*/ aText, int aButtonFlags,
return XPCOM.NS_OK;
}
-int Prompt (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+int Prompt (long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aValue, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
Browser browser = getBrowser ();
String titleLabel = null, textLabel, checkLabel = null;
String[] valueLabel = new String[1];
@@ -274,7 +274,7 @@ int Prompt (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue,
XPCOM.memmove (dest, aText, length * 2);
textLabel = new String (dest);
- int /*long*/[] valueAddr = new int /*long*/[1];
+ long /*int*/[] valueAddr = new long /*int*/[1];
XPCOM.memmove (valueAddr, aValue, C.PTR_SIZEOF);
if (valueAddr[0] != 0) {
length = XPCOM.strlen_PRUnichar (valueAddr[0]);
@@ -305,7 +305,7 @@ int Prompt (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue,
* value that we override must be freed using the nsIMemory service.
*/
if (valueLabel[0] != null) {
- int /*long*/[] result2 = new int /*long*/[1];
+ long /*int*/[] result2 = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result2);
if (rc != XPCOM.NS_OK) SWT.error (rc);
if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
@@ -325,9 +325,9 @@ int Prompt (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue,
char[] buffer = new char[cnt + 1];
valueLabel[0].getChars (0, cnt, buffer, 0);
int size = buffer.length * 2;
- int /*long*/ ptr = memory.Alloc (size);
+ long /*int*/ ptr = memory.Alloc (size);
XPCOM.memmove (ptr, buffer, size);
- XPCOM.memmove (aValue, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+ XPCOM.memmove (aValue, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
if (valueAddr[0] != 0) {
memory.Free (valueAddr[0]);
@@ -339,7 +339,7 @@ int Prompt (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue,
return XPCOM.NS_OK;
}
-int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*long*/ _retval) {
+int PromptAuth(long /*int*/ aChannel, int level, long /*int*/ authInfo, long /*int*/ _retval) {
nsIAuthInformation auth = new nsIAuthInformation (authInfo);
Browser browser = getBrowser ();
@@ -385,11 +385,11 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
/* get initial username and password values */
- int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+ long /*int*/ ptr = XPCOM.nsEmbedString_new ();
int rc = auth.GetUsername (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
int length = XPCOM.nsEmbedString_Length (ptr);
- int /*long*/ buffer = XPCOM.nsEmbedString_get (ptr);
+ long /*int*/ buffer = XPCOM.nsEmbedString_get (ptr);
char[] chars = new char[length];
XPCOM.memmove (chars, buffer, length * 2);
userLabel[0] = new String (chars);
@@ -418,13 +418,13 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
XPCOM.nsEmbedString_delete (ptr);
nsIChannel channel = new nsIChannel (aChannel);
- int /*long*/[] uri = new int /*long*/[1];
+ long /*int*/[] uri = new long /*int*/[1];
rc = channel.GetURI (uri);
if (rc != XPCOM.NS_OK) SWT.error (rc);
if (uri[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
nsIURI nsURI = new nsIURI (uri[0]);
- int /*long*/ host = XPCOM.nsEmbedCString_new ();
+ long /*int*/ host = XPCOM.nsEmbedCString_new ();
rc = nsURI.GetHost (host);
if (rc != XPCOM.NS_OK) SWT.error (rc);
length = XPCOM.nsEmbedCString_Length (host);
@@ -464,7 +464,7 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
return XPCOM.NS_OK;
}
-int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aUsername, int /*long*/ aPassword, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+int PromptUsernameAndPassword (long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aUsername, long /*int*/ aPassword, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
Browser browser = getBrowser ();
String user = null, password = null;
@@ -515,7 +515,7 @@ int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, in
XPCOM.memmove (dest, aText, length * 2);
textLabel = new String (dest);
- int /*long*/[] userAddr = new int /*long*/[1];
+ long /*int*/[] userAddr = new long /*int*/[1];
XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
if (userAddr[0] != 0) {
length = XPCOM.strlen_PRUnichar (userAddr[0]);
@@ -524,7 +524,7 @@ int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, in
userLabel[0] = new String (dest);
}
- int /*long*/[] passAddr = new int /*long*/[1];
+ long /*int*/[] passAddr = new long /*int*/[1];
XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
if (passAddr[0] != 0) {
length = XPCOM.strlen_PRUnichar (passAddr[0]);
@@ -562,12 +562,12 @@ int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, in
* User name and password are returned as PRUnichar values. Any default
* value that we override must be freed using the nsIMemory service.
*/
- int /*long*/[] userAddr = new int /*long*/[1];
+ long /*int*/[] userAddr = new long /*int*/[1];
XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
- int /*long*/[] passAddr = new int /*long*/[1];
+ long /*int*/[] passAddr = new long /*int*/[1];
XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) SWT.error (rc);
if (result[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
@@ -592,9 +592,9 @@ int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, in
char[] buffer = new char[cnt + 1];
user.getChars (0, cnt, buffer, 0);
int size = buffer.length * 2;
- int /*long*/ ptr = C.malloc (size);
+ long /*int*/ ptr = C.malloc (size);
XPCOM.memmove (ptr, buffer, size);
- XPCOM.memmove (aUsername, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+ XPCOM.memmove (aUsername, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
cnt = password.length ();
buffer = new char[cnt + 1];
@@ -602,17 +602,17 @@ int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, in
size = buffer.length * 2;
ptr = C.malloc (size);
XPCOM.memmove (ptr, buffer, size);
- XPCOM.memmove (aPassword, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+ XPCOM.memmove (aPassword, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
}
return XPCOM.NS_OK;
}
-int PromptPassword (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aPassword, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+int PromptPassword (long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aPassword, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-int Select (int /*long*/ aDialogTitle, int /*long*/ aText, int aCount, int /*long*/ aSelectList, int /*long*/ aOutSelection, int /*long*/ _retval) {
+int Select (long /*int*/ aDialogTitle, long /*int*/ aText, int aCount, long /*int*/ aSelectList, long /*int*/ aOutSelection, long /*int*/ _retval) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/SimpleEnumerator.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/SimpleEnumerator.java
index 9b097948a2..d39b512229 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/SimpleEnumerator.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/SimpleEnumerator.java
@@ -36,17 +36,17 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
simpleEnumerator = new XPCOMObject (new int[] {2, 0, 0, 1, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return HasMoreElements (args[0]);}
- public int /*long*/ method4 (int /*long*/[] args) {return GetNext (args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return HasMoreElements (args[0]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return GetNext (args[0]);}
};
}
@@ -67,27 +67,27 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return simpleEnumerator.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsISimpleEnumerator.NS_ISIMPLEENUMERATOR_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {simpleEnumerator.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {simpleEnumerator.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -97,17 +97,17 @@ int Release () {
return refCount;
}
-int HasMoreElements (int /*long*/ _retval) {
+int HasMoreElements (long /*int*/ _retval) {
boolean more = values != null && index < values.length;
XPCOM.memmove (_retval, new boolean[] {more});
return XPCOM.NS_OK;
}
-int GetNext (int /*long*/ _retval) {
+int GetNext (long /*int*/ _retval) {
if (values == null || index == values.length) return XPCOM.NS_ERROR_UNEXPECTED;
nsISupports value = values[index++];
value.AddRef ();
- XPCOM.memmove (_retval, new int /*long*/[] {value.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (_retval, new long /*int*/[] {value.getAddress ()}, C.PTR_SIZEOF);
return XPCOM.NS_OK;
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/WindowCreator2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/WindowCreator2.java
index 8882a4fcf8..78c21ab875 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/WindowCreator2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/WindowCreator2.java
@@ -35,24 +35,24 @@ int AddRef () {
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
};
windowCreator = new XPCOMObject (new int[] {2, 0, 0, 3}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return CreateChromeWindow (args[0], (int)/*64*/args[1], args[2]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return CreateChromeWindow (args[0], (int)/*64*/args[1], args[2]);}
};
windowCreator2 = new XPCOMObject (new int[] {2, 0, 0, 3, 6}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return CreateChromeWindow (args[0], (int)/*64*/args[1], args[2]);}
- public int /*long*/ method4 (int /*long*/[] args) {return CreateChromeWindow2 (args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3], args[4], args[5]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return CreateChromeWindow (args[0], (int)/*64*/args[1], args[2]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return CreateChromeWindow2 (args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3], args[4], args[5]);}
};
}
@@ -72,32 +72,32 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return windowCreator.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
nsID guid = new nsID ();
XPCOM.memmove (guid, riid, nsID.sizeof);
if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIWindowCreator.NS_IWINDOWCREATOR_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {windowCreator.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {windowCreator.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
if (guid.Equals (nsIWindowCreator2.NS_IWINDOWCREATOR2_IID)) {
- XPCOM.memmove (ppvObject, new int /*long*/[] {windowCreator2.getAddress ()}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {windowCreator2.getAddress ()}, C.PTR_SIZEOF);
AddRef ();
return XPCOM.NS_OK;
}
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -109,26 +109,26 @@ int Release () {
/* nsIWindowCreator */
-int CreateChromeWindow (int /*long*/ parent, int chromeFlags, int /*long*/ _retval) {
+int CreateChromeWindow (long /*int*/ parent, int chromeFlags, long /*int*/ _retval) {
return CreateChromeWindow2 (parent, chromeFlags, 0, 0, 0, _retval);
}
/* nsIWindowCreator2 */
-int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int /*long*/ cancel, int /*long*/ _retval) {
+int CreateChromeWindow2 (long /*int*/ parent, int chromeFlags, int contextFlags, long /*int*/ uri, long /*int*/ cancel, long /*int*/ _retval) {
if (parent == 0 && (chromeFlags & nsIWebBrowserChrome.CHROME_OPENAS_CHROME) == 0) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
Browser src = null;
if (parent != 0) {
nsIWebBrowserChrome browserChromeParent = new nsIWebBrowserChrome (parent);
- int /*long*/[] aWebBrowser = new int /*long*/[1];
+ long /*int*/[] aWebBrowser = new long /*int*/[1];
int rc = browserChromeParent.GetWebBrowser (aWebBrowser);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (aWebBrowser[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
nsIWebBrowser webBrowser = new nsIWebBrowser (aWebBrowser[0]);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
if (rc != XPCOM.NS_OK) {
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
@@ -139,7 +139,7 @@ int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags,
nsIBaseWindow baseWindow = new nsIBaseWindow (result[0]);
result[0] = 0;
- int /*long*/[] aParentNativeWindow = new int /*long*/[1];
+ long /*int*/[] aParentNativeWindow = new long /*int*/[1];
rc = baseWindow.GetParentNativeWindow (aParentNativeWindow);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (aParentNativeWindow[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -185,11 +185,11 @@ int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags,
});
if (uri != 0) {
nsIURI location = new nsIURI (uri);
- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
if (location.GetSpec (aSpec) == XPCOM.NS_OK) {
int length = XPCOM.nsEmbedCString_Length (aSpec);
if (length > 0) {
- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
+ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec);
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
browser.setUrl (new String (dest));
@@ -218,11 +218,11 @@ int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags,
if (doit) {
Mozilla mozilla = (Mozilla)browser.webBrowser;
mozilla.isChild = true;
- int /*long*/ chromePtr = mozilla.webBrowserChrome.getAddress ();
+ long /*int*/ chromePtr = mozilla.webBrowserChrome.getAddress ();
nsIWebBrowserChrome webBrowserChrome = new nsIWebBrowserChrome (chromePtr);
webBrowserChrome.SetChromeFlags (chromeFlags);
webBrowserChrome.AddRef ();
- XPCOM.memmove (_retval, new int /*long*/[] {chromePtr}, C.PTR_SIZEOF);
+ XPCOM.memmove (_retval, new long /*int*/[] {chromePtr}, C.PTR_SIZEOF);
} else {
if (cancel != 0) {
XPCOM.memmove (cancel, new boolean[] {true});
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
index 0a1e9708c4..1b29b85eee 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
@@ -160,7 +160,7 @@ public class XPCOM extends C {
public static final native int nsDynamicFunctionLoad_sizeof ();
-public static void memmove(int /*long*/ dest, boolean[] src) {
+public static void memmove(long /*int*/ dest, boolean[] src) {
if (nsISupports.IsXULRunner10) { // TODO change this reference
memmove (dest, new byte[] {src[0] ? (byte)1 : 0}, 1);
} else {
@@ -168,7 +168,7 @@ public static void memmove(int /*long*/ dest, boolean[] src) {
}
}
-public static void memmove(boolean[] dest, int /*long*/ src) {
+public static void memmove(boolean[] dest, long /*int*/ src) {
if (nsISupports.IsXULRunner10) { // TODO change this reference
byte[] result = new byte[1];
memmove (result, src, 1);
@@ -185,28 +185,28 @@ public static void memmove(boolean[] dest, int /*long*/ src) {
* @param src cast=(const void *),flags=no_out critical
* @param size cast=(size_t)
*/
-public static final native void memmove(int /*long*/ dest, nsDynamicFunctionLoad src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, nsDynamicFunctionLoad src, long /*int*/ size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *)
* @param nbytes cast=(size_t)
*/
-public static final native void memmove(nsID dest, int /*long*/ src, int nbytes);
+public static final native void memmove(nsID dest, long /*int*/ src, int nbytes);
/**
* @param dest cast=(void *)
* @param src cast=(const void *)
* @param nbytes cast=(size_t)
*/
-public static final native void memmove(int /*long*/ dest, nsID src, int nbytes);
+public static final native void memmove(long /*int*/ dest, nsID src, int nbytes);
/** @method flags=no_gen */
-public static final native int strlen_PRUnichar(int /*long*/ s);
+public static final native int strlen_PRUnichar(long /*int*/ s);
/** @method flags=no_gen */
-public static final native int /*long*/ CALLBACK_JSNative(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_JSNative(long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ _JS_DefineFunction(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, byte[] name, int /*long*/ call, int nargs, int flags);
-public static final int /*long*/ JS_DefineFunction(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, byte[] name, int /*long*/ call, int nargs, int flags) {
+public static final native long /*int*/ _JS_DefineFunction(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, byte[] name, long /*int*/ call, int nargs, int flags);
+public static final long /*int*/ JS_DefineFunction(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, byte[] name, long /*int*/ call, int nargs, int flags) {
lock.lock();
try {
return _JS_DefineFunction(mozillaPath, cx, obj, name, call, nargs, flags);
@@ -215,8 +215,8 @@ public static final int /*long*/ JS_DefineFunction(byte[] mozillaPath, int /*lon
}
}
/** @method flags=no_gen */
-public static final native int _JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, int /*long*/ principals, char[] chars, int length, byte[] filename, int lineno, int /*long*/[] retVal);
-public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, int /*long*/ principals, char[] chars, int length, byte[] filename, int lineno, int /*long*/[] retVal) {
+public static final native int _JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, long /*int*/ principals, char[] chars, int length, byte[] filename, int lineno, long /*int*/[] retVal);
+public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, long /*int*/ principals, char[] chars, int length, byte[] filename, int lineno, long /*int*/[] retVal) {
lock.lock();
try {
return _JS_EvaluateUCScriptForPrincipals(mozillaPath, cx, obj, principals, chars, length, filename, lineno, retVal);
@@ -225,8 +225,8 @@ public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int
}
}
/** @method flags=no_gen */
-public static final native int /*long*/ _JS_GetGlobalObject(byte[] mozillaPath, int /*long*/ cx);
-public static final int /*long*/ JS_GetGlobalObject(byte[] mozillaPath, int /*long*/ cx) {
+public static final native long /*int*/ _JS_GetGlobalObject(byte[] mozillaPath, long /*int*/ cx);
+public static final long /*int*/ JS_GetGlobalObject(byte[] mozillaPath, long /*int*/ cx) {
lock.lock();
try {
return _JS_GetGlobalObject(mozillaPath, cx);
@@ -235,8 +235,8 @@ public static final int /*long*/ JS_GetGlobalObject(byte[] mozillaPath, int /*lo
}
}
/** @method flags=no_gen */
-public static final native int /*long*/ _JS_NewObject(byte[] mozillaPath, int /*long*/ cx, int /*long*/ clasp, int /*long*/ proto, int /*long*/ parent);
-public static final int /*long*/ JS_NewObject(byte[] mozillaPath, int /*long*/ cx, int /*long*/ clasp, int /*long*/ proto, int /*long*/ parent) {
+public static final native long /*int*/ _JS_NewObject(byte[] mozillaPath, long /*int*/ cx, long /*int*/ clasp, long /*int*/ proto, long /*int*/ parent);
+public static final long /*int*/ JS_NewObject(byte[] mozillaPath, long /*int*/ cx, long /*int*/ clasp, long /*int*/ proto, long /*int*/ parent) {
lock.lock();
try {
return _JS_NewObject(mozillaPath, cx, clasp, proto, parent);
@@ -245,8 +245,8 @@ public static final int /*long*/ JS_NewObject(byte[] mozillaPath, int /*long*/ c
}
}
/** @method flags=no_gen */
-public static final native boolean _NS_Free(byte[] mozillaPath, int /*long*/ aPtr);
-public static final boolean NS_Free(byte[] mozillaPath, int /*long*/ aPtr) {
+public static final native boolean _NS_Free(byte[] mozillaPath, long /*int*/ aPtr);
+public static final boolean NS_Free(byte[] mozillaPath, long /*int*/ aPtr) {
lock.lock();
try {
return _NS_Free(mozillaPath, aPtr);
@@ -255,8 +255,8 @@ public static final boolean NS_Free(byte[] mozillaPath, int /*long*/ aPtr) {
}
}
/** @param result cast=(nsIComponentManager**) */
-public static final native int _NS_GetComponentManager(int /*long*/[] result);
-public static final int NS_GetComponentManager(int /*long*/[] result) {
+public static final native int _NS_GetComponentManager(long /*int*/[] result);
+public static final int NS_GetComponentManager(long /*int*/[] result) {
lock.lock();
try {
return _NS_GetComponentManager(result);
@@ -265,8 +265,8 @@ public static final int NS_GetComponentManager(int /*long*/[] result) {
}
}
/** @param result cast=(nsIServiceManager**) */
-public static final native int _NS_GetServiceManager(int /*long*/[] result);
-public static final int NS_GetServiceManager(int /*long*/[] result) {
+public static final native int _NS_GetServiceManager(long /*int*/[] result);
+public static final int NS_GetServiceManager(long /*int*/[] result) {
lock.lock();
try {
return _NS_GetServiceManager(result);
@@ -279,8 +279,8 @@ public static final int NS_GetServiceManager(int /*long*/[] result) {
* @param binDirectory cast=(nsIFile *)
* @param appFileLocationProvider cast=(nsIDirectoryServiceProvider *)
*/
-public static final native int _NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider);
-public static final int NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider) {
+public static final native int _NS_InitXPCOM2(long /*int*/ result, long /*int*/ binDirectory, long /*int*/ appFileLocationProvider);
+public static final int NS_InitXPCOM2(long /*int*/ result, long /*int*/ binDirectory, long /*int*/ appFileLocationProvider) {
lock.lock();
try {
return _NS_InitXPCOM2(result, binDirectory, appFileLocationProvider);
@@ -292,8 +292,8 @@ public static final int NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirec
* @param path cast=(nsAString *),flags=struct
* @param result cast=(nsILocalFile**)
*/
-public static final native int _NS_NewLocalFile(int /*long*/ path, int followLinks, int /*long*/[] result);
-public static final int NS_NewLocalFile(int /*long*/ path, int followLinks, int /*long*/[] result) {
+public static final native int _NS_NewLocalFile(long /*int*/ path, int followLinks, long /*int*/[] result);
+public static final int NS_NewLocalFile(long /*int*/ path, int followLinks, long /*int*/[] result) {
lock.lock();
try {
return _NS_NewLocalFile(path, followLinks, result);
@@ -302,8 +302,8 @@ public static final int NS_NewLocalFile(int /*long*/ path, int followLinks, int
}
}
/** @method flags=new */
-public static final native int /*long*/ _nsEmbedCString_new();
-public static final int /*long*/ nsEmbedCString_new() {
+public static final native long /*int*/ _nsEmbedCString_new();
+public static final long /*int*/ nsEmbedCString_new() {
lock.lock();
try {
return _nsEmbedCString_new();
@@ -315,8 +315,8 @@ public static final int /*long*/ nsEmbedCString_new() {
* @method flags=new
* @param aString cast=(const char *)
*/
-public static final native int /*long*/ _nsEmbedCString_new(byte[] aString, int length);
-public static final int /*long*/ nsEmbedCString_new(byte[] aString, int length) {
+public static final native long /*int*/ _nsEmbedCString_new(byte[] aString, int length);
+public static final long /*int*/ nsEmbedCString_new(byte[] aString, int length) {
lock.lock();
try {
return _nsEmbedCString_new(aString, length);
@@ -328,8 +328,8 @@ public static final int /*long*/ nsEmbedCString_new(byte[] aString, int length)
* @method flags=new
* @param aString cast=(const char *)
*/
-public static final native int /*long*/ _nsEmbedCString_new(int /*long*/ aString, int length);
-public static final int /*long*/ nsEmbedCString_new(int /*long*/ aString, int length) {
+public static final native long /*int*/ _nsEmbedCString_new(long /*int*/ aString, int length);
+public static final long /*int*/ nsEmbedCString_new(long /*int*/ aString, int length) {
lock.lock();
try {
return _nsEmbedCString_new(aString, length);
@@ -341,8 +341,8 @@ public static final int /*long*/ nsEmbedCString_new(int /*long*/ aString, int le
* @method flags=delete
* @param ptr cast=(nsEmbedCString *)
*/
-public static final native void _nsEmbedCString_delete(int /*long*/ ptr);
-public static final void nsEmbedCString_delete(int /*long*/ ptr) {
+public static final native void _nsEmbedCString_delete(long /*int*/ ptr);
+public static final void nsEmbedCString_delete(long /*int*/ ptr) {
lock.lock();
try {
_nsEmbedCString_delete(ptr);
@@ -354,8 +354,8 @@ public static final void nsEmbedCString_delete(int /*long*/ ptr) {
* @method flags=cpp
* @param ptr cast=(nsEmbedCString *)
*/
-public static final native int _nsEmbedCString_Length(int /*long*/ ptr);
-public static final int nsEmbedCString_Length(int /*long*/ ptr) {
+public static final native int _nsEmbedCString_Length(long /*int*/ ptr);
+public static final int nsEmbedCString_Length(long /*int*/ ptr) {
lock.lock();
try {
return _nsEmbedCString_Length(ptr);
@@ -367,8 +367,8 @@ public static final int nsEmbedCString_Length(int /*long*/ ptr) {
* @method flags=cpp
* @param ptr cast=(nsIScriptGlobalObject *)
*/
-public static final native int _nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long*/ ptr, int lang);
-public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long*/ ptr, int lang) {
+public static final native int _nsIScriptGlobalObject_EnsureScriptEnvironment(long /*int*/ ptr, int lang);
+public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(long /*int*/ ptr, int lang) {
lock.lock();
try {
return _nsIScriptGlobalObject_EnsureScriptEnvironment(ptr, lang);
@@ -380,8 +380,8 @@ public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long
* @method flags=cpp
* @param ptr cast=(nsIScriptGlobalObject *)
*/
-public static final native int /*long*/ _nsIScriptGlobalObject_GetScriptContext(int /*long*/ ptr, int lang);
-public static final int /*long*/ nsIScriptGlobalObject_GetScriptContext(int /*long*/ ptr, int lang) {
+public static final native long /*int*/ _nsIScriptGlobalObject_GetScriptContext(long /*int*/ ptr, int lang);
+public static final long /*int*/ nsIScriptGlobalObject_GetScriptContext(long /*int*/ ptr, int lang) {
lock.lock();
try {
return _nsIScriptGlobalObject_GetScriptContext(ptr, lang);
@@ -393,8 +393,8 @@ public static final int /*long*/ nsIScriptGlobalObject_GetScriptContext(int /*lo
* @method flags=cpp
* @param ptr cast=(nsIScriptContext *)
*/
-public static final native int /*long*/ _nsIScriptContext_GetNativeContext(int /*long*/ ptr);
-public static final int /*long*/ nsIScriptContext_GetNativeContext(int /*long*/ ptr) {
+public static final native long /*int*/ _nsIScriptContext_GetNativeContext(long /*int*/ ptr);
+public static final long /*int*/ nsIScriptContext_GetNativeContext(long /*int*/ ptr) {
lock.lock();
try {
return _nsIScriptContext_GetNativeContext(ptr);
@@ -406,8 +406,8 @@ public static final int /*long*/ nsIScriptContext_GetNativeContext(int /*long*/
* @method flags=cpp
* @param ptr cast=(nsEmbedCString *)
*/
-public static final native int /*long*/ _nsEmbedCString_get(int /*long*/ ptr);
-public static final int /*long*/ nsEmbedCString_get(int /*long*/ ptr) {
+public static final native long /*int*/ _nsEmbedCString_get(long /*int*/ ptr);
+public static final long /*int*/ nsEmbedCString_get(long /*int*/ ptr) {
lock.lock();
try {
return _nsEmbedCString_get(ptr);
@@ -419,8 +419,8 @@ public static final int /*long*/ nsEmbedCString_get(int /*long*/ ptr) {
* @method flags=delete
* @param ptr cast=(nsID *)
*/
-public static final native void _nsID_delete(int /*long*/ ptr);
-public static final void nsID_delete(int /*long*/ ptr) {
+public static final native void _nsID_delete(long /*int*/ ptr);
+public static final void nsID_delete(long /*int*/ ptr) {
lock.lock();
try {
_nsID_delete(ptr);
@@ -429,8 +429,8 @@ public static final void nsID_delete(int /*long*/ ptr) {
}
}
/** @method flags=new */
-public static final native int /*long*/ _nsID_new();
-public static final int /*long*/ nsID_new() {
+public static final native long /*int*/ _nsID_new();
+public static final long /*int*/ nsID_new() {
lock.lock();
try {
return _nsID_new();
@@ -443,8 +443,8 @@ public static final int /*long*/ nsID_new() {
* @param ptr cast=(nsID *)
* @param other cast=(nsID *),flags=struct
*/
-public static final native int _nsID_Equals(int /*long*/ ptr, int /*long*/ other);
-public static final int nsID_Equals(int /*long*/ ptr, int /*long*/ other) {
+public static final native int _nsID_Equals(long /*int*/ ptr, long /*int*/ other);
+public static final int nsID_Equals(long /*int*/ ptr, long /*int*/ other) {
lock.lock();
try {
return _nsID_Equals(ptr, other);
@@ -453,8 +453,8 @@ public static final int nsID_Equals(int /*long*/ ptr, int /*long*/ other) {
}
}
/** @method flags=new */
-public static final native int /*long*/ _nsEmbedString_new();
-public static final int /*long*/ nsEmbedString_new() {
+public static final native long /*int*/ _nsEmbedString_new();
+public static final long /*int*/ nsEmbedString_new() {
lock.lock();
try {
return _nsEmbedString_new();
@@ -466,8 +466,8 @@ public static final int /*long*/ nsEmbedString_new() {
* @method flags=new
* @param aString cast=(PRUnichar *)
*/
-public static final native int /*long*/ _nsEmbedString_new(char[] aString);
-public static final int /*long*/ nsEmbedString_new(char[] aString) {
+public static final native long /*int*/ _nsEmbedString_new(char[] aString);
+public static final long /*int*/ nsEmbedString_new(char[] aString) {
lock.lock();
try {
return _nsEmbedString_new(aString);
@@ -479,8 +479,8 @@ public static final int /*long*/ nsEmbedString_new(char[] aString) {
* @method flags=delete
* @param ptr cast=(nsEmbedString *)
*/
-public static final native void _nsEmbedString_delete(int /*long*/ ptr);
-public static final void nsEmbedString_delete(int /*long*/ ptr) {
+public static final native void _nsEmbedString_delete(long /*int*/ ptr);
+public static final void nsEmbedString_delete(long /*int*/ ptr) {
lock.lock();
try {
_nsEmbedString_delete(ptr);
@@ -492,8 +492,8 @@ public static final void nsEmbedString_delete(int /*long*/ ptr) {
* @method flags=cpp
* @param ptr cast=(nsEmbedString *)
*/
-public static final native int _nsEmbedString_Length(int /*long*/ ptr);
-public static final int nsEmbedString_Length(int /*long*/ ptr) {
+public static final native int _nsEmbedString_Length(long /*int*/ ptr);
+public static final int nsEmbedString_Length(long /*int*/ ptr) {
lock.lock();
try {
return _nsEmbedString_Length(ptr);
@@ -505,8 +505,8 @@ public static final int nsEmbedString_Length(int /*long*/ ptr) {
* @method flags=cpp
* @param ptr cast=(nsEmbedString *)
*/
-public static final native int /*long*/ _nsEmbedString_get(int /*long*/ ptr);
-public static final int /*long*/ nsEmbedString_get(int /*long*/ ptr) {
+public static final native long /*int*/ _nsEmbedString_get(long /*int*/ ptr);
+public static final long /*int*/ nsEmbedString_get(long /*int*/ ptr) {
lock.lock();
try {
return _nsEmbedString_get(ptr);
@@ -519,8 +519,8 @@ public static final int /*long*/ nsEmbedString_get(int /*long*/ ptr) {
* @param ptr cast=(nsIMemory *)
* @param size cast=(size_t)
*/
-public static final native int /*long*/ _nsIMemory_Alloc(int /*long*/ ptr, int size);
-public static final int /*long*/ nsIMemory_Alloc(int /*long*/ ptr, int size) {
+public static final native long /*int*/ _nsIMemory_Alloc(long /*int*/ ptr, int size);
+public static final long /*int*/ nsIMemory_Alloc(long /*int*/ ptr, int size) {
lock.lock();
try {
return _nsIMemory_Alloc(ptr, size);
@@ -534,8 +534,8 @@ public static final int /*long*/ nsIMemory_Alloc(int /*long*/ ptr, int size) {
* @param ptr2 cast=(void *)
* @param size cast=(size_t)
*/
-public static final native int /*long*/ _nsIMemory_Realloc(int /*long*/ ptr1, int /*long*/ ptr2, int size);
-public static final int /*long*/ nsIMemory_Realloc(int /*long*/ ptr1, int /*long*/ ptr2, int size) {
+public static final native long /*int*/ _nsIMemory_Realloc(long /*int*/ ptr1, long /*int*/ ptr2, int size);
+public static final long /*int*/ nsIMemory_Realloc(long /*int*/ ptr1, long /*int*/ ptr2, int size) {
lock.lock();
try {
return _nsIMemory_Realloc(ptr1, ptr2, size);
@@ -544,8 +544,8 @@ public static final int /*long*/ nsIMemory_Realloc(int /*long*/ ptr1, int /*long
}
}
/** @param functionLoad cast=(const nsDynamicFunctionLoad *) */
-public static final native int _XPCOMGlueLoadXULFunctions (int /*long*/ functionLoad);
-public static final int XPCOMGlueLoadXULFunctions (int /*long*/ functionLoad) {
+public static final native int _XPCOMGlueLoadXULFunctions (long /*int*/ functionLoad);
+public static final int XPCOMGlueLoadXULFunctions (long /*int*/ functionLoad) {
lock.lock();
try {
return _XPCOMGlueLoadXULFunctions(functionLoad);
@@ -573,8 +573,8 @@ public static final int XPCOMGlueShutdown() {
}
}
-public static final native int _Call(int /*long*/ ptr);
-public static final int Call(int /*long*/ ptr) {
+public static final native int _Call(long /*int*/ ptr);
+public static final int Call(long /*int*/ ptr) {
lock.lock();
try {
return _Call(ptr);
@@ -590,8 +590,8 @@ public static final int Call(int /*long*/ ptr) {
* @param aFromSegment cast=(const char *)
* @param aWriteCount cast=(PRUint32 *)
*/
-public static final native int /*long*/ _Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount);
-public static final int /*long*/ Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount) {
+public static final native long /*int*/ _Call(long /*int*/ ptr, long /*int*/ aInStream, long /*int*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount);
+public static final long /*int*/ Call(long /*int*/ ptr, long /*int*/ aInStream, long /*int*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount) {
lock.lock();
try {
return _Call(ptr, aInStream, aClosure, aFromSegment, aToOffset, aCount, aWriteCount);
@@ -607,8 +607,8 @@ public static final int /*long*/ Call(int /*long*/ ptr, int /*long*/ aInStream,
* @param aAppDirProvider cast=(nsIDirectoryServiceProvider *)
* @param aStaticComponents cast=(nsStaticModuleInfo const *)
*/
-public static final native int _Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider, int /*long*/ aStaticComponents, int aStaticComponentsCount);
-public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider, int /*long*/ aStaticComponents, int aStaticComponentsCount) {
+public static final native int _Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider, long /*int*/ aStaticComponents, int aStaticComponentsCount);
+public static final int Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider, long /*int*/ aStaticComponents, int aStaticComponentsCount) {
lock.lock();
try {
return _Call(ptr, aLibXULDirectory, aAppDirectory, aAppDirProvider, aStaticComponents, aStaticComponentsCount);
@@ -623,8 +623,8 @@ public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, in
* @param aAppDirectory cast=(nsILocalFile *)
* @param aAppDirProvider cast=(nsIDirectoryServiceProvider *)
*/
-public static final native int _Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider);
-public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider) {
+public static final native int _Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider);
+public static final int Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider) {
lock.lock();
try {
return _Call(ptr, aLibXULDirectory, aAppDirectory, aAppDirProvider);
@@ -633,8 +633,8 @@ public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, in
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl);
@@ -643,8 +643,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl) {
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
@@ -652,8 +652,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0) {
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
@@ -661,8 +661,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0) {
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, double arg0);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, double arg0) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
@@ -670,8 +670,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0) {
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
@@ -679,8 +679,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0) {
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, float[] arg0);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, float[] arg0) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
@@ -688,8 +688,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0) {
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
@@ -697,8 +697,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0) {
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
@@ -706,8 +706,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0) {
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
@@ -715,8 +715,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0) {
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
@@ -724,8 +724,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0) {
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
@@ -733,8 +733,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0) {
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0);
@@ -743,8 +743,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0) {
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -752,8 +752,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1)
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -761,8 +761,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -770,8 +770,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -779,8 +779,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -788,8 +788,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long[] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long[] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long[] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -797,8 +797,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long[] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long[] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long[] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -806,8 +806,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, short[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, short[] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, short[] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, short[] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -815,8 +815,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, short[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int[] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int[] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -824,8 +824,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, short[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, short[] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, short[] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, short[] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -833,8 +833,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, short[]
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -842,8 +842,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[]
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -851,8 +851,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[]
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -860,8 +860,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -869,8 +869,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, short arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, short arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, short arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, short arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -878,8 +878,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, short
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -887,8 +887,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -896,8 +896,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -905,8 +905,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -914,8 +914,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -923,8 +923,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[]
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -932,8 +932,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -941,8 +941,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int[] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int[] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -950,8 +950,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long[] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long[] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -959,8 +959,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, char[] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, char[] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -968,8 +968,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[]
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -977,8 +977,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -986,8 +986,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -996,8 +996,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1005,8 +1005,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1014,8 +1014,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, long[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, long[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, long[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, long[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1023,8 +1023,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, int arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, int arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, int arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1032,8 +1032,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1041,8 +1041,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
@@ -1050,8 +1050,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1059,8 +1059,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, long arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, long arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, long arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, long arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1068,8 +1068,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1078,8 +1078,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1087,8 +1087,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[]
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1096,8 +1096,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[]
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1105,8 +1105,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, int[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, int[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, int[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1114,8 +1114,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1123,8 +1123,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1132,8 +1132,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1141,8 +1141,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, long [] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, long [] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1, long [] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1, long [] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1150,8 +1150,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1159,8 +1159,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1168,8 +1168,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1177,8 +1177,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1186,8 +1186,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1195,8 +1195,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1204,8 +1204,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1213,8 +1213,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1222,8 +1222,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1231,8 +1231,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1240,8 +1240,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1249,8 +1249,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1258,8 +1258,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long [] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long [] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long [] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long [] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1267,8 +1267,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1276,8 +1276,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1285,8 +1285,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1294,8 +1294,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1303,8 +1303,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1312,8 +1312,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1321,8 +1321,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[]
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1330,8 +1330,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[]
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1339,8 +1339,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[]
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1348,8 +1348,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1357,8 +1357,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, char[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, char[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, char[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, char[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1366,8 +1366,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, char[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, char[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, char[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, char[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1375,8 +1375,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, short arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, short arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, short arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, short arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1384,8 +1384,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, short arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, short arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, short arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, short arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1393,8 +1393,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1403,8 +1403,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1412,8 +1412,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1421,8 +1421,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1430,8 +1430,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1439,8 +1439,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1448,8 +1448,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1457,8 +1457,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, int arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, int arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, int arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, int arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1466,8 +1466,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, short arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, short arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, short arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, short arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1475,8 +1475,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, short arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, short arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, short arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, short arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1484,8 +1484,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0, float arg1, int[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0, float arg1, int[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0, float arg1, int[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0, float arg1, int[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1493,8 +1493,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0, float a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0, float arg1, long[] arg2);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0, float arg1, long[] arg2) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0, float arg1, long[] arg2);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0, float arg1, long[] arg2) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
@@ -1503,8 +1503,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0, float a
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg1, int arg2, int arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg1, int arg2, int arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, int arg1, int arg2, int arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, int arg1, int arg2, int arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1512,8 +1512,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long arg1, int arg2, long arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long arg1, int arg2, long arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, long arg1, int arg2, long arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, long arg1, int arg2, long arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1521,8 +1521,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1530,8 +1530,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1539,8 +1539,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1548,8 +1548,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1557,8 +1557,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1566,8 +1566,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1575,8 +1575,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1584,8 +1584,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1593,8 +1593,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1602,8 +1602,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1611,8 +1611,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1620,8 +1620,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1629,8 +1629,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1638,8 +1638,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1647,8 +1647,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1656,8 +1656,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1665,8 +1665,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1674,8 +1674,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1683,8 +1683,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1692,8 +1692,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1701,8 +1701,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1710,8 +1710,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1719,8 +1719,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1728,8 +1728,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1737,8 +1737,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1746,8 +1746,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1755,8 +1755,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1764,8 +1764,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1773,8 +1773,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1782,8 +1782,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1791,8 +1791,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1800,8 +1800,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1809,8 +1809,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1818,8 +1818,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1827,8 +1827,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long[] arg2, long[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long[] arg2, long[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long[] arg2, long[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long[] arg2, long[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1836,8 +1836,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
@@ -1846,8 +1846,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -1855,8 +1855,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -1864,8 +1864,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -1873,8 +1873,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long[] arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long[] arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long[] arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -1882,8 +1882,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, long[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, long[] arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, long[] arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, long[] arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -1891,8 +1891,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -1900,8 +1900,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -1909,8 +1909,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -1918,8 +1918,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -1927,8 +1927,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -1936,8 +1936,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -1945,8 +1945,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -1954,8 +1954,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -1963,8 +1963,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -1973,8 +1973,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -1982,8 +1982,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -1991,8 +1991,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -2000,8 +2000,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -2009,8 +2009,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, long[] arg4);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, long[] arg4) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, long[] arg4);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, long[] arg4) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
@@ -2019,8 +2019,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2028,8 +2028,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2037,8 +2037,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2046,8 +2046,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2055,8 +2055,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2064,8 +2064,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2073,8 +2073,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2083,8 +2083,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] a
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2092,8 +2092,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[]
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2101,8 +2101,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2110,8 +2110,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int[] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2120,8 +2120,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2129,8 +2129,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2138,8 +2138,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2147,8 +2147,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2156,8 +2156,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2165,8 +2165,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2174,8 +2174,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2183,8 +2183,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2192,8 +2192,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2201,8 +2201,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[]
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2210,8 +2210,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2219,8 +2219,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2228,8 +2228,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2237,8 +2237,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2246,8 +2246,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2255,8 +2255,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2264,8 +2264,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -2274,8 +2274,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -2283,8 +2283,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -2292,8 +2292,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -2301,8 +2301,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -2310,8 +2310,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -2319,8 +2319,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -2328,8 +2328,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -2337,8 +2337,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -2346,8 +2346,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -2355,8 +2355,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -2365,8 +2365,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -2374,8 +2374,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -2383,8 +2383,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -2392,8 +2392,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -2401,8 +2401,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
@@ -2411,8 +2411,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
@@ -2420,8 +2420,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
@@ -2429,8 +2429,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
@@ -2438,8 +2438,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
@@ -2447,8 +2447,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
@@ -2456,8 +2456,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] ar
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
@@ -2465,8 +2465,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] a
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
@@ -2474,8 +2474,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
@@ -2483,8 +2483,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
@@ -2492,8 +2492,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
@@ -2501,8 +2501,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
@@ -2510,8 +2510,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
lock.unlock();
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
@@ -2520,8 +2520,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14, float arg15, short arg16);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14, float arg15, short arg16) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14, float arg15, short arg16);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14, float arg15, short arg16) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
@@ -2530,8 +2530,8 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1,
}
}
-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14, float arg15, short arg16);
-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14, float arg15, short arg16) {
+static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14, float arg15, short arg16);
+static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14, float arg15, short arg16) {
lock.lock();
try {
return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOMObject.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOMObject.java
index bc22e54b87..9899a99c9c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOMObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOMObject.java
@@ -21,7 +21,7 @@ public class XPCOMObject {
IsSolaris = osName.startsWith ("sunos") || osName.startsWith("solaris"); //$NON-NLS-1$
}
- private int /*long*/ ppVtable;
+ private long /*int*/ ppVtable;
static private final int MAX_ARG_COUNT = 12;
static private final int MAX_VTABLE_LENGTH = 80;
@@ -31,7 +31,7 @@ public class XPCOMObject {
public XPCOMObject (int[] argCounts) {
- int /*long*/[] callbackAddresses = new int /*long*/[argCounts.length + OS_OFFSET];
+ long /*int*/[] callbackAddresses = new long /*int*/[argCounts.length + OS_OFFSET];
synchronized (Callbacks) {
for (int i = 0, length = argCounts.length; i < length; i++) {
if ((Callbacks[i + OS_OFFSET][argCounts[i]]) == null) {
@@ -42,737 +42,737 @@ public XPCOMObject (int[] argCounts) {
}
}
- int /*long*/ pVtable = C.malloc (C.PTR_SIZEOF * (argCounts.length + OS_OFFSET));
+ long /*int*/ pVtable = C.malloc (C.PTR_SIZEOF * (argCounts.length + OS_OFFSET));
XPCOM.memmove (pVtable, callbackAddresses, C.PTR_SIZEOF * (argCounts.length + OS_OFFSET));
ppVtable = C.malloc (C.PTR_SIZEOF);
- XPCOM.memmove (ppVtable, new int /*long*/[] {pVtable}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppVtable, new long /*int*/[] {pVtable}, C.PTR_SIZEOF);
ObjectMap.put (new LONG (ppVtable), this);
}
-static int /*long*/ callback0 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback0 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method0 (args);
}
-static int /*long*/ callback1 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback1 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method1 (args);
}
-static int /*long*/ callback10 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback10 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method10 (args);
}
-static int /*long*/ callback11 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback11 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method11 (args);
}
-static int /*long*/ callback12 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback12 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method12 (args);
}
-static int /*long*/ callback13 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback13 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method13 (args);
}
-static int /*long*/ callback14 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback14 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method14 (args);
}
-static int /*long*/ callback15 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback15 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method15 (args);
}
-static int /*long*/ callback16 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback16 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method16 (args);
}
-static int /*long*/ callback17 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback17 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method17 (args);
}
-static int /*long*/ callback18 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback18 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method18 (args);
}
-static int /*long*/ callback19 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback19 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method19 (args);
}
-static int /*long*/ callback2 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback2 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method2 (args);
}
-static int /*long*/ callback20 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback20 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method20 (args);
}
-static int /*long*/ callback21 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback21 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method21 (args);
}
-static int /*long*/ callback22 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback22 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method22 (args);
}
-static int /*long*/ callback23 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback23 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method23 (args);
}
-static int /*long*/ callback24 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback24 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method24 (args);
}
-static int /*long*/ callback25 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback25 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method25 (args);
}
-static int /*long*/ callback26 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback26 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method26 (args);
}
-static int /*long*/ callback27 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback27 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method27 (args);
}
-static int /*long*/ callback28 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback28 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method28 (args);
}
-static int /*long*/ callback29 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback29 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method29 (args);
}
-static int /*long*/ callback3 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback3 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method3 (args);
}
-static int /*long*/ callback30 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback30 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method30 (args);
}
-static int /*long*/ callback31 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback31 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method31 (args);
}
-static int /*long*/ callback32 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback32 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method32 (args);
}
-static int /*long*/ callback33 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback33 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method33 (args);
}
-static int /*long*/ callback34 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback34 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method34 (args);
}
-static int /*long*/ callback35 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback35 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method35 (args);
}
-static int /*long*/ callback36 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback36 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method36 (args);
}
-static int /*long*/ callback37 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback37 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method37 (args);
}
-static int /*long*/ callback38 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback38 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method38 (args);
}
-static int /*long*/ callback39 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback39 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method39 (args);
}
-static int /*long*/ callback4 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback4 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method4 (args);
}
-static int /*long*/ callback40 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback40 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method40 (args);
}
-static int /*long*/ callback41 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback41 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method41 (args);
}
-static int /*long*/ callback42 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback42 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method42 (args);
}
-static int /*long*/ callback43 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback43 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method43 (args);
}
-static int /*long*/ callback44 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback44 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method44 (args);
}
-static int /*long*/ callback45 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback45 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method45 (args);
}
-static int /*long*/ callback46 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback46 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method46 (args);
}
-static int /*long*/ callback47 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback47 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method47 (args);
}
-static int /*long*/ callback48 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback48 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method48 (args);
}
-static int /*long*/ callback49 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback49 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method49 (args);
}
-static int /*long*/ callback5 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback5 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method5 (args);
}
-static int /*long*/ callback50 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback50 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method50 (args);
}
-static int /*long*/ callback51 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback51 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method51 (args);
}
-static int /*long*/ callback52 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback52 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method52 (args);
}
-static int /*long*/ callback53 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback53 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method53 (args);
}
-static int /*long*/ callback54 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback54 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method54 (args);
}
-static int /*long*/ callback55 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback55 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method55 (args);
}
-static int /*long*/ callback56 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback56 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method56 (args);
}
-static int /*long*/ callback57 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback57 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method57 (args);
}
-static int /*long*/ callback58 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback58 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method58 (args);
}
-static int /*long*/ callback59 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback59 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method59 (args);
}
-static int /*long*/ callback6 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback6 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method6 (args);
}
-static int /*long*/ callback60 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback60 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method60 (args);
}
-static int /*long*/ callback61 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback61 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method61 (args);
}
-static int /*long*/ callback62 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback62 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method62 (args);
}
-static int /*long*/ callback63 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback63 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method63 (args);
}
-static int /*long*/ callback64 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback64 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method64 (args);
}
-static int /*long*/ callback65 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback65 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method65 (args);
}
-static int /*long*/ callback66 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback66 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method66 (args);
}
-static int /*long*/ callback67 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback67 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method67 (args);
}
-static int /*long*/ callback68 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback68 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method68 (args);
}
-static int /*long*/ callback69 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback69 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method69 (args);
}
-static int /*long*/ callback7 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback7 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method7 (args);
}
-static int /*long*/ callback70 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback70 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method70 (args);
}
-static int /*long*/ callback71 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback71 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method71 (args);
}
-static int /*long*/ callback72 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback72 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method72 (args);
}
-static int /*long*/ callback73 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback73 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method73 (args);
}
-static int /*long*/ callback74 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback74 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method74 (args);
}
-static int /*long*/ callback75 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback75 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method75 (args);
}
-static int /*long*/ callback76 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback76 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method76 (args);
}
-static int /*long*/ callback77 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback77 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method77 (args);
}
-static int /*long*/ callback78 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback78 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method78 (args);
}
-static int /*long*/ callback79 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback79 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method79 (args);
}
-static int /*long*/ callback8 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback8 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method8 (args);
}
-static int /*long*/ callback9 (int /*long*/[] callbackArgs) {
+static long /*int*/ callback9 (long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get (new LONG (address));
if (object == null) return XPCOM.NS_ERROR_FAILURE;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy (callbackArgs, 1, args, 0, args.length);
return ((XPCOMObject) object).method9 (args);
}
public void dispose() {
// free the memory for this reference
- int /*long*/[] pVtable = new int /*long*/[1];
+ long /*int*/[] pVtable = new long /*int*/[1];
XPCOM.memmove (pVtable, ppVtable, C.PTR_SIZEOF);
C.free (pVtable[0]);
C.free (ppVtable);
@@ -783,248 +783,248 @@ public void dispose() {
ppVtable = 0;
}
-public int /*long*/ getAddress () {
+public long /*int*/ getAddress () {
return ppVtable;
}
-public int /*long*/ method0 (int /*long*/[] args) {
+public long /*int*/ method0 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method1 (int /*long*/[] args) {
+public long /*int*/ method1 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method10 (int /*long*/[] args) {
+public long /*int*/ method10 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method11 (int /*long*/[] args) {
+public long /*int*/ method11 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method12 (int /*long*/[] args) {
+public long /*int*/ method12 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method13 (int /*long*/[] args) {
+public long /*int*/ method13 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method14 (int /*long*/[] args) {
+public long /*int*/ method14 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method15 (int /*long*/[] args) {
+public long /*int*/ method15 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method16 (int /*long*/[] args) {
+public long /*int*/ method16 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method17 (int /*long*/[] args) {
+public long /*int*/ method17 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method18 (int /*long*/[] args) {
+public long /*int*/ method18 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method19 (int /*long*/[] args) {
+public long /*int*/ method19 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method2 (int /*long*/[] args) {
+public long /*int*/ method2 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method20 (int /*long*/[] args) {
+public long /*int*/ method20 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method21 (int /*long*/[] args) {
+public long /*int*/ method21 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method22 (int /*long*/[] args) {
+public long /*int*/ method22 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method23 (int /*long*/[] args) {
+public long /*int*/ method23 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method24 (int /*long*/[] args) {
+public long /*int*/ method24 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method25 (int /*long*/[] args) {
+public long /*int*/ method25 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method26 (int /*long*/[] args) {
+public long /*int*/ method26 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method27 (int /*long*/[] args) {
+public long /*int*/ method27 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method28 (int /*long*/[] args) {
+public long /*int*/ method28 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method29 (int /*long*/[] args) {
+public long /*int*/ method29 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method3 (int /*long*/[] args) {
+public long /*int*/ method3 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method30 (int /*long*/[] args) {
+public long /*int*/ method30 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method31 (int /*long*/[] args) {
+public long /*int*/ method31 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method32 (int /*long*/[] args) {
+public long /*int*/ method32 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method33 (int /*long*/[] args) {
+public long /*int*/ method33 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method34 (int /*long*/[] args) {
+public long /*int*/ method34 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method35 (int /*long*/[] args) {
+public long /*int*/ method35 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method36 (int /*long*/[] args) {
+public long /*int*/ method36 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method37 (int /*long*/[] args) {
+public long /*int*/ method37 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method38 (int /*long*/[] args) {
+public long /*int*/ method38 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method39 (int /*long*/[] args) {
+public long /*int*/ method39 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method4 (int /*long*/[] args) {
+public long /*int*/ method4 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method40 (int /*long*/[] args) {
+public long /*int*/ method40 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method41 (int /*long*/[] args) {
+public long /*int*/ method41 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method42 (int /*long*/[] args) {
+public long /*int*/ method42 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method43 (int /*long*/[] args) {
+public long /*int*/ method43 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method44 (int /*long*/[] args) {
+public long /*int*/ method44 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method45 (int /*long*/[] args) {
+public long /*int*/ method45 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method46 (int /*long*/[] args) {
+public long /*int*/ method46 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method47 (int /*long*/[] args) {
+public long /*int*/ method47 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method48 (int /*long*/[] args) {
+public long /*int*/ method48 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method49 (int /*long*/[] args) {
+public long /*int*/ method49 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method5 (int /*long*/[] args) {
+public long /*int*/ method5 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method50 (int /*long*/[] args) {
+public long /*int*/ method50 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method51 (int /*long*/[] args) {
+public long /*int*/ method51 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method52 (int /*long*/[] args) {
+public long /*int*/ method52 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method53 (int /*long*/[] args) {
+public long /*int*/ method53 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method54 (int /*long*/[] args) {
+public long /*int*/ method54 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method55 (int /*long*/[] args) {
+public long /*int*/ method55 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method56 (int /*long*/[] args) {
+public long /*int*/ method56 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method57 (int /*long*/[] args) {
+public long /*int*/ method57 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method58 (int /*long*/[] args) {
+public long /*int*/ method58 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method59 (int /*long*/[] args) {
+public long /*int*/ method59 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method6 (int /*long*/[] args) {
+public long /*int*/ method6 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method60 (int /*long*/[] args) {
+public long /*int*/ method60 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method61 (int /*long*/[] args) {
+public long /*int*/ method61 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method62 (int /*long*/[] args) {
+public long /*int*/ method62 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method63 (int /*long*/[] args) {
+public long /*int*/ method63 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method64 (int /*long*/[] args) {
+public long /*int*/ method64 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method65 (int /*long*/[] args) {
+public long /*int*/ method65 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method66 (int /*long*/[] args) {
+public long /*int*/ method66 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method67 (int /*long*/[] args) {
+public long /*int*/ method67 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method68 (int /*long*/[] args) {
+public long /*int*/ method68 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method69 (int /*long*/[] args) {
+public long /*int*/ method69 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method7 (int /*long*/[] args) {
+public long /*int*/ method7 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method70 (int /*long*/[] args) {
+public long /*int*/ method70 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method71 (int /*long*/[] args) {
+public long /*int*/ method71 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method72 (int /*long*/[] args) {
+public long /*int*/ method72 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method73 (int /*long*/[] args) {
+public long /*int*/ method73 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method74 (int /*long*/[] args) {
+public long /*int*/ method74 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method75 (int /*long*/[] args) {
+public long /*int*/ method75 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method76 (int /*long*/[] args) {
+public long /*int*/ method76 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method77 (int /*long*/[] args) {
+public long /*int*/ method77 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method78 (int /*long*/[] args) {
+public long /*int*/ method78 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method79 (int /*long*/[] args) {
+public long /*int*/ method79 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method8 (int /*long*/[] args) {
+public long /*int*/ method8 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-public int /*long*/ method9 (int /*long*/[] args) {
+public long /*int*/ method9 (long /*int*/[] args) {
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/GREProperty.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/GREProperty.java
index d5935e3d38..86b1d82ab5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/GREProperty.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/GREProperty.java
@@ -30,8 +30,8 @@ package org.eclipse.swt.internal.mozilla.init;
/** @jniclass flags=cpp */
public class GREProperty {
/** @field cast=(const char *) */
- public int /*long*/ property;
+ public long /*int*/ property;
/** @field cast=(const char *) */
- public int /*long*/ value;
+ public long /*int*/ value;
public static final int sizeof = XPCOMInit.GREProperty_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
index 0ec838bd5f..18272a563f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
@@ -30,10 +30,10 @@ package org.eclipse.swt.internal.mozilla.init;
/** @jniclass flags=cpp */
public class GREVersionRange {
/** @field cast=(const char *) */
- public int /*long*/ lower;
+ public long /*int*/ lower;
public boolean lowerInclusive;
/** @field cast=(const char *) */
- public int /*long*/ upper;
+ public long /*int*/ upper;
public boolean upperInclusive;
public static final int sizeof = XPCOMInit.GREVersionRange_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
index d8901f2166..aa38c4cd8b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
@@ -41,8 +41,8 @@ public static final native int GREVersionRange_sizeof ();
* @param properties cast=(const GREProperty *)
* @param buffer cast=(char *)
*/
-public static final native int _GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, GREProperty properties, int propertiesLength, int /*long*/ buffer, int buflen);
-public static final int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, GREProperty properties, int propertiesLength, int /*long*/ buffer, int buflen) {
+public static final native int _GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, GREProperty properties, int propertiesLength, long /*int*/ buffer, int buflen);
+public static final int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, GREProperty properties, int propertiesLength, long /*int*/ buffer, int buflen) {
lock.lock();
try {
return _GRE_GetGREPathWithProperties(versions, versionsLength, properties, propertiesLength, buffer, buflen);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
index 10530015c4..0baee98f62 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
@@ -29,7 +29,7 @@ package org.eclipse.swt.internal.mozilla;
public class nsDynamicFunctionLoad {
/** @field cast=(const char *) */
- public int /*long*/ functionName;
+ public long /*int*/ functionName;
/** @field cast=(NSFuncPtr *) */
- public int /*long*/ function;
+ public long /*int*/ function;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsEmbedString.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsEmbedString.java
index 162a0ad89c..ad9d4538e7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsEmbedString.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsEmbedString.java
@@ -28,7 +28,7 @@
package org.eclipse.swt.internal.mozilla;
public class nsEmbedString {
- int /*long*/ handle;
+ long /*int*/ handle;
public nsEmbedString() {
handle = XPCOM.nsEmbedString_new();
@@ -42,14 +42,14 @@ public nsEmbedString(String string) {
}
}
-public int /*long*/ getAddress() {
+public long /*int*/ getAddress() {
return handle;
}
public String toString() {
if (handle == 0) return null;
int length = XPCOM.nsEmbedString_Length(handle);
- int /*long*/ buffer = XPCOM.nsEmbedString_get(handle);
+ long /*int*/ buffer = XPCOM.nsEmbedString_get(handle);
char[] dest = new char[length];
XPCOM.memmove(dest, buffer, length * 2);
return new String(dest);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java
index 9ce7481d72..c67dd14e7c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java
@@ -37,11 +37,11 @@ public class nsIAppShell extends nsISupports {
public static final nsID NS_IAPPSHELL_IID =
new nsID(NS_IAPPSHELL_IID_STR);
- public nsIAppShell(int /*long*/ address) {
+ public nsIAppShell(long /*int*/ address) {
super(address);
}
- public int Create(int /*long*/ argc, int /*long*/[] argv) {
+ public int Create(long /*int*/ argc, long /*int*/[] argv) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv);
}
@@ -57,15 +57,15 @@ public class nsIAppShell extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
}
- public int ListenToEventQueue(int /*long*/ aQueue, int aListen) {
+ public int ListenToEventQueue(long /*int*/ aQueue, int aListen) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen);
}
- public int GetNativeEvent(int /*long*/ aRealEvent, int /*long*/[] aEvent) {
+ public int GetNativeEvent(long /*int*/ aRealEvent, long /*int*/[] aEvent) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent);
}
- public int DispatchNativeEvent(int aRealEvent, int /*long*/ aEvent) {
+ public int DispatchNativeEvent(int aRealEvent, long /*int*/ aEvent) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aRealEvent, aEvent);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
index 41cb4e2b3f..050ac5f981 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
@@ -37,7 +37,7 @@ public class nsIAuthInformation extends nsISupports {
public static final nsID NS_IAUTHINFORMATION_IID =
new nsID(NS_IAUTHINFORMATION_IID_STR);
- public nsIAuthInformation(int /*long*/ address) {
+ public nsIAuthInformation(long /*int*/ address) {
super(address);
}
@@ -50,35 +50,35 @@ public class nsIAuthInformation extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFlags);
}
- public int GetRealm(int /*long*/ aRealm) {
+ public int GetRealm(long /*int*/ aRealm) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aRealm);
}
- public int GetAuthenticationScheme(int /*long*/ aAuthenticationScheme) {
+ public int GetAuthenticationScheme(long /*int*/ aAuthenticationScheme) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aAuthenticationScheme);
}
- public int GetUsername(int /*long*/ aUsername) {
+ public int GetUsername(long /*int*/ aUsername) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aUsername);
}
- public int SetUsername(int /*long*/ aUsername) {
+ public int SetUsername(long /*int*/ aUsername) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aUsername);
}
- public int GetPassword(int /*long*/ aPassword) {
+ public int GetPassword(long /*int*/ aPassword) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPassword);
}
- public int SetPassword(int /*long*/ aPassword) {
+ public int SetPassword(long /*int*/ aPassword) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aPassword);
}
- public int GetDomain(int /*long*/ aDomain) {
+ public int GetDomain(long /*int*/ aDomain) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aDomain);
}
- public int SetDomain(int /*long*/ aDomain) {
+ public int SetDomain(long /*int*/ aDomain) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDomain);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthPrompt2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthPrompt2.java
index a1b88d8c62..f13efea66f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthPrompt2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthPrompt2.java
@@ -37,7 +37,7 @@ public class nsIAuthPrompt2 extends nsISupports {
public static final nsID NS_IAUTHPROMPT2_IID =
new nsID(NS_IAUTHPROMPT2_IID_STR);
- public nsIAuthPrompt2(int /*long*/ address) {
+ public nsIAuthPrompt2(long /*int*/ address) {
super(address);
}
@@ -45,11 +45,11 @@ public class nsIAuthPrompt2 extends nsISupports {
public static final int LEVEL_PW_ENCRYPTED = 1;
public static final int LEVEL_SECURE = 2;
- public int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
+ public int PromptAuth(long /*int*/ aParent, long /*int*/ aChannel, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 1, getAddress(), aParent, aChannel, level, authInfo, checkboxLabel, checkValue, _retval);
}
- public int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int /*long*/[] _retval) {
+ public int AsyncPromptAuth(long /*int*/ aParent, long /*int*/ aChannel, long /*int*/ aCallback, long /*int*/ aContext, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
index 39c0009366..583214061c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
@@ -37,11 +37,11 @@ public class nsIBadCertListener2 extends nsISupports {
public static final nsID NS_IBADCERTLISTENER2_IID =
new nsID(NS_IBADCERTLISTENER2_IID_STR);
- public nsIBadCertListener2(int /*long*/ address) {
+ public nsIBadCertListener2(long /*int*/ address) {
super(address);
}
- public int NotifyCertProblem(int /*long*/ socketInfo, int /*long*/ status, int /*long*/ targetSite, int[] _retval) {
+ public int NotifyCertProblem(long /*int*/ socketInfo, long /*int*/ status, long /*int*/ targetSite, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), socketInfo, status, targetSite, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
index 4d62dde75d..d67711f3ea 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
@@ -43,11 +43,11 @@ public class nsIBaseWindow extends nsISupports {
public static final nsID NS_IBASEWINDOW_10_IID =
new nsID(NS_IBASEWINDOW_10_IID_STR);
- public nsIBaseWindow(int /*long*/ address) {
+ public nsIBaseWindow(long /*int*/ address) {
super(address);
}
- public int InitWindow(int /*long*/ parentNativeWindow, int /*long*/ parentWidget, int x, int y, int cx, int cy) {
+ public int InitWindow(long /*int*/ parentNativeWindow, long /*int*/ parentWidget, int x, int y, int cx, int cy) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parentNativeWindow, parentWidget, x, y, cx, cy);
}
@@ -87,19 +87,19 @@ public class nsIBaseWindow extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), force);
}
- public int GetParentWidget(int /*long*/[] aParentWidget) {
+ public int GetParentWidget(long /*int*/[] aParentWidget) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aParentWidget);
}
- public int SetParentWidget(int /*long*/ aParentWidget) {
+ public int SetParentWidget(long /*int*/ aParentWidget) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aParentWidget);
}
- public int GetParentNativeWindow(int /*long*/[] aParentNativeWindow) {
+ public int GetParentNativeWindow(long /*int*/[] aParentNativeWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aParentNativeWindow);
}
- public int SetParentNativeWindow(int /*long*/ aParentNativeWindow) {
+ public int SetParentNativeWindow(long /*int*/ aParentNativeWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentNativeWindow);
}
@@ -129,7 +129,7 @@ public class nsIBaseWindow extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aBlurSuppression);
}
- public int GetMainWidget(int /*long*/[] aMainWidget) {
+ public int GetMainWidget(long /*int*/[] aMainWidget) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 21), getAddress(), aMainWidget);
}
@@ -137,7 +137,7 @@ public class nsIBaseWindow extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 22), getAddress());
}
- public int GetTitle(int /*long*/[] aTitle) {
+ public int GetTitle(long /*int*/[] aTitle) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 23), getAddress(), aTitle);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICancelable.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICancelable.java
index e20f203922..b6af27d800 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICancelable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICancelable.java
@@ -37,7 +37,7 @@ public class nsICancelable extends nsISupports {
public static final nsID NS_ICANCELABLE_IID =
new nsID(NS_ICANCELABLE_IID_STR);
- public nsICancelable(int /*long*/ address) {
+ public nsICancelable(long /*int*/ address) {
super(address);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
index 8417352efa..5189b63df2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
@@ -37,15 +37,15 @@ public class nsICategoryManager extends nsISupports {
public static final nsID NS_ICATEGORYMANAGER_IID =
new nsID(NS_ICATEGORYMANAGER_IID_STR);
- public nsICategoryManager(int /*long*/ address) {
+ public nsICategoryManager(long /*int*/ address) {
super(address);
}
- public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, int /*long*/[] _retval) {
+ public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCategory, aEntry, _retval);
}
- public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, int /*long*/[] _retval) {
+ public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCategory, aEntry, aValue, aPersist, aReplace, _retval);
}
@@ -57,11 +57,11 @@ public class nsICategoryManager extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aCategory);
}
- public int EnumerateCategory(byte[] aCategory, int /*long*/[] _retval) {
+ public int EnumerateCategory(byte[] aCategory, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCategory, _retval);
}
- public int EnumerateCategories(int /*long*/[] _retval) {
+ public int EnumerateCategories(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
index 6da76cf159..fbd2c66182 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
@@ -37,7 +37,7 @@ public class nsICertOverrideService extends nsISupports {
public static final nsID NS_ICERTOVERRIDESERVICE_IID =
new nsID(NS_ICERTOVERRIDESERVICE_IID_STR);
- public nsICertOverrideService(int /*long*/ address) {
+ public nsICertOverrideService(long /*int*/ address) {
super(address);
}
@@ -45,27 +45,27 @@ public class nsICertOverrideService extends nsISupports {
public static final int ERROR_MISMATCH = 2;
public static final int ERROR_TIME = 4;
- public int RememberValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int aOverrideBits, int aTemporary) {
+ public int RememberValidityOverride(long /*int*/ aHostName, int aPort, long /*int*/ aCert, int aOverrideBits, int aTemporary) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aHostName, aPort, aCert, aOverrideBits, aTemporary);
}
- public int HasMatchingOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
+ public int HasMatchingOverride(long /*int*/ aHostName, int aPort, long /*int*/ aCert, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aHostName, aPort, aCert, aOverrideBits, aIsTemporary, _retval);
}
- public int GetValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aHashAlg, int /*long*/ aFingerprint, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
+ public int GetValidityOverride(long /*int*/ aHostName, int aPort, long /*int*/ aHashAlg, long /*int*/ aFingerprint, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aHostName, aPort, aHashAlg, aFingerprint, aOverrideBits, aIsTemporary, _retval);
}
- public int ClearValidityOverride(int /*long*/ aHostName, int aPort) {
+ public int ClearValidityOverride(long /*int*/ aHostName, int aPort) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHostName, aPort);
}
- public int GetAllOverrideHostsWithPorts(int[] aCount, int /*long*/[] aHostsWithPortsArray) {
+ public int GetAllOverrideHostsWithPorts(int[] aCount, long /*int*/[] aHostsWithPortsArray) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCount, aHostsWithPortsArray);
}
- public int IsCertUsedForOverrides(int /*long*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) {
+ public int IsCertUsedForOverrides(long /*int*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCert, aCheckTemporaries, aCheckPermanents, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
index 9838c2dde0..a6968ceead 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
@@ -37,31 +37,31 @@ public class nsICertificateDialogs extends nsISupports {
public static final nsID NS_ICERTIFICATEDIALOGS_IID =
new nsID(NS_ICERTIFICATEDIALOGS_IID_STR);
- public nsICertificateDialogs(int /*long*/ address) {
+ public nsICertificateDialogs(long /*int*/ address) {
super(address);
}
- public int ConfirmDownloadCACert(int /*long*/ ctx, int /*long*/ cert, int[] trust, int[] _retval) {
+ public int ConfirmDownloadCACert(long /*int*/ ctx, long /*int*/ cert, int[] trust, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), ctx, cert, trust, _retval);
}
- public int NotifyCACertExists(int /*long*/ ctx) {
+ public int NotifyCACertExists(long /*int*/ ctx) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), ctx);
}
- public int SetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) {
+ public int SetPKCS12FilePassword(long /*int*/ ctx, long /*int*/ password, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ctx, password, _retval);
}
- public int GetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) {
+ public int GetPKCS12FilePassword(long /*int*/ ctx, long /*int*/ password, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), ctx, password, _retval);
}
- public int ViewCert(int /*long*/ ctx, int /*long*/ cert) {
+ public int ViewCert(long /*int*/ ctx, long /*int*/ cert) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), ctx, cert);
}
- public int CrlImportStatusDialog(int /*long*/ ctx, int /*long*/ crl) {
+ public int CrlImportStatusDialog(long /*int*/ ctx, long /*int*/ crl) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), ctx, crl);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java
index 51559cc455..9a6517d9a4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java
@@ -43,55 +43,55 @@ public class nsIChannel extends nsIRequest {
public static final nsID NS_ICHANNEL_10_IID =
new nsID(NS_ICHANNEL_10_IID_STR);
- public nsIChannel(int /*long*/ address) {
+ public nsIChannel(long /*int*/ address) {
super(address);
}
- public int GetOriginalURI(int /*long*/[] aOriginalURI) {
+ public int GetOriginalURI(long /*int*/[] aOriginalURI) {
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 1, getAddress(), aOriginalURI);
}
- public int SetOriginalURI(int /*long*/ aOriginalURI) {
+ public int SetOriginalURI(long /*int*/ aOriginalURI) {
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 2, getAddress(), aOriginalURI);
}
- public int GetURI(int /*long*/[] aURI) {
+ public int GetURI(long /*int*/[] aURI) {
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 3, getAddress(), aURI);
}
- public int GetOwner(int /*long*/[] aOwner) {
+ public int GetOwner(long /*int*/[] aOwner) {
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 4, getAddress(), aOwner);
}
- public int SetOwner(int /*long*/ aOwner) {
+ public int SetOwner(long /*int*/ aOwner) {
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 5, getAddress(), aOwner);
}
- public int GetNotificationCallbacks(int /*long*/[] aNotificationCallbacks) {
+ public int GetNotificationCallbacks(long /*int*/[] aNotificationCallbacks) {
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 6, getAddress(), aNotificationCallbacks);
}
- public int SetNotificationCallbacks(int /*long*/ aNotificationCallbacks) {
+ public int SetNotificationCallbacks(long /*int*/ aNotificationCallbacks) {
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 7, getAddress(), aNotificationCallbacks);
}
- public int GetSecurityInfo(int /*long*/[] aSecurityInfo) {
+ public int GetSecurityInfo(long /*int*/[] aSecurityInfo) {
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 8, getAddress(), aSecurityInfo);
}
- public int GetContentType(int /*long*/ aContentType) {
+ public int GetContentType(long /*int*/ aContentType) {
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 9, getAddress(), aContentType);
}
- public int SetContentType(int /*long*/ aContentType) {
+ public int SetContentType(long /*int*/ aContentType) {
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 10, getAddress(), aContentType);
}
- public int GetContentCharset(int /*long*/ aContentCharset) {
+ public int GetContentCharset(long /*int*/ aContentCharset) {
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 11, getAddress(), aContentCharset);
}
- public int SetContentCharset(int /*long*/ aContentCharset) {
+ public int SetContentCharset(long /*int*/ aContentCharset) {
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 12, getAddress(), aContentCharset);
}
@@ -103,11 +103,11 @@ public class nsIChannel extends nsIRequest {
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 14, getAddress(), aContentLength);
}
- public int Open(int /*long*/[] _retval) {
+ public int Open(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 15, getAddress(), _retval);
}
- public int AsyncOpen(int /*long*/ aListener, int /*long*/ aContext) {
+ public int AsyncOpen(long /*int*/ aListener, long /*int*/ aContext) {
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 16, getAddress(), aListener, aContext);
}
@@ -116,12 +116,12 @@ public class nsIChannel extends nsIRequest {
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 17, getAddress(), aContentDisposition);
}
- public int GetContentDispositionFilename(int /*long*/ aContentDispositionFilename) {
+ public int GetContentDispositionFilename(long /*int*/ aContentDispositionFilename) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 18, getAddress(), aContentDispositionFilename);
}
- public int GetContentDispositionHeader(int /*long*/ aContentDispositionHeader) {
+ public int GetContentDispositionHeader(long /*int*/ aContentDispositionHeader) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 19, getAddress(), aContentDispositionHeader);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIClassInfo.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIClassInfo.java
index 92f9c35ada..58d68a4aab 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIClassInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIClassInfo.java
@@ -37,27 +37,27 @@ public class nsIClassInfo extends nsISupports {
public static final nsID NS_ICLASSINFO_IID =
new nsID(NS_ICLASSINFO_IID_STR);
- public nsIClassInfo(int /*long*/ address) {
+ public nsIClassInfo(long /*int*/ address) {
super(address);
}
- public int GetInterfaces(int[] count, int /*long*/[] array) {
+ public int GetInterfaces(int[] count, long /*int*/[] array) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), count, array);
}
- public int GetHelperForLanguage(int language, int /*long*/[] _retval) {
+ public int GetHelperForLanguage(int language, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), language, _retval);
}
- public int GetContractID(int /*long*/[] aContractID) {
+ public int GetContractID(long /*int*/[] aContractID) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContractID);
}
- public int GetClassDescription(int /*long*/[] aClassDescription) {
+ public int GetClassDescription(long /*int*/[] aClassDescription) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClassDescription);
}
- public int GetClassID(int /*long*/ aClassID) {
+ public int GetClassID(long /*int*/ aClassID) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClassID);
}
@@ -78,7 +78,7 @@ public class nsIClassInfo extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFlags);
}
- public int GetClassIDNoAlloc(int /*long*/ aClassIDNoAlloc) {
+ public int GetClassIDNoAlloc(long /*int*/ aClassIDNoAlloc) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aClassIDNoAlloc);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
index 9da2f35ba5..7140219d74 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
@@ -37,23 +37,23 @@ public class nsIComponentManager extends nsISupports {
public static final nsID NS_ICOMPONENTMANAGER_IID =
new nsID(NS_ICOMPONENTMANAGER_IID_STR);
- public nsIComponentManager(int /*long*/ address) {
+ public nsIComponentManager(long /*int*/ address) {
super(address);
}
- public int GetClassObject(nsID aClass, nsID aIID, int /*long*/[] result) {
+ public int GetClassObject(nsID aClass, nsID aIID, long /*int*/[] result) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
}
- public int GetClassObjectByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) {
+ public int GetClassObjectByContractID(byte[] aContractID, nsID aIID, long /*int*/[] result) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
}
- public int CreateInstance(nsID aClass, int /*long*/ aDelegate, nsID aIID, int /*long*/[] result) {
+ public int CreateInstance(nsID aClass, long /*int*/ aDelegate, nsID aIID, long /*int*/[] result) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aDelegate, aIID, result);
}
- public int CreateInstanceByContractID(byte[] aContractID, int /*long*/ aDelegate, nsID aIID, int /*long*/[] result) {
+ public int CreateInstanceByContractID(byte[] aContractID, long /*int*/ aDelegate, nsID aIID, long /*int*/[] result) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContractID, aDelegate, aIID, result);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
index 6ff0cfff91..ce333513d7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
@@ -37,31 +37,31 @@ public class nsIComponentRegistrar extends nsISupports {
public static final nsID NS_ICOMPONENTREGISTRAR_IID =
new nsID(NS_ICOMPONENTREGISTRAR_IID_STR);
- public nsIComponentRegistrar(int /*long*/ address) {
+ public nsIComponentRegistrar(long /*int*/ address) {
super(address);
}
- public int AutoRegister(int /*long*/ aSpec) {
+ public int AutoRegister(long /*int*/ aSpec) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
}
- public int AutoUnregister(int /*long*/ aSpec) {
+ public int AutoUnregister(long /*int*/ aSpec) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
}
- public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFactory) {
+ public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFactory) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aClassName, aContractID, aFactory);
}
- public int UnregisterFactory(nsID aClass, int /*long*/ aFactory) {
+ public int UnregisterFactory(nsID aClass, long /*int*/ aFactory) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClass, aFactory);
}
- public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFile, byte[] aLoaderStr, byte[] aType) {
+ public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFile, byte[] aLoaderStr, byte[] aType) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClass, aClassName, aContractID, aFile, aLoaderStr, aType);
}
- public int UnregisterFactoryLocation(nsID aClass, int /*long*/ aFile) {
+ public int UnregisterFactoryLocation(nsID aClass, long /*int*/ aFile) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aClass, aFile);
}
@@ -73,19 +73,19 @@ public class nsIComponentRegistrar extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aContractID, _retval);
}
- public int EnumerateCIDs(int /*long*/[] _retval) {
+ public int EnumerateCIDs(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
}
- public int EnumerateContractIDs(int /*long*/[] _retval) {
+ public int EnumerateContractIDs(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
}
- public int CIDToContractID(nsID aClass, int /*long*/[] _retval) {
+ public int CIDToContractID(nsID aClass, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aClass, _retval);
}
- public int ContractIDToCID(byte[] aContractID, int /*long*/ _retval) {
+ public int ContractIDToCID(byte[] aContractID, long /*int*/ _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aContractID, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
index 8cbac68536..3e4d4b92c8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
@@ -37,7 +37,7 @@ public class nsIContextMenuListener extends nsISupports {
public static final nsID NS_ICONTEXTMENULISTENER_IID =
new nsID(NS_ICONTEXTMENULISTENER_IID_STR);
- public nsIContextMenuListener(int /*long*/ address) {
+ public nsIContextMenuListener(long /*int*/ address) {
super(address);
}
@@ -48,7 +48,7 @@ public class nsIContextMenuListener extends nsISupports {
public static final int CONTEXT_TEXT = 8;
public static final int CONTEXT_INPUT = 16;
- public int OnShowContextMenu(int aContextFlags, int /*long*/ aEvent, int /*long*/ aNode) {
+ public int OnShowContextMenu(int aContextFlags, long /*int*/ aEvent, long /*int*/ aNode) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aContextFlags, aEvent, aNode);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookie.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookie.java
index 76a1d64b9f..446992922f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookie.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookie.java
@@ -37,15 +37,15 @@ public class nsICookie extends nsISupports {
public static final nsID NS_ICOOKIE_IID =
new nsID(NS_ICOOKIE_IID_STR);
- public nsICookie(int /*long*/ address) {
+ public nsICookie(long /*int*/ address) {
super(address);
}
- public int GetName(int /*long*/ aName) {
+ public int GetName(long /*int*/ aName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
}
- public int GetValue(int /*long*/ aValue) {
+ public int GetValue(long /*int*/ aValue) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aValue);
}
@@ -53,11 +53,11 @@ public class nsICookie extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aIsDomain);
}
- public int GetHost(int /*long*/ aHost) {
+ public int GetHost(long /*int*/ aHost) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHost);
}
- public int GetPath(int /*long*/ aPath) {
+ public int GetPath(long /*int*/ aPath) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPath);
}
@@ -75,7 +75,7 @@ public class nsICookie extends nsISupports {
public static final int STATUS_FLAGGED = 3;
public static final int STATUS_REJECTED = 4;
- public int GetStatus(int /*long*/ aStatus) {
+ public int GetStatus(long /*int*/ aStatus) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStatus);
}
@@ -86,7 +86,7 @@ public class nsICookie extends nsISupports {
public static final int POLICY_EXPLICIT_CONSENT = 4;
public static final int POLICY_NO_II = 5;
- public int GetPolicy(int /*long*/ aPolicy) {
+ public int GetPolicy(long /*int*/ aPolicy) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPolicy);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieManager.java
index a925dd8cc2..56c8a12bf8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieManager.java
@@ -37,7 +37,7 @@ public class nsICookieManager extends nsISupports {
public static final nsID NS_ICOOKIEMANAGER_IID =
new nsID(NS_ICOOKIEMANAGER_IID_STR);
- public nsICookieManager(int /*long*/ address) {
+ public nsICookieManager(long /*int*/ address) {
super(address);
}
@@ -45,11 +45,11 @@ public class nsICookieManager extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
}
- public int GetEnumerator(int /*long*/[] aEnumerator) {
+ public int GetEnumerator(long /*int*/[] aEnumerator) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEnumerator);
}
- public int Remove(int /*long*/ aDomain, int /*long*/ aName, int /*long*/ aPath, int aBlocked) {
+ public int Remove(long /*int*/ aDomain, long /*int*/ aName, long /*int*/ aPath, int aBlocked) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDomain, aName, aPath, aBlocked);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService.java
index eebe8abb43..86407ec412 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService.java
@@ -37,23 +37,23 @@ public class nsICookieService extends nsISupports {
public static final nsID NS_ICOOKIESERVICE_IID =
new nsID(NS_ICOOKIESERVICE_IID_STR);
- public nsICookieService(int /*long*/ address) {
+ public nsICookieService(long /*int*/ address) {
super(address);
}
- public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+ public int GetCookieString(long /*int*/ aURI, long /*int*/ aChannel, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
}
- public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+ public int GetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aChannel, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
}
- public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
+ public int SetCookieString(long /*int*/ aURI, long /*int*/ aPrompt, byte[] aCookie, long /*int*/ aChannel) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
}
- public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
+ public int SetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aPrompt, byte[] aCookie, byte[] aServerTime, long /*int*/ aChannel) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
index afff59ff8f..cc203de936 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
@@ -37,23 +37,23 @@ public class nsICookieService_1_9 extends nsISupports {
public static final nsID NS_ICOOKIESERVICE_IID =
new nsID(NS_ICOOKIESERVICE_IID_STR);
- public nsICookieService_1_9(int /*long*/ address) {
+ public nsICookieService_1_9(long /*int*/ address) {
super(address);
}
- public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+ public int GetCookieString(long /*int*/ aURI, long /*int*/ aChannel, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
}
- public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+ public int GetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aChannel, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
}
- public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
+ public int SetCookieString(long /*int*/ aURI, long /*int*/ aPrompt, byte[] aCookie, long /*int*/ aChannel) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
}
- public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
+ public int SetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aPrompt, byte[] aCookie, byte[] aServerTime, long /*int*/ aChannel) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java
index 9e2a28b520..71987ad099 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java
@@ -46,9 +46,9 @@ public nsID(String id) {
}
public boolean Equals(nsID other) {
- int /*long*/ ptr = XPCOM.nsID_new ();
+ long /*int*/ ptr = XPCOM.nsID_new ();
XPCOM.memmove (ptr, this, nsID.sizeof);
- int /*long*/ otherPtr = XPCOM.nsID_new ();
+ long /*int*/ otherPtr = XPCOM.nsID_new ();
XPCOM.memmove (otherPtr, other, nsID.sizeof);
boolean result = XPCOM.nsID_Equals (ptr, otherPtr) != 0;
XPCOM.nsID_delete (ptr);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMDocument.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMDocument.java
index 36134ceebb..2ff7477231 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMDocument.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMDocument.java
@@ -43,166 +43,166 @@ public class nsIDOMDocument extends nsIDOMNode {
public static final nsID NS_IDOMDOCUMENT_10_IID =
new nsID(NS_IDOMDOCUMENT_10_IID_STR);
- public nsIDOMDocument(int /*long*/ address) {
+ public nsIDOMDocument(long /*int*/ address) {
super(address);
}
- public int GetDoctype(int /*long*/[] aDoctype) {
+ public int GetDoctype(long /*int*/[] aDoctype) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 1, getAddress(), aDoctype);
}
- public int GetImplementation(int /*long*/[] aImplementation) {
+ public int GetImplementation(long /*int*/[] aImplementation) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 2, getAddress(), aImplementation);
}
- public int GetDocumentElement(int /*long*/[] aDocumentElement) {
+ public int GetDocumentElement(long /*int*/[] aDocumentElement) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 3, getAddress(), aDocumentElement);
}
- public int CreateElement(int /*long*/ tagName, int /*long*/[] _retval) {
+ public int CreateElement(long /*int*/ tagName, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 4, getAddress(), tagName, _retval);
}
- public int CreateDocumentFragment(int /*long*/[] _retval) {
+ public int CreateDocumentFragment(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 5, getAddress(), _retval);
}
- public int CreateTextNode(int /*long*/ data, int /*long*/[] _retval) {
+ public int CreateTextNode(long /*int*/ data, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 6, getAddress(), data, _retval);
}
- public int CreateComment(int /*long*/ data, int /*long*/[] _retval) {
+ public int CreateComment(long /*int*/ data, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 7, getAddress(), data, _retval);
}
- public int CreateCDATASection(int /*long*/ data, int /*long*/[] _retval) {
+ public int CreateCDATASection(long /*int*/ data, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 8, getAddress(), data, _retval);
}
- public int CreateProcessingInstruction(int /*long*/ target, int /*long*/ data, int /*long*/[] _retval) {
+ public int CreateProcessingInstruction(long /*int*/ target, long /*int*/ data, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 9, getAddress(), target, data, _retval);
}
- public int CreateAttribute(int /*long*/ name, int /*long*/[] _retval) {
+ public int CreateAttribute(long /*int*/ name, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 10, getAddress(), name, _retval);
}
- public int CreateEntityReference(int /*long*/ name, int /*long*/[] _retval) {
+ public int CreateEntityReference(long /*int*/ name, long /*int*/[] _retval) {
if (IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 11, getAddress(), name, _retval);
}
- public int GetElementsByTagName(int /*long*/ tagname, int /*long*/[] _retval) {
+ public int GetElementsByTagName(long /*int*/ tagname, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 12), getAddress(), tagname, _retval);
}
- public int ImportNode(int /*long*/ importedNode, int deep, int /*long*/[] _retval) {
+ public int ImportNode(long /*int*/ importedNode, int deep, long /*int*/[] _retval) {
if (IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 13, getAddress(), importedNode, deep, _retval);
}
- public int ImportNode(int /*long*/ importedNode, int deep, int _argc, int /*long*/[] _retval) {
+ public int ImportNode(long /*int*/ importedNode, int deep, int _argc, long /*int*/[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 12, getAddress(), importedNode, deep, _argc, _retval);
}
- public int CreateElementNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/[] _retval) {
+ public int CreateElementNS(long /*int*/ namespaceURI, long /*int*/ qualifiedName, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 14), getAddress(), namespaceURI, qualifiedName, _retval);
}
- public int CreateAttributeNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/[] _retval) {
+ public int CreateAttributeNS(long /*int*/ namespaceURI, long /*int*/ qualifiedName, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 15), getAddress(), namespaceURI, qualifiedName, _retval);
}
- public int GetElementsByTagNameNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
+ public int GetElementsByTagNameNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 16), getAddress(), namespaceURI, localName, _retval);
}
- public int GetElementById(int /*long*/ elementId, int /*long*/[] _retval) {
+ public int GetElementById(long /*int*/ elementId, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 17), getAddress(), elementId, _retval);
}
- public int GetInputEncoding(int /*long*/ aInputEncoding) {
+ public int GetInputEncoding(long /*int*/ aInputEncoding) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 17, getAddress(), aInputEncoding);
}
- public int GetDocumentURI(int /*long*/ aDocumentURI) {
+ public int GetDocumentURI(long /*int*/ aDocumentURI) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 18, getAddress(), aDocumentURI);
}
- public int AdoptNode(int /*long*/ source, int /*long*/[] _retval) {
+ public int AdoptNode(long /*int*/ source, long /*int*/[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 19, getAddress(), source, _retval);
}
- public int CreateRange(int /*long*/[] _retval) {
+ public int CreateRange(long /*int*/[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 20, getAddress(), _retval);
}
- public int CreateNodeIterator(int /*long*/ root, int whatToShow, int /*long*/ filter, int entityReferenceExpansion, int /*long*/[] _retval) {
+ public int CreateNodeIterator(long /*int*/ root, int whatToShow, long /*int*/ filter, int entityReferenceExpansion, long /*int*/[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 21, getAddress(), root, whatToShow, filter, entityReferenceExpansion, _retval);
}
- public int CreateTreeWalker(int /*long*/ root, int whatToShow, int /*long*/ filter, int entityReferenceExpansion, int /*long*/[] _retval) {
+ public int CreateTreeWalker(long /*int*/ root, int whatToShow, long /*int*/ filter, int entityReferenceExpansion, long /*int*/[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 22, getAddress(), root, whatToShow, filter, entityReferenceExpansion, _retval);
}
- public int CreateEvent(int /*long*/ eventType, int /*long*/[] _retval) {
+ public int CreateEvent(long /*int*/ eventType, long /*int*/[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 23, getAddress(), eventType, _retval);
}
- public int GetDefaultView(int /*long*/[] aDefaultView) {
+ public int GetDefaultView(long /*int*/[] aDefaultView) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 24, getAddress(), aDefaultView);
}
- public int GetCharacterSet(int /*long*/ aCharacterSet) {
+ public int GetCharacterSet(long /*int*/ aCharacterSet) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 25, getAddress(), aCharacterSet);
}
- public int GetDir(int /*long*/ aDir) {
+ public int GetDir(long /*int*/ aDir) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 26, getAddress(), aDir);
}
- public int SetDir(int /*long*/ aDir) {
+ public int SetDir(long /*int*/ aDir) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 27, getAddress(), aDir);
}
- public int GetLocation(int /*long*/[] aLocation) {
+ public int GetLocation(long /*int*/[] aLocation) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 28, getAddress(), aLocation);
}
- public int GetTitle(int /*long*/ aTitle) {
+ public int GetTitle(long /*int*/ aTitle) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 29, getAddress(), aTitle);
}
- public int SetTitle(int /*long*/ aTitle) {
+ public int SetTitle(long /*int*/ aTitle) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 30, getAddress(), aTitle);
}
- public int GetReadyState(int /*long*/ aReadyState) {
+ public int GetReadyState(long /*int*/ aReadyState) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 31, getAddress(), aReadyState);
}
- public int GetLastModified(int /*long*/ aLastModified) {
+ public int GetLastModified(long /*int*/ aLastModified) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 32, getAddress(), aLastModified);
}
- public int GetReferrer(int /*long*/ aReferrer) {
+ public int GetReferrer(long /*int*/ aReferrer) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 33, getAddress(), aReferrer);
}
@@ -212,57 +212,57 @@ public class nsIDOMDocument extends nsIDOMNode {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 34, getAddress(), _retval);
}
- public int GetActiveElement(int /*long*/[] aActiveElement) {
+ public int GetActiveElement(long /*int*/[] aActiveElement) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 35, getAddress(), aActiveElement);
}
- public int GetElementsByClassName(int /*long*/ classes, int /*long*/[] _retval) {
+ public int GetElementsByClassName(long /*int*/ classes, long /*int*/[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 36, getAddress(), classes, _retval);
}
- public int GetStyleSheets(int /*long*/[] aStyleSheets) {
+ public int GetStyleSheets(long /*int*/[] aStyleSheets) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 37, getAddress(), aStyleSheets);
}
- public int GetPreferredStyleSheetSet(int /*long*/ aPreferredStyleSheetSet) {
+ public int GetPreferredStyleSheetSet(long /*int*/ aPreferredStyleSheetSet) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 38, getAddress(), aPreferredStyleSheetSet);
}
- public int GetSelectedStyleSheetSet(int /*long*/ aSelectedStyleSheetSet) {
+ public int GetSelectedStyleSheetSet(long /*int*/ aSelectedStyleSheetSet) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 39, getAddress(), aSelectedStyleSheetSet);
}
- public int SetSelectedStyleSheetSet(int /*long*/ aSelectedStyleSheetSet) {
+ public int SetSelectedStyleSheetSet(long /*int*/ aSelectedStyleSheetSet) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 40, getAddress(), aSelectedStyleSheetSet);
}
- public int GetLastStyleSheetSet(int /*long*/ aLastStyleSheetSet) {
+ public int GetLastStyleSheetSet(long /*int*/ aLastStyleSheetSet) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 41, getAddress(), aLastStyleSheetSet);
}
- public int GetStyleSheetSets(int /*long*/[] aStyleSheetSets) {
+ public int GetStyleSheetSets(long /*int*/[] aStyleSheetSets) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 42, getAddress(), aStyleSheetSets);
}
- public int EnableStyleSheetsForSet(int /*long*/ name) {
+ public int EnableStyleSheetsForSet(long /*int*/ name) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 43, getAddress(), name);
}
- public int ElementFromPoint(float x, float y, int /*long*/[] _retval) {
+ public int ElementFromPoint(float x, float y, long /*int*/[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 44, getAddress(), x, y, _retval);
}
- public int GetContentType(int /*long*/ aContentType) {
+ public int GetContentType(long /*int*/ aContentType) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 45, getAddress(), aContentType);
}
@@ -272,7 +272,7 @@ public class nsIDOMDocument extends nsIDOMNode {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 46, getAddress(), aMozSyntheticDocument);
}
- public int GetCurrentScript(int /*long*/[] aCurrentScript) {
+ public int GetCurrentScript(long /*int*/[] aCurrentScript) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 47, getAddress(), aCurrentScript);
}
@@ -282,12 +282,12 @@ public class nsIDOMDocument extends nsIDOMNode {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 48, getAddress());
}
- public int MozSetImageElement(int /*long*/ aImageElementId, int /*long*/ aImageElement) {
+ public int MozSetImageElement(long /*int*/ aImageElementId, long /*int*/ aImageElement) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 49, getAddress(), aImageElementId, aImageElement);
}
- public int GetMozFullScreenElement(int /*long*/[] aMozFullScreenElement) {
+ public int GetMozFullScreenElement(long /*int*/[] aMozFullScreenElement) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 50, getAddress(), aMozFullScreenElement);
}
@@ -307,32 +307,32 @@ public class nsIDOMDocument extends nsIDOMNode {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 53, getAddress(), aMozFullScreenEnabled);
}
- public int GetOnreadystatechange(int /*long*/ cx, int /*long*/ aOnreadystatechange) {
+ public int GetOnreadystatechange(long /*int*/ cx, long /*int*/ aOnreadystatechange) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 54, getAddress(), cx, aOnreadystatechange);
}
- public int SetOnreadystatechange(int /*long*/ cx, int /*long*/ aOnreadystatechange) {
+ public int SetOnreadystatechange(long /*int*/ cx, long /*int*/ aOnreadystatechange) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 55, getAddress(), cx, aOnreadystatechange);
}
- public int GetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+ public int GetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 56, getAddress(), cx, aOnmouseenter);
}
- public int SetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+ public int SetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 57, getAddress(), cx, aOnmouseenter);
}
- public int GetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+ public int GetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 58, getAddress(), cx, aOnmouseleave);
}
- public int SetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+ public int SetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 59, getAddress(), cx, aOnmouseleave);
}
@@ -342,7 +342,7 @@ public class nsIDOMDocument extends nsIDOMNode {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 60, getAddress(), aMozHidden);
}
- public int GetMozVisibilityState(int /*long*/ aMozVisibilityState) {
+ public int GetMozVisibilityState(long /*int*/ aMozVisibilityState) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 61, getAddress(), aMozVisibilityState);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMElement.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMElement.java
index caaee0b887..0d30cbd4fb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMElement.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMElement.java
@@ -43,90 +43,90 @@ public class nsIDOMElement extends nsIDOMNode {
public static final nsID NS_IDOMELEMENT_10_IID =
new nsID(NS_IDOMELEMENT_10_IID_STR);
- public nsIDOMElement(int /*long*/ address) {
+ public nsIDOMElement(long /*int*/ address) {
super(address);
}
- public int GetTagName(int /*long*/ aTagName) {
+ public int GetTagName(long /*int*/ aTagName) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 1, getAddress(), aTagName);
}
- public int GetAttribute(int /*long*/ name, int /*long*/ _retval) {
+ public int GetAttribute(long /*int*/ name, long /*int*/ _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 2, getAddress(), name, _retval);
}
- public int SetAttribute(int /*long*/ name, int /*long*/ value) {
+ public int SetAttribute(long /*int*/ name, long /*int*/ value) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 3, getAddress(), name, value);
}
- public int RemoveAttribute(int /*long*/ name) {
+ public int RemoveAttribute(long /*int*/ name) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 4, getAddress(), name);
}
- public int GetAttributeNode(int /*long*/ name, int /*long*/[] _retval) {
+ public int GetAttributeNode(long /*int*/ name, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 5, getAddress(), name, _retval);
}
- public int SetAttributeNode(int /*long*/ newAttr, int /*long*/[] _retval) {
+ public int SetAttributeNode(long /*int*/ newAttr, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 6, getAddress(), newAttr, _retval);
}
- public int RemoveAttributeNode(int /*long*/ oldAttr, int /*long*/[] _retval) {
+ public int RemoveAttributeNode(long /*int*/ oldAttr, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 7, getAddress(), oldAttr, _retval);
}
- public int GetElementsByTagName(int /*long*/ name, int /*long*/[] _retval) {
+ public int GetElementsByTagName(long /*int*/ name, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 8, getAddress(), name, _retval);
}
- public int GetAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/ _retval) {
+ public int GetAttributeNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/ _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 9, getAddress(), namespaceURI, localName, _retval);
}
- public int SetAttributeNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/ value) {
+ public int SetAttributeNS(long /*int*/ namespaceURI, long /*int*/ qualifiedName, long /*int*/ value) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 10, getAddress(), namespaceURI, qualifiedName, value);
}
- public int RemoveAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName) {
+ public int RemoveAttributeNS(long /*int*/ namespaceURI, long /*int*/ localName) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 11, getAddress(), namespaceURI, localName);
}
- public int GetAttributeNodeNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
+ public int GetAttributeNodeNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 12, getAddress(), namespaceURI, localName, _retval);
}
- public int SetAttributeNodeNS(int /*long*/ newAttr, int /*long*/[] _retval) {
+ public int SetAttributeNodeNS(long /*int*/ newAttr, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 13, getAddress(), newAttr, _retval);
}
- public int GetElementsByTagNameNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {
+ public int GetElementsByTagNameNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 14, getAddress(), namespaceURI, localName, _retval);
}
- public int HasAttribute(int /*long*/ name, int[] _retval) {
+ public int HasAttribute(long /*int*/ name, int[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 15, getAddress(), name, _retval);
}
- public int HasAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName, int[] _retval) {
+ public int HasAttributeNS(long /*int*/ namespaceURI, long /*int*/ localName, int[] _retval) {
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 16, getAddress(), namespaceURI, localName, _retval);
}
- public int GetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+ public int GetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 17, getAddress(), cx, aOnmouseenter);
}
- public int SetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+ public int SetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 18, getAddress(), cx, aOnmouseenter);
}
- public int GetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+ public int GetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 19, getAddress(), cx, aOnmouseleave);
}
- public int SetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+ public int SetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 20, getAddress(), cx, aOnmouseleave);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
index c38dc7ff5c..a031d616b4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
@@ -43,7 +43,7 @@ public class nsIDOMEvent extends nsISupports {
public static final nsID NS_IDOMEVENT_10_IID =
new nsID(NS_IDOMEVENT_10_IID_STR);
- public nsIDOMEvent(int /*long*/ address) {
+ public nsIDOMEvent(long /*int*/ address) {
super(address);
}
@@ -51,15 +51,15 @@ public class nsIDOMEvent extends nsISupports {
public static final int AT_TARGET = 2;
public static final int BUBBLING_PHASE = 3;
- public int GetType(int /*long*/ aType) {
+ public int GetType(long /*int*/ aType) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType);
}
- public int GetTarget(int /*long*/[] aTarget) {
+ public int GetTarget(long /*int*/[] aTarget) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aTarget);
}
- public int GetCurrentTarget(int /*long*/[] aCurrentTarget) {
+ public int GetCurrentTarget(long /*int*/[] aCurrentTarget) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCurrentTarget);
}
@@ -75,7 +75,7 @@ public class nsIDOMEvent extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCancelable);
}
- public int GetTimeStamp(int /*long*/ aTimeStamp) {
+ public int GetTimeStamp(long /*int*/ aTimeStamp) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTimeStamp);
}
@@ -87,7 +87,7 @@ public class nsIDOMEvent extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress());
}
- public int InitEvent(int /*long*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
+ public int InitEvent(long /*int*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
index 46543bc3f0..891bfe9e75 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
@@ -43,25 +43,25 @@ public class nsIDOMEventTarget extends nsISupports {
public static final nsID NS_IDOMEVENTTARGET_10_IID =
new nsID(NS_IDOMEVENTTARGET_10_IID_STR);
- public nsIDOMEventTarget(int /*long*/ address) {
+ public nsIDOMEventTarget(long /*int*/ address) {
super(address);
}
- public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
+ public int AddEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) {
if (IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture);
}
- public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture, int wantsUntrusted, int _argc) {
+ public int AddEventListener(long /*int*/ type, long /*int*/ listener, int useCapture, int wantsUntrusted, int _argc) {
if (!IsXULRunner10) return AddEventListener(type, listener, useCapture);
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture, wantsUntrusted, _argc);
}
- public int RemoveEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
+ public int RemoveEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), type, listener, useCapture);
}
- public int DispatchEvent(int /*long*/ evt, int[] _retval) {
+ public int DispatchEvent(long /*int*/ evt, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), evt, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
index 5af974480e..dd1cbb4469 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
@@ -43,7 +43,7 @@ public class nsIDOMKeyEvent extends nsIDOMUIEvent {
public static final nsID NS_IDOMKEYEVENT_10_IID =
new nsID(NS_IDOMKEYEVENT_10_IID_STR);
- public nsIDOMKeyEvent(int /*long*/ address) {
+ public nsIDOMKeyEvent(long /*int*/ address) {
super(address);
}
@@ -204,7 +204,7 @@ public class nsIDOMKeyEvent extends nsIDOMUIEvent {
return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aMetaKey);
}
- public int InitKeyEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {
+ public int InitKeyEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {
return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, keyCodeArg, charCodeArg);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
index e6f100c49d..e4e99ee43b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
@@ -43,7 +43,7 @@ public class nsIDOMMouseEvent extends nsIDOMUIEvent {
public static final nsID NS_IDOMMOUSEEVENT_10_IID =
new nsID(NS_IDOMMOUSEEVENT_10_IID_STR);
- public nsIDOMMouseEvent(int /*long*/ address) {
+ public nsIDOMMouseEvent(long /*int*/ address) {
super(address);
}
@@ -83,11 +83,11 @@ public class nsIDOMMouseEvent extends nsIDOMUIEvent {
return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 9, getAddress(), aButton);
}
- public int GetRelatedTarget(int /*long*/[] aRelatedTarget) {
+ public int GetRelatedTarget(long /*int*/[] aRelatedTarget) {
return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 10, getAddress(), aRelatedTarget);
}
- public int InitMouseEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, int /*long*/ relatedTargetArg) {
+ public int InitMouseEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, long /*int*/ relatedTargetArg) {
return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 11, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg);
}
@@ -110,7 +110,7 @@ public class nsIDOMMouseEvent extends nsIDOMUIEvent {
return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 13, getAddress(), aMozInputSource);
}
- public int InitNSMouseEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, int /*long*/ relatedTargetArg, float pressure, short inputSourceArg) {
+ public int InitNSMouseEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, long /*int*/ relatedTargetArg, float pressure, short inputSourceArg) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 14, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg, pressure, inputSourceArg);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMNode.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMNode.java
index 9ce83a5a0a..2437ff288b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMNode.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMNode.java
@@ -43,7 +43,7 @@ public class nsIDOMNode extends nsISupports {
public static final nsID NS_IDOMNODE_10_IID =
new nsID(NS_IDOMNODE_10_IID_STR);
- public nsIDOMNode(int /*long*/ address) {
+ public nsIDOMNode(long /*int*/ address) {
super(address);
}
@@ -60,15 +60,15 @@ public class nsIDOMNode extends nsISupports {
public static final int DOCUMENT_FRAGMENT_NODE = 11;
public static final int NOTATION_NODE = 12;
- public int GetNodeName(int /*long*/ aNodeName) {
+ public int GetNodeName(long /*int*/ aNodeName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNodeName);
}
- public int GetNodeValue(int /*long*/ aNodeValue) {
+ public int GetNodeValue(long /*int*/ aNodeValue) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aNodeValue);
}
- public int SetNodeValue(int /*long*/ aNodeValue) {
+ public int SetNodeValue(long /*int*/ aNodeValue) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aNodeValue);
}
@@ -76,56 +76,56 @@ public class nsIDOMNode extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNodeType);
}
- public int GetParentNode(int /*long*/[] aParentNode) {
+ public int GetParentNode(long /*int*/[] aParentNode) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParentNode);
}
- public int GetParentElement(int /*long*/[] aParentElement) {
+ public int GetParentElement(long /*int*/[] aParentElement) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParentElement);
}
- public int GetChildNodes(int /*long*/[] aChildNodes) {
+ public int GetChildNodes(long /*int*/[] aChildNodes) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 7 : 6), getAddress(), aChildNodes);
}
- public int GetFirstChild(int /*long*/[] aFirstChild) {
+ public int GetFirstChild(long /*int*/[] aFirstChild) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 8 : 7), getAddress(), aFirstChild);
}
- public int GetLastChild(int /*long*/[] aLastChild) {
+ public int GetLastChild(long /*int*/[] aLastChild) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 9 : 8), getAddress(), aLastChild);
}
- public int GetPreviousSibling(int /*long*/[] aPreviousSibling) {
+ public int GetPreviousSibling(long /*int*/[] aPreviousSibling) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 10 : 9), getAddress(), aPreviousSibling);
}
- public int GetNextSibling(int /*long*/[] aNextSibling) {
+ public int GetNextSibling(long /*int*/[] aNextSibling) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 10), getAddress(), aNextSibling);
}
- public int GetAttributes(int /*long*/[] aAttributes) {
+ public int GetAttributes(long /*int*/[] aAttributes) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 12 : 11), getAddress(), aAttributes);
}
- public int GetOwnerDocument(int /*long*/[] aOwnerDocument) {
+ public int GetOwnerDocument(long /*int*/[] aOwnerDocument) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 12), getAddress(), aOwnerDocument);
}
- public int InsertBefore(int /*long*/ newChild, int /*long*/ refChild, int /*long*/[] _retval) {
+ public int InsertBefore(long /*int*/ newChild, long /*int*/ refChild, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 13), getAddress(), newChild, refChild, _retval);
}
- public int ReplaceChild(int /*long*/ newChild, int /*long*/ oldChild, int /*long*/[] _retval) {
+ public int ReplaceChild(long /*int*/ newChild, long /*int*/ oldChild, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 14), getAddress(), newChild, oldChild, _retval);
}
- public int RemoveChild(int /*long*/ oldChild, int /*long*/[] _retval) {
+ public int RemoveChild(long /*int*/ oldChild, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 15), getAddress(), oldChild, _retval);
}
- public int AppendChild(int /*long*/ newChild, int /*long*/[] _retval) {
+ public int AppendChild(long /*int*/ newChild, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 16), getAddress(), newChild, _retval);
}
@@ -133,7 +133,7 @@ public class nsIDOMNode extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 18 : 17), getAddress(), _retval);
}
- public int CloneNode(int deep, int /*long*/[] _retval) {
+ public int CloneNode(int deep, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 18), getAddress(), deep, _retval);
}
@@ -141,24 +141,24 @@ public class nsIDOMNode extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 19), getAddress());
}
- public int IsSupported(int /*long*/ feature, int /*long*/ version, int[] _retval) {
+ public int IsSupported(long /*int*/ feature, long /*int*/ version, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 20), getAddress(), feature, version, _retval);
}
- public int GetNamespaceURI(int /*long*/ aNamespaceURI) {
+ public int GetNamespaceURI(long /*int*/ aNamespaceURI) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 21), getAddress(), aNamespaceURI);
}
- public int GetPrefix(int /*long*/ aPrefix) {
+ public int GetPrefix(long /*int*/ aPrefix) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 23 : 22), getAddress(), aPrefix);
}
- public int SetPrefix(int /*long*/ aPrefix) {
+ public int SetPrefix(long /*int*/ aPrefix) {
if (IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aPrefix);
}
- public int GetLocalName(int /*long*/ aLocalName) {
+ public int GetLocalName(long /*int*/ aLocalName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aLocalName);
}
@@ -166,7 +166,7 @@ public class nsIDOMNode extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), _retval);
}
- public int GetDOMBaseURI(int /*long*/ aBaseURI) {
+ public int GetDOMBaseURI(long /*int*/ aBaseURI) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aBaseURI);
}
@@ -179,52 +179,52 @@ public class nsIDOMNode extends nsISupports {
public static final int DOCUMENT_POSITION_CONTAINED_BY = 16;
public static final int DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 32;
- public int CompareDocumentPosition(int /*long*/ other, short[] _retval) {
+ public int CompareDocumentPosition(long /*int*/ other, short[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval);
}
- public int GetTextContent(int /*long*/ aTextContent) {
+ public int GetTextContent(long /*int*/ aTextContent) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aTextContent);
}
- public int SetTextContent(int /*long*/ aTextContent) {
+ public int SetTextContent(long /*int*/ aTextContent) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aTextContent);
}
- public int LookupPrefix(int /*long*/ namespaceURI, int /*long*/ _retval) {
+ public int LookupPrefix(long /*int*/ namespaceURI, long /*int*/ _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), namespaceURI, _retval);
}
- public int IsDefaultNamespace(int /*long*/ namespaceURI, int[] _retval) {
+ public int IsDefaultNamespace(long /*int*/ namespaceURI, int[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), namespaceURI, _retval);
}
- public int LookupNamespaceURI(int /*long*/ prefix, int /*long*/ _retval) {
+ public int LookupNamespaceURI(long /*int*/ prefix, long /*int*/ _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), prefix, _retval);
}
- public int IsEqualNode(int /*long*/ arg, int[] _retval) {
+ public int IsEqualNode(long /*int*/ arg, int[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), arg, _retval);
}
- public int SetUserData(int /*long*/ key, int /*long*/ data, int /*long*/ handler, int /*long*/[] _retval) {
+ public int SetUserData(long /*int*/ key, long /*int*/ data, long /*int*/ handler, long /*int*/[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), key, data, handler, _retval);
}
- public int GetUserData(int /*long*/ key, int /*long*/[] _retval) {
+ public int GetUserData(long /*int*/ key, long /*int*/[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), key, _retval);
}
- public int Contains(int /*long*/ aOther, int[] _retval) {
+ public int Contains(long /*int*/ aOther, int[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aOther, _retval);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java
index a44ec1ff2b..6648049493 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java
@@ -37,15 +37,15 @@ public class nsIDOMSerializer extends nsISupports {
public static final nsID NS_IDOMSERIALIZER_IID =
new nsID(NS_IDOMSERIALIZER_IID_STR);
- public nsIDOMSerializer(int /*long*/ address) {
+ public nsIDOMSerializer(long /*int*/ address) {
super(address);
}
- public int SerializeToString(int /*long*/ root, int /*long*/[] _retval) {
+ public int SerializeToString(long /*int*/ root, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), root, _retval);
}
- public int SerializeToStream(int /*long*/ root, int /*long*/ stream, byte[] charset) {
+ public int SerializeToStream(long /*int*/ root, long /*int*/ stream, byte[] charset) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java
index 3a8ec8bb6c..39b41ed774 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java
@@ -37,15 +37,15 @@ public class nsIDOMSerializer_1_7 extends nsISupports {
public static final nsID NS_IDOMSERIALIZER_IID =
new nsID(NS_IDOMSERIALIZER_IID_STR);
- public nsIDOMSerializer_1_7(int /*long*/ address) {
+ public nsIDOMSerializer_1_7(long /*int*/ address) {
super(address);
}
- public int SerializeToString(int /*long*/ root, int /*long*/ _retval) {
+ public int SerializeToString(long /*int*/ root, long /*int*/ _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), root, _retval);
}
- public int SerializeToStream(int /*long*/ root, int /*long*/ stream, int /*long*/ charset) {
+ public int SerializeToStream(long /*int*/ root, long /*int*/ stream, long /*int*/ charset) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
index e8b4ca57af..2dbb51a6b4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
@@ -43,11 +43,11 @@ public class nsIDOMUIEvent extends nsIDOMEvent {
public static final nsID NS_IDOMUIEVENT_10_IID =
new nsID(NS_IDOMUIEVENT_10_IID_STR);
- public nsIDOMUIEvent(int /*long*/ address) {
+ public nsIDOMUIEvent(long /*int*/ address) {
super(address);
}
- public int GetView(int /*long*/[] aView) {
+ public int GetView(long /*int*/[] aView) {
return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 1, getAddress(), aView);
}
@@ -55,7 +55,7 @@ public class nsIDOMUIEvent extends nsIDOMEvent {
return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 2, getAddress(), aDetail);
}
- public int InitUIEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg) {
+ public int InitUIEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg) {
return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 3, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg);
}
@@ -88,7 +88,7 @@ public class nsIDOMUIEvent extends nsIDOMEvent {
return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 8, getAddress(), aWhich);
}
- public int GetRangeParent(int /*long*/[] aRangeParent) {
+ public int GetRangeParent(long /*int*/[] aRangeParent) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 9, getAddress(), aRangeParent);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
index 6dd6bf6756..e2d80f628f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
@@ -43,69 +43,69 @@ public class nsIDOMWindow extends nsISupports {
public static final nsID NS_IDOMWINDOW_10_IID =
new nsID(NS_IDOMWINDOW_10_IID_STR);
- public nsIDOMWindow(int /*long*/ address) {
+ public nsIDOMWindow(long /*int*/ address) {
super(address);
}
- public int GetWindow(int /*long*/[] aWindow) {
+ public int GetWindow(long /*int*/[] aWindow) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aWindow);
}
- public int GetSelf(int /*long*/[] aSelf) {
+ public int GetSelf(long /*int*/[] aSelf) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSelf);
}
- public int GetDocument(int /*long*/[] aDocument) {
+ public int GetDocument(long /*int*/[] aDocument) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 3 : 1), getAddress(), aDocument);
}
- public int GetParent(int /*long*/[] aParent) {
+ public int GetParent(long /*int*/[] aParent) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 24 : 2), getAddress(), aParent);
}
- public int GetTop(int /*long*/[] aTop) {
+ public int GetTop(long /*int*/[] aTop) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 3), getAddress(), aTop);
}
- public int GetScrollbars(int /*long*/[] aScrollbars) {
+ public int GetScrollbars(long /*int*/[] aScrollbars) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 4), getAddress(), aScrollbars);
}
- public int GetFrames(int /*long*/[] aFrames) {
+ public int GetFrames(long /*int*/[] aFrames) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 62 : 5), getAddress(), aFrames);
}
- public int GetName(int /*long*/ aName) {
+ public int GetName(long /*int*/ aName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 4 : 6), getAddress(), aName);
}
- public int SetName(int /*long*/ aName) {
+ public int SetName(long /*int*/ aName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 5 : 7), getAddress(), aName);
}
- public int GetLocation(int /*long*/[] aLocation) {
+ public int GetLocation(long /*int*/[] aLocation) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLocation);
}
- public int GetHistory(int /*long*/[] aHistory) {
+ public int GetHistory(long /*int*/[] aHistory) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aHistory);
}
- public int GetLocationbar(int /*long*/[] aLocationbar) {
+ public int GetLocationbar(long /*int*/[] aLocationbar) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLocationbar);
}
- public int GetMenubar(int /*long*/[] aMenubar) {
+ public int GetMenubar(long /*int*/[] aMenubar) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aMenubar);
}
- public int GetPersonalbar(int /*long*/[] aPersonalbar) {
+ public int GetPersonalbar(long /*int*/[] aPersonalbar) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPersonalbar);
}
@@ -134,7 +134,7 @@ public class nsIDOMWindow extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 51 : 13), getAddress(), xScrollDif, yScrollDif);
}
- public int GetSelection(int /*long*/[] _retval) {
+ public int GetSelection(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 38 : 14), getAddress(), _retval);
}
@@ -151,22 +151,22 @@ public class nsIDOMWindow extends nsISupports {
}
- public int GetStatusbar(int /*long*/[] aStatusbar) {
+ public int GetStatusbar(long /*int*/[] aStatusbar) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aStatusbar);
}
- public int GetToolbar(int /*long*/[] aToolbar) {
+ public int GetToolbar(long /*int*/[] aToolbar) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aToolbar);
}
- public int GetStatus(int /*long*/ aStatus) {
+ public int GetStatus(long /*int*/ aStatus) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aStatus);
}
- public int SetStatus(int /*long*/ aStatus) {
+ public int SetStatus(long /*int*/ aStatus) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aStatus);
}
@@ -196,42 +196,42 @@ public class nsIDOMWindow extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aLength);
}
- public int GetOpener(int /*long*/[] aOpener) {
+ public int GetOpener(long /*int*/[] aOpener) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aOpener);
}
- public int SetOpener(int /*long*/ aOpener) {
+ public int SetOpener(long /*int*/ aOpener) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aOpener);
}
- public int GetFrameElement(int /*long*/[] aFrameElement) {
+ public int GetFrameElement(long /*int*/[] aFrameElement) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aFrameElement);
}
- public int GetNavigator(int /*long*/[] aNavigator) {
+ public int GetNavigator(long /*int*/[] aNavigator) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aNavigator);
}
- public int GetApplicationCache(int /*long*/[] aApplicationCache) {
+ public int GetApplicationCache(long /*int*/[] aApplicationCache) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aApplicationCache);
}
- public int Alert(int /*long*/ text) {
+ public int Alert(long /*int*/ text) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), text);
}
- public int Confirm(int /*long*/ text, int[] _retval) {
+ public int Confirm(long /*int*/ text, int[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), text, _retval);
}
- public int Prompt(int /*long*/ aMessage, int /*long*/ aInitial, int /*long*/ _retval) {
+ public int Prompt(long /*int*/ aMessage, long /*int*/ aInitial, long /*int*/ _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aMessage, aInitial, _retval);
}
@@ -241,42 +241,42 @@ public class nsIDOMWindow extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress());
}
- public int ShowModalDialog(int /*long*/ aURI, int /*long*/ aArgs, int /*long*/ aOptions, int /*long*/[] _retval) {
+ public int ShowModalDialog(long /*int*/ aURI, long /*int*/ aArgs, long /*int*/ aOptions, long /*int*/[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aURI, aArgs, aOptions, _retval);
}
- public int PostMessageMoz(int /*long*/ message, int /*long*/ targetOrigin, int /*long*/ cx) {
+ public int PostMessageMoz(long /*int*/ message, long /*int*/ targetOrigin, long /*int*/ cx) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), message, targetOrigin, cx);
}
- public int Atob(int /*long*/ aAsciiString, int /*long*/ _retval) {
+ public int Atob(long /*int*/ aAsciiString, long /*int*/ _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), aAsciiString, _retval);
}
- public int Btoa(int /*long*/ aBase64Data, int /*long*/ _retval) {
+ public int Btoa(long /*int*/ aBase64Data, long /*int*/ _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), aBase64Data, _retval);
}
- public int GetSessionStorage(int /*long*/[] aSessionStorage) {
+ public int GetSessionStorage(long /*int*/[] aSessionStorage) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aSessionStorage);
}
- public int GetLocalStorage(int /*long*/[] aLocalStorage) {
+ public int GetLocalStorage(long /*int*/[] aLocalStorage) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), aLocalStorage);
}
- public int MatchMedia(int /*long*/ media_query_list, int /*long*/[] _retval) {
+ public int MatchMedia(long /*int*/ media_query_list, long /*int*/[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), media_query_list, _retval);
}
- public int GetScreen(int /*long*/[] aScreen) {
+ public int GetScreen(long /*int*/[] aScreen) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), aScreen);
}
@@ -356,22 +356,22 @@ public class nsIDOMWindow extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 59, getAddress(), aOuterHeight);
}
- public int GetComputedStyle(int /*long*/ elt, int /*long*/ pseudoElt, int /*long*/[] _retval) {
+ public int GetComputedStyle(long /*int*/ elt, long /*int*/ pseudoElt, long /*int*/[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 60, getAddress(), elt, pseudoElt, _retval);
}
- public int GetWindowRoot(int /*long*/[] aWindowRoot) {
+ public int GetWindowRoot(long /*int*/[] aWindowRoot) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 61, getAddress(), aWindowRoot);
}
- public int GetContent(int /*long*/[] aContent) {
+ public int GetContent(long /*int*/[] aContent) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 68, getAddress(), aContent);
}
- public int GetPrompter(int /*long*/[] aPrompter) {
+ public int GetPrompter(long /*int*/[] aPrompter) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 69, getAddress(), aPrompter);
}
@@ -381,27 +381,27 @@ public class nsIDOMWindow extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 70, getAddress(), aClosed);
}
- public int GetCrypto(int /*long*/[] aCrypto) {
+ public int GetCrypto(long /*int*/[] aCrypto) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 71, getAddress(), aCrypto);
}
- public int GetPkcs11(int /*long*/[] aPkcs11) {
+ public int GetPkcs11(long /*int*/[] aPkcs11) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 72, getAddress(), aPkcs11);
}
- public int GetControllers(int /*long*/[] aControllers) {
+ public int GetControllers(long /*int*/[] aControllers) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 73, getAddress(), aControllers);
}
- public int GetDefaultStatus(int /*long*/ aDefaultStatus) {
+ public int GetDefaultStatus(long /*int*/ aDefaultStatus) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 74, getAddress(), aDefaultStatus);
}
- public int SetDefaultStatus(int /*long*/ aDefaultStatus) {
+ public int SetDefaultStatus(long /*int*/ aDefaultStatus) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 75, getAddress(), aDefaultStatus);
}
@@ -471,32 +471,32 @@ public class nsIDOMWindow extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 88, getAddress(), widthDif, heightDif);
}
- public int Open(int /*long*/ url, int /*long*/ name, int /*long*/ options, int /*long*/[] _retval) {
+ public int Open(long /*int*/ url, long /*int*/ name, long /*int*/ options, long /*int*/[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 89, getAddress(), url, name, options, _retval);
}
- public int OpenDialog(int /*long*/ url, int /*long*/ name, int /*long*/ options, int /*long*/ aExtraArgument, int /*long*/[] _retval) {
+ public int OpenDialog(long /*int*/ url, long /*int*/ name, long /*int*/ options, long /*int*/ aExtraArgument, long /*int*/[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 90, getAddress(), url, name, options, aExtraArgument, _retval);
}
- public int UpdateCommands(int /*long*/ action) {
+ public int UpdateCommands(long /*int*/ action) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 91, getAddress(), action);
}
- public int Find(int /*long*/ str, int caseSensitive, int backwards, int wrapAround, int wholeWord, int searchInFrames, int showDialog, int[] _retval) {
+ public int Find(long /*int*/ str, int caseSensitive, int backwards, int wrapAround, int wholeWord, int searchInFrames, int showDialog, int[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 92, getAddress(), str, caseSensitive, backwards, wrapAround, wholeWord, searchInFrames, showDialog, _retval);
}
- public int GetMozPaintCount(int /*long*/ aMozPaintCount) {
+ public int GetMozPaintCount(long /*int*/ aMozPaintCount) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 93, getAddress(), aMozPaintCount);
}
- public int MozRequestAnimationFrame(int /*long*/ aListener) {
+ public int MozRequestAnimationFrame(long /*int*/ aListener) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 94, getAddress(), aListener);
}
@@ -506,172 +506,172 @@ public class nsIDOMWindow extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 95, getAddress(), aMozAnimationStartTime);
}
- public int GetURL(int /*long*/[] aURL) {
+ public int GetURL(long /*int*/[] aURL) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 96, getAddress(), aURL);
}
- public int GetGlobalStorage(int /*long*/[] aGlobalStorage) {
+ public int GetGlobalStorage(long /*int*/[] aGlobalStorage) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 97, getAddress(), aGlobalStorage);
}
- public int GetOnafterprint(int /*long*/ cx, int /*long*/ aOnafterprint) {
+ public int GetOnafterprint(long /*int*/ cx, long /*int*/ aOnafterprint) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 98, getAddress(), cx, aOnafterprint);
}
- public int SetOnafterprint(int /*long*/ cx, int /*long*/ aOnafterprint) {
+ public int SetOnafterprint(long /*int*/ cx, long /*int*/ aOnafterprint) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 99, getAddress(), cx, aOnafterprint);
}
- public int GetOnbeforeprint(int /*long*/ cx, int /*long*/ aOnbeforeprint) {
+ public int GetOnbeforeprint(long /*int*/ cx, long /*int*/ aOnbeforeprint) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 100, getAddress(), cx, aOnbeforeprint);
}
- public int SetOnbeforeprint(int /*long*/ cx, int /*long*/ aOnbeforeprint) {
+ public int SetOnbeforeprint(long /*int*/ cx, long /*int*/ aOnbeforeprint) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 101, getAddress(), cx, aOnbeforeprint);
}
- public int GetOnbeforeunload(int /*long*/ cx, int /*long*/ aOnbeforeunload) {
+ public int GetOnbeforeunload(long /*int*/ cx, long /*int*/ aOnbeforeunload) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 102, getAddress(), cx, aOnbeforeunload);
}
- public int SetOnbeforeunload(int /*long*/ cx, int /*long*/ aOnbeforeunload) {
+ public int SetOnbeforeunload(long /*int*/ cx, long /*int*/ aOnbeforeunload) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 103, getAddress(), cx, aOnbeforeunload);
}
- public int GetOnhashchange(int /*long*/ cx, int /*long*/ aOnhashchange) {
+ public int GetOnhashchange(long /*int*/ cx, long /*int*/ aOnhashchange) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 104, getAddress(), cx, aOnhashchange);
}
- public int SetOnhashchange(int /*long*/ cx, int /*long*/ aOnhashchange) {
+ public int SetOnhashchange(long /*int*/ cx, long /*int*/ aOnhashchange) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 105, getAddress(), cx, aOnhashchange);
}
- public int GetOnmessage(int /*long*/ cx, int /*long*/ aOnmessage) {
+ public int GetOnmessage(long /*int*/ cx, long /*int*/ aOnmessage) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 106, getAddress(), cx, aOnmessage);
}
- public int SetOnmessage(int /*long*/ cx, int /*long*/ aOnmessage) {
+ public int SetOnmessage(long /*int*/ cx, long /*int*/ aOnmessage) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 107, getAddress(), cx, aOnmessage);
}
- public int GetOnoffline(int /*long*/ cx, int /*long*/ aOnoffline) {
+ public int GetOnoffline(long /*int*/ cx, long /*int*/ aOnoffline) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 108, getAddress(), cx, aOnoffline);
}
- public int SetOnoffline(int /*long*/ cx, int /*long*/ aOnoffline) {
+ public int SetOnoffline(long /*int*/ cx, long /*int*/ aOnoffline) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 109, getAddress(), cx, aOnoffline);
}
- public int GetOnonline(int /*long*/ cx, int /*long*/ aOnonline) {
+ public int GetOnonline(long /*int*/ cx, long /*int*/ aOnonline) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 110, getAddress(), cx, aOnonline);
}
- public int SetOnonline(int /*long*/ cx, int /*long*/ aOnonline) {
+ public int SetOnonline(long /*int*/ cx, long /*int*/ aOnonline) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 111, getAddress(), cx, aOnonline);
}
- public int GetOnpopstate(int /*long*/ cx, int /*long*/ aOnpopstate) {
+ public int GetOnpopstate(long /*int*/ cx, long /*int*/ aOnpopstate) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 112, getAddress(), cx, aOnpopstate);
}
- public int SetOnpopstate(int /*long*/ cx, int /*long*/ aOnpopstate) {
+ public int SetOnpopstate(long /*int*/ cx, long /*int*/ aOnpopstate) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 113, getAddress(), cx, aOnpopstate);
}
- public int GetOnpagehide(int /*long*/ cx, int /*long*/ aOnpagehide) {
+ public int GetOnpagehide(long /*int*/ cx, long /*int*/ aOnpagehide) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 114, getAddress(), cx, aOnpagehide);
}
- public int SetOnpagehide(int /*long*/ cx, int /*long*/ aOnpagehide) {
+ public int SetOnpagehide(long /*int*/ cx, long /*int*/ aOnpagehide) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 115, getAddress(), cx, aOnpagehide);
}
- public int GetOnpageshow(int /*long*/ cx, int /*long*/ aOnpageshow) {
+ public int GetOnpageshow(long /*int*/ cx, long /*int*/ aOnpageshow) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 116, getAddress(), cx, aOnpageshow);
}
- public int SetOnpageshow(int /*long*/ cx, int /*long*/ aOnpageshow) {
+ public int SetOnpageshow(long /*int*/ cx, long /*int*/ aOnpageshow) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 117, getAddress(), cx, aOnpageshow);
}
- public int GetOnresize(int /*long*/ cx, int /*long*/ aOnresize) {
+ public int GetOnresize(long /*int*/ cx, long /*int*/ aOnresize) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 118, getAddress(), cx, aOnresize);
}
- public int SetOnresize(int /*long*/ cx, int /*long*/ aOnresize) {
+ public int SetOnresize(long /*int*/ cx, long /*int*/ aOnresize) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 119, getAddress(), cx, aOnresize);
}
- public int GetOnunload(int /*long*/ cx, int /*long*/ aOnunload) {
+ public int GetOnunload(long /*int*/ cx, long /*int*/ aOnunload) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 120, getAddress(), cx, aOnunload);
}
- public int SetOnunload(int /*long*/ cx, int /*long*/ aOnunload) {
+ public int SetOnunload(long /*int*/ cx, long /*int*/ aOnunload) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 121, getAddress(), cx, aOnunload);
}
- public int GetOndevicemotion(int /*long*/ cx, int /*long*/ aOndevicemotion) {
+ public int GetOndevicemotion(long /*int*/ cx, long /*int*/ aOndevicemotion) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 122, getAddress(), cx, aOndevicemotion);
}
- public int SetOndevicemotion(int /*long*/ cx, int /*long*/ aOndevicemotion) {
+ public int SetOndevicemotion(long /*int*/ cx, long /*int*/ aOndevicemotion) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 123, getAddress(), cx, aOndevicemotion);
}
- public int GetOndeviceorientation(int /*long*/ cx, int /*long*/ aOndeviceorientation) {
+ public int GetOndeviceorientation(long /*int*/ cx, long /*int*/ aOndeviceorientation) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 124, getAddress(), cx, aOndeviceorientation);
}
- public int SetOndeviceorientation(int /*long*/ cx, int /*long*/ aOndeviceorientation) {
+ public int SetOndeviceorientation(long /*int*/ cx, long /*int*/ aOndeviceorientation) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 125, getAddress(), cx, aOndeviceorientation);
}
- public int GetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+ public int GetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 126, getAddress(), cx, aOnmouseenter);
}
- public int SetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+ public int SetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 127, getAddress(), cx, aOnmouseenter);
}
- public int GetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+ public int GetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 128, getAddress(), cx, aOnmouseleave);
}
- public int SetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+ public int SetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 129, getAddress(), cx, aOnmouseleave);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
index 663688ad78..e2500930b5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
@@ -37,7 +37,7 @@ public class nsIDOMWindowCollection extends nsISupports {
public static final nsID NS_IDOMWINDOWCOLLECTION_IID =
new nsID(NS_IDOMWINDOWCOLLECTION_IID_STR);
- public nsIDOMWindowCollection(int /*long*/ address) {
+ public nsIDOMWindowCollection(long /*int*/ address) {
super(address);
}
@@ -45,11 +45,11 @@ public class nsIDOMWindowCollection extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLength);
}
- public int Item(int index, int /*long*/[] _retval) {
+ public int Item(int index, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), index, _retval);
}
- public int NamedItem(int /*long*/ name, int /*long*/[] _retval) {
+ public int NamedItem(long /*int*/ name, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), name, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDataType.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDataType.java
index 1b60b12b78..518878a201 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDataType.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDataType.java
@@ -37,7 +37,7 @@ public class nsIDataType extends nsISupports {
public static final nsID NS_IDATATYPE_IID =
new nsID(NS_IDATATYPE_IID_STR);
- public nsIDataType(int /*long*/ address) {
+ public nsIDataType(long /*int*/ address) {
super(address);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
index 58aef5f984..9b0719748b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
@@ -37,7 +37,7 @@ public class nsIDirectoryService extends nsISupports {
public static final nsID NS_IDIRECTORYSERVICE_IID =
new nsID(NS_IDIRECTORYSERVICE_IID_STR);
- public nsIDirectoryService(int /*long*/ address) {
+ public nsIDirectoryService(long /*int*/ address) {
super(address);
}
@@ -45,11 +45,11 @@ public class nsIDirectoryService extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
}
- public int RegisterProvider(int /*long*/ prov) {
+ public int RegisterProvider(long /*int*/ prov) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prov);
}
- public int UnregisterProvider(int /*long*/ prov) {
+ public int UnregisterProvider(long /*int*/ prov) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prov);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
index 8998396675..435d97d05c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
@@ -37,11 +37,11 @@ public class nsIDirectoryServiceProvider extends nsISupports {
public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID =
new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STR);
- public nsIDirectoryServiceProvider(int /*long*/ address) {
+ public nsIDirectoryServiceProvider(long /*int*/ address) {
super(address);
}
- public int GetFile(byte[] prop, int[] persistent, int /*long*/[] _retval) {
+ public int GetFile(byte[] prop, int[] persistent, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, persistent, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
index b67059a306..a3b68f2609 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
@@ -37,11 +37,11 @@ public class nsIDirectoryServiceProvider2 extends nsIDirectoryServiceProvider {
public static final nsID NS_IDIRECTORYSERVICEPROVIDER2_IID =
new nsID(NS_IDIRECTORYSERVICEPROVIDER2_IID_STRING);
- public nsIDirectoryServiceProvider2(int /*long*/ address) {
+ public nsIDirectoryServiceProvider2(long /*int*/ address) {
super(address);
}
- public int GetFiles(byte[] prop, int /*long*/[] _retval) {
+ public int GetFiles(byte[] prop, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIDirectoryServiceProvider.LAST_METHOD_ID + 1, getAddress(), prop, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java
index 160bfe3540..4c8d7b7f24 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java
@@ -49,23 +49,23 @@ public class nsIDocShell extends nsISupports {
public static final nsID NS_IDOCSHELL_10_IID =
new nsID(NS_IDOCSHELL_10_IID_STR);
- public nsIDocShell(int /*long*/ address) {
+ public nsIDocShell(long /*int*/ address) {
super(address);
}
- public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
+ public int LoadURI(long /*int*/ uri, long /*int*/ loadInfo, int aLoadFlags, int firstParty) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
}
- public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
+ public int LoadStream(long /*int*/ aStream, long /*int*/ aURI, long /*int*/ aContentType, long /*int*/ aContentCharset, long /*int*/ aLoadInfo) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
}
- public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aInheritOwner, char[] aWindowTarget, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
+ public int InternalLoad(long /*int*/ aURI, long /*int*/ aReferrer, long /*int*/ aOwner, int aInheritOwner, char[] aWindowTarget, long /*int*/ aPostDataStream, long /*int*/ aHeadersStream, int aLoadFlags, long /*int*/ aSHEntry, int firstParty, long /*int*/[] aDocShell, long /*int*/[] aRequest) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aInheritOwner, aWindowTarget, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
}
- public int CreateLoadInfo(int /*long*/[] loadInfo) {
+ public int CreateLoadInfo(long /*int*/[] loadInfo) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
}
@@ -73,7 +73,7 @@ public class nsIDocShell extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
}
- public int SetCurrentURI(int /*long*/ aURI) {
+ public int SetCurrentURI(long /*int*/ aURI) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
}
@@ -81,43 +81,43 @@ public class nsIDocShell extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress());
}
- public int GetPresContext(int /*long*/[] aPresContext) {
+ public int GetPresContext(long /*int*/[] aPresContext) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
}
- public int GetPresShell(int /*long*/[] aPresShell) {
+ public int GetPresShell(long /*int*/[] aPresShell) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
}
- public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
+ public int GetEldestPresShell(long /*int*/[] aEldestPresShell) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
}
- public int GetContentViewer(int /*long*/[] aContentViewer) {
+ public int GetContentViewer(long /*int*/[] aContentViewer) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
}
- public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
+ public int GetChromeEventHandler(long /*int*/[] aChromeEventHandler) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
}
- public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
+ public int SetChromeEventHandler(long /*int*/ aChromeEventHandler) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
}
- public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) {
+ public int GetParentURIContentListener(long /*int*/[] aParentURIContentListener) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentURIContentListener);
}
- public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) {
+ public int SetParentURIContentListener(long /*int*/ aParentURIContentListener) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aParentURIContentListener);
}
- public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
+ public int GetDocumentCharsetInfo(long /*int*/[] aDocumentCharsetInfo) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aDocumentCharsetInfo);
}
- public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
+ public int SetDocumentCharsetInfo(long /*int*/ aDocumentCharsetInfo) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocumentCharsetInfo);
}
@@ -165,7 +165,7 @@ public class nsIDocShell extends nsISupports {
public static final int ENUMERATE_BACKWARDS = 1;
- public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
+ public int GetDocShellEnumerator(int aItemType, int aDirection, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aItemType, aDirection, _retval);
}
@@ -261,11 +261,11 @@ public class nsIDocShell extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aIsExecutingOnLoadHandler);
}
- public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
+ public int GetLayoutHistoryState(long /*int*/[] aLayoutHistoryState) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aLayoutHistoryState);
}
- public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
+ public int SetLayoutHistoryState(long /*int*/ aLayoutHistoryState) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aLayoutHistoryState);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload.java
index ba9aaa4bcc..c808c0b240 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload.java
@@ -37,23 +37,23 @@ public class nsIDownload extends nsISupports {
public static final nsID NS_IDOWNLOAD_IID =
new nsID(NS_IDOWNLOAD_IID_STR);
- public nsIDownload(int /*long*/ address) {
+ public nsIDownload(long /*int*/ address) {
super(address);
}
- public int Init(int /*long*/ aSource, int /*long*/ aTarget, char[] aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aPersist) {
+ public int Init(long /*int*/ aSource, long /*int*/ aTarget, char[] aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aPersist) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aPersist);
}
- public int GetSource(int /*long*/[] aSource) {
+ public int GetSource(long /*int*/[] aSource) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);
}
- public int GetTarget(int /*long*/[] aTarget) {
+ public int GetTarget(long /*int*/[] aTarget) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aTarget);
}
- public int GetPersist(int /*long*/[] aPersist) {
+ public int GetPersist(long /*int*/[] aPersist) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPersist);
}
@@ -61,7 +61,7 @@ public class nsIDownload extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPercentComplete);
}
- public int GetDisplayName(int /*long*/[] aDisplayName) {
+ public int GetDisplayName(long /*int*/[] aDisplayName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDisplayName);
}
@@ -73,23 +73,23 @@ public class nsIDownload extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStartTime);
}
- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aMIMEInfo);
}
- public int GetListener(int /*long*/[] aListener) {
+ public int GetListener(long /*int*/[] aListener) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aListener);
}
- public int SetListener(int /*long*/ aListener) {
+ public int SetListener(long /*int*/ aListener) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aListener);
}
- public int GetObserver(int /*long*/[] aObserver) {
+ public int GetObserver(long /*int*/[] aObserver) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aObserver);
}
- public int SetObserver(int /*long*/ aObserver) {
+ public int SetObserver(long /*int*/ aObserver) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aObserver);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java
index aeeb02446e..8105fd7c57 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java
@@ -37,11 +37,11 @@ public class nsIDownload_1_8 extends nsITransfer {
public static final nsID NS_IDOWNLOAD_IID =
new nsID(NS_IDOWNLOAD_IID_STR);
- public nsIDownload_1_8(int /*long*/ address) {
+ public nsIDownload_1_8(long /*int*/ address) {
super(address);
}
- public int GetTargetFile(int /*long*/[] aTargetFile) {
+ public int GetTargetFile(long /*int*/[] aTargetFile) {
return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 1, getAddress(), aTargetFile);
}
@@ -49,27 +49,27 @@ public class nsIDownload_1_8 extends nsITransfer {
return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 2, getAddress(), aPercentComplete);
}
- public int GetAmountTransferred(int /*long*/ aAmountTransferred) {
+ public int GetAmountTransferred(long /*int*/ aAmountTransferred) {
return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 3, getAddress(), aAmountTransferred);
}
- public int GetSize(int /*long*/ aSize) {
+ public int GetSize(long /*int*/ aSize) {
return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 4, getAddress(), aSize);
}
- public int GetSource(int /*long*/[] aSource) {
+ public int GetSource(long /*int*/[] aSource) {
return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 5, getAddress(), aSource);
}
- public int GetTarget(int /*long*/[] aTarget) {
+ public int GetTarget(long /*int*/[] aTarget) {
return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 6, getAddress(), aTarget);
}
- public int GetCancelable(int /*long*/[] aCancelable) {
+ public int GetCancelable(long /*int*/[] aCancelable) {
return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 7, getAddress(), aCancelable);
}
- public int GetDisplayName(int /*long*/[] aDisplayName) {
+ public int GetDisplayName(long /*int*/[] aDisplayName) {
return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 8, getAddress(), aDisplayName);
}
@@ -77,7 +77,7 @@ public class nsIDownload_1_8 extends nsITransfer {
return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 9, getAddress(), aStartTime);
}
- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 10, getAddress(), aMIMEInfo);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
index aaa10c3afd..a584ac20a2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
@@ -37,7 +37,7 @@ public class nsIEmbeddingSiteWindow extends nsISupports {
public static final nsID NS_IEMBEDDINGSITEWINDOW_IID =
new nsID(NS_IEMBEDDINGSITEWINDOW_IID_STR);
- public nsIEmbeddingSiteWindow(int /*long*/ address) {
+ public nsIEmbeddingSiteWindow(long /*int*/ address) {
super(address);
}
@@ -65,7 +65,7 @@ public class nsIEmbeddingSiteWindow extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aVisibility);
}
- public int GetTitle(int /*long*/[] aTitle) {
+ public int GetTitle(long /*int*/[] aTitle) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aTitle);
}
@@ -73,7 +73,7 @@ public class nsIEmbeddingSiteWindow extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTitle);
}
- public int GetSiteWindow(int /*long*/[] aSiteWindow) {
+ public int GetSiteWindow(long /*int*/[] aSiteWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aSiteWindow);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java
index cd83018e5d..3429f561e2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java
@@ -37,11 +37,11 @@ public class nsIFactory extends nsISupports {
public static final nsID NS_IFACTORY_IID =
new nsID(NS_IFACTORY_IID_STR);
- public nsIFactory(int /*long*/ address) {
+ public nsIFactory(long /*int*/ address) {
super(address);
}
- public int CreateInstance(int /*long*/ aOuter, nsID iid, int /*long*/[] result) {
+ public int CreateInstance(long /*int*/ aOuter, nsID iid, long /*int*/[] result) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java
index 073380fe55..455f59bc73 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java
@@ -37,18 +37,18 @@ public class nsIFile extends nsISupports {
public static final nsID NS_IFILE_IID =
new nsID(NS_IFILE_IID_STR);
- public nsIFile(int /*long*/ address) {
+ public nsIFile(long /*int*/ address) {
super(address);
}
public static final int NORMAL_FILE_TYPE = 0;
public static final int DIRECTORY_TYPE = 1;
- public int Append(int /*long*/ node) {
+ public int Append(long /*int*/ node) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), node);
}
- public int AppendNative(int /*long*/ node) {
+ public int AppendNative(long /*int*/ node) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), node);
}
@@ -60,43 +60,43 @@ public class nsIFile extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), type, permissions);
}
- public int GetLeafName(int /*long*/ aLeafName) {
+ public int GetLeafName(long /*int*/ aLeafName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLeafName);
}
- public int SetLeafName(int /*long*/ aLeafName) {
+ public int SetLeafName(long /*int*/ aLeafName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLeafName);
}
- public int GetNativeLeafName(int /*long*/ aNativeLeafName) {
+ public int GetNativeLeafName(long /*int*/ aNativeLeafName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNativeLeafName);
}
- public int SetNativeLeafName(int /*long*/ aNativeLeafName) {
+ public int SetNativeLeafName(long /*int*/ aNativeLeafName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNativeLeafName);
}
- public int CopyTo(int /*long*/ newParentDir, int /*long*/ newName) {
+ public int CopyTo(long /*int*/ newParentDir, long /*int*/ newName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), newParentDir, newName);
}
- public int CopyToNative(int /*long*/ newParentDir, int /*long*/ newName) {
+ public int CopyToNative(long /*int*/ newParentDir, long /*int*/ newName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), newParentDir, newName);
}
- public int CopyToFollowingLinks(int /*long*/ newParentDir, int /*long*/ newName) {
+ public int CopyToFollowingLinks(long /*int*/ newParentDir, long /*int*/ newName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), newParentDir, newName);
}
- public int CopyToFollowingLinksNative(int /*long*/ newParentDir, int /*long*/ newName) {
+ public int CopyToFollowingLinksNative(long /*int*/ newParentDir, long /*int*/ newName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), newParentDir, newName);
}
- public int MoveTo(int /*long*/ newParentDir, int /*long*/ newName) {
+ public int MoveTo(long /*int*/ newParentDir, long /*int*/ newName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), newParentDir, newName);
}
- public int MoveToNative(int /*long*/ newParentDir, int /*long*/ newName) {
+ public int MoveToNative(long /*int*/ newParentDir, long /*int*/ newName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), newParentDir, newName);
}
@@ -148,19 +148,19 @@ public class nsIFile extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aFileSizeOfLink);
}
- public int GetTarget(int /*long*/ aTarget) {
+ public int GetTarget(long /*int*/ aTarget) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aTarget);
}
- public int GetNativeTarget(int /*long*/ aNativeTarget) {
+ public int GetNativeTarget(long /*int*/ aNativeTarget) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aNativeTarget);
}
- public int GetPath(int /*long*/ aPath) {
+ public int GetPath(long /*int*/ aPath) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aPath);
}
- public int GetNativePath(int /*long*/ aNativePath) {
+ public int GetNativePath(long /*int*/ aNativePath) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aNativePath);
}
@@ -204,23 +204,23 @@ public class nsIFile extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), type, permissions);
}
- public int Clone(int /*long*/[] _retval) {
+ public int Clone(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), _retval);
}
- public int Equals(int /*long*/ inFile, int[] _retval) {
+ public int Equals(long /*int*/ inFile, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), inFile, _retval);
}
- public int Contains(int /*long*/ inFile, int recur, int[] _retval) {
+ public int Contains(long /*int*/ inFile, int recur, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), inFile, recur, _retval);
}
- public int GetParent(int /*long*/[] aParent) {
+ public int GetParent(long /*int*/[] aParent) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aParent);
}
- public int GetDirectoryEntries(int /*long*/[] aDirectoryEntries) {
+ public int GetDirectoryEntries(long /*int*/[] aDirectoryEntries) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aDirectoryEntries);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker.java
index 916f834f99..f74a83c6b0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker.java
@@ -37,7 +37,7 @@ public class nsIFilePicker extends nsISupports {
public static final nsID NS_IFILEPICKER_IID =
new nsID(NS_IFILEPICKER_IID_STR);
- public nsIFilePicker(int /*long*/ address) {
+ public nsIFilePicker(long /*int*/ address) {
super(address);
}
@@ -56,7 +56,7 @@ public class nsIFilePicker extends nsISupports {
public static final int filterXUL = 32;
public static final int filterApps = 64;
- public int Init(int /*long*/ parent, char[] title, int mode) {
+ public int Init(long /*int*/ parent, char[] title, int mode) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);
}
@@ -68,7 +68,7 @@ public class nsIFilePicker extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);
}
- public int GetDefaultString(int /*long*/[] aDefaultString) {
+ public int GetDefaultString(long /*int*/[] aDefaultString) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);
}
@@ -76,7 +76,7 @@ public class nsIFilePicker extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);
}
- public int GetDefaultExtension(int /*long*/[] aDefaultExtension) {
+ public int GetDefaultExtension(long /*int*/[] aDefaultExtension) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);
}
@@ -92,27 +92,27 @@ public class nsIFilePicker extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);
}
- public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {
+ public int GetDisplayDirectory(long /*int*/[] aDisplayDirectory) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);
}
- public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {
+ public int SetDisplayDirectory(long /*int*/ aDisplayDirectory) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);
}
- public int GetFile(int /*long*/[] aFile) {
+ public int GetFile(long /*int*/[] aFile) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);
}
- public int GetFileURL(int /*long*/[] aFileURL) {
+ public int GetFileURL(long /*int*/[] aFileURL) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);
}
- public int GetFiles(int /*long*/[] aFiles) {
+ public int GetFiles(long /*int*/[] aFiles) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);
}
- public int Show(int /*long*/ _retval) {
+ public int Show(long /*int*/ _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
index 60bd674749..e0cdd2e2a4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
@@ -43,7 +43,7 @@ public class nsIFilePicker_1_8 extends nsISupports {
public static final nsID NS_IFILEPICKER_10_IID =
new nsID(NS_IFILEPICKER_10_IID_STR);
- public nsIFilePicker_1_8(int /*long*/ address) {
+ public nsIFilePicker_1_8(long /*int*/ address) {
super(address);
}
@@ -67,7 +67,7 @@ public class nsIFilePicker_1_8 extends nsISupports {
public static final int filterAudio = 256;
public static final int filterVideo = 512;
- public int Init(int /*long*/ parent, int /*long*/ title, short mode) {
+ public int Init(long /*int*/ parent, long /*int*/ title, short mode) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);
}
@@ -75,23 +75,23 @@ public class nsIFilePicker_1_8 extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), filterMask);
}
- public int AppendFilter(int /*long*/ title, int /*long*/ filter) {
+ public int AppendFilter(long /*int*/ title, long /*int*/ filter) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);
}
- public int GetDefaultString(int /*long*/ aDefaultString) {
+ public int GetDefaultString(long /*int*/ aDefaultString) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);
}
- public int SetDefaultString(int /*long*/ aDefaultString) {
+ public int SetDefaultString(long /*int*/ aDefaultString) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);
}
- public int GetDefaultExtension(int /*long*/ aDefaultExtension) {
+ public int GetDefaultExtension(long /*int*/ aDefaultExtension) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);
}
- public int SetDefaultExtension(int /*long*/ aDefaultExtension) {
+ public int SetDefaultExtension(long /*int*/ aDefaultExtension) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDefaultExtension);
}
@@ -103,27 +103,27 @@ public class nsIFilePicker_1_8 extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);
}
- public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {
+ public int GetDisplayDirectory(long /*int*/[] aDisplayDirectory) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);
}
- public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {
+ public int SetDisplayDirectory(long /*int*/ aDisplayDirectory) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);
}
- public int GetFile(int /*long*/[] aFile) {
+ public int GetFile(long /*int*/[] aFile) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);
}
- public int GetFileURL(int /*long*/[] aFileURL) {
+ public int GetFileURL(long /*int*/[] aFileURL) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);
}
- public int GetFiles(int /*long*/[] aFiles) {
+ public int GetFiles(long /*int*/[] aFiles) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);
}
- public int Show(int /*long*/ _retval) {
+ public int Show(long /*int*/ _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 15), getAddress(), _retval);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFocusManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFocusManager.java
index ac4d73b264..c795bd79ba 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFocusManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFocusManager.java
@@ -43,51 +43,51 @@ public class nsIFocusManager extends nsISupports {
public static final nsID NS_IFOCUSMANAGER_10_IID =
new nsID(NS_IFOCUSMANAGER_10_IID_STR);
- public nsIFocusManager(int /*long*/ address) {
+ public nsIFocusManager(long /*int*/ address) {
super(address);
}
- public int GetActiveWindow(int /*long*/[] aActiveWindow) {
+ public int GetActiveWindow(long /*int*/[] aActiveWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aActiveWindow);
}
- public int SetActiveWindow(int /*long*/ aActiveWindow) {
+ public int SetActiveWindow(long /*int*/ aActiveWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aActiveWindow);
}
- public int GetFocusedWindow(int /*long*/[] aFocusedWindow) {
+ public int GetFocusedWindow(long /*int*/[] aFocusedWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aFocusedWindow);
}
- public int SetFocusedWindow(int /*long*/ aFocusedWindow) {
+ public int SetFocusedWindow(long /*int*/ aFocusedWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFocusedWindow);
}
- public int GetFocusedElement(int /*long*/[] aFocusedElement) {
+ public int GetFocusedElement(long /*int*/[] aFocusedElement) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFocusedElement);
}
- public int GetLastFocusMethod(int /*long*/ window, int[] _retval) {
+ public int GetLastFocusMethod(long /*int*/ window, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), window, _retval);
}
- public int SetFocus(int /*long*/ aElement, int aFlags) {
+ public int SetFocus(long /*int*/ aElement, int aFlags) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aElement, aFlags);
}
- public int MoveFocus(int /*long*/ aWindow, int /*long*/ aStartElement, int aType, int aFlags, int /*long*/[] _retval) {
+ public int MoveFocus(long /*int*/ aWindow, long /*int*/ aStartElement, int aType, int aFlags, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aWindow, aStartElement, aType, aFlags, _retval);
}
- public int ClearFocus(int /*long*/ aWindow) {
+ public int ClearFocus(long /*int*/ aWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aWindow);
}
- public int GetFocusedElementForWindow(int /*long*/ aWindow, int aDeep, int /*long*/[] aFocusedWindow, int /*long*/[] _retval) {
+ public int GetFocusedElementForWindow(long /*int*/ aWindow, int aDeep, long /*int*/[] aFocusedWindow, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aWindow, aDeep, aFocusedWindow, _retval);
}
- public int MoveCaretToFocus(int /*long*/ aWindow) {
+ public int MoveCaretToFocus(long /*int*/ aWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aWindow);
}
@@ -106,31 +106,31 @@ public class nsIFocusManager extends nsISupports {
public static final int MOVEFOCUS_ROOT = 7;
public static final int MOVEFOCUS_CARET = 8;
- public int WindowRaised(int /*long*/ aWindow) {
+ public int WindowRaised(long /*int*/ aWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aWindow);
}
- public int WindowLowered(int /*long*/ aWindow) {
+ public int WindowLowered(long /*int*/ aWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aWindow);
}
- public int ContentRemoved(int /*long*/ aDocument, int /*long*/ aElement) {
+ public int ContentRemoved(long /*int*/ aDocument, long /*int*/ aElement) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocument, aElement);
}
- public int WindowShown(int /*long*/ aWindow) {
+ public int WindowShown(long /*int*/ aWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aWindow);
}
- public int WindowHidden(int /*long*/ aWindow) {
+ public int WindowHidden(long /*int*/ aWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aWindow);
}
- public int FireDelayedEvents(int /*long*/ aDocument) {
+ public int FireDelayedEvents(long /*int*/ aDocument) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocument);
}
- public int FocusPlugin(int /*long*/ aPlugin) {
+ public int FocusPlugin(long /*int*/ aPlugin) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPlugin);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
index c003eb68b8..d1f6a361c2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
@@ -37,27 +37,27 @@ public class nsIHelperAppLauncher extends nsISupports {
public static final nsID NS_IHELPERAPPLAUNCHER_IID =
new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
- public nsIHelperAppLauncher(int /*long*/ address) {
+ public nsIHelperAppLauncher(long /*int*/ address) {
super(address);
}
- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
}
- public int GetSource(int /*long*/[] aSource) {
+ public int GetSource(long /*int*/[] aSource) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);
}
- public int GetSuggestedFileName(int /*long*/[] aSuggestedFileName) {
+ public int GetSuggestedFileName(long /*int*/[] aSuggestedFileName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
}
- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
}
- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
}
@@ -65,7 +65,7 @@ public class nsIHelperAppLauncher extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
}
- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
+ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aWebProgressListener);
}
@@ -73,7 +73,7 @@ public class nsIHelperAppLauncher extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
}
- public int GetDownloadInfo(int /*long*/[] aSourceUrl, long[] aTimeDownloadStarted, int /*long*/[] _retval) {
+ public int GetDownloadInfo(long /*int*/[] aSourceUrl, long[] aTimeDownloadStarted, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSourceUrl, aTimeDownloadStarted, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
index 3162274c06..cca3b464da 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
@@ -37,19 +37,19 @@ public class nsIHelperAppLauncherDialog extends nsISupports {
public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID =
new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR);
- public nsIHelperAppLauncherDialog(int /*long*/ address) {
+ public nsIHelperAppLauncherDialog(long /*int*/ address) {
super(address);
}
- public int Show(int /*long*/ aLauncher, int /*long*/ aContext) {
+ public int Show(long /*int*/ aLauncher, long /*int*/ aContext) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLauncher, aContext);
}
- public int PromptForSaveToFile(int /*long*/ aWindowContext, char[] aDefaultFile, char[] aSuggestedFileExtension, int /*long*/[] _retval) {
+ public int PromptForSaveToFile(long /*int*/ aWindowContext, char[] aDefaultFile, char[] aSuggestedFileExtension, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWindowContext, aDefaultFile, aSuggestedFileExtension, _retval);
}
- public int ShowProgressDialog(int /*long*/ aLauncher, int /*long*/ aContext) {
+ public int ShowProgressDialog(long /*int*/ aLauncher, long /*int*/ aContext) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aLauncher, aContext);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
index aaa8ecd232..332abfccca 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
@@ -37,7 +37,7 @@ public class nsIHelperAppLauncherDialog_1_9 extends nsISupports {
public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID =
new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR);
- public nsIHelperAppLauncherDialog_1_9(int /*long*/ address) {
+ public nsIHelperAppLauncherDialog_1_9(long /*int*/ address) {
super(address);
}
@@ -45,11 +45,11 @@ public class nsIHelperAppLauncherDialog_1_9 extends nsISupports {
public static final int REASON_SERVERREQUEST = 1;
public static final int REASON_TYPESNIFFED = 2;
- public int Show(int /*long*/ aLauncher, int /*long*/ aWindowContext, int aReason) {
+ public int Show(long /*int*/ aLauncher, long /*int*/ aWindowContext, int aReason) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLauncher, aWindowContext, aReason);
}
- public int PromptForSaveToFile(int /*long*/ aLauncher, int /*long*/ aWindowContext, char[] aDefaultFileName, char[] aSuggestedFileExtension, int aForcePrompt, int /*long*/[] _retval) {
+ public int PromptForSaveToFile(long /*int*/ aLauncher, long /*int*/ aWindowContext, char[] aDefaultFileName, char[] aSuggestedFileExtension, int aForcePrompt, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aLauncher, aWindowContext, aDefaultFileName, aSuggestedFileExtension, aForcePrompt, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
index 1aca93b2f5..823e42a6d2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
@@ -37,31 +37,31 @@ public class nsIHelperAppLauncher_1_8 extends nsICancelable {
public static final nsID NS_IHELPERAPPLAUNCHER_IID =
new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
- public nsIHelperAppLauncher_1_8(int /*long*/ address) {
+ public nsIHelperAppLauncher_1_8(long /*int*/ address) {
super(address);
}
- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
}
- public int GetSource(int /*long*/[] aSource) {
+ public int GetSource(long /*int*/[] aSource) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
}
- public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
+ public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
}
- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
}
- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
}
- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
+ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
}
@@ -69,11 +69,11 @@ public class nsIHelperAppLauncher_1_8 extends nsICancelable {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
}
- public int GetTargetFile(int /*long*/[] aTargetFile) {
+ public int GetTargetFile(long /*int*/[] aTargetFile) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
}
- public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
+ public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTimeDownloadStarted);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
index d277e754a0..bb3c6cf513 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
@@ -37,31 +37,31 @@ public class nsIHelperAppLauncher_1_9 extends nsICancelable {
public static final nsID NS_IHELPERAPPLAUNCHER_IID =
new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
- public nsIHelperAppLauncher_1_9(int /*long*/ address) {
+ public nsIHelperAppLauncher_1_9(long /*int*/ address) {
super(address);
}
- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
}
- public int GetSource(int /*long*/[] aSource) {
+ public int GetSource(long /*int*/[] aSource) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
}
- public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
+ public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
}
- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
}
- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
}
- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
+ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
}
@@ -69,7 +69,7 @@ public class nsIHelperAppLauncher_1_9 extends nsICancelable {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
}
- public int GetTargetFile(int /*long*/[] aTargetFile) {
+ public int GetTargetFile(long /*int*/[] aTargetFile) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
}
@@ -77,7 +77,7 @@ public class nsIHelperAppLauncher_1_9 extends nsICancelable {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable);
}
- public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
+ public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java
index a593aa0022..022162df5d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_8.java
@@ -37,31 +37,31 @@ public class nsIHelperAppLauncher_8 extends nsICancelable {
public static final nsID NS_IHELPERAPPLAUNCHER_IID =
new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
- public nsIHelperAppLauncher_8(int /*long*/ address) {
+ public nsIHelperAppLauncher_8(long /*int*/ address) {
super(address);
}
- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
}
- public int GetSource(int /*long*/[] aSource) {
+ public int GetSource(long /*int*/[] aSource) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
}
- public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
+ public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
}
- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
}
- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
}
- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
+ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
}
@@ -69,7 +69,7 @@ public class nsIHelperAppLauncher_8 extends nsICancelable {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
}
- public int GetTargetFile(int /*long*/[] aTargetFile) {
+ public int GetTargetFile(long /*int*/[] aTargetFile) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
}
@@ -77,11 +77,11 @@ public class nsIHelperAppLauncher_8 extends nsICancelable {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable);
}
- public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
+ public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);
}
- public int GetContentLength(int /*long*/ aContentLength) {
+ public int GetContentLength(long /*int*/ aContentLength) {
return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 11, getAddress(), aContentLength);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpChannel.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpChannel.java
index f72f1fd02a..26d0805cbb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpChannel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpChannel.java
@@ -37,35 +37,35 @@ public class nsIHttpChannel extends nsIChannel {
public static final nsID NS_IHTTPCHANNEL_IID =
new nsID(NS_IHTTPCHANNEL_IID_STR);
- public nsIHttpChannel(int /*long*/ address) {
+ public nsIHttpChannel(long /*int*/ address) {
super(address);
}
- public int GetRequestMethod(int /*long*/ aRequestMethod) {
+ public int GetRequestMethod(long /*int*/ aRequestMethod) {
return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 1, getAddress(), aRequestMethod);
}
- public int SetRequestMethod(int /*long*/ aRequestMethod) {
+ public int SetRequestMethod(long /*int*/ aRequestMethod) {
return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 2, getAddress(), aRequestMethod);
}
- public int GetReferrer(int /*long*/[] aReferrer) {
+ public int GetReferrer(long /*int*/[] aReferrer) {
return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 3, getAddress(), aReferrer);
}
- public int SetReferrer(int /*long*/ aReferrer) {
+ public int SetReferrer(long /*int*/ aReferrer) {
return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 4, getAddress(), aReferrer);
}
- public int GetRequestHeader(int /*long*/ aHeader, int /*long*/ _retval) {
+ public int GetRequestHeader(long /*int*/ aHeader, long /*int*/ _retval) {
return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 5, getAddress(), aHeader, _retval);
}
- public int SetRequestHeader(int /*long*/ aHeader, int /*long*/ aValue, int aMerge) {
+ public int SetRequestHeader(long /*int*/ aHeader, long /*int*/ aValue, int aMerge) {
return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 6, getAddress(), aHeader, aValue, aMerge);
}
- public int VisitRequestHeaders(int /*long*/ aVisitor) {
+ public int VisitRequestHeaders(long /*int*/ aVisitor) {
return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 7, getAddress(), aVisitor);
}
@@ -89,7 +89,7 @@ public class nsIHttpChannel extends nsIChannel {
return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 12, getAddress(), aResponseStatus);
}
- public int GetResponseStatusText(int /*long*/ aResponseStatusText) {
+ public int GetResponseStatusText(long /*int*/ aResponseStatusText) {
return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 13, getAddress(), aResponseStatusText);
}
@@ -97,15 +97,15 @@ public class nsIHttpChannel extends nsIChannel {
return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 14, getAddress(), aRequestSucceeded);
}
- public int GetResponseHeader(int /*long*/ header, int /*long*/ _retval) {
+ public int GetResponseHeader(long /*int*/ header, long /*int*/ _retval) {
return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 15, getAddress(), header, _retval);
}
- public int SetResponseHeader(int /*long*/ header, int /*long*/ value, int merge) {
+ public int SetResponseHeader(long /*int*/ header, long /*int*/ value, int merge) {
return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 16, getAddress(), header, value, merge);
}
- public int VisitResponseHeaders(int /*long*/ aVisitor) {
+ public int VisitResponseHeaders(long /*int*/ aVisitor) {
return XPCOM.VtblCall(nsIChannel.LAST_METHOD_ID + 17, getAddress(), aVisitor);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpHeaderVisitor.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpHeaderVisitor.java
index 0f8cf30be7..a22e85e9e3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpHeaderVisitor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHttpHeaderVisitor.java
@@ -37,11 +37,11 @@ public class nsIHttpHeaderVisitor extends nsISupports {
public static final nsID NS_IHTTPHEADERVISITOR_IID =
new nsID(NS_IHTTPHEADERVISITOR_IID_STR);
- public nsIHttpHeaderVisitor(int /*long*/ address) {
+ public nsIHttpHeaderVisitor(long /*int*/ address) {
super(address);
}
- public int VisitHeader(int /*long*/ aHeader, int /*long*/ aValue) {
+ public int VisitHeader(long /*int*/ aHeader, long /*int*/ aValue) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aHeader, aValue);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIIOService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIIOService.java
index a4b52e16f7..88caa1b9b3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIIOService.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIIOService.java
@@ -37,11 +37,11 @@ public class nsIIOService extends nsISupports {
public static final nsID NS_IIOSERVICE_IID =
new nsID(NS_IIOSERVICE_IID_STR);
- public nsIIOService(int /*long*/ address) {
+ public nsIIOService(long /*int*/ address) {
super(address);
}
- public int GetProtocolHandler(byte[] aScheme, int /*long*/[] _retval) {
+ public int GetProtocolHandler(byte[] aScheme, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aScheme, _retval);
}
@@ -49,19 +49,19 @@ public class nsIIOService extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aScheme, _retval);
}
- public int NewURI(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
+ public int NewURI(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
}
- public int NewFileURI(int /*long*/ aFile, int /*long*/[] _retval) {
+ public int NewFileURI(long /*int*/ aFile, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile, _retval);
}
- public int NewChannelFromURI(int /*long*/ aURI, int /*long*/[] _retval) {
+ public int NewChannelFromURI(long /*int*/ aURI, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aURI, _retval);
}
- public int NewChannel(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
+ public int NewChannel(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
}
@@ -77,7 +77,7 @@ public class nsIIOService extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPort, aScheme, _retval);
}
- public int ExtractScheme(int /*long*/ urlString, int /*long*/ _retval) {
+ public int ExtractScheme(long /*int*/ urlString, long /*int*/ _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), urlString, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java
index 62959ad4cc..15026fea9b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java
@@ -37,7 +37,7 @@ public class nsIInputStream extends nsISupports {
public static final nsID NS_IINPUTSTREAM_IID =
new nsID(NS_IINPUTSTREAM_IID_STR);
- public nsIInputStream(int /*long*/ address) {
+ public nsIInputStream(long /*int*/ address) {
super(address);
}
@@ -53,7 +53,7 @@ public class nsIInputStream extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aBuf, aCount, _retval);
}
- public int ReadSegments(int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int[] _retval) {
+ public int ReadSegments(long /*int*/ aWriter, long /*int*/ aClosure, int aCount, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWriter, aClosure, aCount, _retval);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
index 5d62a6bc44..854a78202a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
@@ -37,11 +37,11 @@ public class nsIInterfaceRequestor extends nsISupports {
public static final nsID NS_IINTERFACEREQUESTOR_IID =
new nsID(NS_IINTERFACEREQUESTOR_IID_STR);
- public nsIInterfaceRequestor(int /*long*/ address) {
+ public nsIInterfaceRequestor(long /*int*/ address) {
super(address);
}
- public int GetInterface(nsID uuid, int /*long*/[] result) {
+ public int GetInterface(nsID uuid, long /*int*/[] result) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
index 5dbedbe533..ea54083857 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
@@ -37,7 +37,7 @@ public class nsIJSContextStack extends nsISupports {
public static final nsID NS_IJSCONTEXTSTACK_IID =
new nsID(NS_IJSCONTEXTSTACK_IID_STR);
- public nsIJSContextStack(int /*long*/ address) {
+ public nsIJSContextStack(long /*int*/ address) {
super(address);
}
@@ -45,15 +45,15 @@ public class nsIJSContextStack extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCount);
}
- public int Peek(int /*long*/[] _retval) {
+ public int Peek(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
}
- public int Pop(int /*long*/[] _retval) {
+ public int Pop(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
}
- public int Push(int /*long*/ cx) {
+ public int Push(long /*int*/ cx) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), cx);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java
index 772bec8096..b3c75d93e1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java
@@ -37,19 +37,19 @@ public class nsILocalFile extends nsIFile {
public static final nsID NS_ILOCALFILE_IID =
new nsID(NS_ILOCALFILE_IID_STR);
- public nsILocalFile(int /*long*/ address) {
+ public nsILocalFile(long /*int*/ address) {
super(address);
}
- public int InitWithPath(int /*long*/ filePath) {
+ public int InitWithPath(long /*int*/ filePath) {
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 1, getAddress(), filePath);
}
- public int InitWithNativePath(int /*long*/ filePath) {
+ public int InitWithNativePath(long /*int*/ filePath) {
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 2, getAddress(), filePath);
}
- public int InitWithFile(int /*long*/ aFile) {
+ public int InitWithFile(long /*int*/ aFile) {
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 3, getAddress(), aFile);
}
@@ -61,15 +61,15 @@ public class nsILocalFile extends nsIFile {
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 5, getAddress(), aFollowLinks);
}
- public int OpenNSPRFileDesc(int flags, int mode, int /*long*/[] _retval) {
+ public int OpenNSPRFileDesc(int flags, int mode, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 6, getAddress(), flags, mode, _retval);
}
- public int OpenANSIFileDesc(byte[] mode, int /*long*/[] _retval) {
+ public int OpenANSIFileDesc(byte[] mode, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 7, getAddress(), mode, _retval);
}
- public int Load(int /*long*/[] _retval) {
+ public int Load(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 8, getAddress(), _retval);
}
@@ -77,19 +77,19 @@ public class nsILocalFile extends nsIFile {
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 9, getAddress(), aDiskSpaceAvailable);
}
- public int AppendRelativePath(int /*long*/ relativeFilePath) {
+ public int AppendRelativePath(long /*int*/ relativeFilePath) {
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 10, getAddress(), relativeFilePath);
}
- public int AppendRelativeNativePath(int /*long*/ relativeFilePath) {
+ public int AppendRelativeNativePath(long /*int*/ relativeFilePath) {
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 11, getAddress(), relativeFilePath);
}
- public int GetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
+ public int GetPersistentDescriptor(long /*int*/ aPersistentDescriptor) {
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 12, getAddress(), aPersistentDescriptor);
}
- public int SetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
+ public int SetPersistentDescriptor(long /*int*/ aPersistentDescriptor) {
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 13, getAddress(), aPersistentDescriptor);
}
@@ -101,11 +101,11 @@ public class nsILocalFile extends nsIFile {
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 15, getAddress());
}
- public int GetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ _retval) {
+ public int GetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ _retval) {
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 16, getAddress(), fromFile, _retval);
}
- public int SetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ relativeDesc) {
+ public int SetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ relativeDesc) {
return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 17, getAddress(), fromFile, relativeDesc);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java
index e4bfd34ce6..a1ce9663e7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java
@@ -37,7 +37,7 @@ public class nsIMIMEInputStream extends nsIInputStream {
public static final nsID NS_IMIMEINPUTSTREAM_IID =
new nsID(NS_IMIMEINPUTSTREAM_IID_STR);
- public nsIMIMEInputStream(int /*long*/ address) {
+ public nsIMIMEInputStream(long /*int*/ address) {
super(address);
}
@@ -53,7 +53,7 @@ public class nsIMIMEInputStream extends nsIInputStream {
return XPCOM.VtblCall(nsIInputStream.LAST_METHOD_ID + 3, getAddress(), name, value);
}
- public int SetData(int /*long*/ stream) {
+ public int SetData(long /*int*/ stream) {
return XPCOM.VtblCall(nsIInputStream.LAST_METHOD_ID + 4, getAddress(), stream);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMemory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMemory.java
index 641777edbd..6083add105 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMemory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMemory.java
@@ -37,19 +37,19 @@ public class nsIMemory extends nsISupports {
public static final nsID NS_IMEMORY_IID =
new nsID(NS_IMEMORY_IID_STR);
- public nsIMemory(int /*long*/ address) {
+ public nsIMemory(long /*int*/ address) {
super(address);
}
- public int /*long*/ Alloc(int size) {
+ public long /*int*/ Alloc(int size) {
return XPCOM.nsIMemory_Alloc(getAddress(), size);
}
- public int /*long*/ Realloc(int /*long*/ ptr, int newSize) {
+ public long /*int*/ Realloc(long /*int*/ ptr, int newSize) {
return XPCOM.nsIMemory_Realloc(getAddress(), ptr, newSize);
}
- public int Free(int /*long*/ ptr) {
+ public int Free(long /*int*/ ptr) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ptr);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java
index 5b3775d472..79c03e880c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java
@@ -37,23 +37,23 @@ public class nsIObserverService extends nsISupports {
public static final nsID NS_IOBSERVERSERVICE_IID =
new nsID(NS_IOBSERVERSERVICE_IID_STR);
- public nsIObserverService(int /*long*/ address) {
+ public nsIObserverService(long /*int*/ address) {
super(address);
}
- public int AddObserver(int /*long*/ anObserver, byte[] aTopic, int ownsWeak) {
+ public int AddObserver(long /*int*/ anObserver, byte[] aTopic, int ownsWeak) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), anObserver, aTopic, ownsWeak);
}
- public int RemoveObserver(int /*long*/ anObserver, byte[] aTopic) {
+ public int RemoveObserver(long /*int*/ anObserver, byte[] aTopic) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), anObserver, aTopic);
}
- public int NotifyObservers(int /*long*/ aSubject, byte[] aTopic, char[] someData) {
+ public int NotifyObservers(long /*int*/ aSubject, byte[] aTopic, char[] someData) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSubject, aTopic, someData);
}
- public int EnumerateObservers(byte[] aTopic, int /*long*/[] _retval) {
+ public int EnumerateObservers(byte[] aTopic, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aTopic, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
index 55f9d83b5a..37612614a3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
@@ -43,7 +43,7 @@ public class nsIPrefBranch extends nsISupports {
public static final nsID NS_IPREFBRANCH_10_IID =
new nsID(NS_IPREFBRANCH_10_IID_STR);
- public nsIPrefBranch(int /*long*/ address) {
+ public nsIPrefBranch(long /*int*/ address) {
super(address);
}
@@ -52,7 +52,7 @@ public class nsIPrefBranch extends nsISupports {
public static final int PREF_INT = 64;
public static final int PREF_BOOL = 128;
- public int GetRoot(int /*long*/[] aRoot) {
+ public int GetRoot(long /*int*/[] aRoot) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aRoot);
}
@@ -68,7 +68,7 @@ public class nsIPrefBranch extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPrefName, aValue);
}
- public int GetCharPref(byte[] aPrefName, int /*long*/[] _retval) {
+ public int GetCharPref(byte[] aPrefName, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefName, _retval);
}
@@ -84,11 +84,11 @@ public class nsIPrefBranch extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPrefName, aValue);
}
- public int GetComplexValue(byte[] aPrefName, nsID aType, int /*long*/[] aValue) {
+ public int GetComplexValue(byte[] aPrefName, nsID aType, long /*int*/[] aValue) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPrefName, aType, aValue);
}
- public int SetComplexValue(byte[] aPrefName, nsID aType, int /*long*/ aValue) {
+ public int SetComplexValue(byte[] aPrefName, nsID aType, long /*int*/ aValue) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPrefName, aType, aValue);
}
@@ -116,7 +116,7 @@ public class nsIPrefBranch extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aStartingAt);
}
- public int GetChildList(byte[] aStartingAt, int[] aCount, int /*long*/[] aChildArray) {
+ public int GetChildList(byte[] aStartingAt, int[] aCount, long /*int*/[] aChildArray) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aStartingAt, aCount, aChildArray);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java
index ba0c32ac15..85ce21935a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java
@@ -37,11 +37,11 @@ public class nsIPrefLocalizedString extends nsISupports {
public static final nsID NS_IPREFLOCALIZEDSTRING_IID =
new nsID(NS_IPREFLOCALIZEDSTRING_IID_STR);
- public nsIPrefLocalizedString(int /*long*/ address) {
+ public nsIPrefLocalizedString(long /*int*/ address) {
super(address);
}
- public int GetData(int /*long*/[] aData) {
+ public int GetData(long /*int*/[] aData) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aData);
}
@@ -49,7 +49,7 @@ public class nsIPrefLocalizedString extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData);
}
- public int ToString(int /*long*/[] _retval) {
+ public int ToString(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java
index b3fc9fbc75..76459a0185 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java
@@ -37,11 +37,11 @@ public class nsIPrefService extends nsISupports {
public static final nsID NS_IPREFSERVICE_IID =
new nsID(NS_IPREFSERVICE_IID_STR);
- public nsIPrefService(int /*long*/ address) {
+ public nsIPrefService(long /*int*/ address) {
super(address);
}
- public int ReadUserPrefs(int /*long*/ aFile) {
+ public int ReadUserPrefs(long /*int*/ aFile) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFile);
}
@@ -53,15 +53,15 @@ public class nsIPrefService extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
}
- public int SavePrefFile(int /*long*/ aFile) {
+ public int SavePrefFile(long /*int*/ aFile) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile);
}
- public int GetBranch(byte[] aPrefRoot, int /*long*/[] _retval) {
+ public int GetBranch(byte[] aPrefRoot, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefRoot, _retval);
}
- public int GetDefaultBranch(byte[] aPrefRoot, int /*long*/[] _retval) {
+ public int GetDefaultBranch(byte[] aPrefRoot, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPrefRoot, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
index 808682b013..b3f5760560 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
@@ -43,7 +43,7 @@ public class nsIPrincipal extends nsISerializable {
public static final nsID NS_IPRINCIPAL_10_IID =
new nsID(NS_IPRINCIPAL_10_IID_STR);
- public nsIPrincipal(int /*long*/ address) {
+ public nsIPrincipal(long /*int*/ address) {
super(address);
}
@@ -52,15 +52,15 @@ public class nsIPrincipal extends nsISerializable {
public static final int ENABLE_WITH_USER_PERMISSION = 3;
public static final int ENABLE_GRANTED = 4;
- public int GetPreferences(int /*long*/[] prefBranch, int /*long*/[] id, int /*long*/[] subjectName, int /*long*/[] grantedList, int /*long*/[] deniedList, int[] isTrusted) {
+ public int GetPreferences(long /*int*/[] prefBranch, long /*int*/[] id, long /*int*/[] subjectName, long /*int*/[] grantedList, long /*int*/[] deniedList, int[] isTrusted) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 1, getAddress(), prefBranch, id, subjectName, grantedList, deniedList, isTrusted);
}
- public int Equals(int /*long*/ other, int[] _retval) {
+ public int Equals(long /*int*/ other, int[] _retval) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 2, getAddress(), other, _retval);
}
- public int EqualsIgnoringDomain(int /*long*/ other, int[] _retval) {
+ public int EqualsIgnoringDomain(long /*int*/ other, int[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 3, getAddress(), other, _retval);
}
@@ -69,19 +69,19 @@ public class nsIPrincipal extends nsISerializable {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 4 : 3), getAddress(), aHashValue);
}
- public int GetJSPrincipals(int /*long*/ cx, int /*long*/[] _retval) {
+ public int GetJSPrincipals(long /*int*/ cx, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 5 : 4), getAddress(), cx, _retval);
}
- public int GetSecurityPolicy(int /*long*/[] aSecurityPolicy) {
+ public int GetSecurityPolicy(long /*int*/[] aSecurityPolicy) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 6 : 5), getAddress(), aSecurityPolicy);
}
- public int SetSecurityPolicy(int /*long*/ aSecurityPolicy) {
+ public int SetSecurityPolicy(long /*int*/ aSecurityPolicy) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 7 : 6), getAddress(), aSecurityPolicy);
}
- public int CanEnableCapability(byte[] capability, int /*long*/ _retval) {
+ public int CanEnableCapability(byte[] capability, long /*int*/ _retval) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 8 : 7), getAddress(), capability, _retval);
}
@@ -89,35 +89,35 @@ public class nsIPrincipal extends nsISerializable {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 9 : 8), getAddress(), capability, canEnable);
}
- public int IsCapabilityEnabled(byte[] capability, int /*long*/ annotation, int[] _retval) {
+ public int IsCapabilityEnabled(byte[] capability, long /*int*/ annotation, int[] _retval) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 10 : 9), getAddress(), capability, annotation, _retval);
}
- public int EnableCapability(byte[] capability, int /*long*/[] annotation) {
+ public int EnableCapability(byte[] capability, long /*int*/[] annotation) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 10), getAddress(), capability, annotation);
}
- public int RevertCapability(byte[] capability, int /*long*/[] annotation) {
+ public int RevertCapability(byte[] capability, long /*int*/[] annotation) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 12 : 11), getAddress(), capability, annotation);
}
- public int DisableCapability(byte[] capability, int /*long*/[] annotation) {
+ public int DisableCapability(byte[] capability, long /*int*/[] annotation) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 12), getAddress(), capability, annotation);
}
- public int GetURI(int /*long*/[] aURI) {
+ public int GetURI(long /*int*/[] aURI) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 13), getAddress(), aURI);
}
- public int GetDomain(int /*long*/[] aDomain) {
+ public int GetDomain(long /*int*/[] aDomain) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 14), getAddress(), aDomain);
}
- public int SetDomain(int /*long*/ aDomain) {
+ public int SetDomain(long /*int*/ aDomain) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 15), getAddress(), aDomain);
}
- public int GetOrigin(int /*long*/[] aOrigin) {
+ public int GetOrigin(long /*int*/[] aOrigin) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 16), getAddress(), aOrigin);
}
@@ -125,36 +125,36 @@ public class nsIPrincipal extends nsISerializable {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 18 : 17), getAddress(), aHasCertificate);
}
- public int GetFingerprint(int /*long*/ aFingerprint) {
+ public int GetFingerprint(long /*int*/ aFingerprint) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 18), getAddress(), aFingerprint);
}
- public int GetPrettyName(int /*long*/ aPrettyName) {
+ public int GetPrettyName(long /*int*/ aPrettyName) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 19), getAddress(), aPrettyName);
}
- public int Subsumes(int /*long*/ other, int[] _retval) {
+ public int Subsumes(long /*int*/ other, int[] _retval) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 20), getAddress(), other, _retval);
}
- public int CheckMayLoad(int /*long*/ uri, int report) {
+ public int CheckMayLoad(long /*int*/ uri, int report) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 21), getAddress(), uri, report);
}
- public int GetSubjectName(int /*long*/ aSubjectName) {
+ public int GetSubjectName(long /*int*/ aSubjectName) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 23 : 22), getAddress(), aSubjectName);
}
- public int GetCertificate(int /*long*/[] aCertificate) {
+ public int GetCertificate(long /*int*/[] aCertificate) {
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 24 : 23), getAddress(), aCertificate);
}
- public int GetCsp(int /*long*/[] aCsp) {
+ public int GetCsp(long /*int*/[] aCsp) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 25, getAddress(), aCsp);
}
- public int SetCsp(int /*long*/ aCsp) {
+ public int SetCsp(long /*int*/ aCsp) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 26, getAddress(), aCsp);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
index 2cc99e4f7b..1170dc5458 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
@@ -37,11 +37,11 @@ public class nsIProgressDialog extends nsIDownload {
public static final nsID NS_IPROGRESSDIALOG_IID =
new nsID(NS_IPROGRESSDIALOG_IID_STR);
- public nsIProgressDialog(int /*long*/ address) {
+ public nsIProgressDialog(long /*int*/ address) {
super(address);
}
- public int Open(int /*long*/ aParent) {
+ public int Open(long /*int*/ aParent) {
return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 1, getAddress(), aParent);
}
@@ -53,11 +53,11 @@ public class nsIProgressDialog extends nsIDownload {
return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
}
- public int GetDialog(int /*long*/[] aDialog) {
+ public int GetDialog(long /*int*/[] aDialog) {
return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 4, getAddress(), aDialog);
}
- public int SetDialog(int /*long*/ aDialog) {
+ public int SetDialog(long /*int*/ aDialog) {
return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 5, getAddress(), aDialog);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
index 13c38f71e1..f3be58f77f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
@@ -37,11 +37,11 @@ public class nsIProgressDialog_1_8 extends nsIDownload_1_8 {
public static final nsID NS_IPROGRESSDIALOG_IID =
new nsID(NS_IPROGRESSDIALOG_IID_STR);
- public nsIProgressDialog_1_8(int /*long*/ address) {
+ public nsIProgressDialog_1_8(long /*int*/ address) {
super(address);
}
- public int Open(int /*long*/ aParent) {
+ public int Open(long /*int*/ aParent) {
return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 1, getAddress(), aParent);
}
@@ -53,19 +53,19 @@ public class nsIProgressDialog_1_8 extends nsIDownload_1_8 {
return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
}
- public int GetObserver(int /*long*/[] aObserver) {
+ public int GetObserver(long /*int*/[] aObserver) {
return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 4, getAddress(), aObserver);
}
- public int SetObserver(int /*long*/ aObserver) {
+ public int SetObserver(long /*int*/ aObserver) {
return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 5, getAddress(), aObserver);
}
- public int GetDialog(int /*long*/[] aDialog) {
+ public int GetDialog(long /*int*/[] aDialog) {
return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 6, getAddress(), aDialog);
}
- public int SetDialog(int /*long*/ aDialog) {
+ public int SetDialog(long /*int*/ aDialog) {
return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 7, getAddress(), aDialog);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrompt.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrompt.java
index e94737a32c..8dcd408ccb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrompt.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrompt.java
@@ -37,7 +37,7 @@ public class nsIPrompt extends nsISupports {
public static final nsID NS_IPROMPT_IID =
new nsID(NS_IPROMPT_IID_STR);
- public nsIPrompt(int /*long*/ address) {
+ public nsIPrompt(long /*int*/ address) {
super(address);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptFactory.java
index 4ee01295ae..1a467a0ab7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptFactory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptFactory.java
@@ -37,11 +37,11 @@ public class nsIPromptFactory extends nsISupports {
public static final nsID NS_IPROMPTFACTORY_IID =
new nsID(NS_IPROMPTFACTORY_IID_STR);
- public nsIPromptFactory(int /*long*/ address) {
+ public nsIPromptFactory(long /*int*/ address) {
super(address);
}
- public int getPrompt(int /*long*/ aParent, nsID iid, int /*long*/[] result) {
+ public int getPrompt(long /*int*/ aParent, nsID iid, long /*int*/[] result) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, iid, result);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService.java
index 1ce5e55163..9cfb774a19 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService.java
@@ -37,23 +37,23 @@ public class nsIPromptService extends nsISupports {
public static final nsID NS_IPROMPTSERVICE_IID =
new nsID(NS_IPROMPTSERVICE_IID_STR);
- public nsIPromptService(int /*long*/ address) {
+ public nsIPromptService(long /*int*/ address) {
super(address);
}
- public int Alert(int /*long*/ aParent, char[] aDialogTitle, char[] aText) {
+ public int Alert(long /*int*/ aParent, char[] aDialogTitle, char[] aText) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aDialogTitle, aText);
}
- public int AlertCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {
+ public int AlertCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState);
}
- public int Confirm(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {
+ public int Confirm(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aParent, aDialogTitle, aText, _retval);
}
- public int ConfirmCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ public int ConfirmCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState, _retval);
}
@@ -75,23 +75,23 @@ public class nsIPromptService extends nsISupports {
public static final int STD_OK_CANCEL_BUTTONS = 513;
public static final int STD_YES_NO_BUTTONS = 1027;
- public int ConfirmEx(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ public int ConfirmEx(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, aDialogTitle, aText, aButtonFlags, aButton0Title, aButton1Title, aButton2Title, aCheckMsg, aCheckState, _retval);
}
- public int Prompt(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ public int Prompt(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, aDialogTitle, aText, aValue, aCheckMsg, aCheckState, _retval);
}
- public int PromptUsernameAndPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aUsername, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ public int PromptUsernameAndPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aUsername, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParent, aDialogTitle, aText, aUsername, aPassword, aCheckMsg, aCheckState, _retval);
}
- public int PromptPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ public int PromptPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParent, aDialogTitle, aText, aPassword, aCheckMsg, aCheckState, _retval);
}
- public int Select(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aCount, int /*long*/[] aSelectList, int[] aOutSelection, int[] _retval) {
+ public int Select(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aCount, long /*int*/[] aSelectList, int[] aOutSelection, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aParent, aDialogTitle, aText, aCount, aSelectList, aOutSelection, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
index fec6bc5897..5d0207fc1f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
@@ -37,15 +37,15 @@ public class nsIPromptService2 extends nsIPromptService {
public static final nsID NS_IPROMPTSERVICE2_IID =
new nsID(NS_IPROMPTSERVICE2_IID_STR);
- public nsIPromptService2(int /*long*/ address) {
+ public nsIPromptService2(long /*int*/ address) {
super(address);
}
- public int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
+ public int PromptAuth(long /*int*/ aParent, long /*int*/ aChannel, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 1, getAddress(), aParent, aChannel, level, authInfo, checkboxLabel, checkValue, _retval);
}
- public int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int /*long*/[] _retval) {
+ public int AsyncPromptAuth(long /*int*/ aParent, long /*int*/ aChannel, long /*int*/ aCallback, long /*int*/ aContext, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProperties.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProperties.java
index 6311098ca2..bd276755cb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProperties.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProperties.java
@@ -37,15 +37,15 @@ public class nsIProperties extends nsISupports {
public static final nsID NS_IPROPERTIES_IID =
new nsID(NS_IPROPERTIES_IID_STR);
- public nsIProperties(int /*long*/ address) {
+ public nsIProperties(long /*int*/ address) {
super(address);
}
- public int Get(byte[] prop, nsID iid, int /*long*/[] result) {
+ public int Get(byte[] prop, nsID iid, long /*int*/[] result) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, iid, result);
}
- public int Set(byte[] prop, int /*long*/ value) {
+ public int Set(byte[] prop, long /*int*/ value) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prop, value);
}
@@ -57,7 +57,7 @@ public class nsIProperties extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), prop);
}
- public int GetKeys(int[] count, int /*long*/[] keys) {
+ public int GetKeys(int[] count, long /*int*/[] keys) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), count, keys);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java
index a0689a7739..d931f3f58d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java
@@ -37,11 +37,11 @@ public class nsIRequest extends nsISupports {
public static final nsID NS_IREQUEST_IID =
new nsID(NS_IREQUEST_IID_STR);
- public nsIRequest(int /*long*/ address) {
+ public nsIRequest(long /*int*/ address) {
super(address);
}
- public int GetName(int /*long*/ aName) {
+ public int GetName(long /*int*/ aName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
}
@@ -49,7 +49,7 @@ public class nsIRequest extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
}
- public int GetStatus(int /*long*/[] aStatus) {
+ public int GetStatus(long /*int*/[] aStatus) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aStatus);
}
@@ -65,15 +65,15 @@ public class nsIRequest extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
}
- public int GetLoadGroup(int /*long*/[] aLoadGroup) {
+ public int GetLoadGroup(long /*int*/[] aLoadGroup) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aLoadGroup);
}
- public int SetLoadGroup(int /*long*/ aLoadGroup) {
+ public int SetLoadGroup(long /*int*/ aLoadGroup) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLoadGroup);
}
- public int GetLoadFlags(int /*long*/[] aLoadFlags) {
+ public int GetLoadFlags(long /*int*/[] aLoadFlags) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aLoadFlags);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
index f366b1c7c3..0a8b3c3531 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
@@ -43,15 +43,15 @@ public class nsISSLStatus extends nsISupports {
public static final nsID NS_ISSLSTATUS_10_IID =
new nsID(NS_ISSLSTATUS_10_IID_STR);
- public nsISSLStatus(int /*long*/ address) {
+ public nsISSLStatus(long /*int*/ address) {
super(address);
}
- public int GetServerCert(int /*long*/[] aServerCert) {
+ public int GetServerCert(long /*int*/[] aServerCert) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aServerCert);
}
- public int GetCipherName(int /*long*/[] aCipherName) {
+ public int GetCipherName(long /*int*/[] aCipherName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCipherName);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager.java
index 7a36f9f35e..2ecc2c9765 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager.java
@@ -49,20 +49,20 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
public static final nsID NS_ISCRIPTSECURITYMANAGER_10_IID =
new nsID(NS_ISCRIPTSECURITYMANAGER_10_IID_STR);
- public nsIScriptSecurityManager(int /*long*/ address) {
+ public nsIScriptSecurityManager(long /*int*/ address) {
super(address);
}
-// public int CheckPropertyAccess(int /*long*/ aJSContext, int /*long*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE ! aProperty, int aAction) {
+// public int CheckPropertyAccess(long /*int*/ aJSContext, long /*int*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE ! aProperty, int aAction) {
// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 1, getAddress(), aJSContext, aJSObject, aClassName, aProperty, aAction);
// }
- public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
+ public int CheckConnect(long /*int*/ aJSContext, long /*int*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
if (IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty);
}
- public int CheckLoadURIFromScript(int /*long*/ cx, int /*long*/ uri) {
+ public int CheckLoadURIFromScript(long /*int*/ cx, long /*int*/ uri) {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 2 : 3), getAddress(), cx, uri);
}
@@ -73,47 +73,47 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
public static final int DISALLOW_SCRIPT_OR_DATA = 4;
public static final int DISALLOW_SCRIPT = 8;
- public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
+ public int CheckLoadURIWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 3 : 4), getAddress(), aPrincipal, uri, flags);
}
- public int CheckLoadURI(int /*long*/ from, int /*long*/ uri, int flags) {
+ public int CheckLoadURI(long /*int*/ from, long /*int*/ uri, int flags) {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 4 : 5), getAddress(), from, uri, flags);
}
- public int CheckLoadURIStrWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
+ public int CheckLoadURIStrWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 5 : 6), getAddress(), aPrincipal, uri, flags);
}
- public int CheckLoadURIStr(int /*long*/ from, int /*long*/ uri, int flags) {
+ public int CheckLoadURIStr(long /*int*/ from, long /*int*/ uri, int flags) {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 6 : 7), getAddress(), from, uri, flags);
}
- public int CheckFunctionAccess(int /*long*/ cx, int /*long*/ funObj, int /*long*/ targetObj) {
+ public int CheckFunctionAccess(long /*int*/ cx, long /*int*/ funObj, long /*int*/ targetObj) {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 7 : 8), getAddress(), cx, funObj, targetObj);
}
- public int CanExecuteScripts(int /*long*/ cx, int /*long*/ principal, int[] _retval) {
+ public int CanExecuteScripts(long /*int*/ cx, long /*int*/ principal, int[] _retval) {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 8 : 9), getAddress(), cx, principal, _retval);
}
- public int GetSubjectPrincipal(int /*long*/[] _retval) {
+ public int GetSubjectPrincipal(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 9 : 10), getAddress(), _retval);
}
- public int GetSystemPrincipal(int /*long*/[] _retval) {
+ public int GetSystemPrincipal(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 10 : 11), getAddress(), _retval);
}
-// public int GetCertificatePrincipal(int /*long*/ aCertFingerprint, int /*long*/ aSubjectName, int /*long*/ aPrettyName, int /*long*/ aCert, int /*long*/ aURI, int /*long*/[] _retval) {
+// public int GetCertificatePrincipal(long /*int*/ aCertFingerprint, long /*int*/ aSubjectName, long /*int*/ aPrettyName, long /*int*/ aCert, long /*int*/ aURI, long /*int*/[] _retval) {
// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 11 : 12), getAddress(), aCertFingerprint, aSubjectName, aPrettyName, aCert, aURI, _retval);
// }
- public int GetCodebasePrincipal(int /*long*/ aURI, int /*long*/[] _retval) {
+ public int GetCodebasePrincipal(long /*int*/ aURI, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 12 : 13), getAddress(), aURI, _retval);
}
-// public int RequestCapability(int /*long*/ principal, byte[] capability, int /*long*/ _retval) {
+// public int RequestCapability(long /*int*/ principal, byte[] capability, long /*int*/ _retval) {
// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 13 : 14), getAddress(), principal, capability, _retval);
// }
@@ -133,11 +133,11 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 18), getAddress(), capability);
}
-// public int SetCanEnableCapability(int /*long*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE ! canEnable) {
+// public int SetCanEnableCapability(long /*int*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE ! canEnable) {
// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 18 : 19), getAddress(), certificateFingerprint, capability, canEnable);
// }
- public int GetObjectPrincipal(int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval) {
+ public int GetObjectPrincipal(long /*int*/ cx, long /*int*/ obj, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 20), getAddress(), cx, obj, _retval);
}
@@ -145,32 +145,32 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 21), getAddress(), _retval);
}
- public int CheckSameOrigin(int /*long*/ aJSContext, int /*long*/ aTargetURI) {
+ public int CheckSameOrigin(long /*int*/ aJSContext, long /*int*/ aTargetURI) {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 22), getAddress(), aJSContext, aTargetURI);
}
- public int CheckSameOriginURI(int /*long*/ aSourceURI, int /*long*/ aTargetURI, int reportError) {
+ public int CheckSameOriginURI(long /*int*/ aSourceURI, long /*int*/ aTargetURI, int reportError) {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 23), getAddress(), aSourceURI, aTargetURI, reportError);
}
- public int GetPrincipalFromContext(int /*long*/ cx, int /*long*/[] _retval) {
+ public int GetPrincipalFromContext(long /*int*/ cx, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 23 : 24), getAddress(), cx, _retval);
}
- public int GetChannelPrincipal(int /*long*/ aChannel, int /*long*/[] _retval) {
+ public int GetChannelPrincipal(long /*int*/ aChannel, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 24 : 25), getAddress(), aChannel, _retval);
}
- public int IsSystemPrincipal(int /*long*/ aPrincipal, int[] _retval) {
+ public int IsSystemPrincipal(long /*int*/ aPrincipal, int[] _retval) {
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 25 : 26), getAddress(), aPrincipal, _retval);
}
- public int PushContextPrincipal(int /*long*/ cx, int /*long*/ fp, int /*long*/ principal) {
+ public int PushContextPrincipal(long /*int*/ cx, long /*int*/ fp, long /*int*/ principal) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), cx, fp, principal);
}
- public int PopContextPrincipal(int /*long*/ cx) {
+ public int PopContextPrincipal(long /*int*/ cx) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 27, getAddress(), cx);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISeekableStream.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISeekableStream.java
index 74ddd6eb3b..af8d253f81 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISeekableStream.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISeekableStream.java
@@ -37,7 +37,7 @@ public class nsISeekableStream extends nsISupports {
public static final nsID NS_ISEEKABLESTREAM_IID =
new nsID(NS_ISEEKABLESTREAM_IID_STR);
- public nsISeekableStream(int /*long*/ address) {
+ public nsISeekableStream(long /*int*/ address) {
super(address);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISerializable.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISerializable.java
index 9537c3619c..25d86c9480 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISerializable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISerializable.java
@@ -37,15 +37,15 @@ public class nsISerializable extends nsISupports {
public static final nsID NS_ISERIALIZABLE_IID =
new nsID(NS_ISERIALIZABLE_IID_STR);
- public nsISerializable(int /*long*/ address) {
+ public nsISerializable(long /*int*/ address) {
super(address);
}
- public int Read(int /*long*/ aInputStream) {
+ public int Read(long /*int*/ aInputStream) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aInputStream);
}
- public int Write(int /*long*/ aOutputStream) {
+ public int Write(long /*int*/ aOutputStream) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aOutputStream);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIServiceManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
index 2f46a6913f..6b357810c4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
@@ -37,15 +37,15 @@ public class nsIServiceManager extends nsISupports {
public static final nsID NS_ISERVICEMANAGER_IID =
new nsID(NS_ISERVICEMANAGER_IID_STR);
- public nsIServiceManager(int /*long*/ address) {
+ public nsIServiceManager(long /*int*/ address) {
super(address);
}
- public int GetService(nsID aClass, nsID aIID, int /*long*/[] result) {
+ public int GetService(nsID aClass, nsID aIID, long /*int*/[] result) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
}
- public int GetServiceByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) {
+ public int GetServiceByContractID(byte[] aContractID, nsID aIID, long /*int*/[] result) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
index 9f29e75265..3a65d38012 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
@@ -37,7 +37,7 @@ public class nsISimpleEnumerator extends nsISupports {
public static final nsID NS_ISIMPLEENUMERATOR_IID =
new nsID(NS_ISIMPLEENUMERATOR_IID_STR);
- public nsISimpleEnumerator(int /*long*/ address) {
+ public nsISimpleEnumerator(long /*int*/ address) {
super(address);
}
@@ -45,7 +45,7 @@ public class nsISimpleEnumerator extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);
}
- public int GetNext(int /*long*/[] _retval) {
+ public int GetNext(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupports.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupports.java
index 2cd9f390f5..885542a894 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupports.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupports.java
@@ -46,17 +46,17 @@ public class nsISupports {
public static final nsID NS_ISUPPORTS_IID =
new nsID(NS_ISUPPORTS_IID_STR);
- int /*long*/ address;
+ long /*int*/ address;
- public nsISupports(int /*long*/ address) {
+ public nsISupports(long /*int*/ address) {
this.address = address;
}
- public int /*long*/ getAddress() {
+ public long /*int*/ getAddress() {
return this.address;
}
- public int QueryInterface(nsID uuid, int /*long*/[] result) {
+ public int QueryInterface(nsID uuid, long /*int*/[] result) {
return XPCOM.VtblCall(FIRST_METHOD_ID, getAddress(), uuid, result);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
index be23ec2a5e..92f390afa5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
@@ -37,11 +37,11 @@ public class nsISupportsWeakReference extends nsISupports {
public static final nsID NS_ISUPPORTSWEAKREFERENCE_IID =
new nsID(NS_ISUPPORTSWEAKREFERENCE_IID_STR);
- public nsISupportsWeakReference(int /*long*/ address) {
+ public nsISupportsWeakReference(long /*int*/ address) {
super(address);
}
- public int GetWeakReference(int /*long*/[] _retval) {
+ public int GetWeakReference(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
index 50126a60b7..c362e6b1b9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
@@ -37,7 +37,7 @@ public class nsITooltipListener extends nsISupports {
public static final nsID NS_ITOOLTIPLISTENER_IID =
new nsID(NS_ITOOLTIPLISTENER_IID_STR);
- public nsITooltipListener(int /*long*/ address) {
+ public nsITooltipListener(long /*int*/ address) {
super(address);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITransfer.java
index c9f0ba686d..454b81f102 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITransfer.java
@@ -37,11 +37,11 @@ public class nsITransfer extends nsIWebProgressListener2 {
public static final nsID NS_ITRANSFER_IID =
new nsID(NS_ITRANSFER_IID_STR);
- public nsITransfer(int /*long*/ address) {
+ public nsITransfer(long /*int*/ address) {
super(address);
}
- public int Init(int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aTempFile, int /*long*/ aCancelable) {
+ public int Init(long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aTempFile, long /*int*/ aCancelable) {
return XPCOM.VtblCall(nsIWebProgressListener2.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aTempFile, aCancelable);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java
index f6b6a7cf82..28adbdb1cb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java
@@ -43,67 +43,67 @@ public class nsIURI extends nsISupports {
public static final nsID NS_IURI_10_IID =
new nsID(NS_IURI_10_IID_STR);
- public nsIURI(int /*long*/ address) {
+ public nsIURI(long /*int*/ address) {
super(address);
}
- public int GetSpec(int /*long*/ aSpec) {
+ public int GetSpec(long /*int*/ aSpec) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
}
- public int SetSpec(int /*long*/ aSpec) {
+ public int SetSpec(long /*int*/ aSpec) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
}
- public int GetPrePath(int /*long*/ aPrePath) {
+ public int GetPrePath(long /*int*/ aPrePath) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrePath);
}
- public int GetScheme(int /*long*/ aScheme) {
+ public int GetScheme(long /*int*/ aScheme) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScheme);
}
- public int SetScheme(int /*long*/ aScheme) {
+ public int SetScheme(long /*int*/ aScheme) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aScheme);
}
- public int GetUserPass(int /*long*/ aUserPass) {
+ public int GetUserPass(long /*int*/ aUserPass) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aUserPass);
}
- public int SetUserPass(int /*long*/ aUserPass) {
+ public int SetUserPass(long /*int*/ aUserPass) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aUserPass);
}
- public int GetUsername(int /*long*/ aUsername) {
+ public int GetUsername(long /*int*/ aUsername) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aUsername);
}
- public int SetUsername(int /*long*/ aUsername) {
+ public int SetUsername(long /*int*/ aUsername) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aUsername);
}
- public int GetPassword(int /*long*/ aPassword) {
+ public int GetPassword(long /*int*/ aPassword) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPassword);
}
- public int SetPassword(int /*long*/ aPassword) {
+ public int SetPassword(long /*int*/ aPassword) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPassword);
}
- public int GetHostPort(int /*long*/ aHostPort) {
+ public int GetHostPort(long /*int*/ aHostPort) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aHostPort);
}
- public int SetHostPort(int /*long*/ aHostPort) {
+ public int SetHostPort(long /*int*/ aHostPort) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aHostPort);
}
- public int GetHost(int /*long*/ aHost) {
+ public int GetHost(long /*int*/ aHost) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aHost);
}
- public int SetHost(int /*long*/ aHost) {
+ public int SetHost(long /*int*/ aHost) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aHost);
}
@@ -115,15 +115,15 @@ public class nsIURI extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPort);
}
- public int GetPath(int /*long*/ aPath) {
+ public int GetPath(long /*int*/ aPath) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPath);
}
- public int SetPath(int /*long*/ aPath) {
+ public int SetPath(long /*int*/ aPath) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPath);
}
- public int Equals(int /*long*/ other, int[] _retval) {
+ public int Equals(long /*int*/ other, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval);
}
@@ -131,47 +131,47 @@ public class nsIURI extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), scheme, _retval);
}
- public int Clone(int /*long*/[] _retval) {
+ public int Clone(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
}
- public int Resolve(int /*long*/ relativePath, int /*long*/ _retval) {
+ public int Resolve(long /*int*/ relativePath, long /*int*/ _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), relativePath, _retval);
}
- public int GetAsciiSpec(int /*long*/ aAsciiSpec) {
+ public int GetAsciiSpec(long /*int*/ aAsciiSpec) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAsciiSpec);
}
- public int GetAsciiHost(int /*long*/ aAsciiHost) {
+ public int GetAsciiHost(long /*int*/ aAsciiHost) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAsciiHost);
}
- public int GetOriginCharset(int /*long*/ aOriginCharset) {
+ public int GetOriginCharset(long /*int*/ aOriginCharset) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aOriginCharset);
}
- public int GetRef(int /*long*/ aRef) {
+ public int GetRef(long /*int*/ aRef) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aRef);
}
- public int SetRef(int /*long*/ aRef) {
+ public int SetRef(long /*int*/ aRef) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aRef);
}
- public int EqualsExceptRef(int /*long*/ other, int[] _retval) {
+ public int EqualsExceptRef(long /*int*/ other, int[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), other, _retval);
}
- public int CloneIgnoringRef(int /*long*/[] _retval) {
+ public int CloneIgnoringRef(long /*int*/[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), _retval);
}
- public int GetSpecIgnoringRef(int /*long*/ aSpecIgnoringRef) {
+ public int GetSpecIgnoringRef(long /*int*/ aSpecIgnoringRef) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aSpecIgnoringRef);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
index aa6378e315..8b2235f2cb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
@@ -37,39 +37,39 @@ public class nsIURIContentListener extends nsISupports {
public static final nsID NS_IURICONTENTLISTENER_IID =
new nsID(NS_IURICONTENTLISTENER_IID_STR);
- public nsIURIContentListener(int /*long*/ address) {
+ public nsIURIContentListener(long /*int*/ address) {
super(address);
}
- public int OnStartURIOpen(int /*long*/ aURI, int[] _retval) {
+ public int OnStartURIOpen(long /*int*/ aURI, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, _retval);
}
- public int DoContent(byte[] aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/[] aContentHandler, int[] _retval) {
+ public int DoContent(byte[] aContentType, int aIsContentPreferred, long /*int*/ aRequest, long /*int*/[] aContentHandler, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContentType, aIsContentPreferred, aRequest, aContentHandler, _retval);
}
- public int IsPreferred(byte[] aContentType, int /*long*/[] aDesiredContentType, int[] _retval) {
+ public int IsPreferred(byte[] aContentType, long /*int*/[] aDesiredContentType, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContentType, aDesiredContentType, _retval);
}
- public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, int /*long*/[] aDesiredContentType, int[] _retval) {
+ public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, long /*int*/[] aDesiredContentType, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContentType, aIsContentPreferred, aDesiredContentType, _retval);
}
- public int GetLoadCookie(int /*long*/[] aLoadCookie) {
+ public int GetLoadCookie(long /*int*/[] aLoadCookie) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLoadCookie);
}
- public int SetLoadCookie(int /*long*/ aLoadCookie) {
+ public int SetLoadCookie(long /*int*/ aLoadCookie) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLoadCookie);
}
- public int GetParentContentListener(int /*long*/[] aParentContentListener) {
+ public int GetParentContentListener(long /*int*/[] aParentContentListener) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParentContentListener);
}
- public int SetParentContentListener(int /*long*/ aParentContentListener) {
+ public int SetParentContentListener(long /*int*/ aParentContentListener) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParentContentListener);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIUploadChannel.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIUploadChannel.java
index 9a8dc985b9..582f637afd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIUploadChannel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIUploadChannel.java
@@ -37,15 +37,15 @@ public class nsIUploadChannel extends nsISupports {
public static final nsID NS_IUPLOADCHANNEL_IID =
new nsID(NS_IUPLOADCHANNEL_IID_STR);
- public nsIUploadChannel(int /*long*/ address) {
+ public nsIUploadChannel(long /*int*/ address) {
super(address);
}
- public int SetUploadStream(int /*long*/ aStream, int /*long*/ aContentType, int aContentLength) {
+ public int SetUploadStream(long /*int*/ aStream, long /*int*/ aContentType, int aContentLength) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aStream, aContentType, aContentLength);
}
- public int GetUploadStream(int /*long*/[] aUploadStream) {
+ public int GetUploadStream(long /*int*/[] aUploadStream) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aUploadStream);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java
index 29f9bad86f..07b3525ecd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java
@@ -43,7 +43,7 @@ public class nsIVariant extends nsISupports {
public static final nsID NS_IVARIANT_10_IID =
new nsID(NS_IVARIANT_10_IID_STR);
- public nsIVariant(int /*long*/ address) {
+ public nsIVariant(long /*int*/ address) {
super(address);
}
@@ -51,11 +51,11 @@ public class nsIVariant extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aDataType);
}
- public int GetAsInt8(int /*long*/ _retval) {
+ public int GetAsInt8(long /*int*/ _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
}
- public int GetAsInt16(int /*long*/ _retval) {
+ public int GetAsInt16(long /*int*/ _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
}
@@ -67,7 +67,7 @@ public class nsIVariant extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
}
- public int GetAsUint8(int /*long*/ _retval) {
+ public int GetAsUint8(long /*int*/ _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
}
@@ -79,7 +79,7 @@ public class nsIVariant extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), _retval);
}
- public int GetAsUint64(int /*long*/ _retval) {
+ public int GetAsUint64(long /*int*/ _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
}
@@ -87,7 +87,7 @@ public class nsIVariant extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
}
- public int GetAsDouble(int /*long*/ _retval) {
+ public int GetAsDouble(long /*int*/ _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), _retval);
}
@@ -103,56 +103,56 @@ public class nsIVariant extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval);
}
- public int GetAsID(int /*long*/ retval) {
+ public int GetAsID(long /*int*/ retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), retval);
}
- public int GetAsAString(int /*long*/ _retval) {
+ public int GetAsAString(long /*int*/ _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), _retval);
}
- public int GetAsDOMString(int /*long*/ _retval) {
+ public int GetAsDOMString(long /*int*/ _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), _retval);
}
- public int GetAsACString(int /*long*/ _retval) {
+ public int GetAsACString(long /*int*/ _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), _retval);
}
- public int GetAsAUTF8String(int /*long*/ _retval) {
+ public int GetAsAUTF8String(long /*int*/ _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), _retval);
}
- public int GetAsString(int /*long*/[] _retval) {
+ public int GetAsString(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), _retval);
}
- public int GetAsWString(int /*long*/[] _retval) {
+ public int GetAsWString(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval);
}
- public int GetAsISupports(int /*long*/[] _retval) {
+ public int GetAsISupports(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
}
- public int GetAsJSVal(int /*long*/[] _retval) {
+ public int GetAsJSVal(long /*int*/[] _retval) {
if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), _retval);
}
- public int GetAsInterface(int /*long*/[] iid, int /*long*/[] iface) {
+ public int GetAsInterface(long /*int*/[] iid, long /*int*/[] iface) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 24 : 23), getAddress(), iid, iface);
}
- public int GetAsArray(short[] type, int /*long*/ iid, int[] count, int /*long*/[] ptr) {
+ public int GetAsArray(short[] type, long /*int*/ iid, int[] count, long /*int*/[] ptr) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 25 : 24), getAddress(), type, iid, count, ptr);
}
- public int GetAsStringWithSize(int[] size, int /*long*/[] str) {
+ public int GetAsStringWithSize(int[] size, long /*int*/[] str) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 26 : 25), getAddress(), size, str);
}
- public int GetAsWStringWithSize(int[] size, int /*long*/[] str) {
+ public int GetAsWStringWithSize(int[] size, long /*int*/[] str) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 27 : 26), getAddress(), size, str);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
index 8cccddcac3..7a37dbd41d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
@@ -37,11 +37,11 @@ public class nsIWeakReference extends nsISupports {
public static final nsID NS_IWEAKREFERENCE_IID =
new nsID(NS_IWEAKREFERENCE_IID_STR);
- public nsIWeakReference(int /*long*/ address) {
+ public nsIWeakReference(long /*int*/ address) {
super(address);
}
- public int QueryReferent(nsID uuid, int /*long*/[] result) {
+ public int QueryReferent(nsID uuid, long /*int*/[] result) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
index ba6c3a5316..02c79c1c58 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
@@ -43,35 +43,35 @@ public class nsIWebBrowser extends nsISupports {
public static final nsID NS_IWEBBROWSER_10_IID =
new nsID(NS_IWEBBROWSER_10_IID_STR);
- public nsIWebBrowser(int /*long*/ address) {
+ public nsIWebBrowser(long /*int*/ address) {
super(address);
}
- public int AddWebBrowserListener(int /*long*/ aListener, nsID aIID) {
+ public int AddWebBrowserListener(long /*int*/ aListener, nsID aIID) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aListener, aIID);
}
- public int RemoveWebBrowserListener(int /*long*/ aListener, nsID aIID) {
+ public int RemoveWebBrowserListener(long /*int*/ aListener, nsID aIID) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aListener, aIID);
}
- public int GetContainerWindow(int /*long*/[] aContainerWindow) {
+ public int GetContainerWindow(long /*int*/[] aContainerWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContainerWindow);
}
- public int SetContainerWindow(int /*long*/ aContainerWindow) {
+ public int SetContainerWindow(long /*int*/ aContainerWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContainerWindow);
}
- public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) {
+ public int GetParentURIContentListener(long /*int*/[] aParentURIContentListener) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParentURIContentListener);
}
- public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) {
+ public int SetParentURIContentListener(long /*int*/ aParentURIContentListener) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParentURIContentListener);
}
- public int GetContentDOMWindow(int /*long*/[] aContentDOMWindow) {
+ public int GetContentDOMWindow(long /*int*/[] aContentDOMWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aContentDOMWindow);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
index e97440b48d..e0e0a14cd3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
@@ -37,7 +37,7 @@ public class nsIWebBrowserChrome extends nsISupports {
public static final nsID NS_IWEBBROWSERCHROME_IID =
new nsID(NS_IWEBBROWSERCHROME_IID_STR);
- public nsIWebBrowserChrome(int /*long*/ address) {
+ public nsIWebBrowserChrome(long /*int*/ address) {
super(address);
}
@@ -49,11 +49,11 @@ public class nsIWebBrowserChrome extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), statusType, status);
}
- public int GetWebBrowser(int /*long*/[] aWebBrowser) {
+ public int GetWebBrowser(long /*int*/[] aWebBrowser) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebBrowser);
}
- public int SetWebBrowser(int /*long*/ aWebBrowser) {
+ public int SetWebBrowser(long /*int*/ aWebBrowser) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebBrowser);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
index 68136bd0df..4f85413a52 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
@@ -37,7 +37,7 @@ public class nsIWebBrowserChromeFocus extends nsISupports {
public static final nsID NS_IWEBBROWSERCHROMEFOCUS_IID =
new nsID(NS_IWEBBROWSERCHROMEFOCUS_IID_STR);
- public nsIWebBrowserChromeFocus(int /*long*/ address) {
+ public nsIWebBrowserChromeFocus(long /*int*/ address) {
super(address);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
index d128470774..ece56a634d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
@@ -37,7 +37,7 @@ public class nsIWebBrowserFocus extends nsISupports {
public static final nsID NS_IWEBBROWSERFOCUS_IID =
new nsID(NS_IWEBBROWSERFOCUS_IID_STR);
- public nsIWebBrowserFocus(int /*long*/ address) {
+ public nsIWebBrowserFocus(long /*int*/ address) {
super(address);
}
@@ -57,19 +57,19 @@ public class nsIWebBrowserFocus extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
}
- public int GetFocusedWindow(int /*long*/[] aFocusedWindow) {
+ public int GetFocusedWindow(long /*int*/[] aFocusedWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFocusedWindow);
}
- public int SetFocusedWindow(int /*long*/ aFocusedWindow) {
+ public int SetFocusedWindow(long /*int*/ aFocusedWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aFocusedWindow);
}
- public int GetFocusedElement(int /*long*/[] aFocusedElement) {
+ public int GetFocusedElement(long /*int*/[] aFocusedElement) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFocusedElement);
}
- public int SetFocusedElement(int /*long*/ aFocusedElement) {
+ public int SetFocusedElement(long /*int*/ aFocusedElement) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFocusedElement);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
index 7ea0bdd22f..a5cc363817 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
@@ -37,7 +37,7 @@ public class nsIWebBrowserSetup extends nsISupports {
public static final nsID NS_IWEBBROWSERSETUP_IID =
new nsID(NS_IWEBBROWSERSETUP_IID_STR);
- public nsIWebBrowserSetup(int /*long*/ address) {
+ public nsIWebBrowserSetup(long /*int*/ address) {
super(address);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
index a6d7c266a8..87a26e8142 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
@@ -37,15 +37,15 @@ public class nsIWebBrowserStream extends nsISupports {
public static final nsID NS_IWEBBROWSERSTREAM_IID =
new nsID(NS_IWEBBROWSERSTREAM_IID_STR);
- public nsIWebBrowserStream(int /*long*/ address) {
+ public nsIWebBrowserStream(long /*int*/ address) {
super(address);
}
- public int OpenStream(int /*long*/ aBaseURI, int /*long*/ aContentType) {
+ public int OpenStream(long /*int*/ aBaseURI, long /*int*/ aContentType) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aBaseURI, aContentType);
}
- public int AppendToStream(int /*long*/ aData, int aLen) {
+ public int AppendToStream(long /*int*/ aData, int aLen) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData, aLen);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
index 5dc9dda95e..1ca0612827 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
@@ -37,7 +37,7 @@ public class nsIWebNavigation extends nsISupports {
public static final nsID NS_IWEBNAVIGATION_IID =
new nsID(NS_IWEBNAVIGATION_IID_STR);
- public nsIWebNavigation(int /*long*/ address) {
+ public nsIWebNavigation(long /*int*/ address) {
super(address);
}
@@ -71,7 +71,7 @@ public class nsIWebNavigation extends nsISupports {
public static final int LOAD_FLAGS_BYPASS_PROXY = 512;
public static final int LOAD_FLAGS_CHARSET_CHANGE = 1024;
- public int LoadURI(char[] uri, int loadFlags, int /*long*/ referrer, int /*long*/ postData, int /*long*/ headers) {
+ public int LoadURI(char[] uri, int loadFlags, long /*int*/ referrer, long /*int*/ postData, long /*int*/ headers) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), uri, loadFlags, referrer, postData, headers);
}
@@ -87,23 +87,23 @@ public class nsIWebNavigation extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), stopFlags);
}
- public int GetDocument(int /*long*/[] aDocument) {
+ public int GetDocument(long /*int*/[] aDocument) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDocument);
}
- public int GetCurrentURI(int /*long*/[] aCurrentURI) {
+ public int GetCurrentURI(long /*int*/[] aCurrentURI) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aCurrentURI);
}
- public int GetReferringURI(int /*long*/[] aReferringURI) {
+ public int GetReferringURI(long /*int*/[] aReferringURI) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aReferringURI);
}
- public int GetSessionHistory(int /*long*/[] aSessionHistory) {
+ public int GetSessionHistory(long /*int*/[] aSessionHistory) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aSessionHistory);
}
- public int SetSessionHistory(int /*long*/ aSessionHistory) {
+ public int SetSessionHistory(long /*int*/ aSessionHistory) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSessionHistory);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java
index 8b329f51f0..f1f3efaf2f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java
@@ -37,7 +37,7 @@ public class nsIWebNavigationInfo extends nsISupports {
public static final nsID NS_IWEBNAVIGATIONINFO_IID =
new nsID(NS_IWEBNAVIGATIONINFO_IID_STR);
- public nsIWebNavigationInfo(int /*long*/ address) {
+ public nsIWebNavigationInfo(long /*int*/ address) {
super(address);
}
@@ -46,7 +46,7 @@ public class nsIWebNavigationInfo extends nsISupports {
public static final int PLUGIN = 2;
public static final int OTHER = 32768;
- public int IsTypeSupported(int /*long*/ aType, int /*long*/ aWebNav, int[] _retval) {
+ public int IsTypeSupported(long /*int*/ aType, long /*int*/ aWebNav, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType, aWebNav, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgress.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
index ba4addd0b1..8f9c97e8ae 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
@@ -37,7 +37,7 @@ public class nsIWebProgress extends nsISupports {
public static final nsID NS_IWEBPROGRESS_IID =
new nsID(NS_IWEBPROGRESS_IID_STR);
- public nsIWebProgress(int /*long*/ address) {
+ public nsIWebProgress(long /*int*/ address) {
super(address);
}
@@ -52,15 +52,15 @@ public class nsIWebProgress extends nsISupports {
public static final int NOTIFY_LOCATION = 128;
public static final int NOTIFY_ALL = 255;
- public int AddProgressListener(int /*long*/ listener, int aNotifyMask) {
+ public int AddProgressListener(long /*int*/ listener, int aNotifyMask) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), listener, aNotifyMask);
}
- public int RemoveProgressListener(int /*long*/ listener) {
+ public int RemoveProgressListener(long /*int*/ listener) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), listener);
}
- public int GetDOMWindow(int /*long*/[] aDOMWindow) {
+ public int GetDOMWindow(long /*int*/[] aDOMWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDOMWindow);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
index 7ce497eaff..902ef3a290 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
@@ -37,7 +37,7 @@ public class nsIWebProgressListener extends nsISupports {
public static final nsID NS_IWEBPROGRESSLISTENER_IID =
new nsID(NS_IWEBPROGRESSLISTENER_IID_STR);
- public nsIWebProgressListener(int /*long*/ address) {
+ public nsIWebProgressListener(long /*int*/ address) {
super(address);
}
@@ -57,23 +57,23 @@ public class nsIWebProgressListener extends nsISupports {
public static final int STATE_SECURE_MED = 65536;
public static final int STATE_SECURE_LOW = 131072;
- public int OnStateChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
+ public int OnStateChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aWebProgress, aRequest, aStateFlags, aStatus);
}
- public int OnProgressChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
+ public int OnProgressChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
}
- public int OnLocationChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ location) {
+ public int OnLocationChange(long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ location) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebProgress, aRequest, location);
}
- public int OnStatusChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, char[] aMessage) {
+ public int OnStatusChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, char[] aMessage) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWebProgress, aRequest, aStatus, aMessage);
}
- public int OnSecurityChange(int /*long*/ aWebProgress, int /*long*/ aRequest, int state) {
+ public int OnSecurityChange(long /*int*/ aWebProgress, long /*int*/ aRequest, int state) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aWebProgress, aRequest, state);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java
index d27f4863ff..c1fa07ee54 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java
@@ -37,11 +37,11 @@ public class nsIWebProgressListener2 extends nsIWebProgressListener {
public static final nsID NS_IWEBPROGRESSLISTENER2_IID =
new nsID(NS_IWEBPROGRESSLISTENER2_IID_STR);
- public nsIWebProgressListener2(int /*long*/ address) {
+ public nsIWebProgressListener2(long /*int*/ address) {
super(address);
}
- public int OnProgressChange64(int /*long*/ aWebProgress, int /*long*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {
+ public int OnProgressChange64(long /*int*/ aWebProgress, long /*int*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) {
return XPCOM.VtblCall(nsIWebProgressListener.LAST_METHOD_ID + 1, getAddress(), aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
index 01646f5c48..0db573ee20 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
@@ -37,11 +37,11 @@ public class nsIWindowCreator extends nsISupports {
public static final nsID NS_IWINDOWCREATOR_IID =
new nsID(NS_IWINDOWCREATOR_IID_STR);
- public nsIWindowCreator(int /*long*/ address) {
+ public nsIWindowCreator(long /*int*/ address) {
super(address);
}
- public int CreateChromeWindow(int /*long*/ parent, int chromeFlags, int /*long*/[] _retval) {
+ public int CreateChromeWindow(long /*int*/ parent, int chromeFlags, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
index 4bfec46ea4..7596227d07 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
@@ -37,13 +37,13 @@ public class nsIWindowCreator2 extends nsIWindowCreator {
public static final nsID NS_IWINDOWCREATOR2_IID =
new nsID(NS_IWINDOWCREATOR2_IID_STR);
- public nsIWindowCreator2(int /*long*/ address) {
+ public nsIWindowCreator2(long /*int*/ address) {
super(address);
}
public static final int PARENT_IS_LOADING_OR_RUNNING_TIMEOUT = 1;
- public int CreateChromeWindow2(int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int[] cancel, int /*long*/[] _retval) {
+ public int CreateChromeWindow2(long /*int*/ parent, int chromeFlags, int contextFlags, long /*int*/ uri, int[] cancel, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsIWindowCreator.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, contextFlags, uri, cancel, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java
index bfb747162c..b9a17819d7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java
@@ -37,51 +37,51 @@ public class nsIWindowWatcher extends nsISupports {
public static final nsID NS_IWINDOWWATCHER_IID =
new nsID(NS_IWINDOWWATCHER_IID_STR);
- public nsIWindowWatcher(int /*long*/ address) {
+ public nsIWindowWatcher(long /*int*/ address) {
super(address);
}
- public int OpenWindow(int /*long*/ aParent, byte[] aUrl, byte[] aName, byte[] aFeatures, int /*long*/ aArguments, int /*long*/[] _retval) {
+ public int OpenWindow(long /*int*/ aParent, byte[] aUrl, byte[] aName, byte[] aFeatures, long /*int*/ aArguments, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aUrl, aName, aFeatures, aArguments, _retval);
}
- public int RegisterNotification(int /*long*/ aObserver) {
+ public int RegisterNotification(long /*int*/ aObserver) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aObserver);
}
- public int UnregisterNotification(int /*long*/ aObserver) {
+ public int UnregisterNotification(long /*int*/ aObserver) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aObserver);
}
- public int GetWindowEnumerator(int /*long*/[] _retval) {
+ public int GetWindowEnumerator(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), _retval);
}
- public int GetNewPrompter(int /*long*/ aParent, int /*long*/[] _retval) {
+ public int GetNewPrompter(long /*int*/ aParent, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, _retval);
}
- public int GetNewAuthPrompter(int /*long*/ aParent, int /*long*/[] _retval) {
+ public int GetNewAuthPrompter(long /*int*/ aParent, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, _retval);
}
- public int SetWindowCreator(int /*long*/ creator) {
+ public int SetWindowCreator(long /*int*/ creator) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), creator);
}
- public int GetChromeForWindow(int /*long*/ aWindow, int /*long*/[] _retval) {
+ public int GetChromeForWindow(long /*int*/ aWindow, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aWindow, _retval);
}
- public int GetWindowByName(char[] aTargetName, int /*long*/ aCurrentWindow, int /*long*/[] _retval) {
+ public int GetWindowByName(char[] aTargetName, long /*int*/ aCurrentWindow, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aTargetName, aCurrentWindow, _retval);
}
- public int GetActiveWindow(int /*long*/[] aActiveWindow) {
+ public int GetActiveWindow(long /*int*/[] aActiveWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aActiveWindow);
}
- public int SetActiveWindow(int /*long*/ aActiveWindow) {
+ public int SetActiveWindow(long /*int*/ aActiveWindow) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aActiveWindow);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
index 76566ddc17..2ccd6283a1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
@@ -37,7 +37,7 @@ public class nsIWritableVariant extends nsIVariant {
public static final nsID NS_IWRITABLEVARIANT_IID =
new nsID(NS_IWRITABLEVARIANT_IID_STR);
- public nsIWritableVariant(int /*long*/ address) {
+ public nsIWritableVariant(long /*int*/ address) {
super(address);
}
@@ -101,23 +101,23 @@ public class nsIWritableVariant extends nsIVariant {
// return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 15, getAddress(), aValue);
// }
- public int SetAsID(int /*long*/ aValue) {
+ public int SetAsID(long /*int*/ aValue) {
return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 16, getAddress(), aValue);
}
- public int SetAsAString(int /*long*/ aValue) {
+ public int SetAsAString(long /*int*/ aValue) {
return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 17, getAddress(), aValue);
}
- public int SetAsDOMString(int /*long*/ aValue) {
+ public int SetAsDOMString(long /*int*/ aValue) {
return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 18, getAddress(), aValue);
}
- public int SetAsACString(int /*long*/ aValue) {
+ public int SetAsACString(long /*int*/ aValue) {
return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 19, getAddress(), aValue);
}
- public int SetAsAUTF8String(int /*long*/ aValue) {
+ public int SetAsAUTF8String(long /*int*/ aValue) {
return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 20, getAddress(), aValue);
}
@@ -129,15 +129,15 @@ public class nsIWritableVariant extends nsIVariant {
return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 22, getAddress(), aValue);
}
- public int SetAsISupports(int /*long*/ aValue) {
+ public int SetAsISupports(long /*int*/ aValue) {
return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 23, getAddress(), aValue);
}
- public int SetAsInterface(nsID iid, int /*long*/ iface) {
+ public int SetAsInterface(nsID iid, long /*int*/ iface) {
return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 24, getAddress(), iid, iface);
}
- public int SetAsArray(short type, int /*long*/ iid, int count, int /*long*/ ptr) {
+ public int SetAsArray(short type, long /*int*/ iid, int count, long /*int*/ ptr) {
return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 25, getAddress(), type, iid, count, ptr);
}
@@ -161,7 +161,7 @@ public class nsIWritableVariant extends nsIVariant {
return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 30, getAddress());
}
- public int SetFromVariant(int /*long*/ aValue) {
+ public int SetFromVariant(long /*int*/ aValue) {
return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 31, getAddress(), aValue);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509Cert.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509Cert.java
index 23705a0765..430bff12d0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509Cert.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509Cert.java
@@ -37,87 +37,87 @@ public class nsIX509Cert extends nsISupports {
public static final nsID NS_IX509CERT_IID =
new nsID(NS_IX509CERT_IID_STR);
- public nsIX509Cert(int /*long*/ address) {
+ public nsIX509Cert(long /*int*/ address) {
super(address);
}
- public int GetNickname(int /*long*/ aNickname) {
+ public int GetNickname(long /*int*/ aNickname) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNickname);
}
- public int GetEmailAddress(int /*long*/ aEmailAddress) {
+ public int GetEmailAddress(long /*int*/ aEmailAddress) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEmailAddress);
}
- public int GetEmailAddresses(int[] length, int /*long*/[] addresses) {
+ public int GetEmailAddresses(int[] length, long /*int*/[] addresses) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), length, addresses);
}
- public int ContainsEmailAddress(int /*long*/ aEmailAddress, int[] _retval) {
+ public int ContainsEmailAddress(long /*int*/ aEmailAddress, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aEmailAddress, _retval);
}
- public int GetSubjectName(int /*long*/ aSubjectName) {
+ public int GetSubjectName(long /*int*/ aSubjectName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aSubjectName);
}
- public int GetCommonName(int /*long*/ aCommonName) {
+ public int GetCommonName(long /*int*/ aCommonName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCommonName);
}
- public int GetOrganization(int /*long*/ aOrganization) {
+ public int GetOrganization(long /*int*/ aOrganization) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOrganization);
}
- public int GetOrganizationalUnit(int /*long*/ aOrganizationalUnit) {
+ public int GetOrganizationalUnit(long /*int*/ aOrganizationalUnit) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOrganizationalUnit);
}
- public int GetSha1Fingerprint(int /*long*/ aSha1Fingerprint) {
+ public int GetSha1Fingerprint(long /*int*/ aSha1Fingerprint) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSha1Fingerprint);
}
- public int GetMd5Fingerprint(int /*long*/ aMd5Fingerprint) {
+ public int GetMd5Fingerprint(long /*int*/ aMd5Fingerprint) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aMd5Fingerprint);
}
- public int GetTokenName(int /*long*/ aTokenName) {
+ public int GetTokenName(long /*int*/ aTokenName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aTokenName);
}
- public int GetIssuerName(int /*long*/ aIssuerName) {
+ public int GetIssuerName(long /*int*/ aIssuerName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aIssuerName);
}
- public int GetSerialNumber(int /*long*/ aSerialNumber) {
+ public int GetSerialNumber(long /*int*/ aSerialNumber) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSerialNumber);
}
- public int GetIssuerCommonName(int /*long*/ aIssuerCommonName) {
+ public int GetIssuerCommonName(long /*int*/ aIssuerCommonName) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aIssuerCommonName);
}
- public int GetIssuerOrganization(int /*long*/ aIssuerOrganization) {
+ public int GetIssuerOrganization(long /*int*/ aIssuerOrganization) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aIssuerOrganization);
}
- public int GetIssuerOrganizationUnit(int /*long*/ aIssuerOrganizationUnit) {
+ public int GetIssuerOrganizationUnit(long /*int*/ aIssuerOrganizationUnit) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aIssuerOrganizationUnit);
}
- public int GetIssuer(int /*long*/[] aIssuer) {
+ public int GetIssuer(long /*int*/[] aIssuer) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aIssuer);
}
- public int GetValidity(int /*long*/[] aValidity) {
+ public int GetValidity(long /*int*/[] aValidity) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aValidity);
}
- public int GetDbKey(int /*long*/[] aDbKey) {
+ public int GetDbKey(long /*int*/[] aDbKey) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aDbKey);
}
- public int GetWindowTitle(int /*long*/[] aWindowTitle) {
+ public int GetWindowTitle(long /*int*/[] aWindowTitle) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aWindowTitle);
}
@@ -148,15 +148,15 @@ public class nsIX509Cert extends nsISupports {
public static final int CERT_USAGE_StatusResponder = 10;
public static final int CERT_USAGE_AnyCA = 11;
- public int GetChain(int /*long*/[] _retval) {
+ public int GetChain(long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval);
}
- public int GetUsagesArray(int ignoreOcsp, int[] verified, int[] count, int /*long*/[] usages) {
+ public int GetUsagesArray(int ignoreOcsp, int[] verified, int[] count, long /*int*/[] usages) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), ignoreOcsp, verified, count, usages);
}
- public int GetUsagesString(int ignoreOcsp, int[] verified, int /*long*/ usages) {
+ public int GetUsagesString(int ignoreOcsp, int[] verified, long /*int*/ usages) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), ignoreOcsp, verified, usages);
}
@@ -164,15 +164,15 @@ public class nsIX509Cert extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), usage, _retval);
}
- public int GetASN1Structure(int /*long*/[] aASN1Structure) {
+ public int GetASN1Structure(long /*int*/[] aASN1Structure) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aASN1Structure);
}
- public int GetRawDER(int[] length, int /*long*/[] data) {
+ public int GetRawDER(int[] length, long /*int*/[] data) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), length, data);
}
- public int Equals(int /*long*/ other, int[] _retval) {
+ public int Equals(long /*int*/ other, int[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
index c14d59300f..ac5ebd3d70 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
@@ -37,39 +37,39 @@ public class nsIX509CertValidity extends nsISupports {
public static final nsID NS_IX509CERTVALIDITY_IID =
new nsID(NS_IX509CERTVALIDITY_IID_STR);
- public nsIX509CertValidity(int /*long*/ address) {
+ public nsIX509CertValidity(long /*int*/ address) {
super(address);
}
- public int GetNotBefore(int /*long*/ aNotBefore) {
+ public int GetNotBefore(long /*int*/ aNotBefore) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNotBefore);
}
- public int GetNotBeforeLocalTime(int /*long*/ aNotBeforeLocalTime) {
+ public int GetNotBeforeLocalTime(long /*int*/ aNotBeforeLocalTime) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aNotBeforeLocalTime);
}
- public int GetNotBeforeLocalDay(int /*long*/ aNotBeforeLocalDay) {
+ public int GetNotBeforeLocalDay(long /*int*/ aNotBeforeLocalDay) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aNotBeforeLocalDay);
}
- public int GetNotBeforeGMT(int /*long*/ aNotBeforeGMT) {
+ public int GetNotBeforeGMT(long /*int*/ aNotBeforeGMT) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNotBeforeGMT);
}
- public int GetNotAfter(int /*long*/ aNotAfter) {
+ public int GetNotAfter(long /*int*/ aNotAfter) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aNotAfter);
}
- public int GetNotAfterLocalTime(int /*long*/ aNotAfterLocalTime) {
+ public int GetNotAfterLocalTime(long /*int*/ aNotAfterLocalTime) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aNotAfterLocalTime);
}
- public int GetNotAfterLocalDay(int /*long*/ aNotAfterLocalDay) {
+ public int GetNotAfterLocalDay(long /*int*/ aNotAfterLocalDay) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNotAfterLocalDay);
}
- public int GetNotAfterGMT(int /*long*/ aNotAfterGMT) {
+ public int GetNotAfterGMT(long /*int*/ aNotAfterGMT) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNotAfterGMT);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
index c1366d7864..b33d74fe84 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
@@ -37,7 +37,7 @@ public class nsIXPCSecurityManager extends nsISupports {
public static final nsID NS_IXPCSECURITYMANAGER_IID =
new nsID(NS_IXPCSECURITYMANAGER_IID_STR);
- public nsIXPCSecurityManager(int /*long*/ address) {
+ public nsIXPCSecurityManager(long /*int*/ address) {
super(address);
}
@@ -55,15 +55,15 @@ public class nsIXPCSecurityManager extends nsISupports {
public static final int HOOK_ALL = 63;
- public int CanCreateWrapper(int /*long*/ aJSContext, nsID aIID, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/[] aPolicy) {
+ public int CanCreateWrapper(long /*int*/ aJSContext, nsID aIID, long /*int*/ aObj, long /*int*/ aClassInfo, long /*int*/[] aPolicy) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aJSContext, aIID, aObj, aClassInfo, aPolicy);
}
- public int CanCreateInstance(int /*long*/ aJSContext, nsID aCID) {
+ public int CanCreateInstance(long /*int*/ aJSContext, nsID aCID) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aJSContext, aCID);
}
- public int CanGetService(int /*long*/ aJSContext, nsID aCID) {
+ public int CanGetService(long /*int*/ aJSContext, nsID aCID) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aJSContext, aCID);
}
@@ -73,7 +73,7 @@ public class nsIXPCSecurityManager extends nsISupports {
public static final int ACCESS_SET_PROPERTY = 2;
- public int CanAccess(int aAction, int /*long*/ aCallContext, int /*long*/ aJSContext, int /*long*/ aJSObject, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/ aName, int /*long*/[] aPolicy) {
+ public int CanAccess(int aAction, long /*int*/ aCallContext, long /*int*/ aJSContext, long /*int*/ aJSObject, long /*int*/ aObj, long /*int*/ aClassInfo, long /*int*/ aName, long /*int*/[] aPolicy) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aAction, aCallContext, aJSContext, aJSObject, aObj, aClassInfo, aName, aPolicy);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPConnect.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPConnect.java
index dc49321651..4a22bff04a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPConnect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPConnect.java
@@ -37,15 +37,15 @@ public class nsIXPConnect extends nsISupports {
public static final nsID NS_IXPCONNECT_IID =
new nsID(NS_IXPCONNECT_IID_STR);
- public nsIXPConnect(int /*long*/ address) {
+ public nsIXPConnect(long /*int*/ address) {
super(address);
}
- public int JSValToVariant(int /*long*/ cx, int /*long*/ aJSVal, int /*long*/[] _retval) {
+ public int JSValToVariant(long /*int*/ cx, long /*int*/ aJSVal, long /*int*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), cx, aJSVal, _retval);
}
- public int VariantToJS(int /*long*/ ctx, int /*long*/ scope, int /*long*/ value, int /*long*/ _retval) {
+ public int VariantToJS(long /*int*/ ctx, long /*int*/ scope, long /*int*/ value, long /*int*/ _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), ctx, scope, value, _retval);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java
index 07a2a65866..7dbed4a3f6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java
@@ -22,11 +22,11 @@ import org.eclipse.swt.widgets.*;
class MozillaDelegate {
Browser browser;
Shell eventShell;
- int /*long*/ mozillaHandle, embedHandle;
+ long /*int*/ mozillaHandle, embedHandle;
boolean hasFocus;
Listener listener;
static Callback eventCallback;
- static int /*long*/ eventProc;
+ static long /*int*/ eventProc;
static final int STOP_PROPOGATE = 1;
static boolean IsSparc;
@@ -50,8 +50,8 @@ MozillaDelegate (Browser browser) {
this.browser = browser;
}
-static int /*long*/ eventProc (int /*long*/ handle, int /*long*/ gdkEvent, int /*long*/ pointer) {
- int /*long*/ parent = OS.gtk_widget_get_parent (handle);
+static long /*int*/ eventProc (long /*int*/ handle, long /*int*/ gdkEvent, long /*int*/ pointer) {
+ long /*int*/ parent = OS.gtk_widget_get_parent (handle);
parent = OS.gtk_widget_get_parent (parent);
if (parent == 0) return 0;
Widget widget = Display.getCurrent ().findWidget (parent);
@@ -61,12 +61,12 @@ static int /*long*/ eventProc (int /*long*/ handle, int /*long*/ gdkEvent, int /
return 0;
}
-static Browser findBrowser (int /*long*/ handle) {
+static Browser findBrowser (long /*int*/ handle) {
/*
* Note. On GTK, Mozilla is embedded into a GtkHBox handle
* and not directly into the parent Composite handle.
*/
- int /*long*/ parent = OS.gtk_widget_get_parent (handle);
+ long /*int*/ parent = OS.gtk_widget_get_parent (handle);
Display display = Display.getCurrent ();
return (Browser)display.findWidget (parent);
}
@@ -96,7 +96,7 @@ static String getProfilePath () {
* then attempt to read the value from the environment directly.
*/
if (baseDir.equals ("?")) { //$NON-NLS-1$
- int /*long*/ ptr = C.getenv (wcsToMbcs (null, "HOME", true)); //$NON-NLS-1$
+ long /*int*/ ptr = C.getenv (wcsToMbcs (null, "HOME", true)); //$NON-NLS-1$
if (ptr != 0) {
int length = C.strlen (ptr);
byte[] bytes = new byte[length];
@@ -167,7 +167,7 @@ int createBaseWindow (nsIBaseWindow baseWindow) {
return baseWindow.Create ();
}
-int /*long*/ getHandle () {
+long /*int*/ getHandle () {
/*
* Bug in Mozilla Linux GTK. Embedding Mozilla into a GtkFixed
* handle causes problems with some Mozilla plug-ins. For some
@@ -189,11 +189,11 @@ int /*long*/ getHandle () {
return embedHandle;
}
-int /*long*/ getSiteWindow () {
+long /*int*/ getSiteWindow () {
return embedHandle;
}
-int /*long*/ gtk_event (int /*long*/ handle, int /*long*/ gdkEvent, int /*long*/ pointer) {
+long /*int*/ gtk_event (long /*int*/ handle, long /*int*/ gdkEvent, long /*int*/ pointer) {
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
if (event.type == OS.GDK_BUTTON_PRESS) {
@@ -265,7 +265,7 @@ void init () {
* forward the event to the parent embedder before Mozilla received and consumed
* them.
*/
- int /*long*/ list = OS.gtk_container_get_children (embedHandle);
+ long /*int*/ list = OS.gtk_container_get_children (embedHandle);
if (list != 0) {
mozillaHandle = OS.g_list_data (list);
OS.g_list_free (list);
@@ -287,7 +287,7 @@ void init () {
}
}
-void onDispose (int /*long*/ embedHandle) {
+void onDispose (long /*int*/ embedHandle) {
if (listener != null) {
eventShell.getDisplay ().removeFilter (SWT.FocusIn, listener);
eventShell.removeListener (SWT.Deactivate, listener);
@@ -305,7 +305,7 @@ boolean sendTraverse () {
return true;
}
-void setSize (int /*long*/ embedHandle, int width, int height) {
+void setSize (long /*int*/ embedHandle, int width, int height) {
OS.gtk_widget_set_size_request (embedHandle, width, height);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/motif/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/motif/org/eclipse/swt/browser/MozillaDelegate.java
index d98968b3a7..7089b380ab 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/motif/org/eclipse/swt/browser/MozillaDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/motif/org/eclipse/swt/browser/MozillaDelegate.java
@@ -152,7 +152,7 @@ int getHandle() {
return embedHandle;
}
-int /*long*/ getSiteWindow () {
+long /*int*/ getSiteWindow () {
return embedHandle;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java
index 1d731613c2..2df19cbdb8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.*;
class MozillaDelegate {
Browser browser;
Vector childWindows = new Vector (9);
- static int /*long*/ MozillaProc;
+ static long /*int*/ MozillaProc;
static Callback SubclassProc;
MozillaDelegate (Browser browser) {
@@ -30,7 +30,7 @@ MozillaDelegate (Browser browser) {
this.browser = browser;
}
-static Browser findBrowser (int /*long*/ handle) {
+static Browser findBrowser (long /*int*/ handle) {
Display display = Display.getCurrent ();
return (Browser)display.findWidget (handle);
}
@@ -106,7 +106,7 @@ static byte[] wcsToMbcs (String codePage, String string, boolean terminate) {
return bytes;
}
-static int /*long*/ windowProc (int /*long*/ hwnd, int /*long*/ msg, int /*long*/ wParam, int /*long*/ lParam) {
+static long /*int*/ windowProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wParam, long /*int*/ lParam) {
switch ((int)/*64*/msg) {
case OS.WM_ERASEBKGND:
RECT rect = new RECT ();
@@ -118,7 +118,7 @@ static int /*long*/ windowProc (int /*long*/ hwnd, int /*long*/ msg, int /*long*
}
void addWindowSubclass () {
- int /*long*/ hwndChild = OS.GetWindow (browser.handle, OS.GW_CHILD);
+ long /*int*/ hwndChild = OS.GetWindow (browser.handle, OS.GW_CHILD);
if (SubclassProc == null) {
SubclassProc = new Callback (MozillaDelegate.class, "windowProc", 4); //$NON-NLS-1$
MozillaProc = OS.GetWindowLongPtr (hwndChild, OS.GWL_WNDPROC);
@@ -130,11 +130,11 @@ int createBaseWindow (nsIBaseWindow baseWindow) {
return baseWindow.Create ();
}
-int /*long*/ getHandle () {
+long /*int*/ getHandle () {
return browser.handle;
}
-int /*long*/ getSiteWindow () {
+long /*int*/ getSiteWindow () {
/*
* As of XULRunner 4, XULRunner's printing facilities on Windows destroy
* the HWND that is returned from here once the print dialog is dismissed
@@ -184,7 +184,7 @@ void init () {
public void handleEvent (Event event) {
if ((event.detail & (SWT.TRAVERSE_TAB_NEXT | SWT.TRAVERSE_TAB_PREVIOUS)) == 0) return;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
@@ -220,7 +220,7 @@ void init () {
}
}
-void onDispose (int /*long*/ embedHandle) {
+void onDispose (long /*int*/ embedHandle) {
removeWindowSubclass ();
childWindows = null;
browser = null;
@@ -228,7 +228,7 @@ void onDispose (int /*long*/ embedHandle) {
void removeWindowSubclass () {
if (SubclassProc == null) return;
- int /*long*/ hwndChild = OS.GetWindow (browser.handle, OS.GW_CHILD);
+ long /*int*/ hwndChild = OS.GetWindow (browser.handle, OS.GW_CHILD);
OS.SetWindowLongPtr (hwndChild, OS.GWL_WNDPROC, MozillaProc);
}
@@ -236,6 +236,6 @@ boolean sendTraverse () {
return false;
}
-void setSize (int /*long*/ embedHandle, int width, int height) {
+void setSize (long /*int*/ embedHandle, int width, int height) {
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java
index 943cb3318e..deba5c0dc7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java
@@ -18,7 +18,7 @@ import org.eclipse.swt.internal.win32.*;
public class COMObject {
- public int /*long*/ ppVtable;
+ public long /*int*/ ppVtable;
static private final int MAX_ARG_COUNT = 12;
static private final int MAX_VTABLE_LENGTH = 80;
@@ -26,7 +26,7 @@ public class COMObject {
static private Hashtable ObjectMap = new Hashtable();
public COMObject(int[] argCounts) {
- int /*long*/[] callbackAddresses = new int /*long*/[argCounts.length];
+ long /*int*/[] callbackAddresses = new long /*int*/[argCounts.length];
synchronized (Callbacks) {
for (int i = 0, length = argCounts.length; i < length; i++){
if ((Callbacks[i][argCounts[i]]) == null) {
@@ -37,10 +37,10 @@ public COMObject(int[] argCounts) {
}
}
- int /*long*/ pVtable = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, OS.PTR_SIZEOF * argCounts.length);
+ long /*int*/ pVtable = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, OS.PTR_SIZEOF * argCounts.length);
COM.MoveMemory(pVtable, callbackAddresses, OS.PTR_SIZEOF * argCounts.length);
ppVtable = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, OS.PTR_SIZEOF);
- COM.MoveMemory(ppVtable, new int /*long*/[] {pVtable}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppVtable, new long /*int*/[] {pVtable}, OS.PTR_SIZEOF);
ObjectMap.put(new LONG(ppVtable), this);
}
@@ -55,729 +55,729 @@ public static GUID IIDFromString(String lpsz) {
return null;
}
-static int /*long*/ callback0(int /*long*/[] callbackArgs) {
+static long /*int*/ callback0(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method0(args);
}
-static int /*long*/ callback1(int /*long*/[] callbackArgs) {
+static long /*int*/ callback1(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method1(args);
}
-static int /*long*/ callback2(int /*long*/[] callbackArgs) {
+static long /*int*/ callback2(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method2(args);
}
-static int /*long*/ callback3(int /*long*/[] callbackArgs) {
+static long /*int*/ callback3(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method3(args);
}
-static int /*long*/ callback4(int /*long*/[] callbackArgs) {
+static long /*int*/ callback4(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method4(args);
}
-static int /*long*/ callback5(int /*long*/[] callbackArgs) {
+static long /*int*/ callback5(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method5(args);
}
-static int /*long*/ callback6(int /*long*/[] callbackArgs) {
+static long /*int*/ callback6(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method6(args);
}
-static int /*long*/ callback7(int /*long*/[] callbackArgs) {
+static long /*int*/ callback7(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method7(args);
}
-static int /*long*/ callback8(int /*long*/[] callbackArgs) {
+static long /*int*/ callback8(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method8(args);
}
-static int /*long*/ callback9(int /*long*/[] callbackArgs) {
+static long /*int*/ callback9(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method9(args);
}
-static int /*long*/ callback10(int /*long*/[] callbackArgs) {
+static long /*int*/ callback10(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method10(args);
}
-static int /*long*/ callback11(int /*long*/[] callbackArgs) {
+static long /*int*/ callback11(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method11(args);
}
-static int /*long*/ callback12(int /*long*/[] callbackArgs) {
+static long /*int*/ callback12(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method12(args);
}
-static int /*long*/ callback13(int /*long*/[] callbackArgs) {
+static long /*int*/ callback13(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method13(args);
}
-static int /*long*/ callback14(int /*long*/[] callbackArgs) {
+static long /*int*/ callback14(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method14(args);
}
-static int /*long*/ callback15(int /*long*/[] callbackArgs) {
+static long /*int*/ callback15(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method15(args);
}
-static int /*long*/ callback16(int /*long*/[] callbackArgs) {
+static long /*int*/ callback16(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method16(args);
}
-static int /*long*/ callback17(int /*long*/[] callbackArgs) {
+static long /*int*/ callback17(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method17(args);
}
-static int /*long*/ callback18(int /*long*/[] callbackArgs) {
+static long /*int*/ callback18(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method18(args);
}
-static int /*long*/ callback19(int /*long*/[] callbackArgs) {
+static long /*int*/ callback19(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method19(args);
}
-static int /*long*/ callback20(int /*long*/[] callbackArgs) {
+static long /*int*/ callback20(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method20(args);
}
-static int /*long*/ callback21(int /*long*/[] callbackArgs) {
+static long /*int*/ callback21(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method21(args);
}
-static int /*long*/ callback22(int /*long*/[] callbackArgs) {
+static long /*int*/ callback22(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method22(args);
}
-static int /*long*/ callback23(int /*long*/[] callbackArgs) {
+static long /*int*/ callback23(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method23(args);
}
-static int /*long*/ callback24(int /*long*/[] callbackArgs) {
+static long /*int*/ callback24(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method24(args);
}
-static int /*long*/ callback25(int /*long*/[] callbackArgs) {
+static long /*int*/ callback25(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method25(args);
}
-static int /*long*/ callback26(int /*long*/[] callbackArgs) {
+static long /*int*/ callback26(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method26(args);
}
-static int /*long*/ callback27(int /*long*/[] callbackArgs) {
+static long /*int*/ callback27(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method27(args);
}
-static int /*long*/ callback28(int /*long*/[] callbackArgs) {
+static long /*int*/ callback28(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method28(args);
}
-static int /*long*/ callback29(int /*long*/[] callbackArgs) {
+static long /*int*/ callback29(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method29(args);
}
-static int /*long*/ callback30(int /*long*/[] callbackArgs) {
+static long /*int*/ callback30(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method30(args);
}
-static int /*long*/ callback31(int /*long*/[] callbackArgs) {
+static long /*int*/ callback31(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method31(args);
}
-static int /*long*/ callback32(int /*long*/[] callbackArgs) {
+static long /*int*/ callback32(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method32(args);
}
-static int /*long*/ callback33(int /*long*/[] callbackArgs) {
+static long /*int*/ callback33(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method33(args);
}
-static int /*long*/ callback34(int /*long*/[] callbackArgs) {
+static long /*int*/ callback34(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method34(args);
}
-static int /*long*/ callback35(int /*long*/[] callbackArgs) {
+static long /*int*/ callback35(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method35(args);
}
-static int /*long*/ callback36(int /*long*/[] callbackArgs) {
+static long /*int*/ callback36(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method36(args);
}
-static int /*long*/ callback37(int /*long*/[] callbackArgs) {
+static long /*int*/ callback37(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method37(args);
}
-static int /*long*/ callback38(int /*long*/[] callbackArgs) {
+static long /*int*/ callback38(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method38(args);
}
-static int /*long*/ callback39(int /*long*/[] callbackArgs) {
+static long /*int*/ callback39(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method39(args);
}
-static int /*long*/ callback40(int /*long*/[] callbackArgs) {
+static long /*int*/ callback40(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method40(args);
}
-static int /*long*/ callback41(int /*long*/[] callbackArgs) {
+static long /*int*/ callback41(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method41(args);
}
-static int /*long*/ callback42(int /*long*/[] callbackArgs) {
+static long /*int*/ callback42(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method42(args);
}
-static int /*long*/ callback43(int /*long*/[] callbackArgs) {
+static long /*int*/ callback43(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method43(args);
}
-static int /*long*/ callback44(int /*long*/[] callbackArgs) {
+static long /*int*/ callback44(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method44(args);
}
-static int /*long*/ callback45(int /*long*/[] callbackArgs) {
+static long /*int*/ callback45(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method45(args);
}
-static int /*long*/ callback46(int /*long*/[] callbackArgs) {
+static long /*int*/ callback46(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method46(args);
}
-static int /*long*/ callback47(int /*long*/[] callbackArgs) {
+static long /*int*/ callback47(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method47(args);
}
-static int /*long*/ callback48(int /*long*/[] callbackArgs) {
+static long /*int*/ callback48(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method48(args);
}
-static int /*long*/ callback49(int /*long*/[] callbackArgs) {
+static long /*int*/ callback49(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method49(args);
}
-static int /*long*/ callback50(int /*long*/[] callbackArgs) {
+static long /*int*/ callback50(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method50(args);
}
-static int /*long*/ callback51(int /*long*/[] callbackArgs) {
+static long /*int*/ callback51(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method51(args);
}
-static int /*long*/ callback52(int /*long*/[] callbackArgs) {
+static long /*int*/ callback52(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method52(args);
}
-static int /*long*/ callback53(int /*long*/[] callbackArgs) {
+static long /*int*/ callback53(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method53(args);
}
-static int /*long*/ callback54(int /*long*/[] callbackArgs) {
+static long /*int*/ callback54(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method54(args);
}
-static int /*long*/ callback55(int /*long*/[] callbackArgs) {
+static long /*int*/ callback55(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method55(args);
}
-static int /*long*/ callback56(int /*long*/[] callbackArgs) {
+static long /*int*/ callback56(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method56(args);
}
-static int /*long*/ callback57(int /*long*/[] callbackArgs) {
+static long /*int*/ callback57(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method57(args);
}
-static int /*long*/ callback58(int /*long*/[] callbackArgs) {
+static long /*int*/ callback58(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method58(args);
}
-static int /*long*/ callback59(int /*long*/[] callbackArgs) {
+static long /*int*/ callback59(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method59(args);
}
-static int /*long*/ callback60(int /*long*/[] callbackArgs) {
+static long /*int*/ callback60(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method60(args);
}
-static int /*long*/ callback61(int /*long*/[] callbackArgs) {
+static long /*int*/ callback61(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method61(args);
}
-static int /*long*/ callback62(int /*long*/[] callbackArgs) {
+static long /*int*/ callback62(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method62(args);
}
-static int /*long*/ callback63(int /*long*/[] callbackArgs) {
+static long /*int*/ callback63(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method63(args);
}
-static int /*long*/ callback64(int /*long*/[] callbackArgs) {
+static long /*int*/ callback64(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method64(args);
}
-static int /*long*/ callback65(int /*long*/[] callbackArgs) {
+static long /*int*/ callback65(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method65(args);
}
-static int /*long*/ callback66(int /*long*/[] callbackArgs) {
+static long /*int*/ callback66(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method66(args);
}
-static int /*long*/ callback67(int /*long*/[] callbackArgs) {
+static long /*int*/ callback67(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method67(args);
}
-static int /*long*/ callback68(int /*long*/[] callbackArgs) {
+static long /*int*/ callback68(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method68(args);
}
-static int /*long*/ callback69(int /*long*/[] callbackArgs) {
+static long /*int*/ callback69(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method69(args);
}
-static int /*long*/ callback70(int /*long*/[] callbackArgs) {
+static long /*int*/ callback70(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method70(args);
}
-static int /*long*/ callback71(int /*long*/[] callbackArgs) {
+static long /*int*/ callback71(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method71(args);
}
-static int /*long*/ callback72(int /*long*/[] callbackArgs) {
+static long /*int*/ callback72(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method72(args);
}
-static int /*long*/ callback73(int /*long*/[] callbackArgs) {
+static long /*int*/ callback73(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method73(args);
}
-static int /*long*/ callback74(int /*long*/[] callbackArgs) {
+static long /*int*/ callback74(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method74(args);
}
-static int /*long*/ callback75(int /*long*/[] callbackArgs) {
+static long /*int*/ callback75(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method75(args);
}
-static int /*long*/ callback76(int /*long*/[] callbackArgs) {
+static long /*int*/ callback76(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method76(args);
}
-static int /*long*/ callback77(int /*long*/[] callbackArgs) {
+static long /*int*/ callback77(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method77(args);
}
-static int /*long*/ callback78(int /*long*/[] callbackArgs) {
+static long /*int*/ callback78(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method78(args);
}
-static int /*long*/ callback79(int /*long*/[] callbackArgs) {
+static long /*int*/ callback79(long /*int*/[] callbackArgs) {
// find the object on which this call was invoked
- int /*long*/ address = callbackArgs[0];
+ long /*int*/ address = callbackArgs[0];
Object object = ObjectMap.get(new LONG(address));
if (object == null) return COM.E_FAIL;
- int /*long*/[] args = new int /*long*/[callbackArgs.length - 1];
+ long /*int*/[] args = new long /*int*/[callbackArgs.length - 1];
System.arraycopy(callbackArgs, 1, args, 0, args.length);
return ((COMObject) object).method79(args);
}
public void dispose() {
// free the memory for this reference
- int /*long*/[] pVtable = new int /*long*/[1];
+ long /*int*/[] pVtable = new long /*int*/[1];
OS.MoveMemory(pVtable, ppVtable, OS.PTR_SIZEOF);
OS.GlobalFree(pVtable[0]);
OS.GlobalFree(ppVtable);
@@ -787,247 +787,247 @@ public void dispose() {
ppVtable = 0;
}
-public int /*long*/ getAddress () {
+public long /*int*/ getAddress () {
return ppVtable;
}
-public int /*long*/ method0(int /*long*/[] args) {
+public long /*int*/ method0(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method1(int /*long*/[] args) {
+public long /*int*/ method1(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method2(int /*long*/[] args) {
+public long /*int*/ method2(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method3(int /*long*/[] args) {
+public long /*int*/ method3(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method4(int /*long*/[] args) {
+public long /*int*/ method4(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method5(int /*long*/[] args) {
+public long /*int*/ method5(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method6(int /*long*/[] args) {
+public long /*int*/ method6(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method7(int /*long*/[] args) {
+public long /*int*/ method7(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method8(int /*long*/[] args) {
+public long /*int*/ method8(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method9(int /*long*/[] args) {
+public long /*int*/ method9(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method10(int /*long*/[] args) {
+public long /*int*/ method10(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method11(int /*long*/[] args) {
+public long /*int*/ method11(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method12(int /*long*/[] args) {
+public long /*int*/ method12(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method13(int /*long*/[] args) {
+public long /*int*/ method13(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method14(int /*long*/[] args) {
+public long /*int*/ method14(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method15(int /*long*/[] args) {
+public long /*int*/ method15(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method16(int /*long*/[] args) {
+public long /*int*/ method16(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method17(int /*long*/[] args) {
+public long /*int*/ method17(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method18(int /*long*/[] args) {
+public long /*int*/ method18(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method19(int /*long*/[] args) {
+public long /*int*/ method19(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method20(int /*long*/[] args) {
+public long /*int*/ method20(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method21(int /*long*/[] args) {
+public long /*int*/ method21(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method22(int /*long*/[] args) {
+public long /*int*/ method22(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method23(int /*long*/[] args) {
+public long /*int*/ method23(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method24(int /*long*/[] args) {
+public long /*int*/ method24(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method25(int /*long*/[] args) {
+public long /*int*/ method25(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method26(int /*long*/[] args) {
+public long /*int*/ method26(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method27(int /*long*/[] args) {
+public long /*int*/ method27(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method28(int /*long*/[] args) {
+public long /*int*/ method28(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method29(int /*long*/[] args) {
+public long /*int*/ method29(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method30(int /*long*/[] args) {
+public long /*int*/ method30(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method31(int /*long*/[] args) {
+public long /*int*/ method31(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method32(int /*long*/[] args) {
+public long /*int*/ method32(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method33(int /*long*/[] args) {
+public long /*int*/ method33(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method34(int /*long*/[] args) {
+public long /*int*/ method34(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method35(int /*long*/[] args) {
+public long /*int*/ method35(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method36(int /*long*/[] args) {
+public long /*int*/ method36(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method37(int /*long*/[] args) {
+public long /*int*/ method37(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method38(int /*long*/[] args) {
+public long /*int*/ method38(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method39(int /*long*/[] args) {
+public long /*int*/ method39(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method40(int /*long*/[] args) {
+public long /*int*/ method40(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method41(int /*long*/[] args) {
+public long /*int*/ method41(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method42(int /*long*/[] args) {
+public long /*int*/ method42(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method43(int /*long*/[] args) {
+public long /*int*/ method43(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method44(int /*long*/[] args) {
+public long /*int*/ method44(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method45(int /*long*/[] args) {
+public long /*int*/ method45(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method46(int /*long*/[] args) {
+public long /*int*/ method46(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method47(int /*long*/[] args) {
+public long /*int*/ method47(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method48(int /*long*/[] args) {
+public long /*int*/ method48(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method49(int /*long*/[] args) {
+public long /*int*/ method49(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method50(int /*long*/[] args) {
+public long /*int*/ method50(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method51(int /*long*/[] args) {
+public long /*int*/ method51(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method52(int /*long*/[] args) {
+public long /*int*/ method52(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method53(int /*long*/[] args) {
+public long /*int*/ method53(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method54(int /*long*/[] args) {
+public long /*int*/ method54(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method55(int /*long*/[] args) {
+public long /*int*/ method55(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method56(int /*long*/[] args) {
+public long /*int*/ method56(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method57(int /*long*/[] args) {
+public long /*int*/ method57(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method58(int /*long*/[] args) {
+public long /*int*/ method58(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method59(int /*long*/[] args) {
+public long /*int*/ method59(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method60(int /*long*/[] args) {
+public long /*int*/ method60(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method61(int /*long*/[] args) {
+public long /*int*/ method61(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method62(int /*long*/[] args) {
+public long /*int*/ method62(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method63(int /*long*/[] args) {
+public long /*int*/ method63(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method64(int /*long*/[] args) {
+public long /*int*/ method64(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method65(int /*long*/[] args) {
+public long /*int*/ method65(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method66(int /*long*/[] args) {
+public long /*int*/ method66(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method67(int /*long*/[] args) {
+public long /*int*/ method67(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method68(int /*long*/[] args) {
+public long /*int*/ method68(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method69(int /*long*/[] args) {
+public long /*int*/ method69(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method70(int /*long*/[] args) {
+public long /*int*/ method70(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method71(int /*long*/[] args) {
+public long /*int*/ method71(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method72(int /*long*/[] args) {
+public long /*int*/ method72(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method73(int /*long*/[] args) {
+public long /*int*/ method73(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method74(int /*long*/[] args) {
+public long /*int*/ method74(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method75(int /*long*/[] args) {
+public long /*int*/ method75(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method76(int /*long*/[] args) {
+public long /*int*/ method76(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method77(int /*long*/[] args) {
+public long /*int*/ method77(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method78(int /*long*/[] args) {
+public long /*int*/ method78(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
-public int /*long*/ method79(int /*long*/[] args) {
+public long /*int*/ method79(long /*int*/[] args) {
return COM.E_NOTIMPL;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java
index bb29d26cd3..2fdea5ed92 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java
@@ -390,7 +390,7 @@ public static String findProgramID (String extension) {
return ""; //$NON-NLS-1$
}
static String getKeyValue (TCHAR key) {
- int /*long*/ [] phkResult = new int /*long*/ [1];
+ long /*int*/ [] phkResult = new long /*int*/ [1];
if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) != 0) {
return null;
}
@@ -413,7 +413,7 @@ static String getKeyValue (TCHAR key) {
return result;
}
private static boolean getKeyExists (TCHAR key) {
- int /*long*/ [] phkResult = new int /*long*/ [1];
+ long /*int*/ [] phkResult = new long /*int*/ [1];
if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) != 0) {
return false;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java
index 62cf4b11c4..c176377f19 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java
@@ -94,7 +94,7 @@ OleAutomation(IDispatch idispatch) {
objIDispatch = idispatch;
objIDispatch.AddRef();
- int /*long*/[] ppv = new int /*long*/[1];
+ long /*int*/[] ppv = new long /*int*/[1];
/* GetTypeInfo([in] iTInfo, [in] lcid, [out] ppTInfo)
* AddRef has already been called on ppTInfo by the callee and must be released by the caller.
*/
@@ -117,7 +117,7 @@ public OleAutomation(OleClientSite clientSite) {
if (clientSite == null) OLE.error(OLE.ERROR_INVALID_INTERFACE_ADDRESS);
objIDispatch = clientSite.getAutomationObject();
- int /*long*/[] ppv = new int /*long*/[1];
+ long /*int*/[] ppv = new long /*int*/[1];
/* GetTypeInfo([in] iTInfo, [in] lcid, [out] ppTInfo)
* AddRef has already been called on ppTInfo by the callee and must be released by the caller.
*/
@@ -152,7 +152,7 @@ public OleAutomation(String progId) {
}
int flags = COM.CLSCTX_INPROC_SERVER;
if (progId.startsWith("Excel")) flags |= COM.CLSCTX_LOCAL_SERVER; //$NON-NLS-1$
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
int result = COM.CoCreateInstance(appClsid, 0, flags, COM.IIDIUnknown, ppvObject);
if (result != COM.S_OK) {
OS.OleUninitialize();
@@ -199,7 +199,7 @@ public void dispose() {
}
objIUnknown = null;
}
-int /*long*/ getAddress() {
+long /*int*/ getAddress() {
return objIDispatch.getAddress();
}
GUID getClassID(String clientName) {
@@ -254,7 +254,7 @@ public String getDocumentation(int dispId) {
*/
public OlePropertyDescription getPropertyDescription(int index) {
if (objITypeInfo == null) return null;
- int /*long*/[] ppVarDesc = new int /*long*/[1];
+ long /*int*/[] ppVarDesc = new long /*int*/[1];
int rc = objITypeInfo.GetVarDesc(index, ppVarDesc);
if (rc != OLE.S_OK) return null;
VARDESC vardesc = new VARDESC();
@@ -285,7 +285,7 @@ public OlePropertyDescription getPropertyDescription(int index) {
*/
public OleFunctionDescription getFunctionDescription(int index) {
if (objITypeInfo == null) return null;
- int /*long*/[] ppFuncDesc = new int /*long*/[1];
+ long /*int*/[] ppFuncDesc = new long /*int*/[1];
int rc = objITypeInfo.GetFuncDesc(index, ppFuncDesc);
if (rc != OLE.S_OK) return null;
FUNCDESC funcdesc = new FUNCDESC();
@@ -316,7 +316,7 @@ public OleFunctionDescription getFunctionDescription(int index) {
short[] vt = new short[1];
COM.MoveMemory(vt, funcdesc.lprgelemdescParam + i * COM.ELEMDESC_sizeof() + OS.PTR_SIZEOF, 2);
if (vt[0] == OLE.VT_PTR) {
- int /*long*/ [] pTypedesc = new int /*long*/ [1];
+ long /*int*/ [] pTypedesc = new long /*int*/ [1];
COM.MoveMemory(pTypedesc, funcdesc.lprgelemdescParam + i * COM.ELEMDESC_sizeof(), OS.PTR_SIZEOF);
short[] vt2 = new short[1];
COM.MoveMemory(vt2, pTypedesc[0] + OS.PTR_SIZEOF, 2);
@@ -347,7 +347,7 @@ public OleFunctionDescription getFunctionDescription(int index) {
*/
public TYPEATTR getTypeInfoAttributes() {
if (objITypeInfo == null) return null;
- int /*long*/ [] ppTypeAttr = new int /*long*/ [1];
+ long /*int*/ [] ppTypeAttr = new long /*int*/ [1];
int rc = objITypeInfo.GetTypeAttr(ppTypeAttr);
if (rc != OLE.S_OK) return null;
TYPEATTR typeattr = new TYPEATTR();
@@ -476,8 +476,8 @@ public boolean equals(Object object) {
if (objIDispatch == null) return false;
OleAutomation oleAutomation = ((OleAutomation) object);
if (oleAutomation.objIDispatch == null) return false;
- int /*long*/ address1 = objIDispatch.getAddress();
- int /*long*/ address2 = oleAutomation.objIDispatch.getAddress();
+ long /*int*/ address1 = objIDispatch.getAddress();
+ long /*int*/ address2 = oleAutomation.objIDispatch.getAddress();
return address1 == address2;
}
return false;
@@ -566,7 +566,7 @@ private int invoke(int dispIdMember, int wFlags, Variant[] rgvarg, int[] rgdispi
// invoke the method
EXCEPINFO excepInfo = new EXCEPINFO();
int[] pArgErr = new int[1];
- int /*long*/ pVarResultAddress = 0;
+ long /*int*/ pVarResultAddress = 0;
if (pVarResult != null) pVarResultAddress = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof);
int result = objIDispatch.Invoke(dispIdMember, new GUID(), COM.LOCALE_USER_DEFAULT, wFlags, pDispParams, pVarResultAddress, excepInfo, pArgErr);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java
index f05b576148..e10840d41f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java
@@ -229,14 +229,14 @@ public OleClientSite(Composite parent, int style, String progId) {
tempStorage = createTempStorage();
// Create ole object with storage object
- int /*long*/[] address = new int /*long*/[1];
+ long /*int*/[] address = new long /*int*/[1];
/*
* Bug in ICA Client 2.7. The creation of the IOleObject fails if the client
* site is provided to OleCreate(). The fix is to detect that the program
* id is an ICA Client and do not pass a client site to OleCreate().
* IOleObject.SetClientSite() is called later on.
*/
- int /*long*/ clientSite = isICAClient() ? 0 : iOleClientSite.getAddress();
+ long /*int*/ clientSite = isICAClient() ? 0 : iOleClientSite.getAddress();
int result = COM.OleCreate(appClsid, COM.IIDIUnknown, COM.OLERENDER_DRAW, null, clientSite, tempStorage.getAddress(), address);
if (result != COM.S_OK)
OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result);
@@ -317,7 +317,7 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) {
// Using the same application that created file, therefore, use default mechanism.
tempStorage = createTempStorage();
// Create ole object with storage object
- int /*long*/[] address = new int /*long*/[1];
+ long /*int*/[] address = new long /*int*/[1];
int result = COM.OleCreateFromFile(appClsid, fileName, COM.IIDIUnknown, COM.OLERENDER_DRAW, null, iOleClientSite.getAddress(), tempStorage.getAddress(), address);
if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result);
objIUnknown = new IUnknown(address[0]);
@@ -325,14 +325,14 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) {
// Not using the same application that created file, therefore, copy from original file to a new storage file
IStorage storage = null;
if (COM.StgIsStorageFile(fileName) == COM.S_OK) {
- int /*long*/[] address = new int /*long*/[1];
+ long /*int*/[] address = new long /*int*/[1];
int mode = COM.STGM_READ | COM.STGM_TRANSACTED | COM.STGM_SHARE_EXCLUSIVE;
int result = COM.StgOpenStorage(fileName, 0, mode, 0, 0, address); //Does an AddRef if successful
if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_OPEN_FILE, result);
storage = new IStorage(address[0]);
} else {
// Original file is not a Storage file so copy contents to a stream in a new storage file
- int /*long*/[] address = new int /*long*/[1];
+ long /*int*/[] address = new long /*int*/[1];
int mode = COM.STGM_READWRITE | COM.STGM_DIRECT | COM.STGM_SHARE_EXCLUSIVE | COM.STGM_CREATE;
int result = COM.StgCreateDocfile(null, mode | COM.STGM_DELETEONRELEASE, 0, address); // Increments ref count if successful
if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_OPEN_FILE, result);
@@ -344,7 +344,7 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) {
GUID wordGUID = getClassID(WORDPROGID);
if (wordGUID != null && COM.IsEqualGUID(appClsid, wordGUID)) streamName = "WordDocument"; //$NON-NLS-1$
if (isOffice2007) streamName = "Package"; //$NON-NLS-1$
- address = new int /*long*/[1];
+ address = new long /*int*/[1];
result = storage.CreateStream(streamName, mode, 0, 0, address); // Increments ref count if successful
if (result != COM.S_OK) {
storage.Release();
@@ -358,7 +358,7 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) {
byte[] buffer = new byte[increment];
int count = 0;
while((count = fileInput.read(buffer)) > 0){
- int /*long*/ pv = COM.CoTaskMemAlloc(count);
+ long /*int*/ pv = COM.CoTaskMemAlloc(count);
OS.MoveMemory(pv, buffer, count);
result = stream.Write(pv, count, null) ;
COM.CoTaskMemFree(pv);
@@ -387,12 +387,12 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) {
if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_OPEN_FILE, result);
// create ole client
- int /*long*/[] ppv = new int /*long*/[1];
+ long /*int*/[] ppv = new long /*int*/[1];
result = COM.CoCreateInstance(appClsid, 0, COM.CLSCTX_INPROC_HANDLER | COM.CLSCTX_INPROC_SERVER, COM.IIDIUnknown, ppv);
if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result);
objIUnknown = new IUnknown(ppv[0]);
// get the persistent storage of the ole client
- ppv = new int /*long*/[1];
+ ppv = new long /*int*/[1];
result = objIUnknown.QueryInterface(COM.IIDIPersistStorage, ppv);
if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result);
IPersistStorage iPersistStorage = new IPersistStorage(ppv[0]);
@@ -409,7 +409,7 @@ void OleCreate(GUID appClsid, GUID fileClsid, char[] fileName, File file) {
}
protected void addObjectReferences() {
//
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
if (objIUnknown.QueryInterface(COM.IIDIPersist, ppvObject) == COM.S_OK) {
IPersist objIPersist = new IPersist(ppvObject[0]);
GUID tempid = new GUID();
@@ -419,7 +419,7 @@ protected void addObjectReferences() {
}
//
- ppvObject = new int /*long*/[1];
+ ppvObject = new long /*int*/[1];
int result = objIUnknown.QueryInterface(COM.IIDIViewObject2, ppvObject);
if (result != COM.S_OK)
OLE.error(OLE.ERROR_INTERFACE_NOT_FOUND, result);
@@ -427,7 +427,7 @@ protected void addObjectReferences() {
objIViewObject2.SetAdvise(aspect, 0, iAdviseSink.getAddress());
//
- ppvObject = new int /*long*/[1];
+ ppvObject = new long /*int*/[1];
result = objIUnknown.QueryInterface(COM.IIDIOleObject, ppvObject);
if (result != COM.S_OK)
OLE.error(OLE.ERROR_INTERFACE_NOT_FOUND, result);
@@ -439,7 +439,7 @@ protected void addObjectReferences() {
* during OleCreate. The fix is to check whether the clientSite has already been set
* and set it. Note that setting it twice can result in assert failures.
*/
- int /*long*/[] ppvClientSite = new int /*long*/[1];
+ long /*int*/[] ppvClientSite = new long /*int*/[1];
result = objIOleObject.GetClientSite(ppvClientSite);
if (ppvClientSite[0] == 0) {
objIOleObject.SetClientSite(iOleClientSite.getAddress());
@@ -454,10 +454,10 @@ protected void addObjectReferences() {
COM.OleSetContainedObject(objIUnknown.getAddress(), true);
// Is OLE object linked or embedded?
- ppvObject = new int /*long*/[1];
+ ppvObject = new long /*int*/[1];
if (objIUnknown.QueryInterface(COM.IIDIOleLink, ppvObject) == COM.S_OK) {
IOleLink objIOleLink = new IOleLink(ppvObject[0]);
- int /*long*/[] ppmk = new int /*long*/[1];
+ long /*int*/[] ppmk = new long /*int*/[1];
if (objIOleLink.GetSourceMoniker(ppmk) == COM.S_OK) {
IMoniker objIMoniker = new IMoniker(ppmk[0]);
objIMoniker.Release();
@@ -485,67 +485,67 @@ private int ContextSensitiveHelp(int fEnterMode) {
protected void createCOMInterfaces() {
iUnknown = new COMObject(new int[]{2, 0, 0}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
};
iOleClientSite = new COMObject(new int[]{2, 0, 0, 0, 3, 1, 0, 1, 0}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return SaveObject();}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return SaveObject();}
// method4 GetMoniker - not implemented
- public int /*long*/ method5(int /*long*/[] args) {return GetContainer(args[0]);}
- public int /*long*/ method6(int /*long*/[] args) {return ShowObject();}
- public int /*long*/ method7(int /*long*/[] args) {return OnShowWindow((int)/*64*/args[0]);}
+ public long /*int*/ method5(long /*int*/[] args) {return GetContainer(args[0]);}
+ public long /*int*/ method6(long /*int*/[] args) {return ShowObject();}
+ public long /*int*/ method7(long /*int*/[] args) {return OnShowWindow((int)/*64*/args[0]);}
// method8 RequestNewObjectLayout - not implemented
};
iAdviseSink = new COMObject(new int[]{2, 0, 0, 2, 2, 1, 0, 0}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return OnDataChange(args[0], args[1]);}
- public int /*long*/ method4(int /*long*/[] args) {return OnViewChange((int)/*64*/args[0], (int)/*64*/args[1]);}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return OnDataChange(args[0], args[1]);}
+ public long /*int*/ method4(long /*int*/[] args) {return OnViewChange((int)/*64*/args[0], (int)/*64*/args[1]);}
//method5 OnRename - not implemented
- public int /*long*/ method6(int /*long*/[] args) {OnSave();return 0;}
- public int /*long*/ method7(int /*long*/[] args) {return OnClose();}
+ public long /*int*/ method6(long /*int*/[] args) {OnSave();return 0;}
+ public long /*int*/ method7(long /*int*/[] args) {return OnClose();}
};
iOleInPlaceSite = new COMObject(new int[]{2, 0, 0, 1, 1, 0, 0, 0, 5, C.PTR_SIZEOF == 4 ? 2 : 1, 1, 0, 0, 0, 1}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return GetWindow(args[0]);}
- public int /*long*/ method4(int /*long*/[] args) {return ContextSensitiveHelp((int)/*64*/args[0]);}
- public int /*long*/ method5(int /*long*/[] args) {return CanInPlaceActivate();}
- public int /*long*/ method6(int /*long*/[] args) {return OnInPlaceActivate();}
- public int /*long*/ method7(int /*long*/[] args) {return OnUIActivate();}
- public int /*long*/ method8(int /*long*/[] args) {return GetWindowContext(args[0], args[1], args[2], args[3], args[4]);}
- public int /*long*/ method9(int /*long*/[] args) {
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return GetWindow(args[0]);}
+ public long /*int*/ method4(long /*int*/[] args) {return ContextSensitiveHelp((int)/*64*/args[0]);}
+ public long /*int*/ method5(long /*int*/[] args) {return CanInPlaceActivate();}
+ public long /*int*/ method6(long /*int*/[] args) {return OnInPlaceActivate();}
+ public long /*int*/ method7(long /*int*/[] args) {return OnUIActivate();}
+ public long /*int*/ method8(long /*int*/[] args) {return GetWindowContext(args[0], args[1], args[2], args[3], args[4]);}
+ public long /*int*/ method9(long /*int*/[] args) {
if (args.length == 2) {
return Scroll((int)/*64*/args[0], (int)/*64*/args[1]);
} else {
return Scroll_64(args[0]);
}
}
- public int /*long*/ method10(int /*long*/[] args) {return OnUIDeactivate((int)/*64*/args[0]);}
- public int /*long*/ method11(int /*long*/[] args) {return OnInPlaceDeactivate();}
+ public long /*int*/ method10(long /*int*/[] args) {return OnUIDeactivate((int)/*64*/args[0]);}
+ public long /*int*/ method11(long /*int*/[] args) {return OnInPlaceDeactivate();}
// method12 DiscardUndoState - not implemented
// method13 DeactivateAndUndoChange - not implemented
- public int /*long*/ method14(int /*long*/[] args) {return OnPosRectChange(args[0]);}
+ public long /*int*/ method14(long /*int*/[] args) {return OnPosRectChange(args[0]);}
};
iOleDocumentSite = new COMObject(new int[]{2, 0, 0, 1}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return ActivateMe(args[0]);}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return ActivateMe(args[0]);}
};
}
protected IStorage createTempStorage() {
- int /*long*/[] tempStorage = new int /*long*/[1];
+ long /*int*/[] tempStorage = new long /*int*/[1];
int grfMode = COM.STGM_READWRITE | COM.STGM_SHARE_EXCLUSIVE | COM.STGM_DELETEONRELEASE;
int result = COM.StgCreateDocfile(null, grfMode, 0, tempStorage);
if (result != COM.S_OK) OLE.error(OLE.ERROR_CANNOT_CREATE_FILE, result);
@@ -635,18 +635,18 @@ public int doVerb(int verb) {
public int exec(int cmdID, int options, Variant in, Variant out) {
if (objIOleCommandTarget == null) {
- int /*long*/[] address = new int /*long*/[1];
+ long /*int*/[] address = new long /*int*/[1];
if (objIUnknown.QueryInterface(COM.IIDIOleCommandTarget, address) != COM.S_OK)
return OLE.ERROR_INTERFACE_NOT_FOUND;
objIOleCommandTarget = new IOleCommandTarget(address[0]);
}
- int /*long*/ inAddress = 0;
+ long /*int*/ inAddress = 0;
if (in != null){
inAddress = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof);
in.getData(inAddress);
}
- int /*long*/ outAddress = 0;
+ long /*int*/ outAddress = 0;
if (out != null){
outAddress = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, VARIANT.sizeof);
out.getData(outAddress);
@@ -667,7 +667,7 @@ public int exec(int cmdID, int options, Variant in, Variant out) {
return result;
}
IDispatch getAutomationObject() {
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
if (objIUnknown.QueryInterface(COM.IIDIDispatch, ppvObject) != COM.S_OK)
return null;
return new IDispatch(ppvObject[0]);
@@ -689,13 +689,13 @@ protected GUID getClassID(String clientName) {
}
return guid;
}
-private int GetContainer(int /*long*/ ppContainer) {
+private int GetContainer(long /*int*/ ppContainer) {
/* Simple containers that do not support links to their embedded
* objects probably do not need to implement this method. Instead,
* they can return E_NOINTERFACE and set ppContainer to NULL.
*/
if (ppContainer != 0)
- COM.MoveMemory(ppContainer, new int /*long*/[]{0}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppContainer, new long /*int*/[]{0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
private SIZE getExtent() {
@@ -731,11 +731,11 @@ public String getProgramID(){
}
String getProgID(GUID clsid) {
if (clsid != null){
- int /*long*/[] lplpszProgID = new int /*long*/[1];
+ long /*int*/[] lplpszProgID = new long /*int*/[1];
if (COM.ProgIDFromCLSID(clsid, lplpszProgID) == COM.S_OK) {
- int /*long*/ hMem = lplpszProgID[0];
+ long /*int*/ hMem = lplpszProgID[0];
int length = OS.GlobalSize(hMem);
- int /*long*/ ptr = OS.GlobalLock(hMem);
+ long /*int*/ ptr = OS.GlobalLock(hMem);
char[] buffer = new char[length];
COM.MoveMemory(buffer, ptr, length);
OS.GlobalUnlock(hMem);
@@ -749,9 +749,9 @@ String getProgID(GUID clsid) {
}
return null;
}
-int ActivateMe(int /*long*/ pViewToActivate) {
+int ActivateMe(long /*int*/ pViewToActivate) {
if (pViewToActivate == 0) {
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
if (objIUnknown.QueryInterface(COM.IIDIOleDocument, ppvObject) != COM.S_OK) return COM.E_FAIL;
IOleDocument objOleDocument = new IOleDocument(ppvObject[0]);
if (objOleDocument.CreateView(iOleInPlaceSite.getAddress(), 0, 0, ppvObject) != COM.S_OK) return COM.E_FAIL;
@@ -768,16 +768,16 @@ int ActivateMe(int /*long*/ pViewToActivate) {
objDocumentView.Show(1);//TRUE
return COM.S_OK;
}
-protected int GetWindow(int /*long*/ phwnd) {
+protected int GetWindow(long /*int*/ phwnd) {
if (phwnd == 0)
return COM.E_INVALIDARG;
if (frame == null) {
- COM.MoveMemory(phwnd, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ COM.MoveMemory(phwnd, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOTIMPL;
}
// Copy the Window's handle into the memory passed in
- COM.MoveMemory(phwnd, new int /*long*/[] {handle}, OS.PTR_SIZEOF);
+ COM.MoveMemory(phwnd, new long /*int*/[] {handle}, OS.PTR_SIZEOF);
return COM.S_OK;
}
RECT getRect() {
@@ -789,17 +789,17 @@ RECT getRect() {
rect.bottom = area.y + area.height;
return rect;
}
-private int GetWindowContext(int /*long*/ ppFrame, int /*long*/ ppDoc, int /*long*/ lprcPosRect, int /*long*/ lprcClipRect, int /*long*/ lpFrameInfo) {
+private int GetWindowContext(long /*int*/ ppFrame, long /*int*/ ppDoc, long /*int*/ lprcPosRect, long /*int*/ lprcClipRect, long /*int*/ lpFrameInfo) {
if (frame == null || ppFrame == 0)
return COM.E_NOTIMPL;
// fill in frame handle
- int /*long*/ iOleInPlaceFrame = frame.getIOleInPlaceFrame();
- COM.MoveMemory(ppFrame, new int /*long*/[] {iOleInPlaceFrame}, OS.PTR_SIZEOF);
+ long /*int*/ iOleInPlaceFrame = frame.getIOleInPlaceFrame();
+ COM.MoveMemory(ppFrame, new long /*int*/[] {iOleInPlaceFrame}, OS.PTR_SIZEOF);
frame.AddRef();
// null out document handle
- if (ppDoc != 0) COM.MoveMemory(ppDoc, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ if (ppDoc != 0) COM.MoveMemory(ppDoc, new long /*int*/[] {0}, OS.PTR_SIZEOF);
// fill in position and clipping info
RECT rect = getRect();
@@ -814,10 +814,10 @@ private int GetWindowContext(int /*long*/ ppFrame, int /*long*/ ppDoc, int /*lon
Shell shell = getShell();
Menu menubar = shell.getMenuBar();
if (menubar != null && !menubar.isDisposed()) {
- int /*long*/ hwnd = shell.handle;
+ long /*int*/ hwnd = shell.handle;
int cAccel = (int)/*64*/OS.SendMessage(hwnd, OS.WM_APP, 0, 0);
if (cAccel != 0) {
- int /*long*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0);
+ long /*int*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0);
if (hAccel != 0) {
frameInfo.cAccelEntries = cAccel;
frameInfo.haccel = hAccel;
@@ -847,7 +847,7 @@ public boolean isDirty() {
*/
// Get access to the persistent storage mechanism
- int /*long*/[] address = new int /*long*/[1];
+ long /*int*/[] address = new long /*int*/[1];
if (objIOleObject.QueryInterface(COM.IIDIPersistFile, address) != COM.S_OK)
return true;
IPersistFile permStorage = new IPersistFile(address[0]);
@@ -859,9 +859,9 @@ public boolean isDirty() {
}
public boolean isFocusControl () {
checkWidget ();
- int /*long*/ focusHwnd = OS.GetFocus();
+ long /*int*/ focusHwnd = OS.GetFocus();
if (objIOleInPlaceObject == null) return (handle == focusHwnd);
- int /*long*/[] phwnd = new int /*long*/[1];
+ long /*int*/[] phwnd = new long /*int*/[1];
objIOleInPlaceObject.GetWindow(phwnd);
while (focusHwnd != 0) {
if (phwnd[0] == focusHwnd) return true;
@@ -889,7 +889,7 @@ private boolean isOffice2007(boolean program) {
private int OnClose() {
return COM.S_OK;
}
-private int OnDataChange(int /*long*/ pFormatetc, int /*long*/ pStgmed) {
+private int OnDataChange(long /*int*/ pFormatetc, long /*int*/ pStgmed) {
return COM.S_OK;
}
private void onDispose(Event e) {
@@ -918,7 +918,7 @@ private void onDispose(Event e) {
void onFocusIn(Event e) {
if (inDispose) return;
if (state != STATE_UIACTIVE) {
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
if (objIUnknown.QueryInterface(COM.IIDIOleInPlaceObject, ppvObject) == COM.S_OK) {
IOleInPlaceObject objIOleInPlaceObject = new IOleInPlaceObject(ppvObject[0]);
objIOleInPlaceObject.Release();
@@ -927,7 +927,7 @@ void onFocusIn(Event e) {
}
if (objIOleInPlaceObject == null) return;
if (isFocusControl()) return;
- int /*long*/[] phwnd = new int /*long*/[1];
+ long /*int*/[] phwnd = new long /*int*/[1];
objIOleInPlaceObject.GetWindow(phwnd);
if (phwnd[0] == 0) return;
OS.SetFocus(phwnd[0]);
@@ -939,7 +939,7 @@ private int OnInPlaceActivate() {
frame.setCurrentDocument(this);
if (objIOleObject == null)
return COM.S_OK;
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
if (objIOleObject.QueryInterface(COM.IIDIOleInPlaceObject, ppvObject) == COM.S_OK) {
objIOleInPlaceObject = new IOleInPlaceObject(ppvObject[0]);
}
@@ -956,7 +956,7 @@ private int OnInPlaceDeactivate() {
}
return COM.S_OK;
}
-private int OnPosRectChange(int /*long*/ lprcPosRect) {
+private int OnPosRectChange(long /*int*/ lprcPosRect) {
Point size = getSize();
setExtent(size.x, size.y);
return COM.S_OK;
@@ -974,7 +974,7 @@ private void onPaint(Event e) {
rect.top = area.y; rect.bottom = area.y + size.cy;
}
- int /*long*/ pArea = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, RECT.sizeof);
+ long /*int*/ pArea = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, RECT.sizeof);
OS.MoveMemory(pArea, rect, RECT.sizeof);
COM.OleDraw(objIUnknown.getAddress(), aspect, e.gc.handle, pArea);
OS.GlobalFree(pArea);
@@ -991,7 +991,7 @@ private int OnShowWindow(int fShow) {
private int OnUIActivate() {
if (objIOleInPlaceObject == null) return COM.E_FAIL;
state = STATE_UIACTIVE;
- int /*long*/[] phwnd = new int /*long*/[1];
+ long /*int*/[] phwnd = new long /*int*/[1];
if (objIOleInPlaceObject.GetWindow(phwnd) == COM.S_OK) {
OS.SetWindowPos(phwnd[0], OS.HWND_TOP, 0, 0, 0, 0, OS.SWP_NOSIZE | OS.SWP_NOMOVE);
}
@@ -1011,7 +1011,7 @@ int OnUIDeactivate(int fUndoable) {
if (menubar == null || menubar.isDisposed())
return COM.S_OK;
- int /*long*/ shellHandle = shell.handle;
+ long /*int*/ shellHandle = shell.handle;
OS.SetMenu(shellHandle, menubar.handle);
return COM.OleSetMenuDescriptor(0, shellHandle, 0, 0, 0);
}
@@ -1031,7 +1031,7 @@ private void onTraverse(Event event) {
private int OnViewChange(int dwAspect, int lindex) {
return COM.S_OK;
}
-protected int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) {
+protected int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0)
return COM.E_NOINTERFACE;
@@ -1039,34 +1039,34 @@ protected int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) {
COM.MoveMemory(guid, riid, GUID.sizeof);
if (COM.IsEqualGUID(guid, COM.IIDIUnknown)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iUnknown.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iUnknown.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
if (COM.IsEqualGUID(guid, COM.IIDIAdviseSink)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iAdviseSink.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iAdviseSink.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
if (COM.IsEqualGUID(guid, COM.IIDIOleClientSite)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iOleClientSite.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iOleClientSite.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
if (COM.IsEqualGUID(guid, COM.IIDIOleInPlaceSite)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iOleInPlaceSite.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iOleInPlaceSite.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
if (COM.IsEqualGUID(guid, COM.IIDIOleDocumentSite )) {
String progID = getProgramID();
if (!progID.startsWith("PowerPoint")) { //$NON-NLS-1$
- COM.MoveMemory(ppvObject, new int /*long*/[] {iOleDocumentSite.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iOleDocumentSite.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
}
- COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
/**
@@ -1084,7 +1084,7 @@ protected int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) {
public int queryStatus(int cmd) {
if (objIOleCommandTarget == null) {
- int /*long*/[] address = new int /*long*/[1];
+ long /*int*/[] address = new long /*int*/[1];
if (objIUnknown.QueryInterface(COM.IIDIOleCommandTarget, address) != COM.S_OK)
return 0;
objIOleCommandTarget = new IOleCommandTarget(address[0]);
@@ -1167,7 +1167,7 @@ public boolean save(File file, boolean includeOleInfo) {
return saveToStorageFile(file);
return saveToTraditionalFile(file);
}
-private boolean saveFromContents(int /*long*/ address, File file) {
+private boolean saveFromContents(long /*int*/ address, File file) {
boolean success = false;
@@ -1178,7 +1178,7 @@ private boolean saveFromContents(int /*long*/ address, File file) {
FileOutputStream writer = new FileOutputStream(file);
int increment = 1024 * 4;
- int /*long*/ pv = COM.CoTaskMemAlloc(increment);
+ long /*int*/ pv = COM.CoTaskMemAlloc(increment);
int[] pcbWritten = new int[1];
while (tempContents.Read(pv, increment, pcbWritten) == COM.S_OK && pcbWritten[0] > 0) {
byte[] buffer = new byte[ pcbWritten[0]];
@@ -1198,7 +1198,7 @@ private boolean saveFromContents(int /*long*/ address, File file) {
return success;
}
-private boolean saveFromOle10Native(int /*long*/ address, File file) {
+private boolean saveFromOle10Native(long /*int*/ address, File file) {
boolean success = false;
@@ -1207,7 +1207,7 @@ private boolean saveFromOle10Native(int /*long*/ address, File file) {
// The "\1Ole10Native" stream contains a DWORD header whose value is the length
// of the native data that follows.
- int /*long*/ pv = COM.CoTaskMemAlloc(4);
+ long /*int*/ pv = COM.CoTaskMemAlloc(4);
int[] size = new int[1];
int rc = tempContents.Read(pv, 4, null);
OS.MoveMemory(size, pv, 4);
@@ -1247,14 +1247,14 @@ private boolean saveOffice2007(File file) {
boolean result = false;
/* Excel fails to open the package stream when the PersistStorage is not in hands off mode */
- int /*long*/[] ppv = new int /*long*/[1];
+ long /*int*/[] ppv = new long /*int*/[1];
IPersistStorage iPersistStorage = null;
if (objIUnknown.QueryInterface(COM.IIDIPersistStorage, ppv) == COM.S_OK) {
iPersistStorage = new IPersistStorage(ppv[0]);
tempStorage.AddRef();
iPersistStorage.HandsOffStorage();
}
- int /*long*/[] address = new int /*long*/[1];
+ long /*int*/[] address = new long /*int*/[1];
int grfMode = COM.STGM_DIRECT | COM.STGM_READ | COM.STGM_SHARE_EXCLUSIVE;
if (tempStorage.OpenStream("Package", 0, grfMode, 0, address) == COM.S_OK) { //$NON-NLS-1$
result = saveFromContents(address[0], file);
@@ -1288,11 +1288,11 @@ private boolean saveToStorageFile(File file) {
if (!updateStorage()) return false;
// get access to the persistent storage mechanism
- int /*long*/[] address = new int /*long*/[1];
+ long /*int*/[] address = new long /*int*/[1];
if (objIOleObject.QueryInterface(COM.IIDIPersistStorage, address) != COM.S_OK) return false;
IPersistStorage permStorage = new IPersistStorage(address[0]);
try {
- address = new int /*long*/[1];
+ address = new long /*int*/[1];
char[] path = (file.getAbsolutePath()+"\0").toCharArray();
int mode = COM.STGM_TRANSACTED | COM.STGM_READWRITE | COM.STGM_SHARE_EXCLUSIVE | COM.STGM_CREATE;
int result = COM.StgCreateDocfile(path, mode, 0, address); //Does an AddRef if successful
@@ -1331,7 +1331,7 @@ private boolean saveToTraditionalFile(File file) {
if (!updateStorage())
return false;
- int /*long*/[] address = new int /*long*/[1];
+ long /*int*/[] address = new long /*int*/[1];
// Look for a CONTENTS stream
if (tempStorage.OpenStream("CONTENTS", 0, COM.STGM_DIRECT | COM.STGM_READ | COM.STGM_SHARE_EXCLUSIVE, 0, address) == COM.S_OK) //$NON-NLS-1$
return saveFromContents(address[0], file);
@@ -1342,7 +1342,7 @@ private boolean saveToTraditionalFile(File file) {
return false;
}
-private int Scroll_64(int /*long*/ scrollExtent) {
+private int Scroll_64(long /*int*/ scrollExtent) {
return COM.S_OK;
}
private int Scroll(int scrollExtent_cx, int scrollExtent_cy) {
@@ -1424,7 +1424,7 @@ private int ShowObject() {
public void showProperties(String title) {
// Get the Property Page information from the OLE Object
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
if (objIUnknown.QueryInterface(COM.IIDISpecifyPropertyPages, ppvObject) != COM.S_OK) return;
ISpecifyPropertyPages objISPP = new ISpecifyPropertyPages(ppvObject[0]);
CAUUID caGUID = new CAUUID();
@@ -1438,7 +1438,7 @@ public void showProperties(String title) {
chTitle = new char[title.length()];
title.getChars(0, title.length(), chTitle, 0);
}
- result = COM.OleCreatePropertyFrame(frame.handle, 10, 10, chTitle, 1, new int /*long*/[] {objIUnknown.getAddress()}, caGUID.cElems, caGUID.pElems, COM.LOCALE_USER_DEFAULT, 0, 0);
+ result = COM.OleCreatePropertyFrame(frame.handle, 10, 10, chTitle, 1, new long /*int*/[] {objIUnknown.getAddress()}, caGUID.cElems, caGUID.pElems, COM.LOCALE_USER_DEFAULT, 0, 0);
// free the property page information
COM.CoTaskMemFree(caGUID.pElems);
@@ -1447,7 +1447,7 @@ private boolean updateStorage() {
if (tempStorage == null) return false;
- int /*long*/[] ppv = new int /*long*/[1];
+ long /*int*/[] ppv = new long /*int*/[1];
if (objIUnknown.QueryInterface(COM.IIDIPersistStorage, ppv) != COM.S_OK) return false;
IPersistStorage iPersistStorage = new IPersistStorage(ppv[0]);
@@ -1469,7 +1469,7 @@ private SIZE xFormHimetricToPixels(SIZE aSize) {
// Return a new Size which is the pixel transformation of a
// size in HIMETRIC units.
- int /*long*/ hDC = OS.GetDC(0);
+ long /*int*/ hDC = OS.GetDC(0);
int xppi = OS.GetDeviceCaps(hDC, 88); // logical pixels/inch in x
int yppi = OS.GetDeviceCaps(hDC, 90); // logical pixels/inch in y
OS.ReleaseDC(0, hDC);
@@ -1484,7 +1484,7 @@ private SIZE xFormPixelsToHimetric(SIZE aSize) {
// Return a new size which is the HIMETRIC transformation of a
// size in pixel units.
- int /*long*/ hDC = OS.GetDC(0);
+ long /*int*/ hDC = OS.GetDC(0);
int xppi = OS.GetDeviceCaps(hDC, 88); // logical pixels/inch in x
int yppi = OS.GetDeviceCaps(hDC, 90); // logical pixels/inch in y
OS.ReleaseDC(0, hDC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java
index b5dda3f6ca..504eebf0b8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java
@@ -55,7 +55,7 @@ public class OleControlSite extends OleClientSite
// supporting Event Sink attributes
private OleEventSink[] oleEventSink = new OleEventSink[0];
private GUID[] oleEventSinkGUID = new GUID[0];
- private int /*long*/[] oleEventSinkIUnknown = new int /*long*/[0];
+ private long /*int*/[] oleEventSinkIUnknown = new long /*int*/[0];
// supporting information for the Control COM object
private CONTROLINFO currentControlInfo;
@@ -129,21 +129,21 @@ public OleControlSite(Composite parent, int style, String progId) {
appClsid = getClassID(progId);
if (appClsid == null) OLE.error(OLE.ERROR_INVALID_CLASSID);
- int /*long*/ licinfo = getLicenseInfo(appClsid);
+ long /*int*/ licinfo = getLicenseInfo(appClsid);
if (licinfo == 0) {
// Open a storage object
tempStorage = createTempStorage();
// Create ole object with storage object
- int /*long*/[] address = new int /*long*/[1];
+ long /*int*/[] address = new long /*int*/[1];
/*
* Bug in ICA Client 2.7. The creation of the IOleObject fails if the client
* site is provided to OleCreate(). The fix is to detect that the program
* id is an ICA Client and do not pass a client site to OleCreate().
* IOleObject.SetClientSite() is called later on.
*/
- int /*long*/ clientSite = isICAClient() ? 0 : iOleClientSite.getAddress();
+ long /*int*/ clientSite = isICAClient() ? 0 : iOleClientSite.getAddress();
int result = COM.OleCreate(appClsid, COM.IIDIUnknown, COM.OLERENDER_DRAW, null, clientSite, tempStorage.getAddress(), address);
if (result != COM.S_OK)
OLE.error(OLE.ERROR_CANNOT_CREATE_OBJECT, result);
@@ -152,7 +152,7 @@ public OleControlSite(Composite parent, int style, String progId) {
} else {
// Prepare the ClassFactory
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
try {
int result = COM.CoGetClassObject(appClsid, COM.CLSCTX_INPROC_HANDLER | COM.CLSCTX_INPROC_SERVER, 0, COM.IIDIClassFactory2, ppvObject);
if (result != COM.S_OK) {
@@ -160,7 +160,7 @@ public OleControlSite(Composite parent, int style, String progId) {
}
IClassFactory2 classFactory = new IClassFactory2(ppvObject[0]);
// Create Com Object
- ppvObject = new int /*long*/[1];
+ ppvObject = new long /*int*/[1];
result = classFactory.CreateInstanceLic(0, 0, COM.IIDIUnknown, licinfo, ppvObject);
classFactory.Release();
if (result != COM.S_OK)
@@ -172,7 +172,7 @@ public OleControlSite(Composite parent, int style, String progId) {
objIUnknown = new IUnknown(ppvObject[0]);
// Prepare a storage medium
- ppvObject = new int /*long*/[1];
+ ppvObject = new long /*int*/[1];
if (objIUnknown.QueryInterface(COM.IIDIPersistStorage, ppvObject) == COM.S_OK) {
IPersistStorage persist = new IPersistStorage(ppvObject[0]);
tempStorage = createTempStorage();
@@ -256,7 +256,7 @@ public void addEventListener(int eventID, OleListener listener) {
}
static GUID getDefaultEventSinkGUID(IUnknown unknown) {
// get Event Sink I/F from IProvideClassInfo2
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
if (unknown.QueryInterface(COM.IIDIProvideClassInfo2, ppvObject) == COM.S_OK) {
IProvideClassInfo2 pci2 = new IProvideClassInfo2(ppvObject[0]);
GUID riid = new GUID();
@@ -268,14 +268,14 @@ static GUID getDefaultEventSinkGUID(IUnknown unknown) {
// get Event Sink I/F from IProvideClassInfo
if (unknown.QueryInterface(COM.IIDIProvideClassInfo, ppvObject) == COM.S_OK) {
IProvideClassInfo pci = new IProvideClassInfo(ppvObject[0]);
- int /*long*/[] ppTI = new int /*long*/[1];
- int /*long*/[] ppEI = new int /*long*/[1];
+ long /*int*/[] ppTI = new long /*int*/[1];
+ long /*int*/[] ppEI = new long /*int*/[1];
int result = pci.GetClassInfo(ppTI);
pci.Release();
if (result == COM.S_OK && ppTI[0] != 0) {
ITypeInfo classInfo = new ITypeInfo(ppTI[0]);
- int /*long*/[] ppTypeAttr = new int /*long*/[1];
+ long /*int*/[] ppTypeAttr = new long /*int*/[1];
result = classInfo.GetTypeAttr(ppTypeAttr);
if (result == COM.S_OK && ppTypeAttr[0] != 0) {
TYPEATTR typeAttribute = new TYPEATTR();
@@ -300,7 +300,7 @@ static GUID getDefaultEventSinkGUID(IUnknown unknown) {
if (ppEI[0] != 0) {
ITypeInfo eventInfo = new ITypeInfo(ppEI[0]);
- ppTypeAttr = new int /*long*/[1];
+ ppTypeAttr = new long /*int*/[1];
result = eventInfo.GetTypeAttr(ppTypeAttr);
GUID riid = null;
if (result == COM.S_OK && ppTypeAttr[0] != 0) {
@@ -331,7 +331,7 @@ static GUID getDefaultEventSinkGUID(IUnknown unknown) {
*/
public void addEventListener(OleAutomation automation, int eventID, OleListener listener) {
if (listener == null || automation == null) OLE.error (SWT.ERROR_NULL_ARGUMENT);
- int /*long*/ address = automation.getAddress();
+ long /*int*/ address = automation.getAddress();
IUnknown unknown = new IUnknown(address);
GUID riid = getDefaultEventSinkGUID(unknown);
if (riid != null) {
@@ -355,7 +355,7 @@ public void addEventListener(OleAutomation automation, int eventID, OleListener
*/
public void addEventListener(OleAutomation automation, String eventSinkId, int eventID, OleListener listener) {
if (listener == null || automation == null || eventSinkId == null) OLE.error (SWT.ERROR_NULL_ARGUMENT);
- int /*long*/ address = automation.getAddress();
+ long /*int*/ address = automation.getAddress();
if (address == 0) return;
char[] buffer = (eventSinkId +"\0").toCharArray();
GUID guid = new GUID();
@@ -363,7 +363,7 @@ public void addEventListener(OleAutomation automation, String eventSinkId, int e
addEventListener(address, guid, eventID, listener);
}
-void addEventListener(int /*long*/ iunknown, GUID guid, int eventID, OleListener listener) {
+void addEventListener(long /*int*/ iunknown, GUID guid, int eventID, OleListener listener) {
if (listener == null || iunknown == 0 || guid == null) OLE.error (SWT.ERROR_NULL_ARGUMENT);
// have we connected to this kind of event sink before?
int index = -1;
@@ -381,7 +381,7 @@ void addEventListener(int /*long*/ iunknown, GUID guid, int eventID, OleListener
int oldLength = oleEventSink.length;
OleEventSink[] newOleEventSink = new OleEventSink[oldLength + 1];
GUID[] newOleEventSinkGUID = new GUID[oldLength + 1];
- int /*long*/[] newOleEventSinkIUnknown = new int /*long*/[oldLength + 1];
+ long /*int*/[] newOleEventSinkIUnknown = new long /*int*/[oldLength + 1];
System.arraycopy(oleEventSink, 0, newOleEventSink, 0, oldLength);
System.arraycopy(oleEventSinkGUID, 0, newOleEventSinkGUID, 0, oldLength);
System.arraycopy(oleEventSinkIUnknown, 0, newOleEventSinkIUnknown, 0, oldLength);
@@ -406,7 +406,7 @@ protected void addObjectReferences() {
connectPropertyChangeSink();
// Get access to the Control object
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
if (objIUnknown.QueryInterface(COM.IIDIOleControl, ppvObject) == COM.S_OK) {
IOleControl objIOleControl = new IOleControl(ppvObject[0]);
// ask the control for its info in case users
@@ -441,26 +441,26 @@ protected void createCOMInterfaces () {
// register each of the interfaces that this object implements
iOleControlSite = new COMObject(new int[]{2, 0, 0, 0, 1, 1, 3, 2, 1, 0}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return OnControlInfoChanged();}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return OnControlInfoChanged();}
// method4 LockInPlaceActive - not implemented
// method5 GetExtendedControl - not implemented
// method6 TransformCoords - not implemented
// method7 Translate Accelerator - not implemented
- public int /*long*/ method8(int /*long*/[] args) {return OnFocus((int)/*64*/args[0]);}
+ public long /*int*/ method8(long /*int*/[] args) {return OnFocus((int)/*64*/args[0]);}
// method9 ShowPropertyFrame - not implemented
};
iDispatch = new COMObject(new int[]{2, 0, 0, 1, 3, 5, 8}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
// method3 GetTypeInfoCount - not implemented
// method4 GetTypeInfo - not implemented
// method5 GetIDsOfNames - not implemented
- public int /*long*/ method6(int /*long*/[] args) {return Invoke((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);}
+ public long /*int*/ method6(long /*int*/[] args) {return Invoke((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);}
};
}
private void disconnectEventSinks() {
@@ -472,7 +472,7 @@ private void disconnectEventSinks() {
}
oleEventSink = new OleEventSink[0];
oleEventSinkGUID = new GUID[0];
- oleEventSinkIUnknown = new int /*long*/[0];
+ oleEventSinkIUnknown = new long /*int*/[0];
}
private void disconnectPropertyChangeSink() {
@@ -556,19 +556,19 @@ public Color getForeground () {
return super.getForeground();
}
-protected int /*long*/ getLicenseInfo(GUID clsid) {
- int /*long*/[] ppvObject = new int /*long*/[1];
+protected long /*int*/ getLicenseInfo(GUID clsid) {
+ long /*int*/[] ppvObject = new long /*int*/[1];
if (COM.CoGetClassObject(clsid, COM.CLSCTX_INPROC_HANDLER
| COM.CLSCTX_INPROC_SERVER, 0, COM.IIDIClassFactory, ppvObject) != COM.S_OK) {
return 0;
}
- int /*long*/ result = 0;
+ long /*int*/ result = 0;
IUnknown unknown = new IUnknown(ppvObject[0]);
if (unknown.QueryInterface(COM.IIDIClassFactory2, ppvObject) == COM.S_OK) {
IClassFactory2 classFactory = new IClassFactory2(ppvObject[0]);
LICINFO licinfo = new LICINFO();
if (classFactory.GetLicInfo(licinfo) == COM.S_OK) {
- int /*long*/[] pBstrKey = new int /*long*/[1];
+ long /*int*/[] pBstrKey = new long /*int*/[1];
if (licinfo != null && licinfo.fRuntimeKeyAvail) {
if (classFactory.RequestLicKey(0, pBstrKey) == COM.S_OK) {
result = pBstrKey[0];
@@ -599,22 +599,22 @@ public Variant getSiteProperty(int dispId){
}
return null;
}
-protected int GetWindow(int /*long*/ phwnd) {
+protected int GetWindow(long /*int*/ phwnd) {
if (phwnd == 0)
return COM.E_INVALIDARG;
if (frame == null) {
- COM.MoveMemory(phwnd, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ COM.MoveMemory(phwnd, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOTIMPL;
}
// Copy the Window's handle into the memory passed in
- COM.MoveMemory(phwnd, new int /*long*/[] {handle}, OS.PTR_SIZEOF);
+ COM.MoveMemory(phwnd, new long /*int*/[] {handle}, OS.PTR_SIZEOF);
return COM.S_OK;
}
-private int Invoke(int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, int /*long*/ pDispParams, int /*long*/ pVarResult, int /*long*/ pExcepInfo, int /*long*/ pArgErr) {
+private int Invoke(int dispIdMember, long /*int*/ riid, int lcid, int dwFlags, long /*int*/ pDispParams, long /*int*/ pVarResult, long /*int*/ pExcepInfo, long /*int*/ pArgErr) {
if (pVarResult == 0 || dwFlags != COM.DISPATCH_PROPERTYGET) {
- if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new int /*long*/ [] {0}, OS.PTR_SIZEOF);
+ if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new long /*int*/ [] {0}, OS.PTR_SIZEOF);
if (pArgErr != 0) COM.MoveMemory(pArgErr, new int[] {0}, 4);
return COM.DISP_E_MEMBERNOTFOUND;
}
@@ -628,8 +628,8 @@ private int Invoke(int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, i
case COM.DISPID_AMBIENT_SUPPORTSMNEMONICS :
case COM.DISPID_AMBIENT_SHOWGRABHANDLES :
case COM.DISPID_AMBIENT_SHOWHATCHING :
- if (pVarResult != 0) COM.MoveMemory(pVarResult, new int /*long*/ [] {0}, OS.PTR_SIZEOF);
- if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new int /*long*/ [] {0}, OS.PTR_SIZEOF);
+ if (pVarResult != 0) COM.MoveMemory(pVarResult, new long /*int*/ [] {0}, OS.PTR_SIZEOF);
+ if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new long /*int*/ [] {0}, OS.PTR_SIZEOF);
if (pArgErr != 0) COM.MoveMemory(pArgErr, new int[] {0}, 4);
return COM.S_FALSE;
@@ -641,20 +641,20 @@ private int Invoke(int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, i
case COM.DISPID_AMBIENT_LOCALEID :
case COM.DISPID_AMBIENT_SILENT :
case COM.DISPID_AMBIENT_MESSAGEREFLECT :
- if (pVarResult != 0) COM.MoveMemory(pVarResult, new int /*long*/ [] {0}, OS.PTR_SIZEOF);
- if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new int /*long*/ [] {0}, OS.PTR_SIZEOF);
+ if (pVarResult != 0) COM.MoveMemory(pVarResult, new long /*int*/ [] {0}, OS.PTR_SIZEOF);
+ if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo, new long /*int*/ [] {0}, OS.PTR_SIZEOF);
if (pArgErr != 0) COM.MoveMemory(pArgErr, new int[] {0}, 4);
return COM.E_NOTIMPL;
default :
- if (pVarResult != 0) COM.MoveMemory(pVarResult, new int /*long*/ [] {0}, OS.PTR_SIZEOF);
- if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo,new int /*long*/ [] {0}, OS.PTR_SIZEOF);
+ if (pVarResult != 0) COM.MoveMemory(pVarResult, new long /*int*/ [] {0}, OS.PTR_SIZEOF);
+ if (pExcepInfo != 0) COM.MoveMemory(pExcepInfo,new long /*int*/ [] {0}, OS.PTR_SIZEOF);
if (pArgErr != 0) COM.MoveMemory(pArgErr, new int[] {0}, 4);
return COM.DISP_E_MEMBERNOTFOUND;
}
}
private int OnControlInfoChanged() {
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
if (objIUnknown.QueryInterface(COM.IIDIOleControl, ppvObject) == COM.S_OK) {
IOleControl objIOleControl = new IOleControl(ppvObject[0]);
// ask the control for its info in case users
@@ -678,7 +678,7 @@ void onFocusIn(Event e) {
if (objIOleInPlaceObject == null) return;
if (!isActivated) doVerb(OLE.OLEIVERB_UIACTIVATE);
if (isFocusControl()) return;
- int /*long*/[] phwnd = new int /*long*/[1];
+ long /*int*/[] phwnd = new long /*int*/[1];
objIOleInPlaceObject.GetWindow(phwnd);
if (phwnd[0] == 0) return;
OS.SetFocus(phwnd[0]);
@@ -737,7 +737,7 @@ void onFocusOut(Event e) {
private int OnFocus(int fGotFocus) {
return COM.S_OK;
}
-protected int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) {
+protected int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) {
int result = super.QueryInterface(riid, ppvObject);
if (result == COM.S_OK)
return result;
@@ -746,16 +746,16 @@ protected int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) {
GUID guid = new GUID();
COM.MoveMemory(guid, riid, GUID.sizeof);
if (COM.IsEqualGUID(guid, COM.IIDIOleControlSite)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iOleControlSite.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iOleControlSite.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
if (COM.IsEqualGUID(guid, COM.IIDIDispatch)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iDispatch.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iDispatch.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
- COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
protected int Release() {
@@ -836,14 +836,14 @@ public void removeEventListener(OleAutomation automation, GUID guid, int eventID
public void removeEventListener(OleAutomation automation, int eventID, OleListener listener) {
checkWidget();
if (automation == null || listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
- int /*long*/ address = automation.getAddress();
+ long /*int*/ address = automation.getAddress();
IUnknown unknown = new IUnknown(address);
GUID riid = getDefaultEventSinkGUID(unknown);
if (riid != null) {
removeEventListener(address, riid, eventID, listener);
}
}
-void removeEventListener(int /*long*/ iunknown, GUID guid, int eventID, OleListener listener) {
+void removeEventListener(long /*int*/ iunknown, GUID guid, int eventID, OleListener listener) {
if (listener == null || guid == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
for (int i = 0; i < oleEventSink.length; i++) {
if (COM.IsEqualGUID(oleEventSinkGUID[i], guid)) {
@@ -857,7 +857,7 @@ void removeEventListener(int /*long*/ iunknown, GUID guid, int eventID, OleListe
if (oldLength == 1) {
oleEventSink = new OleEventSink[0];
oleEventSinkGUID = new GUID[0];
- oleEventSinkIUnknown = new int /*long*/[0];
+ oleEventSinkIUnknown = new long /*int*/[0];
} else {
OleEventSink[] newOleEventSink = new OleEventSink[oldLength - 1];
System.arraycopy(oleEventSink, 0, newOleEventSink, 0, i);
@@ -869,7 +869,7 @@ void removeEventListener(int /*long*/ iunknown, GUID guid, int eventID, OleListe
System.arraycopy(oleEventSinkGUID, i + 1, newOleEventSinkGUID, i, oldLength - i - 1);
oleEventSinkGUID = newOleEventSinkGUID;
- int /*long*/[] newOleEventSinkIUnknown = new int /*long*/[oldLength - 1];
+ long /*int*/[] newOleEventSinkIUnknown = new long /*int*/[oldLength - 1];
System.arraycopy(oleEventSinkIUnknown, 0, newOleEventSinkIUnknown, 0, i);
System.arraycopy(oleEventSinkIUnknown, i + 1, newOleEventSinkIUnknown, i, oldLength - i - 1);
oleEventSinkIUnknown = newOleEventSinkIUnknown;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java
index ae94cf4103..648195eef0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java
@@ -27,7 +27,7 @@ final class OleEventSink
private OleEventTable eventTable;
-OleEventSink(OleControlSite widget, int /*long*/ iUnknown, GUID riid) {
+OleEventSink(OleControlSite widget, long /*int*/ iUnknown, GUID riid) {
this.widget = widget;
this.eventGuid = riid;
@@ -37,10 +37,10 @@ OleEventSink(OleControlSite widget, int /*long*/ iUnknown, GUID riid) {
}
void connect () {
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
if (objIUnknown.QueryInterface(COM.IIDIConnectionPointContainer, ppvObject) == COM.S_OK) {
IConnectionPointContainer cpc = new IConnectionPointContainer(ppvObject[0]);
- int /*long*/[] ppCP = new int /*long*/[1];
+ long /*int*/[] ppCP = new long /*int*/[1];
if (cpc.FindConnectionPoint(eventGuid, ppCP) == COM.S_OK) {
IConnectionPoint cp = new IConnectionPoint(ppCP[0]);
int[] pCookie = new int[1];
@@ -62,19 +62,19 @@ int AddRef() {
}
private void createCOMInterfaces() {
iDispatch = new COMObject(new int[]{2, 0, 0, 1, 3, 4, 8}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
// method3 GetTypeInfoCount - not implemented
// method4 GetTypeInfo - not implemented
// method5 GetIDsOfNames - not implemented
- public int /*long*/ method6(int /*long*/[] args) {return Invoke((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);}
+ public long /*int*/ method6(long /*int*/[] args) {return Invoke((int)/*64*/args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7]);}
};
}
void disconnect() {
// disconnect event sink
if (eventCookie != 0 && objIUnknown != null) {
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
if (objIUnknown.QueryInterface(COM.IIDIConnectionPointContainer, ppvObject) == COM.S_OK) {
IConnectionPointContainer cpc = new IConnectionPointContainer(ppvObject[0]);
if (cpc.FindConnectionPoint(eventGuid, ppvObject) == COM.S_OK) {
@@ -94,7 +94,7 @@ private void disposeCOMInterfaces() {
iDispatch = null;
}
-private int Invoke(int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, int /*long*/ pDispParams, int /*long*/ pVarResult, int /*long*/ pExcepInfo, int /*long*/ pArgErr)
+private int Invoke(int dispIdMember, long /*int*/ riid, int lcid, int dwFlags, long /*int*/ pDispParams, long /*int*/ pVarResult, long /*int*/ pExcepInfo, long /*int*/ pArgErr)
{
if (eventTable == null || !eventTable.hooks(dispIdMember)) return COM.S_OK;
@@ -106,7 +106,7 @@ private int Invoke(int dispIdMember, int /*long*/ riid, int lcid, int dwFlags, i
COM.MoveMemory(dispParams, pDispParams, DISPPARAMS.sizeof);
eventInfo = new Variant[dispParams.cArgs];
int size = VARIANT.sizeof;
- int /*long*/ offset = (dispParams.cArgs - 1) * size;
+ long /*int*/ offset = (dispParams.cArgs - 1) * size;
for (int j = 0; j < dispParams.cArgs; j++){
eventInfo[j] = new Variant();
@@ -144,7 +144,7 @@ private void notifyListener (int eventType, OleEvent event) {
event.widget = widget;
eventTable.sendEvent (event);
}
-private int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) {
+private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0)
return COM.E_INVALIDARG;
@@ -153,12 +153,12 @@ private int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) {
if ( COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIDispatch) ||
COM.IsEqualGUID(guid, eventGuid)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iDispatch.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iDispatch.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return OLE.S_OK;
}
- COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
int Release() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java
index 560d7927e5..403b7d47e3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java
@@ -133,9 +133,9 @@ private static void initCheckFocus (final Display display) {
public void run() {
if (lastFocus[0] instanceof OleClientSite && !lastFocus[0].isDisposed()) {
// ignore popup menus and dialogs
- int /*long*/ hwnd = OS.GetFocus();
+ long /*int*/ hwnd = OS.GetFocus();
while (hwnd != 0) {
- int /*long*/ ownerHwnd = OS.GetWindow(hwnd, OS.GW_OWNER);
+ long /*int*/ ownerHwnd = OS.GetWindow(hwnd, OS.GW_OWNER);
if (ownerHwnd != 0) {
display.timerExec(time, timer[0]);
return;
@@ -168,10 +168,10 @@ private static void initCheckFocus (final Display display) {
private static void initMsgHook(Display display) {
if (display.getData(HHOOK) != null) return;
final Callback callback = new Callback(OleFrame.class, "getMsgProc", 3); //$NON-NLS-1$
- int /*long*/ address = callback.getAddress();
+ long /*int*/ address = callback.getAddress();
if (address == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS);
int threadId = OS.GetCurrentThreadId();
- final int /*long*/ hHook = OS.SetWindowsHookEx(OS.WH_GETMESSAGE, address, 0, threadId);
+ final long /*int*/ hHook = OS.SetWindowsHookEx(OS.WH_GETMESSAGE, address, 0, threadId);
if (hHook == 0) {
callback.dispose();
return;
@@ -185,7 +185,7 @@ private static void initMsgHook(Display display) {
}
});
}
-static int /*long*/ getMsgProc(int /*long*/ code, int /*long*/ wParam, int /*long*/ lParam) {
+static long /*int*/ getMsgProc(long /*int*/ code, long /*int*/ wParam, long /*int*/ lParam) {
Display display = Display.getCurrent();
if (display == null) return 0;
LONG hHook = (LONG)display.getData(HHOOK);
@@ -199,7 +199,7 @@ static int /*long*/ getMsgProc(int /*long*/ code, int /*long*/ wParam, int /*lon
if (OS.WM_KEYFIRST <= message && message <= OS.WM_KEYLAST) {
if (display != null) {
Widget widget = null;
- int /*long*/ hwnd = msg.hwnd;
+ long /*int*/ hwnd = msg.hwnd;
while (hwnd != 0) {
widget = display.findWidget (hwnd);
if (widget != null) break;
@@ -274,7 +274,7 @@ static int /*long*/ getMsgProc(int /*long*/ code, int /*long*/ wParam, int /*lon
}
/* Allow OleClientSite to process key events before activeX control */
if (!consumed && !accentKey && !ignoreNextKey) {
- int /*long*/ hwndOld = msg.hwnd;
+ long /*int*/ hwndOld = msg.hwnd;
msg.hwnd = site.handle;
consumed = OS.DispatchMessage (msg) == 1;
msg.hwnd = hwndOld;
@@ -327,27 +327,27 @@ private int ContextSensitiveHelp(int fEnterMode) {
private void createCOMInterfaces() {
// Create each of the interfaces that this object implements
iUnknown = new COMObject(new int[]{2, 0, 0}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
};
iOleInPlaceFrame = new COMObject(new int[]{2, 0, 0, 1, 1, 1, 1, 1, 2, 2, 3, 1, 1, 1, 2}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return GetWindow(args[0]);}
- public int /*long*/ method4(int /*long*/[] args) {return ContextSensitiveHelp((int)/*64*/args[0]);}
- public int /*long*/ method5(int /*long*/[] args) {return GetBorder(args[0]);}
- public int /*long*/ method6(int /*long*/[] args) {return RequestBorderSpace(args[0]);}
- public int /*long*/ method7(int /*long*/[] args) {return SetBorderSpace(args[0]);}
- public int /*long*/ method8(int /*long*/[] args) {return SetActiveObject(args[0], args[1]);}
- public int /*long*/ method9(int /*long*/[] args) {return InsertMenus(args[0], args[1]);}
- public int /*long*/ method10(int /*long*/[] args) {return SetMenu(args[0], args[1], args[2]);}
- public int /*long*/ method11(int /*long*/[] args) {return RemoveMenus(args[0]);}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return GetWindow(args[0]);}
+ public long /*int*/ method4(long /*int*/[] args) {return ContextSensitiveHelp((int)/*64*/args[0]);}
+ public long /*int*/ method5(long /*int*/[] args) {return GetBorder(args[0]);}
+ public long /*int*/ method6(long /*int*/[] args) {return RequestBorderSpace(args[0]);}
+ public long /*int*/ method7(long /*int*/[] args) {return SetBorderSpace(args[0]);}
+ public long /*int*/ method8(long /*int*/[] args) {return SetActiveObject(args[0], args[1]);}
+ public long /*int*/ method9(long /*int*/[] args) {return InsertMenus(args[0], args[1]);}
+ public long /*int*/ method10(long /*int*/[] args) {return SetMenu(args[0], args[1], args[2]);}
+ public long /*int*/ method11(long /*int*/[] args) {return RemoveMenus(args[0]);}
// method12 SetStatusText - not implemented
// method13 EnableModeless - not implemented
- public int /*long*/ method14(int /*long*/[] args) {return TranslateAccelerator(args[0], (int)/*64*/args[1]);}
+ public long /*int*/ method14(long /*int*/[] args) {return TranslateAccelerator(args[0], (int)/*64*/args[1]);}
};
}
private void disposeCOMInterfaces () {
@@ -360,7 +360,7 @@ private void disposeCOMInterfaces () {
iOleInPlaceFrame.dispose();
iOleInPlaceFrame = null;
}
-private int GetBorder(int /*long*/ lprectBorder) {
+private int GetBorder(long /*int*/ lprectBorder) {
/*
The IOleInPlaceUIWindow::GetBorder function, when called on a document or frame window
object, returns the outer rectangle (relative to the window) where the object can put
@@ -409,11 +409,11 @@ public MenuItem[] getContainerMenus(){
public MenuItem[] getFileMenus(){
return fileMenuItems;
}
-int /*long*/ getIOleInPlaceFrame() {
+long /*int*/ getIOleInPlaceFrame() {
return iOleInPlaceFrame.getAddress();
}
-private int /*long*/ getMenuItemID(int /*long*/ hMenu, int index) {
- int /*long*/ id = 0;
+private long /*int*/ getMenuItemID(long /*int*/ hMenu, int index) {
+ long /*int*/ id = 0;
MENUITEMINFO lpmii = new MENUITEMINFO();
lpmii.cbSize = MENUITEMINFO.sizeof;
lpmii.fMask = OS.MIIM_STATE | OS.MIIM_SUBMENU | OS.MIIM_ID;
@@ -425,9 +425,9 @@ private int /*long*/ getMenuItemID(int /*long*/ hMenu, int index) {
}
return id;
}
-private int GetWindow(int /*long*/ phwnd) {
+private int GetWindow(long /*int*/ phwnd) {
if (phwnd != 0) {
- COM.MoveMemory(phwnd, new int /*long*/[] {handle}, OS.PTR_SIZEOF);
+ COM.MoveMemory(phwnd, new long /*int*/[] {handle}, OS.PTR_SIZEOF);
}
return COM.S_OK;
}
@@ -449,22 +449,22 @@ private int GetWindow(int /*long*/ phwnd) {
public MenuItem[] getWindowMenus(){
return windowMenuItems;
}
-private int InsertMenus(int /*long*/ hmenuShared, int /*long*/ lpMenuWidths) {
+private int InsertMenus(long /*int*/ hmenuShared, long /*int*/ lpMenuWidths) {
// locate menu bar
Menu menubar = getShell().getMenuBar();
if (menubar == null || menubar.isDisposed()) {
COM.MoveMemory(lpMenuWidths, new int[] {0}, 4);
return COM.S_OK;
}
- int /*long*/ hMenu = menubar.handle;
+ long /*int*/ hMenu = menubar.handle;
// Create a holder for menu information. This will be passed down to
// the OS and the OS will fill in the requested information for each menu.
MENUITEMINFO lpmii = new MENUITEMINFO();
- int /*long*/ hHeap = OS.GetProcessHeap();
+ long /*int*/ hHeap = OS.GetProcessHeap();
int cch = 128;
int byteCount = cch * TCHAR.sizeof;
- int /*long*/ pszText = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ pszText = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
lpmii.cbSize = MENUITEMINFO.sizeof;
lpmii.fMask = OS.MIIM_STATE | OS.MIIM_ID | OS.MIIM_TYPE | OS.MIIM_SUBMENU | OS.MIIM_DATA;
lpmii.dwTypeData = pszText;
@@ -580,19 +580,19 @@ private void onResize(Event e) {
objIOleInPlaceActiveObject.ResizeBorder(lpRect, iOleInPlaceFrame.getAddress(), true);
}
}
-private int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) {
+private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) {
// implements IUnknown, IOleInPlaceFrame, IOleContainer, IOleInPlaceUIWindow
if (riid == 0 || ppvObject == 0)
return COM.E_INVALIDARG;
GUID guid = new GUID();
COM.MoveMemory(guid, riid, GUID.sizeof);
if (COM.IsEqualGUID(guid, COM.IIDIUnknown) || COM.IsEqualGUID(guid, COM.IIDIOleInPlaceFrame) ) {
- COM.MoveMemory(ppvObject, new int /*long*/ [] {iOleInPlaceFrame.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/ [] {iOleInPlaceFrame.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
- COM.MoveMemory(ppvObject, new int /*long*/ [] {0}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/ [] {0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
/**
@@ -616,12 +616,12 @@ private void releaseObjectInterfaces() {
}
objIOleInPlaceActiveObject = null;
}
-private int RemoveMenus(int /*long*/ hmenuShared) {
+private int RemoveMenus(long /*int*/ hmenuShared) {
Menu menubar = getShell().getMenuBar();
if (menubar == null || menubar.isDisposed()) return COM.S_FALSE;
- int /*long*/ hMenu = menubar.handle;
+ long /*int*/ hMenu = menubar.handle;
Vector ids = new Vector();
if (this.fileMenuItems != null) {
@@ -630,7 +630,7 @@ private int RemoveMenus(int /*long*/ hmenuShared) {
if (item != null && !item.isDisposed()) {
int index = item.getParent().indexOf(item);
// get Id from original menubar
- int /*long*/ id = getMenuItemID(hMenu, index);
+ long /*int*/ id = getMenuItemID(hMenu, index);
ids.addElement(new LONG(id));
}
}
@@ -640,7 +640,7 @@ private int RemoveMenus(int /*long*/ hmenuShared) {
MenuItem item = this.containerMenuItems[i];
if (item != null && !item.isDisposed()) {
int index = item.getParent().indexOf(item);
- int /*long*/ id = getMenuItemID(hMenu, index);
+ long /*int*/ id = getMenuItemID(hMenu, index);
ids.addElement(new LONG(id));
}
}
@@ -650,24 +650,24 @@ private int RemoveMenus(int /*long*/ hmenuShared) {
MenuItem item = this.windowMenuItems[i];
if (item != null && !item.isDisposed()) {
int index = item.getParent().indexOf(item);
- int /*long*/ id = getMenuItemID(hMenu, index);
+ long /*int*/ id = getMenuItemID(hMenu, index);
ids.addElement(new LONG(id));
}
}
}
int index = OS.GetMenuItemCount(hmenuShared) - 1;
for (int i = index; i >= 0; i--) {
- int /*long*/ id = getMenuItemID(hmenuShared, i);
+ long /*int*/ id = getMenuItemID(hmenuShared, i);
if (ids.contains(new LONG(id))){
OS.RemoveMenu(hmenuShared, i, OS.MF_BYPOSITION);
}
}
return COM.S_OK;
}
-private int RequestBorderSpace(int /*long*/ pborderwidths) {
+private int RequestBorderSpace(long /*int*/ pborderwidths) {
return COM.S_OK;
}
-int SetActiveObject(int /*long*/ pActiveObject, int /*long*/ pszObjName) {
+int SetActiveObject(long /*int*/ pActiveObject, long /*int*/ pszObjName) {
if (objIOleInPlaceActiveObject != null) {
objIOleInPlaceActiveObject.Release();
objIOleInPlaceActiveObject = null;
@@ -679,7 +679,7 @@ int SetActiveObject(int /*long*/ pActiveObject, int /*long*/ pszObjName) {
return COM.S_OK;
}
-private int SetBorderSpace(int /*long*/ pborderwidths) {
+private int SetBorderSpace(long /*int*/ pborderwidths) {
// A Control/Document can :
// Use its own toolbars, requesting border space of a specific size, or,
// Use no toolbars, but force the container to remove its toolbars by passing a
@@ -747,8 +747,8 @@ void setCurrentDocument(OleClientSite doc) {
public void setFileMenus(MenuItem[] fileMenus){
fileMenuItems = fileMenus;
}
-private int SetMenu(int /*long*/ hmenuShared, int /*long*/ holemenu, int /*long*/ hwndActiveObject) {
- int /*long*/ inPlaceActiveObject = 0;
+private int SetMenu(long /*int*/ hmenuShared, long /*int*/ holemenu, long /*int*/ hwndActiveObject) {
+ long /*int*/ inPlaceActiveObject = 0;
if (objIOleInPlaceActiveObject != null)
inPlaceActiveObject = objIOleInPlaceActiveObject.getAddress();
@@ -757,7 +757,7 @@ private int SetMenu(int /*long*/ hmenuShared, int /*long*/ holemenu, int /*long*
return COM.OleSetMenuDescriptor(0, getShell().handle, hwndActiveObject, iOleInPlaceFrame.getAddress(), inPlaceActiveObject);
}
- int /*long*/ handle = menubar.getShell().handle;
+ long /*int*/ handle = menubar.getShell().handle;
if (hmenuShared == 0 && holemenu == 0) {
// re-instate the original menu - this occurs on deactivation
@@ -795,14 +795,14 @@ private boolean translateOleAccelerator(MSG msg) {
int result = objIOleInPlaceActiveObject.TranslateAccelerator(msg);
return (result != COM.S_FALSE && result != COM.E_NOTIMPL);
}
-private int TranslateAccelerator(int /*long*/ lpmsg, int wID){
+private int TranslateAccelerator(long /*int*/ lpmsg, int wID){
Menu menubar = getShell().getMenuBar();
if (menubar == null || menubar.isDisposed() || !menubar.isEnabled()) return COM.S_FALSE;
if (wID < 0) return COM.S_FALSE;
Shell shell = menubar.getShell();
- int /*long*/ hwnd = shell.handle;
- int /*long*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0);
+ long /*int*/ hwnd = shell.handle;
+ long /*int*/ hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0);
if (hAccel == 0) return COM.S_FALSE;
MSG msg = new MSG();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java
index 98ca8a8a2a..b1d0ed72c3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java
@@ -47,7 +47,7 @@ int AddRef() {
void connect(IUnknown objIUnknown) {
// Set up property change notification sink
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
if (objIUnknown.QueryInterface(COM.IIDIConnectionPointContainer, ppvObject) == COM.S_OK) {
IConnectionPointContainer cpc = new IConnectionPointContainer(ppvObject[0]);
if (cpc.FindConnectionPoint(COM.IIDIPropertyNotifySink, ppvObject) == COM.S_OK) {
@@ -64,24 +64,24 @@ void connect(IUnknown objIUnknown) {
private void createCOMInterfaces() {
// register each of the interfaces that this object implements
iUnknown = new COMObject(new int[]{2, 0, 0}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
};
iPropertyNotifySink = new COMObject(new int[]{2, 0, 0, 1, 1}){
- public int /*long*/ method0(int /*long*/[] args) {return QueryInterface(args[0], args[1]);}
- public int /*long*/ method1(int /*long*/[] args) {return AddRef();}
- public int /*long*/ method2(int /*long*/[] args) {return Release();}
- public int /*long*/ method3(int /*long*/[] args) {return OnChanged((int)/*64*/args[0]);}
- public int /*long*/ method4(int /*long*/[] args) {return OnRequestEdit((int)/*64*/args[0]);}
+ public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);}
+ public long /*int*/ method1(long /*int*/[] args) {return AddRef();}
+ public long /*int*/ method2(long /*int*/[] args) {return Release();}
+ public long /*int*/ method3(long /*int*/[] args) {return OnChanged((int)/*64*/args[0]);}
+ public long /*int*/ method4(long /*int*/[] args) {return OnRequestEdit((int)/*64*/args[0]);}
};
}
void disconnect(IUnknown objIUnknown) {
// disconnect property notification sink
if (propertyCookie != 0 && objIUnknown != null) {
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
if (objIUnknown.QueryInterface(COM.IIDIConnectionPointContainer, ppvObject) == COM.S_OK) {
IConnectionPointContainer cpc = new IConnectionPointContainer(ppvObject[0]);
if (cpc.FindConnectionPoint(COM.IIDIPropertyNotifySink, ppvObject) == COM.S_OK) {
@@ -140,22 +140,22 @@ private int OnRequestEdit(int dispID) {
notifyListener(dispID,event);
return (event.doit) ? COM.S_OK : COM.S_FALSE;
}
-private int QueryInterface(int /*long*/ riid, int /*long*/ ppvObject) {
+private int QueryInterface(long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0)
return COM.E_INVALIDARG;
GUID guid = new GUID();
COM.MoveMemory(guid, riid, GUID.sizeof);
if (COM.IsEqualGUID(guid, COM.IIDIUnknown)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iUnknown.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iUnknown.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
if (COM.IsEqualGUID(guid, COM.IIDIPropertyNotifySink)) {
- COM.MoveMemory(ppvObject, new int /*long*/[] {iPropertyNotifySink.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {iPropertyNotifySink.getAddress()}, OS.PTR_SIZEOF);
AddRef();
return COM.S_OK;
}
- COM.MoveMemory(ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
int Release() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java
index d7a541f2cf..bee729e9ac 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java
@@ -37,7 +37,7 @@ public final class Variant {
private float floatData;
private double doubleData;
private String stringData;
- private int /*long*/ byRefPtr;
+ private long /*int*/ byRefPtr;
private IDispatch dispatchData;
private IUnknown unknownData;
@@ -70,7 +70,7 @@ public final class Variant {
*
* @since 3.3
*/
-public static void win32_copy (int /*long*/ pVarDest, Variant varSrc) {
+public static void win32_copy (long /*int*/ pVarDest, Variant varSrc) {
varSrc.getData (pVarDest);
}
@@ -93,7 +93,7 @@ public static void win32_copy (int /*long*/ pVarDest, Variant varSrc) {
*
* @since 3.3
*/
-public static Variant win32_new (int /*long*/ pVariant) {
+public static Variant win32_new (long /*int*/ pVariant) {
Variant variant = new Variant ();
variant.setData (pVariant);
return variant;
@@ -150,7 +150,7 @@ public Variant(double val) {
* @param byRefType the type of the data being transferred such as OLE.VT_BSTR | OLE.VT_BYREF
*
*/
-public Variant(int /*long*/ ptr, short byRefType) {
+public Variant(long /*int*/ ptr, short byRefType) {
type = byRefType;
byRefPtr = ptr;
}
@@ -277,8 +277,8 @@ public OleAutomation getAutomation() {
return new OleAutomation(dispatchData);
}
// try to coerce the value to the desired type
- int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
- int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
try {
getData(oldPtr);
int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_DISPATCH);
@@ -320,8 +320,8 @@ public IDispatch getDispatch() {
return dispatchData;
}
// try to coerce the value to the desired type
- int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
- int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
try {
getData(oldPtr);
int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_DISPATCH);
@@ -362,8 +362,8 @@ public boolean getBoolean() {
}
// try to coerce the value to the desired type
- int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
- int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
try {
getData(oldPtr);
int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_BOOL);
@@ -387,7 +387,7 @@ public boolean getBoolean() {
* @return a pointer to the referenced data represented by this Variant or 0
*
*/
-public int /*long*/ getByRef() {
+public long /*int*/ getByRef() {
if (type == COM.VT_EMPTY) {
OLE.error(OLE.ERROR_CANNOT_CHANGE_VARIANT_TYPE, -1);
}
@@ -420,8 +420,8 @@ public byte getByte() {
}
// try to coerce the value to the desired type
- int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
- int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
try {
getData(oldPtr);
int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_I1);
@@ -460,8 +460,8 @@ public char getChar() {
}
// try to coerce the value to the desired type
- int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
- int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
try {
getData(oldPtr);
int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_UI2);
@@ -477,7 +477,7 @@ public char getChar() {
OS.GlobalFree(newPtr);
}
}
-void getData(int /*long*/ pData){
+void getData(long /*int*/ pData){
if (pData == 0) OLE.error(OLE.ERROR_OUT_OF_MEMORY);
COM.VariantInit(pData);
@@ -485,7 +485,7 @@ void getData(int /*long*/ pData){
if ((type & COM.VT_BYREF) == COM.VT_BYREF) {
//TODO - use VARIANT structure
COM.MoveMemory(pData, new short[] {type}, 2);
- COM.MoveMemory(pData + 8, new int /*long*/[]{byRefPtr}, OS.PTR_SIZEOF);
+ COM.MoveMemory(pData + 8, new long /*int*/[]{byRefPtr}, OS.PTR_SIZEOF);
return;
}
@@ -529,18 +529,18 @@ void getData(int /*long*/ pData){
case COM.VT_DISPATCH :
dispatchData.AddRef();
COM.MoveMemory(pData, new short[] {type}, 2);
- COM.MoveMemory(pData + 8, new int /*long*/[]{dispatchData.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(pData + 8, new long /*int*/[]{dispatchData.getAddress()}, OS.PTR_SIZEOF);
break;
case COM.VT_UNKNOWN :
unknownData.AddRef();
COM.MoveMemory(pData, new short[] {type}, 2);
- COM.MoveMemory(pData + 8, new int /*long*/[]{unknownData.getAddress()}, OS.PTR_SIZEOF);
+ COM.MoveMemory(pData + 8, new long /*int*/[]{unknownData.getAddress()}, OS.PTR_SIZEOF);
break;
case COM.VT_BSTR :
COM.MoveMemory(pData, new short[] {type}, 2);
char[] data = (stringData+"\0").toCharArray();
- int /*long*/ ptr = COM.SysAllocString(data);
- COM.MoveMemory(pData + 8, new int /*long*/[] {ptr}, OS.PTR_SIZEOF);
+ long /*int*/ ptr = COM.SysAllocString(data);
+ COM.MoveMemory(pData + 8, new long /*int*/[] {ptr}, OS.PTR_SIZEOF);
break;
default :
@@ -570,8 +570,8 @@ public double getDouble() {
}
// try to coerce the value to the desired type
- int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
- int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
try {
getData(oldPtr);
int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_R8);
@@ -609,8 +609,8 @@ public float getFloat() {
}
// try to coerce the value to the desired type
- int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
- int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
try {
getData(oldPtr);
int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_R4);
@@ -648,8 +648,8 @@ public int getInt() {
}
// try to coerce the value to the desired type
- int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
- int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
try {
getData(oldPtr);
int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_I4);
@@ -688,8 +688,8 @@ public long getLong() {
}
// try to coerce the value to the desired type
- int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
- int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
try {
getData(oldPtr);
int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_I8);
@@ -726,8 +726,8 @@ public short getShort() {
}
// try to coerce the value to the desired type
- int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
- int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
try {
getData(oldPtr);
int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_I2);
@@ -765,8 +765,8 @@ public String getString() {
}
// try to coerce the value to the desired type
- int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
- int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
try {
getData(oldPtr);
int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_BSTR);
@@ -819,8 +819,8 @@ public IUnknown getUnknown() {
}
// try to coerce the value to the desired type
- int /*long*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
- int /*long*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ oldPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
+ long /*int*/ newPtr = OS.GlobalAlloc(COM.GMEM_FIXED | COM.GMEM_ZEROINIT, sizeof);
try {
getData(oldPtr);
int result = COM.VariantChangeType(newPtr, oldPtr, (short) 0, COM.VT_UNKNOWN);
@@ -886,11 +886,11 @@ public void setByRef(float val) {
*
* @since 2.1
*/
-public void setByRef(int /*long*/ val) {
+public void setByRef(long /*int*/ val) {
if ((type & COM.VT_BYREF) == 0 || (type & COM.VT_I4) == 0) {
OLE.error(OLE.ERROR_CANNOT_CHANGE_VARIANT_TYPE);
}
- COM.MoveMemory(byRefPtr, new int /*long*/[]{val}, OS.PTR_SIZEOF);
+ COM.MoveMemory(byRefPtr, new long /*int*/[]{val}, OS.PTR_SIZEOF);
}
/**
* Update the by reference value of this variant with a new short value.
@@ -909,7 +909,7 @@ public void setByRef(short val) {
}
COM.MoveMemory(byRefPtr, new short[]{val}, 2);
}
-void setData(int /*long*/ pData){
+void setData(long /*int*/ pData){
if (pData == 0) OLE.error(OLE.ERROR_INVALID_ARGUMENT);
//TODO - use VARIANT structure
@@ -918,7 +918,7 @@ void setData(int /*long*/ pData){
type = dataType[0];
if ((type & COM.VT_BYREF) == COM.VT_BYREF) {
- int /*long*/[] newByRefPtr = new int /*long*/[1];
+ long /*int*/[] newByRefPtr = new long /*int*/[1];
OS.MoveMemory(newByRefPtr, pData + 8, OS.PTR_SIZEOF);
byRefPtr = newByRefPtr[0];
return;
@@ -969,7 +969,7 @@ void setData(int /*long*/ pData){
doubleData = newDoubleData[0];
break;
case COM.VT_DISPATCH : {
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
OS.MoveMemory(ppvObject, pData + 8, OS.PTR_SIZEOF);
if (ppvObject[0] == 0) {
type = COM.VT_EMPTY;
@@ -980,7 +980,7 @@ void setData(int /*long*/ pData){
break;
}
case COM.VT_UNKNOWN : {
- int /*long*/[] ppvObject = new int /*long*/[1];
+ long /*int*/[] ppvObject = new long /*int*/[1];
OS.MoveMemory(ppvObject, pData + 8, OS.PTR_SIZEOF);
if (ppvObject[0] == 0) {
type = COM.VT_EMPTY;
@@ -992,7 +992,7 @@ void setData(int /*long*/ pData){
}
case COM.VT_BSTR :
// get the address of the memory in which the string resides
- int /*long*/[] hMem = new int /*long*/[1];
+ long /*int*/[] hMem = new long /*int*/[1];
OS.MoveMemory(hMem, pData + 8, OS.PTR_SIZEOF);
if (hMem[0] == 0) {
type = COM.VT_EMPTY;
@@ -1013,7 +1013,7 @@ void setData(int /*long*/ pData){
default :
// try coercing it into one of the known forms
- int /*long*/ newPData = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, sizeof);
+ long /*int*/ newPData = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT, sizeof);
if (COM.VariantChangeType(newPData, pData, (short) 0, COM.VT_R4) == COM.S_OK) {
setData(newPData);
} else if (COM.VariantChangeType(newPData, pData, (short) 0, COM.VT_I4) == COM.S_OK) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/cocoa/org/eclipse/swt/opengl/GLCanvas.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/cocoa/org/eclipse/swt/opengl/GLCanvas.java
index f30a7df4a1..e1aa6802c5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/cocoa/org/eclipse/swt/opengl/GLCanvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/cocoa/org/eclipse/swt/opengl/GLCanvas.java
@@ -155,7 +155,7 @@ public GLCanvas (Composite parent, int style, GLData data) {
public GLData getGLData () {
checkWidget ();
GLData data = new GLData ();
- int /*long*/ [] value = new int /*long*/ [1];
+ long /*int*/ [] value = new long /*int*/ [1];
pixelFormat.getValues(value, OS.NSOpenGLPFADoubleBuffer, 0);
data.doubleBuffer = value [0] != 0;
pixelFormat.getValues(value, OS.NSOpenGLPFAStereo, 0);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java
index 4f1d979490..6e071ffae8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java
@@ -231,8 +231,8 @@ public static final void glViewport(int x, int y, int width, int height) {
}
}
/** @param dpy cast=(Display *) */
-public static final native int /*long*/ _glXChooseVisual(int /*long*/ dpy, int screen, int[] attribList);
-public static final int /*long*/ glXChooseVisual(int /*long*/ dpy, int screen, int[] attribList) {
+public static final native long /*int*/ _glXChooseVisual(long /*int*/ dpy, int screen, int[] attribList);
+public static final long /*int*/ glXChooseVisual(long /*int*/ dpy, int screen, int[] attribList) {
lock.lock();
try {
return _glXChooseVisual(dpy, screen, attribList);
@@ -245,8 +245,8 @@ public static final int /*long*/ glXChooseVisual(int /*long*/ dpy, int screen, i
* @param src cast=(GLXContext)
* @param dst cast=(GLXContext)
*/
-public static final native void _glXCopyContext(int /*long*/ dpy, int /*long*/ src, int /*long*/ dst, int mask);
-public static final void glXCopyContext(int /*long*/ dpy, int /*long*/ src, int /*long*/ dst, int mask) {
+public static final native void _glXCopyContext(long /*int*/ dpy, long /*int*/ src, long /*int*/ dst, int mask);
+public static final void glXCopyContext(long /*int*/ dpy, long /*int*/ src, long /*int*/ dst, int mask) {
lock.lock();
try {
_glXCopyContext(dpy, src, dst, mask);
@@ -258,8 +258,8 @@ public static final void glXCopyContext(int /*long*/ dpy, int /*long*/ src, int
* @param dpy cast=(Display *)
* @param shareList cast=(GLXContext)
*/
-public static final native int /*long*/ _glXCreateContext(int /*long*/ dpy, XVisualInfo vis, int /*long*/ shareList, boolean direct);
-public static final int /*long*/ glXCreateContext(int /*long*/ dpy, XVisualInfo vis, int /*long*/ shareList, boolean direct) {
+public static final native long /*int*/ _glXCreateContext(long /*int*/ dpy, XVisualInfo vis, long /*int*/ shareList, boolean direct);
+public static final long /*int*/ glXCreateContext(long /*int*/ dpy, XVisualInfo vis, long /*int*/ shareList, boolean direct) {
lock.lock();
try {
return _glXCreateContext(dpy, vis, shareList, direct);
@@ -271,8 +271,8 @@ public static final int /*long*/ glXCreateContext(int /*long*/ dpy, XVisualInfo
* @param dpy cast=(Display *)
* @param pixmap cast=(Pixmap)
*/
-public static final native int /*long*/ _glXCreateGLXPixmap(int /*long*/ dpy, XVisualInfo vis, int /*long*/ pixmap);
-public static final int /*long*/ glXCreateGLXPixmap(int /*long*/ dpy, XVisualInfo vis, int /*long*/ pixmap) {
+public static final native long /*int*/ _glXCreateGLXPixmap(long /*int*/ dpy, XVisualInfo vis, long /*int*/ pixmap);
+public static final long /*int*/ glXCreateGLXPixmap(long /*int*/ dpy, XVisualInfo vis, long /*int*/ pixmap) {
lock.lock();
try {
return _glXCreateGLXPixmap(dpy, vis, pixmap);
@@ -284,8 +284,8 @@ public static final int /*long*/ glXCreateGLXPixmap(int /*long*/ dpy, XVisualInf
* @param dpy cast=(Display *)
* @param ctx cast=(GLXContext)
*/
-public static final native void _glXDestroyContext(int /*long*/ dpy, int /*long*/ ctx);
-public static final void glXDestroyContext(int /*long*/ dpy, int /*long*/ ctx) {
+public static final native void _glXDestroyContext(long /*int*/ dpy, long /*int*/ ctx);
+public static final void glXDestroyContext(long /*int*/ dpy, long /*int*/ ctx) {
lock.lock();
try {
_glXDestroyContext(dpy, ctx);
@@ -297,8 +297,8 @@ public static final void glXDestroyContext(int /*long*/ dpy, int /*long*/ ctx) {
* @param dpy cast=(Display *)
* @param pix cast=(GLXPixmap)
*/
-public static final native void _glXDestroyGLXPixmap(int /*long*/ dpy, int /*long*/ pix);
-public static final void glXDestroyGLXPixmap(int /*long*/ dpy, int /*long*/ pix) {
+public static final native void _glXDestroyGLXPixmap(long /*int*/ dpy, long /*int*/ pix);
+public static final void glXDestroyGLXPixmap(long /*int*/ dpy, long /*int*/ pix) {
lock.lock();
try {
_glXDestroyGLXPixmap(dpy, pix);
@@ -307,8 +307,8 @@ public static final void glXDestroyGLXPixmap(int /*long*/ dpy, int /*long*/ pix)
}
}
/** @param dpy cast=(Display *) */
-public static final native int /*long*/ _glXGetClientString(int /*long*/ dpy, int name);
-public static final int /*long*/ glXGetClientString(int /*long*/ dpy, int name) {
+public static final native long /*int*/ _glXGetClientString(long /*int*/ dpy, int name);
+public static final long /*int*/ glXGetClientString(long /*int*/ dpy, int name) {
lock.lock();
try {
return _glXGetClientString(dpy, name);
@@ -317,8 +317,8 @@ public static final int /*long*/ glXGetClientString(int /*long*/ dpy, int name)
}
}
/** @param dpy cast=(Display *) */
-public static final native int _glXGetConfig(int /*long*/ dpy, XVisualInfo vis, int attrib, int[] value);
-public static final int glXGetConfig(int /*long*/ dpy, XVisualInfo vis, int attrib, int[] value) {
+public static final native int _glXGetConfig(long /*int*/ dpy, XVisualInfo vis, int attrib, int[] value);
+public static final int glXGetConfig(long /*int*/ dpy, XVisualInfo vis, int attrib, int[] value) {
lock.lock();
try {
return _glXGetConfig(dpy, vis, attrib, value);
@@ -326,8 +326,8 @@ public static final int glXGetConfig(int /*long*/ dpy, XVisualInfo vis, int attr
lock.unlock();
}
}
-public static final native int /*long*/ _glXGetCurrentContext();
-public static final int /*long*/ glXGetCurrentContext() {
+public static final native long /*int*/ _glXGetCurrentContext();
+public static final long /*int*/ glXGetCurrentContext() {
lock.lock();
try {
return _glXGetCurrentContext();
@@ -335,8 +335,8 @@ public static final int /*long*/ glXGetCurrentContext() {
lock.unlock();
}
}
-public static final native int /*long*/ _glXGetCurrentDrawable();
-public static final int /*long*/ glXGetCurrentDrawable() {
+public static final native long /*int*/ _glXGetCurrentDrawable();
+public static final long /*int*/ glXGetCurrentDrawable() {
lock.lock();
try {
return _glXGetCurrentDrawable();
@@ -348,8 +348,8 @@ public static final int /*long*/ glXGetCurrentDrawable() {
* @param dpy cast=(Display *)
* @param ctx cast=(GLXContext)
*/
-public static final native boolean _glXIsDirect(int /*long*/ dpy, int /*long*/ ctx);
-public static final boolean glXIsDirect(int /*long*/ dpy, int /*long*/ ctx) {
+public static final native boolean _glXIsDirect(long /*int*/ dpy, long /*int*/ ctx);
+public static final boolean glXIsDirect(long /*int*/ dpy, long /*int*/ ctx) {
lock.lock();
try {
return _glXIsDirect(dpy, ctx);
@@ -362,8 +362,8 @@ public static final boolean glXIsDirect(int /*long*/ dpy, int /*long*/ ctx) {
* @param drawable cast=(GLXDrawable)
* @param ctx cast=(GLXContext)
*/
-public static final native boolean _glXMakeCurrent(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ ctx);
-public static final boolean glXMakeCurrent(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ ctx) {
+public static final native boolean _glXMakeCurrent(long /*int*/ dpy, long /*int*/ drawable, long /*int*/ ctx);
+public static final boolean glXMakeCurrent(long /*int*/ dpy, long /*int*/ drawable, long /*int*/ ctx) {
lock.lock();
try {
return _glXMakeCurrent(dpy, drawable, ctx);
@@ -372,8 +372,8 @@ public static final boolean glXMakeCurrent(int /*long*/ dpy, int /*long*/ drawab
}
}
/** @param dpy cast=(Display *) */
-public static final native boolean _glXQueryExtension(int /*long*/ dpy, int[] errorBase, int[] eventBase);
-public static final boolean glXQueryExtension(int /*long*/ dpy, int[] errorBase, int[] eventBase) {
+public static final native boolean _glXQueryExtension(long /*int*/ dpy, int[] errorBase, int[] eventBase);
+public static final boolean glXQueryExtension(long /*int*/ dpy, int[] errorBase, int[] eventBase) {
lock.lock();
try {
return _glXQueryExtension(dpy, errorBase, eventBase);
@@ -382,8 +382,8 @@ public static final boolean glXQueryExtension(int /*long*/ dpy, int[] errorBase,
}
}
/** @param dpy cast=(Display *) */
-public static final native int /*long*/ _glXQueryExtensionsString(int /*long*/ dpy, int screen);
-public static final int /*long*/ glXQueryExtensionsString(int /*long*/ dpy, int screen) {
+public static final native long /*int*/ _glXQueryExtensionsString(long /*int*/ dpy, int screen);
+public static final long /*int*/ glXQueryExtensionsString(long /*int*/ dpy, int screen) {
lock.lock();
try {
return _glXQueryExtensionsString(dpy, screen);
@@ -392,8 +392,8 @@ public static final int /*long*/ glXQueryExtensionsString(int /*long*/ dpy, int
}
}
/** @param dpy cast=(Display *) */
-public static final native int /*long*/ _glXQueryServerString(int /*long*/ dpy, int screen, int name);
-public static final int /*long*/ glXQueryServerString(int /*long*/ dpy, int screen, int name) {
+public static final native long /*int*/ _glXQueryServerString(long /*int*/ dpy, int screen, int name);
+public static final long /*int*/ glXQueryServerString(long /*int*/ dpy, int screen, int name) {
lock.lock();
try {
return _glXQueryServerString(dpy, screen, name);
@@ -406,8 +406,8 @@ public static final int /*long*/ glXQueryServerString(int /*long*/ dpy, int scre
* @param major flags=no_in
* @param minor flags=no_in
*/
-public static final native boolean _glXQueryVersion(int /*long*/ dpy, int[] major, int[] minor);
-public static final boolean glXQueryVersion(int /*long*/ dpy, int[] major, int[] minor) {
+public static final native boolean _glXQueryVersion(long /*int*/ dpy, int[] major, int[] minor);
+public static final boolean glXQueryVersion(long /*int*/ dpy, int[] major, int[] minor) {
lock.lock();
try {
return _glXQueryVersion(dpy, major, minor);
@@ -419,8 +419,8 @@ public static final boolean glXQueryVersion(int /*long*/ dpy, int[] major, int[]
* @param dpy cast=(Display *)
* @param drawable cast=(GLXDrawable)
*/
-public static final native void _glXSwapBuffers(int /*long*/ dpy, int /*long*/ drawable);
-public static final void glXSwapBuffers(int /*long*/ dpy, int /*long*/ drawable) {
+public static final native void _glXSwapBuffers(long /*int*/ dpy, long /*int*/ drawable);
+public static final void glXSwapBuffers(long /*int*/ dpy, long /*int*/ drawable) {
lock.lock();
try {
_glXSwapBuffers(dpy, drawable);
@@ -450,5 +450,5 @@ public static final void glXWaitX() {
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(XVisualInfo dest, int /*long*/ src, int size);
+public static final native void memmove(XVisualInfo dest, long /*int*/ src, int size);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
index 8faa6cfca2..c7b6733d66 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.opengl.glx;
public class XVisualInfo {
/** @field cast=(Visual *) */
- public int /*long*/ visual;
+ public long /*int*/ visual;
public int visualid;
public int screen;
public int depth;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java
index 4686202e84..f997d6e745 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/gtk/org/eclipse/swt/opengl/GLCanvas.java
@@ -27,9 +27,9 @@ import org.eclipse.swt.internal.opengl.glx.*;
*/
public class GLCanvas extends Canvas {
- int /*long*/ context;
- int /*long*/ xWindow;
- int /*long*/ glWindow;
+ long /*int*/ context;
+ long /*int*/ xWindow;
+ long /*int*/ glWindow;
XVisualInfo vinfo;
static final int MAX_ATTRIBUTES = 32;
@@ -104,14 +104,14 @@ public GLCanvas (Composite parent, int style, GLData data) {
}
glxAttrib [pos++] = 0;
OS.gtk_widget_realize (handle);
- int /*long*/ window;
+ long /*int*/ window;
if (OS.GTK_VERSION >= OS.VERSION(2, 14, 0)){
window = OS.gtk_widget_get_window (handle);
} else {
window = OS.GTK_WIDGET_WINDOW (handle);
}
- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
- int /*long*/ infoPtr = GLX.glXChooseVisual (xDisplay, OS.XDefaultScreen (xDisplay), glxAttrib);
+ long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
+ long /*int*/ infoPtr = GLX.glXChooseVisual (xDisplay, OS.XDefaultScreen (xDisplay), glxAttrib);
if (infoPtr == 0) {
dispose ();
SWT.error (SWT.ERROR_UNSUPPORTED_DEPTH);
@@ -119,9 +119,9 @@ public GLCanvas (Composite parent, int style, GLData data) {
vinfo = new XVisualInfo ();
GLX.memmove (vinfo, infoPtr, XVisualInfo.sizeof);
OS.XFree (infoPtr);
- int /*long*/ screen = OS.gdk_screen_get_default ();
- int /*long*/ gdkvisual = OS.gdk_x11_screen_lookup_visual (screen, vinfo.visualid);
- int /*long*/ share = data.shareContext != null ? data.shareContext.context : 0;
+ long /*int*/ screen = OS.gdk_screen_get_default ();
+ long /*int*/ gdkvisual = OS.gdk_x11_screen_lookup_visual (screen, vinfo.visualid);
+ long /*int*/ share = data.shareContext != null ? data.shareContext.context : 0;
context = GLX.glXCreateContext (xDisplay, vinfo, share, true);
if (context == 0) SWT.error (SWT.ERROR_NO_HANDLES);
GdkWindowAttr attrs = new GdkWindowAttr ();
@@ -161,13 +161,13 @@ public GLCanvas (Composite parent, int style, GLData data) {
OS.gdk_window_resize (glWindow, clientArea.width, clientArea.height);
break;
case SWT.Dispose:
- int /*long*/ window;
+ long /*int*/ window;
if (OS.GTK_VERSION >= OS.VERSION(2, 14, 0)){
window = OS.gtk_widget_get_window (handle);
} else {
window = OS.GTK_WIDGET_WINDOW (handle);
}
- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
+ long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
if (context != 0) {
if (GLX.glXGetCurrentContext () == context) {
GLX.glXMakeCurrent (xDisplay, 0, 0);
@@ -199,13 +199,13 @@ public GLCanvas (Composite parent, int style, GLData data) {
*/
public GLData getGLData () {
checkWidget ();
- int /*long*/ window;
+ long /*int*/ window;
if (OS.GTK_VERSION >= OS.VERSION(2, 14, 0)){
window = OS.gtk_widget_get_window (handle);
} else {
window = OS.GTK_WIDGET_WINDOW (handle);
}
- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
+ long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
GLData data = new GLData ();
int [] value = new int [1];
GLX.glXGetConfig (xDisplay, vinfo, GLX.GLX_DOUBLEBUFFER, value);
@@ -267,8 +267,8 @@ public boolean isCurrent () {
public void setCurrent () {
checkWidget ();
if (GLX.glXGetCurrentContext () == context) return;
- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle);
- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle);
+ long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
GLX.glXMakeCurrent (xDisplay, xWindow, context);
}
@@ -282,8 +282,8 @@ public void setCurrent () {
*/
public void swapBuffers () {
checkWidget ();
- int /*long*/ window = OS.GTK_WIDGET_WINDOW (handle);
- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (handle);
+ long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
GLX.glXSwapBuffers (xDisplay, xWindow);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/motif/org/eclipse/swt/opengl/GLCanvas.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/motif/org/eclipse/swt/opengl/GLCanvas.java
index c0ce0f9e4a..927f480671 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/motif/org/eclipse/swt/opengl/GLCanvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/motif/org/eclipse/swt/opengl/GLCanvas.java
@@ -117,7 +117,7 @@ public GLCanvas (Composite parent, int style, GLData data) {
vinfo = new XVisualInfo ();
GLX.memmove (vinfo, infoPtr, XVisualInfo.sizeof);
OS.XFree (infoPtr);
- int /*long*/ share = data.shareContext != null ? data.shareContext.context : 0;
+ long /*int*/ share = data.shareContext != null ? data.shareContext.context : 0;
context = GLX.glXCreateContext (xDisplay, vinfo, share, true);
if (context == 0) SWT.error (SWT.ERROR_NO_HANDLES);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java
index 4904161221..a0c27de453 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java
@@ -99,53 +99,53 @@ public class WGL extends Platform {
public static final int PFD_STEREO_DONTCARE = 0x80000000;
/** @param hdc cast=(HDC) */
-public static final native int ChoosePixelFormat(int /*long*/ hdc, PIXELFORMATDESCRIPTOR ppfd);
+public static final native int ChoosePixelFormat(long /*int*/ hdc, PIXELFORMATDESCRIPTOR ppfd);
/** @param hdc cast=(HDC) */
-public static final native int DescribePixelFormat(int /*long*/ hdc, int iPixelFormat, int nBytes, PIXELFORMATDESCRIPTOR ppfd);
+public static final native int DescribePixelFormat(long /*int*/ hdc, int iPixelFormat, int nBytes, PIXELFORMATDESCRIPTOR ppfd);
/** @param hdc cast=(HDC) */
-public static final native int GetPixelFormat(int /*long*/ hdc);
+public static final native int GetPixelFormat(long /*int*/ hdc);
/** @param hdc cast=(HDC) */
-public static final native boolean SetPixelFormat(int /*long*/ hdc, int iPixelFormat, PIXELFORMATDESCRIPTOR ppfd);
+public static final native boolean SetPixelFormat(long /*int*/ hdc, int iPixelFormat, PIXELFORMATDESCRIPTOR ppfd);
/** @param hdc cast=(HDC) */
-public static final native boolean SwapBuffers(int /*long*/ hdc);
+public static final native boolean SwapBuffers(long /*int*/ hdc);
/**
* @param hglrcSrc cast=(HGLRC)
* @param hglrcDst cast=(HGLRC)
*/
-public static final native boolean wglCopyContext(int /*long*/ hglrcSrc, int /*long*/ hglrcDst, int mask);
+public static final native boolean wglCopyContext(long /*int*/ hglrcSrc, long /*int*/ hglrcDst, int mask);
/** @param hdc cast=(HDC) */
-public static final native int /*long*/ wglCreateContext(int /*long*/ hdc);
+public static final native long /*int*/ wglCreateContext(long /*int*/ hdc);
/** @param hdc cast=(HDC) */
-public static final native int /*long*/ wglCreateLayerContext(int /*long*/ hdc, int iLayerPlane);
+public static final native long /*int*/ wglCreateLayerContext(long /*int*/ hdc, int iLayerPlane);
/** @param hglrc cast=(HGLRC) */
-public static final native boolean wglDeleteContext(int /*long*/ hglrc);
-public static final native int /*long*/ wglGetCurrentContext();
-public static final native int /*long*/ wglGetCurrentDC();
-public static final native int /*long*/ wglGetProcAddress(byte[] lpszProc);
+public static final native boolean wglDeleteContext(long /*int*/ hglrc);
+public static final native long /*int*/ wglGetCurrentContext();
+public static final native long /*int*/ wglGetCurrentDC();
+public static final native long /*int*/ wglGetProcAddress(byte[] lpszProc);
/**
* @param hdc cast=(HDC)
* @param hglrc cast=(HGLRC)
*/
-public static final native boolean wglMakeCurrent(int /*long*/ hdc, int /*long*/ hglrc);
+public static final native boolean wglMakeCurrent(long /*int*/ hdc, long /*int*/ hglrc);
/**
* @param hglrc1 cast=(HGLRC)
* @param hglrc2 cast=(HGLRC)
*/
-public static final native boolean wglShareLists(int /*long*/ hglrc1, int /*long*/ hglrc2);
+public static final native boolean wglShareLists(long /*int*/ hglrc1, long /*int*/ hglrc2);
/** @param hdc cast=(HDC) */
-public static final native boolean wglDescribeLayerPlane(int /*long*/ hdc, int iPixelFormat, int iLayerPlane, int nBytes, LAYERPLANEDESCRIPTOR plpd);
+public static final native boolean wglDescribeLayerPlane(long /*int*/ hdc, int iPixelFormat, int iLayerPlane, int nBytes, LAYERPLANEDESCRIPTOR plpd);
/**
* @param hdc cast=(HDC)
* @param pcr cast=(COLORREF *)
*/
-public static final native int wglSetLayerPaletteEntries(int /*long*/ hdc, int iLayerPlane, int iStart, int cEntries, int[] pcr);
+public static final native int wglSetLayerPaletteEntries(long /*int*/ hdc, int iLayerPlane, int iStart, int cEntries, int[] pcr);
/**
* @param hdc cast=(HDC)
* @param pcr cast=(COLORREF *)
*/
-public static final native int wglGetLayerPaletteEntries(int /*long*/ hdc, int iLayerPlane, int iStart, int cEntries, int[] pcr);
+public static final native int wglGetLayerPaletteEntries(long /*int*/ hdc, int iLayerPlane, int iStart, int cEntries, int[] pcr);
/** @param hdc cast=(HDC) */
-public static final native boolean wglRealizeLayerPalette(int /*long*/ hdc, int iLayerPlane, boolean bRealize);
+public static final native boolean wglRealizeLayerPalette(long /*int*/ hdc, int iLayerPlane, boolean bRealize);
/** @param hdc cast=(HDC) */
-public static final native boolean wglSwapLayerBuffers(int /*long*/ hdc, int fuPlanes);
+public static final native boolean wglSwapLayerBuffers(long /*int*/ hdc, int fuPlanes);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/opengl/GLCanvas.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/opengl/GLCanvas.java
index 39b6350898..2bb80554dd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/opengl/GLCanvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/opengl/GLCanvas.java
@@ -26,7 +26,7 @@ import org.eclipse.swt.internal.opengl.win32.*;
*/
public class GLCanvas extends Canvas {
- int /*long*/ context;
+ long /*int*/ context;
int pixelFormat;
static final String USE_OWNDC_KEY = "org.eclipse.swt.internal.win32.useOwnDC"; //$NON-NLS-1$
/**
@@ -76,7 +76,7 @@ public GLCanvas (Composite parent, int style, GLData data) {
// wglAttrib [pos++] = data.samples;
// }
- int /*long*/ hDC = OS.GetDC (handle);
+ long /*int*/ hDC = OS.GetDC (handle);
pixelFormat = WGL.ChoosePixelFormat (hDC, pfd);
if (pixelFormat == 0 || !WGL.SetPixelFormat (hDC, pixelFormat, pfd)) {
OS.ReleaseDC (handle, hDC);
@@ -128,7 +128,7 @@ public GLData getGLData () {
GLData data = new GLData ();
PIXELFORMATDESCRIPTOR pfd = new PIXELFORMATDESCRIPTOR ();
pfd.nSize = (short) PIXELFORMATDESCRIPTOR.sizeof;
- int /*long*/ hDC = OS.GetDC (handle);
+ long /*int*/ hDC = OS.GetDC (handle);
WGL.DescribePixelFormat (hDC, pixelFormat, PIXELFORMATDESCRIPTOR.sizeof, pfd);
OS.ReleaseDC (handle, hDC);
data.doubleBuffer = (pfd.dwFlags & WGL.PFD_DOUBLEBUFFER) != 0;
@@ -174,7 +174,7 @@ public boolean isCurrent () {
public void setCurrent () {
checkWidget ();
if (WGL.wglGetCurrentContext () == context) return;
- int /*long*/ hDC = OS.GetDC (handle);
+ long /*int*/ hDC = OS.GetDC (handle);
WGL.wglMakeCurrent (hDC, context);
OS.ReleaseDC (handle, hDC);
}
@@ -189,7 +189,7 @@ public void setCurrent () {
*/
public void swapBuffers () {
checkWidget ();
- int /*long*/ hDC = OS.GetDC (handle);
+ long /*int*/ hDC = OS.GetDC (handle);
WGL.SwapBuffers (hDC);
OS.ReleaseDC (handle, hDC);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
index 8f342be036..79a3c48820 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
@@ -101,8 +101,8 @@ public static final native int CAIRO_VERSION_ENCODE(int major, int minor, int mi
* @param cr cast=(cairo_t *)
* @param path cast=(cairo_path_t *)
*/
-public static final native void _cairo_append_path(int /*long*/ cr, int /*long*/ path);
-public static final void cairo_append_path(int /*long*/ cr, int /*long*/ path) {
+public static final native void _cairo_append_path(long /*int*/ cr, long /*int*/ path);
+public static final void cairo_append_path(long /*int*/ cr, long /*int*/ path) {
lock.lock();
try {
_cairo_append_path(cr, path);
@@ -111,8 +111,8 @@ public static final void cairo_append_path(int /*long*/ cr, int /*long*/ path) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_arc(int /*long*/ cr, double xc, double yc, double radius, double angle1, double angle2);
-public static final void cairo_arc(int /*long*/ cr, double xc, double yc, double radius, double angle1, double angle2) {
+public static final native void _cairo_arc(long /*int*/ cr, double xc, double yc, double radius, double angle1, double angle2);
+public static final void cairo_arc(long /*int*/ cr, double xc, double yc, double radius, double angle1, double angle2) {
lock.lock();
try {
_cairo_arc(cr, xc, yc, radius, angle1, angle2);
@@ -121,8 +121,8 @@ public static final void cairo_arc(int /*long*/ cr, double xc, double yc, double
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_arc_negative(int /*long*/ cr, double xc, double yc, double radius, double angle1, double angle2);
-public static final void cairo_arc_negative(int /*long*/ cr, double xc, double yc, double radius, double angle1, double angle2) {
+public static final native void _cairo_arc_negative(long /*int*/ cr, double xc, double yc, double radius, double angle1, double angle2);
+public static final void cairo_arc_negative(long /*int*/ cr, double xc, double yc, double radius, double angle1, double angle2) {
lock.lock();
try {
_cairo_arc_negative(cr, xc, yc, radius, angle1, angle2);
@@ -131,8 +131,8 @@ public static final void cairo_arc_negative(int /*long*/ cr, double xc, double y
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_clip(int /*long*/ cr);
-public static final void cairo_clip(int /*long*/ cr) {
+public static final native void _cairo_clip(long /*int*/ cr);
+public static final void cairo_clip(long /*int*/ cr) {
lock.lock();
try {
_cairo_clip(cr);
@@ -141,8 +141,8 @@ public static final void cairo_clip(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_clip_preserve(int /*long*/ cr);
-public static final void cairo_clip_preserve(int /*long*/ cr) {
+public static final native void _cairo_clip_preserve(long /*int*/ cr);
+public static final void cairo_clip_preserve(long /*int*/ cr) {
lock.lock();
try {
_cairo_clip_preserve(cr);
@@ -151,8 +151,8 @@ public static final void cairo_clip_preserve(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_close_path(int /*long*/ cr);
-public static final void cairo_close_path(int /*long*/ cr) {
+public static final native void _cairo_close_path(long /*int*/ cr);
+public static final void cairo_close_path(long /*int*/ cr) {
lock.lock();
try {
_cairo_close_path(cr);
@@ -161,8 +161,8 @@ public static final void cairo_close_path(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_copy_page(int /*long*/ cr);
-public static final void cairo_copy_page(int /*long*/ cr) {
+public static final native void _cairo_copy_page(long /*int*/ cr);
+public static final void cairo_copy_page(long /*int*/ cr) {
lock.lock();
try {
_cairo_copy_page(cr);
@@ -171,8 +171,8 @@ public static final void cairo_copy_page(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native int /*long*/ _cairo_copy_path(int /*long*/ cr);
-public static final int /*long*/ cairo_copy_path(int /*long*/ cr) {
+public static final native long /*int*/ _cairo_copy_path(long /*int*/ cr);
+public static final long /*int*/ cairo_copy_path(long /*int*/ cr) {
lock.lock();
try {
return _cairo_copy_path(cr);
@@ -181,8 +181,8 @@ public static final int /*long*/ cairo_copy_path(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native int /*long*/ _cairo_copy_path_flat(int /*long*/ cr);
-public static final int /*long*/ cairo_copy_path_flat(int /*long*/ cr) {
+public static final native long /*int*/ _cairo_copy_path_flat(long /*int*/ cr);
+public static final long /*int*/ cairo_copy_path_flat(long /*int*/ cr) {
lock.lock();
try {
return _cairo_copy_path_flat(cr);
@@ -191,8 +191,8 @@ public static final int /*long*/ cairo_copy_path_flat(int /*long*/ cr) {
}
}
/** @param target cast=(cairo_surface_t *) */
-public static final native int /*long*/ _cairo_create(int /*long*/ target);
-public static final int /*long*/ cairo_create(int /*long*/ target) {
+public static final native long /*int*/ _cairo_create(long /*int*/ target);
+public static final long /*int*/ cairo_create(long /*int*/ target) {
lock.lock();
try {
return _cairo_create(target);
@@ -201,8 +201,8 @@ public static final int /*long*/ cairo_create(int /*long*/ target) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_curve_to(int /*long*/ cr, double x1, double y1, double x2, double y2, double x3, double y3);
-public static final void cairo_curve_to(int /*long*/ cr, double x1, double y1, double x2, double y2, double x3, double y3) {
+public static final native void _cairo_curve_to(long /*int*/ cr, double x1, double y1, double x2, double y2, double x3, double y3);
+public static final void cairo_curve_to(long /*int*/ cr, double x1, double y1, double x2, double y2, double x3, double y3) {
lock.lock();
try {
_cairo_curve_to(cr, x1, y1, x2, y2, x3, y3);
@@ -211,8 +211,8 @@ public static final void cairo_curve_to(int /*long*/ cr, double x1, double y1, d
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_destroy(int /*long*/ cr);
-public static final void cairo_destroy(int /*long*/ cr) {
+public static final native void _cairo_destroy(long /*int*/ cr);
+public static final void cairo_destroy(long /*int*/ cr) {
lock.lock();
try {
_cairo_destroy(cr);
@@ -221,8 +221,8 @@ public static final void cairo_destroy(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_device_to_user(int /*long*/ cr, double[] x, double[] y);
-public static final void cairo_device_to_user(int /*long*/ cr, double[] x, double[] y) {
+public static final native void _cairo_device_to_user(long /*int*/ cr, double[] x, double[] y);
+public static final void cairo_device_to_user(long /*int*/ cr, double[] x, double[] y) {
lock.lock();
try {
_cairo_device_to_user(cr, x, y);
@@ -231,8 +231,8 @@ public static final void cairo_device_to_user(int /*long*/ cr, double[] x, doubl
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_device_to_user_distance(int /*long*/ cr, double[] dx, double[] dy);
-public static final void cairo_device_to_user_distance(int /*long*/ cr, double[] dx, double[] dy) {
+public static final native void _cairo_device_to_user_distance(long /*int*/ cr, double[] dx, double[] dy);
+public static final void cairo_device_to_user_distance(long /*int*/ cr, double[] dx, double[] dy) {
lock.lock();
try {
_cairo_device_to_user_distance(cr, dx, dy);
@@ -241,8 +241,8 @@ public static final void cairo_device_to_user_distance(int /*long*/ cr, double[]
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_fill(int /*long*/ cr);
-public static final void cairo_fill(int /*long*/ cr) {
+public static final native void _cairo_fill(long /*int*/ cr);
+public static final void cairo_fill(long /*int*/ cr) {
lock.lock();
try {
_cairo_fill(cr);
@@ -251,8 +251,8 @@ public static final void cairo_fill(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_fill_extents(int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2);
-public static final void cairo_fill_extents(int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2) {
+public static final native void _cairo_fill_extents(long /*int*/ cr, double[] x1, double[] y1, double[] x2, double[] y2);
+public static final void cairo_fill_extents(long /*int*/ cr, double[] x1, double[] y1, double[] x2, double[] y2) {
lock.lock();
try {
_cairo_fill_extents(cr, x1, y1, x2, y2);
@@ -261,8 +261,8 @@ public static final void cairo_fill_extents(int /*long*/ cr, double[] x1, double
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_fill_preserve(int /*long*/ cr);
-public static final void cairo_fill_preserve(int /*long*/ cr) {
+public static final native void _cairo_fill_preserve(long /*int*/ cr);
+public static final void cairo_fill_preserve(long /*int*/ cr) {
lock.lock();
try {
_cairo_fill_preserve(cr);
@@ -271,8 +271,8 @@ public static final void cairo_fill_preserve(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_font_extents(int /*long*/ cr, cairo_font_extents_t extents);
-public static final void cairo_font_extents(int /*long*/ cr, cairo_font_extents_t extents) {
+public static final native void _cairo_font_extents(long /*int*/ cr, cairo_font_extents_t extents);
+public static final void cairo_font_extents(long /*int*/ cr, cairo_font_extents_t extents) {
lock.lock();
try {
_cairo_font_extents(cr, extents);
@@ -280,8 +280,8 @@ public static final void cairo_font_extents(int /*long*/ cr, cairo_font_extents_
lock.unlock();
}
}
-public static final native int /*long*/ _cairo_font_options_create();
-public static final int /*long*/ cairo_font_options_create() {
+public static final native long /*int*/ _cairo_font_options_create();
+public static final long /*int*/ cairo_font_options_create() {
lock.lock();
try {
return _cairo_font_options_create();
@@ -290,8 +290,8 @@ public static final int /*long*/ cairo_font_options_create() {
}
}
/** @param options cast=(cairo_font_options_t *) */
-public static final native void _cairo_font_options_destroy(int /*long*/ options);
-public static final void cairo_font_options_destroy(int /*long*/ options) {
+public static final native void _cairo_font_options_destroy(long /*int*/ options);
+public static final void cairo_font_options_destroy(long /*int*/ options) {
lock.lock();
try {
_cairo_font_options_destroy(options);
@@ -300,8 +300,8 @@ public static final void cairo_font_options_destroy(int /*long*/ options) {
}
}
/** @param options cast=(cairo_font_options_t *) */
-public static final native int _cairo_font_options_get_antialias(int /*long*/ options);
-public static final int cairo_font_options_get_antialias(int /*long*/ options) {
+public static final native int _cairo_font_options_get_antialias(long /*int*/ options);
+public static final int cairo_font_options_get_antialias(long /*int*/ options) {
lock.lock();
try {
return _cairo_font_options_get_antialias(options);
@@ -310,8 +310,8 @@ public static final int cairo_font_options_get_antialias(int /*long*/ options) {
}
}
/** @param options cast=(cairo_font_options_t *) */
-public static final native void _cairo_font_options_set_antialias(int /*long*/ options, int antialias);
-public static final void cairo_font_options_set_antialias(int /*long*/ options, int antialias) {
+public static final native void _cairo_font_options_set_antialias(long /*int*/ options, int antialias);
+public static final void cairo_font_options_set_antialias(long /*int*/ options, int antialias) {
lock.lock();
try {
_cairo_font_options_set_antialias(options, antialias);
@@ -330,8 +330,8 @@ public static final int cairo_format_stride_for_width(int format, int width) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native int _cairo_get_antialias(int /*long*/ cr);
-public static final int cairo_get_antialias(int /*long*/ cr) {
+public static final native int _cairo_get_antialias(long /*int*/ cr);
+public static final int cairo_get_antialias(long /*int*/ cr) {
lock.lock();
try {
return _cairo_get_antialias(cr);
@@ -340,8 +340,8 @@ public static final int cairo_get_antialias(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_get_current_point(int /*long*/ cr, double[] x, double[] y);
-public static final void cairo_get_current_point(int /*long*/ cr, double[] x, double[] y) {
+public static final native void _cairo_get_current_point(long /*int*/ cr, double[] x, double[] y);
+public static final void cairo_get_current_point(long /*int*/ cr, double[] x, double[] y) {
lock.lock();
try {
_cairo_get_current_point(cr, x, y);
@@ -350,8 +350,8 @@ public static final void cairo_get_current_point(int /*long*/ cr, double[] x, do
}
}
/** @param cr cast=(cairo_t *) */
-public static final native int _cairo_get_fill_rule(int /*long*/ cr);
-public static final int cairo_get_fill_rule(int /*long*/ cr) {
+public static final native int _cairo_get_fill_rule(long /*int*/ cr);
+public static final int cairo_get_fill_rule(long /*int*/ cr) {
lock.lock();
try {
return _cairo_get_fill_rule(cr);
@@ -360,8 +360,8 @@ public static final int cairo_get_fill_rule(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native int /*long*/ _cairo_get_font_face(int /*long*/ cr);
-public static final int /*long*/ cairo_get_font_face(int /*long*/ cr) {
+public static final native long /*int*/ _cairo_get_font_face(long /*int*/ cr);
+public static final long /*int*/ cairo_get_font_face(long /*int*/ cr) {
lock.lock();
try {
return _cairo_get_font_face(cr);
@@ -373,8 +373,8 @@ public static final int /*long*/ cairo_get_font_face(int /*long*/ cr) {
* @param cr cast=(cairo_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
-public static final native void _cairo_get_font_matrix(int /*long*/ cr, double[] matrix);
-public static final void cairo_get_font_matrix(int /*long*/ cr, double[] matrix) {
+public static final native void _cairo_get_font_matrix(long /*int*/ cr, double[] matrix);
+public static final void cairo_get_font_matrix(long /*int*/ cr, double[] matrix) {
lock.lock();
try {
_cairo_get_font_matrix(cr, matrix);
@@ -386,8 +386,8 @@ public static final void cairo_get_font_matrix(int /*long*/ cr, double[] matrix)
* @param cr cast=(cairo_t *)
* @param options cast=(cairo_font_options_t *)
*/
-public static final native void _cairo_get_font_options(int /*long*/ cr, int /*long*/ options);
-public static final void cairo_get_font_options(int /*long*/ cr, int /*long*/ options) {
+public static final native void _cairo_get_font_options(long /*int*/ cr, long /*int*/ options);
+public static final void cairo_get_font_options(long /*int*/ cr, long /*int*/ options) {
lock.lock();
try {
_cairo_get_font_options(cr, options);
@@ -396,8 +396,8 @@ public static final void cairo_get_font_options(int /*long*/ cr, int /*long*/ op
}
}
/** @param cr cast=(cairo_t *) */
-public static final native int _cairo_get_line_cap(int /*long*/ cr);
-public static final int cairo_get_line_cap(int /*long*/ cr) {
+public static final native int _cairo_get_line_cap(long /*int*/ cr);
+public static final int cairo_get_line_cap(long /*int*/ cr) {
lock.lock();
try {
return _cairo_get_line_cap(cr);
@@ -406,8 +406,8 @@ public static final int cairo_get_line_cap(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native int _cairo_get_line_join(int /*long*/ cr);
-public static final int cairo_get_line_join(int /*long*/ cr) {
+public static final native int _cairo_get_line_join(long /*int*/ cr);
+public static final int cairo_get_line_join(long /*int*/ cr) {
lock.lock();
try {
return _cairo_get_line_join(cr);
@@ -416,8 +416,8 @@ public static final int cairo_get_line_join(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native double _cairo_get_line_width(int /*long*/ cr);
-public static final double cairo_get_line_width(int /*long*/ cr) {
+public static final native double _cairo_get_line_width(long /*int*/ cr);
+public static final double cairo_get_line_width(long /*int*/ cr) {
lock.lock();
try {
return _cairo_get_line_width(cr);
@@ -429,8 +429,8 @@ public static final double cairo_get_line_width(int /*long*/ cr) {
* @param cr cast=(cairo_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
-public static final native void _cairo_get_matrix(int /*long*/ cr, double[] matrix);
-public static final void cairo_get_matrix(int /*long*/ cr, double[] matrix) {
+public static final native void _cairo_get_matrix(long /*int*/ cr, double[] matrix);
+public static final void cairo_get_matrix(long /*int*/ cr, double[] matrix) {
lock.lock();
try {
_cairo_get_matrix(cr, matrix);
@@ -439,8 +439,8 @@ public static final void cairo_get_matrix(int /*long*/ cr, double[] matrix) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native double _cairo_get_miter_limit(int /*long*/ cr);
-public static final double cairo_get_miter_limit(int /*long*/ cr) {
+public static final native double _cairo_get_miter_limit(long /*int*/ cr);
+public static final double cairo_get_miter_limit(long /*int*/ cr) {
lock.lock();
try {
return _cairo_get_miter_limit(cr);
@@ -449,8 +449,8 @@ public static final double cairo_get_miter_limit(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native int _cairo_get_operator(int /*long*/ cr);
-public static final int cairo_get_operator(int /*long*/ cr) {
+public static final native int _cairo_get_operator(long /*int*/ cr);
+public static final int cairo_get_operator(long /*int*/ cr) {
lock.lock();
try {
return _cairo_get_operator(cr);
@@ -459,8 +459,8 @@ public static final int cairo_get_operator(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native int /*long*/ _cairo_get_source(int /*long*/ cr);
-public static final int /*long*/ cairo_get_source(int /*long*/ cr) {
+public static final native long /*int*/ _cairo_get_source(long /*int*/ cr);
+public static final long /*int*/ cairo_get_source(long /*int*/ cr) {
lock.lock();
try {
return _cairo_get_source(cr);
@@ -469,8 +469,8 @@ public static final int /*long*/ cairo_get_source(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native int /*long*/ _cairo_get_target(int /*long*/ cr);
-public static final int /*long*/ cairo_get_target(int /*long*/ cr) {
+public static final native long /*int*/ _cairo_get_target(long /*int*/ cr);
+public static final long /*int*/ cairo_get_target(long /*int*/ cr) {
lock.lock();
try {
return _cairo_get_target(cr);
@@ -479,8 +479,8 @@ public static final int /*long*/ cairo_get_target(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native double _cairo_get_tolerance(int /*long*/ cr);
-public static final double cairo_get_tolerance(int /*long*/ cr) {
+public static final native double _cairo_get_tolerance(long /*int*/ cr);
+public static final double cairo_get_tolerance(long /*int*/ cr) {
lock.lock();
try {
return _cairo_get_tolerance(cr);
@@ -493,8 +493,8 @@ public static final double cairo_get_tolerance(int /*long*/ cr) {
* @param glyphs cast=(cairo_glyph_t *)
* @param extents cast=(cairo_text_extents_t *)
*/
-public static final native void _cairo_glyph_extents(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs, int /*long*/ extents);
-public static final void cairo_glyph_extents(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs, int /*long*/ extents) {
+public static final native void _cairo_glyph_extents(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs, long /*int*/ extents);
+public static final void cairo_glyph_extents(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs, long /*int*/ extents) {
lock.lock();
try {
_cairo_glyph_extents(cr, glyphs, num_glyphs, extents);
@@ -506,8 +506,8 @@ public static final void cairo_glyph_extents(int /*long*/ cr, int /*long*/ glyph
* @param cr cast=(cairo_t *)
* @param glyphs cast=(cairo_glyph_t *)
*/
-public static final native void _cairo_glyph_path(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs);
-public static final void cairo_glyph_path(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs) {
+public static final native void _cairo_glyph_path(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs);
+public static final void cairo_glyph_path(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs) {
lock.lock();
try {
_cairo_glyph_path(cr, glyphs, num_glyphs);
@@ -516,8 +516,8 @@ public static final void cairo_glyph_path(int /*long*/ cr, int /*long*/ glyphs,
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_identity_matrix(int /*long*/ cr);
-public static final void cairo_identity_matrix(int /*long*/ cr) {
+public static final native void _cairo_identity_matrix(long /*int*/ cr);
+public static final void cairo_identity_matrix(long /*int*/ cr) {
lock.lock();
try {
_cairo_identity_matrix(cr);
@@ -525,8 +525,8 @@ public static final void cairo_identity_matrix(int /*long*/ cr) {
lock.unlock();
}
}
-public static final native int /*long*/ _cairo_image_surface_create(int format, int width, int height);
-public static final int /*long*/ cairo_image_surface_create(int format, int width, int height) {
+public static final native long /*int*/ _cairo_image_surface_create(int format, int width, int height);
+public static final long /*int*/ cairo_image_surface_create(int format, int width, int height) {
lock.lock();
try {
return _cairo_image_surface_create(format, width, height);
@@ -535,8 +535,8 @@ public static final int /*long*/ cairo_image_surface_create(int format, int widt
}
}
/** @param data cast=(unsigned char *) */
-public static final native int /*long*/ _cairo_image_surface_create_for_data(int /*long*/ data, int format, int width, int height, int stride);
-public static final int /*long*/ cairo_image_surface_create_for_data(int /*long*/ data, int format, int width, int height, int stride) {
+public static final native long /*int*/ _cairo_image_surface_create_for_data(long /*int*/ data, int format, int width, int height, int stride);
+public static final long /*int*/ cairo_image_surface_create_for_data(long /*int*/ data, int format, int width, int height, int stride) {
lock.lock();
try {
return _cairo_image_surface_create_for_data(data, format, width, height, stride);
@@ -548,8 +548,8 @@ public static final int /*long*/ cairo_image_surface_create_for_data(int /*long*
* @method flags=dynamic
* @param surface cast=(cairo_surface_t *)
*/
-public static final native int /*long*/ _cairo_image_surface_get_data(int /*long*/ surface);
-public static final int /*long*/ cairo_image_surface_get_data(int /*long*/ surface) {
+public static final native long /*int*/ _cairo_image_surface_get_data(long /*int*/ surface);
+public static final long /*int*/ cairo_image_surface_get_data(long /*int*/ surface) {
lock.lock();
try {
return _cairo_image_surface_get_data(surface);
@@ -561,8 +561,8 @@ public static final int /*long*/ cairo_image_surface_get_data(int /*long*/ surfa
* @method flags=dynamic
* @param surface cast=(cairo_surface_t *)
*/
-public static final native int _cairo_image_surface_get_format(int /*long*/ surface);
-public static final int cairo_image_surface_get_format(int /*long*/ surface) {
+public static final native int _cairo_image_surface_get_format(long /*int*/ surface);
+public static final int cairo_image_surface_get_format(long /*int*/ surface) {
lock.lock();
try {
return _cairo_image_surface_get_format(surface);
@@ -571,8 +571,8 @@ public static final int cairo_image_surface_get_format(int /*long*/ surface) {
}
}
/** @param surface cast=(cairo_surface_t *) */
-public static final native int _cairo_image_surface_get_height(int /*long*/ surface);
-public static final int cairo_image_surface_get_height(int /*long*/ surface) {
+public static final native int _cairo_image_surface_get_height(long /*int*/ surface);
+public static final int cairo_image_surface_get_height(long /*int*/ surface) {
lock.lock();
try {
return _cairo_image_surface_get_height(surface);
@@ -581,8 +581,8 @@ public static final int cairo_image_surface_get_height(int /*long*/ surface) {
}
}
/** @param surface cast=(cairo_surface_t *) */
-public static final native int _cairo_image_surface_get_width(int /*long*/ surface);
-public static final int cairo_image_surface_get_width(int /*long*/ surface) {
+public static final native int _cairo_image_surface_get_width(long /*int*/ surface);
+public static final int cairo_image_surface_get_width(long /*int*/ surface) {
lock.lock();
try {
return _cairo_image_surface_get_width(surface);
@@ -594,8 +594,8 @@ public static final int cairo_image_surface_get_width(int /*long*/ surface) {
* @method flags=dynamic
* @param surface cast=(cairo_surface_t *)
*/
-public static final native int _cairo_image_surface_get_stride(int /*long*/ surface);
-public static final int cairo_image_surface_get_stride(int /*long*/ surface) {
+public static final native int _cairo_image_surface_get_stride(long /*int*/ surface);
+public static final int cairo_image_surface_get_stride(long /*int*/ surface) {
lock.lock();
try {
return _cairo_image_surface_get_stride(surface);
@@ -604,8 +604,8 @@ public static final int cairo_image_surface_get_stride(int /*long*/ surface) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native int _cairo_in_fill(int /*long*/ cr, double x, double y);
-public static final int cairo_in_fill(int /*long*/ cr, double x, double y) {
+public static final native int _cairo_in_fill(long /*int*/ cr, double x, double y);
+public static final int cairo_in_fill(long /*int*/ cr, double x, double y) {
lock.lock();
try {
return _cairo_in_fill(cr, x, y);
@@ -614,8 +614,8 @@ public static final int cairo_in_fill(int /*long*/ cr, double x, double y) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native int _cairo_in_stroke(int /*long*/ cr, double x, double y);
-public static final int cairo_in_stroke(int /*long*/ cr, double x, double y) {
+public static final native int _cairo_in_stroke(long /*int*/ cr, double x, double y);
+public static final int cairo_in_stroke(long /*int*/ cr, double x, double y) {
lock.lock();
try {
return _cairo_in_stroke(cr, x, y);
@@ -624,8 +624,8 @@ public static final int cairo_in_stroke(int /*long*/ cr, double x, double y) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_line_to(int /*long*/ cr, double x, double y);
-public static final void cairo_line_to(int /*long*/ cr, double x, double y) {
+public static final native void _cairo_line_to(long /*int*/ cr, double x, double y);
+public static final void cairo_line_to(long /*int*/ cr, double x, double y) {
lock.lock();
try {
_cairo_line_to(cr, x, y);
@@ -637,8 +637,8 @@ public static final void cairo_line_to(int /*long*/ cr, double x, double y) {
* @param cr cast=(cairo_t *)
* @param pattern cast=(cairo_pattern_t *)
*/
-public static final native void _cairo_mask(int /*long*/ cr, int /*long*/ pattern);
-public static final void cairo_mask(int /*long*/ cr, int /*long*/ pattern) {
+public static final native void _cairo_mask(long /*int*/ cr, long /*int*/ pattern);
+public static final void cairo_mask(long /*int*/ cr, long /*int*/ pattern) {
lock.lock();
try {
_cairo_mask(cr, pattern);
@@ -650,8 +650,8 @@ public static final void cairo_mask(int /*long*/ cr, int /*long*/ pattern) {
* @param cr cast=(cairo_t *)
* @param surface cast=(cairo_surface_t *)
*/
-public static final native void _cairo_mask_surface(int /*long*/ cr, int /*long*/ surface, double surface_x, double surface_y);
-public static final void cairo_mask_surface(int /*long*/ cr, int /*long*/ surface, double surface_x, double surface_y) {
+public static final native void _cairo_mask_surface(long /*int*/ cr, long /*int*/ surface, double surface_x, double surface_y);
+public static final void cairo_mask_surface(long /*int*/ cr, long /*int*/ surface, double surface_x, double surface_y) {
lock.lock();
try {
_cairo_mask_surface(cr, surface, surface_x, surface_y);
@@ -784,8 +784,8 @@ public static final void cairo_matrix_translate(double[] matrix, double tx, doub
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_move_to(int /*long*/ cr, double x, double y);
-public static final void cairo_move_to(int /*long*/ cr, double x, double y) {
+public static final native void _cairo_move_to(long /*int*/ cr, double x, double y);
+public static final void cairo_move_to(long /*int*/ cr, double x, double y) {
lock.lock();
try {
_cairo_move_to(cr, x, y);
@@ -794,8 +794,8 @@ public static final void cairo_move_to(int /*long*/ cr, double x, double y) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_new_path(int /*long*/ cr);
-public static final void cairo_new_path(int /*long*/ cr) {
+public static final native void _cairo_new_path(long /*int*/ cr);
+public static final void cairo_new_path(long /*int*/ cr) {
lock.lock();
try {
_cairo_new_path(cr);
@@ -804,8 +804,8 @@ public static final void cairo_new_path(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_paint(int /*long*/ cr);
-public static final void cairo_paint(int /*long*/ cr) {
+public static final native void _cairo_paint(long /*int*/ cr);
+public static final void cairo_paint(long /*int*/ cr) {
lock.lock();
try {
_cairo_paint(cr);
@@ -814,8 +814,8 @@ public static final void cairo_paint(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_paint_with_alpha(int /*long*/ cr, double alpha);
-public static final void cairo_paint_with_alpha(int /*long*/ cr, double alpha) {
+public static final native void _cairo_paint_with_alpha(long /*int*/ cr, double alpha);
+public static final void cairo_paint_with_alpha(long /*int*/ cr, double alpha) {
lock.lock();
try {
_cairo_paint_with_alpha(cr, alpha);
@@ -824,8 +824,8 @@ public static final void cairo_paint_with_alpha(int /*long*/ cr, double alpha) {
}
}
/** @param path cast=(cairo_path_t *) */
-public static final native void _cairo_path_destroy(int /*long*/ path);
-public static final void cairo_path_destroy(int /*long*/ path) {
+public static final native void _cairo_path_destroy(long /*int*/ path);
+public static final void cairo_path_destroy(long /*int*/ path) {
lock.lock();
try {
_cairo_path_destroy(path);
@@ -834,8 +834,8 @@ public static final void cairo_path_destroy(int /*long*/ path) {
}
}
/** @param pattern cast=(cairo_pattern_t *) */
-public static final native void _cairo_pattern_add_color_stop_rgb(int /*long*/ pattern, double offset, double red, double green, double blue);
-public static final void cairo_pattern_add_color_stop_rgb(int /*long*/ pattern, double offset, double red, double green, double blue) {
+public static final native void _cairo_pattern_add_color_stop_rgb(long /*int*/ pattern, double offset, double red, double green, double blue);
+public static final void cairo_pattern_add_color_stop_rgb(long /*int*/ pattern, double offset, double red, double green, double blue) {
lock.lock();
try {
_cairo_pattern_add_color_stop_rgb(pattern, offset, red, green, blue);
@@ -844,8 +844,8 @@ public static final void cairo_pattern_add_color_stop_rgb(int /*long*/ pattern,
}
}
/** @param pattern cast=(cairo_pattern_t *) */
-public static final native void _cairo_pattern_add_color_stop_rgba(int /*long*/ pattern, double offset, double red, double green, double blue, double alpha);
-public static final void cairo_pattern_add_color_stop_rgba(int /*long*/ pattern, double offset, double red, double green, double blue, double alpha) {
+public static final native void _cairo_pattern_add_color_stop_rgba(long /*int*/ pattern, double offset, double red, double green, double blue, double alpha);
+public static final void cairo_pattern_add_color_stop_rgba(long /*int*/ pattern, double offset, double red, double green, double blue, double alpha) {
lock.lock();
try {
_cairo_pattern_add_color_stop_rgba(pattern, offset, red, green, blue, alpha);
@@ -854,8 +854,8 @@ public static final void cairo_pattern_add_color_stop_rgba(int /*long*/ pattern,
}
}
/** @param surface cast=(cairo_surface_t *) */
-public static final native int /*long*/ _cairo_pattern_create_for_surface(int /*long*/ surface);
-public static final int /*long*/ cairo_pattern_create_for_surface(int /*long*/ surface) {
+public static final native long /*int*/ _cairo_pattern_create_for_surface(long /*int*/ surface);
+public static final long /*int*/ cairo_pattern_create_for_surface(long /*int*/ surface) {
lock.lock();
try {
return _cairo_pattern_create_for_surface(surface);
@@ -863,8 +863,8 @@ public static final int /*long*/ cairo_pattern_create_for_surface(int /*long*/ s
lock.unlock();
}
}
-public static final native int /*long*/ _cairo_pattern_create_linear(double x0, double y0, double x1, double y1);
-public static final int /*long*/ cairo_pattern_create_linear(double x0, double y0, double x1, double y1) {
+public static final native long /*int*/ _cairo_pattern_create_linear(double x0, double y0, double x1, double y1);
+public static final long /*int*/ cairo_pattern_create_linear(double x0, double y0, double x1, double y1) {
lock.lock();
try {
return _cairo_pattern_create_linear(x0, y0, x1, y1);
@@ -872,8 +872,8 @@ public static final int /*long*/ cairo_pattern_create_linear(double x0, double y
lock.unlock();
}
}
-public static final native int /*long*/ _cairo_pattern_create_radial(double cx0, double cy0, double radius0, double cx1, double cy1, double radius1);
-public static final int /*long*/ cairo_pattern_create_radial(double cx0, double cy0, double radius0, double cx1, double cy1, double radius1) {
+public static final native long /*int*/ _cairo_pattern_create_radial(double cx0, double cy0, double radius0, double cx1, double cy1, double radius1);
+public static final long /*int*/ cairo_pattern_create_radial(double cx0, double cy0, double radius0, double cx1, double cy1, double radius1) {
lock.lock();
try {
return _cairo_pattern_create_radial(cx0, cy0, radius0, cx1, cy1, radius1);
@@ -882,8 +882,8 @@ public static final int /*long*/ cairo_pattern_create_radial(double cx0, double
}
}
/** @param pattern cast=(cairo_pattern_t *) */
-public static final native void _cairo_pattern_destroy(int /*long*/ pattern);
-public static final void cairo_pattern_destroy(int /*long*/ pattern) {
+public static final native void _cairo_pattern_destroy(long /*int*/ pattern);
+public static final void cairo_pattern_destroy(long /*int*/ pattern) {
lock.lock();
try {
_cairo_pattern_destroy(pattern);
@@ -892,8 +892,8 @@ public static final void cairo_pattern_destroy(int /*long*/ pattern) {
}
}
/** @param pattern cast=(cairo_pattern_t *) */
-public static final native int _cairo_pattern_get_extend(int /*long*/ pattern);
-public static final int cairo_pattern_get_extend(int /*long*/ pattern) {
+public static final native int _cairo_pattern_get_extend(long /*int*/ pattern);
+public static final int cairo_pattern_get_extend(long /*int*/ pattern) {
lock.lock();
try {
return _cairo_pattern_get_extend(pattern);
@@ -902,8 +902,8 @@ public static final int cairo_pattern_get_extend(int /*long*/ pattern) {
}
}
/** @param pattern cast=(cairo_pattern_t *) */
-public static final native int _cairo_pattern_get_filter(int /*long*/ pattern);
-public static final int cairo_pattern_get_filter(int /*long*/ pattern) {
+public static final native int _cairo_pattern_get_filter(long /*int*/ pattern);
+public static final int cairo_pattern_get_filter(long /*int*/ pattern) {
lock.lock();
try {
return _cairo_pattern_get_filter(pattern);
@@ -915,8 +915,8 @@ public static final int cairo_pattern_get_filter(int /*long*/ pattern) {
* @param pattern cast=(cairo_pattern_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
-public static final native void _cairo_pattern_get_matrix(int /*long*/ pattern, double[] matrix);
-public static final void cairo_pattern_get_matrix(int /*long*/ pattern, double[] matrix) {
+public static final native void _cairo_pattern_get_matrix(long /*int*/ pattern, double[] matrix);
+public static final void cairo_pattern_get_matrix(long /*int*/ pattern, double[] matrix) {
lock.lock();
try {
_cairo_pattern_get_matrix(pattern, matrix);
@@ -925,8 +925,8 @@ public static final void cairo_pattern_get_matrix(int /*long*/ pattern, double[]
}
}
/** @param pattern cast=(cairo_pattern_t *) */
-public static final native void _cairo_pattern_reference(int /*long*/ pattern);
-public static final void cairo_pattern_reference(int /*long*/ pattern) {
+public static final native void _cairo_pattern_reference(long /*int*/ pattern);
+public static final void cairo_pattern_reference(long /*int*/ pattern) {
lock.lock();
try {
_cairo_pattern_reference(pattern);
@@ -935,8 +935,8 @@ public static final void cairo_pattern_reference(int /*long*/ pattern) {
}
}
/** @param pattern cast=(cairo_pattern_t *) */
-public static final native void _cairo_pattern_set_extend(int /*long*/ pattern, int extend);
-public static final void cairo_pattern_set_extend(int /*long*/ pattern, int extend) {
+public static final native void _cairo_pattern_set_extend(long /*int*/ pattern, int extend);
+public static final void cairo_pattern_set_extend(long /*int*/ pattern, int extend) {
lock.lock();
try {
_cairo_pattern_set_extend(pattern, extend);
@@ -945,8 +945,8 @@ public static final void cairo_pattern_set_extend(int /*long*/ pattern, int exte
}
}
/** @param pattern cast=(cairo_pattern_t *) */
-public static final native void _cairo_pattern_set_filter(int /*long*/ pattern, int filter);
-public static final void cairo_pattern_set_filter(int /*long*/ pattern, int filter) {
+public static final native void _cairo_pattern_set_filter(long /*int*/ pattern, int filter);
+public static final void cairo_pattern_set_filter(long /*int*/ pattern, int filter) {
lock.lock();
try {
_cairo_pattern_set_filter(pattern, filter);
@@ -958,8 +958,8 @@ public static final void cairo_pattern_set_filter(int /*long*/ pattern, int filt
* @param pattern cast=(cairo_pattern_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
-public static final native void _cairo_pattern_set_matrix(int /*long*/ pattern, double[] matrix);
-public static final void cairo_pattern_set_matrix(int /*long*/ pattern, double[] matrix) {
+public static final native void _cairo_pattern_set_matrix(long /*int*/ pattern, double[] matrix);
+public static final void cairo_pattern_set_matrix(long /*int*/ pattern, double[] matrix) {
lock.lock();
try {
_cairo_pattern_set_matrix(pattern, matrix);
@@ -971,8 +971,8 @@ public static final void cairo_pattern_set_matrix(int /*long*/ pattern, double[]
* @method flags=dynamic
* @param surface cast=(cairo_surface_t *)
*/
-public static final native void _cairo_pdf_surface_set_size(int /*long*/ surface, double width_in_points, double height_in_points);
-public static final void cairo_pdf_surface_set_size(int /*long*/ surface, double width_in_points, double height_in_points) {
+public static final native void _cairo_pdf_surface_set_size(long /*int*/ surface, double width_in_points, double height_in_points);
+public static final void cairo_pdf_surface_set_size(long /*int*/ surface, double width_in_points, double height_in_points) {
lock.lock();
try {
_cairo_pdf_surface_set_size(surface, width_in_points, height_in_points);
@@ -984,8 +984,8 @@ public static final void cairo_pdf_surface_set_size(int /*long*/ surface, double
* @method flags=dynamic
* @param cairo cast=(cairo_t *)
*/
-public static final native void _cairo_push_group(int /*long*/ cairo);
-public static final void cairo_push_group(int /*long*/ cairo) {
+public static final native void _cairo_push_group(long /*int*/ cairo);
+public static final void cairo_push_group(long /*int*/ cairo) {
lock.lock();
try {
_cairo_push_group(cairo);
@@ -997,8 +997,8 @@ public static final void cairo_push_group(int /*long*/ cairo) {
* @method flags=dynamic
* @param cairo cast=(cairo_t *)
*/
-public static final native void _cairo_pop_group_to_source(int /*long*/ cairo);
-public static final void cairo_pop_group_to_source(int /*long*/ cairo) {
+public static final native void _cairo_pop_group_to_source(long /*int*/ cairo);
+public static final void cairo_pop_group_to_source(long /*int*/ cairo) {
lock.lock();
try {
_cairo_pop_group_to_source(cairo);
@@ -1010,8 +1010,8 @@ public static final void cairo_pop_group_to_source(int /*long*/ cairo) {
* @method flags=dynamic
* @param surface cast=(cairo_surface_t *)
*/
-public static final native void _cairo_ps_surface_set_size(int /*long*/ surface, double width_in_points, double height_in_points);
-public static final void cairo_ps_surface_set_size(int /*long*/ surface, double width_in_points, double height_in_points) {
+public static final native void _cairo_ps_surface_set_size(long /*int*/ surface, double width_in_points, double height_in_points);
+public static final void cairo_ps_surface_set_size(long /*int*/ surface, double width_in_points, double height_in_points) {
lock.lock();
try {
_cairo_ps_surface_set_size(surface, width_in_points, height_in_points);
@@ -1020,8 +1020,8 @@ public static final void cairo_ps_surface_set_size(int /*long*/ surface, double
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_rectangle(int /*long*/ cr, double x, double y, double width, double height);
-public static final void cairo_rectangle(int /*long*/ cr, double x, double y, double width, double height) {
+public static final native void _cairo_rectangle(long /*int*/ cr, double x, double y, double width, double height);
+public static final void cairo_rectangle(long /*int*/ cr, double x, double y, double width, double height) {
lock.lock();
try {
_cairo_rectangle(cr, x, y, width, height);
@@ -1030,8 +1030,8 @@ public static final void cairo_rectangle(int /*long*/ cr, double x, double y, do
}
}
/** @param cr cast=(cairo_t *) */
-public static final native int /*long*/ _cairo_reference(int /*long*/ cr);
-public static final int /*long*/ cairo_reference(int /*long*/ cr) {
+public static final native long /*int*/ _cairo_reference(long /*int*/ cr);
+public static final long /*int*/ cairo_reference(long /*int*/ cr) {
lock.lock();
try {
return _cairo_reference(cr);
@@ -1040,8 +1040,8 @@ public static final int /*long*/ cairo_reference(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_rel_curve_to(int /*long*/ cr, double dx1, double dy1, double dx2, double dy2, double dx3, double dy3);
-public static final void cairo_rel_curve_to(int /*long*/ cr, double dx1, double dy1, double dx2, double dy2, double dx3, double dy3) {
+public static final native void _cairo_rel_curve_to(long /*int*/ cr, double dx1, double dy1, double dx2, double dy2, double dx3, double dy3);
+public static final void cairo_rel_curve_to(long /*int*/ cr, double dx1, double dy1, double dx2, double dy2, double dx3, double dy3) {
lock.lock();
try {
_cairo_rel_curve_to(cr, dx1, dy1, dx2, dy2, dx3, dy3);
@@ -1050,8 +1050,8 @@ public static final void cairo_rel_curve_to(int /*long*/ cr, double dx1, double
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_rel_line_to(int /*long*/ cr, double dx, double dy);
-public static final void cairo_rel_line_to(int /*long*/ cr, double dx, double dy) {
+public static final native void _cairo_rel_line_to(long /*int*/ cr, double dx, double dy);
+public static final void cairo_rel_line_to(long /*int*/ cr, double dx, double dy) {
lock.lock();
try {
_cairo_rel_line_to(cr, dx, dy);
@@ -1060,8 +1060,8 @@ public static final void cairo_rel_line_to(int /*long*/ cr, double dx, double dy
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_rel_move_to(int /*long*/ cr, double dx, double dy);
-public static final void cairo_rel_move_to(int /*long*/ cr, double dx, double dy) {
+public static final native void _cairo_rel_move_to(long /*int*/ cr, double dx, double dy);
+public static final void cairo_rel_move_to(long /*int*/ cr, double dx, double dy) {
lock.lock();
try {
_cairo_rel_move_to(cr, dx, dy);
@@ -1070,8 +1070,8 @@ public static final void cairo_rel_move_to(int /*long*/ cr, double dx, double dy
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_reset_clip(int /*long*/ cr);
-public static final void cairo_reset_clip(int /*long*/ cr) {
+public static final native void _cairo_reset_clip(long /*int*/ cr);
+public static final void cairo_reset_clip(long /*int*/ cr) {
lock.lock();
try {
_cairo_reset_clip(cr);
@@ -1080,8 +1080,8 @@ public static final void cairo_reset_clip(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_restore(int /*long*/ cr);
-public static final void cairo_restore(int /*long*/ cr) {
+public static final native void _cairo_restore(long /*int*/ cr);
+public static final void cairo_restore(long /*int*/ cr) {
lock.lock();
try {
_cairo_restore(cr);
@@ -1090,8 +1090,8 @@ public static final void cairo_restore(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_rotate(int /*long*/ cr, double angle);
-public static final void cairo_rotate(int /*long*/ cr, double angle) {
+public static final native void _cairo_rotate(long /*int*/ cr, double angle);
+public static final void cairo_rotate(long /*int*/ cr, double angle) {
lock.lock();
try {
_cairo_rotate(cr, angle);
@@ -1100,8 +1100,8 @@ public static final void cairo_rotate(int /*long*/ cr, double angle) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_save(int /*long*/ cr);
-public static final void cairo_save(int /*long*/ cr) {
+public static final native void _cairo_save(long /*int*/ cr);
+public static final void cairo_save(long /*int*/ cr) {
lock.lock();
try {
_cairo_save(cr);
@@ -1110,8 +1110,8 @@ public static final void cairo_save(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_scale(int /*long*/ cr, double sx, double sy);
-public static final void cairo_scale(int /*long*/ cr, double sx, double sy) {
+public static final native void _cairo_scale(long /*int*/ cr, double sx, double sy);
+public static final void cairo_scale(long /*int*/ cr, double sx, double sy) {
lock.lock();
try {
_cairo_scale(cr, sx, sy);
@@ -1123,8 +1123,8 @@ public static final void cairo_scale(int /*long*/ cr, double sx, double sy) {
* @param cr cast=(cairo_t *)
* @param family cast=(const char *)
*/
-public static final native void _cairo_select_font_face(int /*long*/ cr, byte[] family, int slant, int weight);
-public static final void cairo_select_font_face(int /*long*/ cr, byte[] family, int slant, int weight) {
+public static final native void _cairo_select_font_face(long /*int*/ cr, byte[] family, int slant, int weight);
+public static final void cairo_select_font_face(long /*int*/ cr, byte[] family, int slant, int weight) {
lock.lock();
try {
_cairo_select_font_face(cr, family, slant, weight);
@@ -1133,8 +1133,8 @@ public static final void cairo_select_font_face(int /*long*/ cr, byte[] family,
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_antialias(int /*long*/ cr, int antialias);
-public static final void cairo_set_antialias(int /*long*/ cr, int antialias) {
+public static final native void _cairo_set_antialias(long /*int*/ cr, int antialias);
+public static final void cairo_set_antialias(long /*int*/ cr, int antialias) {
lock.lock();
try {
_cairo_set_antialias(cr, antialias);
@@ -1143,8 +1143,8 @@ public static final void cairo_set_antialias(int /*long*/ cr, int antialias) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_dash(int /*long*/ cr, double[] dashes, int ndash, double offset);
-public static final void cairo_set_dash(int /*long*/ cr, double[] dashes, int ndash, double offset) {
+public static final native void _cairo_set_dash(long /*int*/ cr, double[] dashes, int ndash, double offset);
+public static final void cairo_set_dash(long /*int*/ cr, double[] dashes, int ndash, double offset) {
lock.lock();
try {
_cairo_set_dash(cr, dashes, ndash, offset);
@@ -1153,8 +1153,8 @@ public static final void cairo_set_dash(int /*long*/ cr, double[] dashes, int nd
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_fill_rule(int /*long*/ cr, int fill_rule);
-public static final void cairo_set_fill_rule(int /*long*/ cr, int fill_rule) {
+public static final native void _cairo_set_fill_rule(long /*int*/ cr, int fill_rule);
+public static final void cairo_set_fill_rule(long /*int*/ cr, int fill_rule) {
lock.lock();
try {
_cairo_set_fill_rule(cr, fill_rule);
@@ -1166,8 +1166,8 @@ public static final void cairo_set_fill_rule(int /*long*/ cr, int fill_rule) {
* @param cr cast=(cairo_t *)
* @param font_face cast=(cairo_font_face_t *)
*/
-public static final native void _cairo_set_font_face(int /*long*/ cr, int /*long*/ font_face);
-public static final void cairo_set_font_face(int /*long*/ cr, int /*long*/ font_face) {
+public static final native void _cairo_set_font_face(long /*int*/ cr, long /*int*/ font_face);
+public static final void cairo_set_font_face(long /*int*/ cr, long /*int*/ font_face) {
lock.lock();
try {
_cairo_set_font_face(cr, font_face);
@@ -1179,8 +1179,8 @@ public static final void cairo_set_font_face(int /*long*/ cr, int /*long*/ font_
* @param cr cast=(cairo_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
-public static final native void _cairo_set_font_matrix(int /*long*/ cr, double[] matrix);
-public static final void cairo_set_font_matrix(int /*long*/ cr, double[] matrix) {
+public static final native void _cairo_set_font_matrix(long /*int*/ cr, double[] matrix);
+public static final void cairo_set_font_matrix(long /*int*/ cr, double[] matrix) {
lock.lock();
try {
_cairo_set_font_matrix(cr, matrix);
@@ -1192,8 +1192,8 @@ public static final void cairo_set_font_matrix(int /*long*/ cr, double[] matrix)
* @param cr cast=(cairo_t *)
* @param options cast=(cairo_font_options_t *)
*/
-public static final native void _cairo_set_font_options(int /*long*/ cr, int /*long*/ options);
-public static final void cairo_set_font_options(int /*long*/ cr, int /*long*/ options) {
+public static final native void _cairo_set_font_options(long /*int*/ cr, long /*int*/ options);
+public static final void cairo_set_font_options(long /*int*/ cr, long /*int*/ options) {
lock.lock();
try {
_cairo_set_font_options(cr, options);
@@ -1202,8 +1202,8 @@ public static final void cairo_set_font_options(int /*long*/ cr, int /*long*/ op
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_font_size(int /*long*/ cr, double size);
-public static final void cairo_set_font_size(int /*long*/ cr, double size) {
+public static final native void _cairo_set_font_size(long /*int*/ cr, double size);
+public static final void cairo_set_font_size(long /*int*/ cr, double size) {
lock.lock();
try {
_cairo_set_font_size(cr, size);
@@ -1212,8 +1212,8 @@ public static final void cairo_set_font_size(int /*long*/ cr, double size) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_line_cap(int /*long*/ cr, int line_cap);
-public static final void cairo_set_line_cap(int /*long*/ cr, int line_cap) {
+public static final native void _cairo_set_line_cap(long /*int*/ cr, int line_cap);
+public static final void cairo_set_line_cap(long /*int*/ cr, int line_cap) {
lock.lock();
try {
_cairo_set_line_cap(cr, line_cap);
@@ -1222,8 +1222,8 @@ public static final void cairo_set_line_cap(int /*long*/ cr, int line_cap) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_line_join(int /*long*/ cr, int line_join);
-public static final void cairo_set_line_join(int /*long*/ cr, int line_join) {
+public static final native void _cairo_set_line_join(long /*int*/ cr, int line_join);
+public static final void cairo_set_line_join(long /*int*/ cr, int line_join) {
lock.lock();
try {
_cairo_set_line_join(cr, line_join);
@@ -1232,8 +1232,8 @@ public static final void cairo_set_line_join(int /*long*/ cr, int line_join) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_line_width(int /*long*/ cr, double width);
-public static final void cairo_set_line_width(int /*long*/ cr, double width) {
+public static final native void _cairo_set_line_width(long /*int*/ cr, double width);
+public static final void cairo_set_line_width(long /*int*/ cr, double width) {
lock.lock();
try {
_cairo_set_line_width(cr, width);
@@ -1245,8 +1245,8 @@ public static final void cairo_set_line_width(int /*long*/ cr, double width) {
* @param cr cast=(cairo_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
-public static final native void _cairo_set_matrix(int /*long*/ cr, double[] matrix);
-public static final void cairo_set_matrix(int /*long*/ cr, double[] matrix) {
+public static final native void _cairo_set_matrix(long /*int*/ cr, double[] matrix);
+public static final void cairo_set_matrix(long /*int*/ cr, double[] matrix) {
lock.lock();
try {
_cairo_set_matrix(cr, matrix);
@@ -1255,8 +1255,8 @@ public static final void cairo_set_matrix(int /*long*/ cr, double[] matrix) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_miter_limit(int /*long*/ cr, double limit);
-public static final void cairo_set_miter_limit(int /*long*/ cr, double limit) {
+public static final native void _cairo_set_miter_limit(long /*int*/ cr, double limit);
+public static final void cairo_set_miter_limit(long /*int*/ cr, double limit) {
lock.lock();
try {
_cairo_set_miter_limit(cr, limit);
@@ -1265,8 +1265,8 @@ public static final void cairo_set_miter_limit(int /*long*/ cr, double limit) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_operator(int /*long*/ cr, int op);
-public static final void cairo_set_operator(int /*long*/ cr, int op) {
+public static final native void _cairo_set_operator(long /*int*/ cr, int op);
+public static final void cairo_set_operator(long /*int*/ cr, int op) {
lock.lock();
try {
_cairo_set_operator(cr, op);
@@ -1278,8 +1278,8 @@ public static final void cairo_set_operator(int /*long*/ cr, int op) {
* @param cr cast=(cairo_t *)
* @param source cast=(cairo_pattern_t *)
*/
-public static final native void _cairo_set_source(int /*long*/ cr, int /*long*/ source);
-public static final void cairo_set_source(int /*long*/ cr, int /*long*/ source) {
+public static final native void _cairo_set_source(long /*int*/ cr, long /*int*/ source);
+public static final void cairo_set_source(long /*int*/ cr, long /*int*/ source) {
lock.lock();
try {
_cairo_set_source(cr, source);
@@ -1288,8 +1288,8 @@ public static final void cairo_set_source(int /*long*/ cr, int /*long*/ source)
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_source_rgb(int /*long*/ cr, double red, double green, double blue);
-public static final void cairo_set_source_rgb(int /*long*/ cr, double red, double green, double blue) {
+public static final native void _cairo_set_source_rgb(long /*int*/ cr, double red, double green, double blue);
+public static final void cairo_set_source_rgb(long /*int*/ cr, double red, double green, double blue) {
lock.lock();
try {
_cairo_set_source_rgb(cr, red, green, blue);
@@ -1298,8 +1298,8 @@ public static final void cairo_set_source_rgb(int /*long*/ cr, double red, doubl
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_source_rgba(int /*long*/ cr, double red, double green, double blue, double alpha);
-public static final void cairo_set_source_rgba(int /*long*/ cr, double red, double green, double blue, double alpha) {
+public static final native void _cairo_set_source_rgba(long /*int*/ cr, double red, double green, double blue, double alpha);
+public static final void cairo_set_source_rgba(long /*int*/ cr, double red, double green, double blue, double alpha) {
lock.lock();
try {
_cairo_set_source_rgba(cr, red, green, blue, alpha);
@@ -1311,8 +1311,8 @@ public static final void cairo_set_source_rgba(int /*long*/ cr, double red, doub
* @param cr cast=(cairo_t *)
* @param surface cast=(cairo_surface_t *)
*/
-public static final native void _cairo_set_source_surface(int /*long*/ cr, int /*long*/ surface, double x, double y);
-public static final void cairo_set_source_surface(int /*long*/ cr, int /*long*/ surface, double x, double y) {
+public static final native void _cairo_set_source_surface(long /*int*/ cr, long /*int*/ surface, double x, double y);
+public static final void cairo_set_source_surface(long /*int*/ cr, long /*int*/ surface, double x, double y) {
lock.lock();
try {
_cairo_set_source_surface(cr, surface, x, y);
@@ -1321,8 +1321,8 @@ public static final void cairo_set_source_surface(int /*long*/ cr, int /*long*/
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_tolerance(int /*long*/ cr, double tolerance);
-public static final void cairo_set_tolerance(int /*long*/ cr, double tolerance) {
+public static final native void _cairo_set_tolerance(long /*int*/ cr, double tolerance);
+public static final void cairo_set_tolerance(long /*int*/ cr, double tolerance) {
lock.lock();
try {
_cairo_set_tolerance(cr, tolerance);
@@ -1334,8 +1334,8 @@ public static final void cairo_set_tolerance(int /*long*/ cr, double tolerance)
* @param cr cast=(cairo_t *)
* @param glyphs cast=(cairo_glyph_t *)
*/
-public static final native void _cairo_show_glyphs(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs);
-public static final void cairo_show_glyphs(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs) {
+public static final native void _cairo_show_glyphs(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs);
+public static final void cairo_show_glyphs(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs) {
lock.lock();
try {
_cairo_show_glyphs(cr, glyphs, num_glyphs);
@@ -1344,8 +1344,8 @@ public static final void cairo_show_glyphs(int /*long*/ cr, int /*long*/ glyphs,
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_show_page(int /*long*/ cr);
-public static final void cairo_show_page(int /*long*/ cr) {
+public static final native void _cairo_show_page(long /*int*/ cr);
+public static final void cairo_show_page(long /*int*/ cr) {
lock.lock();
try {
_cairo_show_page(cr);
@@ -1357,8 +1357,8 @@ public static final void cairo_show_page(int /*long*/ cr) {
* @param cr cast=(cairo_t *)
* @param utf8 cast=(const char *)
*/
-public static final native void _cairo_show_text(int /*long*/ cr, byte[] utf8);
-public static final void cairo_show_text(int /*long*/ cr, byte[] utf8) {
+public static final native void _cairo_show_text(long /*int*/ cr, byte[] utf8);
+public static final void cairo_show_text(long /*int*/ cr, byte[] utf8) {
lock.lock();
try {
_cairo_show_text(cr, utf8);
@@ -1367,8 +1367,8 @@ public static final void cairo_show_text(int /*long*/ cr, byte[] utf8) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native int _cairo_status(int /*long*/ cr);
-public static final int cairo_status(int /*long*/ cr) {
+public static final native int _cairo_status(long /*int*/ cr);
+public static final int cairo_status(long /*int*/ cr) {
lock.lock();
try {
return _cairo_status(cr);
@@ -1376,8 +1376,8 @@ public static final int cairo_status(int /*long*/ cr) {
lock.unlock();
}
}
-public static final native int /*long*/ _cairo_status_to_string(int status);
-public static final int /*long*/ cairo_status_to_string(int status) {
+public static final native long /*int*/ _cairo_status_to_string(int status);
+public static final long /*int*/ cairo_status_to_string(int status) {
lock.lock();
try {
return _cairo_status_to_string(status);
@@ -1386,8 +1386,8 @@ public static final int /*long*/ cairo_status_to_string(int status) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_stroke(int /*long*/ cr);
-public static final void cairo_stroke(int /*long*/ cr) {
+public static final native void _cairo_stroke(long /*int*/ cr);
+public static final void cairo_stroke(long /*int*/ cr) {
lock.lock();
try {
_cairo_stroke(cr);
@@ -1396,8 +1396,8 @@ public static final void cairo_stroke(int /*long*/ cr) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_stroke_extents(int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2);
-public static final void cairo_stroke_extents(int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2) {
+public static final native void _cairo_stroke_extents(long /*int*/ cr, double[] x1, double[] y1, double[] x2, double[] y2);
+public static final void cairo_stroke_extents(long /*int*/ cr, double[] x1, double[] y1, double[] x2, double[] y2) {
lock.lock();
try {
_cairo_stroke_extents(cr, x1, y1, x2, y2);
@@ -1406,8 +1406,8 @@ public static final void cairo_stroke_extents(int /*long*/ cr, double[] x1, doub
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_stroke_preserve(int /*long*/ cr);
-public static final void cairo_stroke_preserve(int /*long*/ cr) {
+public static final native void _cairo_stroke_preserve(long /*int*/ cr);
+public static final void cairo_stroke_preserve(long /*int*/ cr) {
lock.lock();
try {
_cairo_stroke_preserve(cr);
@@ -1416,8 +1416,8 @@ public static final void cairo_stroke_preserve(int /*long*/ cr) {
}
}
/** @param other cast=(cairo_surface_t *) */
-public static final native int /*long*/ _cairo_surface_create_similar(int /*long*/ other, int format, int width, int height);
-public static final int /*long*/ cairo_surface_create_similar(int /*long*/ other, int format, int width, int height) {
+public static final native long /*int*/ _cairo_surface_create_similar(long /*int*/ other, int format, int width, int height);
+public static final long /*int*/ cairo_surface_create_similar(long /*int*/ other, int format, int width, int height) {
lock.lock();
try {
return _cairo_surface_create_similar(other, format, width, height);
@@ -1426,8 +1426,8 @@ public static final int /*long*/ cairo_surface_create_similar(int /*long*/ other
}
}
/** @param surface cast=(cairo_surface_t *) */
-public static final native void _cairo_surface_destroy(int /*long*/ surface);
-public static final void cairo_surface_destroy(int /*long*/ surface) {
+public static final native void _cairo_surface_destroy(long /*int*/ surface);
+public static final void cairo_surface_destroy(long /*int*/ surface) {
lock.lock();
try {
_cairo_surface_destroy(surface);
@@ -1436,8 +1436,8 @@ public static final void cairo_surface_destroy(int /*long*/ surface) {
}
}
/** @param surface cast=(cairo_surface_t *) */
-public static final native void _cairo_surface_flush(int /*long*/ surface);
-public static final void cairo_surface_flush(int /*long*/ surface) {
+public static final native void _cairo_surface_flush(long /*int*/ surface);
+public static final void cairo_surface_flush(long /*int*/ surface) {
lock.lock();
try {
_cairo_surface_flush(surface);
@@ -1446,8 +1446,8 @@ public static final void cairo_surface_flush(int /*long*/ surface) {
}
}
/** @param surface cast=(cairo_surface_t *) */
-public static final native void _cairo_surface_finish(int /*long*/ surface);
-public static final void cairo_surface_finish(int /*long*/ surface) {
+public static final native void _cairo_surface_finish(long /*int*/ surface);
+public static final void cairo_surface_finish(long /*int*/ surface) {
lock.lock();
try {
_cairo_surface_finish(surface);
@@ -1459,8 +1459,8 @@ public static final void cairo_surface_finish(int /*long*/ surface) {
* @method flags=dynamic
* @param surface cast=(cairo_surface_t *)
*/
-public static final native int _cairo_surface_get_type(int /*long*/ surface);
-public static final int cairo_surface_get_type(int /*long*/ surface) {
+public static final native int _cairo_surface_get_type(long /*int*/ surface);
+public static final int cairo_surface_get_type(long /*int*/ surface) {
lock.lock();
try {
return _cairo_surface_get_type(surface);
@@ -1472,8 +1472,8 @@ public static final int cairo_surface_get_type(int /*long*/ surface) {
* @method flags=dynamic
* @param surface cast=(cairo_surface_t *)
*/
-public static final native int _cairo_surface_get_content(int /*long*/ surface);
-public static final int cairo_surface_get_content(int /*long*/ surface) {
+public static final native int _cairo_surface_get_content(long /*int*/ surface);
+public static final int cairo_surface_get_content(long /*int*/ surface) {
lock.lock();
try {
return _cairo_surface_get_content(surface);
@@ -1485,8 +1485,8 @@ public static final int cairo_surface_get_content(int /*long*/ surface) {
* @param surface cast=(cairo_surface_t *)
* @param key cast=(cairo_user_data_key_t *)
*/
-public static final native int /*long*/ _cairo_surface_get_user_data(int /*long*/ surface, int /*long*/ key);
-public static final int /*long*/ cairo_surface_get_user_data(int /*long*/ surface, int /*long*/ key) {
+public static final native long /*int*/ _cairo_surface_get_user_data(long /*int*/ surface, long /*int*/ key);
+public static final long /*int*/ cairo_surface_get_user_data(long /*int*/ surface, long /*int*/ key) {
lock.lock();
try {
return _cairo_surface_get_user_data(surface, key);
@@ -1495,8 +1495,8 @@ public static final int /*long*/ cairo_surface_get_user_data(int /*long*/ surfac
}
}
/** @param surface cast=(cairo_surface_t *) */
-public static final native void _cairo_surface_mark_dirty(int /*long*/ surface);
-public static final void cairo_surface_mark_dirty(int /*long*/ surface) {
+public static final native void _cairo_surface_mark_dirty(long /*int*/ surface);
+public static final void cairo_surface_mark_dirty(long /*int*/ surface) {
lock.lock();
try {
_cairo_surface_mark_dirty(surface);
@@ -1505,8 +1505,8 @@ public static final void cairo_surface_mark_dirty(int /*long*/ surface) {
}
}
/** @param surface cast=(cairo_surface_t *) */
-public static final native void _cairo_surface_reference(int /*long*/ surface);
-public static final void cairo_surface_reference(int /*long*/ surface) {
+public static final native void _cairo_surface_reference(long /*int*/ surface);
+public static final void cairo_surface_reference(long /*int*/ surface) {
lock.lock();
try {
_cairo_surface_reference(surface);
@@ -1515,8 +1515,8 @@ public static final void cairo_surface_reference(int /*long*/ surface) {
}
}
/** @param surface cast=(cairo_surface_t *) */
-public static final native void _cairo_surface_set_device_offset(int /*long*/ surface, double x_offset, double y_offset);
-public static final void cairo_surface_set_device_offset(int /*long*/ surface, double x_offset, double y_offset) {
+public static final native void _cairo_surface_set_device_offset(long /*int*/ surface, double x_offset, double y_offset);
+public static final void cairo_surface_set_device_offset(long /*int*/ surface, double x_offset, double y_offset) {
lock.lock();
try {
_cairo_surface_set_device_offset(surface, x_offset, y_offset);
@@ -1525,8 +1525,8 @@ public static final void cairo_surface_set_device_offset(int /*long*/ surface, d
}
}
/** @method flags=dynamic */
-public static final native void _cairo_surface_set_fallback_resolution(int /*long*/ surface, double x_pixels_per_inch, double y_pixels_per_inch);
-public static final void cairo_surface_set_fallback_resolution(int /*long*/ surface, double x_pixels_per_inch, double y_pixels_per_inch) {
+public static final native void _cairo_surface_set_fallback_resolution(long /*int*/ surface, double x_pixels_per_inch, double y_pixels_per_inch);
+public static final void cairo_surface_set_fallback_resolution(long /*int*/ surface, double x_pixels_per_inch, double y_pixels_per_inch) {
lock.lock();
try {
_cairo_surface_set_fallback_resolution(surface, x_pixels_per_inch, y_pixels_per_inch);
@@ -1540,8 +1540,8 @@ public static final void cairo_surface_set_fallback_resolution(int /*long*/ surf
* @param user_data cast=(void *)
* @param destroy cast=(cairo_destroy_func_t)
*/
-public static final native int _cairo_surface_set_user_data(int /*long*/ surface, int /*long*/ key, int /*long*/ user_data, int /*long*/ destroy);
-public static final int cairo_surface_set_user_data(int /*long*/ surface, int /*long*/ key, int /*long*/ user_data, int /*long*/ destroy) {
+public static final native int _cairo_surface_set_user_data(long /*int*/ surface, long /*int*/ key, long /*int*/ user_data, long /*int*/ destroy);
+public static final int cairo_surface_set_user_data(long /*int*/ surface, long /*int*/ key, long /*int*/ user_data, long /*int*/ destroy) {
lock.lock();
try {
return _cairo_surface_set_user_data(surface, key, user_data, destroy);
@@ -1554,8 +1554,8 @@ public static final int cairo_surface_set_user_data(int /*long*/ surface, int /*
* @param utf8 cast=(const char *)
* @param extents cast=(cairo_text_extents_t *)
*/
-public static final native void _cairo_text_extents(int /*long*/ cr, byte[] utf8, cairo_text_extents_t extents);
-public static final void cairo_text_extents(int /*long*/ cr, byte[] utf8, cairo_text_extents_t extents) {
+public static final native void _cairo_text_extents(long /*int*/ cr, byte[] utf8, cairo_text_extents_t extents);
+public static final void cairo_text_extents(long /*int*/ cr, byte[] utf8, cairo_text_extents_t extents) {
lock.lock();
try {
_cairo_text_extents(cr, utf8, extents);
@@ -1567,8 +1567,8 @@ public static final void cairo_text_extents(int /*long*/ cr, byte[] utf8, cairo_
* @param cr cast=(cairo_t *)
* @param utf8 cast=(const char *)
*/
-public static final native void _cairo_text_path(int /*long*/ cr, byte[] utf8);
-public static final void cairo_text_path(int /*long*/ cr, byte[] utf8) {
+public static final native void _cairo_text_path(long /*int*/ cr, byte[] utf8);
+public static final void cairo_text_path(long /*int*/ cr, byte[] utf8) {
lock.lock();
try {
_cairo_text_path(cr, utf8);
@@ -1580,8 +1580,8 @@ public static final void cairo_text_path(int /*long*/ cr, byte[] utf8) {
* @param cr cast=(cairo_t *)
* @param matrix cast=(cairo_matrix_t *)
*/
-public static final native void _cairo_transform(int /*long*/ cr, double[] matrix);
-public static final void cairo_transform(int /*long*/ cr, double[] matrix) {
+public static final native void _cairo_transform(long /*int*/ cr, double[] matrix);
+public static final void cairo_transform(long /*int*/ cr, double[] matrix) {
lock.lock();
try {
_cairo_transform(cr, matrix);
@@ -1590,8 +1590,8 @@ public static final void cairo_transform(int /*long*/ cr, double[] matrix) {
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_translate(int /*long*/ cr, double tx, double ty);
-public static final void cairo_translate(int /*long*/ cr, double tx, double ty) {
+public static final native void _cairo_translate(long /*int*/ cr, double tx, double ty);
+public static final void cairo_translate(long /*int*/ cr, double tx, double ty) {
lock.lock();
try {
_cairo_translate(cr, tx, ty);
@@ -1600,8 +1600,8 @@ public static final void cairo_translate(int /*long*/ cr, double tx, double ty)
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_user_to_device(int /*long*/ cr, double[] x, double[] y);
-public static final void cairo_user_to_device(int /*long*/ cr, double[] x, double[] y) {
+public static final native void _cairo_user_to_device(long /*int*/ cr, double[] x, double[] y);
+public static final void cairo_user_to_device(long /*int*/ cr, double[] x, double[] y) {
lock.lock();
try {
_cairo_user_to_device(cr, x, y);
@@ -1610,8 +1610,8 @@ public static final void cairo_user_to_device(int /*long*/ cr, double[] x, doubl
}
}
/** @param cr cast=(cairo_t *) */
-public static final native void _cairo_user_to_device_distance(int /*long*/ cr, double[] dx, double[] dy);
-public static final void cairo_user_to_device_distance(int /*long*/ cr, double[] dx, double[] dy) {
+public static final native void _cairo_user_to_device_distance(long /*int*/ cr, double[] dx, double[] dy);
+public static final void cairo_user_to_device_distance(long /*int*/ cr, double[] dx, double[] dy) {
lock.lock();
try {
_cairo_user_to_device_distance(cr, dx, dy);
@@ -1625,8 +1625,8 @@ public static final native int cairo_version();
* @param drawable cast=(Drawable)
* @param visual cast=(Visual *)
*/
-public static final native int /*long*/ _cairo_xlib_surface_create(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ visual, int width, int height);
-public static final int /*long*/ cairo_xlib_surface_create(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ visual, int width, int height) {
+public static final native long /*int*/ _cairo_xlib_surface_create(long /*int*/ dpy, long /*int*/ drawable, long /*int*/ visual, int width, int height);
+public static final long /*int*/ cairo_xlib_surface_create(long /*int*/ dpy, long /*int*/ drawable, long /*int*/ visual, int width, int height) {
lock.lock();
try {
return _cairo_xlib_surface_create(dpy, drawable, visual, width, height);
@@ -1639,8 +1639,8 @@ public static final int /*long*/ cairo_xlib_surface_create(int /*long*/ dpy, int
* @param pixmap cast=(Pixmap)
* @param screen cast=(Screen *)
*/
-public static final native int /*long*/ _cairo_xlib_surface_create_for_bitmap(int /*long*/ dpy, int /*long*/ pixmap, int /*long*/ screen, int width, int height);
-public static final int /*long*/ cairo_xlib_surface_create_for_bitmap(int /*long*/ dpy, int /*long*/ pixmap, int /*long*/ screen, int width, int height) {
+public static final native long /*int*/ _cairo_xlib_surface_create_for_bitmap(long /*int*/ dpy, long /*int*/ pixmap, long /*int*/ screen, int width, int height);
+public static final long /*int*/ cairo_xlib_surface_create_for_bitmap(long /*int*/ dpy, long /*int*/ pixmap, long /*int*/ screen, int width, int height) {
lock.lock();
try {
return _cairo_xlib_surface_create_for_bitmap(dpy, pixmap, screen, width, height);
@@ -1649,8 +1649,8 @@ public static final int /*long*/ cairo_xlib_surface_create_for_bitmap(int /*long
}
}
/** @param surface cast=(cairo_surface_t *) */
-public static final native void _cairo_xlib_surface_set_size(int /*long*/ surface, int width, int height);
-public static final void cairo_xlib_surface_set_size(int /*long*/ surface, int width, int height) {
+public static final native void _cairo_xlib_surface_set_size(long /*int*/ surface, int width, int height);
+public static final void cairo_xlib_surface_set_size(long /*int*/ surface, int width, int height) {
lock.lock();
try {
_cairo_xlib_surface_set_size(surface, width, height);
@@ -1662,8 +1662,8 @@ public static final void cairo_xlib_surface_set_size(int /*long*/ surface, int w
* @method flags=dynamic
* @param surface cast=(cairo_surface_t *)
*/
-public static final native int /*long*/ _cairo_xlib_surface_get_drawable(int /*long*/ surface);
-public static final int /*long*/ cairo_xlib_surface_get_drawable(int /*long*/ surface) {
+public static final native long /*int*/ _cairo_xlib_surface_get_drawable(long /*int*/ surface);
+public static final long /*int*/ cairo_xlib_surface_get_drawable(long /*int*/ surface) {
lock.lock();
try {
return _cairo_xlib_surface_get_drawable(surface);
@@ -1675,8 +1675,8 @@ public static final int /*long*/ cairo_xlib_surface_get_drawable(int /*long*/ su
* @method flags=dynamic
* @param surface cast=(cairo_surface_t *)
*/
-public static final native int _cairo_xlib_surface_get_height(int /*long*/ surface);
-public static final int cairo_xlib_surface_get_height(int /*long*/ surface) {
+public static final native int _cairo_xlib_surface_get_height(long /*int*/ surface);
+public static final int cairo_xlib_surface_get_height(long /*int*/ surface) {
lock.lock();
try {
return _cairo_xlib_surface_get_height(surface);
@@ -1688,8 +1688,8 @@ public static final int cairo_xlib_surface_get_height(int /*long*/ surface) {
* @method flags=dynamic
* @param surface cast=(cairo_surface_t *)
*/
-public static final native int _cairo_xlib_surface_get_width(int /*long*/ surface);
-public static final int cairo_xlib_surface_get_width(int /*long*/ surface) {
+public static final native int _cairo_xlib_surface_get_width(long /*int*/ surface);
+public static final int cairo_xlib_surface_get_width(long /*int*/ surface) {
lock.lock();
try {
return _cairo_xlib_surface_get_width(surface);
@@ -1702,18 +1702,18 @@ public static final int cairo_xlib_surface_get_width(int /*long*/ surface) {
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(cairo_path_t dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(cairo_path_t dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(cairo_path_data_t dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(cairo_path_data_t dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(double[] dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(double[] dest, long /*int*/ src, long /*int*/ size);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/cairo_path_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/cairo_path_t.java
index db690aa8dd..2b02301ff0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/cairo_path_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/cairo_path_t.java
@@ -24,7 +24,7 @@ package org.eclipse.swt.internal.cairo;
public class cairo_path_t {
public int status;
/** @field cast=(cairo_path_data_t *) */
- public int /*long*/ data;
+ public long /*int*/ data;
public int num_data;
public static final int sizeof = Cairo.cairo_path_t_sizeof();
}
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 8ba01edff4..295f23dc43 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
@@ -2049,7 +2049,7 @@ public static final native int CGDisplayBytesPerRow (int display);
* @method flags=dynamic
* @param displayID cast=(CGDirectDisplayID)
*/
-public static final native int /*long*/ CGDisplayCreateImage(int displayID);
+public static final native long /*int*/ CGDisplayCreateImage(int displayID);
/** @param display cast=(CGDirectDisplayID) */
public static final native int CGDisplayPixelsHigh (int display);
/** @param display cast=(CGDirectDisplayID) */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java
index a1b3b9f128..b607fc1ba8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java
@@ -297,7 +297,7 @@ public static final native int HICocoaViewCreate(int nsview, int options, int[]
* @param aClass cast=(Class)
* @param aSelector cast=(SEL)
*/
-public static final native int /*long*/ class_getClassMethod(int /*long*/ aClass, int /*long*/ aSelector);
+public static final native long /*int*/ class_getClassMethod(long /*int*/ aClass, long /*int*/ aSelector);
/** @param className cast=(const char *) */
public static final native int objc_getClass(byte[] className);
/** @param className cast=(const char *) */
@@ -416,7 +416,7 @@ public static final native int objc_msgSend(int object, int selector, int arg0,
*/
public static final native int objc_msgSend(int object, int selector, int[] arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10);
/** @method flags=cast */
-public static final native double objc_msgSend_fpret(int /*long*/ id, int /*long*/ sel);
+public static final native double objc_msgSend_fpret(long /*int*/ id, long /*int*/ sel);
/**
* @param result cast=(void *)
* @param object cast=(void *)
@@ -424,7 +424,7 @@ public static final native double objc_msgSend_fpret(int /*long*/ id, int /*long
*/
public static final native void objc_msgSend_stret(NSRect result, int object, int selector);
/** @method flags=cast */
-public static final native void objc_msgSend_stret(NSPoint result, int /*long*/ id, int /*long*/ sel);
+public static final native void objc_msgSend_stret(NSPoint result, long /*int*/ id, long /*int*/ sel);
/**
* @param result cast=(void *)
* @param object cast=(void *)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CFRange.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CFRange.java
index da171ade5c..75eb095bb6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CFRange.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CFRange.java
@@ -11,7 +11,7 @@
package org.eclipse.swt.internal.cocoa;
public class CFRange {
- public int /*long*/ location;
- public int /*long*/ length;
+ public long /*int*/ location;
+ public long /*int*/ length;
public static int sizeof = OS.CFRange_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGAffineTransform.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGAffineTransform.java
index 520553b3b3..1760aa4e9f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGAffineTransform.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGAffineTransform.java
@@ -11,11 +11,11 @@
package org.eclipse.swt.internal.cocoa;
public class CGAffineTransform {
- public float /*double*/ a;
- public float /*double*/ b;
- public float /*double*/ c;
- public float /*double*/ d;
- public float /*double*/ tx;
- public float /*double*/ ty;
+ public double /*float*/ a;
+ public double /*float*/ b;
+ public double /*float*/ c;
+ public double /*float*/ d;
+ public double /*float*/ tx;
+ public double /*float*/ ty;
public static int sizeof = OS.CGAffineTransform_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPathElement.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPathElement.java
index 8b700c86a8..ffb8c04f46 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPathElement.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPathElement.java
@@ -15,6 +15,6 @@ public class CGPathElement {
/** @field cast=(CGPathElementType) */
public int type;
/** @field cast=(CGPoint *) */
- public int /*long*/ points;
+ public long /*int*/ points;
public static final int sizeof = OS.CGPathElement_sizeof();
}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPoint.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPoint.java
index 6408522352..0dfa4d55d3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPoint.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPoint.java
@@ -11,7 +11,7 @@
package org.eclipse.swt.internal.cocoa;
public class CGPoint {
- public float /*double*/ x;
- public float /*double*/ y;
+ public double /*float*/ x;
+ public double /*float*/ y;
public static final int sizeof = OS.CGPoint_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGSize.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGSize.java
index 2498493b74..4d27f673ae 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGSize.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGSize.java
@@ -11,7 +11,7 @@
package org.eclipse.swt.internal.cocoa;
public class CGSize {
- public float /*double*/ width;
- public float /*double*/ height;
+ public double /*float*/ width;
+ public double /*float*/ height;
public static final int sizeof = OS.CGSize_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CTParagraphStyleSetting.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CTParagraphStyleSetting.java
index fafe146fac..fce07c1486 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CTParagraphStyleSetting.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CTParagraphStyleSetting.java
@@ -14,8 +14,8 @@ package org.eclipse.swt.internal.cocoa;
public class CTParagraphStyleSetting {
/** @field cast=(CTParagraphStyleSpecifier) */
public int spec;
- public int /*long*/ valueSize;
+ public long /*int*/ valueSize;
/** @field cast=(void *) */
- public int /*long*/ value;
+ public long /*int*/ value;
public static final int sizeof = OS.CTParagraphStyleSetting_sizeof();
}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMDocument.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMDocument.java
index df4b442fdc..9f952871ca 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMDocument.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMDocument.java
@@ -16,7 +16,7 @@ public DOMDocument() {
super();
}
-public DOMDocument(int /*long*/ id) {
+public DOMDocument(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public DOMDocument(id id) {
}
public WebFrame webFrame() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_webFrame);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_webFrame);
return result != 0 ? new WebFrame(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMEvent.java
index 44bd432dfc..44e72b0fad 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMEvent.java
@@ -16,7 +16,7 @@ public DOMEvent() {
super();
}
-public DOMEvent(int /*long*/ id) {
+public DOMEvent(long /*int*/ id) {
super(id);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMKeyboardEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMKeyboardEvent.java
index 3ce5b472ee..a1ab3a1d00 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMKeyboardEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMKeyboardEvent.java
@@ -16,7 +16,7 @@ public DOMKeyboardEvent() {
super();
}
-public DOMKeyboardEvent(int /*long*/ id) {
+public DOMKeyboardEvent(long /*int*/ id) {
super(id);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMMouseEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMMouseEvent.java
index 503ee08ef6..03c55d6f71 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMMouseEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMMouseEvent.java
@@ -16,7 +16,7 @@ public DOMMouseEvent() {
super();
}
-public DOMMouseEvent(int /*long*/ id) {
+public DOMMouseEvent(long /*int*/ id) {
super(id);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMUIEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMUIEvent.java
index 053e025f2f..b10b357d2e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMUIEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMUIEvent.java
@@ -16,7 +16,7 @@ public DOMUIEvent() {
super();
}
-public DOMUIEvent(int /*long*/ id) {
+public DOMUIEvent(long /*int*/ id) {
super(id);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMWheelEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMWheelEvent.java
index 9b99a8f2d3..8d8295a044 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMWheelEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMWheelEvent.java
@@ -16,7 +16,7 @@ public DOMWheelEvent() {
super();
}
-public DOMWheelEvent(int /*long*/ id) {
+public DOMWheelEvent(long /*int*/ id) {
super(id);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSActionCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSActionCell.java
index 6796aa2f22..a4f293f7c3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSActionCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSActionCell.java
@@ -16,7 +16,7 @@ public NSActionCell() {
super();
}
-public NSActionCell(int /*long*/ id) {
+public NSActionCell(long /*int*/ id) {
super(id);
}
@@ -24,11 +24,11 @@ public NSActionCell(id id) {
super(id);
}
-public int /*long*/ action() {
+public long /*int*/ action() {
return OS.objc_msgSend(this.id, OS.sel_action);
}
-public void setAction(int /*long*/ aSelector) {
+public void setAction(long /*int*/ aSelector) {
OS.objc_msgSend(this.id, OS.sel_setAction_, aSelector);
}
@@ -37,7 +37,7 @@ public void setTarget(id anObject) {
}
public id target() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_target);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_target);
return result != 0 ? new id(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransform.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransform.java
index 88369a7794..cad22b59d4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransform.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransform.java
@@ -16,7 +16,7 @@ public NSAffineTransform() {
super();
}
-public NSAffineTransform(int /*long*/ id) {
+public NSAffineTransform(long /*int*/ id) {
super(id);
}
@@ -33,7 +33,7 @@ public void set() {
}
public NSAffineTransform initWithTransform(NSAffineTransform transform) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithTransform_, transform != null ? transform.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithTransform_, transform != null ? transform.id : 0);
return result == this.id ? this : (result != 0 ? new NSAffineTransform(result) : null);
}
@@ -45,11 +45,11 @@ public void prependTransform(NSAffineTransform transform) {
OS.objc_msgSend(this.id, OS.sel_prependTransform_, transform != null ? transform.id : 0);
}
-public void rotateByDegrees(float /*double*/ angle) {
+public void rotateByDegrees(double /*float*/ angle) {
OS.objc_msgSend(this.id, OS.sel_rotateByDegrees_, angle);
}
-public void scaleXBy(float /*double*/ scaleX, float /*double*/ scaleY) {
+public void scaleXBy(double /*float*/ scaleX, double /*float*/ scaleY) {
OS.objc_msgSend(this.id, OS.sel_scaleXBy_yBy_, scaleX, scaleY);
}
@@ -58,7 +58,7 @@ public void setTransformStruct(NSAffineTransformStruct transformStruct) {
}
public static NSAffineTransform transform() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSAffineTransform, OS.sel_transform);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSAffineTransform, OS.sel_transform);
return result != 0 ? new NSAffineTransform(result) : null;
}
@@ -80,7 +80,7 @@ public NSAffineTransformStruct transformStruct() {
return result;
}
-public void translateXBy(float /*double*/ deltaX, float /*double*/ deltaY) {
+public void translateXBy(double /*float*/ deltaX, double /*float*/ deltaY) {
OS.objc_msgSend(this.id, OS.sel_translateXBy_yBy_, deltaX, deltaY);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java
index 82b75ea9ad..64b07b6d99 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java
@@ -11,7 +11,7 @@
package org.eclipse.swt.internal.cocoa;
public class NSAffineTransformStruct {
- public float /*double*/ m11, m12, m21, m22;
- public float /*double*/ tX, tY;
+ public double /*float*/ m11, m12, m21, m22;
+ public double /*float*/ tX, tY;
public static final int sizeof = OS.NSAffineTransformStruct_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAlert.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAlert.java
index 6d3ed2d820..4d9135cff3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAlert.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAlert.java
@@ -16,7 +16,7 @@ public NSAlert() {
super();
}
-public NSAlert(int /*long*/ id) {
+public NSAlert(long /*int*/ id) {
super(id);
}
@@ -25,19 +25,19 @@ public NSAlert(id id) {
}
public NSButton addButtonWithTitle(NSString title) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_addButtonWithTitle_, title != null ? title.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_addButtonWithTitle_, title != null ? title.id : 0);
return result != 0 ? new NSButton(result) : null;
}
-public void beginSheetModalForWindow(NSWindow window, id delegate, int /*long*/ didEndSelector, int /*long*/ contextInfo) {
+public void beginSheetModalForWindow(NSWindow window, id delegate, long /*int*/ didEndSelector, long /*int*/ contextInfo) {
OS.objc_msgSend(this.id, OS.sel_beginSheetModalForWindow_modalDelegate_didEndSelector_contextInfo_, window != null ? window.id : 0, delegate != null ? delegate.id : 0, didEndSelector, contextInfo);
}
-public int /*long*/ runModal() {
+public long /*int*/ runModal() {
return OS.objc_msgSend(this.id, OS.sel_runModal);
}
-public void setAlertStyle(int /*long*/ style) {
+public void setAlertStyle(long /*int*/ style) {
OS.objc_msgSend(this.id, OS.sel_setAlertStyle_, style);
}
@@ -46,7 +46,7 @@ public void setMessageText(NSString messageText) {
}
public NSWindow window() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_window);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_window);
return result != 0 ? new NSWindow(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleEventDescriptor.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleEventDescriptor.java
index 6790acbe91..f07f936e24 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleEventDescriptor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleEventDescriptor.java
@@ -16,7 +16,7 @@ public NSAppleEventDescriptor() {
super();
}
-public NSAppleEventDescriptor(int /*long*/ id) {
+public NSAppleEventDescriptor(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSAppleEventDescriptor(id id) {
}
public NSAppleEventDescriptor initListDescriptor() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initListDescriptor);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initListDescriptor);
return result == this.id ? this : (result != 0 ? new NSAppleEventDescriptor(result) : null);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java
index a3ff53d87e..d273488c24 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java
@@ -16,7 +16,7 @@ public NSApplication() {
super();
}
-public NSApplication(int /*long*/ id) {
+public NSApplication(long /*int*/ id) {
super(id);
}
@@ -29,7 +29,7 @@ public void activateIgnoringOtherApps(boolean flag) {
}
public NSImage applicationIconImage() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_applicationIconImage);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_applicationIconImage);
return result != 0 ? new NSImage(result) : null;
}
@@ -37,21 +37,21 @@ public void arrangeInFront(id sender) {
OS.objc_msgSend(this.id, OS.sel_arrangeInFront_, sender != null ? sender.id : 0);
}
-public void beginSheet(NSWindow sheet, NSWindow docWindow, id modalDelegate, int /*long*/ didEndSelector, int /*long*/ contextInfo) {
+public void beginSheet(NSWindow sheet, NSWindow docWindow, id modalDelegate, long /*int*/ didEndSelector, long /*int*/ contextInfo) {
OS.objc_msgSend(this.id, OS.sel_beginSheet_modalForWindow_modalDelegate_didEndSelector_contextInfo_, sheet != null ? sheet.id : 0, docWindow != null ? docWindow.id : 0, modalDelegate != null ? modalDelegate.id : 0, didEndSelector, contextInfo);
}
public NSEvent currentEvent() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_currentEvent);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_currentEvent);
return result != 0 ? new NSEvent(result) : null;
}
public NSDockTile dockTile() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_dockTile);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_dockTile);
return result != 0 ? new NSDockTile(result) : null;
}
-public void endSheet(NSWindow sheet, int /*long*/ returnCode) {
+public void endSheet(NSWindow sheet, long /*int*/ returnCode) {
OS.objc_msgSend(this.id, OS.sel_endSheet_returnCode_, sheet != null ? sheet.id : 0, returnCode);
}
@@ -76,22 +76,22 @@ public boolean isRunning() {
}
public NSWindow keyWindow() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_keyWindow);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_keyWindow);
return result != 0 ? new NSWindow(result) : null;
}
public NSMenu mainMenu() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_mainMenu);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_mainMenu);
return result != 0 ? new NSMenu(result) : null;
}
public NSWindow mainWindow() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_mainWindow);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_mainWindow);
return result != 0 ? new NSWindow(result) : null;
}
-public NSEvent nextEventMatchingMask(int /*long*/ mask, NSDate expiration, NSString mode, boolean deqFlag) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_nextEventMatchingMask_untilDate_inMode_dequeue_, mask, expiration != null ? expiration.id : 0, mode != null ? mode.id : 0, deqFlag);
+public NSEvent nextEventMatchingMask(long /*int*/ mask, NSDate expiration, NSString mode, boolean deqFlag) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_nextEventMatchingMask_untilDate_inMode_dequeue_, mask, expiration != null ? expiration.id : 0, mode != null ? mode.id : 0, deqFlag);
return result != 0 ? new NSEvent(result) : null;
}
@@ -100,7 +100,7 @@ public void orderFrontStandardAboutPanel(id sender) {
}
public NSArray orderedWindows() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_orderedWindows);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_orderedWindows);
return result != 0 ? new NSArray(result) : null;
}
@@ -108,7 +108,7 @@ public void postEvent(NSEvent event, boolean flag) {
OS.objc_msgSend(this.id, OS.sel_postEvent_atStart_, event != null ? event.id : 0, flag);
}
-public void replyToOpenOrPrint(int /*long*/ reply) {
+public void replyToOpenOrPrint(long /*int*/ reply) {
OS.objc_msgSend(this.id, OS.sel_replyToOpenOrPrint_, reply);
}
@@ -116,11 +116,11 @@ public void run() {
OS.objc_msgSend(this.id, OS.sel_run);
}
-public int /*long*/ runModalForWindow(NSWindow theWindow) {
+public long /*int*/ runModalForWindow(NSWindow theWindow) {
return OS.objc_msgSend(this.id, OS.sel_runModalForWindow_, theWindow != null ? theWindow.id : 0);
}
-public boolean sendAction(int /*long*/ theAction, id theTarget, id sender) {
+public boolean sendAction(long /*int*/ theAction, id theTarget, id sender) {
return OS.objc_msgSend_bool(this.id, OS.sel_sendAction_to_from_, theAction, theTarget != null ? theTarget.id : 0, sender != null ? sender.id : 0);
}
@@ -145,7 +145,7 @@ public void setServicesMenu(NSMenu aMenu) {
}
public static NSApplication sharedApplication() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSApplication, OS.sel_sharedApplication);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSApplication, OS.sel_sharedApplication);
return result != 0 ? new NSApplication(result) : null;
}
@@ -161,13 +161,13 @@ public void unhideAllApplications(id sender) {
OS.objc_msgSend(this.id, OS.sel_unhideAllApplications_, sender != null ? sender.id : 0);
}
-public NSWindow windowWithWindowNumber(int /*long*/ windowNum) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_windowWithWindowNumber_, windowNum);
+public NSWindow windowWithWindowNumber(long /*int*/ windowNum) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_windowWithWindowNumber_, windowNum);
return result != 0 ? new NSWindow(result) : null;
}
public NSArray windows() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_windows);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_windows);
return result != 0 ? new NSArray(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArray.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArray.java
index 6d63291431..419ad7e5aa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArray.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArray.java
@@ -16,7 +16,7 @@ public NSArray() {
super();
}
-public NSArray(int /*long*/ id) {
+public NSArray(long /*int*/ id) {
super(id);
}
@@ -25,12 +25,12 @@ public NSArray(id id) {
}
public static NSArray array() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSArray, OS.sel_array);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSArray, OS.sel_array);
return result != 0 ? new NSArray(result) : null;
}
public static NSArray arrayWithObject(id anObject) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSArray, OS.sel_arrayWithObject_, anObject != null ? anObject.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSArray, OS.sel_arrayWithObject_, anObject != null ? anObject.id : 0);
return result != 0 ? new NSArray(result) : null;
}
@@ -38,16 +38,16 @@ public boolean containsObject(id anObject) {
return OS.objc_msgSend_bool(this.id, OS.sel_containsObject_, anObject != null ? anObject.id : 0);
}
-public int /*long*/ count() {
+public long /*int*/ count() {
return OS.objc_msgSend(this.id, OS.sel_count);
}
-public int /*long*/ indexOfObjectIdenticalTo(id anObject) {
+public long /*int*/ indexOfObjectIdenticalTo(id anObject) {
return OS.objc_msgSend(this.id, OS.sel_indexOfObjectIdenticalTo_, anObject != null ? anObject.id : 0);
}
-public id objectAtIndex(int /*long*/ index) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_objectAtIndex_, index);
+public id objectAtIndex(long /*int*/ index) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_objectAtIndex_, index);
return result != 0 ? new id(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAssertionHandler.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAssertionHandler.java
index 33e74b8ffd..4ab5c19de1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAssertionHandler.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAssertionHandler.java
@@ -16,7 +16,7 @@ public NSAssertionHandler() {
super();
}
-public NSAssertionHandler(int /*long*/ id) {
+public NSAssertionHandler(long /*int*/ id) {
super(id);
}
@@ -25,15 +25,15 @@ public NSAssertionHandler(id id) {
}
public static NSAssertionHandler currentHandler() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSAssertionHandler, OS.sel_currentHandler);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSAssertionHandler, OS.sel_currentHandler);
return result != 0 ? new NSAssertionHandler(result) : null;
}
-public void handleFailureInFunction(NSString functionName, NSString fileName, int /*long*/ line, NSString format) {
+public void handleFailureInFunction(NSString functionName, NSString fileName, long /*int*/ line, NSString format) {
OS.objc_msgSend(this.id, OS.sel_handleFailureInFunction_file_lineNumber_description_, functionName != null ? functionName.id : 0, fileName != null ? fileName.id : 0, line, format != null ? format.id : 0);
}
-public void handleFailureInMethod(int /*long*/ selector, id object, NSString fileName, int /*long*/ line, NSString format) {
+public void handleFailureInMethod(long /*int*/ selector, id object, NSString fileName, long /*int*/ line, NSString format) {
OS.objc_msgSend(this.id, OS.sel_handleFailureInMethod_object_file_lineNumber_description_, selector, object != null ? object.id : 0, fileName != null ? fileName.id : 0, line, format != null ? format.id : 0);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java
index cc8066ea78..84662993d1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java
@@ -16,7 +16,7 @@ public NSAttributedString() {
super();
}
-public NSAttributedString(int /*long*/ id) {
+public NSAttributedString(long /*int*/ id) {
super(id);
}
@@ -25,17 +25,17 @@ public NSAttributedString(id id) {
}
public static NSAttributedString attributedStringWithAttachment(NSTextAttachment attachment) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSAttributedString, OS.sel_attributedStringWithAttachment_, attachment != null ? attachment.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSAttributedString, OS.sel_attributedStringWithAttachment_, attachment != null ? attachment.id : 0);
return result != 0 ? new NSAttributedString(result) : null;
}
-public NSRect boundingRectWithSize(NSSize size, int /*long*/ options) {
+public NSRect boundingRectWithSize(NSSize size, long /*int*/ options) {
NSRect result = new NSRect();
OS.objc_msgSend_stret(result, this.id, OS.sel_boundingRectWithSize_options_, size, options);
return result;
}
-public NSRange doubleClickAtIndex(int /*long*/ location) {
+public NSRange doubleClickAtIndex(long /*int*/ location) {
NSRange result = new NSRange();
OS.objc_msgSend_stret(result, this.id, OS.sel_doubleClickAtIndex_, location);
return result;
@@ -49,7 +49,7 @@ public void drawInRect(NSRect rect) {
OS.objc_msgSend(this.id, OS.sel_drawInRect_, rect);
}
-public int /*long*/ nextWordFromIndex(int /*long*/ location, boolean isForward) {
+public long /*int*/ nextWordFromIndex(long /*int*/ location, boolean isForward) {
return OS.objc_msgSend(this.id, OS.sel_nextWordFromIndex_forward_, location, isForward);
}
@@ -59,37 +59,37 @@ public NSSize size() {
return result;
}
-public id attribute(NSString attrName, int /*long*/ location, int /*long*/ range) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_attribute_atIndex_effectiveRange_, attrName != null ? attrName.id : 0, location, range);
+public id attribute(NSString attrName, long /*int*/ location, long /*int*/ range) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_attribute_atIndex_effectiveRange_, attrName != null ? attrName.id : 0, location, range);
return result != 0 ? new id(result) : null;
}
public NSAttributedString attributedSubstringFromRange(NSRange range) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_attributedSubstringFromRange_, range);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_attributedSubstringFromRange_, range);
return result == this.id ? this : (result != 0 ? new NSAttributedString(result) : null);
}
-public NSDictionary attributesAtIndex(int /*long*/ location, int /*long*/ range, NSRange rangeLimit) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_attributesAtIndex_longestEffectiveRange_inRange_, location, range, rangeLimit);
+public NSDictionary attributesAtIndex(long /*int*/ location, long /*int*/ range, NSRange rangeLimit) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_attributesAtIndex_longestEffectiveRange_inRange_, location, range, rangeLimit);
return result != 0 ? new NSDictionary(result) : null;
}
public NSAttributedString initWithString(NSString str) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithString_, str != null ? str.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithString_, str != null ? str.id : 0);
return result == this.id ? this : (result != 0 ? new NSAttributedString(result) : null);
}
public NSAttributedString initWithString(NSString str, NSDictionary attrs) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithString_attributes_, str != null ? str.id : 0, attrs != null ? attrs.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithString_attributes_, str != null ? str.id : 0, attrs != null ? attrs.id : 0);
return result == this.id ? this : (result != 0 ? new NSAttributedString(result) : null);
}
-public int /*long*/ length() {
+public long /*int*/ length() {
return OS.objc_msgSend(this.id, OS.sel_length);
}
public NSString string() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_string);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_string);
return result != 0 ? new NSString(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAutoreleasePool.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAutoreleasePool.java
index 37ff895293..46f45de014 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAutoreleasePool.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAutoreleasePool.java
@@ -16,7 +16,7 @@ public NSAutoreleasePool() {
super();
}
-public NSAutoreleasePool(int /*long*/ id) {
+public NSAutoreleasePool(long /*int*/ id) {
super(id);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBezierPath.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBezierPath.java
index 142f2fa4b0..27cfab8142 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBezierPath.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBezierPath.java
@@ -16,7 +16,7 @@ public NSBezierPath() {
super();
}
-public NSBezierPath(int /*long*/ id) {
+public NSBezierPath(long /*int*/ id) {
super(id);
}
@@ -32,15 +32,15 @@ public void appendBezierPath(NSBezierPath path) {
OS.objc_msgSend(this.id, OS.sel_appendBezierPath_, path != null ? path.id : 0);
}
-public void appendBezierPathWithArcWithCenter(NSPoint center, float /*double*/ radius, float /*double*/ startAngle, float /*double*/ endAngle) {
+public void appendBezierPathWithArcWithCenter(NSPoint center, double /*float*/ radius, double /*float*/ startAngle, double /*float*/ endAngle) {
OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_, center, radius, startAngle, endAngle);
}
-public void appendBezierPathWithArcWithCenter(NSPoint center, float /*double*/ radius, float /*double*/ startAngle, float /*double*/ endAngle, boolean clockwise) {
+public void appendBezierPathWithArcWithCenter(NSPoint center, double /*float*/ radius, double /*float*/ startAngle, double /*float*/ endAngle, boolean clockwise) {
OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_clockwise_, center, radius, startAngle, endAngle, clockwise);
}
-public void appendBezierPathWithGlyphs(int /*long*/ glyphs, int /*long*/ count, NSFont font) {
+public void appendBezierPathWithGlyphs(long /*int*/ glyphs, long /*int*/ count, NSFont font) {
OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithGlyphs_count_inFont_, glyphs, count, font != null ? font.id : 0);
}
@@ -52,22 +52,22 @@ public void appendBezierPathWithRect(NSRect rect) {
OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithRect_, rect);
}
-public void appendBezierPathWithRoundedRect(NSRect rect, float /*double*/ xRadius, float /*double*/ yRadius) {
+public void appendBezierPathWithRoundedRect(NSRect rect, double /*float*/ xRadius, double /*float*/ yRadius) {
OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithRoundedRect_xRadius_yRadius_, rect, xRadius, yRadius);
}
public static NSBezierPath bezierPath() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPath);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPath);
return result != 0 ? new NSBezierPath(result) : null;
}
public NSBezierPath bezierPathByFlatteningPath() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_bezierPathByFlatteningPath);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_bezierPathByFlatteningPath);
return result == this.id ? this : (result != 0 ? new NSBezierPath(result) : null);
}
public static NSBezierPath bezierPathWithRect(NSRect rect) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPathWithRect_, rect);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPathWithRect_, rect);
return result != 0 ? new NSBezierPath(result) : null;
}
@@ -101,15 +101,15 @@ public void curveToPoint(NSPoint endPoint, NSPoint controlPoint1, NSPoint contro
OS.objc_msgSend(this.id, OS.sel_curveToPoint_controlPoint1_controlPoint2_, endPoint, controlPoint1, controlPoint2);
}
-public static float /*double*/ defaultFlatness() {
- return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSBezierPath, OS.sel_defaultFlatness);
+public static double /*float*/ defaultFlatness() {
+ return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSBezierPath, OS.sel_defaultFlatness);
}
-public int /*long*/ elementAtIndex(int /*long*/ index, int /*long*/ points) {
+public long /*int*/ elementAtIndex(long /*int*/ index, long /*int*/ points) {
return OS.objc_msgSend(this.id, OS.sel_elementAtIndex_associatedPoints_, index, points);
}
-public int /*long*/ elementCount() {
+public long /*int*/ elementCount() {
return OS.objc_msgSend(this.id, OS.sel_elementCount);
}
@@ -141,31 +141,31 @@ public void setClip() {
OS.objc_msgSend(this.id, OS.sel_setClip);
}
-public static void setDefaultFlatness(float /*double*/ flatness) {
+public static void setDefaultFlatness(double /*float*/ flatness) {
OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_setDefaultFlatness_, flatness);
}
-public void setLineCapStyle(int /*long*/ lineCapStyle) {
+public void setLineCapStyle(long /*int*/ lineCapStyle) {
OS.objc_msgSend(this.id, OS.sel_setLineCapStyle_, lineCapStyle);
}
-public void setLineDash(float[] /*double[]*/ pattern, int /*long*/ count, float /*double*/ phase) {
+public void setLineDash(double[] /*float[]*/ pattern, long /*int*/ count, double /*float*/ phase) {
OS.objc_msgSend(this.id, OS.sel_setLineDash_count_phase_, pattern, count, phase);
}
-public void setLineJoinStyle(int /*long*/ lineJoinStyle) {
+public void setLineJoinStyle(long /*int*/ lineJoinStyle) {
OS.objc_msgSend(this.id, OS.sel_setLineJoinStyle_, lineJoinStyle);
}
-public void setLineWidth(float /*double*/ lineWidth) {
+public void setLineWidth(double /*float*/ lineWidth) {
OS.objc_msgSend(this.id, OS.sel_setLineWidth_, lineWidth);
}
-public void setMiterLimit(float /*double*/ miterLimit) {
+public void setMiterLimit(double /*float*/ miterLimit) {
OS.objc_msgSend(this.id, OS.sel_setMiterLimit_, miterLimit);
}
-public void setWindingRule(int /*long*/ windingRule) {
+public void setWindingRule(long /*int*/ windingRule) {
OS.objc_msgSend(this.id, OS.sel_setWindingRule_, windingRule);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBitmapImageRep.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBitmapImageRep.java
index 7e0261ffc4..487e387577 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBitmapImageRep.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBitmapImageRep.java
@@ -16,7 +16,7 @@ public NSBitmapImageRep() {
super();
}
-public NSBitmapImageRep(int /*long*/ id) {
+public NSBitmapImageRep(long /*int*/ id) {
super(id);
}
@@ -25,61 +25,61 @@ public NSBitmapImageRep(id id) {
}
public NSData TIFFRepresentation() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_TIFFRepresentation);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_TIFFRepresentation);
return result != 0 ? new NSData(result) : null;
}
-public int /*long*/ bitmapData() {
+public long /*int*/ bitmapData() {
return OS.objc_msgSend(this.id, OS.sel_bitmapData);
}
-public int /*long*/ bitmapFormat() {
+public long /*int*/ bitmapFormat() {
return OS.objc_msgSend(this.id, OS.sel_bitmapFormat);
}
-public int /*long*/ bitsPerPixel() {
+public long /*int*/ bitsPerPixel() {
return OS.objc_msgSend(this.id, OS.sel_bitsPerPixel);
}
-public int /*long*/ bytesPerPlane() {
+public long /*int*/ bytesPerPlane() {
return OS.objc_msgSend(this.id, OS.sel_bytesPerPlane);
}
-public int /*long*/ bytesPerRow() {
+public long /*int*/ bytesPerRow() {
return OS.objc_msgSend(this.id, OS.sel_bytesPerRow);
}
-public NSColor colorAtX(int /*long*/ x, int /*long*/ y) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_colorAtX_y_, x, y);
+public NSColor colorAtX(long /*int*/ x, long /*int*/ y) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_colorAtX_y_, x, y);
return result != 0 ? new NSColor(result) : null;
}
-public void getBitmapDataPlanes(int[] /*long[]*/ data) {
+public void getBitmapDataPlanes(long[] /*int[]*/ data) {
OS.objc_msgSend(this.id, OS.sel_getBitmapDataPlanes_, data);
}
public static id imageRepWithData(NSData data) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSBitmapImageRep, OS.sel_imageRepWithData_, data != null ? data.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSBitmapImageRep, OS.sel_imageRepWithData_, data != null ? data.id : 0);
return result != 0 ? new id(result) : null;
}
-public NSBitmapImageRep initWithBitmapDataPlanes(int /*long*/ planes, int /*long*/ width, int /*long*/ height, int /*long*/ bps, int /*long*/ spp, boolean alpha, boolean isPlanar, NSString colorSpaceName, int /*long*/ bitmapFormat, int /*long*/ rBytes, int /*long*/ pBits) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName != null ? colorSpaceName.id : 0, bitmapFormat, rBytes, pBits);
+public NSBitmapImageRep initWithBitmapDataPlanes(long /*int*/ planes, long /*int*/ width, long /*int*/ height, long /*int*/ bps, long /*int*/ spp, boolean alpha, boolean isPlanar, NSString colorSpaceName, long /*int*/ bitmapFormat, long /*int*/ rBytes, long /*int*/ pBits) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName != null ? colorSpaceName.id : 0, bitmapFormat, rBytes, pBits);
return result == this.id ? this : (result != 0 ? new NSBitmapImageRep(result) : null);
}
-public NSBitmapImageRep initWithBitmapDataPlanes(int /*long*/ planes, int /*long*/ width, int /*long*/ height, int /*long*/ bps, int /*long*/ spp, boolean alpha, boolean isPlanar, NSString colorSpaceName, int /*long*/ rBytes, int /*long*/ pBits) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName != null ? colorSpaceName.id : 0, rBytes, pBits);
+public NSBitmapImageRep initWithBitmapDataPlanes(long /*int*/ planes, long /*int*/ width, long /*int*/ height, long /*int*/ bps, long /*int*/ spp, boolean alpha, boolean isPlanar, NSString colorSpaceName, long /*int*/ rBytes, long /*int*/ pBits) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName != null ? colorSpaceName.id : 0, rBytes, pBits);
return result == this.id ? this : (result != 0 ? new NSBitmapImageRep(result) : null);
}
public NSBitmapImageRep initWithData(NSData data) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithData_, data != null ? data.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithData_, data != null ? data.id : 0);
return result == this.id ? this : (result != 0 ? new NSBitmapImageRep(result) : null);
}
public NSBitmapImageRep initWithFocusedViewRect(NSRect rect) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFocusedViewRect_, rect);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFocusedViewRect_, rect);
return result == this.id ? this : (result != 0 ? new NSBitmapImageRep(result) : null);
}
@@ -87,11 +87,11 @@ public boolean isPlanar() {
return OS.objc_msgSend_bool(this.id, OS.sel_isPlanar);
}
-public int /*long*/ numberOfPlanes() {
+public long /*int*/ numberOfPlanes() {
return OS.objc_msgSend(this.id, OS.sel_numberOfPlanes);
}
-public int /*long*/ samplesPerPixel() {
+public long /*int*/ samplesPerPixel() {
return OS.objc_msgSend(this.id, OS.sel_samplesPerPixel);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBox.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBox.java
index 9d64fe3d77..734132f49a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBox.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBox.java
@@ -16,7 +16,7 @@ public NSBox() {
super();
}
-public NSBox(int /*long*/ id) {
+public NSBox(long /*int*/ id) {
super(id);
}
@@ -24,12 +24,12 @@ public NSBox(id id) {
super(id);
}
-public float /*double*/ borderWidth() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_borderWidth);
+public double /*float*/ borderWidth() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_borderWidth);
}
public NSView contentView() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_contentView);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_contentView);
return result != 0 ? new NSView(result) : null;
}
@@ -39,15 +39,15 @@ public NSSize contentViewMargins() {
return result;
}
-public void setBorderType(int /*long*/ aType) {
+public void setBorderType(long /*int*/ aType) {
OS.objc_msgSend(this.id, OS.sel_setBorderType_, aType);
}
-public void setBorderWidth(float /*double*/ borderWidth) {
+public void setBorderWidth(double /*float*/ borderWidth) {
OS.objc_msgSend(this.id, OS.sel_setBorderWidth_, borderWidth);
}
-public void setBoxType(int /*long*/ boxType) {
+public void setBoxType(long /*int*/ boxType) {
OS.objc_msgSend(this.id, OS.sel_setBoxType_, boxType);
}
@@ -75,7 +75,7 @@ public void setTitleFont(NSFont fontObj) {
OS.objc_msgSend(this.id, OS.sel_setTitleFont_, fontObj != null ? fontObj.id : 0);
}
-public void setTitlePosition(int /*long*/ aPosition) {
+public void setTitlePosition(long /*int*/ aPosition) {
OS.objc_msgSend(this.id, OS.sel_setTitlePosition_, aPosition);
}
@@ -84,12 +84,12 @@ public void sizeToFit() {
}
public NSCell titleCell() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_titleCell);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_titleCell);
return result != 0 ? new NSCell(result) : null;
}
public NSFont titleFont() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_titleFont);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_titleFont);
return result != 0 ? new NSFont(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowserCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowserCell.java
index e096e93612..96e1c7cf4c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowserCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowserCell.java
@@ -16,7 +16,7 @@ public NSBrowserCell() {
super();
}
-public NSBrowserCell(int /*long*/ id) {
+public NSBrowserCell(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSBrowserCell(id id) {
}
public NSColor highlightColorInView(NSView controlView) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_highlightColorInView_, controlView != null ? controlView.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_highlightColorInView_, controlView != null ? controlView.id : 0);
return result != 0 ? new NSColor(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBundle.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBundle.java
index ab76f90053..b60b2e44d2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBundle.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBundle.java
@@ -16,7 +16,7 @@ public NSBundle() {
super();
}
-public NSBundle(int /*long*/ id) {
+public NSBundle(long /*int*/ id) {
super(id);
}
@@ -24,57 +24,57 @@ public NSBundle(id id) {
super(id);
}
-public static boolean loadNibFile(NSString fileName, NSDictionary context, int /*long*/ zone) {
+public static boolean loadNibFile(NSString fileName, NSDictionary context, long /*int*/ zone) {
return OS.objc_msgSend_bool(OS.class_NSBundle, OS.sel_loadNibFile_externalNameTable_withZone_, fileName != null ? fileName.id : 0, context != null ? context.id : 0, zone);
}
public NSString bundleIdentifier() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_bundleIdentifier);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_bundleIdentifier);
return result != 0 ? new NSString(result) : null;
}
public NSString bundlePath() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_bundlePath);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_bundlePath);
return result != 0 ? new NSString(result) : null;
}
public static NSBundle bundleWithIdentifier(NSString identifier) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleWithIdentifier_, identifier != null ? identifier.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleWithIdentifier_, identifier != null ? identifier.id : 0);
return result != 0 ? new NSBundle(result) : null;
}
public static NSBundle bundleWithPath(NSString path) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleWithPath_, path != null ? path.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleWithPath_, path != null ? path.id : 0);
return result != 0 ? new NSBundle(result) : null;
}
public NSDictionary infoDictionary() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_infoDictionary);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_infoDictionary);
return result != 0 ? new NSDictionary(result) : null;
}
public static NSBundle mainBundle() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_mainBundle);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_mainBundle);
return result != 0 ? new NSBundle(result) : null;
}
public id objectForInfoDictionaryKey(NSString key) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_objectForInfoDictionaryKey_, key != null ? key.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_objectForInfoDictionaryKey_, key != null ? key.id : 0);
return result != 0 ? new id(result) : null;
}
public NSString pathForResource(NSString name, NSString ext) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_pathForResource_ofType_, name != null ? name.id : 0, ext != null ? ext.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_pathForResource_ofType_, name != null ? name.id : 0, ext != null ? ext.id : 0);
return result != 0 ? new NSString(result) : null;
}
public NSString pathForResource(NSString name, NSString ext, NSString subpath, NSString localizationName) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_pathForResource_ofType_inDirectory_forLocalization_, name != null ? name.id : 0, ext != null ? ext.id : 0, subpath != null ? subpath.id : 0, localizationName != null ? localizationName.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_pathForResource_ofType_inDirectory_forLocalization_, name != null ? name.id : 0, ext != null ? ext.id : 0, subpath != null ? subpath.id : 0, localizationName != null ? localizationName.id : 0);
return result != 0 ? new NSString(result) : null;
}
public NSString resourcePath() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_resourcePath);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_resourcePath);
return result != 0 ? new NSString(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButton.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButton.java
index b26e093a93..5d9e073770 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButton.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButton.java
@@ -16,7 +16,7 @@ public NSButton() {
super();
}
-public NSButton(int /*long*/ id) {
+public NSButton(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSButton(id id) {
}
public NSAttributedString attributedTitle() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_attributedTitle);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_attributedTitle);
return result != 0 ? new NSAttributedString(result) : null;
}
@@ -37,7 +37,7 @@ public void setAttributedTitle(NSAttributedString aString) {
OS.objc_msgSend(this.id, OS.sel_setAttributedTitle_, aString != null ? aString.id : 0);
}
-public void setBezelStyle(int /*long*/ bezelStyle) {
+public void setBezelStyle(long /*int*/ bezelStyle) {
OS.objc_msgSend(this.id, OS.sel_setBezelStyle_, bezelStyle);
}
@@ -45,7 +45,7 @@ public void setBordered(boolean flag) {
OS.objc_msgSend(this.id, OS.sel_setBordered_, flag);
}
-public void setButtonType(int /*long*/ aType) {
+public void setButtonType(long /*int*/ aType) {
OS.objc_msgSend(this.id, OS.sel_setButtonType_, aType);
}
@@ -53,7 +53,7 @@ public void setImage(NSImage image) {
OS.objc_msgSend(this.id, OS.sel_setImage_, image != null ? image.id : 0);
}
-public void setImagePosition(int /*long*/ aPosition) {
+public void setImagePosition(long /*int*/ aPosition) {
OS.objc_msgSend(this.id, OS.sel_setImagePosition_, aPosition);
}
@@ -61,7 +61,7 @@ public void setKeyEquivalent(NSString charCode) {
OS.objc_msgSend(this.id, OS.sel_setKeyEquivalent_, charCode != null ? charCode.id : 0);
}
-public void setState(int /*long*/ value) {
+public void setState(long /*int*/ value) {
OS.objc_msgSend(this.id, OS.sel_setState_, value);
}
@@ -69,15 +69,15 @@ public void setTitle(NSString aString) {
OS.objc_msgSend(this.id, OS.sel_setTitle_, aString != null ? aString.id : 0);
}
-public int /*long*/ state() {
+public long /*int*/ state() {
return OS.objc_msgSend(this.id, OS.sel_state);
}
-public static int /*long*/ cellClass() {
+public static long /*int*/ cellClass() {
return OS.objc_msgSend(OS.class_NSButton, OS.sel_cellClass);
}
-public static void setCellClass(int /*long*/ factoryId) {
+public static void setCellClass(long /*int*/ factoryId) {
OS.objc_msgSend(OS.class_NSButton, OS.sel_setCellClass_, factoryId);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButtonCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButtonCell.java
index bdc70b3e63..946d39f7dc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButtonCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButtonCell.java
@@ -16,7 +16,7 @@ public NSButtonCell() {
super();
}
-public NSButtonCell(int /*long*/ id) {
+public NSButtonCell(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSButtonCell(id id) {
}
public NSColor backgroundColor() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
return result != 0 ? new NSColor(result) : null;
}
@@ -43,20 +43,20 @@ public void setBackgroundColor(NSColor color) {
OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0);
}
-public void setButtonType(int /*long*/ aType) {
+public void setButtonType(long /*int*/ aType) {
OS.objc_msgSend(this.id, OS.sel_setButtonType_, aType);
}
-public void setHighlightsBy(int /*long*/ aType) {
+public void setHighlightsBy(long /*int*/ aType) {
OS.objc_msgSend(this.id, OS.sel_setHighlightsBy_, aType);
}
-public void setImagePosition(int /*long*/ aPosition) {
+public void setImagePosition(long /*int*/ aPosition) {
OS.objc_msgSend(this.id, OS.sel_setImagePosition_, aPosition);
}
public NSString title() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_title);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_title);
return result != 0 ? new NSString(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendarDate.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendarDate.java
index 3705512bcd..422eeebbf1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendarDate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendarDate.java
@@ -16,7 +16,7 @@ public NSCalendarDate() {
super();
}
-public NSCalendarDate(int /*long*/ id) {
+public NSCalendarDate(long /*int*/ id) {
super(id);
}
@@ -25,51 +25,51 @@ public NSCalendarDate(id id) {
}
public static NSCalendarDate calendarDate() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_calendarDate);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_calendarDate);
return result != 0 ? new NSCalendarDate(result) : null;
}
-public static NSCalendarDate dateWithYear(int /*long*/ year, int /*long*/ month, int /*long*/ day, int /*long*/ hour, int /*long*/ minute, int /*long*/ second, NSTimeZone aTimeZone) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithYear_month_day_hour_minute_second_timeZone_, year, month, day, hour, minute, second, aTimeZone != null ? aTimeZone.id : 0);
+public static NSCalendarDate dateWithYear(long /*int*/ year, long /*int*/ month, long /*int*/ day, long /*int*/ hour, long /*int*/ minute, long /*int*/ second, NSTimeZone aTimeZone) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithYear_month_day_hour_minute_second_timeZone_, year, month, day, hour, minute, second, aTimeZone != null ? aTimeZone.id : 0);
return result != 0 ? new NSCalendarDate(result) : null;
}
-public int /*long*/ dayOfMonth() {
+public long /*int*/ dayOfMonth() {
return OS.objc_msgSend(this.id, OS.sel_dayOfMonth);
}
-public int /*long*/ hourOfDay() {
+public long /*int*/ hourOfDay() {
return OS.objc_msgSend(this.id, OS.sel_hourOfDay);
}
-public int /*long*/ minuteOfHour() {
+public long /*int*/ minuteOfHour() {
return OS.objc_msgSend(this.id, OS.sel_minuteOfHour);
}
-public int /*long*/ monthOfYear() {
+public long /*int*/ monthOfYear() {
return OS.objc_msgSend(this.id, OS.sel_monthOfYear);
}
-public int /*long*/ secondOfMinute() {
+public long /*int*/ secondOfMinute() {
return OS.objc_msgSend(this.id, OS.sel_secondOfMinute);
}
public NSTimeZone timeZone() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_timeZone);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_timeZone);
return result != 0 ? new NSTimeZone(result) : null;
}
-public int /*long*/ yearOfCommonEra() {
+public long /*int*/ yearOfCommonEra() {
return OS.objc_msgSend(this.id, OS.sel_yearOfCommonEra);
}
public static NSDate dateWithTimeIntervalSinceNow(double secs) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithTimeIntervalSinceNow_, secs);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithTimeIntervalSinceNow_, secs);
return result != 0 ? new NSCalendarDate(result) : null;
}
public static NSDate distantFuture() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_distantFuture);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_distantFuture);
return result != 0 ? new NSCalendarDate(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCell.java
index d5820a1147..81be8e27ea 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCell.java
@@ -16,7 +16,7 @@ public NSCell() {
super();
}
-public NSCell(int /*long*/ id) {
+public NSCell(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSCell(id id) {
}
public NSAttributedString attributedStringValue() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_attributedStringValue);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_attributedStringValue);
return result != 0 ? new NSAttributedString(result) : null;
}
@@ -41,7 +41,7 @@ public NSSize cellSizeForBounds(NSRect aRect) {
return result;
}
-public int /*long*/ controlSize() {
+public long /*int*/ controlSize() {
return OS.objc_msgSend(this.id, OS.sel_controlSize);
}
@@ -66,21 +66,21 @@ public NSRect expansionFrameWithFrame(NSRect cellFrame, NSView view) {
}
public NSFont font() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_font);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_font);
return result != 0 ? new NSFont(result) : null;
}
public NSColor highlightColorWithFrame(NSRect cellFrame, NSView controlView) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_highlightColorWithFrame_inView_, cellFrame, controlView != null ? controlView.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_highlightColorWithFrame_inView_, cellFrame, controlView != null ? controlView.id : 0);
return result != 0 ? new NSColor(result) : null;
}
-public int /*long*/ hitTestForEvent(NSEvent event, NSRect cellFrame, NSView controlView) {
+public long /*int*/ hitTestForEvent(NSEvent event, NSRect cellFrame, NSView controlView) {
return OS.objc_msgSend(this.id, OS.sel_hitTestForEvent_inRect_ofView_, event != null ? event.id : 0, cellFrame, controlView != null ? controlView.id : 0);
}
public NSImage image() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_image);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_image);
return result != 0 ? new NSImage(result) : null;
}
@@ -98,11 +98,11 @@ public boolean isHighlighted() {
return OS.objc_msgSend_bool(this.id, OS.sel_isHighlighted);
}
-public int /*long*/ nextState() {
+public long /*int*/ nextState() {
return OS.objc_msgSend(this.id, OS.sel_nextState);
}
-public void setAlignment(int /*long*/ mode) {
+public void setAlignment(long /*int*/ mode) {
OS.objc_msgSend(this.id, OS.sel_setAlignment_, mode);
}
@@ -114,15 +114,15 @@ public void setAttributedStringValue(NSAttributedString obj) {
OS.objc_msgSend(this.id, OS.sel_setAttributedStringValue_, obj != null ? obj.id : 0);
}
-public void setBackgroundStyle(int /*long*/ style) {
+public void setBackgroundStyle(long /*int*/ style) {
OS.objc_msgSend(this.id, OS.sel_setBackgroundStyle_, style);
}
-public void setBaseWritingDirection(int /*long*/ writingDirection) {
+public void setBaseWritingDirection(long /*int*/ writingDirection) {
OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_, writingDirection);
}
-public void setControlSize(int /*long*/ size) {
+public void setControlSize(long /*int*/ size) {
OS.objc_msgSend(this.id, OS.sel_setControlSize_, size);
}
@@ -146,7 +146,7 @@ public void setImage(NSImage image) {
OS.objc_msgSend(this.id, OS.sel_setImage_, image != null ? image.id : 0);
}
-public void setLineBreakMode(int /*long*/ mode) {
+public void setLineBreakMode(long /*int*/ mode) {
OS.objc_msgSend(this.id, OS.sel_setLineBreakMode_, mode);
}
@@ -167,7 +167,7 @@ public void setWraps(boolean flag) {
}
public NSString title() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_title);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_title);
return result != 0 ? new NSString(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCharacterSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCharacterSet.java
index 7d30d26535..31749c3900 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCharacterSet.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCharacterSet.java
@@ -16,7 +16,7 @@ public NSCharacterSet() {
super();
}
-public NSCharacterSet(int /*long*/ id) {
+public NSCharacterSet(long /*int*/ id) {
super(id);
}
@@ -29,7 +29,7 @@ public boolean characterIsMember(short aCharacter) {
}
public static id decimalDigitCharacterSet() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_decimalDigitCharacterSet);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_decimalDigitCharacterSet);
return result != 0 ? new id(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClipView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClipView.java
index 25cb35db9b..7697274f6c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClipView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClipView.java
@@ -16,7 +16,7 @@ public NSClipView() {
super();
}
-public NSClipView(int /*long*/ id) {
+public NSClipView(long /*int*/ id) {
super(id);
}
@@ -29,7 +29,7 @@ public boolean copiesOnScroll() {
}
public NSCursor documentCursor() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_documentCursor);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_documentCursor);
return result != 0 ? new NSCursor(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCoder.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCoder.java
index 2ea8804207..ea790d5ee0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCoder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCoder.java
@@ -16,7 +16,7 @@ public NSCoder() {
super();
}
-public NSCoder(int /*long*/ id) {
+public NSCoder(long /*int*/ id) {
super(id);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColor.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColor.java
index a17f0eea62..691f3aec8d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColor.java
@@ -16,7 +16,7 @@ public NSColor() {
super();
}
-public NSColor(int /*long*/ id) {
+public NSColor(long /*int*/ id) {
super(id);
}
@@ -24,132 +24,132 @@ public NSColor(id id) {
super(id);
}
-public float /*double*/ alphaComponent() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_alphaComponent);
+public double /*float*/ alphaComponent() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_alphaComponent);
}
public static NSColor alternateSelectedControlColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_alternateSelectedControlColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_alternateSelectedControlColor);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor alternateSelectedControlTextColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_alternateSelectedControlTextColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_alternateSelectedControlTextColor);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor blackColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_blackColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_blackColor);
return result != 0 ? new NSColor(result) : null;
}
-public float /*double*/ blueComponent() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_blueComponent);
+public double /*float*/ blueComponent() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_blueComponent);
}
public static NSColor clearColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_clearColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_clearColor);
return result != 0 ? new NSColor(result) : null;
}
public NSColorSpace colorSpace() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_colorSpace);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_colorSpace);
return result != 0 ? new NSColorSpace(result) : null;
}
public NSColor colorUsingColorSpaceName(NSString colorSpace) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_colorUsingColorSpaceName_, colorSpace != null ? colorSpace.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_colorUsingColorSpaceName_, colorSpace != null ? colorSpace.id : 0);
return result == this.id ? this : (result != 0 ? new NSColor(result) : null);
}
-public static NSColor colorWithCalibratedRed(float /*double*/ red, float /*double*/ green, float /*double*/ blue, float /*double*/ alpha) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithCalibratedRed_green_blue_alpha_, red, green, blue, alpha);
+public static NSColor colorWithCalibratedRed(double /*float*/ red, double /*float*/ green, double /*float*/ blue, double /*float*/ alpha) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithCalibratedRed_green_blue_alpha_, red, green, blue, alpha);
return result != 0 ? new NSColor(result) : null;
}
-public static NSColor colorWithDeviceRed(float /*double*/ red, float /*double*/ green, float /*double*/ blue, float /*double*/ alpha) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithDeviceRed_green_blue_alpha_, red, green, blue, alpha);
+public static NSColor colorWithDeviceRed(double /*float*/ red, double /*float*/ green, double /*float*/ blue, double /*float*/ alpha) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithDeviceRed_green_blue_alpha_, red, green, blue, alpha);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor colorWithPatternImage(NSImage image) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithPatternImage_, image != null ? image.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithPatternImage_, image != null ? image.id : 0);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor controlBackgroundColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlBackgroundColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlBackgroundColor);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor controlDarkShadowColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlDarkShadowColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlDarkShadowColor);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor controlHighlightColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlHighlightColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlHighlightColor);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor controlLightHighlightColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlLightHighlightColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlLightHighlightColor);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor controlShadowColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlShadowColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlShadowColor);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor controlTextColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlTextColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlTextColor);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor disabledControlTextColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_disabledControlTextColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_disabledControlTextColor);
return result != 0 ? new NSColor(result) : null;
}
-public void getComponents(float[] /*double[]*/ components) {
+public void getComponents(double[] /*float[]*/ components) {
OS.objc_msgSend(this.id, OS.sel_getComponents_, components);
}
-public float /*double*/ greenComponent() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_greenComponent);
+public double /*float*/ greenComponent() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_greenComponent);
}
-public int /*long*/ numberOfComponents() {
+public long /*int*/ numberOfComponents() {
return OS.objc_msgSend(this.id, OS.sel_numberOfComponents);
}
-public float /*double*/ redComponent() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_redComponent);
+public double /*float*/ redComponent() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_redComponent);
}
public static NSColor secondarySelectedControlColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_secondarySelectedControlColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_secondarySelectedControlColor);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor selectedControlColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedControlColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedControlColor);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor selectedControlTextColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedControlTextColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedControlTextColor);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor selectedTextBackgroundColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedTextBackgroundColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedTextBackgroundColor);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor selectedTextColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedTextColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedTextColor);
return result != 0 ? new NSColor(result) : null;
}
@@ -166,27 +166,27 @@ public void setStroke() {
}
public static NSColor textBackgroundColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_textBackgroundColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_textBackgroundColor);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor textColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_textColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_textColor);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor windowBackgroundColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowBackgroundColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowBackgroundColor);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor windowFrameColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowFrameColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowFrameColor);
return result != 0 ? new NSColor(result) : null;
}
public static NSColor windowFrameTextColor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowFrameTextColor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowFrameTextColor);
return result != 0 ? new NSColor(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorList.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorList.java
index 0e209f5081..9d9f39c76d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorList.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorList.java
@@ -16,7 +16,7 @@ public NSColorList() {
super();
}
-public NSColorList(int /*long*/ id) {
+public NSColorList(long /*int*/ id) {
super(id);
}
@@ -25,26 +25,26 @@ public NSColorList(id id) {
}
public NSArray allKeys() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_allKeys);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_allKeys);
return result != 0 ? new NSArray(result) : null;
}
public static NSColorList colorListNamed(NSString name) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColorList, OS.sel_colorListNamed_, name != null ? name.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColorList, OS.sel_colorListNamed_, name != null ? name.id : 0);
return result != 0 ? new NSColorList(result) : null;
}
public NSColor colorWithKey(NSString key) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_colorWithKey_, key != null ? key.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_colorWithKey_, key != null ? key.id : 0);
return result != 0 ? new NSColor(result) : null;
}
public id initWithName(NSString name) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithName_, name != null ? name.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithName_, name != null ? name.id : 0);
return result != 0 ? new id(result) : null;
}
-public void insertColor(NSColor color, NSString key, int /*long*/ loc) {
+public void insertColor(NSColor color, NSString key, long /*int*/ loc) {
OS.objc_msgSend(this.id, OS.sel_insertColor_key_atIndex_, color != null ? color.id : 0, key != null ? key.id : 0, loc);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorPanel.java
index 2cb3edb7ef..d0caec592c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorPanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorPanel.java
@@ -16,7 +16,7 @@ public NSColorPanel() {
super();
}
-public NSColorPanel(int /*long*/ id) {
+public NSColorPanel(long /*int*/ id) {
super(id);
}
@@ -29,7 +29,7 @@ public void attachColorList(NSColorList colorList) {
}
public NSColor color() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_color);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_color);
return result != 0 ? new NSColor(result) : null;
}
@@ -38,15 +38,15 @@ public void setColor(NSColor color) {
}
public static NSColorPanel sharedColorPanel() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColorPanel, OS.sel_sharedColorPanel);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColorPanel, OS.sel_sharedColorPanel);
return result != 0 ? new NSColorPanel(result) : null;
}
-public static float /*double*/ minFrameWidthWithTitle(NSString aTitle, int /*long*/ aStyle) {
- return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSColorPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+public static double /*float*/ minFrameWidthWithTitle(NSString aTitle, long /*int*/ aStyle) {
+ return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSColorPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
}
-public static int /*long*/ windowNumberAtPoint(NSPoint point, int /*long*/ windowNumber) {
+public static long /*int*/ windowNumberAtPoint(NSPoint point, long /*int*/ windowNumber) {
return OS.objc_msgSend(OS.class_NSColorPanel, OS.sel_windowNumberAtPoint_belowWindowWithWindowNumber_, point, windowNumber);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorSpace.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorSpace.java
index 71c2f2c44d..12451c4942 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorSpace.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorSpace.java
@@ -16,7 +16,7 @@ public NSColorSpace() {
super();
}
-public NSColorSpace(int /*long*/ id) {
+public NSColorSpace(long /*int*/ id) {
super(id);
}
@@ -24,12 +24,12 @@ public NSColorSpace(id id) {
super(id);
}
-public int /*long*/ colorSpaceModel() {
+public long /*int*/ colorSpaceModel() {
return OS.objc_msgSend(this.id, OS.sel_colorSpaceModel);
}
public static NSColorSpace genericRGBColorSpace() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_genericRGBColorSpace);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_genericRGBColorSpace);
return result != 0 ? new NSColorSpace(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBox.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBox.java
index 4b8b1e9f98..f29d0202ca 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBox.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBox.java
@@ -16,7 +16,7 @@ public NSComboBox() {
super();
}
-public NSComboBox(int /*long*/ id) {
+public NSComboBox(long /*int*/ id) {
super(id);
}
@@ -28,32 +28,32 @@ public void addItemWithObjectValue(id object) {
OS.objc_msgSend(this.id, OS.sel_addItemWithObjectValue_, object != null ? object.id : 0);
}
-public void deselectItemAtIndex(int /*long*/ index) {
+public void deselectItemAtIndex(long /*int*/ index) {
OS.objc_msgSend(this.id, OS.sel_deselectItemAtIndex_, index);
}
-public int /*long*/ indexOfSelectedItem() {
+public long /*int*/ indexOfSelectedItem() {
return OS.objc_msgSend(this.id, OS.sel_indexOfSelectedItem);
}
-public void insertItemWithObjectValue(id object, int /*long*/ index) {
+public void insertItemWithObjectValue(id object, long /*int*/ index) {
OS.objc_msgSend(this.id, OS.sel_insertItemWithObjectValue_atIndex_, object != null ? object.id : 0, index);
}
-public float /*double*/ itemHeight() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_itemHeight);
+public double /*float*/ itemHeight() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_itemHeight);
}
-public id itemObjectValueAtIndex(int /*long*/ index) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_itemObjectValueAtIndex_, index);
+public id itemObjectValueAtIndex(long /*int*/ index) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_itemObjectValueAtIndex_, index);
return result != 0 ? new id(result) : null;
}
-public int /*long*/ numberOfItems() {
+public long /*int*/ numberOfItems() {
return OS.objc_msgSend(this.id, OS.sel_numberOfItems);
}
-public int /*long*/ numberOfVisibleItems() {
+public long /*int*/ numberOfVisibleItems() {
return OS.objc_msgSend(this.id, OS.sel_numberOfVisibleItems);
}
@@ -61,23 +61,23 @@ public void removeAllItems() {
OS.objc_msgSend(this.id, OS.sel_removeAllItems);
}
-public void removeItemAtIndex(int /*long*/ index) {
+public void removeItemAtIndex(long /*int*/ index) {
OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_, index);
}
-public void selectItemAtIndex(int /*long*/ index) {
+public void selectItemAtIndex(long /*int*/ index) {
OS.objc_msgSend(this.id, OS.sel_selectItemAtIndex_, index);
}
-public void setNumberOfVisibleItems(int /*long*/ visibleItems) {
+public void setNumberOfVisibleItems(long /*int*/ visibleItems) {
OS.objc_msgSend(this.id, OS.sel_setNumberOfVisibleItems_, visibleItems);
}
-public static int /*long*/ cellClass() {
+public static long /*int*/ cellClass() {
return OS.objc_msgSend(OS.class_NSComboBox, OS.sel_cellClass);
}
-public static void setCellClass(int /*long*/ factoryId) {
+public static void setCellClass(long /*int*/ factoryId) {
OS.objc_msgSend(OS.class_NSComboBox, OS.sel_setCellClass_, factoryId);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBoxCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBoxCell.java
index cb8b2ea8d1..8782e80e8e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBoxCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBoxCell.java
@@ -16,7 +16,7 @@ public NSComboBoxCell() {
super();
}
-public NSComboBoxCell(int /*long*/ id) {
+public NSComboBoxCell(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSComboBoxCell(id id) {
}
public NSArray objectValues() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_objectValues);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_objectValues);
return result != 0 ? new NSArray(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSControl.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSControl.java
index 50bf2f05cb..3873821d5b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSControl.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSControl.java
@@ -16,7 +16,7 @@ public NSControl() {
super();
}
-public NSControl(int /*long*/ id) {
+public NSControl(long /*int*/ id) {
super(id);
}
@@ -28,21 +28,21 @@ public boolean abortEditing() {
return OS.objc_msgSend_bool(this.id, OS.sel_abortEditing);
}
-public int /*long*/ action() {
+public long /*int*/ action() {
return OS.objc_msgSend(this.id, OS.sel_action);
}
public NSCell cell() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_cell);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_cell);
return result != 0 ? new NSCell(result) : null;
}
-public static int /*long*/ cellClass() {
+public static long /*int*/ cellClass() {
return OS.objc_msgSend(OS.class_NSControl, OS.sel_cellClass);
}
public NSText currentEditor() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_currentEditor);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_currentEditor);
return result != 0 ? new NSText(result) : null;
}
@@ -51,7 +51,7 @@ public double doubleValue() {
}
public NSFont font() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_font);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_font);
return result != 0 ? new NSFont(result) : null;
}
@@ -59,19 +59,19 @@ public boolean isEnabled() {
return OS.objc_msgSend_bool(this.id, OS.sel_isEnabled);
}
-public boolean sendAction(int /*long*/ theAction, id theTarget) {
+public boolean sendAction(long /*int*/ theAction, id theTarget) {
return OS.objc_msgSend_bool(this.id, OS.sel_sendAction_to_, theAction, theTarget != null ? theTarget.id : 0);
}
-public void setAction(int /*long*/ aSelector) {
+public void setAction(long /*int*/ aSelector) {
OS.objc_msgSend(this.id, OS.sel_setAction_, aSelector);
}
-public void setAlignment(int /*long*/ mode) {
+public void setAlignment(long /*int*/ mode) {
OS.objc_msgSend(this.id, OS.sel_setAlignment_, mode);
}
-public void setBaseWritingDirection(int /*long*/ writingDirection) {
+public void setBaseWritingDirection(long /*int*/ writingDirection) {
OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_, writingDirection);
}
@@ -79,7 +79,7 @@ public void setCell(NSCell aCell) {
OS.objc_msgSend(this.id, OS.sel_setCell_, aCell != null ? aCell.id : 0);
}
-public static void setCellClass(int /*long*/ factoryId) {
+public static void setCellClass(long /*int*/ factoryId) {
OS.objc_msgSend(OS.class_NSControl, OS.sel_setCellClass_, factoryId);
}
@@ -112,12 +112,12 @@ public void sizeToFit() {
}
public NSString stringValue() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_stringValue);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringValue);
return result != 0 ? new NSString(result) : null;
}
public id target() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_target);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_target);
return result != 0 ? new id(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCursor.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCursor.java
index c6a2587b27..453c58f3e0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCursor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCursor.java
@@ -16,7 +16,7 @@ public NSCursor() {
super();
}
-public NSCursor(int /*long*/ id) {
+public NSCursor(long /*int*/ id) {
super(id);
}
@@ -25,22 +25,22 @@ public NSCursor(id id) {
}
public static NSCursor IBeamCursor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_IBeamCursor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_IBeamCursor);
return result != 0 ? new NSCursor(result) : null;
}
public static NSCursor arrowCursor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_arrowCursor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_arrowCursor);
return result != 0 ? new NSCursor(result) : null;
}
public static NSCursor crosshairCursor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_crosshairCursor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_crosshairCursor);
return result != 0 ? new NSCursor(result) : null;
}
public static NSCursor currentCursor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_currentCursor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_currentCursor);
return result != 0 ? new NSCursor(result) : null;
}
@@ -51,12 +51,12 @@ public NSPoint hotSpot() {
}
public NSCursor initWithImage(NSImage newImage, NSPoint aPoint) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithImage_hotSpot_, newImage != null ? newImage.id : 0, aPoint);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithImage_hotSpot_, newImage != null ? newImage.id : 0, aPoint);
return result == this.id ? this : (result != 0 ? new NSCursor(result) : null);
}
public static NSCursor pointingHandCursor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_pointingHandCursor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_pointingHandCursor);
return result != 0 ? new NSCursor(result) : null;
}
@@ -69,32 +69,32 @@ public void push() {
}
public static NSCursor resizeDownCursor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeDownCursor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeDownCursor);
return result != 0 ? new NSCursor(result) : null;
}
public static NSCursor resizeLeftCursor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeLeftCursor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeLeftCursor);
return result != 0 ? new NSCursor(result) : null;
}
public static NSCursor resizeLeftRightCursor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeLeftRightCursor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeLeftRightCursor);
return result != 0 ? new NSCursor(result) : null;
}
public static NSCursor resizeRightCursor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeRightCursor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeRightCursor);
return result != 0 ? new NSCursor(result) : null;
}
public static NSCursor resizeUpCursor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeUpCursor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeUpCursor);
return result != 0 ? new NSCursor(result) : null;
}
public static NSCursor resizeUpDownCursor() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeUpDownCursor);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeUpDownCursor);
return result != 0 ? new NSCursor(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSData.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSData.java
index 70d62a8bc4..8216276fa2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSData.java
@@ -16,7 +16,7 @@ public NSData() {
super();
}
-public NSData(int /*long*/ id) {
+public NSData(long /*int*/ id) {
super(id);
}
@@ -24,12 +24,12 @@ public NSData(id id) {
super(id);
}
-public int /*long*/ bytes() {
+public long /*int*/ bytes() {
return OS.objc_msgSend(this.id, OS.sel_bytes);
}
-public static NSData dataWithBytes(byte[] bytes, int /*long*/ length) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSData, OS.sel_dataWithBytes_length_, bytes, length);
+public static NSData dataWithBytes(byte[] bytes, long /*int*/ length) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSData, OS.sel_dataWithBytes_length_, bytes, length);
return result != 0 ? new NSData(result) : null;
}
@@ -37,11 +37,11 @@ public void getBytes(byte[] buffer) {
OS.objc_msgSend(this.id, OS.sel_getBytes_, buffer);
}
-public void getBytes(int /*long*/ buffer, int /*long*/ length) {
+public void getBytes(long /*int*/ buffer, long /*int*/ length) {
OS.objc_msgSend(this.id, OS.sel_getBytes_length_, buffer, length);
}
-public int /*long*/ length() {
+public long /*int*/ length() {
return OS.objc_msgSend(this.id, OS.sel_length);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDate.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDate.java
index f864e5c8e9..34903e1f70 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDate.java
@@ -16,7 +16,7 @@ public NSDate() {
super();
}
-public NSDate(int /*long*/ id) {
+public NSDate(long /*int*/ id) {
super(id);
}
@@ -25,17 +25,17 @@ public NSDate(id id) {
}
public NSCalendarDate dateWithCalendarFormat(NSString format, NSTimeZone aTimeZone) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_dateWithCalendarFormat_timeZone_, format != null ? format.id : 0, aTimeZone != null ? aTimeZone.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_dateWithCalendarFormat_timeZone_, format != null ? format.id : 0, aTimeZone != null ? aTimeZone.id : 0);
return result != 0 ? new NSCalendarDate(result) : null;
}
public static NSDate dateWithTimeIntervalSinceNow(double secs) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithTimeIntervalSinceNow_, secs);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithTimeIntervalSinceNow_, secs);
return result != 0 ? new NSDate(result) : null;
}
public static NSDate distantFuture() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSDate, OS.sel_distantFuture);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSDate, OS.sel_distantFuture);
return result != 0 ? new NSDate(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePicker.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePicker.java
index 68a46dcc7f..587fce1357 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePicker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePicker.java
@@ -16,7 +16,7 @@ public NSDatePicker() {
super();
}
-public NSDatePicker(int /*long*/ id) {
+public NSDatePicker(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSDatePicker(id id) {
}
public NSDate dateValue() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_dateValue);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_dateValue);
return result != 0 ? new NSDate(result) : null;
}
@@ -41,11 +41,11 @@ public void setBordered(boolean flag) {
OS.objc_msgSend(this.id, OS.sel_setBordered_, flag);
}
-public void setDatePickerElements(int /*long*/ elementFlags) {
+public void setDatePickerElements(long /*int*/ elementFlags) {
OS.objc_msgSend(this.id, OS.sel_setDatePickerElements_, elementFlags);
}
-public void setDatePickerStyle(int /*long*/ newStyle) {
+public void setDatePickerStyle(long /*int*/ newStyle) {
OS.objc_msgSend(this.id, OS.sel_setDatePickerStyle_, newStyle);
}
@@ -61,11 +61,11 @@ public void setTextColor(NSColor color) {
OS.objc_msgSend(this.id, OS.sel_setTextColor_, color != null ? color.id : 0);
}
-public static int /*long*/ cellClass() {
+public static long /*int*/ cellClass() {
return OS.objc_msgSend(OS.class_NSDatePicker, OS.sel_cellClass);
}
-public static void setCellClass(int /*long*/ factoryId) {
+public static void setCellClass(long /*int*/ factoryId) {
OS.objc_msgSend(OS.class_NSDatePicker, OS.sel_setCellClass_, factoryId);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionary.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionary.java
index 472e7a425d..3ceb972407 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionary.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionary.java
@@ -16,7 +16,7 @@ public NSDictionary() {
super();
}
-public NSDictionary(int /*long*/ id) {
+public NSDictionary(long /*int*/ id) {
super(id);
}
@@ -25,31 +25,31 @@ public NSDictionary(id id) {
}
public NSArray allKeys() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_allKeys);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_allKeys);
return result != 0 ? new NSArray(result) : null;
}
-public int /*long*/ count() {
+public long /*int*/ count() {
return OS.objc_msgSend(this.id, OS.sel_count);
}
public static NSDictionary dictionaryWithObject(id object, id key) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSDictionary, OS.sel_dictionaryWithObject_forKey_, object != null ? object.id : 0, key != null ? key.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSDictionary, OS.sel_dictionaryWithObject_forKey_, object != null ? object.id : 0, key != null ? key.id : 0);
return result != 0 ? new NSDictionary(result) : null;
}
public NSEnumerator objectEnumerator() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator);
return result != 0 ? new NSEnumerator(result) : null;
}
public id objectForKey(id aKey) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_objectForKey_, aKey != null ? aKey.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_objectForKey_, aKey != null ? aKey.id : 0);
return result != 0 ? new id(result) : null;
}
public id valueForKey(NSString key) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_valueForKey_, key != null ? key.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_valueForKey_, key != null ? key.id : 0);
return result != 0 ? new id(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDirectoryEnumerator.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDirectoryEnumerator.java
index 29605cca2f..9b1c48cea6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDirectoryEnumerator.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDirectoryEnumerator.java
@@ -16,7 +16,7 @@ public NSDirectoryEnumerator() {
super();
}
-public NSDirectoryEnumerator(int /*long*/ id) {
+public NSDirectoryEnumerator(long /*int*/ id) {
super(id);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDockTile.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDockTile.java
index 074d56bc6b..40ce42aa12 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDockTile.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDockTile.java
@@ -16,7 +16,7 @@ public NSDockTile() {
super();
}
-public NSDockTile(int /*long*/ id) {
+public NSDockTile(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSDockTile(id id) {
}
public NSString badgeLabel() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_badgeLabel);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_badgeLabel);
return result != 0 ? new NSString(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEnumerator.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEnumerator.java
index 518631b5d2..83059fcf26 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEnumerator.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEnumerator.java
@@ -16,7 +16,7 @@ public NSEnumerator() {
super();
}
-public NSEnumerator(int /*long*/ id) {
+public NSEnumerator(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSEnumerator(id id) {
}
public id nextObject() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_nextObject);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_nextObject);
return result != 0 ? new id(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSError.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSError.java
index 5799811802..c7d88d329c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSError.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSError.java
@@ -16,7 +16,7 @@ public NSError() {
super();
}
-public NSError(int /*long*/ id) {
+public NSError(long /*int*/ id) {
super(id);
}
@@ -24,17 +24,17 @@ public NSError(id id) {
super(id);
}
-public int /*long*/ code() {
+public long /*int*/ code() {
return OS.objc_msgSend(this.id, OS.sel_code);
}
public NSString localizedDescription() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_localizedDescription);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_localizedDescription);
return result != 0 ? new NSString(result) : null;
}
public NSDictionary userInfo() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_userInfo);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_userInfo);
return result != 0 ? new NSDictionary(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEvent.java
index 2ea5f36330..699e71c6b8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEvent.java
@@ -16,7 +16,7 @@ public NSEvent() {
super();
}
-public NSEvent(int /*long*/ id) {
+public NSEvent(long /*int*/ id) {
super(id);
}
@@ -24,38 +24,38 @@ public NSEvent(id id) {
super(id);
}
-public int /*long*/ CGEvent() {
+public long /*int*/ CGEvent() {
return OS.objc_msgSend(this.id, OS.sel_CGEvent);
}
-public int /*long*/ buttonNumber() {
+public long /*int*/ buttonNumber() {
return OS.objc_msgSend(this.id, OS.sel_buttonNumber);
}
public NSString characters() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_characters);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_characters);
return result != 0 ? new NSString(result) : null;
}
public NSString charactersIgnoringModifiers() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_charactersIgnoringModifiers);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_charactersIgnoringModifiers);
return result != 0 ? new NSString(result) : null;
}
-public int /*long*/ clickCount() {
+public long /*int*/ clickCount() {
return OS.objc_msgSend(this.id, OS.sel_clickCount);
}
-public float /*double*/ deltaX() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_deltaX);
+public double /*float*/ deltaX() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_deltaX);
}
-public float /*double*/ deltaY() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_deltaY);
+public double /*float*/ deltaY() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_deltaY);
}
-public static NSEvent enterExitEventWithType(int /*long*/ type, NSPoint location, int /*long*/ flags, double time, int /*long*/ wNum, NSGraphicsContext context, int /*long*/ eNum, int /*long*/ tNum, int /*long*/ data) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSEvent, OS.sel_enterExitEventWithType_location_modifierFlags_timestamp_windowNumber_context_eventNumber_trackingNumber_userData_, type, location, flags, time, wNum, context != null ? context.id : 0, eNum, tNum, data);
+public static NSEvent enterExitEventWithType(long /*int*/ type, NSPoint location, long /*int*/ flags, double time, long /*int*/ wNum, NSGraphicsContext context, long /*int*/ eNum, long /*int*/ tNum, long /*int*/ data) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSEvent, OS.sel_enterExitEventWithType_location_modifierFlags_timestamp_windowNumber_context_eventNumber_trackingNumber_userData_, type, location, flags, time, wNum, context != null ? context.id : 0, eNum, tNum, data);
return result != 0 ? new NSEvent(result) : null;
}
@@ -69,11 +69,11 @@ public NSPoint locationInWindow() {
return result;
}
-public float /*double*/ magnification() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_magnification);
+public double /*float*/ magnification() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_magnification);
}
-public int /*long*/ modifierFlags() {
+public long /*int*/ modifierFlags() {
return OS.objc_msgSend(this.id, OS.sel_modifierFlags);
}
@@ -83,8 +83,8 @@ public static NSPoint mouseLocation() {
return result;
}
-public static NSEvent otherEventWithType(int /*long*/ type, NSPoint location, int /*long*/ flags, double time, int /*long*/ wNum, NSGraphicsContext context, short subtype, int /*long*/ d1, int /*long*/ d2) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSEvent, OS.sel_otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2_, type, location, flags, time, wNum, context != null ? context.id : 0, subtype, d1, d2);
+public static NSEvent otherEventWithType(long /*int*/ type, NSPoint location, long /*int*/ flags, double time, long /*int*/ wNum, NSGraphicsContext context, short subtype, long /*int*/ d1, long /*int*/ d2) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSEvent, OS.sel_otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2_, type, location, flags, time, wNum, context != null ? context.id : 0, subtype, d1, d2);
return result != 0 ? new NSEvent(result) : null;
}
@@ -96,17 +96,17 @@ public double timestamp() {
return OS.objc_msgSend_fpret(this.id, OS.sel_timestamp);
}
-public NSSet touchesMatchingPhase(int /*long*/ phase, NSView view) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_touchesMatchingPhase_inView_, phase, view != null ? view.id : 0);
+public NSSet touchesMatchingPhase(long /*int*/ phase, NSView view) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_touchesMatchingPhase_inView_, phase, view != null ? view.id : 0);
return result != 0 ? new NSSet(result) : null;
}
-public int /*long*/ type() {
+public long /*int*/ type() {
return OS.objc_msgSend(this.id, OS.sel_type);
}
public NSWindow window() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_window);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_window);
return result != 0 ? new NSWindow(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileManager.java
index 01b6230cc2..ee57669a92 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileManager.java
@@ -16,7 +16,7 @@ public NSFileManager() {
super();
}
-public NSFileManager(int /*long*/ id) {
+public NSFileManager(long /*int*/ id) {
super(id);
}
@@ -24,8 +24,8 @@ public NSFileManager(id id) {
super(id);
}
-public NSArray URLsForDirectory(int /*long*/ directory, int /*long*/ domainMask) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_URLsForDirectory_inDomains_, directory, domainMask);
+public NSArray URLsForDirectory(long /*int*/ directory, long /*int*/ domainMask) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_URLsForDirectory_inDomains_, directory, domainMask);
return result != 0 ? new NSArray(result) : null;
}
@@ -34,12 +34,12 @@ public boolean createFileAtPath(NSString path, NSData data, NSDictionary attr) {
}
public static NSFileManager defaultManager() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSFileManager, OS.sel_defaultManager);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSFileManager, OS.sel_defaultManager);
return result != 0 ? new NSFileManager(result) : null;
}
public NSDirectoryEnumerator enumeratorAtPath(NSString path) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_enumeratorAtPath_, path != null ? path.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_enumeratorAtPath_, path != null ? path.id : 0);
return result != 0 ? new NSDirectoryEnumerator(result) : null;
}
@@ -47,7 +47,7 @@ public boolean fileExistsAtPath(NSString path) {
return OS.objc_msgSend_bool(this.id, OS.sel_fileExistsAtPath_, path != null ? path.id : 0);
}
-public boolean fileExistsAtPath(NSString path, int /*long*/ isDirectory) {
+public boolean fileExistsAtPath(NSString path, long /*int*/ isDirectory) {
return OS.objc_msgSend_bool(this.id, OS.sel_fileExistsAtPath_isDirectory_, path != null ? path.id : 0, isDirectory);
}
@@ -55,7 +55,7 @@ public boolean isExecutableFileAtPath(NSString path) {
return OS.objc_msgSend_bool(this.id, OS.sel_isExecutableFileAtPath_, path != null ? path.id : 0);
}
-public boolean removeItemAtPath(NSString path, int /*long*/ error) {
+public boolean removeItemAtPath(NSString path, long /*int*/ error) {
return OS.objc_msgSend_bool(this.id, OS.sel_removeItemAtPath_error_, path != null ? path.id : 0, error);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileWrapper.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileWrapper.java
index c5971cb3ff..e8e40b1960 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileWrapper.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileWrapper.java
@@ -16,7 +16,7 @@ public NSFileWrapper() {
super();
}
-public NSFileWrapper(int /*long*/ id) {
+public NSFileWrapper(long /*int*/ id) {
super(id);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFont.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFont.java
index 7cc9c9a87d..47a06c042d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFont.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFont.java
@@ -16,7 +16,7 @@ public NSFont() {
super();
}
-public NSFont(int /*long*/ id) {
+public NSFont(long /*int*/ id) {
super(id);
}
@@ -24,72 +24,72 @@ public NSFont(id id) {
super(id);
}
-public float /*double*/ ascender() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_ascender);
+public double /*float*/ ascender() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_ascender);
}
-public static NSFont controlContentFontOfSize(float /*double*/ fontSize) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_controlContentFontOfSize_, fontSize);
+public static NSFont controlContentFontOfSize(double /*float*/ fontSize) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_controlContentFontOfSize_, fontSize);
return result != 0 ? new NSFont(result) : null;
}
-public float /*double*/ descender() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_descender);
+public double /*float*/ descender() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_descender);
}
public NSString displayName() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_displayName);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_displayName);
return result != 0 ? new NSString(result) : null;
}
public NSString familyName() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_familyName);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_familyName);
return result != 0 ? new NSString(result) : null;
}
public NSString fontName() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_fontName);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_fontName);
return result != 0 ? new NSString(result) : null;
}
-public static NSFont fontWithName(NSString fontName, float /*double*/ fontSize) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_fontWithName_size_, fontName != null ? fontName.id : 0, fontSize);
+public static NSFont fontWithName(NSString fontName, double /*float*/ fontSize) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_fontWithName_size_, fontName != null ? fontName.id : 0, fontSize);
return result != 0 ? new NSFont(result) : null;
}
-public float /*double*/ leading() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_leading);
+public double /*float*/ leading() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_leading);
}
-public static NSFont menuBarFontOfSize(float /*double*/ fontSize) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_menuBarFontOfSize_, fontSize);
+public static NSFont menuBarFontOfSize(double /*float*/ fontSize) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_menuBarFontOfSize_, fontSize);
return result != 0 ? new NSFont(result) : null;
}
-public static NSFont menuFontOfSize(float /*double*/ fontSize) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_menuFontOfSize_, fontSize);
+public static NSFont menuFontOfSize(double /*float*/ fontSize) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_menuFontOfSize_, fontSize);
return result != 0 ? new NSFont(result) : null;
}
-public float /*double*/ pointSize() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_pointSize);
+public double /*float*/ pointSize() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_pointSize);
}
-public static float /*double*/ smallSystemFontSize() {
- return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_smallSystemFontSize);
+public static double /*float*/ smallSystemFontSize() {
+ return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_smallSystemFontSize);
}
-public static NSFont systemFontOfSize(float /*double*/ fontSize) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_systemFontOfSize_, fontSize);
+public static NSFont systemFontOfSize(double /*float*/ fontSize) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_systemFontOfSize_, fontSize);
return result != 0 ? new NSFont(result) : null;
}
-public static float /*double*/ systemFontSize() {
- return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_systemFontSize);
+public static double /*float*/ systemFontSize() {
+ return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_systemFontSize);
}
-public static float /*double*/ systemFontSizeForControlSize(int /*long*/ controlSize) {
- return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_systemFontSizeForControlSize_, controlSize);
+public static double /*float*/ systemFontSizeForControlSize(long /*int*/ controlSize) {
+ return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_systemFontSizeForControlSize_, controlSize);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontManager.java
index 0051f13796..4cfc68fc1b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontManager.java
@@ -16,7 +16,7 @@ public NSFontManager() {
super();
}
-public NSFontManager(int /*long*/ id) {
+public NSFontManager(long /*int*/ id) {
super(id);
}
@@ -25,40 +25,40 @@ public NSFontManager(id id) {
}
public NSArray availableFontFamilies() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_availableFontFamilies);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_availableFontFamilies);
return result != 0 ? new NSArray(result) : null;
}
public NSArray availableFonts() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_availableFonts);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_availableFonts);
return result != 0 ? new NSArray(result) : null;
}
public NSArray availableMembersOfFontFamily(NSString fam) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_availableMembersOfFontFamily_, fam != null ? fam.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_availableMembersOfFontFamily_, fam != null ? fam.id : 0);
return result != 0 ? new NSArray(result) : null;
}
-public NSFont convertFont(NSFont fontObj, int /*long*/ trait) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_convertFont_toHaveTrait_, fontObj != null ? fontObj.id : 0, trait);
+public NSFont convertFont(NSFont fontObj, long /*int*/ trait) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_convertFont_toHaveTrait_, fontObj != null ? fontObj.id : 0, trait);
return result != 0 ? new NSFont(result) : null;
}
-public NSFont fontWithFamily(NSString family, int /*long*/ traits, int /*long*/ weight, float /*double*/ size) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_fontWithFamily_traits_weight_size_, family != null ? family.id : 0, traits, weight, size);
+public NSFont fontWithFamily(NSString family, long /*int*/ traits, long /*int*/ weight, double /*float*/ size) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_fontWithFamily_traits_weight_size_, family != null ? family.id : 0, traits, weight, size);
return result != 0 ? new NSFont(result) : null;
}
public static NSFontManager sharedFontManager() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSFontManager, OS.sel_sharedFontManager);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSFontManager, OS.sel_sharedFontManager);
return result != 0 ? new NSFontManager(result) : null;
}
-public int /*long*/ traitsOfFont(NSFont fontObj) {
+public long /*int*/ traitsOfFont(NSFont fontObj) {
return OS.objc_msgSend(this.id, OS.sel_traitsOfFont_, fontObj != null ? fontObj.id : 0);
}
-public int /*long*/ weightOfFont(NSFont fontObj) {
+public long /*int*/ weightOfFont(NSFont fontObj) {
return OS.objc_msgSend(this.id, OS.sel_weightOfFont_, fontObj != null ? fontObj.id : 0);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontPanel.java
index c598113bfb..dc20e389bc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontPanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontPanel.java
@@ -16,7 +16,7 @@ public NSFontPanel() {
super();
}
-public NSFontPanel(int /*long*/ id) {
+public NSFontPanel(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSFontPanel(id id) {
}
public NSFont panelConvertFont(NSFont fontObj) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_panelConvertFont_, fontObj != null ? fontObj.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_panelConvertFont_, fontObj != null ? fontObj.id : 0);
return result != 0 ? new NSFont(result) : null;
}
@@ -34,15 +34,15 @@ public void setPanelFont(NSFont fontObj, boolean flag) {
}
public static NSFontPanel sharedFontPanel() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSFontPanel, OS.sel_sharedFontPanel);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSFontPanel, OS.sel_sharedFontPanel);
return result != 0 ? new NSFontPanel(result) : null;
}
-public static float /*double*/ minFrameWidthWithTitle(NSString aTitle, int /*long*/ aStyle) {
- return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSFontPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+public static double /*float*/ minFrameWidthWithTitle(NSString aTitle, long /*int*/ aStyle) {
+ return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSFontPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
}
-public static int /*long*/ windowNumberAtPoint(NSPoint point, int /*long*/ windowNumber) {
+public static long /*int*/ windowNumberAtPoint(NSPoint point, long /*int*/ windowNumber) {
return OS.objc_msgSend(OS.class_NSFontPanel, OS.sel_windowNumberAtPoint_belowWindowWithWindowNumber_, point, windowNumber);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFormatter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFormatter.java
index 92ee13e50a..25a89f3708 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFormatter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFormatter.java
@@ -16,7 +16,7 @@ public NSFormatter() {
super();
}
-public NSFormatter(int /*long*/ id) {
+public NSFormatter(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSFormatter(id id) {
}
public NSString stringForObjectValue(id obj) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_stringForObjectValue_, obj != null ? obj.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringForObjectValue_, obj != null ? obj.id : 0);
return result != 0 ? new NSString(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGradient.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGradient.java
index f489131a52..077fd165d7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGradient.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGradient.java
@@ -16,7 +16,7 @@ public NSGradient() {
super();
}
-public NSGradient(int /*long*/ id) {
+public NSGradient(long /*int*/ id) {
super(id);
}
@@ -24,16 +24,16 @@ public NSGradient(id id) {
super(id);
}
-public void drawFromPoint(NSPoint startingPoint, NSPoint endingPoint, int /*long*/ options) {
+public void drawFromPoint(NSPoint startingPoint, NSPoint endingPoint, long /*int*/ options) {
OS.objc_msgSend(this.id, OS.sel_drawFromPoint_toPoint_options_, startingPoint, endingPoint, options);
}
-public void drawInRect(NSRect rect, float /*double*/ angle) {
+public void drawInRect(NSRect rect, double /*float*/ angle) {
OS.objc_msgSend(this.id, OS.sel_drawInRect_angle_, rect, angle);
}
public NSGradient initWithStartingColor(NSColor startingColor, NSColor endingColor) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithStartingColor_endingColor_, startingColor != null ? startingColor.id : 0, endingColor != null ? endingColor.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithStartingColor_endingColor_, startingColor != null ? startingColor.id : 0, endingColor != null ? endingColor.id : 0);
return result == this.id ? this : (result != 0 ? new NSGradient(result) : null);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java
index 33f0b1fc2f..72e694cfd9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java
@@ -16,7 +16,7 @@ public NSGraphicsContext() {
super();
}
-public NSGraphicsContext(int /*long*/ id) {
+public NSGraphicsContext(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSGraphicsContext(id id) {
}
public static NSGraphicsContext currentContext() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_currentContext);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_currentContext);
return result != 0 ? new NSGraphicsContext(result) : null;
}
@@ -34,25 +34,25 @@ public void flushGraphics() {
}
public static NSGraphicsContext graphicsContextWithBitmapImageRep(NSBitmapImageRep bitmapRep) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithBitmapImageRep_, bitmapRep != null ? bitmapRep.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithBitmapImageRep_, bitmapRep != null ? bitmapRep.id : 0);
return result != 0 ? new NSGraphicsContext(result) : null;
}
-public static NSGraphicsContext graphicsContextWithGraphicsPort(int /*long*/ graphicsPort, boolean initialFlippedState) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithGraphicsPort_flipped_, graphicsPort, initialFlippedState);
+public static NSGraphicsContext graphicsContextWithGraphicsPort(long /*int*/ graphicsPort, boolean initialFlippedState) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithGraphicsPort_flipped_, graphicsPort, initialFlippedState);
return result != 0 ? new NSGraphicsContext(result) : null;
}
public static NSGraphicsContext graphicsContextWithWindow(NSWindow window) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithWindow_, window != null ? window.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithWindow_, window != null ? window.id : 0);
return result != 0 ? new NSGraphicsContext(result) : null;
}
-public int /*long*/ graphicsPort() {
+public long /*int*/ graphicsPort() {
return OS.objc_msgSend(this.id, OS.sel_graphicsPort);
}
-public int /*long*/ imageInterpolation() {
+public long /*int*/ imageInterpolation() {
return OS.objc_msgSend(this.id, OS.sel_imageInterpolation);
}
@@ -80,7 +80,7 @@ public void saveGraphicsState() {
OS.objc_msgSend(this.id, OS.sel_saveGraphicsState);
}
-public void setCompositingOperation(int /*long*/ operation) {
+public void setCompositingOperation(long /*int*/ operation) {
OS.objc_msgSend(this.id, OS.sel_setCompositingOperation_, operation);
}
@@ -88,7 +88,7 @@ public static void setCurrentContext(NSGraphicsContext context) {
OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_setCurrentContext_, context != null ? context.id : 0);
}
-public void setImageInterpolation(int /*long*/ interpolation) {
+public void setImageInterpolation(long /*int*/ interpolation) {
OS.objc_msgSend(this.id, OS.sel_setImageInterpolation_, interpolation);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookie.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookie.java
index e29ea217e3..d76636d760 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookie.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookie.java
@@ -16,7 +16,7 @@ public NSHTTPCookie() {
super();
}
-public NSHTTPCookie(int /*long*/ id) {
+public NSHTTPCookie(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSHTTPCookie(id id) {
}
public static NSArray cookiesWithResponseHeaderFields(NSDictionary headerFields, NSURL URL) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSHTTPCookie, OS.sel_cookiesWithResponseHeaderFields_forURL_, headerFields != null ? headerFields.id : 0, URL != null ? URL.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSHTTPCookie, OS.sel_cookiesWithResponseHeaderFields_forURL_, headerFields != null ? headerFields.id : 0, URL != null ? URL.id : 0);
return result != 0 ? new NSArray(result) : null;
}
@@ -34,12 +34,12 @@ public boolean isSessionOnly() {
}
public NSString name() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_name);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_name);
return result != 0 ? new NSString(result) : null;
}
public NSString value() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_value);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_value);
return result != 0 ? new NSString(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookieStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookieStorage.java
index 9d027f0291..cc1b283f20 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookieStorage.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookieStorage.java
@@ -16,7 +16,7 @@ public NSHTTPCookieStorage() {
super();
}
-public NSHTTPCookieStorage(int /*long*/ id) {
+public NSHTTPCookieStorage(long /*int*/ id) {
super(id);
}
@@ -25,12 +25,12 @@ public NSHTTPCookieStorage(id id) {
}
public NSArray cookies() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_cookies);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_cookies);
return result != 0 ? new NSArray(result) : null;
}
public NSArray cookiesForURL(NSURL URL) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_cookiesForURL_, URL != null ? URL.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_cookiesForURL_, URL != null ? URL.id : 0);
return result != 0 ? new NSArray(result) : null;
}
@@ -43,7 +43,7 @@ public void setCookie(NSHTTPCookie cookie) {
}
public static NSHTTPCookieStorage sharedHTTPCookieStorage() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSHTTPCookieStorage, OS.sel_sharedHTTPCookieStorage);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSHTTPCookieStorage, OS.sel_sharedHTTPCookieStorage);
return result != 0 ? new NSHTTPCookieStorage(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImage.java
index 7f22c01e9f..8acdbc1f64 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImage.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImage.java
@@ -16,7 +16,7 @@ public NSImage() {
super();
}
-public NSImage(int /*long*/ id) {
+public NSImage(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSImage(id id) {
}
public NSData TIFFRepresentation() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_TIFFRepresentation);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_TIFFRepresentation);
return result != 0 ? new NSData(result) : null;
}
@@ -34,45 +34,45 @@ public void addRepresentation(NSImageRep imageRep) {
}
public NSImageRep bestRepresentationForDevice(NSDictionary deviceDescription) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_bestRepresentationForDevice_, deviceDescription != null ? deviceDescription.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_bestRepresentationForDevice_, deviceDescription != null ? deviceDescription.id : 0);
return result != 0 ? new NSImageRep(result) : null;
}
-public void drawAtPoint(NSPoint point, NSRect fromRect, int /*long*/ op, float /*double*/ delta) {
+public void drawAtPoint(NSPoint point, NSRect fromRect, long /*int*/ op, double /*float*/ delta) {
OS.objc_msgSend(this.id, OS.sel_drawAtPoint_fromRect_operation_fraction_, point, fromRect, op, delta);
}
-public void drawInRect(NSRect rect, NSRect fromRect, int /*long*/ op, float /*double*/ delta) {
+public void drawInRect(NSRect rect, NSRect fromRect, long /*int*/ op, double /*float*/ delta) {
OS.objc_msgSend(this.id, OS.sel_drawInRect_fromRect_operation_fraction_, rect, fromRect, op, delta);
}
public static NSImage imageNamed(NSString name) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSImage, OS.sel_imageNamed_, name != null ? name.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSImage, OS.sel_imageNamed_, name != null ? name.id : 0);
return result != 0 ? new NSImage(result) : null;
}
public NSImage initByReferencingFile(NSString fileName) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initByReferencingFile_, fileName != null ? fileName.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initByReferencingFile_, fileName != null ? fileName.id : 0);
return result == this.id ? this : (result != 0 ? new NSImage(result) : null);
}
public NSImage initWithContentsOfFile(NSString fileName) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfFile_, fileName != null ? fileName.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfFile_, fileName != null ? fileName.id : 0);
return result == this.id ? this : (result != 0 ? new NSImage(result) : null);
}
public id initWithData(NSData data) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithData_, data != null ? data.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithData_, data != null ? data.id : 0);
return result != 0 ? new id(result) : null;
}
-public NSImage initWithIconRef(int /*long*/ iconRef) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIconRef_, iconRef);
+public NSImage initWithIconRef(long /*int*/ iconRef) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIconRef_, iconRef);
return result == this.id ? this : (result != 0 ? new NSImage(result) : null);
}
public NSImage initWithSize(NSSize aSize) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithSize_, aSize);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithSize_, aSize);
return result == this.id ? this : (result != 0 ? new NSImage(result) : null);
}
@@ -85,11 +85,11 @@ public void removeRepresentation(NSImageRep imageRep) {
}
public NSArray representations() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_representations);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_representations);
return result != 0 ? new NSArray(result) : null;
}
-public void setCacheMode(int /*long*/ mode) {
+public void setCacheMode(long /*int*/ mode) {
OS.objc_msgSend(this.id, OS.sel_setCacheMode_, mode);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageRep.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageRep.java
index 32918e8378..444561d6e6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageRep.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageRep.java
@@ -16,7 +16,7 @@ public NSImageRep() {
super();
}
-public NSImageRep(int /*long*/ id) {
+public NSImageRep(long /*int*/ id) {
super(id);
}
@@ -24,12 +24,12 @@ public NSImageRep(id id) {
super(id);
}
-public int /*long*/ bitsPerSample() {
+public long /*int*/ bitsPerSample() {
return OS.objc_msgSend(this.id, OS.sel_bitsPerSample);
}
public NSString colorSpaceName() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_colorSpaceName);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_colorSpaceName);
return result != 0 ? new NSString(result) : null;
}
@@ -41,11 +41,11 @@ public boolean hasAlpha() {
return OS.objc_msgSend_bool(this.id, OS.sel_hasAlpha);
}
-public int /*long*/ pixelsHigh() {
+public long /*int*/ pixelsHigh() {
return OS.objc_msgSend(this.id, OS.sel_pixelsHigh);
}
-public int /*long*/ pixelsWide() {
+public long /*int*/ pixelsWide() {
return OS.objc_msgSend(this.id, OS.sel_pixelsWide);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageView.java
index 0e64831882..d58609a003 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageView.java
@@ -16,7 +16,7 @@ public NSImageView() {
super();
}
-public NSImageView(int /*long*/ id) {
+public NSImageView(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSImageView(id id) {
}
public NSImage image() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_image);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_image);
return result != 0 ? new NSImage(result) : null;
}
@@ -33,19 +33,19 @@ public void setImage(NSImage newImage) {
OS.objc_msgSend(this.id, OS.sel_setImage_, newImage != null ? newImage.id : 0);
}
-public void setImageAlignment(int /*long*/ newAlign) {
+public void setImageAlignment(long /*int*/ newAlign) {
OS.objc_msgSend(this.id, OS.sel_setImageAlignment_, newAlign);
}
-public void setImageScaling(int /*long*/ newScaling) {
+public void setImageScaling(long /*int*/ newScaling) {
OS.objc_msgSend(this.id, OS.sel_setImageScaling_, newScaling);
}
-public static int /*long*/ cellClass() {
+public static long /*int*/ cellClass() {
return OS.objc_msgSend(OS.class_NSImageView, OS.sel_cellClass);
}
-public static void setCellClass(int /*long*/ factoryId) {
+public static void setCellClass(long /*int*/ factoryId) {
OS.objc_msgSend(OS.class_NSImageView, OS.sel_setCellClass_, factoryId);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSet.java
index 601d923b54..91ce221e65 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSet.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSet.java
@@ -16,7 +16,7 @@ public NSIndexSet() {
super();
}
-public NSIndexSet(int /*long*/ id) {
+public NSIndexSet(long /*int*/ id) {
super(id);
}
@@ -24,39 +24,39 @@ public NSIndexSet(id id) {
super(id);
}
-public boolean containsIndex(int /*long*/ value) {
+public boolean containsIndex(long /*int*/ value) {
return OS.objc_msgSend_bool(this.id, OS.sel_containsIndex_, value);
}
-public int /*long*/ count() {
+public long /*int*/ count() {
return OS.objc_msgSend(this.id, OS.sel_count);
}
-public int /*long*/ firstIndex() {
+public long /*int*/ firstIndex() {
return OS.objc_msgSend(this.id, OS.sel_firstIndex);
}
-public int /*long*/ getIndexes(int[] /*long[]*/ indexBuffer, int /*long*/ bufferSize, int /*long*/ range) {
+public long /*int*/ getIndexes(long[] /*int[]*/ indexBuffer, long /*int*/ bufferSize, long /*int*/ range) {
return OS.objc_msgSend(this.id, OS.sel_getIndexes_maxCount_inIndexRange_, indexBuffer, bufferSize, range);
}
-public static id indexSetWithIndex(int /*long*/ value) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSIndexSet, OS.sel_indexSetWithIndex_, value);
+public static id indexSetWithIndex(long /*int*/ value) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSIndexSet, OS.sel_indexSetWithIndex_, value);
return result != 0 ? new id(result) : null;
}
-public NSIndexSet initWithIndex(int /*long*/ value) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIndex_, value);
+public NSIndexSet initWithIndex(long /*int*/ value) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIndex_, value);
return result == this.id ? this : (result != 0 ? new NSIndexSet(result) : null);
}
public id initWithIndexSet(NSIndexSet indexSet) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIndexSet_, indexSet != null ? indexSet.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIndexSet_, indexSet != null ? indexSet.id : 0);
return result != 0 ? new id(result) : null;
}
public NSIndexSet initWithIndexesInRange(NSRange range) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIndexesInRange_, range);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIndexesInRange_, range);
return result == this.id ? this : (result != 0 ? new NSIndexSet(result) : null);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInputManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInputManager.java
index 606bf4e86c..0c3ec99a60 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInputManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInputManager.java
@@ -16,7 +16,7 @@ public NSInputManager() {
super();
}
-public NSInputManager(int /*long*/ id) {
+public NSInputManager(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSInputManager(id id) {
}
public static NSInputManager currentInputManager() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSInputManager, OS.sel_currentInputManager);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSInputManager, OS.sel_currentInputManager);
return result != 0 ? new NSInputManager(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedArchiver.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedArchiver.java
index 68d2a12e5d..4dd74cb2e9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedArchiver.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedArchiver.java
@@ -16,7 +16,7 @@ public NSKeyedArchiver() {
super();
}
-public NSKeyedArchiver(int /*long*/ id) {
+public NSKeyedArchiver(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSKeyedArchiver(id id) {
}
public static NSData archivedDataWithRootObject(id rootObject) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSKeyedArchiver, OS.sel_archivedDataWithRootObject_, rootObject != null ? rootObject.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSKeyedArchiver, OS.sel_archivedDataWithRootObject_, rootObject != null ? rootObject.id : 0);
return result != 0 ? new NSData(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedUnarchiver.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedUnarchiver.java
index a300dac217..5b5c71bbd3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedUnarchiver.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedUnarchiver.java
@@ -16,7 +16,7 @@ public NSKeyedUnarchiver() {
super();
}
-public NSKeyedUnarchiver(int /*long*/ id) {
+public NSKeyedUnarchiver(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSKeyedUnarchiver(id id) {
}
public static id unarchiveObjectWithData(NSData data) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSKeyedUnarchiver, OS.sel_unarchiveObjectWithData_, data != null ? data.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSKeyedUnarchiver, OS.sel_unarchiveObjectWithData_, data != null ? data.id : 0);
return result != 0 ? new id(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLayoutManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLayoutManager.java
index ed498d7178..5c28a79e48 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLayoutManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLayoutManager.java
@@ -16,7 +16,7 @@ public NSLayoutManager() {
super();
}
-public NSLayoutManager(int /*long*/ id) {
+public NSLayoutManager(long /*int*/ id) {
super(id);
}
@@ -38,16 +38,16 @@ public NSRect boundingRectForGlyphRange(NSRange glyphRange, NSTextContainer cont
return result;
}
-public int /*long*/ characterIndexForGlyphAtIndex(int /*long*/ glyphIndex) {
+public long /*int*/ characterIndexForGlyphAtIndex(long /*int*/ glyphIndex) {
return OS.objc_msgSend(this.id, OS.sel_characterIndexForGlyphAtIndex_, glyphIndex);
}
-public float /*double*/ defaultBaselineOffsetForFont(NSFont theFont) {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_defaultBaselineOffsetForFont_, theFont != null ? theFont.id : 0);
+public double /*float*/ defaultBaselineOffsetForFont(NSFont theFont) {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_defaultBaselineOffsetForFont_, theFont != null ? theFont.id : 0);
}
-public float /*double*/ defaultLineHeightForFont(NSFont theFont) {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_defaultLineHeightForFont_, theFont != null ? theFont.id : 0);
+public double /*float*/ defaultLineHeightForFont(NSFont theFont) {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_defaultLineHeightForFont_, theFont != null ? theFont.id : 0);
}
public void drawBackgroundForGlyphRange(NSRange glyphsToShow, NSPoint origin) {
@@ -58,23 +58,23 @@ public void drawGlyphsForGlyphRange(NSRange glyphsToShow, NSPoint origin) {
OS.objc_msgSend(this.id, OS.sel_drawGlyphsForGlyphRange_atPoint_, glyphsToShow, origin);
}
-public int /*long*/ getGlyphs(int /*long*/ glyphArray, NSRange glyphRange) {
+public long /*int*/ getGlyphs(long /*int*/ glyphArray, NSRange glyphRange) {
return OS.objc_msgSend(this.id, OS.sel_getGlyphs_range_, glyphArray, glyphRange);
}
-public int /*long*/ getGlyphsInRange(NSRange glyphRange, int /*long*/ glyphBuffer, int /*long*/ charIndexBuffer, int /*long*/ inscribeBuffer, int /*long*/ elasticBuffer, byte[] bidiLevelBuffer) {
+public long /*int*/ getGlyphsInRange(NSRange glyphRange, long /*int*/ glyphBuffer, long /*int*/ charIndexBuffer, long /*int*/ inscribeBuffer, long /*int*/ elasticBuffer, byte[] bidiLevelBuffer) {
return OS.objc_msgSend(this.id, OS.sel_getGlyphsInRange_glyphs_characterIndexes_glyphInscriptions_elasticBits_bidiLevels_, glyphRange, glyphBuffer, charIndexBuffer, inscribeBuffer, elasticBuffer, bidiLevelBuffer);
}
-public int /*long*/ glyphIndexForCharacterAtIndex(int /*long*/ charIndex) {
+public long /*int*/ glyphIndexForCharacterAtIndex(long /*int*/ charIndex) {
return OS.objc_msgSend(this.id, OS.sel_glyphIndexForCharacterAtIndex_, charIndex);
}
-public int /*long*/ glyphIndexForPoint(NSPoint point, NSTextContainer container, float[] /*double[]*/ partialFraction) {
+public long /*int*/ glyphIndexForPoint(NSPoint point, NSTextContainer container, double[] /*float[]*/ partialFraction) {
return OS.objc_msgSend(this.id, OS.sel_glyphIndexForPoint_inTextContainer_fractionOfDistanceThroughGlyph_, point, container != null ? container.id : 0, partialFraction);
}
-public NSRange glyphRangeForCharacterRange(NSRange charRange, int /*long*/ actualCharRange) {
+public NSRange glyphRangeForCharacterRange(NSRange charRange, long /*int*/ actualCharRange) {
NSRange result = new NSRange();
OS.objc_msgSend_stret(result, this.id, OS.sel_glyphRangeForCharacterRange_actualCharacterRange_, charRange, actualCharRange);
return result;
@@ -86,33 +86,33 @@ public NSRange glyphRangeForTextContainer(NSTextContainer container) {
return result;
}
-public NSRect lineFragmentUsedRectForGlyphAtIndex(int /*long*/ glyphIndex, int /*long*/ effectiveGlyphRange) {
+public NSRect lineFragmentUsedRectForGlyphAtIndex(long /*int*/ glyphIndex, long /*int*/ effectiveGlyphRange) {
NSRect result = new NSRect();
OS.objc_msgSend_stret(result, this.id, OS.sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_, glyphIndex, effectiveGlyphRange);
return result;
}
-public NSRect lineFragmentUsedRectForGlyphAtIndex(int /*long*/ glyphIndex, int /*long*/ effectiveGlyphRange, boolean flag) {
+public NSRect lineFragmentUsedRectForGlyphAtIndex(long /*int*/ glyphIndex, long /*int*/ effectiveGlyphRange, boolean flag) {
NSRect result = new NSRect();
OS.objc_msgSend_stret(result, this.id, OS.sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_withoutAdditionalLayout_, glyphIndex, effectiveGlyphRange, flag);
return result;
}
-public NSPoint locationForGlyphAtIndex(int /*long*/ glyphIndex) {
+public NSPoint locationForGlyphAtIndex(long /*int*/ glyphIndex) {
NSPoint result = new NSPoint();
OS.objc_msgSend_stret(result, this.id, OS.sel_locationForGlyphAtIndex_, glyphIndex);
return result;
}
-public int /*long*/ numberOfGlyphs() {
+public long /*int*/ numberOfGlyphs() {
return OS.objc_msgSend(this.id, OS.sel_numberOfGlyphs);
}
-public int /*long*/ rectArrayForCharacterRange(NSRange charRange, NSRange selCharRange, NSTextContainer container, int[] /*long[]*/ rectCount) {
+public long /*int*/ rectArrayForCharacterRange(NSRange charRange, NSRange selCharRange, NSTextContainer container, long[] /*int[]*/ rectCount) {
return OS.objc_msgSend(this.id, OS.sel_rectArrayForCharacterRange_withinSelectedCharacterRange_inTextContainer_rectCount_, charRange, selCharRange, container != null ? container.id : 0, rectCount);
}
-public int /*long*/ rectArrayForGlyphRange(NSRange glyphRange, NSRange selGlyphRange, NSTextContainer container, int[] /*long[]*/ rectCount) {
+public long /*int*/ rectArrayForGlyphRange(NSRange glyphRange, NSRange selGlyphRange, NSTextContainer container, long[] /*int[]*/ rectCount) {
return OS.objc_msgSend(this.id, OS.sel_rectArrayForGlyphRange_withinSelectedGlyphRange_inTextContainer_rectCount_, glyphRange, selGlyphRange, container != null ? container.id : 0, rectCount);
}
@@ -137,7 +137,7 @@ public void setUsesScreenFonts(boolean flag) {
}
public NSTypesetter typesetter() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_typesetter);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_typesetter);
return result != 0 ? new NSTypesetter(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLocale.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLocale.java
index f356b8dd7c..34e02458f6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLocale.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLocale.java
@@ -16,7 +16,7 @@ public NSLocale() {
super();
}
-public NSLocale(int /*long*/ id) {
+public NSLocale(long /*int*/ id) {
super(id);
}
@@ -25,12 +25,12 @@ public NSLocale(id id) {
}
public NSString displayNameForKey(id key, id value) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_displayNameForKey_value_, key != null ? key.id : 0, value != null ? value.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_displayNameForKey_value_, key != null ? key.id : 0, value != null ? value.id : 0);
return result != 0 ? new NSString(result) : null;
}
public id initWithLocaleIdentifier(NSString string) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithLocaleIdentifier_, string != null ? string.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithLocaleIdentifier_, string != null ? string.id : 0);
return result != 0 ? new id(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java
index b9320e824a..aa1301f814 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java
@@ -16,7 +16,7 @@ public NSMenu() {
super();
}
-public NSMenu(int /*long*/ id) {
+public NSMenu(long /*int*/ id) {
super(id);
}
@@ -28,8 +28,8 @@ public void addItem(NSMenuItem newItem) {
OS.objc_msgSend(this.id, OS.sel_addItem_, newItem != null ? newItem.id : 0);
}
-public NSMenuItem addItemWithTitle(NSString aString, int /*long*/ aSelector, NSString charCode) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_addItemWithTitle_action_keyEquivalent_, aString != null ? aString.id : 0, aSelector, charCode != null ? charCode.id : 0);
+public NSMenuItem addItemWithTitle(NSString aString, long /*int*/ aSelector, NSString charCode) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_addItemWithTitle_action_keyEquivalent_, aString != null ? aString.id : 0, aSelector, charCode != null ? charCode.id : 0);
return result != 0 ? new NSMenuItem(result) : null;
}
@@ -37,35 +37,35 @@ public void cancelTracking() {
OS.objc_msgSend(this.id, OS.sel_cancelTracking);
}
-public int /*long*/ indexOfItemWithTarget(id target, int /*long*/ actionSelector) {
+public long /*int*/ indexOfItemWithTarget(id target, long /*int*/ actionSelector) {
return OS.objc_msgSend(this.id, OS.sel_indexOfItemWithTarget_andAction_, target != null ? target.id : 0, actionSelector);
}
public NSMenu initWithTitle(NSString aTitle) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithTitle_, aTitle != null ? aTitle.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithTitle_, aTitle != null ? aTitle.id : 0);
return result == this.id ? this : (result != 0 ? new NSMenu(result) : null);
}
-public void insertItem(NSMenuItem newItem, int /*long*/ index) {
+public void insertItem(NSMenuItem newItem, long /*int*/ index) {
OS.objc_msgSend(this.id, OS.sel_insertItem_atIndex_, newItem != null ? newItem.id : 0, index);
}
public NSArray itemArray() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_itemArray);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_itemArray);
return result != 0 ? new NSArray(result) : null;
}
-public NSMenuItem itemAtIndex(int /*long*/ index) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_itemAtIndex_, index);
+public NSMenuItem itemAtIndex(long /*int*/ index) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_itemAtIndex_, index);
return result != 0 ? new NSMenuItem(result) : null;
}
-public NSMenuItem itemWithTag(int /*long*/ tag) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_itemWithTag_, tag);
+public NSMenuItem itemWithTag(long /*int*/ tag) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_itemWithTag_, tag);
return result != 0 ? new NSMenuItem(result) : null;
}
-public int /*long*/ numberOfItems() {
+public long /*int*/ numberOfItems() {
return OS.objc_msgSend(this.id, OS.sel_numberOfItems);
}
@@ -81,7 +81,7 @@ public void removeItem(NSMenuItem item) {
OS.objc_msgSend(this.id, OS.sel_removeItem_, item != null ? item.id : 0);
}
-public void removeItemAtIndex(int /*long*/ index) {
+public void removeItemAtIndex(long /*int*/ index) {
OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_, index);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItem.java
index 3d12164508..39ae2ccf7f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItem.java
@@ -16,7 +16,7 @@ public NSMenuItem() {
super();
}
-public NSMenuItem(int /*long*/ id) {
+public NSMenuItem(long /*int*/ id) {
super(id);
}
@@ -24,22 +24,22 @@ public NSMenuItem(id id) {
super(id);
}
-public int /*long*/ action() {
+public long /*int*/ action() {
return OS.objc_msgSend(this.id, OS.sel_action);
}
public NSAttributedString attributedTitle() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_attributedTitle);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_attributedTitle);
return result != 0 ? new NSAttributedString(result) : null;
}
public NSImage image() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_image);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_image);
return result != 0 ? new NSImage(result) : null;
}
-public NSMenuItem initWithTitle(NSString aString, int /*long*/ aSelector, NSString charCode) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithTitle_action_keyEquivalent_, aString != null ? aString.id : 0, aSelector, charCode != null ? charCode.id : 0);
+public NSMenuItem initWithTitle(NSString aString, long /*int*/ aSelector, NSString charCode) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithTitle_action_keyEquivalent_, aString != null ? aString.id : 0, aSelector, charCode != null ? charCode.id : 0);
return result == this.id ? this : (result != 0 ? new NSMenuItem(result) : null);
}
@@ -52,20 +52,20 @@ public boolean isSeparatorItem() {
}
public NSString keyEquivalent() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_keyEquivalent);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_keyEquivalent);
return result != 0 ? new NSString(result) : null;
}
-public int /*long*/ keyEquivalentModifierMask() {
+public long /*int*/ keyEquivalentModifierMask() {
return OS.objc_msgSend(this.id, OS.sel_keyEquivalentModifierMask);
}
public static NSMenuItem separatorItem() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSMenuItem, OS.sel_separatorItem);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSMenuItem, OS.sel_separatorItem);
return result != 0 ? new NSMenuItem(result) : null;
}
-public void setAction(int /*long*/ aSelector) {
+public void setAction(long /*int*/ aSelector) {
OS.objc_msgSend(this.id, OS.sel_setAction_, aSelector);
}
@@ -89,7 +89,7 @@ public void setKeyEquivalent(NSString aKeyEquivalent) {
OS.objc_msgSend(this.id, OS.sel_setKeyEquivalent_, aKeyEquivalent != null ? aKeyEquivalent.id : 0);
}
-public void setKeyEquivalentModifierMask(int /*long*/ mask) {
+public void setKeyEquivalentModifierMask(long /*int*/ mask) {
OS.objc_msgSend(this.id, OS.sel_setKeyEquivalentModifierMask_, mask);
}
@@ -97,7 +97,7 @@ public void setMenu(NSMenu menu) {
OS.objc_msgSend(this.id, OS.sel_setMenu_, menu != null ? menu.id : 0);
}
-public void setState(int /*long*/ state) {
+public void setState(long /*int*/ state) {
OS.objc_msgSend(this.id, OS.sel_setState_, state);
}
@@ -105,7 +105,7 @@ public void setSubmenu(NSMenu submenu) {
OS.objc_msgSend(this.id, OS.sel_setSubmenu_, submenu != null ? submenu.id : 0);
}
-public void setTag(int /*long*/ anInt) {
+public void setTag(long /*int*/ anInt) {
OS.objc_msgSend(this.id, OS.sel_setTag_, anInt);
}
@@ -117,26 +117,26 @@ public void setTitle(NSString aString) {
OS.objc_msgSend(this.id, OS.sel_setTitle_, aString != null ? aString.id : 0);
}
-public int /*long*/ state() {
+public long /*int*/ state() {
return OS.objc_msgSend(this.id, OS.sel_state);
}
public NSMenu submenu() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_submenu);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_submenu);
return result != 0 ? new NSMenu(result) : null;
}
-public int /*long*/ tag() {
+public long /*int*/ tag() {
return OS.objc_msgSend(this.id, OS.sel_tag);
}
public id target() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_target);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_target);
return result != 0 ? new id(result) : null;
}
public NSString title() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_title);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_title);
return result != 0 ? new NSString(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableArray.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableArray.java
index c040b3b012..7d8a2edb17 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableArray.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableArray.java
@@ -16,7 +16,7 @@ public NSMutableArray() {
super();
}
-public NSMutableArray(int /*long*/ id) {
+public NSMutableArray(long /*int*/ id) {
super(id);
}
@@ -32,13 +32,13 @@ public void addObjectsFromArray(NSArray otherArray) {
OS.objc_msgSend(this.id, OS.sel_addObjectsFromArray_, otherArray != null ? otherArray.id : 0);
}
-public static NSMutableArray arrayWithCapacity(int /*long*/ numItems) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_arrayWithCapacity_, numItems);
+public static NSMutableArray arrayWithCapacity(long /*int*/ numItems) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_arrayWithCapacity_, numItems);
return result != 0 ? new NSMutableArray(result) : null;
}
-public NSMutableArray initWithCapacity(int /*long*/ numItems) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithCapacity_, numItems);
+public NSMutableArray initWithCapacity(long /*int*/ numItems) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithCapacity_, numItems);
return result == this.id ? this : (result != 0 ? new NSMutableArray(result) : null);
}
@@ -50,7 +50,7 @@ public void removeObject(id anObject) {
OS.objc_msgSend(this.id, OS.sel_removeObject_, anObject != null ? anObject.id : 0);
}
-public void removeObjectAtIndex(int /*long*/ index) {
+public void removeObjectAtIndex(long /*int*/ index) {
OS.objc_msgSend(this.id, OS.sel_removeObjectAtIndex_, index);
}
@@ -59,12 +59,12 @@ public void removeObjectIdenticalTo(id anObject) {
}
public static NSArray array() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_array);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_array);
return result != 0 ? new NSArray(result) : null;
}
public static NSArray arrayWithObject(id anObject) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_arrayWithObject_, anObject != null ? anObject.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_arrayWithObject_, anObject != null ? anObject.id : 0);
return result != 0 ? new NSMutableArray(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableAttributedString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableAttributedString.java
index fd4b025678..853a2fb36d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableAttributedString.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableAttributedString.java
@@ -16,7 +16,7 @@ public NSMutableAttributedString() {
super();
}
-public NSMutableAttributedString(int /*long*/ id) {
+public NSMutableAttributedString(long /*int*/ id) {
super(id);
}
@@ -24,7 +24,7 @@ public NSMutableAttributedString(id id) {
super(id);
}
-public void setBaseWritingDirection(int /*long*/ writingDirection, NSRange range) {
+public void setBaseWritingDirection(long /*int*/ writingDirection, NSRange range) {
OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_range_, writingDirection, range);
}
@@ -45,7 +45,7 @@ public void endEditing() {
}
public NSMutableString mutableString() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_mutableString);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_mutableString);
return result != 0 ? new NSMutableString(result) : null;
}
@@ -62,7 +62,7 @@ public void setAttributedString(NSAttributedString attrString) {
}
public static NSAttributedString attributedStringWithAttachment(NSTextAttachment attachment) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableAttributedString, OS.sel_attributedStringWithAttachment_, attachment != null ? attachment.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableAttributedString, OS.sel_attributedStringWithAttachment_, attachment != null ? attachment.id : 0);
return result != 0 ? new NSAttributedString(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableDictionary.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableDictionary.java
index 77980256df..f9cb6ecdb9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableDictionary.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableDictionary.java
@@ -16,7 +16,7 @@ public NSMutableDictionary() {
super();
}
-public NSMutableDictionary(int /*long*/ id) {
+public NSMutableDictionary(long /*int*/ id) {
super(id);
}
@@ -24,13 +24,13 @@ public NSMutableDictionary(id id) {
super(id);
}
-public static NSMutableDictionary dictionaryWithCapacity(int /*long*/ numItems) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableDictionary, OS.sel_dictionaryWithCapacity_, numItems);
+public static NSMutableDictionary dictionaryWithCapacity(long /*int*/ numItems) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableDictionary, OS.sel_dictionaryWithCapacity_, numItems);
return result != 0 ? new NSMutableDictionary(result) : null;
}
-public NSMutableDictionary initWithCapacity(int /*long*/ numItems) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithCapacity_, numItems);
+public NSMutableDictionary initWithCapacity(long /*int*/ numItems) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithCapacity_, numItems);
return result == this.id ? this : (result != 0 ? new NSMutableDictionary(result) : null);
}
@@ -51,7 +51,7 @@ public void setValue(id value, NSString key) {
}
public static NSDictionary dictionaryWithObject(id object, id key) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableDictionary, OS.sel_dictionaryWithObject_forKey_, object != null ? object.id : 0, key != null ? key.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableDictionary, OS.sel_dictionaryWithObject_forKey_, object != null ? object.id : 0, key != null ? key.id : 0);
return result != 0 ? new NSMutableDictionary(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableIndexSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableIndexSet.java
index 3eb8318a5e..06205e31f2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableIndexSet.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableIndexSet.java
@@ -16,7 +16,7 @@ public NSMutableIndexSet() {
super();
}
-public NSMutableIndexSet(int /*long*/ id) {
+public NSMutableIndexSet(long /*int*/ id) {
super(id);
}
@@ -24,16 +24,16 @@ public NSMutableIndexSet(id id) {
super(id);
}
-public void addIndex(int /*long*/ value) {
+public void addIndex(long /*int*/ value) {
OS.objc_msgSend(this.id, OS.sel_addIndex_, value);
}
-public void removeIndex(int /*long*/ value) {
+public void removeIndex(long /*int*/ value) {
OS.objc_msgSend(this.id, OS.sel_removeIndex_, value);
}
-public static id indexSetWithIndex(int /*long*/ value) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableIndexSet, OS.sel_indexSetWithIndex_, value);
+public static id indexSetWithIndex(long /*int*/ value) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableIndexSet, OS.sel_indexSetWithIndex_, value);
return result != 0 ? new id(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableParagraphStyle.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableParagraphStyle.java
index fce0c3c77f..9ca6cba79e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableParagraphStyle.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableParagraphStyle.java
@@ -16,7 +16,7 @@ public NSMutableParagraphStyle() {
super();
}
-public NSMutableParagraphStyle(int /*long*/ id) {
+public NSMutableParagraphStyle(long /*int*/ id) {
super(id);
}
@@ -28,31 +28,31 @@ public void addTabStop(NSTextTab anObject) {
OS.objc_msgSend(this.id, OS.sel_addTabStop_, anObject != null ? anObject.id : 0);
}
-public void setAlignment(int /*long*/ alignment) {
+public void setAlignment(long /*int*/ alignment) {
OS.objc_msgSend(this.id, OS.sel_setAlignment_, alignment);
}
-public void setBaseWritingDirection(int /*long*/ writingDirection) {
+public void setBaseWritingDirection(long /*int*/ writingDirection) {
OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_, writingDirection);
}
-public void setDefaultTabInterval(float /*double*/ aFloat) {
+public void setDefaultTabInterval(double /*float*/ aFloat) {
OS.objc_msgSend(this.id, OS.sel_setDefaultTabInterval_, aFloat);
}
-public void setFirstLineHeadIndent(float /*double*/ aFloat) {
+public void setFirstLineHeadIndent(double /*float*/ aFloat) {
OS.objc_msgSend(this.id, OS.sel_setFirstLineHeadIndent_, aFloat);
}
-public void setHeadIndent(float /*double*/ aFloat) {
+public void setHeadIndent(double /*float*/ aFloat) {
OS.objc_msgSend(this.id, OS.sel_setHeadIndent_, aFloat);
}
-public void setLineBreakMode(int /*long*/ mode) {
+public void setLineBreakMode(long /*int*/ mode) {
OS.objc_msgSend(this.id, OS.sel_setLineBreakMode_, mode);
}
-public void setLineSpacing(float /*double*/ aFloat) {
+public void setLineSpacing(double /*float*/ aFloat) {
OS.objc_msgSend(this.id, OS.sel_setLineSpacing_, aFloat);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableSet.java
index 19f89ec4ae..0a03d40d6c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableSet.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableSet.java
@@ -16,7 +16,7 @@ public NSMutableSet() {
super();
}
-public NSMutableSet(int /*long*/ id) {
+public NSMutableSet(long /*int*/ id) {
super(id);
}
@@ -29,7 +29,7 @@ public void addObjectsFromArray(NSArray array) {
}
public static NSSet set() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableSet, OS.sel_set);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableSet, OS.sel_set);
return result != 0 ? new NSMutableSet(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java
index 3201b59287..ef52328ec6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java
@@ -16,7 +16,7 @@ public NSMutableString() {
super();
}
-public NSMutableString(int /*long*/ id) {
+public NSMutableString(long /*int*/ id) {
super(id);
}
@@ -37,22 +37,22 @@ public void setString(NSString aString) {
}
public static NSString string() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_string);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_string);
return result != 0 ? new NSString(result) : null;
}
-public static NSString stringWithCharacters(char[] characters, int /*long*/ length) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_stringWithCharacters_length_, characters, length);
+public static NSString stringWithCharacters(char[] characters, long /*int*/ length) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_stringWithCharacters_length_, characters, length);
return result != 0 ? new NSMutableString(result) : null;
}
public static NSString stringWithFormat(NSString format) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_stringWithFormat_, format != null ? format.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_stringWithFormat_, format != null ? format.id : 0);
return result != 0 ? new NSString(result) : null;
}
-public static NSString stringWithUTF8String(int /*long*/ nullTerminatedCString) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_stringWithUTF8String_, nullTerminatedCString);
+public static NSString stringWithUTF8String(long /*int*/ nullTerminatedCString) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_stringWithUTF8String_, nullTerminatedCString);
return result != 0 ? new NSString(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableURLRequest.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableURLRequest.java
index 4a895806c3..9e6069c1c8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableURLRequest.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableURLRequest.java
@@ -16,7 +16,7 @@ public NSMutableURLRequest() {
super();
}
-public NSMutableURLRequest(int /*long*/ id) {
+public NSMutableURLRequest(long /*int*/ id) {
super(id);
}
@@ -24,7 +24,7 @@ public NSMutableURLRequest(id id) {
super(id);
}
-public void setCachePolicy(int /*long*/ policy) {
+public void setCachePolicy(long /*int*/ policy) {
OS.objc_msgSend(this.id, OS.sel_setCachePolicy_, policy);
}
@@ -45,7 +45,7 @@ public void setValue(NSString value, NSString field) {
}
public static NSURLRequest requestWithURL(NSURL URL) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSMutableURLRequest, OS.sel_requestWithURL_, URL != null ? URL.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableURLRequest, OS.sel_requestWithURL_, URL != null ? URL.id : 0);
return result != 0 ? new NSMutableURLRequest(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotification.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotification.java
index e1c32d7dc8..c53ef614dd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotification.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotification.java
@@ -16,7 +16,7 @@ public NSNotification() {
super();
}
-public NSNotification(int /*long*/ id) {
+public NSNotification(long /*int*/ id) {
super(id);
}
@@ -25,12 +25,12 @@ public NSNotification(id id) {
}
public id object() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_object);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_object);
return result != 0 ? new id(result) : null;
}
public NSDictionary userInfo() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_userInfo);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_userInfo);
return result != 0 ? new NSDictionary(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotificationCenter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotificationCenter.java
index c383443a71..a06fe69055 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotificationCenter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotificationCenter.java
@@ -16,7 +16,7 @@ public NSNotificationCenter() {
super();
}
-public NSNotificationCenter(int /*long*/ id) {
+public NSNotificationCenter(long /*int*/ id) {
super(id);
}
@@ -24,12 +24,12 @@ public NSNotificationCenter(id id) {
super(id);
}
-public void addObserver(id observer, int /*long*/ aSelector, NSString aName, id anObject) {
+public void addObserver(id observer, long /*int*/ aSelector, NSString aName, id anObject) {
OS.objc_msgSend(this.id, OS.sel_addObserver_selector_name_object_, observer != null ? observer.id : 0, aSelector, aName != null ? aName.id : 0, anObject != null ? anObject.id : 0);
}
public static NSNotificationCenter defaultCenter() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSNotificationCenter, OS.sel_defaultCenter);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSNotificationCenter, OS.sel_defaultCenter);
return result != 0 ? new NSNotificationCenter(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumber.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumber.java
index 808c0210d2..3d4a65e8c0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumber.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumber.java
@@ -16,7 +16,7 @@ public NSNumber() {
super();
}
-public NSNumber(int /*long*/ id) {
+public NSNumber(long /*int*/ id) {
super(id);
}
@@ -40,47 +40,47 @@ public int intValue() {
return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_intValue);
}
-public int /*long*/ integerValue() {
+public long /*int*/ integerValue() {
return OS.objc_msgSend(this.id, OS.sel_integerValue);
}
public static NSNumber numberWithBool(boolean value) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithBool_, value);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithBool_, value);
return result != 0 ? new NSNumber(result) : null;
}
public static NSNumber numberWithDouble(double value) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithDouble_, value);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithDouble_, value);
return result != 0 ? new NSNumber(result) : null;
}
public static NSNumber numberWithInt(int value) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithInt_, value);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithInt_, value);
return result != 0 ? new NSNumber(result) : null;
}
-public static NSNumber numberWithInteger(int /*long*/ value) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithInteger_, value);
+public static NSNumber numberWithInteger(long /*int*/ value) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithInteger_, value);
return result != 0 ? new NSNumber(result) : null;
}
public static NSValue valueWithPoint(NSPoint point) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithPoint_, point);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithPoint_, point);
return result != 0 ? new NSValue(result) : null;
}
public static NSValue valueWithRange(NSRange range) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithRange_, range);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithRange_, range);
return result != 0 ? new NSValue(result) : null;
}
public static NSValue valueWithRect(NSRect rect) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithRect_, rect);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithRect_, rect);
return result != 0 ? new NSValue(result) : null;
}
public static NSValue valueWithSize(NSSize size) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithSize_, size);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithSize_, size);
return result != 0 ? new NSValue(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumberFormatter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumberFormatter.java
index b5dfc05a2f..8cd3a5300a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumberFormatter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumberFormatter.java
@@ -16,7 +16,7 @@ public NSNumberFormatter() {
super();
}
-public NSNumberFormatter(int /*long*/ id) {
+public NSNumberFormatter(long /*int*/ id) {
super(id);
}
@@ -33,25 +33,25 @@ public boolean alwaysShowsDecimalSeparator() {
}
public NSString decimalSeparator() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_decimalSeparator);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_decimalSeparator);
return result != 0 ? new NSString(result) : null;
}
public NSNumber maximum() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_maximum);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_maximum);
return result != 0 ? new NSNumber(result) : null;
}
-public int /*long*/ maximumFractionDigits() {
+public long /*int*/ maximumFractionDigits() {
return OS.objc_msgSend(this.id, OS.sel_maximumFractionDigits);
}
-public int /*long*/ maximumIntegerDigits() {
+public long /*int*/ maximumIntegerDigits() {
return OS.objc_msgSend(this.id, OS.sel_maximumIntegerDigits);
}
public NSNumber minimum() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_minimum);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_minimum);
return result != 0 ? new NSNumber(result) : null;
}
@@ -63,11 +63,11 @@ public void setMaximum(NSNumber number) {
OS.objc_msgSend(this.id, OS.sel_setMaximum_, number != null ? number.id : 0);
}
-public void setMaximumFractionDigits(int /*long*/ number) {
+public void setMaximumFractionDigits(long /*int*/ number) {
OS.objc_msgSend(this.id, OS.sel_setMaximumFractionDigits_, number);
}
-public void setMaximumIntegerDigits(int /*long*/ number) {
+public void setMaximumIntegerDigits(long /*int*/ number) {
OS.objc_msgSend(this.id, OS.sel_setMaximumIntegerDigits_, number);
}
@@ -75,15 +75,15 @@ public void setMinimum(NSNumber number) {
OS.objc_msgSend(this.id, OS.sel_setMinimum_, number != null ? number.id : 0);
}
-public void setMinimumFractionDigits(int /*long*/ number) {
+public void setMinimumFractionDigits(long /*int*/ number) {
OS.objc_msgSend(this.id, OS.sel_setMinimumFractionDigits_, number);
}
-public void setMinimumIntegerDigits(int /*long*/ number) {
+public void setMinimumIntegerDigits(long /*int*/ number) {
OS.objc_msgSend(this.id, OS.sel_setMinimumIntegerDigits_, number);
}
-public void setNumberStyle(int /*long*/ style) {
+public void setNumberStyle(long /*int*/ style) {
OS.objc_msgSend(this.id, OS.sel_setNumberStyle_, style);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java
index c8ffbd8331..fe68483433 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java
@@ -16,7 +16,7 @@ public NSObject() {
super();
}
-public NSObject(int /*long*/ id) {
+public NSObject(long /*int*/ id) {
super(id);
}
@@ -30,7 +30,7 @@ public NSObject alloc() {
}
public id accessibilityAttributeValue(NSString attribute, id parameter) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_accessibilityAttributeValue_forParameter_, attribute != null ? attribute.id : 0, parameter != null ? parameter.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_accessibilityAttributeValue_forParameter_, attribute != null ? attribute.id : 0, parameter != null ? parameter.id : 0);
return result != 0 ? new id(result) : null;
}
@@ -38,12 +38,12 @@ public boolean accessibilitySetOverrideValue(id value, NSString attribute) {
return OS.objc_msgSend_bool(this.id, OS.sel_accessibilitySetOverrideValue_forAttribute_, value != null ? value.id : 0, attribute != null ? attribute.id : 0);
}
-public void draggedImage(NSImage image, NSPoint screenPoint, int /*long*/ operation) {
+public void draggedImage(NSImage image, NSPoint screenPoint, long /*int*/ operation) {
OS.objc_msgSend(this.id, OS.sel_draggedImage_endedAt_operation_, image != null ? image.id : 0, screenPoint, operation);
}
public NSWindow draggingDestinationWindow() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_draggingDestinationWindow);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_draggingDestinationWindow);
return result != 0 ? new NSWindow(result) : null;
}
@@ -54,11 +54,11 @@ public NSPoint draggingLocation() {
}
public NSPasteboard draggingPasteboard() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_draggingPasteboard);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_draggingPasteboard);
return result != 0 ? new NSPasteboard(result) : null;
}
-public int /*long*/ draggingSourceOperationMask() {
+public long /*int*/ draggingSourceOperationMask() {
return OS.objc_msgSend(this.id, OS.sel_draggingSourceOperationMask);
}
@@ -66,7 +66,7 @@ public boolean outlineView(NSOutlineView outlineView, NSTableColumn tableColumn,
return OS.objc_msgSend_bool(this.id, OS.sel_outlineView_shouldEditTableColumn_item_, outlineView != null ? outlineView.id : 0, tableColumn != null ? tableColumn.id : 0, item != null ? item.id : 0);
}
-public boolean outlineView(NSOutlineView outlineView, int /*long*/ columnIndex, int /*long*/ newColumnIndex) {
+public boolean outlineView(NSOutlineView outlineView, long /*int*/ columnIndex, long /*int*/ newColumnIndex) {
return OS.objc_msgSend_bool(this.id, OS.sel_outlineView_shouldReorderColumn_toColumn_, outlineView != null ? outlineView.id : 0, columnIndex, newColumnIndex);
}
@@ -82,15 +82,15 @@ public boolean readSelectionFromPasteboard(NSPasteboard pboard) {
return OS.objc_msgSend_bool(this.id, OS.sel_readSelectionFromPasteboard_, pboard != null ? pboard.id : 0);
}
-public boolean tableView(NSTableView tableView, int /*long*/ columnIndex, int /*long*/ newColumnIndex) {
+public boolean tableView(NSTableView tableView, long /*int*/ columnIndex, long /*int*/ newColumnIndex) {
return OS.objc_msgSend_bool(this.id, OS.sel_tableView_shouldReorderColumn_toColumn_, tableView != null ? tableView.id : 0, columnIndex, newColumnIndex);
}
-public boolean tableView(NSTableView tableView, int /*long*/ row) {
+public boolean tableView(NSTableView tableView, long /*int*/ row) {
return OS.objc_msgSend_bool(this.id, OS.sel_tableView_shouldSelectRow_, tableView != null ? tableView.id : 0, row);
}
-public boolean tableView(NSTableView tableView, NSCell cell, NSTableColumn tableColumn, int /*long*/ row) {
+public boolean tableView(NSTableView tableView, NSCell cell, NSTableColumn tableColumn, long /*int*/ row) {
return OS.objc_msgSend_bool(this.id, OS.sel_tableView_shouldTrackCell_forTableColumn_row_, tableView != null ? tableView.id : 0, cell != null ? cell.id : 0, tableColumn != null ? tableColumn.id : 0, row);
}
@@ -99,7 +99,7 @@ public boolean writeSelectionToPasteboard(NSPasteboard pboard, NSArray types) {
}
public NSObject autorelease() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_autorelease);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_autorelease);
return result == this.id ? this : (result != 0 ? new NSObject(result) : null);
}
@@ -108,7 +108,7 @@ public void cancelAuthenticationChallenge(NSURLAuthenticationChallenge challenge
}
public NSString className() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_className);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_className);
return result != 0 ? new NSString(result) : null;
}
@@ -117,17 +117,17 @@ public boolean conformsToProtocol(Protocol aProtocol) {
}
public id copy() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_copy);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_copy);
return result != 0 ? new id(result) : null;
}
public NSString description() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_description);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_description);
return result != 0 ? new NSString(result) : null;
}
public NSObject init() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_init);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_init);
return result == this.id ? this : (result != 0 ? new NSObject(result) : null);
}
@@ -139,20 +139,20 @@ public boolean isEqualTo(id object) {
return OS.objc_msgSend_bool(this.id, OS.sel_isEqualTo_, object != null ? object.id : 0);
}
-public boolean isKindOfClass(int /*long*/ aClass) {
+public boolean isKindOfClass(long /*int*/ aClass) {
return OS.objc_msgSend_bool(this.id, OS.sel_isKindOfClass_, aClass);
}
public id mutableCopy() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_mutableCopy);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_mutableCopy);
return result != 0 ? new id(result) : null;
}
-public void performSelector(int /*long*/ aSelector, id anArgument, double delay, NSArray modes) {
+public void performSelector(long /*int*/ aSelector, id anArgument, double delay, NSArray modes) {
OS.objc_msgSend(this.id, OS.sel_performSelector_withObject_afterDelay_inModes_, aSelector, anArgument != null ? anArgument.id : 0, delay, modes != null ? modes.id : 0);
}
-public void performSelectorOnMainThread(int /*long*/ aSelector, id arg, boolean wait) {
+public void performSelectorOnMainThread(long /*int*/ aSelector, id arg, boolean wait) {
OS.objc_msgSend(this.id, OS.sel_performSelectorOnMainThread_withObject_waitUntilDone_, aSelector, arg != null ? arg.id : 0, wait);
}
@@ -160,16 +160,16 @@ public void release() {
OS.objc_msgSend(this.id, OS.sel_release);
}
-public boolean respondsToSelector(int /*long*/ aSelector) {
+public boolean respondsToSelector(long /*int*/ aSelector) {
return OS.objc_msgSend_bool(this.id, OS.sel_respondsToSelector_, aSelector);
}
public id retain() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_retain);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_retain);
return result != 0 ? new id(result) : null;
}
-public int /*long*/ retainCount() {
+public long /*int*/ retainCount() {
return OS.objc_msgSend(this.id, OS.sel_retainCount);
}
@@ -177,7 +177,7 @@ public void setValue(id value, NSString key) {
OS.objc_msgSend(this.id, OS.sel_setValue_forKey_, value != null ? value.id : 0, key != null ? key.id : 0);
}
-public int /*long*/ superclass() {
+public long /*int*/ superclass() {
return OS.objc_msgSend(this.id, OS.sel_superclass);
}
@@ -186,7 +186,7 @@ public void useCredential(NSURLCredential credential, NSURLAuthenticationChallen
}
public id valueForKey(NSString key) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_valueForKey_, key != null ? key.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_valueForKey_, key != null ? key.id : 0);
return result != 0 ? new id(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLContext.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLContext.java
index d03cb56fa2..1af4200ab8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLContext.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLContext.java
@@ -16,7 +16,7 @@ public NSOpenGLContext() {
super();
}
-public NSOpenGLContext(int /*long*/ id) {
+public NSOpenGLContext(long /*int*/ id) {
super(id);
}
@@ -33,7 +33,7 @@ public void clearDrawable() {
}
public static NSOpenGLContext currentContext() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSOpenGLContext, OS.sel_currentContext);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSOpenGLContext, OS.sel_currentContext);
return result != 0 ? new NSOpenGLContext(result) : null;
}
@@ -42,7 +42,7 @@ public void flushBuffer() {
}
public NSOpenGLContext initWithFormat(NSOpenGLPixelFormat format, NSOpenGLContext share) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFormat_shareContext_, format != null ? format.id : 0, share != null ? share.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFormat_shareContext_, format != null ? format.id : 0, share != null ? share.id : 0);
return result == this.id ? this : (result != 0 ? new NSOpenGLContext(result) : null);
}
@@ -63,7 +63,7 @@ public void update() {
}
public NSView view() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_view);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_view);
return result != 0 ? new NSView(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelFormat.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelFormat.java
index e3f786d166..71064881a6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelFormat.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelFormat.java
@@ -16,7 +16,7 @@ public NSOpenGLPixelFormat() {
super();
}
-public NSOpenGLPixelFormat(int /*long*/ id) {
+public NSOpenGLPixelFormat(long /*int*/ id) {
super(id);
}
@@ -24,12 +24,12 @@ public NSOpenGLPixelFormat(id id) {
super(id);
}
-public void getValues(int[] /*long[]*/ vals, int attrib, int screen) {
+public void getValues(long[] /*int[]*/ vals, int attrib, int screen) {
OS.objc_msgSend(this.id, OS.sel_getValues_forAttribute_forVirtualScreen_, vals, attrib, screen);
}
public id initWithAttributes(int[] attribs) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithAttributes_, attribs);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithAttributes_, attribs);
return result != 0 ? new id(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenPanel.java
index f647d3007c..2576c39f93 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenPanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenPanel.java
@@ -16,7 +16,7 @@ public NSOpenPanel() {
super();
}
-public NSOpenPanel(int /*long*/ id) {
+public NSOpenPanel(long /*int*/ id) {
super(id);
}
@@ -25,12 +25,12 @@ public NSOpenPanel(id id) {
}
public NSArray filenames() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_filenames);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_filenames);
return result != 0 ? new NSArray(result) : null;
}
public static NSOpenPanel openPanel() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSOpenPanel, OS.sel_openPanel);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSOpenPanel, OS.sel_openPanel);
return result != 0 ? new NSOpenPanel(result) : null;
}
@@ -47,15 +47,15 @@ public void setCanChooseFiles(boolean flag) {
}
public static NSSavePanel savePanel() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSOpenPanel, OS.sel_savePanel);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSOpenPanel, OS.sel_savePanel);
return result != 0 ? new NSSavePanel(result) : null;
}
-public static float /*double*/ minFrameWidthWithTitle(NSString aTitle, int /*long*/ aStyle) {
- return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSOpenPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+public static double /*float*/ minFrameWidthWithTitle(NSString aTitle, long /*int*/ aStyle) {
+ return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSOpenPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
}
-public static int /*long*/ windowNumberAtPoint(NSPoint point, int /*long*/ windowNumber) {
+public static long /*int*/ windowNumberAtPoint(NSPoint point, long /*int*/ windowNumber) {
return OS.objc_msgSend(OS.class_NSOpenPanel, OS.sel_windowNumberAtPoint_belowWindowWithWindowNumber_, point, windowNumber);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutlineView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutlineView.java
index 4d7f03c884..c3ae00e151 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutlineView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutlineView.java
@@ -16,7 +16,7 @@ public NSOutlineView() {
super();
}
-public NSOutlineView(int /*long*/ id) {
+public NSOutlineView(long /*int*/ id) {
super(id);
}
@@ -40,31 +40,31 @@ public void expandItem(id item, boolean expandChildren) {
OS.objc_msgSend(this.id, OS.sel_expandItem_expandChildren_, item != null ? item.id : 0, expandChildren);
}
-public NSRect frameOfOutlineCellAtRow(int /*long*/ row) {
+public NSRect frameOfOutlineCellAtRow(long /*int*/ row) {
NSRect result = new NSRect();
OS.objc_msgSend_stret(result, this.id, OS.sel_frameOfOutlineCellAtRow_, row);
return result;
}
-public float /*double*/ indentationPerLevel() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_indentationPerLevel);
+public double /*float*/ indentationPerLevel() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_indentationPerLevel);
}
public boolean isItemExpanded(id item) {
return OS.objc_msgSend_bool(this.id, OS.sel_isItemExpanded_, item != null ? item.id : 0);
}
-public id itemAtRow(int /*long*/ row) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_itemAtRow_, row);
+public id itemAtRow(long /*int*/ row) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_itemAtRow_, row);
return result != 0 ? new id(result) : null;
}
-public int /*long*/ levelForItem(id item) {
+public long /*int*/ levelForItem(id item) {
return OS.objc_msgSend(this.id, OS.sel_levelForItem_, item != null ? item.id : 0);
}
public NSTableColumn outlineTableColumn() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_outlineTableColumn);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_outlineTableColumn);
return result != 0 ? new NSTableColumn(result) : null;
}
@@ -72,7 +72,7 @@ public void reloadItem(id item, boolean reloadChildren) {
OS.objc_msgSend(this.id, OS.sel_reloadItem_reloadChildren_, item != null ? item.id : 0, reloadChildren);
}
-public int /*long*/ rowForItem(id item) {
+public long /*int*/ rowForItem(id item) {
return OS.objc_msgSend(this.id, OS.sel_rowForItem_, item != null ? item.id : 0);
}
@@ -84,7 +84,7 @@ public void setAutosaveExpandedItems(boolean save) {
OS.objc_msgSend(this.id, OS.sel_setAutosaveExpandedItems_, save);
}
-public void setDropItem(id item, int /*long*/ index) {
+public void setDropItem(id item, long /*int*/ index) {
OS.objc_msgSend(this.id, OS.sel_setDropItem_dropChildIndex_, item != null ? item.id : 0, index);
}
@@ -92,11 +92,11 @@ public void setOutlineTableColumn(NSTableColumn outlineTableColumn) {
OS.objc_msgSend(this.id, OS.sel_setOutlineTableColumn_, outlineTableColumn != null ? outlineTableColumn.id : 0);
}
-public static int /*long*/ cellClass() {
+public static long /*int*/ cellClass() {
return OS.objc_msgSend(OS.class_NSOutlineView, OS.sel_cellClass);
}
-public static void setCellClass(int /*long*/ factoryId) {
+public static void setCellClass(long /*int*/ factoryId) {
OS.objc_msgSend(OS.class_NSOutlineView, OS.sel_setCellClass_, factoryId);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPanel.java
index 96c05dd459..a25bc5ad27 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPanel.java
@@ -16,7 +16,7 @@ public NSPanel() {
super();
}
-public NSPanel(int /*long*/ id) {
+public NSPanel(long /*int*/ id) {
super(id);
}
@@ -40,11 +40,11 @@ public boolean worksWhenModal() {
return OS.objc_msgSend_bool(this.id, OS.sel_worksWhenModal);
}
-public static float /*double*/ minFrameWidthWithTitle(NSString aTitle, int /*long*/ aStyle) {
- return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+public static double /*float*/ minFrameWidthWithTitle(NSString aTitle, long /*int*/ aStyle) {
+ return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
}
-public static int /*long*/ windowNumberAtPoint(NSPoint point, int /*long*/ windowNumber) {
+public static long /*int*/ windowNumberAtPoint(NSPoint point, long /*int*/ windowNumber) {
return OS.objc_msgSend(OS.class_NSPanel, OS.sel_windowNumberAtPoint_belowWindowWithWindowNumber_, point, windowNumber);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSParagraphStyle.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSParagraphStyle.java
index 9ee0c1d55b..d6dcd7cb12 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSParagraphStyle.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSParagraphStyle.java
@@ -16,7 +16,7 @@ public NSParagraphStyle() {
super();
}
-public NSParagraphStyle(int /*long*/ id) {
+public NSParagraphStyle(long /*int*/ id) {
super(id);
}
@@ -24,12 +24,12 @@ public NSParagraphStyle(id id) {
super(id);
}
-public int /*long*/ alignment() {
+public long /*int*/ alignment() {
return OS.objc_msgSend(this.id, OS.sel_alignment);
}
public NSArray tabStops() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_tabStops);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_tabStops);
return result != 0 ? new NSArray(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPasteboard.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPasteboard.java
index 593edace35..bc0a7fec48 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPasteboard.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPasteboard.java
@@ -16,7 +16,7 @@ public NSPasteboard() {
super();
}
-public NSPasteboard(int /*long*/ id) {
+public NSPasteboard(long /*int*/ id) {
super(id);
}
@@ -24,36 +24,36 @@ public NSPasteboard(id id) {
super(id);
}
-public int /*long*/ addTypes(NSArray newTypes, id newOwner) {
+public long /*int*/ addTypes(NSArray newTypes, id newOwner) {
return OS.objc_msgSend(this.id, OS.sel_addTypes_owner_, newTypes != null ? newTypes.id : 0, newOwner != null ? newOwner.id : 0);
}
public NSString availableTypeFromArray(NSArray types) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_availableTypeFromArray_, types != null ? types.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_availableTypeFromArray_, types != null ? types.id : 0);
return result != 0 ? new NSString(result) : null;
}
public NSData dataForType(NSString dataType) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_dataForType_, dataType != null ? dataType.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_dataForType_, dataType != null ? dataType.id : 0);
return result != 0 ? new NSData(result) : null;
}
-public int /*long*/ declareTypes(NSArray newTypes, id newOwner) {
+public long /*int*/ declareTypes(NSArray newTypes, id newOwner) {
return OS.objc_msgSend(this.id, OS.sel_declareTypes_owner_, newTypes != null ? newTypes.id : 0, newOwner != null ? newOwner.id : 0);
}
public static NSPasteboard generalPasteboard() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_generalPasteboard);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_generalPasteboard);
return result != 0 ? new NSPasteboard(result) : null;
}
public static NSPasteboard pasteboardWithName(NSString name) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardWithName_, name != null ? name.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardWithName_, name != null ? name.id : 0);
return result != 0 ? new NSPasteboard(result) : null;
}
public id propertyListForType(NSString dataType) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_propertyListForType_, dataType != null ? dataType.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_propertyListForType_, dataType != null ? dataType.id : 0);
return result != 0 ? new id(result) : null;
}
@@ -70,12 +70,12 @@ public boolean setString(NSString string, NSString dataType) {
}
public NSString stringForType(NSString dataType) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_stringForType_, dataType != null ? dataType.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringForType_, dataType != null ? dataType.id : 0);
return result != 0 ? new NSString(result) : null;
}
public NSArray types() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_types);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_types);
return result != 0 ? new NSArray(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java
index e07dfd350a..abd669f98d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java
@@ -12,8 +12,8 @@ package org.eclipse.swt.internal.cocoa;
public class NSPoint {
- public float /*double*/ x;
- public float /*double*/ y;
+ public double /*float*/ x;
+ public double /*float*/ y;
public static final int sizeof = OS.NSPoint_sizeof();
public String toString() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButton.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButton.java
index c74656f185..7823f64ead 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButton.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButton.java
@@ -16,7 +16,7 @@ public NSPopUpButton() {
super();
}
-public NSPopUpButton(int /*long*/ id) {
+public NSPopUpButton(long /*int*/ id) {
super(id);
}
@@ -24,31 +24,31 @@ public NSPopUpButton(id id) {
super(id);
}
-public int /*long*/ indexOfSelectedItem() {
+public long /*int*/ indexOfSelectedItem() {
return OS.objc_msgSend(this.id, OS.sel_indexOfSelectedItem);
}
public NSPopUpButton initWithFrame(NSRect buttonFrame, boolean flag) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_pullsDown_, buttonFrame, flag);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_pullsDown_, buttonFrame, flag);
return result == this.id ? this : (result != 0 ? new NSPopUpButton(result) : null);
}
-public NSMenuItem itemAtIndex(int /*long*/ index) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_itemAtIndex_, index);
+public NSMenuItem itemAtIndex(long /*int*/ index) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_itemAtIndex_, index);
return result != 0 ? new NSMenuItem(result) : null;
}
-public NSString itemTitleAtIndex(int /*long*/ index) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_itemTitleAtIndex_, index);
+public NSString itemTitleAtIndex(long /*int*/ index) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_itemTitleAtIndex_, index);
return result != 0 ? new NSString(result) : null;
}
public NSMenu menu() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_menu);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_menu);
return result != 0 ? new NSMenu(result) : null;
}
-public int /*long*/ numberOfItems() {
+public long /*int*/ numberOfItems() {
return OS.objc_msgSend(this.id, OS.sel_numberOfItems);
}
@@ -56,7 +56,7 @@ public void removeAllItems() {
OS.objc_msgSend(this.id, OS.sel_removeAllItems);
}
-public void removeItemAtIndex(int /*long*/ index) {
+public void removeItemAtIndex(long /*int*/ index) {
OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_, index);
}
@@ -64,7 +64,7 @@ public void selectItem(NSMenuItem item) {
OS.objc_msgSend(this.id, OS.sel_selectItem_, item != null ? item.id : 0);
}
-public void selectItemAtIndex(int /*long*/ index) {
+public void selectItemAtIndex(long /*int*/ index) {
OS.objc_msgSend(this.id, OS.sel_selectItemAtIndex_, index);
}
@@ -77,15 +77,15 @@ public void setPullsDown(boolean flag) {
}
public NSString titleOfSelectedItem() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_titleOfSelectedItem);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_titleOfSelectedItem);
return result != 0 ? new NSString(result) : null;
}
-public static int /*long*/ cellClass() {
+public static long /*int*/ cellClass() {
return OS.objc_msgSend(OS.class_NSPopUpButton, OS.sel_cellClass);
}
-public static void setCellClass(int /*long*/ factoryId) {
+public static void setCellClass(long /*int*/ factoryId) {
OS.objc_msgSend(OS.class_NSPopUpButton, OS.sel_setCellClass_, factoryId);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintInfo.java
index fc2fa09351..b1c3df5f24 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintInfo.java
@@ -16,7 +16,7 @@ public NSPrintInfo() {
super();
}
-public NSPrintInfo(int /*long*/ id) {
+public NSPrintInfo(long /*int*/ id) {
super(id);
}
@@ -24,21 +24,21 @@ public NSPrintInfo(id id) {
super(id);
}
-public int /*long*/ PMPrintSession() {
+public long /*int*/ PMPrintSession() {
return OS.objc_msgSend(this.id, OS.sel_PMPrintSession);
}
-public int /*long*/ PMPrintSettings() {
+public long /*int*/ PMPrintSettings() {
return OS.objc_msgSend(this.id, OS.sel_PMPrintSettings);
}
public static NSPrinter defaultPrinter() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_defaultPrinter);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_defaultPrinter);
return result != 0 ? new NSPrinter(result) : null;
}
public NSMutableDictionary dictionary() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_dictionary);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_dictionary);
return result != 0 ? new NSMutableDictionary(result) : null;
}
@@ -49,12 +49,12 @@ public NSRect imageablePageBounds() {
}
public NSPrintInfo initWithDictionary(NSDictionary attributes) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithDictionary_, attributes != null ? attributes.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithDictionary_, attributes != null ? attributes.id : 0);
return result == this.id ? this : (result != 0 ? new NSPrintInfo(result) : null);
}
public NSString jobDisposition() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_jobDisposition);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_jobDisposition);
return result != 0 ? new NSString(result) : null;
}
@@ -65,12 +65,12 @@ public NSSize paperSize() {
}
public NSMutableDictionary printSettings() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_printSettings);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_printSettings);
return result != 0 ? new NSMutableDictionary(result) : null;
}
public NSPrinter printer() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_printer);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_printer);
return result != 0 ? new NSPrinter(result) : null;
}
@@ -87,7 +87,7 @@ public void setUpPrintOperationDefaultValues() {
}
public static NSPrintInfo sharedPrintInfo() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_sharedPrintInfo);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_sharedPrintInfo);
return result != 0 ? new NSPrintInfo(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintOperation.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintOperation.java
index 7468f1ac09..ea40ae655f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintOperation.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintOperation.java
@@ -16,7 +16,7 @@ public NSPrintOperation() {
super();
}
-public NSPrintOperation(int /*long*/ id) {
+public NSPrintOperation(long /*int*/ id) {
super(id);
}
@@ -29,12 +29,12 @@ public void cleanUpOperation() {
}
public NSGraphicsContext context() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_context);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_context);
return result != 0 ? new NSGraphicsContext(result) : null;
}
public NSGraphicsContext createContext() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_createContext);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_createContext);
return result != 0 ? new NSGraphicsContext(result) : null;
}
@@ -47,7 +47,7 @@ public void destroyContext() {
}
public static NSPrintOperation printOperationWithView(NSView view, NSPrintInfo printInfo) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSPrintOperation, OS.sel_printOperationWithView_printInfo_, view != null ? view.id : 0, printInfo != null ? printInfo.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSPrintOperation, OS.sel_printOperationWithView_printInfo_, view != null ? view.id : 0, printInfo != null ? printInfo.id : 0);
return result != 0 ? new NSPrintOperation(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintPanel.java
index 46440aec83..30071c4e94 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintPanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintPanel.java
@@ -16,7 +16,7 @@ public NSPrintPanel() {
super();
}
-public NSPrintPanel(int /*long*/ id) {
+public NSPrintPanel(long /*int*/ id) {
super(id);
}
@@ -24,24 +24,24 @@ public NSPrintPanel(id id) {
super(id);
}
-public void beginSheetWithPrintInfo(NSPrintInfo printInfo, NSWindow docWindow, id delegate, int /*long*/ didEndSelector, int /*long*/ contextInfo) {
+public void beginSheetWithPrintInfo(NSPrintInfo printInfo, NSWindow docWindow, id delegate, long /*int*/ didEndSelector, long /*int*/ contextInfo) {
OS.objc_msgSend(this.id, OS.sel_beginSheetWithPrintInfo_modalForWindow_delegate_didEndSelector_contextInfo_, printInfo != null ? printInfo.id : 0, docWindow != null ? docWindow.id : 0, delegate != null ? delegate.id : 0, didEndSelector, contextInfo);
}
-public int /*long*/ options() {
+public long /*int*/ options() {
return OS.objc_msgSend(this.id, OS.sel_options);
}
public static NSPrintPanel printPanel() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSPrintPanel, OS.sel_printPanel);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSPrintPanel, OS.sel_printPanel);
return result != 0 ? new NSPrintPanel(result) : null;
}
-public int /*long*/ runModalWithPrintInfo(NSPrintInfo printInfo) {
+public long /*int*/ runModalWithPrintInfo(NSPrintInfo printInfo) {
return OS.objc_msgSend(this.id, OS.sel_runModalWithPrintInfo_, printInfo != null ? printInfo.id : 0);
}
-public void setOptions(int /*long*/ options) {
+public void setOptions(long /*int*/ options) {
OS.objc_msgSend(this.id, OS.sel_setOptions_, options);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrinter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrinter.java
index 16be33739e..8feaf57b82 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrinter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrinter.java
@@ -16,7 +16,7 @@ public NSPrinter() {
super();
}
-public NSPrinter(int /*long*/ id) {
+public NSPrinter(long /*int*/ id) {
super(id);
}
@@ -25,17 +25,17 @@ public NSPrinter(id id) {
}
public NSString name() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_name);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_name);
return result != 0 ? new NSString(result) : null;
}
public static NSArray printerNames() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerNames);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerNames);
return result != 0 ? new NSArray(result) : null;
}
public static NSPrinter printerWithName(NSString name) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerWithName_, name != null ? name.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerWithName_, name != null ? name.id : 0);
return result != 0 ? new NSPrinter(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProgressIndicator.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProgressIndicator.java
index 7f1fd6bf0e..31f90b1863 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProgressIndicator.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProgressIndicator.java
@@ -16,7 +16,7 @@ public NSProgressIndicator() {
super();
}
-public NSProgressIndicator(int /*long*/ id) {
+public NSProgressIndicator(long /*int*/ id) {
super(id);
}
@@ -24,7 +24,7 @@ public NSProgressIndicator(id id) {
super(id);
}
-public int /*long*/ controlSize() {
+public long /*int*/ controlSize() {
return OS.objc_msgSend(this.id, OS.sel_controlSize);
}
@@ -40,7 +40,7 @@ public double minValue() {
return OS.objc_msgSend_fpret(this.id, OS.sel_minValue);
}
-public void setControlSize(int /*long*/ size) {
+public void setControlSize(long /*int*/ size) {
OS.objc_msgSend(this.id, OS.sel_setControlSize_, size);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java
index e6758c29c3..27a4a7da78 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java
@@ -11,7 +11,7 @@
package org.eclipse.swt.internal.cocoa;
public class NSRange {
- public int /*long*/ location;
- public int /*long*/ length;
+ public long /*int*/ location;
+ public long /*int*/ length;
public static int sizeof = OS.NSRange_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java
index 31a378b732..5b3c2b8b03 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java
@@ -13,13 +13,13 @@ package org.eclipse.swt.internal.cocoa;
public class NSRect {
/** @field accessor=origin.x */
- public float /*double*/ x;
+ public double /*float*/ x;
/** @field accessor=origin.y */
- public float /*double*/ y;
+ public double /*float*/ y;
/** @field accessor=size.width */
- public float /*double*/ width;
+ public double /*float*/ width;
/** @field accessor=size.height */
- public float /*double*/ height;
+ public double /*float*/ height;
public static final int sizeof = OS.NSRect_sizeof();
public String toString() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSResponder.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSResponder.java
index 7ef173ff4c..72cad86390 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSResponder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSResponder.java
@@ -16,7 +16,7 @@ public NSResponder() {
super();
}
-public NSResponder(int /*long*/ id) {
+public NSResponder(long /*int*/ id) {
super(id);
}
@@ -44,7 +44,7 @@ public void cursorUpdate(NSEvent event) {
OS.objc_msgSend(this.id, OS.sel_cursorUpdate_, event != null ? event.id : 0);
}
-public void doCommandBySelector(int /*long*/ aSelector) {
+public void doCommandBySelector(long /*int*/ aSelector) {
OS.objc_msgSend(this.id, OS.sel_doCommandBySelector_, aSelector);
}
@@ -116,7 +116,7 @@ public void moveUp(id sender) {
OS.objc_msgSend(this.id, OS.sel_moveUp_, sender != null ? sender.id : 0);
}
-public void noResponderFor(int /*long*/ eventSelector) {
+public void noResponderFor(long /*int*/ eventSelector) {
OS.objc_msgSend(this.id, OS.sel_noResponderFor_, eventSelector);
}
@@ -189,12 +189,12 @@ public void touchesMovedWithEvent(NSEvent event) {
}
public NSUndoManager undoManager() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_undoManager);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_undoManager);
return result != 0 ? new NSUndoManager(result) : null;
}
public id validRequestorForSendType(NSString sendType, NSString returnType) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_validRequestorForSendType_returnType_, sendType != null ? sendType.id : 0, returnType != null ? returnType.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_validRequestorForSendType_returnType_, sendType != null ? sendType.id : 0, returnType != null ? returnType.id : 0);
return result != 0 ? new id(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRunLoop.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRunLoop.java
index 20b95c118e..06870fda3d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRunLoop.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRunLoop.java
@@ -16,7 +16,7 @@ public NSRunLoop() {
super();
}
-public NSRunLoop(int /*long*/ id) {
+public NSRunLoop(long /*int*/ id) {
super(id);
}
@@ -29,12 +29,12 @@ public void addTimer(NSTimer timer, NSString mode) {
}
public static NSRunLoop currentRunLoop() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSRunLoop, OS.sel_currentRunLoop);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSRunLoop, OS.sel_currentRunLoop);
return result != 0 ? new NSRunLoop(result) : null;
}
public static NSRunLoop mainRunLoop() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSRunLoop, OS.sel_mainRunLoop);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSRunLoop, OS.sel_mainRunLoop);
return result != 0 ? new NSRunLoop(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSavePanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSavePanel.java
index abd433f928..6a3adf9cc7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSavePanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSavePanel.java
@@ -16,7 +16,7 @@ public NSSavePanel() {
super();
}
-public NSSavePanel(int /*long*/ id) {
+public NSSavePanel(long /*int*/ id) {
super(id);
}
@@ -25,20 +25,20 @@ public NSSavePanel(id id) {
}
public NSString filename() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_filename);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_filename);
return result != 0 ? new NSString(result) : null;
}
-public int /*long*/ runModal() {
+public long /*int*/ runModal() {
return OS.objc_msgSend(this.id, OS.sel_runModal);
}
-public int /*long*/ runModalForDirectory(NSString path, NSString name) {
+public long /*int*/ runModalForDirectory(NSString path, NSString name) {
return OS.objc_msgSend(this.id, OS.sel_runModalForDirectory_file_, path != null ? path.id : 0, name != null ? name.id : 0);
}
public static NSSavePanel savePanel() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSSavePanel, OS.sel_savePanel);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSSavePanel, OS.sel_savePanel);
return result != 0 ? new NSSavePanel(result) : null;
}
@@ -66,11 +66,11 @@ public void validateVisibleColumns() {
OS.objc_msgSend(this.id, OS.sel_validateVisibleColumns);
}
-public static float /*double*/ minFrameWidthWithTitle(NSString aTitle, int /*long*/ aStyle) {
- return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSSavePanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+public static double /*float*/ minFrameWidthWithTitle(NSString aTitle, long /*int*/ aStyle) {
+ return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSSavePanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
}
-public static int /*long*/ windowNumberAtPoint(NSPoint point, int /*long*/ windowNumber) {
+public static long /*int*/ windowNumberAtPoint(NSPoint point, long /*int*/ windowNumber) {
return OS.objc_msgSend(OS.class_NSSavePanel, OS.sel_windowNumberAtPoint_belowWindowWithWindowNumber_, point, windowNumber);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScreen.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScreen.java
index ec04eff32f..4bae3a6527 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScreen.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScreen.java
@@ -16,7 +16,7 @@ public NSScreen() {
super();
}
-public NSScreen(int /*long*/ id) {
+public NSScreen(long /*int*/ id) {
super(id);
}
@@ -29,7 +29,7 @@ public int depth() {
}
public NSDictionary deviceDescription() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_deviceDescription);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_deviceDescription);
return result != 0 ? new NSDictionary(result) : null;
}
@@ -40,17 +40,17 @@ public NSRect frame() {
}
public static NSScreen mainScreen() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSScreen, OS.sel_mainScreen);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSScreen, OS.sel_mainScreen);
return result != 0 ? new NSScreen(result) : null;
}
public static NSArray screens() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSScreen, OS.sel_screens);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSScreen, OS.sel_screens);
return result != 0 ? new NSArray(result) : null;
}
-public float /*double*/ userSpaceScaleFactor() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_userSpaceScaleFactor);
+public double /*float*/ userSpaceScaleFactor() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_userSpaceScaleFactor);
}
public NSRect visibleFrame() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java
index ba695d8966..222fb198da 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java
@@ -16,7 +16,7 @@ public NSScrollView() {
super();
}
-public NSScrollView(int /*long*/ id) {
+public NSScrollView(long /*int*/ id) {
super(id);
}
@@ -30,19 +30,19 @@ public NSSize contentSize() {
return result;
}
-public static NSSize contentSizeForFrameSize(NSSize fSize, boolean hFlag, boolean vFlag, int /*long*/ aType) {
+public static NSSize contentSizeForFrameSize(NSSize fSize, boolean hFlag, boolean vFlag, long /*int*/ aType) {
NSSize result = new NSSize();
OS.objc_msgSend_stret(result, OS.class_NSScrollView, OS.sel_contentSizeForFrameSize_hasHorizontalScroller_hasVerticalScroller_borderType_, fSize, hFlag, vFlag, aType);
return result;
}
public NSClipView contentView() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_contentView);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_contentView);
return result != 0 ? new NSClipView(result) : null;
}
public NSView documentView() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_documentView);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_documentView);
return result != 0 ? new NSView(result) : null;
}
@@ -52,7 +52,7 @@ public NSRect documentVisibleRect() {
return result;
}
-public static NSSize frameSizeForContentSize(NSSize cSize, boolean hFlag, boolean vFlag, int /*long*/ aType) {
+public static NSSize frameSizeForContentSize(NSSize cSize, boolean hFlag, boolean vFlag, long /*int*/ aType) {
NSSize result = new NSSize();
OS.objc_msgSend_stret(result, OS.class_NSScrollView, OS.sel_frameSizeForContentSize_hasHorizontalScroller_hasVerticalScroller_borderType_, cSize, hFlag, vFlag, aType);
return result;
@@ -66,7 +66,7 @@ public void setAutohidesScrollers(boolean flag) {
OS.objc_msgSend(this.id, OS.sel_setAutohidesScrollers_, flag);
}
-public void setBorderType(int /*long*/ aType) {
+public void setBorderType(long /*int*/ aType) {
OS.objc_msgSend(this.id, OS.sel_setBorderType_, aType);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScroller.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScroller.java
index d16367321d..e6268f0db2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScroller.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScroller.java
@@ -16,7 +16,7 @@ public NSScroller() {
super();
}
-public NSScroller(int /*long*/ id) {
+public NSScroller(long /*int*/ id) {
super(id);
}
@@ -24,49 +24,49 @@ public NSScroller(id id) {
super(id);
}
-public int /*long*/ controlSize() {
+public long /*int*/ controlSize() {
return OS.objc_msgSend(this.id, OS.sel_controlSize);
}
-public int /*long*/ hitPart() {
+public long /*int*/ hitPart() {
return OS.objc_msgSend(this.id, OS.sel_hitPart);
}
-public float /*double*/ knobProportion() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_knobProportion);
+public double /*float*/ knobProportion() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_knobProportion);
}
-public NSRect rectForPart(int /*long*/ partCode) {
+public NSRect rectForPart(long /*int*/ partCode) {
NSRect result = new NSRect();
OS.objc_msgSend_stret(result, this.id, OS.sel_rectForPart_, partCode);
return result;
}
-public static float /*double*/ scrollerWidth() {
- return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSScroller, OS.sel_scrollerWidth);
+public static double /*float*/ scrollerWidth() {
+ return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSScroller, OS.sel_scrollerWidth);
}
-public static float /*double*/ scrollerWidthForControlSize(int /*long*/ controlSize) {
- return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSScroller, OS.sel_scrollerWidthForControlSize_, controlSize);
+public static double /*float*/ scrollerWidthForControlSize(long /*int*/ controlSize) {
+ return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSScroller, OS.sel_scrollerWidthForControlSize_, controlSize);
}
-public void setControlSize(int /*long*/ controlSize) {
+public void setControlSize(long /*int*/ controlSize) {
OS.objc_msgSend(this.id, OS.sel_setControlSize_, controlSize);
}
-public void setKnobProportion(float /*double*/ proportion) {
+public void setKnobProportion(double /*float*/ proportion) {
OS.objc_msgSend(this.id, OS.sel_setKnobProportion_, proportion);
}
-public int /*long*/ testPart(NSPoint thePoint) {
+public long /*int*/ testPart(NSPoint thePoint) {
return OS.objc_msgSend(this.id, OS.sel_testPart_, thePoint);
}
-public static int /*long*/ cellClass() {
+public static long /*int*/ cellClass() {
return OS.objc_msgSend(OS.class_NSScroller, OS.sel_cellClass);
}
-public static void setCellClass(int /*long*/ factoryId) {
+public static void setCellClass(long /*int*/ factoryId) {
OS.objc_msgSend(OS.class_NSScroller, OS.sel_setCellClass_, factoryId);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchField.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchField.java
index d13e0df24e..698e9e191d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchField.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchField.java
@@ -16,7 +16,7 @@ public NSSearchField() {
super();
}
-public NSSearchField(int /*long*/ id) {
+public NSSearchField(long /*int*/ id) {
super(id);
}
@@ -25,15 +25,15 @@ public NSSearchField(id id) {
}
public NSArray recentSearches() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_recentSearches);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_recentSearches);
return result != 0 ? new NSArray(result) : null;
}
-public static int /*long*/ cellClass() {
+public static long /*int*/ cellClass() {
return OS.objc_msgSend(OS.class_NSSearchField, OS.sel_cellClass);
}
-public static void setCellClass(int /*long*/ factoryId) {
+public static void setCellClass(long /*int*/ factoryId) {
OS.objc_msgSend(OS.class_NSSearchField, OS.sel_setCellClass_, factoryId);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchFieldCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchFieldCell.java
index 8829bf0eb3..4f006636dd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchFieldCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchFieldCell.java
@@ -16,7 +16,7 @@ public NSSearchFieldCell() {
super();
}
-public NSSearchFieldCell(int /*long*/ id) {
+public NSSearchFieldCell(long /*int*/ id) {
super(id);
}
@@ -25,12 +25,12 @@ public NSSearchFieldCell(id id) {
}
public NSButtonCell cancelButtonCell() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_cancelButtonCell);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_cancelButtonCell);
return result != 0 ? new NSButtonCell(result) : null;
}
public NSButtonCell searchButtonCell() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_searchButtonCell);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_searchButtonCell);
return result != 0 ? new NSButtonCell(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSecureTextField.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSecureTextField.java
index 58fe71687f..c5bc78756e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSecureTextField.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSecureTextField.java
@@ -16,7 +16,7 @@ public NSSecureTextField() {
super();
}
-public NSSecureTextField(int /*long*/ id) {
+public NSSecureTextField(long /*int*/ id) {
super(id);
}
@@ -24,11 +24,11 @@ public NSSecureTextField(id id) {
super(id);
}
-public static int /*long*/ cellClass() {
+public static long /*int*/ cellClass() {
return OS.objc_msgSend(OS.class_NSSecureTextField, OS.sel_cellClass);
}
-public static void setCellClass(int /*long*/ factoryId) {
+public static void setCellClass(long /*int*/ factoryId) {
OS.objc_msgSend(OS.class_NSSecureTextField, OS.sel_setCellClass_, factoryId);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedCell.java
index 26a7d166e3..13a59cff68 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedCell.java
@@ -16,7 +16,7 @@ public NSSegmentedCell() {
super();
}
-public NSSegmentedCell(int /*long*/ id) {
+public NSSegmentedCell(long /*int*/ id) {
super(id);
}
@@ -24,51 +24,51 @@ public NSSegmentedCell(id id) {
super(id);
}
-public void setEnabled(boolean enabled, int /*long*/ segment) {
+public void setEnabled(boolean enabled, long /*int*/ segment) {
OS.objc_msgSend(this.id, OS.sel_setEnabled_forSegment_, enabled, segment);
}
-public void setImage(NSImage image, int /*long*/ segment) {
+public void setImage(NSImage image, long /*int*/ segment) {
OS.objc_msgSend(this.id, OS.sel_setImage_forSegment_, image != null ? image.id : 0, segment);
}
-public void setLabel(NSString label, int /*long*/ segment) {
+public void setLabel(NSString label, long /*int*/ segment) {
OS.objc_msgSend(this.id, OS.sel_setLabel_forSegment_, label != null ? label.id : 0, segment);
}
-public void setMenu(NSMenu menu, int /*long*/ segment) {
+public void setMenu(NSMenu menu, long /*int*/ segment) {
OS.objc_msgSend(this.id, OS.sel_setMenu_forSegment_, menu != null ? menu.id : 0, segment);
}
-public void setSegmentCount(int /*long*/ count) {
+public void setSegmentCount(long /*int*/ count) {
OS.objc_msgSend(this.id, OS.sel_setSegmentCount_, count);
}
-public void setSegmentStyle(int /*long*/ segmentStyle) {
+public void setSegmentStyle(long /*int*/ segmentStyle) {
OS.objc_msgSend(this.id, OS.sel_setSegmentStyle_, segmentStyle);
}
-public void setSelected(boolean selected, int /*long*/ segment) {
+public void setSelected(boolean selected, long /*int*/ segment) {
OS.objc_msgSend(this.id, OS.sel_setSelected_forSegment_, selected, segment);
}
-public void setSelectedSegment(int /*long*/ selectedSegment) {
+public void setSelectedSegment(long /*int*/ selectedSegment) {
OS.objc_msgSend(this.id, OS.sel_setSelectedSegment_, selectedSegment);
}
-public void setTag(int /*long*/ tag, int /*long*/ segment) {
+public void setTag(long /*int*/ tag, long /*int*/ segment) {
OS.objc_msgSend(this.id, OS.sel_setTag_forSegment_, tag, segment);
}
-public void setToolTip(NSString toolTip, int /*long*/ segment) {
+public void setToolTip(NSString toolTip, long /*int*/ segment) {
OS.objc_msgSend(this.id, OS.sel_setToolTip_forSegment_, toolTip != null ? toolTip.id : 0, segment);
}
-public void setTrackingMode(int /*long*/ trackingMode) {
+public void setTrackingMode(long /*int*/ trackingMode) {
OS.objc_msgSend(this.id, OS.sel_setTrackingMode_, trackingMode);
}
-public void setWidth(float /*double*/ width, int /*long*/ segment) {
+public void setWidth(double /*float*/ width, long /*int*/ segment) {
OS.objc_msgSend(this.id, OS.sel_setWidth_forSegment_, width, segment);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSet.java
index 998b521d88..2930308e17 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSet.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSet.java
@@ -16,7 +16,7 @@ public NSSet() {
super();
}
-public NSSet(int /*long*/ id) {
+public NSSet(long /*int*/ id) {
super(id);
}
@@ -25,21 +25,21 @@ public NSSet(id id) {
}
public NSArray allObjects() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_allObjects);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_allObjects);
return result != 0 ? new NSArray(result) : null;
}
-public int /*long*/ count() {
+public long /*int*/ count() {
return OS.objc_msgSend(this.id, OS.sel_count);
}
public NSEnumerator objectEnumerator() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator);
return result != 0 ? new NSEnumerator(result) : null;
}
public static NSSet set() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSSet, OS.sel_set);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSSet, OS.sel_set);
return result != 0 ? new NSSet(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java
index 9be69e93fc..a14d5e3d62 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java
@@ -13,8 +13,8 @@ package org.eclipse.swt.internal.cocoa;
public class NSSize {
- public float /*double*/ width;
- public float /*double*/ height;
+ public double /*float*/ width;
+ public double /*float*/ height;
public static final int sizeof = OS.NSSize_sizeof();
public String toString() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSlider.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSlider.java
index 4882423062..4a3c98e24a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSlider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSlider.java
@@ -16,7 +16,7 @@ public NSSlider() {
super();
}
-public NSSlider(int /*long*/ id) {
+public NSSlider(long /*int*/ id) {
super(id);
}
@@ -24,8 +24,8 @@ public NSSlider(id id) {
super(id);
}
-public float /*double*/ knobThickness() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_knobThickness);
+public double /*float*/ knobThickness() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_knobThickness);
}
public double maxValue() {
@@ -44,11 +44,11 @@ public void setMinValue(double aDouble) {
OS.objc_msgSend(this.id, OS.sel_setMinValue_, aDouble);
}
-public static int /*long*/ cellClass() {
+public static long /*int*/ cellClass() {
return OS.objc_msgSend(OS.class_NSSlider, OS.sel_cellClass);
}
-public static void setCellClass(int /*long*/ factoryId) {
+public static void setCellClass(long /*int*/ factoryId) {
OS.objc_msgSend(OS.class_NSSlider, OS.sel_setCellClass_, factoryId);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusBar.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusBar.java
index 6735c39516..9ea9f14123 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusBar.java
@@ -16,7 +16,7 @@ public NSStatusBar() {
super();
}
-public NSStatusBar(int /*long*/ id) {
+public NSStatusBar(long /*int*/ id) {
super(id);
}
@@ -28,18 +28,18 @@ public void removeStatusItem(NSStatusItem item) {
OS.objc_msgSend(this.id, OS.sel_removeStatusItem_, item != null ? item.id : 0);
}
-public NSStatusItem statusItemWithLength(float /*double*/ length) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_statusItemWithLength_, length);
+public NSStatusItem statusItemWithLength(double /*float*/ length) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_statusItemWithLength_, length);
return result != 0 ? new NSStatusItem(result) : null;
}
public static NSStatusBar systemStatusBar() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSStatusBar, OS.sel_systemStatusBar);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSStatusBar, OS.sel_systemStatusBar);
return result != 0 ? new NSStatusBar(result) : null;
}
-public float /*double*/ thickness() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_thickness);
+public double /*float*/ thickness() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_thickness);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusItem.java
index 0b5f65cbb1..e4e4d75eaa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusItem.java
@@ -16,7 +16,7 @@ public NSStatusItem() {
super();
}
-public NSStatusItem(int /*long*/ id) {
+public NSStatusItem(long /*int*/ id) {
super(id);
}
@@ -36,7 +36,7 @@ public void setHighlightMode(boolean highlightMode) {
OS.objc_msgSend(this.id, OS.sel_setHighlightMode_, highlightMode);
}
-public void setLength(float /*double*/ length) {
+public void setLength(double /*float*/ length) {
OS.objc_msgSend(this.id, OS.sel_setLength_, length);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStepper.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStepper.java
index f3b8d78d39..4d2b612c88 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStepper.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStepper.java
@@ -16,7 +16,7 @@ public NSStepper() {
super();
}
-public NSStepper(int /*long*/ id) {
+public NSStepper(long /*int*/ id) {
super(id);
}
@@ -52,11 +52,11 @@ public void setValueWraps(boolean valueWraps) {
OS.objc_msgSend(this.id, OS.sel_setValueWraps_, valueWraps);
}
-public static int /*long*/ cellClass() {
+public static long /*int*/ cellClass() {
return OS.objc_msgSend(OS.class_NSStepper, OS.sel_cellClass);
}
-public static void setCellClass(int /*long*/ factoryId) {
+public static void setCellClass(long /*int*/ factoryId) {
OS.objc_msgSend(OS.class_NSStepper, OS.sel_setCellClass_, factoryId);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java
index ed953f8a9c..abf81f2475 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java
@@ -16,7 +16,7 @@ public NSString() {
super();
}
-public NSString(int /*long*/ id) {
+public NSString(long /*int*/ id) {
super(id);
}
@@ -42,19 +42,19 @@ public static NSString stringWith(String str) {
return stringWithCharacters(buffer, buffer.length);
}
-public int /*long*/ UTF8String() {
+public long /*int*/ UTF8String() {
return OS.objc_msgSend(this.id, OS.sel_UTF8String);
}
-public int /*long*/ characterAtIndex(int /*long*/ index) {
+public long /*int*/ characterAtIndex(long /*int*/ index) {
return OS.objc_msgSend(this.id, OS.sel_characterAtIndex_, index);
}
-public int /*long*/ compare(NSString string) {
+public long /*int*/ compare(NSString string) {
return OS.objc_msgSend(this.id, OS.sel_compare_, string != null ? string.id : 0);
}
-public int /*long*/ fileSystemRepresentation() {
+public long /*int*/ fileSystemRepresentation() {
return OS.objc_msgSend(this.id, OS.sel_fileSystemRepresentation);
}
@@ -66,8 +66,8 @@ public void getCharacters(char[] buffer, NSRange aRange) {
OS.objc_msgSend(this.id, OS.sel_getCharacters_range_, buffer, aRange);
}
-public NSString initWithCharacters(char[] characters, int /*long*/ length) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithCharacters_length_, characters, length);
+public NSString initWithCharacters(char[] characters, long /*int*/ length) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithCharacters_length_, characters, length);
return result == this.id ? this : (result != 0 ? new NSString(result) : null);
}
@@ -76,81 +76,81 @@ public boolean isEqualToString(NSString aString) {
}
public NSString lastPathComponent() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_lastPathComponent);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_lastPathComponent);
return result == this.id ? this : (result != 0 ? new NSString(result) : null);
}
-public int /*long*/ length() {
+public long /*int*/ length() {
return OS.objc_msgSend(this.id, OS.sel_length);
}
public NSString lowercaseString() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_lowercaseString);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_lowercaseString);
return result == this.id ? this : (result != 0 ? new NSString(result) : null);
}
public NSString pathExtension() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_pathExtension);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_pathExtension);
return result == this.id ? this : (result != 0 ? new NSString(result) : null);
}
public static NSString string() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSString, OS.sel_string);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSString, OS.sel_string);
return result != 0 ? new NSString(result) : null;
}
-public NSString stringByAddingPercentEscapesUsingEncoding(int /*long*/ enc) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_stringByAddingPercentEscapesUsingEncoding_, enc);
+public NSString stringByAddingPercentEscapesUsingEncoding(long /*int*/ enc) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringByAddingPercentEscapesUsingEncoding_, enc);
return result == this.id ? this : (result != 0 ? new NSString(result) : null);
}
public NSString stringByAppendingPathComponent(NSString str) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_stringByAppendingPathComponent_, str != null ? str.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringByAppendingPathComponent_, str != null ? str.id : 0);
return result == this.id ? this : (result != 0 ? new NSString(result) : null);
}
public NSString stringByAppendingPathExtension(NSString str) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_stringByAppendingPathExtension_, str != null ? str.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringByAppendingPathExtension_, str != null ? str.id : 0);
return result == this.id ? this : (result != 0 ? new NSString(result) : null);
}
public NSString stringByAppendingString(NSString aString) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_stringByAppendingString_, aString != null ? aString.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringByAppendingString_, aString != null ? aString.id : 0);
return result == this.id ? this : (result != 0 ? new NSString(result) : null);
}
public NSString stringByDeletingLastPathComponent() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_stringByDeletingLastPathComponent);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringByDeletingLastPathComponent);
return result == this.id ? this : (result != 0 ? new NSString(result) : null);
}
public NSString stringByDeletingPathExtension() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_stringByDeletingPathExtension);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringByDeletingPathExtension);
return result == this.id ? this : (result != 0 ? new NSString(result) : null);
}
public NSString stringByReplacingOccurrencesOfString(NSString target, NSString replacement) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_stringByReplacingOccurrencesOfString_withString_, target != null ? target.id : 0, replacement != null ? replacement.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringByReplacingOccurrencesOfString_withString_, target != null ? target.id : 0, replacement != null ? replacement.id : 0);
return result == this.id ? this : (result != 0 ? new NSString(result) : null);
}
-public NSString stringByReplacingPercentEscapesUsingEncoding(int /*long*/ enc) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_stringByReplacingPercentEscapesUsingEncoding_, enc);
+public NSString stringByReplacingPercentEscapesUsingEncoding(long /*int*/ enc) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringByReplacingPercentEscapesUsingEncoding_, enc);
return result == this.id ? this : (result != 0 ? new NSString(result) : null);
}
-public static NSString stringWithCharacters(char[] characters, int /*long*/ length) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithCharacters_length_, characters, length);
+public static NSString stringWithCharacters(char[] characters, long /*int*/ length) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithCharacters_length_, characters, length);
return result != 0 ? new NSString(result) : null;
}
public static NSString stringWithFormat(NSString format) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithFormat_, format != null ? format.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithFormat_, format != null ? format.id : 0);
return result != 0 ? new NSString(result) : null;
}
-public static NSString stringWithUTF8String(int /*long*/ nullTerminatedCString) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithUTF8String_, nullTerminatedCString);
+public static NSString stringWithUTF8String(long /*int*/ nullTerminatedCString) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithUTF8String_, nullTerminatedCString);
return result != 0 ? new NSString(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabView.java
index 2f7a9a22f0..c38f8a4c97 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabView.java
@@ -16,7 +16,7 @@ public NSTabView() {
super();
}
-public NSTabView(int /*long*/ id) {
+public NSTabView(long /*int*/ id) {
super(id);
}
@@ -34,7 +34,7 @@ public NSRect contentRect() {
return result;
}
-public void insertTabViewItem(NSTabViewItem tabViewItem, int /*long*/ index) {
+public void insertTabViewItem(NSTabViewItem tabViewItem, long /*int*/ index) {
OS.objc_msgSend(this.id, OS.sel_insertTabViewItem_atIndex_, tabViewItem != null ? tabViewItem.id : 0, index);
}
@@ -48,16 +48,16 @@ public void removeTabViewItem(NSTabViewItem tabViewItem) {
OS.objc_msgSend(this.id, OS.sel_removeTabViewItem_, tabViewItem != null ? tabViewItem.id : 0);
}
-public void selectTabViewItemAtIndex(int /*long*/ index) {
+public void selectTabViewItemAtIndex(long /*int*/ index) {
OS.objc_msgSend(this.id, OS.sel_selectTabViewItemAtIndex_, index);
}
public NSTabViewItem selectedTabViewItem() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_selectedTabViewItem);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_selectedTabViewItem);
return result != 0 ? new NSTabViewItem(result) : null;
}
-public void setControlSize(int /*long*/ controlSize) {
+public void setControlSize(long /*int*/ controlSize) {
OS.objc_msgSend(this.id, OS.sel_setControlSize_, controlSize);
}
@@ -69,12 +69,12 @@ public void setFont(NSFont font) {
OS.objc_msgSend(this.id, OS.sel_setFont_, font != null ? font.id : 0);
}
-public void setTabViewType(int /*long*/ tabViewType) {
+public void setTabViewType(long /*int*/ tabViewType) {
OS.objc_msgSend(this.id, OS.sel_setTabViewType_, tabViewType);
}
public NSTabViewItem tabViewItemAtPoint(NSPoint point) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_tabViewItemAtPoint_, point);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_tabViewItemAtPoint_, point);
return result != 0 ? new NSTabViewItem(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabViewItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabViewItem.java
index 41d644561c..0c8afa8ac7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabViewItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabViewItem.java
@@ -16,7 +16,7 @@ public NSTabViewItem() {
super();
}
-public NSTabViewItem(int /*long*/ id) {
+public NSTabViewItem(long /*int*/ id) {
super(id);
}
@@ -29,7 +29,7 @@ public void drawLabel(boolean shouldTruncateLabel, NSRect labelRect) {
}
public id initWithIdentifier(id identifier) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0);
return result != 0 ? new id(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java
index 42f92ebafc..935720601d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java
@@ -16,7 +16,7 @@ public NSTableColumn() {
super();
}
-public NSTableColumn(int /*long*/ id) {
+public NSTableColumn(long /*int*/ id) {
super(id);
}
@@ -25,21 +25,21 @@ public NSTableColumn(id id) {
}
public NSCell dataCell() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_dataCell);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_dataCell);
return result != 0 ? new NSCell(result) : null;
}
public NSTableHeaderCell headerCell() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_headerCell);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_headerCell);
return result != 0 ? new NSTableHeaderCell(result) : null;
}
public NSTableColumn initWithIdentifier(NSString identifier) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0);
return result == this.id ? this : (result != 0 ? new NSTableColumn(result) : null);
}
-public int /*long*/ resizingMask() {
+public long /*int*/ resizingMask() {
return OS.objc_msgSend(this.id, OS.sel_resizingMask);
}
@@ -59,20 +59,20 @@ public void setIdentifier(NSString identifier) {
OS.objc_msgSend(this.id, OS.sel_setIdentifier_, identifier != null ? identifier.id : 0);
}
-public void setMinWidth(float /*double*/ minWidth) {
+public void setMinWidth(double /*float*/ minWidth) {
OS.objc_msgSend(this.id, OS.sel_setMinWidth_, minWidth);
}
-public void setResizingMask(int /*long*/ resizingMask) {
+public void setResizingMask(long /*int*/ resizingMask) {
OS.objc_msgSend(this.id, OS.sel_setResizingMask_, resizingMask);
}
-public void setWidth(float /*double*/ width) {
+public void setWidth(double /*float*/ width) {
OS.objc_msgSend(this.id, OS.sel_setWidth_, width);
}
-public float /*double*/ width() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_width);
+public double /*float*/ width() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_width);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderCell.java
index 1b6b109f4b..284826f120 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderCell.java
@@ -16,7 +16,7 @@ public NSTableHeaderCell() {
super();
}
-public NSTableHeaderCell(int /*long*/ id) {
+public NSTableHeaderCell(long /*int*/ id) {
super(id);
}
@@ -24,7 +24,7 @@ public NSTableHeaderCell(id id) {
super(id);
}
-public void drawSortIndicatorWithFrame(NSRect cellFrame, NSView controlView, boolean ascending, int /*long*/ priority) {
+public void drawSortIndicatorWithFrame(NSRect cellFrame, NSView controlView, boolean ascending, long /*int*/ priority) {
OS.objc_msgSend(this.id, OS.sel_drawSortIndicatorWithFrame_inView_ascending_priority_, cellFrame, controlView != null ? controlView.id : 0, ascending, priority);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderView.java
index b3b5d16d08..b22a7bb535 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderView.java
@@ -16,7 +16,7 @@ public NSTableHeaderView() {
super();
}
-public NSTableHeaderView(int /*long*/ id) {
+public NSTableHeaderView(long /*int*/ id) {
super(id);
}
@@ -24,11 +24,11 @@ public NSTableHeaderView(id id) {
super(id);
}
-public int /*long*/ columnAtPoint(NSPoint point) {
+public long /*int*/ columnAtPoint(NSPoint point) {
return OS.objc_msgSend(this.id, OS.sel_columnAtPoint_, point);
}
-public NSRect headerRectOfColumn(int /*long*/ column) {
+public NSRect headerRectOfColumn(long /*int*/ column) {
NSRect result = new NSRect();
OS.objc_msgSend_stret(result, this.id, OS.sel_headerRectOfColumn_, column);
return result;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java
index 0f1de0b7d3..d10381a5db 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java
@@ -16,7 +16,7 @@ public NSTableView() {
super();
}
-public NSTableView(int /*long*/ id) {
+public NSTableView(long /*int*/ id) {
super(id);
}
@@ -36,24 +36,24 @@ public boolean canDragRowsWithIndexes(NSIndexSet rowIndexes, NSPoint mouseDownPo
return OS.objc_msgSend_bool(this.id, OS.sel_canDragRowsWithIndexes_atPoint_, rowIndexes != null ? rowIndexes.id : 0, mouseDownPoint);
}
-public int /*long*/ clickedColumn() {
+public long /*int*/ clickedColumn() {
return OS.objc_msgSend(this.id, OS.sel_clickedColumn);
}
-public int /*long*/ clickedRow() {
+public long /*int*/ clickedRow() {
return OS.objc_msgSend(this.id, OS.sel_clickedRow);
}
-public int /*long*/ columnAtPoint(NSPoint point) {
+public long /*int*/ columnAtPoint(NSPoint point) {
return OS.objc_msgSend(this.id, OS.sel_columnAtPoint_, point);
}
public NSIndexSet columnIndexesInRect(NSRect rect) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_columnIndexesInRect_, rect);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_columnIndexesInRect_, rect);
return result != 0 ? new NSIndexSet(result) : null;
}
-public int /*long*/ columnWithIdentifier(NSString identifier) {
+public long /*int*/ columnWithIdentifier(NSString identifier) {
return OS.objc_msgSend(this.id, OS.sel_columnWithIdentifier_, identifier != null ? identifier.id : 0);
}
@@ -61,12 +61,12 @@ public void deselectAll(id sender) {
OS.objc_msgSend(this.id, OS.sel_deselectAll_, sender != null ? sender.id : 0);
}
-public void deselectRow(int /*long*/ row) {
+public void deselectRow(long /*int*/ row) {
OS.objc_msgSend(this.id, OS.sel_deselectRow_, row);
}
-public NSImage dragImageForRowsWithIndexes(NSIndexSet dragRows, NSArray tableColumns, NSEvent dragEvent, int /*long*/ dragImageOffset) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_dragImageForRowsWithIndexes_tableColumns_event_offset_, dragRows != null ? dragRows.id : 0, tableColumns != null ? tableColumns.id : 0, dragEvent != null ? dragEvent.id : 0, dragImageOffset);
+public NSImage dragImageForRowsWithIndexes(NSIndexSet dragRows, NSArray tableColumns, NSEvent dragEvent, long /*int*/ dragImageOffset) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_dragImageForRowsWithIndexes_tableColumns_event_offset_, dragRows != null ? dragRows.id : 0, tableColumns != null ? tableColumns.id : 0, dragEvent != null ? dragEvent.id : 0, dragImageOffset);
return result != 0 ? new NSImage(result) : null;
}
@@ -74,14 +74,14 @@ public void drawBackgroundInClipRect(NSRect clipRect) {
OS.objc_msgSend(this.id, OS.sel_drawBackgroundInClipRect_, clipRect);
}
-public NSRect frameOfCellAtColumn(int /*long*/ column, int /*long*/ row) {
+public NSRect frameOfCellAtColumn(long /*int*/ column, long /*int*/ row) {
NSRect result = new NSRect();
OS.objc_msgSend_stret(result, this.id, OS.sel_frameOfCellAtColumn_row_, column, row);
return result;
}
public NSTableHeaderView headerView() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_headerView);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_headerView);
return result != 0 ? new NSTableHeaderView(result) : null;
}
@@ -95,11 +95,11 @@ public NSSize intercellSpacing() {
return result;
}
-public boolean isRowSelected(int /*long*/ row) {
+public boolean isRowSelected(long /*int*/ row) {
return OS.objc_msgSend_bool(this.id, OS.sel_isRowSelected_, row);
}
-public void moveColumn(int /*long*/ column, int /*long*/ newIndex) {
+public void moveColumn(long /*int*/ column, long /*int*/ newIndex) {
OS.objc_msgSend(this.id, OS.sel_moveColumn_toColumn_, column, newIndex);
}
@@ -107,30 +107,30 @@ public void noteNumberOfRowsChanged() {
OS.objc_msgSend(this.id, OS.sel_noteNumberOfRowsChanged);
}
-public int /*long*/ numberOfColumns() {
+public long /*int*/ numberOfColumns() {
return OS.objc_msgSend(this.id, OS.sel_numberOfColumns);
}
-public int /*long*/ numberOfRows() {
+public long /*int*/ numberOfRows() {
return OS.objc_msgSend(this.id, OS.sel_numberOfRows);
}
-public int /*long*/ numberOfSelectedRows() {
+public long /*int*/ numberOfSelectedRows() {
return OS.objc_msgSend(this.id, OS.sel_numberOfSelectedRows);
}
-public NSCell preparedCellAtColumn(int /*long*/ column, int /*long*/ row) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_preparedCellAtColumn_row_, column, row);
+public NSCell preparedCellAtColumn(long /*int*/ column, long /*int*/ row) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_preparedCellAtColumn_row_, column, row);
return result != 0 ? new NSCell(result) : null;
}
-public NSRect rectOfColumn(int /*long*/ column) {
+public NSRect rectOfColumn(long /*int*/ column) {
NSRect result = new NSRect();
OS.objc_msgSend_stret(result, this.id, OS.sel_rectOfColumn_, column);
return result;
}
-public NSRect rectOfRow(int /*long*/ row) {
+public NSRect rectOfRow(long /*int*/ row) {
NSRect result = new NSRect();
OS.objc_msgSend_stret(result, this.id, OS.sel_rectOfRow_, row);
return result;
@@ -144,12 +144,12 @@ public void removeTableColumn(NSTableColumn column) {
OS.objc_msgSend(this.id, OS.sel_removeTableColumn_, column != null ? column.id : 0);
}
-public int /*long*/ rowAtPoint(NSPoint point) {
+public long /*int*/ rowAtPoint(NSPoint point) {
return OS.objc_msgSend(this.id, OS.sel_rowAtPoint_, point);
}
-public float /*double*/ rowHeight() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_rowHeight);
+public double /*float*/ rowHeight() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_rowHeight);
}
public NSRange rowsInRect(NSRect rect) {
@@ -158,11 +158,11 @@ public NSRange rowsInRect(NSRect rect) {
return result;
}
-public void scrollColumnToVisible(int /*long*/ column) {
+public void scrollColumnToVisible(long /*int*/ column) {
OS.objc_msgSend(this.id, OS.sel_scrollColumnToVisible_, column);
}
-public void scrollRowToVisible(int /*long*/ row) {
+public void scrollRowToVisible(long /*int*/ row) {
OS.objc_msgSend(this.id, OS.sel_scrollRowToVisible_, row);
}
@@ -174,12 +174,12 @@ public void selectRowIndexes(NSIndexSet indexes, boolean extend) {
OS.objc_msgSend(this.id, OS.sel_selectRowIndexes_byExtendingSelection_, indexes != null ? indexes.id : 0, extend);
}
-public int /*long*/ selectedRow() {
+public long /*int*/ selectedRow() {
return OS.objc_msgSend(this.id, OS.sel_selectedRow);
}
public NSIndexSet selectedRowIndexes() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_selectedRowIndexes);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_selectedRowIndexes);
return result != 0 ? new NSIndexSet(result) : null;
}
@@ -195,7 +195,7 @@ public void setBackgroundColor(NSColor color) {
OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0);
}
-public void setColumnAutoresizingStyle(int /*long*/ style) {
+public void setColumnAutoresizingStyle(long /*int*/ style) {
OS.objc_msgSend(this.id, OS.sel_setColumnAutoresizingStyle_, style);
}
@@ -207,15 +207,15 @@ public void setDelegate(id delegate) {
OS.objc_msgSend(this.id, OS.sel_setDelegate_, delegate != null ? delegate.id : 0);
}
-public void setDoubleAction(int /*long*/ aSelector) {
+public void setDoubleAction(long /*int*/ aSelector) {
OS.objc_msgSend(this.id, OS.sel_setDoubleAction_, aSelector);
}
-public void setDropRow(int /*long*/ row, int /*long*/ op) {
+public void setDropRow(long /*int*/ row, long /*int*/ op) {
OS.objc_msgSend(this.id, OS.sel_setDropRow_dropOperation_, row, op);
}
-public void setGridStyleMask(int /*long*/ gridStyle) {
+public void setGridStyleMask(long /*int*/ gridStyle) {
OS.objc_msgSend(this.id, OS.sel_setGridStyleMask_, gridStyle);
}
@@ -235,7 +235,7 @@ public void setIntercellSpacing(NSSize aSize) {
OS.objc_msgSend(this.id, OS.sel_setIntercellSpacing_, aSize);
}
-public void setRowHeight(float /*double*/ rowHeight) {
+public void setRowHeight(double /*float*/ rowHeight) {
OS.objc_msgSend(this.id, OS.sel_setRowHeight_, rowHeight);
}
@@ -244,7 +244,7 @@ public void setUsesAlternatingRowBackgroundColors(boolean useAlternatingRowColor
}
public NSArray tableColumns() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_tableColumns);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_tableColumns);
return result != 0 ? new NSArray(result) : null;
}
@@ -256,11 +256,11 @@ public boolean usesAlternatingRowBackgroundColors() {
return OS.objc_msgSend_bool(this.id, OS.sel_usesAlternatingRowBackgroundColors);
}
-public static int /*long*/ cellClass() {
+public static long /*int*/ cellClass() {
return OS.objc_msgSend(OS.class_NSTableView, OS.sel_cellClass);
}
-public static void setCellClass(int /*long*/ factoryId) {
+public static void setCellClass(long /*int*/ factoryId) {
OS.objc_msgSend(OS.class_NSTableView, OS.sel_setCellClass_, factoryId);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSText.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSText.java
index 66a6f88cf6..b7d2589af0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSText.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSText.java
@@ -16,7 +16,7 @@ public NSText() {
super();
}
-public NSText(int /*long*/ id) {
+public NSText(long /*int*/ id) {
super(id);
}
@@ -33,12 +33,12 @@ public void cut(id sender) {
}
public id delegate() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_delegate);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_delegate);
return result != 0 ? new id(result) : null;
}
public NSFont font() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_font);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_font);
return result != 0 ? new NSFont(result) : null;
}
@@ -68,7 +68,7 @@ public NSRange selectedRange() {
return result;
}
-public void setAlignment(int /*long*/ mode) {
+public void setAlignment(long /*int*/ mode) {
OS.objc_msgSend(this.id, OS.sel_setAlignment_, mode);
}
@@ -76,7 +76,7 @@ public void setBackgroundColor(NSColor color) {
OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0);
}
-public void setBaseWritingDirection(int /*long*/ writingDirection) {
+public void setBaseWritingDirection(long /*int*/ writingDirection) {
OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_, writingDirection);
}
@@ -129,7 +129,7 @@ public void sizeToFit() {
}
public NSString string() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_string);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_string);
return result != 0 ? new NSString(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextAttachment.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextAttachment.java
index c7d04b266d..0fcd11af9f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextAttachment.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextAttachment.java
@@ -16,7 +16,7 @@ public NSTextAttachment() {
super();
}
-public NSTextAttachment(int /*long*/ id) {
+public NSTextAttachment(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSTextAttachment(id id) {
}
public NSTextAttachment initWithFileWrapper(NSFileWrapper fileWrapper) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFileWrapper_, fileWrapper != null ? fileWrapper.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFileWrapper_, fileWrapper != null ? fileWrapper.id : 0);
return result == this.id ? this : (result != 0 ? new NSTextAttachment(result) : null);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextContainer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextContainer.java
index eefef39e8a..c27a38dba8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextContainer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextContainer.java
@@ -16,7 +16,7 @@ public NSTextContainer() {
super();
}
-public NSTextContainer(int /*long*/ id) {
+public NSTextContainer(long /*int*/ id) {
super(id);
}
@@ -31,7 +31,7 @@ public NSSize containerSize() {
}
public NSTextContainer initWithContainerSize(NSSize size) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithContainerSize_, size);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithContainerSize_, size);
return result == this.id ? this : (result != 0 ? new NSTextContainer(result) : null);
}
@@ -39,7 +39,7 @@ public void setContainerSize(NSSize size) {
OS.objc_msgSend(this.id, OS.sel_setContainerSize_, size);
}
-public void setLineFragmentPadding(float /*double*/ pad) {
+public void setLineFragmentPadding(double /*float*/ pad) {
OS.objc_msgSend(this.id, OS.sel_setLineFragmentPadding_, pad);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextField.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextField.java
index e2507f4ad3..6e6ea877e4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextField.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextField.java
@@ -16,7 +16,7 @@ public NSTextField() {
super();
}
-public NSTextField(int /*long*/ id) {
+public NSTextField(long /*int*/ id) {
super(id);
}
@@ -56,11 +56,11 @@ public void setTextColor(NSColor color) {
OS.objc_msgSend(this.id, OS.sel_setTextColor_, color != null ? color.id : 0);
}
-public static int /*long*/ cellClass() {
+public static long /*int*/ cellClass() {
return OS.objc_msgSend(OS.class_NSTextField, OS.sel_cellClass);
}
-public static void setCellClass(int /*long*/ factoryId) {
+public static void setCellClass(long /*int*/ factoryId) {
OS.objc_msgSend(OS.class_NSTextField, OS.sel_setCellClass_, factoryId);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextFieldCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextFieldCell.java
index 98e6bef1ab..188a5c0750 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextFieldCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextFieldCell.java
@@ -16,7 +16,7 @@ public NSTextFieldCell() {
super();
}
-public NSTextFieldCell(int /*long*/ id) {
+public NSTextFieldCell(long /*int*/ id) {
super(id);
}
@@ -33,7 +33,7 @@ public void setTextColor(NSColor color) {
}
public NSColor textColor() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_textColor);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_textColor);
return result != 0 ? new NSColor(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextStorage.java
index 22a0c54090..61882b5802 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextStorage.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextStorage.java
@@ -16,7 +16,7 @@ public NSTextStorage() {
super();
}
-public NSTextStorage(int /*long*/ id) {
+public NSTextStorage(long /*int*/ id) {
super(id);
}
@@ -29,12 +29,12 @@ public void addLayoutManager(NSLayoutManager obj) {
}
public NSArray paragraphs() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_paragraphs);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_paragraphs);
return result != 0 ? new NSArray(result) : null;
}
public static NSAttributedString attributedStringWithAttachment(NSTextAttachment attachment) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSTextStorage, OS.sel_attributedStringWithAttachment_, attachment != null ? attachment.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSTextStorage, OS.sel_attributedStringWithAttachment_, attachment != null ? attachment.id : 0);
return result != 0 ? new NSAttributedString(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTab.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTab.java
index 5c1169b13d..859cd6e987 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTab.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTab.java
@@ -16,7 +16,7 @@ public NSTextTab() {
super();
}
-public NSTextTab(int /*long*/ id) {
+public NSTextTab(long /*int*/ id) {
super(id);
}
@@ -24,16 +24,16 @@ public NSTextTab(id id) {
super(id);
}
-public NSTextTab initWithType(int /*long*/ type, float /*double*/ loc) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithType_location_, type, loc);
+public NSTextTab initWithType(long /*int*/ type, double /*float*/ loc) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithType_location_, type, loc);
return result == this.id ? this : (result != 0 ? new NSTextTab(result) : null);
}
-public float /*double*/ location() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_location);
+public double /*float*/ location() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_location);
}
-public int /*long*/ tabStopType() {
+public long /*int*/ tabStopType() {
return OS.objc_msgSend(this.id, OS.sel_tabStopType);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextView.java
index 7e0d32f4f2..6f1e409956 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextView.java
@@ -16,7 +16,7 @@ public NSTextView() {
super();
}
-public NSTextView(int /*long*/ id) {
+public NSTextView(long /*int*/ id) {
super(id);
}
@@ -24,12 +24,12 @@ public NSTextView(id id) {
super(id);
}
-public int /*long*/ characterIndexForInsertionAtPoint(NSPoint point) {
+public long /*int*/ characterIndexForInsertionAtPoint(NSPoint point) {
return OS.objc_msgSend(this.id, OS.sel_characterIndexForInsertionAtPoint_, point);
}
public NSParagraphStyle defaultParagraphStyle() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_defaultParagraphStyle);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_defaultParagraphStyle);
return result != 0 ? new NSParagraphStyle(result) : null;
}
@@ -42,22 +42,22 @@ public void drawViewBackgroundInRect(NSRect rect) {
}
public NSLayoutManager layoutManager() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_layoutManager);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_layoutManager);
return result != 0 ? new NSLayoutManager(result) : null;
}
public NSDictionary linkTextAttributes() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_linkTextAttributes);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_linkTextAttributes);
return result != 0 ? new NSDictionary(result) : null;
}
public NSDictionary markedTextAttributes() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_markedTextAttributes);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_markedTextAttributes);
return result != 0 ? new NSDictionary(result) : null;
}
public NSDictionary selectedTextAttributes() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_selectedTextAttributes);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_selectedTextAttributes);
return result != 0 ? new NSDictionary(result) : null;
}
@@ -65,7 +65,7 @@ public void setAllowsUndo(boolean flag) {
OS.objc_msgSend(this.id, OS.sel_setAllowsUndo_, flag);
}
-public void setBaseWritingDirection(int /*long*/ writingDirection, NSRange range) {
+public void setBaseWritingDirection(long /*int*/ writingDirection, NSRange range) {
OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_range_, writingDirection, range);
}
@@ -102,12 +102,12 @@ public boolean shouldDrawInsertionPoint() {
}
public NSTextContainer textContainer() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_textContainer);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_textContainer);
return result != 0 ? new NSTextContainer(result) : null;
}
public NSTextStorage textStorage() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_textStorage);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_textStorage);
return result != 0 ? new NSTextStorage(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSThread.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSThread.java
index 6947c2bac8..d109d5c364 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSThread.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSThread.java
@@ -16,7 +16,7 @@ public NSThread() {
super();
}
-public NSThread(int /*long*/ id) {
+public NSThread(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSThread(id id) {
}
public static NSThread currentThread() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSThread, OS.sel_currentThread);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSThread, OS.sel_currentThread);
return result != 0 ? new NSThread(result) : null;
}
@@ -34,7 +34,7 @@ public static boolean isMainThread() {
}
public NSMutableDictionary threadDictionary() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_threadDictionary);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_threadDictionary);
return result != 0 ? new NSMutableDictionary(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimeZone.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimeZone.java
index 846438305f..cfd71d8d71 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimeZone.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimeZone.java
@@ -16,7 +16,7 @@ public NSTimeZone() {
super();
}
-public NSTimeZone(int /*long*/ id) {
+public NSTimeZone(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSTimeZone(id id) {
}
public static NSTimeZone defaultTimeZone() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_defaultTimeZone);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_defaultTimeZone);
return result != 0 ? new NSTimeZone(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimer.java
index 09f032e3c1..d2cc1c68d5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimer.java
@@ -16,7 +16,7 @@ public NSTimer() {
super();
}
-public NSTimer(int /*long*/ id) {
+public NSTimer(long /*int*/ id) {
super(id);
}
@@ -28,8 +28,8 @@ public void invalidate() {
OS.objc_msgSend(this.id, OS.sel_invalidate);
}
-public static NSTimer scheduledTimerWithTimeInterval(double ti, id aTarget, int /*long*/ aSelector, id userInfo, boolean yesOrNo) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSTimer, OS.sel_scheduledTimerWithTimeInterval_target_selector_userInfo_repeats_, ti, aTarget != null ? aTarget.id : 0, aSelector, userInfo != null ? userInfo.id : 0, yesOrNo);
+public static NSTimer scheduledTimerWithTimeInterval(double ti, id aTarget, long /*int*/ aSelector, id userInfo, boolean yesOrNo) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSTimer, OS.sel_scheduledTimerWithTimeInterval_target_selector_userInfo_repeats_, ti, aTarget != null ? aTarget.id : 0, aSelector, userInfo != null ? userInfo.id : 0, yesOrNo);
return result != 0 ? new NSTimer(result) : null;
}
@@ -38,7 +38,7 @@ public void setFireDate(NSDate date) {
}
public id userInfo() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_userInfo);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_userInfo);
return result != 0 ? new id(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbar.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbar.java
index db010b427d..d7fe543bc6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbar.java
@@ -16,7 +16,7 @@ public NSToolbar() {
super();
}
-public NSToolbar(int /*long*/ id) {
+public NSToolbar(long /*int*/ id) {
super(id);
}
@@ -25,11 +25,11 @@ public NSToolbar(id id) {
}
public NSToolbar initWithIdentifier(NSString identifier) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0);
return result == this.id ? this : (result != 0 ? new NSToolbar(result) : null);
}
-public void insertItemWithItemIdentifier(NSString itemIdentifier, int /*long*/ index) {
+public void insertItemWithItemIdentifier(NSString itemIdentifier, long /*int*/ index) {
OS.objc_msgSend(this.id, OS.sel_insertItemWithItemIdentifier_atIndex_, itemIdentifier != null ? itemIdentifier.id : 0, index);
}
@@ -37,7 +37,7 @@ public boolean isVisible() {
return OS.objc_msgSend_bool(this.id, OS.sel_isVisible);
}
-public void removeItemAtIndex(int /*long*/ index) {
+public void removeItemAtIndex(long /*int*/ index) {
OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_, index);
}
@@ -49,7 +49,7 @@ public void setDelegate(id delegate) {
OS.objc_msgSend(this.id, OS.sel_setDelegate_, delegate != null ? delegate.id : 0);
}
-public void setDisplayMode(int /*long*/ displayMode) {
+public void setDisplayMode(long /*int*/ displayMode) {
OS.objc_msgSend(this.id, OS.sel_setDisplayMode_, displayMode);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItem.java
index efe821eb0f..e530f80a05 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItem.java
@@ -16,7 +16,7 @@ public NSToolbarItem() {
super();
}
-public NSToolbarItem(int /*long*/ id) {
+public NSToolbarItem(long /*int*/ id) {
super(id);
}
@@ -25,16 +25,16 @@ public NSToolbarItem(id id) {
}
public NSToolbarItem initWithItemIdentifier(NSString itemIdentifier) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithItemIdentifier_, itemIdentifier != null ? itemIdentifier.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithItemIdentifier_, itemIdentifier != null ? itemIdentifier.id : 0);
return result == this.id ? this : (result != 0 ? new NSToolbarItem(result) : null);
}
public NSString itemIdentifier() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_itemIdentifier);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_itemIdentifier);
return result != 0 ? new NSString(result) : null;
}
-public void setAction(int /*long*/ action) {
+public void setAction(long /*int*/ action) {
OS.objc_msgSend(this.id, OS.sel_setAction_, action);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTouch.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTouch.java
index d2c2b0e69f..02000fe6e5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTouch.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTouch.java
@@ -16,7 +16,7 @@ public NSTouch() {
super();
}
-public NSTouch(int /*long*/ id) {
+public NSTouch(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSTouch(id id) {
}
public id device() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_device);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_device);
return result != 0 ? new id(result) : null;
}
@@ -45,7 +45,7 @@ public NSPoint normalizedPosition() {
return result;
}
-public int /*long*/ phase() {
+public long /*int*/ phase() {
return OS.objc_msgSend(this.id, OS.sel_phase);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTrackingArea.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTrackingArea.java
index 648cd5ad37..3bb57c9ccc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTrackingArea.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTrackingArea.java
@@ -16,7 +16,7 @@ public NSTrackingArea() {
super();
}
-public NSTrackingArea(int /*long*/ id) {
+public NSTrackingArea(long /*int*/ id) {
super(id);
}
@@ -24,18 +24,18 @@ public NSTrackingArea(id id) {
super(id);
}
-public NSTrackingArea initWithRect(NSRect rect, int /*long*/ options, id owner, NSDictionary userInfo) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithRect_options_owner_userInfo_, rect, options, owner != null ? owner.id : 0, userInfo != null ? userInfo.id : 0);
+public NSTrackingArea initWithRect(NSRect rect, long /*int*/ options, id owner, NSDictionary userInfo) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithRect_options_owner_userInfo_, rect, options, owner != null ? owner.id : 0, userInfo != null ? userInfo.id : 0);
return result == this.id ? this : (result != 0 ? new NSTrackingArea(result) : null);
}
public id owner() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_owner);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_owner);
return result != 0 ? new id(result) : null;
}
public NSDictionary userInfo() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_userInfo);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_userInfo);
return result != 0 ? new NSDictionary(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTypesetter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTypesetter.java
index ef158f8d84..51ed6cdae2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTypesetter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTypesetter.java
@@ -16,7 +16,7 @@ public NSTypesetter() {
super();
}
-public NSTypesetter(int /*long*/ id) {
+public NSTypesetter(long /*int*/ id) {
super(id);
}
@@ -24,8 +24,8 @@ public NSTypesetter(id id) {
super(id);
}
-public float /*double*/ baselineOffsetInLayoutManager(NSLayoutManager layoutMgr, int /*long*/ glyphIndex) {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_baselineOffsetInLayoutManager_glyphIndex_, layoutMgr != null ? layoutMgr.id : 0, glyphIndex);
+public double /*float*/ baselineOffsetInLayoutManager(NSLayoutManager layoutMgr, long /*int*/ glyphIndex) {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_baselineOffsetInLayoutManager_glyphIndex_, layoutMgr != null ? layoutMgr.id : 0, glyphIndex);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURL.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURL.java
index 294d76225f..fcb65d6d06 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURL.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURL.java
@@ -16,7 +16,7 @@ public NSURL() {
super();
}
-public NSURL(int /*long*/ id) {
+public NSURL(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public NSURL(id id) {
}
public static NSURL URLFromPasteboard(NSPasteboard pasteBoard) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSURL, OS.sel_URLFromPasteboard_, pasteBoard != null ? pasteBoard.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSURL, OS.sel_URLFromPasteboard_, pasteBoard != null ? pasteBoard.id : 0);
return result != 0 ? new NSURL(result) : null;
}
@@ -34,22 +34,22 @@ public void writeToPasteboard(NSPasteboard pasteBoard) {
}
public static NSURL URLWithString(NSString URLString) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSURL, OS.sel_URLWithString_, URLString != null ? URLString.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSURL, OS.sel_URLWithString_, URLString != null ? URLString.id : 0);
return result != 0 ? new NSURL(result) : null;
}
public NSString absoluteString() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_absoluteString);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_absoluteString);
return result != 0 ? new NSString(result) : null;
}
public static NSURL fileURLWithPath(NSString path) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSURL, OS.sel_fileURLWithPath_, path != null ? path.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSURL, OS.sel_fileURLWithPath_, path != null ? path.id : 0);
return result != 0 ? new NSURL(result) : null;
}
public NSString host() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_host);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_host);
return result != 0 ? new NSString(result) : null;
}
@@ -58,7 +58,7 @@ public boolean isFileURL() {
}
public NSString path() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_path);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_path);
return result != 0 ? new NSString(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLAuthenticationChallenge.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLAuthenticationChallenge.java
index 319225e932..6511142c38 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLAuthenticationChallenge.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLAuthenticationChallenge.java
@@ -16,7 +16,7 @@ public NSURLAuthenticationChallenge() {
super();
}
-public NSURLAuthenticationChallenge(int /*long*/ id) {
+public NSURLAuthenticationChallenge(long /*int*/ id) {
super(id);
}
@@ -24,22 +24,22 @@ public NSURLAuthenticationChallenge(id id) {
super(id);
}
-public int /*long*/ previousFailureCount() {
+public long /*int*/ previousFailureCount() {
return OS.objc_msgSend(this.id, OS.sel_previousFailureCount);
}
public NSURLCredential proposedCredential() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_proposedCredential);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_proposedCredential);
return result != 0 ? new NSURLCredential(result) : null;
}
public NSURLProtectionSpace protectionSpace() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_protectionSpace);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_protectionSpace);
return result != 0 ? new NSURLProtectionSpace(result) : null;
}
public id sender() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_sender);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_sender);
return result != 0 ? new id(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLCredential.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLCredential.java
index b6413be7ee..5cc186a769 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLCredential.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLCredential.java
@@ -16,7 +16,7 @@ public NSURLCredential() {
super();
}
-public NSURLCredential(int /*long*/ id) {
+public NSURLCredential(long /*int*/ id) {
super(id);
}
@@ -24,8 +24,8 @@ public NSURLCredential(id id) {
super(id);
}
-public static NSURLCredential credentialWithUser(NSString user, NSString password, int /*long*/ persistence) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSURLCredential, OS.sel_credentialWithUser_password_persistence_, user != null ? user.id : 0, password != null ? password.id : 0, persistence);
+public static NSURLCredential credentialWithUser(NSString user, NSString password, long /*int*/ persistence) {
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSURLCredential, OS.sel_credentialWithUser_password_persistence_, user != null ? user.id : 0, password != null ? password.id : 0, persistence);
return result != 0 ? new NSURLCredential(result) : null;
}
@@ -34,12 +34,12 @@ public boolean hasPassword() {
}
public NSString password() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_password);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_password);
return result != 0 ? new NSString(result) : null;
}
public NSString user() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_user);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_user);
return result != 0 ? new NSString(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLDownload.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLDownload.java
index 1ac5514edf..53841ba243 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLDownload.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLDownload.java
@@ -16,7 +16,7 @@ public NSURLDownload() {
super();
}
-public NSURLDownload(int /*long*/ id) {
+public NSURLDownload(long /*int*/ id) {
super(id);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLProtectionSpace.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLProtectionSpace.java
index 548a70902b..323a847520 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLProtectionSpace.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLProtectionSpace.java
@@ -16,7 +16,7 @@ public NSURLProtectionSpace() {
super();
}
-public NSURLProtectionSpace(int /*long*/ id) {
+public NSURLProtectionSpace(long /*int*/ id) {
super(id);
}
@@ -25,16 +25,16 @@ public NSURLProtectionSpace(id id) {
}
public NSString host() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_host);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_host);
return result != 0 ? new NSString(result) : null;
}
-public int /*long*/ port() {
+public long /*int*/ port() {
return OS.objc_msgSend(this.id, OS.sel_port);
}
public NSString realm() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_realm);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_realm);
return result != 0 ? new NSString(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLRequest.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLRequest.java
index b0d1e99a12..6b57c073f0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLRequest.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLRequest.java
@@ -16,7 +16,7 @@ public NSURLRequest() {
super();
}
-public NSURLRequest(int /*long*/ id) {
+public NSURLRequest(long /*int*/ id) {
super(id);
}
@@ -25,17 +25,17 @@ public NSURLRequest(id id) {
}
public NSURL URL() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_URL);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_URL);
return result != 0 ? new NSURL(result) : null;
}
public NSURLRequest initWithURL(NSURL URL) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithURL_, URL != null ? URL.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithURL_, URL != null ? URL.id : 0);
return result == this.id ? this : (result != 0 ? new NSURLRequest(result) : null);
}
public static NSURLRequest requestWithURL(NSURL URL) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSURLRequest, OS.sel_requestWithURL_, URL != null ? URL.id : 0);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSURLRequest, OS.sel_requestWithURL_, URL != null ? URL.id : 0);
return result != 0 ? new NSURLRequest(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUndoManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUndoManager.java
index 47615dddfc..1854bed58e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUndoManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUndoManager.java
@@ -16,7 +16,7 @@ public NSUndoManager() {
super();
}
-public NSUndoManager(int /*long*/ id) {
+public NSUndoManager(long /*int*/ id) {
super(id);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUserDefaults.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUserDefaults.java
index 0eb9657c78..4eb2d64218 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUserDefaults.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUserDefaults.java
@@ -16,7 +16,7 @@ public NSUserDefaults() {
super();
}
-public NSUserDefaults(int /*long*/ id) {
+public NSUserDefaults(long /*int*/ id) {
super(id);
}
@@ -25,12 +25,12 @@ public NSUserDefaults(id id) {
}
public id objectForKey(NSString defaultName) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_objectForKey_, defaultName != null ? defaultName.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_objectForKey_, defaultName != null ? defaultName.id : 0);
return result != 0 ? new id(result) : null;
}
public static NSUserDefaults standardUserDefaults() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSUserDefaults, OS.sel_standardUserDefaults);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSUserDefaults, OS.sel_standardUserDefaults);
return result != 0 ? new NSUserDefaults(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSValue.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSValue.java
index 9e11593bbb..a2af41eea7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSValue.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSValue.java
@@ -16,7 +16,7 @@ public NSValue() {
super();
}
-public NSValue(int /*long*/ id) {
+public NSValue(long /*int*/ id) {
super(id);
}
@@ -24,7 +24,7 @@ public NSValue(id id) {
super(id);
}
-public int /*long*/ objCType() {
+public long /*int*/ objCType() {
return OS.objc_msgSend(this.id, OS.sel_objCType);
}
@@ -53,22 +53,22 @@ public NSSize sizeValue() {
}
public static NSValue valueWithPoint(NSPoint point) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithPoint_, point);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithPoint_, point);
return result != 0 ? new NSValue(result) : null;
}
public static NSValue valueWithRange(NSRange range) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithRange_, range);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithRange_, range);
return result != 0 ? new NSValue(result) : null;
}
public static NSValue valueWithRect(NSRect rect) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithRect_, rect);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithRect_, rect);
return result != 0 ? new NSValue(result) : null;
}
public static NSValue valueWithSize(NSSize size) {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithSize_, size);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithSize_, size);
return result != 0 ? new NSValue(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java
index 7bfb67fc9f..7dd64ab18e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java
@@ -16,7 +16,7 @@ public NSView() {
super();
}
-public NSView(int /*long*/ id) {
+public NSView(long /*int*/ id) {
super(id);
}
@@ -32,11 +32,11 @@ public void addSubview(NSView aView) {
OS.objc_msgSend(this.id, OS.sel_addSubview_, aView != null ? aView.id : 0);
}
-public void addSubview(NSView aView, int /*long*/ place, NSView otherView) {
+public void addSubview(NSView aView, long /*int*/ place, NSView otherView) {
OS.objc_msgSend(this.id, OS.sel_addSubview_positioned_relativeTo_, aView != null ? aView.id : 0, place, otherView != null ? otherView.id : 0);
}
-public int /*long*/ addToolTipRect(NSRect aRect, id anObject, int /*long*/ data) {
+public long /*int*/ addToolTipRect(NSRect aRect, id anObject, long /*int*/ data) {
return OS.objc_msgSend(this.id, OS.sel_addToolTipRect_owner_userData_, aRect, anObject != null ? anObject.id : 0, data);
}
@@ -169,12 +169,12 @@ public NSRect frame() {
}
public NSView hitTest(NSPoint aPoint) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_hitTest_, aPoint);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_hitTest_, aPoint);
return result == this.id ? this : (result != 0 ? new NSView(result) : null);
}
public NSView initWithFrame(NSRect frameRect) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_, frameRect);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_, frameRect);
return result == this.id ? this : (result != 0 ? new NSView(result) : null);
}
@@ -199,7 +199,7 @@ public void lockFocus() {
}
public NSMenu menuForEvent(NSEvent event) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_menuForEvent_, event != null ? event.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_menuForEvent_, event != null ? event.id : 0);
return result != 0 ? new NSMenu(result) : null;
}
@@ -223,7 +223,7 @@ public void removeFromSuperview() {
OS.objc_msgSend(this.id, OS.sel_removeFromSuperview);
}
-public void removeToolTip(int /*long*/ tag) {
+public void removeToolTip(long /*int*/ tag) {
OS.objc_msgSend(this.id, OS.sel_removeToolTip_, tag);
}
@@ -255,15 +255,15 @@ public void setAutoresizesSubviews(boolean flag) {
OS.objc_msgSend(this.id, OS.sel_setAutoresizesSubviews_, flag);
}
-public void setAutoresizingMask(int /*long*/ mask) {
+public void setAutoresizingMask(long /*int*/ mask) {
OS.objc_msgSend(this.id, OS.sel_setAutoresizingMask_, mask);
}
-public void setBoundsRotation(float /*double*/ angle) {
+public void setBoundsRotation(double /*float*/ angle) {
OS.objc_msgSend(this.id, OS.sel_setBoundsRotation_, angle);
}
-public void setFocusRingType(int /*long*/ focusRingType) {
+public void setFocusRingType(long /*int*/ focusRingType) {
OS.objc_msgSend(this.id, OS.sel_setFocusRingType_, focusRingType);
}
@@ -304,17 +304,17 @@ public boolean shouldDelayWindowOrderingForEvent(NSEvent theEvent) {
}
public NSArray subviews() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_subviews);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_subviews);
return result != 0 ? new NSArray(result) : null;
}
public NSView superview() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_superview);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_superview);
return result == this.id ? this : (result != 0 ? new NSView(result) : null);
}
public NSArray trackingAreas() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_trackingAreas);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_trackingAreas);
return result != 0 ? new NSArray(result) : null;
}
@@ -345,7 +345,7 @@ public NSRect visibleRect() {
}
public NSWindow window() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_window);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_window);
return result != 0 ? new NSWindow(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindow.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindow.java
index 92a78ad625..3d51a72f0d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindow.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindow.java
@@ -16,7 +16,7 @@ public NSWindow() {
super();
}
-public NSWindow(int /*long*/ id) {
+public NSWindow(long /*int*/ id) {
super(id);
}
@@ -24,12 +24,12 @@ public NSWindow(id id) {
super(id);
}
-public void addChildWindow(NSWindow childWin, int /*long*/ place) {
+public void addChildWindow(NSWindow childWin, long /*int*/ place) {
OS.objc_msgSend(this.id, OS.sel_addChildWindow_ordered_, childWin != null ? childWin.id : 0, place);
}
-public float /*double*/ alphaValue() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_alphaValue);
+public double /*float*/ alphaValue() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_alphaValue);
}
public boolean areCursorRectsEnabled() {
@@ -54,12 +54,12 @@ public void close() {
OS.objc_msgSend(this.id, OS.sel_close);
}
-public int /*long*/ collectionBehavior() {
+public long /*int*/ collectionBehavior() {
return OS.objc_msgSend(this.id, OS.sel_collectionBehavior);
}
public NSView contentView() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_contentView);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_contentView);
return result != 0 ? new NSView(result) : null;
}
@@ -76,12 +76,12 @@ public NSPoint convertScreenToBase(NSPoint aPoint) {
}
public NSButtonCell defaultButtonCell() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_defaultButtonCell);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_defaultButtonCell);
return result != 0 ? new NSButtonCell(result) : null;
}
public id delegate() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_delegate);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_delegate);
return result != 0 ? new id(result) : null;
}
@@ -114,12 +114,12 @@ public void endEditingFor(id anObject) {
}
public NSText fieldEditor(boolean createFlag, id anObject) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_fieldEditor_forObject_, createFlag, anObject != null ? anObject.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_fieldEditor_forObject_, createFlag, anObject != null ? anObject.id : 0);
return result != 0 ? new NSText(result) : null;
}
public NSResponder firstResponder() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_firstResponder);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_firstResponder);
return result != 0 ? new NSResponder(result) : null;
}
@@ -140,7 +140,7 @@ public NSRect frameRectForContentRect(NSRect contentRect) {
}
public NSGraphicsContext graphicsContext() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_graphicsContext);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_graphicsContext);
return result != 0 ? new NSGraphicsContext(result) : null;
}
@@ -148,13 +148,13 @@ public boolean hasShadow() {
return OS.objc_msgSend_bool(this.id, OS.sel_hasShadow);
}
-public NSWindow initWithContentRect(NSRect contentRect, int /*long*/ aStyle, int /*long*/ bufferingType, boolean flag) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithContentRect_styleMask_backing_defer_, contentRect, aStyle, bufferingType, flag);
+public NSWindow initWithContentRect(NSRect contentRect, long /*int*/ aStyle, long /*int*/ bufferingType, boolean flag) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithContentRect_styleMask_backing_defer_, contentRect, aStyle, bufferingType, flag);
return result == this.id ? this : (result != 0 ? new NSWindow(result) : null);
}
-public NSWindow initWithContentRect(NSRect contentRect, int /*long*/ aStyle, int /*long*/ bufferingType, boolean flag, NSScreen screen) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithContentRect_styleMask_backing_defer_screen_, contentRect, aStyle, bufferingType, flag, screen != null ? screen.id : 0);
+public NSWindow initWithContentRect(NSRect contentRect, long /*int*/ aStyle, long /*int*/ bufferingType, boolean flag, NSScreen screen) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithContentRect_styleMask_backing_defer_screen_, contentRect, aStyle, bufferingType, flag, screen != null ? screen.id : 0);
return result == this.id ? this : (result != 0 ? new NSWindow(result) : null);
}
@@ -190,7 +190,7 @@ public boolean isZoomed() {
return OS.objc_msgSend_bool(this.id, OS.sel_isZoomed);
}
-public int /*long*/ level() {
+public long /*int*/ level() {
return OS.objc_msgSend(this.id, OS.sel_level);
}
@@ -202,8 +202,8 @@ public void makeKeyAndOrderFront(id sender) {
OS.objc_msgSend(this.id, OS.sel_makeKeyAndOrderFront_, sender != null ? sender.id : 0);
}
-public static float /*double*/ minFrameWidthWithTitle(NSString aTitle, int /*long*/ aStyle) {
- return (float /*double*/)OS.objc_msgSend_fpret(OS.class_NSWindow, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+public static double /*float*/ minFrameWidthWithTitle(NSString aTitle, long /*int*/ aStyle) {
+ return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSWindow, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
}
public NSSize minSize() {
@@ -238,12 +238,12 @@ public void orderOut(id sender) {
OS.objc_msgSend(this.id, OS.sel_orderOut_, sender != null ? sender.id : 0);
}
-public void orderWindow(int /*long*/ place, int /*long*/ otherWin) {
+public void orderWindow(long /*int*/ place, long /*int*/ otherWin) {
OS.objc_msgSend(this.id, OS.sel_orderWindow_relativeTo_, place, otherWin);
}
public NSWindow parentWindow() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_parentWindow);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_parentWindow);
return result == this.id ? this : (result != 0 ? new NSWindow(result) : null);
}
@@ -252,7 +252,7 @@ public void removeChildWindow(NSWindow childWin) {
}
public NSScreen screen() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_screen);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_screen);
return result != 0 ? new NSScreen(result) : null;
}
@@ -264,7 +264,7 @@ public void setAcceptsMouseMovedEvents(boolean flag) {
OS.objc_msgSend(this.id, OS.sel_setAcceptsMouseMovedEvents_, flag);
}
-public void setAlphaValue(float /*double*/ windowAlpha) {
+public void setAlphaValue(double /*float*/ windowAlpha) {
OS.objc_msgSend(this.id, OS.sel_setAlphaValue_, windowAlpha);
}
@@ -272,7 +272,7 @@ public void setBackgroundColor(NSColor color) {
OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0);
}
-public void setCollectionBehavior(int /*long*/ behavior) {
+public void setCollectionBehavior(long /*int*/ behavior) {
OS.objc_msgSend(this.id, OS.sel_setCollectionBehavior_, behavior);
}
@@ -308,7 +308,7 @@ public void setHidesOnDeactivate(boolean flag) {
OS.objc_msgSend(this.id, OS.sel_setHidesOnDeactivate_, flag);
}
-public void setLevel(int /*long*/ newLevel) {
+public void setLevel(long /*int*/ newLevel) {
OS.objc_msgSend(this.id, OS.sel_setLevel_, newLevel);
}
@@ -348,12 +348,12 @@ public void setToolbar(NSToolbar toolbar) {
OS.objc_msgSend(this.id, OS.sel_setToolbar_, toolbar != null ? toolbar.id : 0);
}
-public NSButton standardWindowButton(int /*long*/ b) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_standardWindowButton_, b);
+public NSButton standardWindowButton(long /*int*/ b) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_standardWindowButton_, b);
return result != 0 ? new NSButton(result) : null;
}
-public int /*long*/ styleMask() {
+public long /*int*/ styleMask() {
return OS.objc_msgSend(this.id, OS.sel_styleMask);
}
@@ -362,23 +362,23 @@ public void toggleToolbarShown(id sender) {
}
public NSToolbar toolbar() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_toolbar);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_toolbar);
return result != 0 ? new NSToolbar(result) : null;
}
-public float /*double*/ userSpaceScaleFactor() {
- return (float /*double*/)OS.objc_msgSend_fpret(this.id, OS.sel_userSpaceScaleFactor);
+public double /*float*/ userSpaceScaleFactor() {
+ return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_userSpaceScaleFactor);
}
-public int /*long*/ windowNumber() {
+public long /*int*/ windowNumber() {
return OS.objc_msgSend(this.id, OS.sel_windowNumber);
}
-public static int /*long*/ windowNumberAtPoint(NSPoint point, int /*long*/ windowNumber) {
+public static long /*int*/ windowNumberAtPoint(NSPoint point, long /*int*/ windowNumber) {
return OS.objc_msgSend(OS.class_NSWindow, OS.sel_windowNumberAtPoint_belowWindowWithWindowNumber_, point, windowNumber);
}
-public int /*long*/ windowRef() {
+public long /*int*/ windowRef() {
return OS.objc_msgSend(this.id, OS.sel_windowRef);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWorkspace.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWorkspace.java
index d769cf0691..739fd96347 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWorkspace.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWorkspace.java
@@ -16,7 +16,7 @@ public NSWorkspace() {
super();
}
-public NSWorkspace(int /*long*/ id) {
+public NSWorkspace(long /*int*/ id) {
super(id);
}
@@ -25,21 +25,21 @@ public NSWorkspace(id id) {
}
public NSString fullPathForApplication(NSString appName) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_fullPathForApplication_, appName != null ? appName.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_fullPathForApplication_, appName != null ? appName.id : 0);
return result != 0 ? new NSString(result) : null;
}
-public boolean getInfoForFile(NSString fullPath, int /*long*/ appName, int /*long*/ type) {
+public boolean getInfoForFile(NSString fullPath, long /*int*/ appName, long /*int*/ type) {
return OS.objc_msgSend_bool(this.id, OS.sel_getInfoForFile_application_type_, fullPath != null ? fullPath.id : 0, appName, type);
}
public NSImage iconForFile(NSString fullPath) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_iconForFile_, fullPath != null ? fullPath.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_iconForFile_, fullPath != null ? fullPath.id : 0);
return result != 0 ? new NSImage(result) : null;
}
public NSImage iconForFileType(NSString fileType) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_iconForFileType_, fileType != null ? fileType.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_iconForFileType_, fileType != null ? fileType.id : 0);
return result != 0 ? new NSImage(result) : null;
}
@@ -55,12 +55,12 @@ public boolean openURL(NSURL url) {
return OS.objc_msgSend_bool(this.id, OS.sel_openURL_, url != null ? url.id : 0);
}
-public boolean openURLs(NSArray urls, NSString bundleIdentifier, int /*long*/ options, NSAppleEventDescriptor descriptor, int /*long*/ identifiers) {
+public boolean openURLs(NSArray urls, NSString bundleIdentifier, long /*int*/ options, NSAppleEventDescriptor descriptor, long /*int*/ identifiers) {
return OS.objc_msgSend_bool(this.id, OS.sel_openURLs_withAppBundleIdentifier_options_additionalEventParamDescriptor_launchIdentifiers_, urls != null ? urls.id : 0, bundleIdentifier != null ? bundleIdentifier.id : 0, options, descriptor != null ? descriptor.id : 0, identifiers);
}
public static NSWorkspace sharedWorkspace() {
- int /*long*/ result = OS.objc_msgSend(OS.class_NSWorkspace, OS.sel_sharedWorkspace);
+ long /*int*/ result = OS.objc_msgSend(OS.class_NSWorkspace, OS.sel_sharedWorkspace);
return result != 0 ? new NSWorkspace(result) : null;
}
@@ -68,8 +68,8 @@ public boolean type(NSString firstTypeName, NSString secondTypeName) {
return OS.objc_msgSend_bool(this.id, OS.sel_type_conformsToType_, firstTypeName != null ? firstTypeName.id : 0, secondTypeName != null ? secondTypeName.id : 0);
}
-public NSString typeOfFile(NSString absoluteFilePath, int /*long*/ outError) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_typeOfFile_error_, absoluteFilePath != null ? absoluteFilePath.id : 0, outError);
+public NSString typeOfFile(NSString absoluteFilePath, long /*int*/ outError) {
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_typeOfFile_error_, absoluteFilePath != null ? absoluteFilePath.id : 0, outError);
return result != 0 ? new NSString(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
index 80daea4f87..59bfbd3c75 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
@@ -35,7 +35,7 @@ public class OS extends C {
* field-like text views created by the FieldAspect class. This is simply half of LargeNumberForText; at sizes as large as LargeNumberForText,
* the text system stops aligning text, for various reasons."
*/
- public static final float /*double*/ MAX_TEXT_CONTAINER_SIZE = 0.5e7f;
+ public static final double /*float*/ MAX_TEXT_CONTAINER_SIZE = 0.5e7f;
public static final int gestaltSystemVersion = ('s'<<24) + ('y'<<16) + ('s'<<8) + 'v';
public static final int noErr = 0;
@@ -67,89 +67,89 @@ public class OS extends C {
public static final int kPMDuplexNoTumble = 0x0002;
public static final int kPMDuplexTumble = 0x0003;
- public static final int /*long*/ sel_identity = sel_registerName("identity");
- public static final int /*long*/ sel_sendSearchSelection = sel_registerName("sendSearchSelection");
- public static final int /*long*/ sel_sendCancelSelection = sel_registerName("sendCancelSelection");
- public static final int /*long*/ sel_sendSelection = sel_registerName("sendSelection");
- public static final int /*long*/ sel_sendSelection_ = sel_registerName("sendSelection:");
- public static final int /*long*/ sel_sendDoubleSelection = sel_registerName("sendDoubleSelection");
- public static final int /*long*/ sel_sendVerticalSelection = sel_registerName("sendVerticalSelection");
- public static final int /*long*/ sel_sendHorizontalSelection = sel_registerName("sendHorizontalSelection");
- public static final int /*long*/ sel_timerProc_ = sel_registerName("timerProc:");
- public static final int /*long*/ sel_handleNotification_ = sel_registerName("handleNotification:");
- public static final int /*long*/ sel_callJava = sel_registerName("callJava:index:token:arg:");
- public static final int /*long*/ sel_callRunBeforeUnloadConfirmPanelWithMessage = sel_registerName("callRunBeforeUnloadConfirmPanelWithMessage:arg:");
- public static final int /*long*/ sel_createPanelDidEnd = sel_registerName("createPanelDidEnd:returnCode:contextInfo:");
- public static final int /*long*/ sel_systemSettingsChanged_ = sel_registerName("systemSettingsChanged:");
- public static final int /*long*/ sel_panelDidEnd_returnCode_contextInfo_ = sel_registerName("panelDidEnd:returnCode:contextInfo:");
- public static final int /*long*/ sel_updateOpenGLContext_ = sel_registerName("updateOpenGLContext:");
+ public static final long /*int*/ sel_identity = sel_registerName("identity");
+ public static final long /*int*/ sel_sendSearchSelection = sel_registerName("sendSearchSelection");
+ public static final long /*int*/ sel_sendCancelSelection = sel_registerName("sendCancelSelection");
+ public static final long /*int*/ sel_sendSelection = sel_registerName("sendSelection");
+ public static final long /*int*/ sel_sendSelection_ = sel_registerName("sendSelection:");
+ public static final long /*int*/ sel_sendDoubleSelection = sel_registerName("sendDoubleSelection");
+ public static final long /*int*/ sel_sendVerticalSelection = sel_registerName("sendVerticalSelection");
+ public static final long /*int*/ sel_sendHorizontalSelection = sel_registerName("sendHorizontalSelection");
+ public static final long /*int*/ sel_timerProc_ = sel_registerName("timerProc:");
+ public static final long /*int*/ sel_handleNotification_ = sel_registerName("handleNotification:");
+ public static final long /*int*/ sel_callJava = sel_registerName("callJava:index:token:arg:");
+ public static final long /*int*/ sel_callRunBeforeUnloadConfirmPanelWithMessage = sel_registerName("callRunBeforeUnloadConfirmPanelWithMessage:arg:");
+ public static final long /*int*/ sel_createPanelDidEnd = sel_registerName("createPanelDidEnd:returnCode:contextInfo:");
+ public static final long /*int*/ sel_systemSettingsChanged_ = sel_registerName("systemSettingsChanged:");
+ public static final long /*int*/ sel_panelDidEnd_returnCode_contextInfo_ = sel_registerName("panelDidEnd:returnCode:contextInfo:");
+ public static final long /*int*/ sel_updateOpenGLContext_ = sel_registerName("updateOpenGLContext:");
- public static final int /*long*/ sel_overwriteExistingFileCheck = sel_registerName("_overwriteExistingFileCheck:");
- public static final int /*long*/ sel_setShowsHiddenFiles_ = sel_registerName("setShowsHiddenFiles:");
+ public static final long /*int*/ sel_overwriteExistingFileCheck = sel_registerName("_overwriteExistingFileCheck:");
+ public static final long /*int*/ sel_setShowsHiddenFiles_ = sel_registerName("setShowsHiddenFiles:");
- public static final int /*long*/ sel_setMovable_ = OS.sel_registerName("setMovable:");
+ public static final long /*int*/ sel_setMovable_ = OS.sel_registerName("setMovable:");
- public static final int /*long*/ sel_contextID = OS.sel_registerName("contextID");
+ public static final long /*int*/ sel_contextID = OS.sel_registerName("contextID");
- public static final int /*long*/ sel__drawThemeProgressArea_ = OS.sel_registerName("_drawThemeProgressArea:");
+ public static final long /*int*/ sel__drawThemeProgressArea_ = OS.sel_registerName("_drawThemeProgressArea:");
- public static final int /*long*/ sel__setDashboardBehavior = OS.sel_registerName("_setDashboardBehavior:to:");
+ public static final long /*int*/ sel__setDashboardBehavior = OS.sel_registerName("_setDashboardBehavior:to:");
- public static final int /*long*/ sel__setNeedsToUseHeartBeatWindow_ = OS.sel_registerName("_setNeedsToUseHeartBeatWindow:");
+ public static final long /*int*/ sel__setNeedsToUseHeartBeatWindow_ = OS.sel_registerName("_setNeedsToUseHeartBeatWindow:");
- public static final int /*long*/ class_WebPanelAuthenticationHandler = OS.objc_getClass("WebPanelAuthenticationHandler");
- public static final int /*long*/ sel_sharedHandler = sel_registerName("sharedHandler");
- public static final int /*long*/ sel_startAuthentication = sel_registerName("startAuthentication:window:");
- public static final int /*long*/ sel_setAllowsAnyHTTPSCertificate = sel_registerName("setAllowsAnyHTTPSCertificate:forHost:");
+ public static final long /*int*/ class_WebPanelAuthenticationHandler = OS.objc_getClass("WebPanelAuthenticationHandler");
+ public static final long /*int*/ sel_sharedHandler = sel_registerName("sharedHandler");
+ public static final long /*int*/ sel_startAuthentication = sel_registerName("startAuthentication:window:");
+ public static final long /*int*/ sel_setAllowsAnyHTTPSCertificate = sel_registerName("setAllowsAnyHTTPSCertificate:forHost:");
- public static final int /*long*/ sel_accessibleHandle = sel_registerName("accessibleHandle");
- public static final int /*long*/ sel_getImageView = sel_registerName("getImageView");
+ public static final long /*int*/ sel_accessibleHandle = sel_registerName("accessibleHandle");
+ public static final long /*int*/ sel_getImageView = sel_registerName("getImageView");
- public static final int /*long*/ sel_clearDeferFlushing = sel_registerName("clearDeferFlushing");
+ public static final long /*int*/ sel_clearDeferFlushing = sel_registerName("clearDeferFlushing");
- public static final int /*long*/ sel_setShouldExpandItem_ = sel_registerName("setShouldExpandItem:");
- public static final int /*long*/ sel_setShouldScrollClipView_ = sel_registerName("setShouldScrollClipView:");
+ public static final long /*int*/ sel_setShouldExpandItem_ = sel_registerName("setShouldExpandItem:");
+ public static final long /*int*/ sel_setShouldScrollClipView_ = sel_registerName("setShouldScrollClipView:");
/* These are not generated in order to avoid creating static methods on all classes */
- public static final int /*long*/ sel_isSelectorExcludedFromWebScript_ = sel_registerName("isSelectorExcludedFromWebScript:");
- public static final int /*long*/ sel_webScriptNameForSelector_ = sel_registerName("webScriptNameForSelector:");
+ public static final long /*int*/ sel_isSelectorExcludedFromWebScript_ = sel_registerName("isSelectorExcludedFromWebScript:");
+ public static final long /*int*/ sel_webScriptNameForSelector_ = sel_registerName("webScriptNameForSelector:");
- public static final int /*long*/ sel_setColor_forAttribute_ = sel_registerName("setColor:forAttribute:");
+ public static final long /*int*/ sel_setColor_forAttribute_ = sel_registerName("setColor:forAttribute:");
- public static final int /*long*/ sel_javaRunLoopMode = sel_registerName("javaRunLoopMode");
+ public static final long /*int*/ sel_javaRunLoopMode = sel_registerName("javaRunLoopMode");
/* These are not generated in order to avoid attempting to create a java method called "null" */
- public static final int /*long*/ class_NSNull = objc_getClass("NSNull");
- public static final int /*long*/ sel_null = sel_registerName("null");
+ public static final long /*int*/ class_NSNull = objc_getClass("NSNull");
+ public static final long /*int*/ sel_null = sel_registerName("null");
/* NSTextAttachmentCell */
/** @method callback_types=NSPoint;id;SEL;,callback_flags=struct;none;none; */
- public static final native int /*long*/ CALLBACK_cellBaselineOffset(int /*long*/ func);
+ public static final native long /*int*/ CALLBACK_cellBaselineOffset(long /*int*/ func);
/** @method callback_types=NSSize;id;SEL;,callback_flags=struct;none;none; */
- public static final native int /*long*/ CALLBACK_NSTextAttachmentCell_cellSize(int /*long*/ func);
- public static final int /*long*/ protocol_NSTextAttachmentCell = objc_getProtocol("NSTextAttachmentCell");
- public static final int /*long*/ sel_cellBaselineOffset = sel_registerName("cellBaselineOffset");
+ public static final native long /*int*/ CALLBACK_NSTextAttachmentCell_cellSize(long /*int*/ func);
+ public static final long /*int*/ protocol_NSTextAttachmentCell = objc_getProtocol("NSTextAttachmentCell");
+ public static final long /*int*/ sel_cellBaselineOffset = sel_registerName("cellBaselineOffset");
/*10.6 Accessibility Strings*/
/** @method flags=const dynamic no_gen*/
- public static final native int /*long*/ NSAccessibilityRowIndexRangeAttribute();
+ public static final native long /*int*/ NSAccessibilityRowIndexRangeAttribute();
public static final NSString NSAccessibilityRowIndexRangeAttribute = new NSString(NSAccessibilityRowIndexRangeAttribute());
/** @method flags=const dynamic no_gen*/
- public static final native int /*long*/ NSAccessibilityColumnIndexRangeAttribute();
+ public static final native long /*int*/ NSAccessibilityColumnIndexRangeAttribute();
public static final NSString NSAccessibilityColumnIndexRangeAttribute = new NSString(NSAccessibilityColumnIndexRangeAttribute());
/** @method flags=const dynamic no_gen*/
- public static final native int /*long*/ NSAccessibilityCellForColumnAndRowParameterizedAttribute();
+ public static final native long /*int*/ NSAccessibilityCellForColumnAndRowParameterizedAttribute();
public static final NSString NSAccessibilityCellForColumnAndRowParameterizedAttribute = new NSString(NSAccessibilityCellForColumnAndRowParameterizedAttribute());
/** @method flags=const dynamic no_gen*/
- public static final native int /*long*/ NSAccessibilityCellRole();
+ public static final native long /*int*/ NSAccessibilityCellRole();
public static final NSString NSAccessibilityCellRole = new NSString(NSAccessibilityCellRole());
/** 10.7 selectors and constants */
- public static final int /*long*/ sel_isCompatibleWithOverlayScrollers = sel_registerName("isCompatibleWithOverlayScrollers");
- public static final int /*long*/ sel_flashScrollers = sel_registerName("flashScrollers");
- public static final int /*long*/ sel_frameSizeForContentSize_horizontalScrollerClass_verticalScrollerClass_borderType_controlSize_scrollerStyle_ = sel_registerName("frameSizeForContentSize:horizontalScrollerClass:verticalScrollerClass:borderType:controlSize:scrollerStyle:");
- public static final int /*long*/ sel_scrollerStyle = sel_registerName("scrollerStyle");
- public static final int /*long*/ sel_toggleFullScreen_ = sel_registerName("toggleFullScreen:");
+ public static final long /*int*/ sel_isCompatibleWithOverlayScrollers = sel_registerName("isCompatibleWithOverlayScrollers");
+ public static final long /*int*/ sel_flashScrollers = sel_registerName("flashScrollers");
+ public static final long /*int*/ sel_frameSizeForContentSize_horizontalScrollerClass_verticalScrollerClass_borderType_controlSize_scrollerStyle_ = sel_registerName("frameSizeForContentSize:horizontalScrollerClass:verticalScrollerClass:borderType:controlSize:scrollerStyle:");
+ public static final long /*int*/ sel_scrollerStyle = sel_registerName("scrollerStyle");
+ public static final long /*int*/ sel_toggleFullScreen_ = sel_registerName("toggleFullScreen:");
public static final int NSScrollerStyleLegacy = 0;
public static final int NSScrollerStyleOverlay = 1;
@@ -159,22 +159,22 @@ public class OS extends C {
public static final int NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8;
/* AWT application delegate. Remove these when JavaRuntimeSupport.framework has bridgesupport generated for it. */
- public static final int /*long*/ class_JRSAppKitAWT = objc_getClass("JRSAppKitAWT");
- public static final int /*long*/ sel_awtAppDelegate = sel_registerName("awtAppDelegate");
+ public static final long /*int*/ class_JRSAppKitAWT = objc_getClass("JRSAppKitAWT");
+ public static final long /*int*/ sel_awtAppDelegate = sel_registerName("awtAppDelegate");
- public static final int /*long*/ class_NSToolbarView = objc_getClass("NSToolbarView");
+ public static final long /*int*/ class_NSToolbarView = objc_getClass("NSToolbarView");
/** JNI natives */
/** @method flags=jni */
-public static final native int /*long*/ NewGlobalRef(Object object);
+public static final native long /*int*/ NewGlobalRef(Object object);
/**
* @method flags=jni
* @param globalRef cast=(jobject)
*/
-public static final native void DeleteGlobalRef(int /*long*/ globalRef);
+public static final native void DeleteGlobalRef(long /*int*/ globalRef);
/** @method flags=no_gen */
-public static final native Object JNIGetObject(int /*long*/ globalRef);
+public static final native Object JNIGetObject(long /*int*/ globalRef);
/** Carbon calls */
@@ -185,7 +185,7 @@ public static final native int GetCurrentProcess(int[] psn);
public static final native int SetFrontProcess(int[] psn);
/** @param psn cast=(ProcessSerialNumber *) */
public static final native int TransformProcessType(int[] psn, int transformState);
-public static final native int CPSSetProcessName(int[] psn, int /*long*/ name);
+public static final native int CPSSetProcessName(int[] psn, long /*int*/ name);
/** @method flags=dynamic */
public static final native int SetThemeCursor(int themeCursor);
/** @method flags=dynamic */
@@ -199,18 +199,18 @@ public static final native int GetDblTime();
@param inMIMEType cast=(CFStringRef)
@param inUsageFlags cast=(IconServicesUsageFlags)
@param outIconRef cast=(IconRef *) */
-public static final native int GetIconRefFromTypeInfo(int inCreator, int inType, int /*long*/ inExtension, int /*long*/ inMIMEType, int inUsageFlags, int /*long*/ outIconRef[]);
+public static final native int GetIconRefFromTypeInfo(int inCreator, int inType, long /*int*/ inExtension, long /*int*/ inMIMEType, int inUsageFlags, long /*int*/ outIconRef[]);
/** @method flags=dynamic
@param context cast=(CGContextRef) */
-public static final native int /*long*/ CGContextCopyPath(int /*long*/ context);
+public static final native long /*int*/ CGContextCopyPath(long /*int*/ context);
/** @method flags=dynamic */
-public static final native int /*long*/ TISCopyCurrentKeyboardInputSource();
+public static final native long /*int*/ TISCopyCurrentKeyboardInputSource();
/** @method flags=dynamic
@param inputSource cast=(TISInputSourceRef)
@param propertyKey cast=(CFStringRef) */
-public static final native int /*long*/ TISGetInputSourceProperty (int /*long*/ inputSource, int /*long*/ propertyKey);
+public static final native long /*int*/ TISGetInputSourceProperty (long /*int*/ inputSource, long /*int*/ propertyKey);
/** @method flags=no_gen */
-public static final native int /*long*/ kTISPropertyUnicodeKeyLayoutData();
+public static final native long /*int*/ kTISPropertyUnicodeKeyLayoutData();
/**
* @method flags=dynamic
* @param inMode cast=(UInt32)
@@ -236,12 +236,12 @@ public static final native int GetSystemUIMode(int[] outMode, int[] outOptions);
* @param actualStringLength cast=(UniCharCount *)
* @param unicodeString cast=(UniChar *)
*/
-public static final native int UCKeyTranslate (int /*long*/ keyLayoutPtr, short virtualKeyCode, short keyAction, int modifierKeyState, int keyboardType, int keyTranslateOptions, int[] deadKeyState, int maxStringLength, int[] actualStringLength, char[] unicodeString);
+public static final native int UCKeyTranslate (long /*int*/ keyLayoutPtr, short virtualKeyCode, short keyAction, int modifierKeyState, int keyboardType, int keyTranslateOptions, int[] deadKeyState, int maxStringLength, int[] actualStringLength, char[] unicodeString);
/**
* @param inUTI1 cast=(CFStringRef)
* @param inUTI2 cast=(CFStringRef)
*/
-public static final native boolean UTTypeEqual(int /*long*/ inUTI1, int /*long*/ inUTI2);
+public static final native boolean UTTypeEqual(long /*int*/ inUTI1, long /*int*/ inUTI2);
/**
* @method flags=dynamic
@@ -252,7 +252,7 @@ public static final native void GetThemeMetric(int themeConstant, int[] metric);
* @method flags=dynamic
* @param inContext cast=(CGContextRef)
*/
-public static final native int HIThemeDrawFocusRect(CGRect inRect, boolean inHasFocus, int /*long*/ inContext, int inOrientation);
+public static final native int HIThemeDrawFocusRect(CGRect inRect, boolean inHasFocus, long /*int*/ inContext, int inOrientation);
public static final int kUCKeyActionDown = 0;
public static final int kUCKeyActionUp = 1;
@@ -269,7 +269,7 @@ public static final int kThemeAliasArrowCursor = 2;
* @param iOptions cast=(ATSOptionFlags)
* @param oContainer cast=(ATSFontContainerRef *)
*/
-public static final native int ATSFontActivateFromFileReference(byte[] iFile, int iContext, int iFormat, int /*long*/ iReserved, int iOptions, int /*long*/ [] oContainer);
+public static final native int ATSFontActivateFromFileReference(byte[] iFile, int iContext, int iFormat, long /*int*/ iReserved, int iOptions, long /*int*/ [] oContainer);
public static final int kATSFontContextLocal = 2;
public static final int kATSOptionFlagsDefault = 0;
@@ -280,15 +280,15 @@ public static final int kATSFontFormatUnspecified = 0;
* @param ref cast=(FSRef *)
* @param isDirectory cast=(Boolean *)
*/
-public static final native int FSPathMakeRef (int /*long*/ path, byte[] ref, boolean[] isDirectory);
+public static final native int FSPathMakeRef (long /*int*/ path, byte[] ref, boolean[] isDirectory);
/** @method flags=dynamic */
public static final native byte LMGetKbdType();
/** @method flags=dynamic */
-public static final native int /*long*/ AcquireRootMenu ();
+public static final native long /*int*/ AcquireRootMenu ();
/** @method flags=dynamic */
-public static final native int CancelMenuTracking (int /*long*/ inRootMenu, boolean inImmediate, int inDismissalReason);
+public static final native int CancelMenuTracking (long /*int*/ inRootMenu, boolean inImmediate, int inDismissalReason);
/**
* @param inType cast=(OSType)
* @param inCreator cast=(OSType)
@@ -297,7 +297,7 @@ public static final native int CancelMenuTracking (int /*long*/ inRootMenu, bool
* @param outAppRef cast=(FSRef *)
* @param outAppURL cast=(CFURLRef *)
*/
-public static final native int /*long*/ LSGetApplicationForInfo(int inType, int inCreator,int /*long*/ inExtension, int inRoleMask, byte[] outAppRef, int[] outAppURL);
+public static final native long /*int*/ LSGetApplicationForInfo(int inType, int inCreator,long /*int*/ inExtension, int inRoleMask, byte[] outAppRef, int[] outAppURL);
/** @method flags=dynamic
* @param mHandle cast=(MenuRef)
* @param commandId cast=(MenuCommand)
@@ -305,90 +305,90 @@ public static final native int /*long*/ LSGetApplicationForInfo(int inType, int
* @param outMenu cast=(MenuRef *)
* @param outIndex cast=(MenuItemIndex *)
*/
-public static final native int GetIndMenuItemWithCommandID(int /*long*/ mHandle, int commandId, int index, int /*long*/ [] outMenu, short[] outIndex);
+public static final native int GetIndMenuItemWithCommandID(long /*int*/ mHandle, int commandId, int index, long /*int*/ [] outMenu, short[] outIndex);
/** @method flags=dynamic
* @param mHandle cast=(MenuRef)
* @param index cast=(short)
*/
-public static final native void DeleteMenuItem(int /*long*/ mHandle, short index);
+public static final native void DeleteMenuItem(long /*int*/ mHandle, short index);
/**
* @param image_name cast=(const char*)
* @param options cast=(uint32_t)
*/
-public static final native int /*long*/ NSAddImage(byte[] image_name, int options);
+public static final native long /*int*/ NSAddImage(byte[] image_name, int options);
public static final int NSADDIMAGE_OPTION_RETURN_ON_ERROR = 0x1;
public static final int NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME = 0x8;
/** @method flags=dynamic
* @param pmSessionInfo cast=(PMPrintSession)
* @param outPMPrinter cast=(PMPrinter *)
*/
-public static final native int /*long*/ PMSessionGetCurrentPrinter(int /*long*/ pmSessionInfo, int /*long*/[] outPMPrinter);
+public static final native long /*int*/ PMSessionGetCurrentPrinter(long /*int*/ pmSessionInfo, long /*int*/[] outPMPrinter);
/** @method flags=dynamic
* @param pmSessionInfo cast=(PMPrintSession)
* @param pmPrintSettings cast=(PMPrintSettings)
*/
-public static final native int /*long*/ PMSessionGetDestinationType(int /*long*/ pmSessionInfo, int /*long*/ pmPrintSettings, short[] outDestinationType);
+public static final native long /*int*/ PMSessionGetDestinationType(long /*int*/ pmSessionInfo, long /*int*/ pmPrintSettings, short[] outDestinationType);
/** @method flags=dynamic
* @param printSettings cast=(PMPrintSettings)
* @param outDuplexSetting cast=(PMDuplexMode *)
*/
-public static final native int /*long*/ PMGetDuplex(int /*long*/ printSettings, int[] outDuplexSetting);
+public static final native long /*int*/ PMGetDuplex(long /*int*/ printSettings, int[] outDuplexSetting);
/** @method flags=dynamic
* @param printSettings cast=(PMPrintSettings)
* @param duplexSetting cast=(PMDuplexMode)
*/
-public static final native int /*long*/ PMSetDuplex(int /*long*/ printSettings, int duplexSetting);
+public static final native long /*int*/ PMSetDuplex(long /*int*/ printSettings, int duplexSetting);
/** @method flags=dynamic
* @param pmPrinter cast=(PMPrinter)
* @param outNumResolutions cast=(UInt32 *)
*/
-public static final native int /*long*/ PMPrinterGetPrinterResolutionCount(int /*long*/ pmPrinter, int[] outNumResolutions);
+public static final native long /*int*/ PMPrinterGetPrinterResolutionCount(long /*int*/ pmPrinter, int[] outNumResolutions);
/** @method flags=dynamic
* @param pmPrinter cast=(PMPrinter)
* @param pmPrintSettings cast=(PMPrintSettings)
* @param outResolution cast=(PMResolution *)
*/
-public static final native int /*long*/ PMPrinterGetOutputResolution(int /*long*/ pmPrinter, int /*long*/ pmPrintSettings, PMResolution outResolution);
+public static final native long /*int*/ PMPrinterGetOutputResolution(long /*int*/ pmPrinter, long /*int*/ pmPrintSettings, PMResolution outResolution);
/** @method flags=dynamic
* @param pmPrinter cast=(PMPrinter)
* @param outResolution cast=(PMResolution *)
*/
-public static final native int /*long*/ PMPrinterGetIndexedPrinterResolution(int /*long*/ pmPrinter, int index, PMResolution outResolution);
+public static final native long /*int*/ PMPrinterGetIndexedPrinterResolution(long /*int*/ pmPrinter, int index, PMResolution outResolution);
// Custom FindWindow implementation to avoid namespace collisions with Point.
/**
* @method flags=no_gen
* @param wHandle cast=(WindowRef *)
*/
-public static final native int /*long*/ FindWindow (int /*long*/ h, int /*long*/ v, int /*long*/ [] wHandle);
+public static final native long /*int*/ FindWindow (long /*int*/ h, long /*int*/ v, long /*int*/ [] wHandle);
/**
* @method flags=dynamic
* @param display cast=(CGDirectDisplayID)
*/
-public static final native int /*long*/ CGDisplayBaseAddress(int display);
+public static final native long /*int*/ CGDisplayBaseAddress(int display);
/**
* @method flags=dynamic
* @param display cast=(CGDirectDisplayID)
*/
-public static final native int /*long*/ CGDisplayBitsPerPixel(int display);
+public static final native long /*int*/ CGDisplayBitsPerPixel(int display);
/**
* @method flags=dynamic
* @param display cast=(CGDirectDisplayID)
*/
-public static final native int /*long*/ CGDisplayBitsPerSample(int display);
+public static final native long /*int*/ CGDisplayBitsPerSample(int display);
/**
* @method flags=dynamic
* @param display cast=(CGDirectDisplayID)
*/
-public static final native int /*long*/ CGDisplayBytesPerRow(int display);
+public static final native long /*int*/ CGDisplayBytesPerRow(int display);
/** C calls */
public static final native int getpid();
-public static final native void call(int /*long*/ proc, int /*long*/ id, int /*long*/ sel);
+public static final native void call(long /*int*/ proc, long /*int*/ id, long /*int*/ sel);
/** @method flags=no_gen */
public static final native boolean __BIG_ENDIAN__();
@@ -405,53 +405,53 @@ public static final int kCGBitmapByteOrder32Host = __BIG_ENDIAN__() ? kCGBitmapB
* @param destRect flags=struct
* @param srcRect flags=struct
*/
-public static final native void CGContextCopyWindowContentsToRect(int /*long*/ context, CGRect destRect, int /*long*/ contextID, int /*long*/ windowNumber, CGRect srcRect);
+public static final native void CGContextCopyWindowContentsToRect(long /*int*/ context, CGRect destRect, long /*int*/ contextID, long /*int*/ windowNumber, CGRect srcRect);
/**
* @method flags=dynamic
* @param displayID cast=(CGDirectDisplayID)
*/
-public static final native int /*long*/ CGDisplayCreateImage(int displayID);
+public static final native long /*int*/ CGDisplayCreateImage(int displayID);
/** QuickDraw calls */
/** @method flags=dynamic */
-public static final native int /*long*/ NewRgn();
+public static final native long /*int*/ NewRgn();
/** @method flags=dynamic */
-public static final native void RectRgn(int /*long*/ rgnHandle, short[] rect);
+public static final native void RectRgn(long /*int*/ rgnHandle, short[] rect);
/** @method flags=dynamic */
public static final native void OpenRgn();
/** @method flags=dynamic */
-public static final native void OffsetRgn(int /*long*/ rgnHandle, short dh, short dv);
+public static final native void OffsetRgn(long /*int*/ rgnHandle, short dh, short dv);
/** @method flags=dynamic */
public static final native void MoveTo(short h, short v);
/** @method flags=dynamic */
public static final native void LineTo(short h, short v);
/** @method flags=dynamic */
-public static final native void UnionRgn(int /*long*/ srcRgnA, int /*long*/ srcRgnB, int /*long*/ dstRgn);
+public static final native void UnionRgn(long /*int*/ srcRgnA, long /*int*/ srcRgnB, long /*int*/ dstRgn);
/** @method flags=dynamic */
-public static final native void CloseRgn(int /*long*/ dstRgn);
+public static final native void CloseRgn(long /*int*/ dstRgn);
/** @method flags=dynamic */
-public static final native void DisposeRgn(int /*long*/ rgnHandle);
+public static final native void DisposeRgn(long /*int*/ rgnHandle);
/**
* @method flags=dynamic
* @param pt flags=struct,cast=(Point *)
*/
-public static final native boolean PtInRgn(short[] pt, int /*long*/ rgnHandle);
+public static final native boolean PtInRgn(short[] pt, long /*int*/ rgnHandle);
/** @method flags=dynamic */
-public static final native void GetRegionBounds(int /*long*/ rgnHandle, short[] bounds);
+public static final native void GetRegionBounds(long /*int*/ rgnHandle, short[] bounds);
/** @method flags=dynamic */
-public static final native void SectRgn(int /*long*/ srcRgnA, int /*long*/ srcRgnB, int /*long*/ dstRgn);
+public static final native void SectRgn(long /*int*/ srcRgnA, long /*int*/ srcRgnB, long /*int*/ dstRgn);
/** @method flags=dynamic */
-public static final native boolean EmptyRgn(int /*long*/ rgnHandle);
+public static final native boolean EmptyRgn(long /*int*/ rgnHandle);
/** @method flags=dynamic */
-public static final native void DiffRgn(int /*long*/ srcRgnA, int /*long*/ srcRgnB, int /*long*/ dstRgn);
+public static final native void DiffRgn(long /*int*/ srcRgnA, long /*int*/ srcRgnB, long /*int*/ dstRgn);
/** @method flags=dynamic */
-public static final native boolean RectInRgn(short[] rect, int /*long*/ rgnHandle);
+public static final native boolean RectInRgn(short[] rect, long /*int*/ rgnHandle);
/** @method flags=dynamic */
-public static final native int QDRegionToRects(int /*long*/ rgn, int dir, int /*long*/ proc, int /*long*/ userData);
+public static final native int QDRegionToRects(long /*int*/ rgn, int dir, long /*int*/ proc, long /*int*/ userData);
/** @method flags=dynamic */
-public static final native void CopyRgn(int /*long*/ srcRgnHandle, int /*long*/ dstRgnHandle);
+public static final native void CopyRgn(long /*int*/ srcRgnHandle, long /*int*/ dstRgnHandle);
/** @method flags=dynamic */
public static final native void SetRect(short[] r, short left, short top, short right, short bottom);
public static final int kQDParseRegionFromTop = (1 << 0);
@@ -465,7 +465,7 @@ public static final int kQDRegionToRectsMsgParse = 2;
* @method flags=dynamic
* @param inWindow cast=(WindowRef)
*/
-public static final native int HIWindowGetCGWindowID(int /*long*/ inWindow);
+public static final native int HIWindowGetCGWindowID(long /*int*/ inWindow);
/** JavaScriptCore calls */
@@ -476,17 +476,17 @@ public static final native int HIWindowGetCGWindowID(int /*long*/ inWindow);
* @param sourceURL cast=(JSStringRef)
* @param exception cast=(JSValueRef *)
*/
-public static final native int /*long*/ JSEvaluateScript (int /*long*/ ctx, int /*long*/ script, int /*long*/ thisObject, int /*long*/ sourceURL, int startingLineNumber, int /*long*/[] exception);
+public static final native long /*int*/ JSEvaluateScript (long /*int*/ ctx, long /*int*/ script, long /*int*/ thisObject, long /*int*/ sourceURL, int startingLineNumber, long /*int*/[] exception);
/**
* @param string cast=(const char *)
*/
-public static final native int /*long*/ JSStringCreateWithUTF8CString (byte[] string);
+public static final native long /*int*/ JSStringCreateWithUTF8CString (byte[] string);
/**
* @param string cast=(JSStringRef)
*/
-public static final native void JSStringRelease (int /*long*/ string);
+public static final native void JSStringRelease (long /*int*/ string);
/** Certificate Security */
@@ -497,20 +497,20 @@ public static final native void JSStringRelease (int /*long*/ string);
* @param value cast=(CSSM_DATA *)
* @param policySearch cast=(SecPolicySearchRef *)
*/
-public static final native int SecPolicySearchCreate(int /*long*/ certType, int /*long*/ policyOID, int /*long*/ value, int /*long*/ [] policySearch);
+public static final native int SecPolicySearchCreate(long /*int*/ certType, long /*int*/ policyOID, long /*int*/ value, long /*int*/ [] policySearch);
/**
* @param searchRef cast=(SecPolicySearchRef)
* @param policyRef cast=(SecPolicyRef *)
*/
-public static final native int SecPolicySearchCopyNext(int /*long*/ searchRef, int /*long*/ [] policyRef);
+public static final native int SecPolicySearchCopyNext(long /*int*/ searchRef, long /*int*/ [] policyRef);
/**
* @param certificates cast=(CFArrayRef)
* @param policies cast=(CFTypeRef)
* @param trustRef cast=(SecTrustRef *)
*/
-public static final native int SecTrustCreateWithCertificates(int /*long*/ certificates, int /*long*/ policies, int /*long*/ [] trustRef);
+public static final native int SecTrustCreateWithCertificates(long /*int*/ certificates, long /*int*/ policies, long /*int*/ [] trustRef);
public static final int CSSM_CERT_X_509v3 = 0x3;
@@ -518,7 +518,7 @@ public static final int CSSM_CERT_X_509v3 = 0x3;
/** Custom callbacks */
/** @method flags=no_gen */
-public static final native int /*long*/ isFlipped_CALLBACK();
+public static final native long /*int*/ isFlipped_CALLBACK();
/** Custom structure return */
@@ -531,9 +531,9 @@ public static final native void NSIntersectionRect (NSRect result, NSRect aRect,
public static final native void CGDisplayBounds(int display, CGRect rect);
/** @method flags=const address*/
-public static final native int /*long*/ kCFTypeDictionaryKeyCallBacks();
+public static final native long /*int*/ kCFTypeDictionaryKeyCallBacks();
/** @method flags=const address*/
-public static final native int /*long*/ kCFTypeDictionaryValueCallBacks();
+public static final native long /*int*/ kCFTypeDictionaryValueCallBacks();
/** Objective-C runtime */
@@ -542,1745 +542,1745 @@ public static final native int /*long*/ kCFTypeDictionaryValueCallBacks();
* @param name cast=(const char *),flags=critical
* @param types cast=(const char *),flags=critical
*/
-public static final native boolean class_addIvar(int /*long*/ cls, byte[] name, int /*long*/ size, byte alignment, byte[] types);
+public static final native boolean class_addIvar(long /*int*/ cls, byte[] name, long /*int*/ size, byte alignment, byte[] types);
/**
* @param cls cast=(Class)
* @param name cast=(SEL)
* @param imp cast=(IMP)
*/
-public static final native boolean class_addMethod(int /*long*/ cls, int /*long*/ name, int /*long*/ imp, String types);
+public static final native boolean class_addMethod(long /*int*/ cls, long /*int*/ name, long /*int*/ imp, String types);
/**
* @param cls cast=(Class)
* @param protocol cast=(Protocol *)
*/
-public static final native boolean class_addProtocol(int /*long*/ cls, int /*long*/ protocol);
+public static final native boolean class_addProtocol(long /*int*/ cls, long /*int*/ protocol);
/**
* @param aClass cast=(Class)
* @param aSelector cast=(SEL)
*/
-public static final native int /*long*/ class_getClassMethod(int /*long*/ aClass, int /*long*/ aSelector);
+public static final native long /*int*/ class_getClassMethod(long /*int*/ aClass, long /*int*/ aSelector);
/**
* @param cls cast=(Class)
* @param name cast=(SEL)
*/
-public static final native int /*long*/ class_getMethodImplementation(int /*long*/ cls, int /*long*/ name);
+public static final native long /*int*/ class_getMethodImplementation(long /*int*/ cls, long /*int*/ name);
/**
* @param cls cast=(Class)
* @param name cast=(SEL)
*/
-public static final native int /*long*/ class_getInstanceMethod(int /*long*/ cls, int /*long*/ name);
+public static final native long /*int*/ class_getInstanceMethod(long /*int*/ cls, long /*int*/ name);
/** @param cls cast=(Class) */
-public static final native int /*long*/ class_getSuperclass(int /*long*/ cls);
+public static final native long /*int*/ class_getSuperclass(long /*int*/ cls);
/**
* @param method cast=(Method)
* @param imp cast=(IMP)
*/
-public static final native int /*long*/ method_setImplementation(int /*long*/ method, int /*long*/ imp);
+public static final native long /*int*/ method_setImplementation(long /*int*/ method, long /*int*/ imp);
/**
* @param sel cast=(SEL)
*/
-public static final native int /*long*/ sel_getName(int /*long*/ sel);
+public static final native long /*int*/ sel_getName(long /*int*/ sel);
/**
* @param cls cast=(Class)
* @param extraBytes cast=(size_t)
*/
-public static final native int /*long*/ class_createInstance(int /*long*/ cls, int /*long*/ extraBytes);
+public static final native long /*int*/ class_createInstance(long /*int*/ cls, long /*int*/ extraBytes);
/** @method flags=no_gen */
-public static final native String class_getName(int /*long*/ cls);
+public static final native String class_getName(long /*int*/ cls);
/** @method flags=dynamic */
public static final native void instrumentObjcMessageSends(boolean val);
/** @param superclass cast=(Class) */
-public static final native int /*long*/ objc_allocateClassPair(int /*long*/ superclass, String name, int /*long*/ extraBytes);
+public static final native long /*int*/ objc_allocateClassPair(long /*int*/ superclass, String name, long /*int*/ extraBytes);
/** @param klass cast=(Class) */
-public static final native void objc_disposeClassPair(int /*long*/ klass);
-public static final native int /*long*/ objc_getClass(String className);
-public static final native int /*long*/ objc_getMetaClass(String name);
-public static final native int /*long*/ objc_getProtocol(String name);
-public static final native int /*long*/ objc_lookUpClass(String className);
+public static final native void objc_disposeClassPair(long /*int*/ klass);
+public static final native long /*int*/ objc_getClass(String className);
+public static final native long /*int*/ objc_getMetaClass(String name);
+public static final native long /*int*/ objc_getProtocol(String name);
+public static final native long /*int*/ objc_lookUpClass(String className);
/** @param cls cast=(Class) */
-public static final native void objc_registerClassPair(int /*long*/ cls);
+public static final native void objc_registerClassPair(long /*int*/ cls);
/** @param obj cast=(id) */
-public static final native int /*long*/ object_getClassName(int /*long*/ obj);
+public static final native long /*int*/ object_getClassName(long /*int*/ obj);
/** @param obj cast=(id) */
-public static final native int /*long*/ object_getClass(int /*long*/ obj);
+public static final native long /*int*/ object_getClass(long /*int*/ obj);
/**
* @param obj cast=(id)
* @param name cast=(const char*),flags=critical
* @param outValue cast=(void **),flags=critical
*/
-public static final native int /*long*/ object_getInstanceVariable(int /*long*/ obj, byte[] name, int /*long*/ [] outValue);
+public static final native long /*int*/ object_getInstanceVariable(long /*int*/ obj, byte[] name, long /*int*/ [] outValue);
/**
* @param obj cast=(id)
* @param name cast=(const char*),flags=critical
* @param value cast=(void *),flags=critical
*/
-public static final native int /*long*/ object_setInstanceVariable(int /*long*/ obj, byte[] name, int /*long*/ value);
+public static final native long /*int*/ object_setInstanceVariable(long /*int*/ obj, byte[] name, long /*int*/ value);
/**
* @param obj cast=(id)
* @param clazz cast=(Class)
*/
-public static final native int /*long*/ object_setClass(int /*long*/ obj, int /*long*/ clazz);
-public static final native int /*long*/ sel_registerName(String selectorName);
+public static final native long /*int*/ object_setClass(long /*int*/ obj, long /*int*/ clazz);
+public static final native long /*int*/ sel_registerName(String selectorName);
public static final native int objc_super_sizeof();
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel, NSSize arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5);
+public static final native void objc_msgSend_stret(NSSize result, long /*int*/ id, long /*int*/ sel, NSSize arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5);
/** This section is auto generated */
/** Custom callbacks */
/** @method callback_types=id;id;SEL;NSPoint;,callback_flags=none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_accessibilityHitTest_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_accessibilityHitTest_(long /*int*/ func);
/** @method callback_types=NSAttributedString*;id;SEL;NSRange;,callback_flags=none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_attributedSubstringFromRange_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_attributedSubstringFromRange_(long /*int*/ func);
/** @method callback_types=BOOL;id;SEL;NSIndexSet*;NSPoint;,callback_flags=none;none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_canDragRowsWithIndexes_atPoint_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_canDragRowsWithIndexes_atPoint_(long /*int*/ func);
/** @method callback_types=NSSize;id;SEL;,callback_flags=struct;none;none; */
-public static final native int /*long*/ CALLBACK_cellSize(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_cellSize(long /*int*/ func);
/** @method callback_types=NSSize;id;SEL;NSRect;,callback_flags=struct;none;none;struct; */
-public static final native int /*long*/ CALLBACK_cellSizeForBounds_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_cellSizeForBounds_(long /*int*/ func);
/** @method callback_types=NSUInteger;id;SEL;NSPoint;,callback_flags=none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_characterIndexForPoint_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_characterIndexForPoint_(long /*int*/ func);
/** @method callback_types=NSInteger;id;SEL;NSPoint;,callback_flags=none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_columnAtPoint_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_columnAtPoint_(long /*int*/ func);
/** @method callback_types=BOOL;id;SEL;NSEvent*;NSSize;BOOL;,callback_flags=none;none;none;none;struct;none; */
-public static final native int /*long*/ CALLBACK_dragSelectionWithEvent_offset_slideBack_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_dragSelectionWithEvent_offset_slideBack_(long /*int*/ func);
/** @method callback_types=void;id;SEL;NSImage*;NSPoint;,callback_flags=none;none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_draggedImage_beganAt_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_draggedImage_beganAt_(long /*int*/ func);
/** @method callback_types=void;id;SEL;NSImage*;NSPoint;NSDragOperation;,callback_flags=none;none;none;none;struct;none; */
-public static final native int /*long*/ CALLBACK_draggedImage_endedAt_operation_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_draggedImage_endedAt_operation_(long /*int*/ func);
/** @method callback_types=void;id;SEL;NSRect;,callback_flags=none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_drawBackgroundInClipRect_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_drawBackgroundInClipRect_(long /*int*/ func);
/** @method callback_types=void;id;SEL;NSImage*;NSRect;NSView*;,callback_flags=none;none;none;none;struct;none; */
-public static final native int /*long*/ CALLBACK_drawImage_withFrame_inView_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_drawImage_withFrame_inView_(long /*int*/ func);
/** @method callback_types=void;id;SEL;NSRect;NSView*;,callback_flags=none;none;none;struct;none; */
-public static final native int /*long*/ CALLBACK_drawInteriorWithFrame_inView_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_drawInteriorWithFrame_inView_(long /*int*/ func);
/** @method callback_types=void;id;SEL;BOOL;NSRect;,callback_flags=none;none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_drawLabel_inRect_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_drawLabel_inRect_(long /*int*/ func);
/** @method callback_types=void;id;SEL;NSRect;,callback_flags=none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_drawRect_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_drawRect_(long /*int*/ func);
/** @method callback_types=NSRect;id;SEL;NSAttributedString*;NSRect;NSView*;,callback_flags=struct;none;none;none;struct;none; */
-public static final native int /*long*/ CALLBACK_drawTitle_withFrame_inView_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_drawTitle_withFrame_inView_(long /*int*/ func);
/** @method callback_types=void;id;SEL;NSRect;,callback_flags=none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_drawViewBackgroundInRect_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_drawViewBackgroundInRect_(long /*int*/ func);
/** @method callback_types=void;id;SEL;NSRect;NSView*;,callback_flags=none;none;none;struct;none; */
-public static final native int /*long*/ CALLBACK_drawWithExpansionFrame_inView_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_drawWithExpansionFrame_inView_(long /*int*/ func);
/** @method callback_types=NSRect;id;SEL;NSRect;NSView*;,callback_flags=struct;none;none;struct;none; */
-public static final native int /*long*/ CALLBACK_expansionFrameWithFrame_inView_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_expansionFrameWithFrame_inView_(long /*int*/ func);
/** @method callback_types=NSRect;id;SEL;NSRange;,callback_flags=struct;none;none;struct; */
-public static final native int /*long*/ CALLBACK_firstRectForCharacterRange_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_firstRectForCharacterRange_(long /*int*/ func);
/** @method callback_types=NSRect;id;SEL;NSInteger;,callback_flags=struct;none;none;none; */
-public static final native int /*long*/ CALLBACK_headerRectOfColumn_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_headerRectOfColumn_(long /*int*/ func);
/** @method callback_types=void;id;SEL;NSRect;,callback_flags=none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_highlightSelectionInClipRect_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_highlightSelectionInClipRect_(long /*int*/ func);
/** @method callback_types=NSView*;id;SEL;NSPoint;,callback_flags=none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_hitTest_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_hitTest_(long /*int*/ func);
/** @method callback_types=NSUInteger;id;SEL;NSEvent*;NSRect;NSView*;,callback_flags=none;none;none;none;struct;none; */
-public static final native int /*long*/ CALLBACK_hitTestForEvent_inRect_ofView_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_hitTestForEvent_inRect_ofView_(long /*int*/ func);
/** @method callback_types=NSRect;id;SEL;NSRect;,callback_flags=struct;none;none;struct; */
-public static final native int /*long*/ CALLBACK_imageRectForBounds_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_imageRectForBounds_(long /*int*/ func);
/** @method callback_types=NSRange;id;SEL;,callback_flags=struct;none;none; */
-public static final native int /*long*/ CALLBACK_markedRange(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_markedRange(long /*int*/ func);
/** @method callback_types=void;id;SEL;NSClipView*;NSPoint;,callback_flags=none;none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_scrollClipView_toPoint_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_scrollClipView_toPoint_(long /*int*/ func);
/** @method callback_types=NSRange;id;SEL;,callback_flags=struct;none;none; */
-public static final native int /*long*/ CALLBACK_selectedRange(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_selectedRange(long /*int*/ func);
/** @method callback_types=void;id;SEL;NSRect;,callback_flags=none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_setFrame_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_setFrame_(long /*int*/ func);
/** @method callback_types=void;id;SEL;NSPoint;,callback_flags=none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_setFrameOrigin_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_setFrameOrigin_(long /*int*/ func);
/** @method callback_types=void;id;SEL;NSSize;,callback_flags=none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_setFrameSize_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_setFrameSize_(long /*int*/ func);
/** @method callback_types=void;id;SEL;id;NSRange;,callback_flags=none;none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_setMarkedText_selectedRange_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_setMarkedText_selectedRange_(long /*int*/ func);
/** @method callback_types=void;id;SEL;NSRect;,callback_flags=none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_setNeedsDisplayInRect_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_setNeedsDisplayInRect_(long /*int*/ func);
/** @method callback_types=BOOL;id;SEL;NSRange;NSString*;,callback_flags=none;none;none;struct;none; */
-public static final native int /*long*/ CALLBACK_shouldChangeTextInRange_replacementString_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_shouldChangeTextInRange_replacementString_(long /*int*/ func);
/** @method callback_types=NSSize;id;SEL;BOOL;,callback_flags=struct;none;none;none; */
-public static final native int /*long*/ CALLBACK_sizeOfLabel_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_sizeOfLabel_(long /*int*/ func);
/** @method callback_types=NSRange;id;SEL;NSTextView*;NSRange;NSRange;,callback_flags=struct;none;none;none;struct;struct; */
-public static final native int /*long*/ CALLBACK_textView_willChangeSelectionFromCharacterRange_toCharacterRange_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_textView_willChangeSelectionFromCharacterRange_toCharacterRange_(long /*int*/ func);
/** @method callback_types=NSRect;id;SEL;NSRect;,callback_flags=struct;none;none;struct; */
-public static final native int /*long*/ CALLBACK_titleRectForBounds_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_titleRectForBounds_(long /*int*/ func);
/** @method callback_types=NSString*;id;SEL;NSView*;NSToolTipTag;NSPoint;void*;,callback_flags=none;none;none;none;none;struct;none; */
-public static final native int /*long*/ CALLBACK_view_stringForToolTip_point_userData_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_view_stringForToolTip_point_userData_(long /*int*/ func);
/** @method callback_types=void;id;SEL;WebView*;NSRect;,callback_flags=none;none;none;none;struct; */
-public static final native int /*long*/ CALLBACK_webView_setFrame_(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_webView_setFrame_(long /*int*/ func);
/** Classes */
-public static final int /*long*/ class_DOMDocument = objc_getClass("DOMDocument");
-public static final int /*long*/ class_DOMEvent = objc_getClass("DOMEvent");
-public static final int /*long*/ class_DOMKeyboardEvent = objc_getClass("DOMKeyboardEvent");
-public static final int /*long*/ class_DOMMouseEvent = objc_getClass("DOMMouseEvent");
-public static final int /*long*/ class_DOMUIEvent = objc_getClass("DOMUIEvent");
-public static final int /*long*/ class_DOMWheelEvent = objc_getClass("DOMWheelEvent");
-public static final int /*long*/ class_NSActionCell = objc_getClass("NSActionCell");
-public static final int /*long*/ class_NSAffineTransform = objc_getClass("NSAffineTransform");
-public static final int /*long*/ class_NSAlert = objc_getClass("NSAlert");
-public static final int /*long*/ class_NSAppleEventDescriptor = objc_getClass("NSAppleEventDescriptor");
-public static final int /*long*/ class_NSApplication = objc_getClass("NSApplication");
-public static final int /*long*/ class_NSArray = objc_getClass("NSArray");
-public static final int /*long*/ class_NSAssertionHandler = objc_getClass("NSAssertionHandler");
-public static final int /*long*/ class_NSAttributedString = objc_getClass("NSAttributedString");
-public static final int /*long*/ class_NSAutoreleasePool = objc_getClass("NSAutoreleasePool");
-public static final int /*long*/ class_NSBezierPath = objc_getClass("NSBezierPath");
-public static final int /*long*/ class_NSBitmapImageRep = objc_getClass("NSBitmapImageRep");
-public static final int /*long*/ class_NSBox = objc_getClass("NSBox");
-public static final int /*long*/ class_NSBrowserCell = objc_getClass("NSBrowserCell");
-public static final int /*long*/ class_NSBundle = objc_getClass("NSBundle");
-public static final int /*long*/ class_NSButton = objc_getClass("NSButton");
-public static final int /*long*/ class_NSButtonCell = objc_getClass("NSButtonCell");
-public static final int /*long*/ class_NSCalendarDate = objc_getClass("NSCalendarDate");
-public static final int /*long*/ class_NSCell = objc_getClass("NSCell");
-public static final int /*long*/ class_NSCharacterSet = objc_getClass("NSCharacterSet");
-public static final int /*long*/ class_NSClipView = objc_getClass("NSClipView");
-public static final int /*long*/ class_NSCoder = objc_getClass("NSCoder");
-public static final int /*long*/ class_NSColor = objc_getClass("NSColor");
-public static final int /*long*/ class_NSColorList = objc_getClass("NSColorList");
-public static final int /*long*/ class_NSColorPanel = objc_getClass("NSColorPanel");
-public static final int /*long*/ class_NSColorSpace = objc_getClass("NSColorSpace");
-public static final int /*long*/ class_NSComboBox = objc_getClass("NSComboBox");
-public static final int /*long*/ class_NSComboBoxCell = objc_getClass("NSComboBoxCell");
-public static final int /*long*/ class_NSControl = objc_getClass("NSControl");
-public static final int /*long*/ class_NSCursor = objc_getClass("NSCursor");
-public static final int /*long*/ class_NSData = objc_getClass("NSData");
-public static final int /*long*/ class_NSDate = objc_getClass("NSDate");
-public static final int /*long*/ class_NSDatePicker = objc_getClass("NSDatePicker");
-public static final int /*long*/ class_NSDictionary = objc_getClass("NSDictionary");
-public static final int /*long*/ class_NSDirectoryEnumerator = objc_getClass("NSDirectoryEnumerator");
-public static final int /*long*/ class_NSDockTile = objc_getClass("NSDockTile");
-public static final int /*long*/ class_NSEnumerator = objc_getClass("NSEnumerator");
-public static final int /*long*/ class_NSError = objc_getClass("NSError");
-public static final int /*long*/ class_NSEvent = objc_getClass("NSEvent");
-public static final int /*long*/ class_NSFileManager = objc_getClass("NSFileManager");
-public static final int /*long*/ class_NSFileWrapper = objc_getClass("NSFileWrapper");
-public static final int /*long*/ class_NSFont = objc_getClass("NSFont");
-public static final int /*long*/ class_NSFontManager = objc_getClass("NSFontManager");
-public static final int /*long*/ class_NSFontPanel = objc_getClass("NSFontPanel");
-public static final int /*long*/ class_NSFormatter = objc_getClass("NSFormatter");
-public static final int /*long*/ class_NSGradient = objc_getClass("NSGradient");
-public static final int /*long*/ class_NSGraphicsContext = objc_getClass("NSGraphicsContext");
-public static final int /*long*/ class_NSHTTPCookie = objc_getClass("NSHTTPCookie");
-public static final int /*long*/ class_NSHTTPCookieStorage = objc_getClass("NSHTTPCookieStorage");
-public static final int /*long*/ class_NSImage = objc_getClass("NSImage");
-public static final int /*long*/ class_NSImageRep = objc_getClass("NSImageRep");
-public static final int /*long*/ class_NSImageView = objc_getClass("NSImageView");
-public static final int /*long*/ class_NSIndexSet = objc_getClass("NSIndexSet");
-public static final int /*long*/ class_NSInputManager = objc_getClass("NSInputManager");
-public static final int /*long*/ class_NSKeyedArchiver = objc_getClass("NSKeyedArchiver");
-public static final int /*long*/ class_NSKeyedUnarchiver = objc_getClass("NSKeyedUnarchiver");
-public static final int /*long*/ class_NSLayoutManager = objc_getClass("NSLayoutManager");
-public static final int /*long*/ class_NSLocale = objc_getClass("NSLocale");
-public static final int /*long*/ class_NSMenu = objc_getClass("NSMenu");
-public static final int /*long*/ class_NSMenuItem = objc_getClass("NSMenuItem");
-public static final int /*long*/ class_NSMutableArray = objc_getClass("NSMutableArray");
-public static final int /*long*/ class_NSMutableAttributedString = objc_getClass("NSMutableAttributedString");
-public static final int /*long*/ class_NSMutableDictionary = objc_getClass("NSMutableDictionary");
-public static final int /*long*/ class_NSMutableIndexSet = objc_getClass("NSMutableIndexSet");
-public static final int /*long*/ class_NSMutableParagraphStyle = objc_getClass("NSMutableParagraphStyle");
-public static final int /*long*/ class_NSMutableSet = objc_getClass("NSMutableSet");
-public static final int /*long*/ class_NSMutableString = objc_getClass("NSMutableString");
-public static final int /*long*/ class_NSMutableURLRequest = objc_getClass("NSMutableURLRequest");
-public static final int /*long*/ class_NSNotification = objc_getClass("NSNotification");
-public static final int /*long*/ class_NSNotificationCenter = objc_getClass("NSNotificationCenter");
-public static final int /*long*/ class_NSNumber = objc_getClass("NSNumber");
-public static final int /*long*/ class_NSNumberFormatter = objc_getClass("NSNumberFormatter");
-public static final int /*long*/ class_NSObject = objc_getClass("NSObject");
-public static final int /*long*/ class_NSOpenGLContext = objc_getClass("NSOpenGLContext");
-public static final int /*long*/ class_NSOpenGLPixelFormat = objc_getClass("NSOpenGLPixelFormat");
-public static final int /*long*/ class_NSOpenPanel = objc_getClass("NSOpenPanel");
-public static final int /*long*/ class_NSOutlineView = objc_getClass("NSOutlineView");
-public static final int /*long*/ class_NSPanel = objc_getClass("NSPanel");
-public static final int /*long*/ class_NSParagraphStyle = objc_getClass("NSParagraphStyle");
-public static final int /*long*/ class_NSPasteboard = objc_getClass("NSPasteboard");
-public static final int /*long*/ class_NSPopUpButton = objc_getClass("NSPopUpButton");
-public static final int /*long*/ class_NSPrintInfo = objc_getClass("NSPrintInfo");
-public static final int /*long*/ class_NSPrintOperation = objc_getClass("NSPrintOperation");
-public static final int /*long*/ class_NSPrintPanel = objc_getClass("NSPrintPanel");
-public static final int /*long*/ class_NSPrinter = objc_getClass("NSPrinter");
-public static final int /*long*/ class_NSProgressIndicator = objc_getClass("NSProgressIndicator");
-public static final int /*long*/ class_NSResponder = objc_getClass("NSResponder");
-public static final int /*long*/ class_NSRunLoop = objc_getClass("NSRunLoop");
-public static final int /*long*/ class_NSSavePanel = objc_getClass("NSSavePanel");
-public static final int /*long*/ class_NSScreen = objc_getClass("NSScreen");
-public static final int /*long*/ class_NSScrollView = objc_getClass("NSScrollView");
-public static final int /*long*/ class_NSScroller = objc_getClass("NSScroller");
-public static final int /*long*/ class_NSSearchField = objc_getClass("NSSearchField");
-public static final int /*long*/ class_NSSearchFieldCell = objc_getClass("NSSearchFieldCell");
-public static final int /*long*/ class_NSSecureTextField = objc_getClass("NSSecureTextField");
-public static final int /*long*/ class_NSSegmentedCell = objc_getClass("NSSegmentedCell");
-public static final int /*long*/ class_NSSet = objc_getClass("NSSet");
-public static final int /*long*/ class_NSSlider = objc_getClass("NSSlider");
-public static final int /*long*/ class_NSStatusBar = objc_getClass("NSStatusBar");
-public static final int /*long*/ class_NSStatusItem = objc_getClass("NSStatusItem");
-public static final int /*long*/ class_NSStepper = objc_getClass("NSStepper");
-public static final int /*long*/ class_NSString = objc_getClass("NSString");
-public static final int /*long*/ class_NSTabView = objc_getClass("NSTabView");
-public static final int /*long*/ class_NSTabViewItem = objc_getClass("NSTabViewItem");
-public static final int /*long*/ class_NSTableColumn = objc_getClass("NSTableColumn");
-public static final int /*long*/ class_NSTableHeaderCell = objc_getClass("NSTableHeaderCell");
-public static final int /*long*/ class_NSTableHeaderView = objc_getClass("NSTableHeaderView");
-public static final int /*long*/ class_NSTableView = objc_getClass("NSTableView");
-public static final int /*long*/ class_NSText = objc_getClass("NSText");
-public static final int /*long*/ class_NSTextAttachment = objc_getClass("NSTextAttachment");
-public static final int /*long*/ class_NSTextContainer = objc_getClass("NSTextContainer");
-public static final int /*long*/ class_NSTextField = objc_getClass("NSTextField");
-public static final int /*long*/ class_NSTextFieldCell = objc_getClass("NSTextFieldCell");
-public static final int /*long*/ class_NSTextStorage = objc_getClass("NSTextStorage");
-public static final int /*long*/ class_NSTextTab = objc_getClass("NSTextTab");
-public static final int /*long*/ class_NSTextView = objc_getClass("NSTextView");
-public static final int /*long*/ class_NSThread = objc_getClass("NSThread");
-public static final int /*long*/ class_NSTimeZone = objc_getClass("NSTimeZone");
-public static final int /*long*/ class_NSTimer = objc_getClass("NSTimer");
-public static final int /*long*/ class_NSToolbar = objc_getClass("NSToolbar");
-public static final int /*long*/ class_NSToolbarItem = objc_getClass("NSToolbarItem");
-public static final int /*long*/ class_NSTouch = objc_getClass("NSTouch");
-public static final int /*long*/ class_NSTrackingArea = objc_getClass("NSTrackingArea");
-public static final int /*long*/ class_NSTypesetter = objc_getClass("NSTypesetter");
-public static final int /*long*/ class_NSURL = objc_getClass("NSURL");
-public static final int /*long*/ class_NSURLAuthenticationChallenge = objc_getClass("NSURLAuthenticationChallenge");
-public static final int /*long*/ class_NSURLCredential = objc_getClass("NSURLCredential");
-public static final int /*long*/ class_NSURLDownload = objc_getClass("NSURLDownload");
-public static final int /*long*/ class_NSURLProtectionSpace = objc_getClass("NSURLProtectionSpace");
-public static final int /*long*/ class_NSURLRequest = objc_getClass("NSURLRequest");
-public static final int /*long*/ class_NSUndoManager = objc_getClass("NSUndoManager");
-public static final int /*long*/ class_NSUserDefaults = objc_getClass("NSUserDefaults");
-public static final int /*long*/ class_NSValue = objc_getClass("NSValue");
-public static final int /*long*/ class_NSView = objc_getClass("NSView");
-public static final int /*long*/ class_NSWindow = objc_getClass("NSWindow");
-public static final int /*long*/ class_NSWorkspace = objc_getClass("NSWorkspace");
-public static final int /*long*/ class_SFCertificatePanel = objc_getClass("SFCertificatePanel");
-public static final int /*long*/ class_SFCertificateTrustPanel = objc_getClass("SFCertificateTrustPanel");
-public static final int /*long*/ class_WebDataSource = objc_getClass("WebDataSource");
-public static final int /*long*/ class_WebFrame = objc_getClass("WebFrame");
-public static final int /*long*/ class_WebFrameView = objc_getClass("WebFrameView");
-public static final int /*long*/ class_WebPreferences = objc_getClass("WebPreferences");
-public static final int /*long*/ class_WebScriptObject = objc_getClass("WebScriptObject");
-public static final int /*long*/ class_WebUndefined = objc_getClass("WebUndefined");
-public static final int /*long*/ class_WebView = objc_getClass("WebView");
+public static final long /*int*/ class_DOMDocument = objc_getClass("DOMDocument");
+public static final long /*int*/ class_DOMEvent = objc_getClass("DOMEvent");
+public static final long /*int*/ class_DOMKeyboardEvent = objc_getClass("DOMKeyboardEvent");
+public static final long /*int*/ class_DOMMouseEvent = objc_getClass("DOMMouseEvent");
+public static final long /*int*/ class_DOMUIEvent = objc_getClass("DOMUIEvent");
+public static final long /*int*/ class_DOMWheelEvent = objc_getClass("DOMWheelEvent");
+public static final long /*int*/ class_NSActionCell = objc_getClass("NSActionCell");
+public static final long /*int*/ class_NSAffineTransform = objc_getClass("NSAffineTransform");
+public static final long /*int*/ class_NSAlert = objc_getClass("NSAlert");
+public static final long /*int*/ class_NSAppleEventDescriptor = objc_getClass("NSAppleEventDescriptor");
+public static final long /*int*/ class_NSApplication = objc_getClass("NSApplication");
+public static final long /*int*/ class_NSArray = objc_getClass("NSArray");
+public static final long /*int*/ class_NSAssertionHandler = objc_getClass("NSAssertionHandler");
+public static final long /*int*/ class_NSAttributedString = objc_getClass("NSAttributedString");
+public static final long /*int*/ class_NSAutoreleasePool = objc_getClass("NSAutoreleasePool");
+public static final long /*int*/ class_NSBezierPath = objc_getClass("NSBezierPath");
+public static final long /*int*/ class_NSBitmapImageRep = objc_getClass("NSBitmapImageRep");
+public static final long /*int*/ class_NSBox = objc_getClass("NSBox");
+public static final long /*int*/ class_NSBrowserCell = objc_getClass("NSBrowserCell");
+public static final long /*int*/ class_NSBundle = objc_getClass("NSBundle");
+public static final long /*int*/ class_NSButton = objc_getClass("NSButton");
+public static final long /*int*/ class_NSButtonCell = objc_getClass("NSButtonCell");
+public static final long /*int*/ class_NSCalendarDate = objc_getClass("NSCalendarDate");
+public static final long /*int*/ class_NSCell = objc_getClass("NSCell");
+public static final long /*int*/ class_NSCharacterSet = objc_getClass("NSCharacterSet");
+public static final long /*int*/ class_NSClipView = objc_getClass("NSClipView");
+public static final long /*int*/ class_NSCoder = objc_getClass("NSCoder");
+public static final long /*int*/ class_NSColor = objc_getClass("NSColor");
+public static final long /*int*/ class_NSColorList = objc_getClass("NSColorList");
+public static final long /*int*/ class_NSColorPanel = objc_getClass("NSColorPanel");
+public static final long /*int*/ class_NSColorSpace = objc_getClass("NSColorSpace");
+public static final long /*int*/ class_NSComboBox = objc_getClass("NSComboBox");
+public static final long /*int*/ class_NSComboBoxCell = objc_getClass("NSComboBoxCell");
+public static final long /*int*/ class_NSControl = objc_getClass("NSControl");
+public static final long /*int*/ class_NSCursor = objc_getClass("NSCursor");
+public static final long /*int*/ class_NSData = objc_getClass("NSData");
+public static final long /*int*/ class_NSDate = objc_getClass("NSDate");
+public static final long /*int*/ class_NSDatePicker = objc_getClass("NSDatePicker");
+public static final long /*int*/ class_NSDictionary = objc_getClass("NSDictionary");
+public static final long /*int*/ class_NSDirectoryEnumerator = objc_getClass("NSDirectoryEnumerator");
+public static final long /*int*/ class_NSDockTile = objc_getClass("NSDockTile");
+public static final long /*int*/ class_NSEnumerator = objc_getClass("NSEnumerator");
+public static final long /*int*/ class_NSError = objc_getClass("NSError");
+public static final long /*int*/ class_NSEvent = objc_getClass("NSEvent");
+public static final long /*int*/ class_NSFileManager = objc_getClass("NSFileManager");
+public static final long /*int*/ class_NSFileWrapper = objc_getClass("NSFileWrapper");
+public static final long /*int*/ class_NSFont = objc_getClass("NSFont");
+public static final long /*int*/ class_NSFontManager = objc_getClass("NSFontManager");
+public static final long /*int*/ class_NSFontPanel = objc_getClass("NSFontPanel");
+public static final long /*int*/ class_NSFormatter = objc_getClass("NSFormatter");
+public static final long /*int*/ class_NSGradient = objc_getClass("NSGradient");
+public static final long /*int*/ class_NSGraphicsContext = objc_getClass("NSGraphicsContext");
+public static final long /*int*/ class_NSHTTPCookie = objc_getClass("NSHTTPCookie");
+public static final long /*int*/ class_NSHTTPCookieStorage = objc_getClass("NSHTTPCookieStorage");
+public static final long /*int*/ class_NSImage = objc_getClass("NSImage");
+public static final long /*int*/ class_NSImageRep = objc_getClass("NSImageRep");
+public static final long /*int*/ class_NSImageView = objc_getClass("NSImageView");
+public static final long /*int*/ class_NSIndexSet = objc_getClass("NSIndexSet");
+public static final long /*int*/ class_NSInputManager = objc_getClass("NSInputManager");
+public static final long /*int*/ class_NSKeyedArchiver = objc_getClass("NSKeyedArchiver");
+public static final long /*int*/ class_NSKeyedUnarchiver = objc_getClass("NSKeyedUnarchiver");
+public static final long /*int*/ class_NSLayoutManager = objc_getClass("NSLayoutManager");
+public static final long /*int*/ class_NSLocale = objc_getClass("NSLocale");
+public static final long /*int*/ class_NSMenu = objc_getClass("NSMenu");
+public static final long /*int*/ class_NSMenuItem = objc_getClass("NSMenuItem");
+public static final long /*int*/ class_NSMutableArray = objc_getClass("NSMutableArray");
+public static final long /*int*/ class_NSMutableAttributedString = objc_getClass("NSMutableAttributedString");
+public static final long /*int*/ class_NSMutableDictionary = objc_getClass("NSMutableDictionary");
+public static final long /*int*/ class_NSMutableIndexSet = objc_getClass("NSMutableIndexSet");
+public static final long /*int*/ class_NSMutableParagraphStyle = objc_getClass("NSMutableParagraphStyle");
+public static final long /*int*/ class_NSMutableSet = objc_getClass("NSMutableSet");
+public static final long /*int*/ class_NSMutableString = objc_getClass("NSMutableString");
+public static final long /*int*/ class_NSMutableURLRequest = objc_getClass("NSMutableURLRequest");
+public static final long /*int*/ class_NSNotification = objc_getClass("NSNotification");
+public static final long /*int*/ class_NSNotificationCenter = objc_getClass("NSNotificationCenter");
+public static final long /*int*/ class_NSNumber = objc_getClass("NSNumber");
+public static final long /*int*/ class_NSNumberFormatter = objc_getClass("NSNumberFormatter");
+public static final long /*int*/ class_NSObject = objc_getClass("NSObject");
+public static final long /*int*/ class_NSOpenGLContext = objc_getClass("NSOpenGLContext");
+public static final long /*int*/ class_NSOpenGLPixelFormat = objc_getClass("NSOpenGLPixelFormat");
+public static final long /*int*/ class_NSOpenPanel = objc_getClass("NSOpenPanel");
+public static final long /*int*/ class_NSOutlineView = objc_getClass("NSOutlineView");
+public static final long /*int*/ class_NSPanel = objc_getClass("NSPanel");
+public static final long /*int*/ class_NSParagraphStyle = objc_getClass("NSParagraphStyle");
+public static final long /*int*/ class_NSPasteboard = objc_getClass("NSPasteboard");
+public static final long /*int*/ class_NSPopUpButton = objc_getClass("NSPopUpButton");
+public static final long /*int*/ class_NSPrintInfo = objc_getClass("NSPrintInfo");
+public static final long /*int*/ class_NSPrintOperation = objc_getClass("NSPrintOperation");
+public static final long /*int*/ class_NSPrintPanel = objc_getClass("NSPrintPanel");
+public static final long /*int*/ class_NSPrinter = objc_getClass("NSPrinter");
+public static final long /*int*/ class_NSProgressIndicator = objc_getClass("NSProgressIndicator");
+public static final long /*int*/ class_NSResponder = objc_getClass("NSResponder");
+public static final long /*int*/ class_NSRunLoop = objc_getClass("NSRunLoop");
+public static final long /*int*/ class_NSSavePanel = objc_getClass("NSSavePanel");
+public static final long /*int*/ class_NSScreen = objc_getClass("NSScreen");
+public static final long /*int*/ class_NSScrollView = objc_getClass("NSScrollView");
+public static final long /*int*/ class_NSScroller = objc_getClass("NSScroller");
+public static final long /*int*/ class_NSSearchField = objc_getClass("NSSearchField");
+public static final long /*int*/ class_NSSearchFieldCell = objc_getClass("NSSearchFieldCell");
+public static final long /*int*/ class_NSSecureTextField = objc_getClass("NSSecureTextField");
+public static final long /*int*/ class_NSSegmentedCell = objc_getClass("NSSegmentedCell");
+public static final long /*int*/ class_NSSet = objc_getClass("NSSet");
+public static final long /*int*/ class_NSSlider = objc_getClass("NSSlider");
+public static final long /*int*/ class_NSStatusBar = objc_getClass("NSStatusBar");
+public static final long /*int*/ class_NSStatusItem = objc_getClass("NSStatusItem");
+public static final long /*int*/ class_NSStepper = objc_getClass("NSStepper");
+public static final long /*int*/ class_NSString = objc_getClass("NSString");
+public static final long /*int*/ class_NSTabView = objc_getClass("NSTabView");
+public static final long /*int*/ class_NSTabViewItem = objc_getClass("NSTabViewItem");
+public static final long /*int*/ class_NSTableColumn = objc_getClass("NSTableColumn");
+public static final long /*int*/ class_NSTableHeaderCell = objc_getClass("NSTableHeaderCell");
+public static final long /*int*/ class_NSTableHeaderView = objc_getClass("NSTableHeaderView");
+public static final long /*int*/ class_NSTableView = objc_getClass("NSTableView");
+public static final long /*int*/ class_NSText = objc_getClass("NSText");
+public static final long /*int*/ class_NSTextAttachment = objc_getClass("NSTextAttachment");
+public static final long /*int*/ class_NSTextContainer = objc_getClass("NSTextContainer");
+public static final long /*int*/ class_NSTextField = objc_getClass("NSTextField");
+public static final long /*int*/ class_NSTextFieldCell = objc_getClass("NSTextFieldCell");
+public static final long /*int*/ class_NSTextStorage = objc_getClass("NSTextStorage");
+public static final long /*int*/ class_NSTextTab = objc_getClass("NSTextTab");
+public static final long /*int*/ class_NSTextView = objc_getClass("NSTextView");
+public static final long /*int*/ class_NSThread = objc_getClass("NSThread");
+public static final long /*int*/ class_NSTimeZone = objc_getClass("NSTimeZone");
+public static final long /*int*/ class_NSTimer = objc_getClass("NSTimer");
+public static final long /*int*/ class_NSToolbar = objc_getClass("NSToolbar");
+public static final long /*int*/ class_NSToolbarItem = objc_getClass("NSToolbarItem");
+public static final long /*int*/ class_NSTouch = objc_getClass("NSTouch");
+public static final long /*int*/ class_NSTrackingArea = objc_getClass("NSTrackingArea");
+public static final long /*int*/ class_NSTypesetter = objc_getClass("NSTypesetter");
+public static final long /*int*/ class_NSURL = objc_getClass("NSURL");
+public static final long /*int*/ class_NSURLAuthenticationChallenge = objc_getClass("NSURLAuthenticationChallenge");
+public static final long /*int*/ class_NSURLCredential = objc_getClass("NSURLCredential");
+public static final long /*int*/ class_NSURLDownload = objc_getClass("NSURLDownload");
+public static final long /*int*/ class_NSURLProtectionSpace = objc_getClass("NSURLProtectionSpace");
+public static final long /*int*/ class_NSURLRequest = objc_getClass("NSURLRequest");
+public static final long /*int*/ class_NSUndoManager = objc_getClass("NSUndoManager");
+public static final long /*int*/ class_NSUserDefaults = objc_getClass("NSUserDefaults");
+public static final long /*int*/ class_NSValue = objc_getClass("NSValue");
+public static final long /*int*/ class_NSView = objc_getClass("NSView");
+public static final long /*int*/ class_NSWindow = objc_getClass("NSWindow");
+public static final long /*int*/ class_NSWorkspace = objc_getClass("NSWorkspace");
+public static final long /*int*/ class_SFCertificatePanel = objc_getClass("SFCertificatePanel");
+public static final long /*int*/ class_SFCertificateTrustPanel = objc_getClass("SFCertificateTrustPanel");
+public static final long /*int*/ class_WebDataSource = objc_getClass("WebDataSource");
+public static final long /*int*/ class_WebFrame = objc_getClass("WebFrame");
+public static final long /*int*/ class_WebFrameView = objc_getClass("WebFrameView");
+public static final long /*int*/ class_WebPreferences = objc_getClass("WebPreferences");
+public static final long /*int*/ class_WebScriptObject = objc_getClass("WebScriptObject");
+public static final long /*int*/ class_WebUndefined = objc_getClass("WebUndefined");
+public static final long /*int*/ class_WebView = objc_getClass("WebView");
/** Protocols */
-public static final int /*long*/ protocol_NSAccessibility = objc_getProtocol("NSAccessibility");
-public static final int /*long*/ protocol_NSAccessibilityAdditions = objc_getProtocol("NSAccessibilityAdditions");
-public static final int /*long*/ protocol_NSApplicationDelegate = objc_getProtocol("NSApplicationDelegate");
-public static final int /*long*/ protocol_NSApplicationNotifications = objc_getProtocol("NSApplicationNotifications");
-public static final int /*long*/ protocol_NSColorPanelResponderMethod = objc_getProtocol("NSColorPanelResponderMethod");
-public static final int /*long*/ protocol_NSComboBoxNotifications = objc_getProtocol("NSComboBoxNotifications");
-public static final int /*long*/ protocol_NSDraggingDestination = objc_getProtocol("NSDraggingDestination");
-public static final int /*long*/ protocol_NSDraggingSource = objc_getProtocol("NSDraggingSource");
-public static final int /*long*/ protocol_NSFontManagerResponderMethod = objc_getProtocol("NSFontManagerResponderMethod");
-public static final int /*long*/ protocol_NSFontPanelValidationAdditions = objc_getProtocol("NSFontPanelValidationAdditions");
-public static final int /*long*/ protocol_NSMenuDelegate = objc_getProtocol("NSMenuDelegate");
-public static final int /*long*/ protocol_NSMenuValidation = objc_getProtocol("NSMenuValidation");
-public static final int /*long*/ protocol_NSOutlineViewDataSource = objc_getProtocol("NSOutlineViewDataSource");
-public static final int /*long*/ protocol_NSOutlineViewDelegate = objc_getProtocol("NSOutlineViewDelegate");
-public static final int /*long*/ protocol_NSOutlineViewNotifications = objc_getProtocol("NSOutlineViewNotifications");
-public static final int /*long*/ protocol_NSPasteboardOwner = objc_getProtocol("NSPasteboardOwner");
-public static final int /*long*/ protocol_NSSavePanelDelegate = objc_getProtocol("NSSavePanelDelegate");
-public static final int /*long*/ protocol_NSTabViewDelegate = objc_getProtocol("NSTabViewDelegate");
-public static final int /*long*/ protocol_NSTableDataSource = objc_getProtocol("NSTableDataSource");
-public static final int /*long*/ protocol_NSTableViewDelegate = objc_getProtocol("NSTableViewDelegate");
-public static final int /*long*/ protocol_NSTableViewNotifications = objc_getProtocol("NSTableViewNotifications");
-public static final int /*long*/ protocol_NSTextDelegate = objc_getProtocol("NSTextDelegate");
-public static final int /*long*/ protocol_NSTextInput = objc_getProtocol("NSTextInput");
-public static final int /*long*/ protocol_NSTextViewDelegate = objc_getProtocol("NSTextViewDelegate");
-public static final int /*long*/ protocol_NSToolTipOwner = objc_getProtocol("NSToolTipOwner");
-public static final int /*long*/ protocol_NSToolbarDelegate = objc_getProtocol("NSToolbarDelegate");
-public static final int /*long*/ protocol_NSToolbarNotifications = objc_getProtocol("NSToolbarNotifications");
-public static final int /*long*/ protocol_NSURLDownloadDelegate = objc_getProtocol("NSURLDownloadDelegate");
-public static final int /*long*/ protocol_NSWindowDelegate = objc_getProtocol("NSWindowDelegate");
-public static final int /*long*/ protocol_NSWindowNotifications = objc_getProtocol("NSWindowNotifications");
-public static final int /*long*/ protocol_WebDocumentRepresentation = objc_getProtocol("WebDocumentRepresentation");
-public static final int /*long*/ protocol_WebFrameLoadDelegate = objc_getProtocol("WebFrameLoadDelegate");
-public static final int /*long*/ protocol_WebOpenPanelResultListener = objc_getProtocol("WebOpenPanelResultListener");
-public static final int /*long*/ protocol_WebPolicyDecisionListener = objc_getProtocol("WebPolicyDecisionListener");
-public static final int /*long*/ protocol_WebPolicyDelegate = objc_getProtocol("WebPolicyDelegate");
-public static final int /*long*/ protocol_WebResourceLoadDelegate = objc_getProtocol("WebResourceLoadDelegate");
-public static final int /*long*/ protocol_WebUIDelegate = objc_getProtocol("WebUIDelegate");
+public static final long /*int*/ protocol_NSAccessibility = objc_getProtocol("NSAccessibility");
+public static final long /*int*/ protocol_NSAccessibilityAdditions = objc_getProtocol("NSAccessibilityAdditions");
+public static final long /*int*/ protocol_NSApplicationDelegate = objc_getProtocol("NSApplicationDelegate");
+public static final long /*int*/ protocol_NSApplicationNotifications = objc_getProtocol("NSApplicationNotifications");
+public static final long /*int*/ protocol_NSColorPanelResponderMethod = objc_getProtocol("NSColorPanelResponderMethod");
+public static final long /*int*/ protocol_NSComboBoxNotifications = objc_getProtocol("NSComboBoxNotifications");
+public static final long /*int*/ protocol_NSDraggingDestination = objc_getProtocol("NSDraggingDestination");
+public static final long /*int*/ protocol_NSDraggingSource = objc_getProtocol("NSDraggingSource");
+public static final long /*int*/ protocol_NSFontManagerResponderMethod = objc_getProtocol("NSFontManagerResponderMethod");
+public static final long /*int*/ protocol_NSFontPanelValidationAdditions = objc_getProtocol("NSFontPanelValidationAdditions");
+public static final long /*int*/ protocol_NSMenuDelegate = objc_getProtocol("NSMenuDelegate");
+public static final long /*int*/ protocol_NSMenuValidation = objc_getProtocol("NSMenuValidation");
+public static final long /*int*/ protocol_NSOutlineViewDataSource = objc_getProtocol("NSOutlineViewDataSource");
+public static final long /*int*/ protocol_NSOutlineViewDelegate = objc_getProtocol("NSOutlineViewDelegate");
+public static final long /*int*/ protocol_NSOutlineViewNotifications = objc_getProtocol("NSOutlineViewNotifications");
+public static final long /*int*/ protocol_NSPasteboardOwner = objc_getProtocol("NSPasteboardOwner");
+public static final long /*int*/ protocol_NSSavePanelDelegate = objc_getProtocol("NSSavePanelDelegate");
+public static final long /*int*/ protocol_NSTabViewDelegate = objc_getProtocol("NSTabViewDelegate");
+public static final long /*int*/ protocol_NSTableDataSource = objc_getProtocol("NSTableDataSource");
+public static final long /*int*/ protocol_NSTableViewDelegate = objc_getProtocol("NSTableViewDelegate");
+public static final long /*int*/ protocol_NSTableViewNotifications = objc_getProtocol("NSTableViewNotifications");
+public static final long /*int*/ protocol_NSTextDelegate = objc_getProtocol("NSTextDelegate");
+public static final long /*int*/ protocol_NSTextInput = objc_getProtocol("NSTextInput");
+public static final long /*int*/ protocol_NSTextViewDelegate = objc_getProtocol("NSTextViewDelegate");
+public static final long /*int*/ protocol_NSToolTipOwner = objc_getProtocol("NSToolTipOwner");
+public static final long /*int*/ protocol_NSToolbarDelegate = objc_getProtocol("NSToolbarDelegate");
+public static final long /*int*/ protocol_NSToolbarNotifications = objc_getProtocol("NSToolbarNotifications");
+public static final long /*int*/ protocol_NSURLDownloadDelegate = objc_getProtocol("NSURLDownloadDelegate");
+public static final long /*int*/ protocol_NSWindowDelegate = objc_getProtocol("NSWindowDelegate");
+public static final long /*int*/ protocol_NSWindowNotifications = objc_getProtocol("NSWindowNotifications");
+public static final long /*int*/ protocol_WebDocumentRepresentation = objc_getProtocol("WebDocumentRepresentation");
+public static final long /*int*/ protocol_WebFrameLoadDelegate = objc_getProtocol("WebFrameLoadDelegate");
+public static final long /*int*/ protocol_WebOpenPanelResultListener = objc_getProtocol("WebOpenPanelResultListener");
+public static final long /*int*/ protocol_WebPolicyDecisionListener = objc_getProtocol("WebPolicyDecisionListener");
+public static final long /*int*/ protocol_WebPolicyDelegate = objc_getProtocol("WebPolicyDelegate");
+public static final long /*int*/ protocol_WebResourceLoadDelegate = objc_getProtocol("WebResourceLoadDelegate");
+public static final long /*int*/ protocol_WebUIDelegate = objc_getProtocol("WebUIDelegate");
/** Selectors */
-public static final int /*long*/ sel_CGEvent = sel_registerName("CGEvent");
-public static final int /*long*/ sel_DOMDocument = sel_registerName("DOMDocument");
-public static final int /*long*/ sel_IBeamCursor = sel_registerName("IBeamCursor");
-public static final int /*long*/ sel_PMPrintSession = sel_registerName("PMPrintSession");
-public static final int /*long*/ sel_PMPrintSettings = sel_registerName("PMPrintSettings");
-public static final int /*long*/ sel_TIFFRepresentation = sel_registerName("TIFFRepresentation");
-public static final int /*long*/ sel_URL = sel_registerName("URL");
-public static final int /*long*/ sel_URLFromPasteboard_ = sel_registerName("URLFromPasteboard:");
-public static final int /*long*/ sel_URLWithString_ = sel_registerName("URLWithString:");
-public static final int /*long*/ sel_URLsForDirectory_inDomains_ = sel_registerName("URLsForDirectory:inDomains:");
-public static final int /*long*/ sel_UTF8String = sel_registerName("UTF8String");
-public static final int /*long*/ sel_abortEditing = sel_registerName("abortEditing");
-public static final int /*long*/ sel_absoluteString = sel_registerName("absoluteString");
-public static final int /*long*/ sel_acceptsFirstMouse_ = sel_registerName("acceptsFirstMouse:");
-public static final int /*long*/ sel_acceptsFirstResponder = sel_registerName("acceptsFirstResponder");
-public static final int /*long*/ sel_accessibilityActionDescription_ = sel_registerName("accessibilityActionDescription:");
-public static final int /*long*/ sel_accessibilityActionNames = sel_registerName("accessibilityActionNames");
-public static final int /*long*/ sel_accessibilityAttributeNames = sel_registerName("accessibilityAttributeNames");
-public static final int /*long*/ sel_accessibilityAttributeValue_ = sel_registerName("accessibilityAttributeValue:");
-public static final int /*long*/ sel_accessibilityAttributeValue_forParameter_ = sel_registerName("accessibilityAttributeValue:forParameter:");
-public static final int /*long*/ sel_accessibilityFocusedUIElement = sel_registerName("accessibilityFocusedUIElement");
-public static final int /*long*/ sel_accessibilityHitTest_ = sel_registerName("accessibilityHitTest:");
-public static final int /*long*/ sel_accessibilityIsAttributeSettable_ = sel_registerName("accessibilityIsAttributeSettable:");
-public static final int /*long*/ sel_accessibilityIsIgnored = sel_registerName("accessibilityIsIgnored");
-public static final int /*long*/ sel_accessibilityParameterizedAttributeNames = sel_registerName("accessibilityParameterizedAttributeNames");
-public static final int /*long*/ sel_accessibilityPerformAction_ = sel_registerName("accessibilityPerformAction:");
-public static final int /*long*/ sel_accessibilitySetOverrideValue_forAttribute_ = sel_registerName("accessibilitySetOverrideValue:forAttribute:");
-public static final int /*long*/ sel_accessibilitySetValue_forAttribute_ = sel_registerName("accessibilitySetValue:forAttribute:");
-public static final int /*long*/ sel_action = sel_registerName("action");
-public static final int /*long*/ sel_activateIgnoringOtherApps_ = sel_registerName("activateIgnoringOtherApps:");
-public static final int /*long*/ sel_addAttribute_value_range_ = sel_registerName("addAttribute:value:range:");
-public static final int /*long*/ sel_addButtonWithTitle_ = sel_registerName("addButtonWithTitle:");
-public static final int /*long*/ sel_addChildWindow_ordered_ = sel_registerName("addChildWindow:ordered:");
-public static final int /*long*/ sel_addClip = sel_registerName("addClip");
-public static final int /*long*/ sel_addEventListener_listener_useCapture_ = sel_registerName("addEventListener:listener:useCapture:");
-public static final int /*long*/ sel_addIndex_ = sel_registerName("addIndex:");
-public static final int /*long*/ sel_addItem_ = sel_registerName("addItem:");
-public static final int /*long*/ sel_addItemWithObjectValue_ = sel_registerName("addItemWithObjectValue:");
-public static final int /*long*/ sel_addItemWithTitle_action_keyEquivalent_ = sel_registerName("addItemWithTitle:action:keyEquivalent:");
-public static final int /*long*/ sel_addLayoutManager_ = sel_registerName("addLayoutManager:");
-public static final int /*long*/ sel_addObject_ = sel_registerName("addObject:");
-public static final int /*long*/ sel_addObjectsFromArray_ = sel_registerName("addObjectsFromArray:");
-public static final int /*long*/ sel_addObserver_selector_name_object_ = sel_registerName("addObserver:selector:name:object:");
-public static final int /*long*/ sel_addRepresentation_ = sel_registerName("addRepresentation:");
-public static final int /*long*/ sel_addSubview_ = sel_registerName("addSubview:");
-public static final int /*long*/ sel_addSubview_positioned_relativeTo_ = sel_registerName("addSubview:positioned:relativeTo:");
-public static final int /*long*/ sel_addTabStop_ = sel_registerName("addTabStop:");
-public static final int /*long*/ sel_addTabViewItem_ = sel_registerName("addTabViewItem:");
-public static final int /*long*/ sel_addTableColumn_ = sel_registerName("addTableColumn:");
-public static final int /*long*/ sel_addTemporaryAttribute_value_forCharacterRange_ = sel_registerName("addTemporaryAttribute:value:forCharacterRange:");
-public static final int /*long*/ sel_addTextContainer_ = sel_registerName("addTextContainer:");
-public static final int /*long*/ sel_addTimer_forMode_ = sel_registerName("addTimer:forMode:");
-public static final int /*long*/ sel_addToolTipRect_owner_userData_ = sel_registerName("addToolTipRect:owner:userData:");
-public static final int /*long*/ sel_addTypes_owner_ = sel_registerName("addTypes:owner:");
-public static final int /*long*/ sel_alignment = sel_registerName("alignment");
-public static final int /*long*/ sel_allKeys = sel_registerName("allKeys");
-public static final int /*long*/ sel_allObjects = sel_registerName("allObjects");
-public static final int /*long*/ sel_alloc = sel_registerName("alloc");
-public static final int /*long*/ sel_allowsColumnReordering = sel_registerName("allowsColumnReordering");
-public static final int /*long*/ sel_allowsFloats = sel_registerName("allowsFloats");
-public static final int /*long*/ sel_alphaComponent = sel_registerName("alphaComponent");
-public static final int /*long*/ sel_alphaValue = sel_registerName("alphaValue");
-public static final int /*long*/ sel_altKey = sel_registerName("altKey");
-public static final int /*long*/ sel_alternateSelectedControlColor = sel_registerName("alternateSelectedControlColor");
-public static final int /*long*/ sel_alternateSelectedControlTextColor = sel_registerName("alternateSelectedControlTextColor");
-public static final int /*long*/ sel_alwaysShowsDecimalSeparator = sel_registerName("alwaysShowsDecimalSeparator");
-public static final int /*long*/ sel_appendAttributedString_ = sel_registerName("appendAttributedString:");
-public static final int /*long*/ sel_appendBezierPath_ = sel_registerName("appendBezierPath:");
-public static final int /*long*/ sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_ = sel_registerName("appendBezierPathWithArcWithCenter:radius:startAngle:endAngle:");
-public static final int /*long*/ sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_clockwise_ = sel_registerName("appendBezierPathWithArcWithCenter:radius:startAngle:endAngle:clockwise:");
-public static final int /*long*/ sel_appendBezierPathWithGlyphs_count_inFont_ = sel_registerName("appendBezierPathWithGlyphs:count:inFont:");
-public static final int /*long*/ sel_appendBezierPathWithOvalInRect_ = sel_registerName("appendBezierPathWithOvalInRect:");
-public static final int /*long*/ sel_appendBezierPathWithRect_ = sel_registerName("appendBezierPathWithRect:");
-public static final int /*long*/ sel_appendBezierPathWithRoundedRect_xRadius_yRadius_ = sel_registerName("appendBezierPathWithRoundedRect:xRadius:yRadius:");
-public static final int /*long*/ sel_appendString_ = sel_registerName("appendString:");
-public static final int /*long*/ sel_application_openFile_ = sel_registerName("application:openFile:");
-public static final int /*long*/ sel_application_openFiles_ = sel_registerName("application:openFiles:");
-public static final int /*long*/ sel_applicationDidBecomeActive_ = sel_registerName("applicationDidBecomeActive:");
-public static final int /*long*/ sel_applicationDidFinishLaunching_ = sel_registerName("applicationDidFinishLaunching:");
-public static final int /*long*/ sel_applicationDidResignActive_ = sel_registerName("applicationDidResignActive:");
-public static final int /*long*/ sel_applicationDockMenu_ = sel_registerName("applicationDockMenu:");
-public static final int /*long*/ sel_applicationIconImage = sel_registerName("applicationIconImage");
-public static final int /*long*/ sel_applicationShouldHandleReopen_hasVisibleWindows_ = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:");
-public static final int /*long*/ sel_applicationShouldTerminate_ = sel_registerName("applicationShouldTerminate:");
-public static final int /*long*/ sel_applicationWillFinishLaunching_ = sel_registerName("applicationWillFinishLaunching:");
-public static final int /*long*/ sel_applicationWillTerminate_ = sel_registerName("applicationWillTerminate:");
-public static final int /*long*/ sel_archivedDataWithRootObject_ = sel_registerName("archivedDataWithRootObject:");
-public static final int /*long*/ sel_areCursorRectsEnabled = sel_registerName("areCursorRectsEnabled");
-public static final int /*long*/ sel_arrangeInFront_ = sel_registerName("arrangeInFront:");
-public static final int /*long*/ sel_array = sel_registerName("array");
-public static final int /*long*/ sel_arrayWithCapacity_ = sel_registerName("arrayWithCapacity:");
-public static final int /*long*/ sel_arrayWithObject_ = sel_registerName("arrayWithObject:");
-public static final int /*long*/ sel_arrowCursor = sel_registerName("arrowCursor");
-public static final int /*long*/ sel_ascender = sel_registerName("ascender");
-public static final int /*long*/ sel_attachColorList_ = sel_registerName("attachColorList:");
-public static final int /*long*/ sel_attribute_atIndex_effectiveRange_ = sel_registerName("attribute:atIndex:effectiveRange:");
-public static final int /*long*/ sel_attributedStringValue = sel_registerName("attributedStringValue");
-public static final int /*long*/ sel_attributedStringWithAttachment_ = sel_registerName("attributedStringWithAttachment:");
-public static final int /*long*/ sel_attributedSubstringFromRange_ = sel_registerName("attributedSubstringFromRange:");
-public static final int /*long*/ sel_attributedTitle = sel_registerName("attributedTitle");
-public static final int /*long*/ sel_attributesAtIndex_longestEffectiveRange_inRange_ = sel_registerName("attributesAtIndex:longestEffectiveRange:inRange:");
-public static final int /*long*/ sel_autorelease = sel_registerName("autorelease");
-public static final int /*long*/ sel_availableFontFamilies = sel_registerName("availableFontFamilies");
-public static final int /*long*/ sel_availableFonts = sel_registerName("availableFonts");
-public static final int /*long*/ sel_availableMembersOfFontFamily_ = sel_registerName("availableMembersOfFontFamily:");
-public static final int /*long*/ sel_availableTypeFromArray_ = sel_registerName("availableTypeFromArray:");
-public static final int /*long*/ sel_backgroundColor = sel_registerName("backgroundColor");
-public static final int /*long*/ sel_badgeLabel = sel_registerName("badgeLabel");
-public static final int /*long*/ sel_baselineOffsetInLayoutManager_glyphIndex_ = sel_registerName("baselineOffsetInLayoutManager:glyphIndex:");
-public static final int /*long*/ sel_becomeFirstResponder = sel_registerName("becomeFirstResponder");
-public static final int /*long*/ sel_becomeKeyWindow = sel_registerName("becomeKeyWindow");
-public static final int /*long*/ sel_beginDocument = sel_registerName("beginDocument");
-public static final int /*long*/ sel_beginEditing = sel_registerName("beginEditing");
-public static final int /*long*/ sel_beginGestureWithEvent_ = sel_registerName("beginGestureWithEvent:");
-public static final int /*long*/ sel_beginPageInRect_atPlacement_ = sel_registerName("beginPageInRect:atPlacement:");
-public static final int /*long*/ sel_beginSheet_modalForWindow_modalDelegate_didEndSelector_contextInfo_ = sel_registerName("beginSheet:modalForWindow:modalDelegate:didEndSelector:contextInfo:");
-public static final int /*long*/ sel_beginSheetForWindow_modalDelegate_didEndSelector_contextInfo_trust_message_ = sel_registerName("beginSheetForWindow:modalDelegate:didEndSelector:contextInfo:trust:message:");
-public static final int /*long*/ sel_beginSheetModalForWindow_modalDelegate_didEndSelector_contextInfo_ = sel_registerName("beginSheetModalForWindow:modalDelegate:didEndSelector:contextInfo:");
-public static final int /*long*/ sel_beginSheetWithPrintInfo_modalForWindow_delegate_didEndSelector_contextInfo_ = sel_registerName("beginSheetWithPrintInfo:modalForWindow:delegate:didEndSelector:contextInfo:");
-public static final int /*long*/ sel_bestRepresentationForDevice_ = sel_registerName("bestRepresentationForDevice:");
-public static final int /*long*/ sel_bezierPath = sel_registerName("bezierPath");
-public static final int /*long*/ sel_bezierPathByFlatteningPath = sel_registerName("bezierPathByFlatteningPath");
-public static final int /*long*/ sel_bezierPathWithRect_ = sel_registerName("bezierPathWithRect:");
-public static final int /*long*/ sel_bitmapData = sel_registerName("bitmapData");
-public static final int /*long*/ sel_bitmapFormat = sel_registerName("bitmapFormat");
-public static final int /*long*/ sel_bitsPerPixel = sel_registerName("bitsPerPixel");
-public static final int /*long*/ sel_bitsPerSample = sel_registerName("bitsPerSample");
-public static final int /*long*/ sel_blackColor = sel_registerName("blackColor");
-public static final int /*long*/ sel_blueComponent = sel_registerName("blueComponent");
-public static final int /*long*/ sel_boolValue = sel_registerName("boolValue");
-public static final int /*long*/ sel_borderWidth = sel_registerName("borderWidth");
-public static final int /*long*/ sel_boundingRectForGlyphRange_inTextContainer_ = sel_registerName("boundingRectForGlyphRange:inTextContainer:");
-public static final int /*long*/ sel_boundingRectWithSize_options_ = sel_registerName("boundingRectWithSize:options:");
-public static final int /*long*/ sel_bounds = sel_registerName("bounds");
-public static final int /*long*/ sel_bundleIdentifier = sel_registerName("bundleIdentifier");
-public static final int /*long*/ sel_bundlePath = sel_registerName("bundlePath");
-public static final int /*long*/ sel_bundleWithIdentifier_ = sel_registerName("bundleWithIdentifier:");
-public static final int /*long*/ sel_bundleWithPath_ = sel_registerName("bundleWithPath:");
-public static final int /*long*/ sel_button = sel_registerName("button");
-public static final int /*long*/ sel_buttonNumber = sel_registerName("buttonNumber");
-public static final int /*long*/ sel_bytes = sel_registerName("bytes");
-public static final int /*long*/ sel_bytesPerPlane = sel_registerName("bytesPerPlane");
-public static final int /*long*/ sel_bytesPerRow = sel_registerName("bytesPerRow");
-public static final int /*long*/ sel_calendarDate = sel_registerName("calendarDate");
-public static final int /*long*/ sel_canBecomeKeyView = sel_registerName("canBecomeKeyView");
-public static final int /*long*/ sel_canBecomeKeyWindow = sel_registerName("canBecomeKeyWindow");
-public static final int /*long*/ sel_canDragRowsWithIndexes_atPoint_ = sel_registerName("canDragRowsWithIndexes:atPoint:");
-public static final int /*long*/ sel_canGoBack = sel_registerName("canGoBack");
-public static final int /*long*/ sel_canGoForward = sel_registerName("canGoForward");
-public static final int /*long*/ sel_canRedo = sel_registerName("canRedo");
-public static final int /*long*/ sel_canShowMIMEType_ = sel_registerName("canShowMIMEType:");
-public static final int /*long*/ sel_canUndo = sel_registerName("canUndo");
-public static final int /*long*/ sel_cancel = sel_registerName("cancel");
-public static final int /*long*/ sel_cancelAuthenticationChallenge_ = sel_registerName("cancelAuthenticationChallenge:");
-public static final int /*long*/ sel_cancelButtonCell = sel_registerName("cancelButtonCell");
-public static final int /*long*/ sel_cancelOperation_ = sel_registerName("cancelOperation:");
-public static final int /*long*/ sel_cancelTracking = sel_registerName("cancelTracking");
-public static final int /*long*/ sel_cascadeTopLeftFromPoint_ = sel_registerName("cascadeTopLeftFromPoint:");
-public static final int /*long*/ sel_cell = sel_registerName("cell");
-public static final int /*long*/ sel_cellClass = sel_registerName("cellClass");
-public static final int /*long*/ sel_cellSize = sel_registerName("cellSize");
-public static final int /*long*/ sel_cellSizeForBounds_ = sel_registerName("cellSizeForBounds:");
-public static final int /*long*/ sel_changeColor_ = sel_registerName("changeColor:");
-public static final int /*long*/ sel_changeFont_ = sel_registerName("changeFont:");
-public static final int /*long*/ sel_charCode = sel_registerName("charCode");
-public static final int /*long*/ sel_characterAtIndex_ = sel_registerName("characterAtIndex:");
-public static final int /*long*/ sel_characterIndexForGlyphAtIndex_ = sel_registerName("characterIndexForGlyphAtIndex:");
-public static final int /*long*/ sel_characterIndexForInsertionAtPoint_ = sel_registerName("characterIndexForInsertionAtPoint:");
-public static final int /*long*/ sel_characterIndexForPoint_ = sel_registerName("characterIndexForPoint:");
-public static final int /*long*/ sel_characterIsMember_ = sel_registerName("characterIsMember:");
-public static final int /*long*/ sel_characters = sel_registerName("characters");
-public static final int /*long*/ sel_charactersIgnoringModifiers = sel_registerName("charactersIgnoringModifiers");
-public static final int /*long*/ sel_chooseFilename_ = sel_registerName("chooseFilename:");
-public static final int /*long*/ sel_className = sel_registerName("className");
-public static final int /*long*/ sel_cleanUpOperation = sel_registerName("cleanUpOperation");
-public static final int /*long*/ sel_clearColor = sel_registerName("clearColor");
-public static final int /*long*/ sel_clearCurrentContext = sel_registerName("clearCurrentContext");
-public static final int /*long*/ sel_clearDrawable = sel_registerName("clearDrawable");
-public static final int /*long*/ sel_clickCount = sel_registerName("clickCount");
-public static final int /*long*/ sel_clickedColumn = sel_registerName("clickedColumn");
-public static final int /*long*/ sel_clickedRow = sel_registerName("clickedRow");
-public static final int /*long*/ sel_close = sel_registerName("close");
-public static final int /*long*/ sel_closePath = sel_registerName("closePath");
-public static final int /*long*/ sel_code = sel_registerName("code");
-public static final int /*long*/ sel_collapseItem_ = sel_registerName("collapseItem:");
-public static final int /*long*/ sel_collapseItem_collapseChildren_ = sel_registerName("collapseItem:collapseChildren:");
-public static final int /*long*/ sel_collectionBehavior = sel_registerName("collectionBehavior");
-public static final int /*long*/ sel_color = sel_registerName("color");
-public static final int /*long*/ sel_colorAtX_y_ = sel_registerName("colorAtX:y:");
-public static final int /*long*/ sel_colorListNamed_ = sel_registerName("colorListNamed:");
-public static final int /*long*/ sel_colorSpace = sel_registerName("colorSpace");
-public static final int /*long*/ sel_colorSpaceModel = sel_registerName("colorSpaceModel");
-public static final int /*long*/ sel_colorSpaceName = sel_registerName("colorSpaceName");
-public static final int /*long*/ sel_colorUsingColorSpaceName_ = sel_registerName("colorUsingColorSpaceName:");
-public static final int /*long*/ sel_colorWithCalibratedRed_green_blue_alpha_ = sel_registerName("colorWithCalibratedRed:green:blue:alpha:");
-public static final int /*long*/ sel_colorWithDeviceRed_green_blue_alpha_ = sel_registerName("colorWithDeviceRed:green:blue:alpha:");
-public static final int /*long*/ sel_colorWithKey_ = sel_registerName("colorWithKey:");
-public static final int /*long*/ sel_colorWithPatternImage_ = sel_registerName("colorWithPatternImage:");
-public static final int /*long*/ sel_columnAtPoint_ = sel_registerName("columnAtPoint:");
-public static final int /*long*/ sel_columnIndexesInRect_ = sel_registerName("columnIndexesInRect:");
-public static final int /*long*/ sel_columnWithIdentifier_ = sel_registerName("columnWithIdentifier:");
-public static final int /*long*/ sel_comboBoxSelectionDidChange_ = sel_registerName("comboBoxSelectionDidChange:");
-public static final int /*long*/ sel_comboBoxWillDismiss_ = sel_registerName("comboBoxWillDismiss:");
-public static final int /*long*/ sel_comboBoxWillPopUp_ = sel_registerName("comboBoxWillPopUp:");
-public static final int /*long*/ sel_compare_ = sel_registerName("compare:");
-public static final int /*long*/ sel_concat = sel_registerName("concat");
-public static final int /*long*/ sel_conformsToProtocol_ = sel_registerName("conformsToProtocol:");
-public static final int /*long*/ sel_containerSize = sel_registerName("containerSize");
-public static final int /*long*/ sel_containsIndex_ = sel_registerName("containsIndex:");
-public static final int /*long*/ sel_containsObject_ = sel_registerName("containsObject:");
-public static final int /*long*/ sel_containsPoint_ = sel_registerName("containsPoint:");
-public static final int /*long*/ sel_contentRect = sel_registerName("contentRect");
-public static final int /*long*/ sel_contentSize = sel_registerName("contentSize");
-public static final int /*long*/ sel_contentSizeForFrameSize_hasHorizontalScroller_hasVerticalScroller_borderType_ = sel_registerName("contentSizeForFrameSize:hasHorizontalScroller:hasVerticalScroller:borderType:");
-public static final int /*long*/ sel_contentView = sel_registerName("contentView");
-public static final int /*long*/ sel_contentViewMargins = sel_registerName("contentViewMargins");
-public static final int /*long*/ sel_context = sel_registerName("context");
-public static final int /*long*/ sel_controlBackgroundColor = sel_registerName("controlBackgroundColor");
-public static final int /*long*/ sel_controlContentFontOfSize_ = sel_registerName("controlContentFontOfSize:");
-public static final int /*long*/ sel_controlDarkShadowColor = sel_registerName("controlDarkShadowColor");
-public static final int /*long*/ sel_controlHighlightColor = sel_registerName("controlHighlightColor");
-public static final int /*long*/ sel_controlLightHighlightColor = sel_registerName("controlLightHighlightColor");
-public static final int /*long*/ sel_controlPointBounds = sel_registerName("controlPointBounds");
-public static final int /*long*/ sel_controlShadowColor = sel_registerName("controlShadowColor");
-public static final int /*long*/ sel_controlSize = sel_registerName("controlSize");
-public static final int /*long*/ sel_controlTextColor = sel_registerName("controlTextColor");
-public static final int /*long*/ sel_convertBaseToScreen_ = sel_registerName("convertBaseToScreen:");
-public static final int /*long*/ sel_convertFont_toHaveTrait_ = sel_registerName("convertFont:toHaveTrait:");
-public static final int /*long*/ sel_convertPoint_fromView_ = sel_registerName("convertPoint:fromView:");
-public static final int /*long*/ sel_convertPoint_toView_ = sel_registerName("convertPoint:toView:");
-public static final int /*long*/ sel_convertPointFromBase_ = sel_registerName("convertPointFromBase:");
-public static final int /*long*/ sel_convertPointToBase_ = sel_registerName("convertPointToBase:");
-public static final int /*long*/ sel_convertRect_fromView_ = sel_registerName("convertRect:fromView:");
-public static final int /*long*/ sel_convertRect_toView_ = sel_registerName("convertRect:toView:");
-public static final int /*long*/ sel_convertRectFromBase_ = sel_registerName("convertRectFromBase:");
-public static final int /*long*/ sel_convertRectToBase_ = sel_registerName("convertRectToBase:");
-public static final int /*long*/ sel_convertScreenToBase_ = sel_registerName("convertScreenToBase:");
-public static final int /*long*/ sel_convertSize_fromView_ = sel_registerName("convertSize:fromView:");
-public static final int /*long*/ sel_convertSize_toView_ = sel_registerName("convertSize:toView:");
-public static final int /*long*/ sel_convertSizeFromBase_ = sel_registerName("convertSizeFromBase:");
-public static final int /*long*/ sel_convertSizeToBase_ = sel_registerName("convertSizeToBase:");
-public static final int /*long*/ sel_cookies = sel_registerName("cookies");
-public static final int /*long*/ sel_cookiesForURL_ = sel_registerName("cookiesForURL:");
-public static final int /*long*/ sel_cookiesWithResponseHeaderFields_forURL_ = sel_registerName("cookiesWithResponseHeaderFields:forURL:");
-public static final int /*long*/ sel_copiesOnScroll = sel_registerName("copiesOnScroll");
-public static final int /*long*/ sel_copy = sel_registerName("copy");
-public static final int /*long*/ sel_copy_ = sel_registerName("copy:");
-public static final int /*long*/ sel_count = sel_registerName("count");
-public static final int /*long*/ sel_createContext = sel_registerName("createContext");
-public static final int /*long*/ sel_createFileAtPath_contents_attributes_ = sel_registerName("createFileAtPath:contents:attributes:");
-public static final int /*long*/ sel_credentialWithUser_password_persistence_ = sel_registerName("credentialWithUser:password:persistence:");
-public static final int /*long*/ sel_crosshairCursor = sel_registerName("crosshairCursor");
-public static final int /*long*/ sel_ctrlKey = sel_registerName("ctrlKey");
-public static final int /*long*/ sel_currentContext = sel_registerName("currentContext");
-public static final int /*long*/ sel_currentCursor = sel_registerName("currentCursor");
-public static final int /*long*/ sel_currentEditor = sel_registerName("currentEditor");
-public static final int /*long*/ sel_currentEvent = sel_registerName("currentEvent");
-public static final int /*long*/ sel_currentHandler = sel_registerName("currentHandler");
-public static final int /*long*/ sel_currentInputManager = sel_registerName("currentInputManager");
-public static final int /*long*/ sel_currentPoint = sel_registerName("currentPoint");
-public static final int /*long*/ sel_currentRunLoop = sel_registerName("currentRunLoop");
-public static final int /*long*/ sel_currentThread = sel_registerName("currentThread");
-public static final int /*long*/ sel_cursorUpdate_ = sel_registerName("cursorUpdate:");
-public static final int /*long*/ sel_curveToPoint_controlPoint1_controlPoint2_ = sel_registerName("curveToPoint:controlPoint1:controlPoint2:");
-public static final int /*long*/ sel_cut_ = sel_registerName("cut:");
-public static final int /*long*/ sel_dataCell = sel_registerName("dataCell");
-public static final int /*long*/ sel_dataForType_ = sel_registerName("dataForType:");
-public static final int /*long*/ sel_dataSource = sel_registerName("dataSource");
-public static final int /*long*/ sel_dataWithBytes_length_ = sel_registerName("dataWithBytes:length:");
-public static final int /*long*/ sel_dateValue = sel_registerName("dateValue");
-public static final int /*long*/ sel_dateWithCalendarFormat_timeZone_ = sel_registerName("dateWithCalendarFormat:timeZone:");
-public static final int /*long*/ sel_dateWithTimeIntervalSinceNow_ = sel_registerName("dateWithTimeIntervalSinceNow:");
-public static final int /*long*/ sel_dateWithYear_month_day_hour_minute_second_timeZone_ = sel_registerName("dateWithYear:month:day:hour:minute:second:timeZone:");
-public static final int /*long*/ sel_dayOfMonth = sel_registerName("dayOfMonth");
-public static final int /*long*/ sel_dealloc = sel_registerName("dealloc");
-public static final int /*long*/ sel_decimalDigitCharacterSet = sel_registerName("decimalDigitCharacterSet");
-public static final int /*long*/ sel_decimalSeparator = sel_registerName("decimalSeparator");
-public static final int /*long*/ sel_declareTypes_owner_ = sel_registerName("declareTypes:owner:");
-public static final int /*long*/ sel_defaultBaselineOffsetForFont_ = sel_registerName("defaultBaselineOffsetForFont:");
-public static final int /*long*/ sel_defaultButtonCell = sel_registerName("defaultButtonCell");
-public static final int /*long*/ sel_defaultCenter = sel_registerName("defaultCenter");
-public static final int /*long*/ sel_defaultFlatness = sel_registerName("defaultFlatness");
-public static final int /*long*/ sel_defaultLineHeightForFont_ = sel_registerName("defaultLineHeightForFont:");
-public static final int /*long*/ sel_defaultManager = sel_registerName("defaultManager");
-public static final int /*long*/ sel_defaultParagraphStyle = sel_registerName("defaultParagraphStyle");
-public static final int /*long*/ sel_defaultPrinter = sel_registerName("defaultPrinter");
-public static final int /*long*/ sel_defaultTimeZone = sel_registerName("defaultTimeZone");
-public static final int /*long*/ sel_delegate = sel_registerName("delegate");
-public static final int /*long*/ sel_deleteCookie_ = sel_registerName("deleteCookie:");
-public static final int /*long*/ sel_deliverResult = sel_registerName("deliverResult");
-public static final int /*long*/ sel_deltaX = sel_registerName("deltaX");
-public static final int /*long*/ sel_deltaY = sel_registerName("deltaY");
-public static final int /*long*/ sel_deminiaturize_ = sel_registerName("deminiaturize:");
-public static final int /*long*/ sel_depth = sel_registerName("depth");
-public static final int /*long*/ sel_descender = sel_registerName("descender");
-public static final int /*long*/ sel_description = sel_registerName("description");
-public static final int /*long*/ sel_deselectAll_ = sel_registerName("deselectAll:");
-public static final int /*long*/ sel_deselectItemAtIndex_ = sel_registerName("deselectItemAtIndex:");
-public static final int /*long*/ sel_deselectRow_ = sel_registerName("deselectRow:");
-public static final int /*long*/ sel_destroyContext = sel_registerName("destroyContext");
-public static final int /*long*/ sel_detail = sel_registerName("detail");
-public static final int /*long*/ sel_device = sel_registerName("device");
-public static final int /*long*/ sel_deviceDescription = sel_registerName("deviceDescription");
-public static final int /*long*/ sel_deviceSize = sel_registerName("deviceSize");
-public static final int /*long*/ sel_dictionary = sel_registerName("dictionary");
-public static final int /*long*/ sel_dictionaryWithCapacity_ = sel_registerName("dictionaryWithCapacity:");
-public static final int /*long*/ sel_dictionaryWithObject_forKey_ = sel_registerName("dictionaryWithObject:forKey:");
-public static final int /*long*/ sel_disableCursorRects = sel_registerName("disableCursorRects");
-public static final int /*long*/ sel_disableFlushWindow = sel_registerName("disableFlushWindow");
-public static final int /*long*/ sel_disabledControlTextColor = sel_registerName("disabledControlTextColor");
-public static final int /*long*/ sel_discardCursorRects = sel_registerName("discardCursorRects");
-public static final int /*long*/ sel_display = sel_registerName("display");
-public static final int /*long*/ sel_displayIfNeeded = sel_registerName("displayIfNeeded");
-public static final int /*long*/ sel_displayName = sel_registerName("displayName");
-public static final int /*long*/ sel_displayNameForKey_value_ = sel_registerName("displayNameForKey:value:");
-public static final int /*long*/ sel_displayRectIgnoringOpacity_inContext_ = sel_registerName("displayRectIgnoringOpacity:inContext:");
-public static final int /*long*/ sel_distantFuture = sel_registerName("distantFuture");
-public static final int /*long*/ sel_doCommandBySelector_ = sel_registerName("doCommandBySelector:");
-public static final int /*long*/ sel_dockTile = sel_registerName("dockTile");
-public static final int /*long*/ sel_documentCursor = sel_registerName("documentCursor");
-public static final int /*long*/ sel_documentSource = sel_registerName("documentSource");
-public static final int /*long*/ sel_documentView = sel_registerName("documentView");
-public static final int /*long*/ sel_documentViewShouldHandlePrint = sel_registerName("documentViewShouldHandlePrint");
-public static final int /*long*/ sel_documentVisibleRect = sel_registerName("documentVisibleRect");
-public static final int /*long*/ sel_doubleClickAtIndex_ = sel_registerName("doubleClickAtIndex:");
-public static final int /*long*/ sel_doubleValue = sel_registerName("doubleValue");
-public static final int /*long*/ sel_download = sel_registerName("download");
-public static final int /*long*/ sel_download_decideDestinationWithSuggestedFilename_ = sel_registerName("download:decideDestinationWithSuggestedFilename:");
-public static final int /*long*/ sel_dragImage_at_offset_event_pasteboard_source_slideBack_ = sel_registerName("dragImage:at:offset:event:pasteboard:source:slideBack:");
-public static final int /*long*/ sel_dragImageForRowsWithIndexes_tableColumns_event_offset_ = sel_registerName("dragImageForRowsWithIndexes:tableColumns:event:offset:");
-public static final int /*long*/ sel_dragSelectionWithEvent_offset_slideBack_ = sel_registerName("dragSelectionWithEvent:offset:slideBack:");
-public static final int /*long*/ sel_draggedImage_beganAt_ = sel_registerName("draggedImage:beganAt:");
-public static final int /*long*/ sel_draggedImage_endedAt_operation_ = sel_registerName("draggedImage:endedAt:operation:");
-public static final int /*long*/ sel_draggingDestinationWindow = sel_registerName("draggingDestinationWindow");
-public static final int /*long*/ sel_draggingEnded_ = sel_registerName("draggingEnded:");
-public static final int /*long*/ sel_draggingEntered_ = sel_registerName("draggingEntered:");
-public static final int /*long*/ sel_draggingExited_ = sel_registerName("draggingExited:");
-public static final int /*long*/ sel_draggingLocation = sel_registerName("draggingLocation");
-public static final int /*long*/ sel_draggingPasteboard = sel_registerName("draggingPasteboard");
-public static final int /*long*/ sel_draggingSourceOperationMask = sel_registerName("draggingSourceOperationMask");
-public static final int /*long*/ sel_draggingSourceOperationMaskForLocal_ = sel_registerName("draggingSourceOperationMaskForLocal:");
-public static final int /*long*/ sel_draggingUpdated_ = sel_registerName("draggingUpdated:");
-public static final int /*long*/ sel_drawAtPoint_ = sel_registerName("drawAtPoint:");
-public static final int /*long*/ sel_drawAtPoint_fromRect_operation_fraction_ = sel_registerName("drawAtPoint:fromRect:operation:fraction:");
-public static final int /*long*/ sel_drawBackgroundForGlyphRange_atPoint_ = sel_registerName("drawBackgroundForGlyphRange:atPoint:");
-public static final int /*long*/ sel_drawBackgroundInClipRect_ = sel_registerName("drawBackgroundInClipRect:");
-public static final int /*long*/ sel_drawFromPoint_toPoint_options_ = sel_registerName("drawFromPoint:toPoint:options:");
-public static final int /*long*/ sel_drawGlyphsForGlyphRange_atPoint_ = sel_registerName("drawGlyphsForGlyphRange:atPoint:");
-public static final int /*long*/ sel_drawImage_withFrame_inView_ = sel_registerName("drawImage:withFrame:inView:");
-public static final int /*long*/ sel_drawInRect_ = sel_registerName("drawInRect:");
-public static final int /*long*/ sel_drawInRect_angle_ = sel_registerName("drawInRect:angle:");
-public static final int /*long*/ sel_drawInRect_fromRect_operation_fraction_ = sel_registerName("drawInRect:fromRect:operation:fraction:");
-public static final int /*long*/ sel_drawInteriorWithFrame_inView_ = sel_registerName("drawInteriorWithFrame:inView:");
-public static final int /*long*/ sel_drawLabel_inRect_ = sel_registerName("drawLabel:inRect:");
-public static final int /*long*/ sel_drawRect_ = sel_registerName("drawRect:");
-public static final int /*long*/ sel_drawSortIndicatorWithFrame_inView_ascending_priority_ = sel_registerName("drawSortIndicatorWithFrame:inView:ascending:priority:");
-public static final int /*long*/ sel_drawStatusBarBackgroundInRect_withHighlight_ = sel_registerName("drawStatusBarBackgroundInRect:withHighlight:");
-public static final int /*long*/ sel_drawTitle_withFrame_inView_ = sel_registerName("drawTitle:withFrame:inView:");
-public static final int /*long*/ sel_drawViewBackgroundInRect_ = sel_registerName("drawViewBackgroundInRect:");
-public static final int /*long*/ sel_drawWithExpansionFrame_inView_ = sel_registerName("drawWithExpansionFrame:inView:");
-public static final int /*long*/ sel_drawingRectForBounds_ = sel_registerName("drawingRectForBounds:");
-public static final int /*long*/ sel_elementAtIndex_associatedPoints_ = sel_registerName("elementAtIndex:associatedPoints:");
-public static final int /*long*/ sel_elementCount = sel_registerName("elementCount");
-public static final int /*long*/ sel_enableCursorRects = sel_registerName("enableCursorRects");
-public static final int /*long*/ sel_enableFlushWindow = sel_registerName("enableFlushWindow");
-public static final int /*long*/ sel_endDocument = sel_registerName("endDocument");
-public static final int /*long*/ sel_endEditing = sel_registerName("endEditing");
-public static final int /*long*/ sel_endEditingFor_ = sel_registerName("endEditingFor:");
-public static final int /*long*/ sel_endGestureWithEvent_ = sel_registerName("endGestureWithEvent:");
-public static final int /*long*/ sel_endPage = sel_registerName("endPage");
-public static final int /*long*/ sel_endSheet_returnCode_ = sel_registerName("endSheet:returnCode:");
-public static final int /*long*/ sel_enterExitEventWithType_location_modifierFlags_timestamp_windowNumber_context_eventNumber_trackingNumber_userData_ = sel_registerName("enterExitEventWithType:location:modifierFlags:timestamp:windowNumber:context:eventNumber:trackingNumber:userData:");
-public static final int /*long*/ sel_enumeratorAtPath_ = sel_registerName("enumeratorAtPath:");
-public static final int /*long*/ sel_expandItem_ = sel_registerName("expandItem:");
-public static final int /*long*/ sel_expandItem_expandChildren_ = sel_registerName("expandItem:expandChildren:");
-public static final int /*long*/ sel_expansionFrameWithFrame_inView_ = sel_registerName("expansionFrameWithFrame:inView:");
-public static final int /*long*/ sel_familyName = sel_registerName("familyName");
-public static final int /*long*/ sel_fieldEditor_forObject_ = sel_registerName("fieldEditor:forObject:");
-public static final int /*long*/ sel_fileExistsAtPath_ = sel_registerName("fileExistsAtPath:");
-public static final int /*long*/ sel_fileExistsAtPath_isDirectory_ = sel_registerName("fileExistsAtPath:isDirectory:");
-public static final int /*long*/ sel_fileSystemRepresentation = sel_registerName("fileSystemRepresentation");
-public static final int /*long*/ sel_fileURLWithPath_ = sel_registerName("fileURLWithPath:");
-public static final int /*long*/ sel_filename = sel_registerName("filename");
-public static final int /*long*/ sel_filenames = sel_registerName("filenames");
-public static final int /*long*/ sel_fill = sel_registerName("fill");
-public static final int /*long*/ sel_fillRect_ = sel_registerName("fillRect:");
-public static final int /*long*/ sel_finishLaunching = sel_registerName("finishLaunching");
-public static final int /*long*/ sel_firstIndex = sel_registerName("firstIndex");
-public static final int /*long*/ sel_firstRectForCharacterRange_ = sel_registerName("firstRectForCharacterRange:");
-public static final int /*long*/ sel_firstResponder = sel_registerName("firstResponder");
-public static final int /*long*/ sel_flagsChanged_ = sel_registerName("flagsChanged:");
-public static final int /*long*/ sel_floatValue = sel_registerName("floatValue");
-public static final int /*long*/ sel_flushBuffer = sel_registerName("flushBuffer");
-public static final int /*long*/ sel_flushGraphics = sel_registerName("flushGraphics");
-public static final int /*long*/ sel_flushWindowIfNeeded = sel_registerName("flushWindowIfNeeded");
-public static final int /*long*/ sel_font = sel_registerName("font");
-public static final int /*long*/ sel_fontName = sel_registerName("fontName");
-public static final int /*long*/ sel_fontWithFamily_traits_weight_size_ = sel_registerName("fontWithFamily:traits:weight:size:");
-public static final int /*long*/ sel_fontWithName_size_ = sel_registerName("fontWithName:size:");
-public static final int /*long*/ sel_frame = sel_registerName("frame");
-public static final int /*long*/ sel_frameOfCellAtColumn_row_ = sel_registerName("frameOfCellAtColumn:row:");
-public static final int /*long*/ sel_frameOfOutlineCellAtRow_ = sel_registerName("frameOfOutlineCellAtRow:");
-public static final int /*long*/ sel_frameRectForContentRect_ = sel_registerName("frameRectForContentRect:");
-public static final int /*long*/ sel_frameSizeForContentSize_hasHorizontalScroller_hasVerticalScroller_borderType_ = sel_registerName("frameSizeForContentSize:hasHorizontalScroller:hasVerticalScroller:borderType:");
-public static final int /*long*/ sel_fullPathForApplication_ = sel_registerName("fullPathForApplication:");
-public static final int /*long*/ sel_generalPasteboard = sel_registerName("generalPasteboard");
-public static final int /*long*/ sel_genericRGBColorSpace = sel_registerName("genericRGBColorSpace");
-public static final int /*long*/ sel_getBitmapDataPlanes_ = sel_registerName("getBitmapDataPlanes:");
-public static final int /*long*/ sel_getBytes_ = sel_registerName("getBytes:");
-public static final int /*long*/ sel_getBytes_length_ = sel_registerName("getBytes:length:");
-public static final int /*long*/ sel_getCharacters_ = sel_registerName("getCharacters:");
-public static final int /*long*/ sel_getCharacters_range_ = sel_registerName("getCharacters:range:");
-public static final int /*long*/ sel_getComponents_ = sel_registerName("getComponents:");
-public static final int /*long*/ sel_getGlyphs_range_ = sel_registerName("getGlyphs:range:");
-public static final int /*long*/ sel_getGlyphsInRange_glyphs_characterIndexes_glyphInscriptions_elasticBits_bidiLevels_ = sel_registerName("getGlyphsInRange:glyphs:characterIndexes:glyphInscriptions:elasticBits:bidiLevels:");
-public static final int /*long*/ sel_getIndexes_maxCount_inIndexRange_ = sel_registerName("getIndexes:maxCount:inIndexRange:");
-public static final int /*long*/ sel_getInfoForFile_application_type_ = sel_registerName("getInfoForFile:application:type:");
-public static final int /*long*/ sel_getValues_forAttribute_forVirtualScreen_ = sel_registerName("getValues:forAttribute:forVirtualScreen:");
-public static final int /*long*/ sel_globalContext = sel_registerName("globalContext");
-public static final int /*long*/ sel_glyphIndexForCharacterAtIndex_ = sel_registerName("glyphIndexForCharacterAtIndex:");
-public static final int /*long*/ sel_glyphIndexForPoint_inTextContainer_fractionOfDistanceThroughGlyph_ = sel_registerName("glyphIndexForPoint:inTextContainer:fractionOfDistanceThroughGlyph:");
-public static final int /*long*/ sel_glyphRangeForCharacterRange_actualCharacterRange_ = sel_registerName("glyphRangeForCharacterRange:actualCharacterRange:");
-public static final int /*long*/ sel_glyphRangeForTextContainer_ = sel_registerName("glyphRangeForTextContainer:");
-public static final int /*long*/ sel_goBack = sel_registerName("goBack");
-public static final int /*long*/ sel_goForward = sel_registerName("goForward");
-public static final int /*long*/ sel_graphicsContext = sel_registerName("graphicsContext");
-public static final int /*long*/ sel_graphicsContextWithBitmapImageRep_ = sel_registerName("graphicsContextWithBitmapImageRep:");
-public static final int /*long*/ sel_graphicsContextWithGraphicsPort_flipped_ = sel_registerName("graphicsContextWithGraphicsPort:flipped:");
-public static final int /*long*/ sel_graphicsContextWithWindow_ = sel_registerName("graphicsContextWithWindow:");
-public static final int /*long*/ sel_graphicsPort = sel_registerName("graphicsPort");
-public static final int /*long*/ sel_greenComponent = sel_registerName("greenComponent");
-public static final int /*long*/ sel_handleEvent_ = sel_registerName("handleEvent:");
-public static final int /*long*/ sel_handleFailureInFunction_file_lineNumber_description_ = sel_registerName("handleFailureInFunction:file:lineNumber:description:");
-public static final int /*long*/ sel_handleFailureInMethod_object_file_lineNumber_description_ = sel_registerName("handleFailureInMethod:object:file:lineNumber:description:");
-public static final int /*long*/ sel_handleMouseEvent_ = sel_registerName("handleMouseEvent:");
-public static final int /*long*/ sel_hasAlpha = sel_registerName("hasAlpha");
-public static final int /*long*/ sel_hasMarkedText = sel_registerName("hasMarkedText");
-public static final int /*long*/ sel_hasPassword = sel_registerName("hasPassword");
-public static final int /*long*/ sel_hasShadow = sel_registerName("hasShadow");
-public static final int /*long*/ sel_headerCell = sel_registerName("headerCell");
-public static final int /*long*/ sel_headerRectOfColumn_ = sel_registerName("headerRectOfColumn:");
-public static final int /*long*/ sel_headerView = sel_registerName("headerView");
-public static final int /*long*/ sel_helpRequested_ = sel_registerName("helpRequested:");
-public static final int /*long*/ sel_hide_ = sel_registerName("hide:");
-public static final int /*long*/ sel_hideOtherApplications_ = sel_registerName("hideOtherApplications:");
-public static final int /*long*/ sel_highlightColorInView_ = sel_registerName("highlightColorInView:");
-public static final int /*long*/ sel_highlightColorWithFrame_inView_ = sel_registerName("highlightColorWithFrame:inView:");
-public static final int /*long*/ sel_highlightSelectionInClipRect_ = sel_registerName("highlightSelectionInClipRect:");
-public static final int /*long*/ sel_hitPart = sel_registerName("hitPart");
-public static final int /*long*/ sel_hitTest_ = sel_registerName("hitTest:");
-public static final int /*long*/ sel_hitTestForEvent_inRect_ofView_ = sel_registerName("hitTestForEvent:inRect:ofView:");
-public static final int /*long*/ sel_host = sel_registerName("host");
-public static final int /*long*/ sel_hotSpot = sel_registerName("hotSpot");
-public static final int /*long*/ sel_hourOfDay = sel_registerName("hourOfDay");
-public static final int /*long*/ sel_iconForFile_ = sel_registerName("iconForFile:");
-public static final int /*long*/ sel_iconForFileType_ = sel_registerName("iconForFileType:");
-public static final int /*long*/ sel_ignore = sel_registerName("ignore");
-public static final int /*long*/ sel_ignoreModifierKeysWhileDragging = sel_registerName("ignoreModifierKeysWhileDragging");
-public static final int /*long*/ sel_image = sel_registerName("image");
-public static final int /*long*/ sel_imageInterpolation = sel_registerName("imageInterpolation");
-public static final int /*long*/ sel_imageNamed_ = sel_registerName("imageNamed:");
-public static final int /*long*/ sel_imageRectForBounds_ = sel_registerName("imageRectForBounds:");
-public static final int /*long*/ sel_imageRepWithData_ = sel_registerName("imageRepWithData:");
-public static final int /*long*/ sel_imageablePageBounds = sel_registerName("imageablePageBounds");
-public static final int /*long*/ sel_increment = sel_registerName("increment");
-public static final int /*long*/ sel_indentationPerLevel = sel_registerName("indentationPerLevel");
-public static final int /*long*/ sel_indexOfItemWithTarget_andAction_ = sel_registerName("indexOfItemWithTarget:andAction:");
-public static final int /*long*/ sel_indexOfObjectIdenticalTo_ = sel_registerName("indexOfObjectIdenticalTo:");
-public static final int /*long*/ sel_indexOfSelectedItem = sel_registerName("indexOfSelectedItem");
-public static final int /*long*/ sel_indexSetWithIndex_ = sel_registerName("indexSetWithIndex:");
-public static final int /*long*/ sel_infoDictionary = sel_registerName("infoDictionary");
-public static final int /*long*/ sel_init = sel_registerName("init");
-public static final int /*long*/ sel_initByReferencingFile_ = sel_registerName("initByReferencingFile:");
-public static final int /*long*/ sel_initListDescriptor = sel_registerName("initListDescriptor");
-public static final int /*long*/ sel_initWithAttributes_ = sel_registerName("initWithAttributes:");
-public static final int /*long*/ sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_ = sel_registerName("initWithBitmapDataPlanes:pixelsWide:pixelsHigh:bitsPerSample:samplesPerPixel:hasAlpha:isPlanar:colorSpaceName:bitmapFormat:bytesPerRow:bitsPerPixel:");
-public static final int /*long*/ sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_ = sel_registerName("initWithBitmapDataPlanes:pixelsWide:pixelsHigh:bitsPerSample:samplesPerPixel:hasAlpha:isPlanar:colorSpaceName:bytesPerRow:bitsPerPixel:");
-public static final int /*long*/ sel_initWithCapacity_ = sel_registerName("initWithCapacity:");
-public static final int /*long*/ sel_initWithCharacters_length_ = sel_registerName("initWithCharacters:length:");
-public static final int /*long*/ sel_initWithContainerSize_ = sel_registerName("initWithContainerSize:");
-public static final int /*long*/ sel_initWithContentRect_styleMask_backing_defer_ = sel_registerName("initWithContentRect:styleMask:backing:defer:");
-public static final int /*long*/ sel_initWithContentRect_styleMask_backing_defer_screen_ = sel_registerName("initWithContentRect:styleMask:backing:defer:screen:");
-public static final int /*long*/ sel_initWithContentsOfFile_ = sel_registerName("initWithContentsOfFile:");
-public static final int /*long*/ sel_initWithData_ = sel_registerName("initWithData:");
-public static final int /*long*/ sel_initWithDictionary_ = sel_registerName("initWithDictionary:");
-public static final int /*long*/ sel_initWithFileWrapper_ = sel_registerName("initWithFileWrapper:");
-public static final int /*long*/ sel_initWithFocusedViewRect_ = sel_registerName("initWithFocusedViewRect:");
-public static final int /*long*/ sel_initWithFormat_shareContext_ = sel_registerName("initWithFormat:shareContext:");
-public static final int /*long*/ sel_initWithFrame_ = sel_registerName("initWithFrame:");
-public static final int /*long*/ sel_initWithFrame_frameName_groupName_ = sel_registerName("initWithFrame:frameName:groupName:");
-public static final int /*long*/ sel_initWithFrame_pullsDown_ = sel_registerName("initWithFrame:pullsDown:");
-public static final int /*long*/ sel_initWithIconRef_ = sel_registerName("initWithIconRef:");
-public static final int /*long*/ sel_initWithIdentifier_ = sel_registerName("initWithIdentifier:");
-public static final int /*long*/ sel_initWithImage_hotSpot_ = sel_registerName("initWithImage:hotSpot:");
-public static final int /*long*/ sel_initWithIndex_ = sel_registerName("initWithIndex:");
-public static final int /*long*/ sel_initWithIndexSet_ = sel_registerName("initWithIndexSet:");
-public static final int /*long*/ sel_initWithIndexesInRange_ = sel_registerName("initWithIndexesInRange:");
-public static final int /*long*/ sel_initWithItemIdentifier_ = sel_registerName("initWithItemIdentifier:");
-public static final int /*long*/ sel_initWithLocaleIdentifier_ = sel_registerName("initWithLocaleIdentifier:");
-public static final int /*long*/ sel_initWithName_ = sel_registerName("initWithName:");
-public static final int /*long*/ sel_initWithRect_options_owner_userInfo_ = sel_registerName("initWithRect:options:owner:userInfo:");
-public static final int /*long*/ sel_initWithSize_ = sel_registerName("initWithSize:");
-public static final int /*long*/ sel_initWithStartingColor_endingColor_ = sel_registerName("initWithStartingColor:endingColor:");
-public static final int /*long*/ sel_initWithString_ = sel_registerName("initWithString:");
-public static final int /*long*/ sel_initWithString_attributes_ = sel_registerName("initWithString:attributes:");
-public static final int /*long*/ sel_initWithTitle_ = sel_registerName("initWithTitle:");
-public static final int /*long*/ sel_initWithTitle_action_keyEquivalent_ = sel_registerName("initWithTitle:action:keyEquivalent:");
-public static final int /*long*/ sel_initWithTransform_ = sel_registerName("initWithTransform:");
-public static final int /*long*/ sel_initWithType_location_ = sel_registerName("initWithType:location:");
-public static final int /*long*/ sel_initWithURL_ = sel_registerName("initWithURL:");
-public static final int /*long*/ sel_insertColor_key_atIndex_ = sel_registerName("insertColor:key:atIndex:");
-public static final int /*long*/ sel_insertItem_atIndex_ = sel_registerName("insertItem:atIndex:");
-public static final int /*long*/ sel_insertItemWithItemIdentifier_atIndex_ = sel_registerName("insertItemWithItemIdentifier:atIndex:");
-public static final int /*long*/ sel_insertItemWithObjectValue_atIndex_ = sel_registerName("insertItemWithObjectValue:atIndex:");
-public static final int /*long*/ sel_insertTabViewItem_atIndex_ = sel_registerName("insertTabViewItem:atIndex:");
-public static final int /*long*/ sel_insertText_ = sel_registerName("insertText:");
-public static final int /*long*/ sel_intValue = sel_registerName("intValue");
-public static final int /*long*/ sel_integerValue = sel_registerName("integerValue");
-public static final int /*long*/ sel_intercellSpacing = sel_registerName("intercellSpacing");
-public static final int /*long*/ sel_interpretKeyEvents_ = sel_registerName("interpretKeyEvents:");
-public static final int /*long*/ sel_invalidate = sel_registerName("invalidate");
-public static final int /*long*/ sel_invalidateShadow = sel_registerName("invalidateShadow");
-public static final int /*long*/ sel_invert = sel_registerName("invert");
-public static final int /*long*/ sel_isActive = sel_registerName("isActive");
-public static final int /*long*/ sel_isDocumentEdited = sel_registerName("isDocumentEdited");
-public static final int /*long*/ sel_isDrawingToScreen = sel_registerName("isDrawingToScreen");
-public static final int /*long*/ sel_isEmpty = sel_registerName("isEmpty");
-public static final int /*long*/ sel_isEnabled = sel_registerName("isEnabled");
-public static final int /*long*/ sel_isEqual_ = sel_registerName("isEqual:");
-public static final int /*long*/ sel_isEqualTo_ = sel_registerName("isEqualTo:");
-public static final int /*long*/ sel_isEqualToString_ = sel_registerName("isEqualToString:");
-public static final int /*long*/ sel_isExecutableFileAtPath_ = sel_registerName("isExecutableFileAtPath:");
-public static final int /*long*/ sel_isFieldEditor = sel_registerName("isFieldEditor");
-public static final int /*long*/ sel_isFilePackageAtPath_ = sel_registerName("isFilePackageAtPath:");
-public static final int /*long*/ sel_isFileURL = sel_registerName("isFileURL");
-public static final int /*long*/ sel_isFlipped = sel_registerName("isFlipped");
-public static final int /*long*/ sel_isHidden = sel_registerName("isHidden");
-public static final int /*long*/ sel_isHiddenOrHasHiddenAncestor = sel_registerName("isHiddenOrHasHiddenAncestor");
-public static final int /*long*/ sel_isHighlighted = sel_registerName("isHighlighted");
-public static final int /*long*/ sel_isItemExpanded_ = sel_registerName("isItemExpanded:");
-public static final int /*long*/ sel_isKeyWindow = sel_registerName("isKeyWindow");
-public static final int /*long*/ sel_isKindOfClass_ = sel_registerName("isKindOfClass:");
-public static final int /*long*/ sel_isMainThread = sel_registerName("isMainThread");
-public static final int /*long*/ sel_isMainWindow = sel_registerName("isMainWindow");
-public static final int /*long*/ sel_isMiniaturized = sel_registerName("isMiniaturized");
-public static final int /*long*/ sel_isOpaque = sel_registerName("isOpaque");
-public static final int /*long*/ sel_isPlanar = sel_registerName("isPlanar");
-public static final int /*long*/ sel_isResting = sel_registerName("isResting");
-public static final int /*long*/ sel_isRowSelected_ = sel_registerName("isRowSelected:");
-public static final int /*long*/ sel_isRunning = sel_registerName("isRunning");
-public static final int /*long*/ sel_isSeparatorItem = sel_registerName("isSeparatorItem");
-public static final int /*long*/ sel_isSessionOnly = sel_registerName("isSessionOnly");
-public static final int /*long*/ sel_isSheet = sel_registerName("isSheet");
-public static final int /*long*/ sel_isVisible = sel_registerName("isVisible");
-public static final int /*long*/ sel_isZoomed = sel_registerName("isZoomed");
-public static final int /*long*/ sel_itemArray = sel_registerName("itemArray");
-public static final int /*long*/ sel_itemAtIndex_ = sel_registerName("itemAtIndex:");
-public static final int /*long*/ sel_itemAtRow_ = sel_registerName("itemAtRow:");
-public static final int /*long*/ sel_itemHeight = sel_registerName("itemHeight");
-public static final int /*long*/ sel_itemIdentifier = sel_registerName("itemIdentifier");
-public static final int /*long*/ sel_itemObjectValueAtIndex_ = sel_registerName("itemObjectValueAtIndex:");
-public static final int /*long*/ sel_itemTitleAtIndex_ = sel_registerName("itemTitleAtIndex:");
-public static final int /*long*/ sel_itemWithTag_ = sel_registerName("itemWithTag:");
-public static final int /*long*/ sel_jobDisposition = sel_registerName("jobDisposition");
-public static final int /*long*/ sel_keyCode = sel_registerName("keyCode");
-public static final int /*long*/ sel_keyDown_ = sel_registerName("keyDown:");
-public static final int /*long*/ sel_keyEquivalent = sel_registerName("keyEquivalent");
-public static final int /*long*/ sel_keyEquivalentModifierMask = sel_registerName("keyEquivalentModifierMask");
-public static final int /*long*/ sel_keyUp_ = sel_registerName("keyUp:");
-public static final int /*long*/ sel_keyWindow = sel_registerName("keyWindow");
-public static final int /*long*/ sel_knobProportion = sel_registerName("knobProportion");
-public static final int /*long*/ sel_knobThickness = sel_registerName("knobThickness");
-public static final int /*long*/ sel_lastPathComponent = sel_registerName("lastPathComponent");
-public static final int /*long*/ sel_layoutManager = sel_registerName("layoutManager");
-public static final int /*long*/ sel_leading = sel_registerName("leading");
-public static final int /*long*/ sel_length = sel_registerName("length");
-public static final int /*long*/ sel_level = sel_registerName("level");
-public static final int /*long*/ sel_levelForItem_ = sel_registerName("levelForItem:");
-public static final int /*long*/ sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_ = sel_registerName("lineFragmentUsedRectForGlyphAtIndex:effectiveRange:");
-public static final int /*long*/ sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_withoutAdditionalLayout_ = sel_registerName("lineFragmentUsedRectForGlyphAtIndex:effectiveRange:withoutAdditionalLayout:");
-public static final int /*long*/ sel_lineToPoint_ = sel_registerName("lineToPoint:");
-public static final int /*long*/ sel_linkTextAttributes = sel_registerName("linkTextAttributes");
-public static final int /*long*/ sel_loadHTMLString_baseURL_ = sel_registerName("loadHTMLString:baseURL:");
-public static final int /*long*/ sel_loadNibFile_externalNameTable_withZone_ = sel_registerName("loadNibFile:externalNameTable:withZone:");
-public static final int /*long*/ sel_loadRequest_ = sel_registerName("loadRequest:");
-public static final int /*long*/ sel_localizedDescription = sel_registerName("localizedDescription");
-public static final int /*long*/ sel_location = sel_registerName("location");
-public static final int /*long*/ sel_locationForGlyphAtIndex_ = sel_registerName("locationForGlyphAtIndex:");
-public static final int /*long*/ sel_locationInWindow = sel_registerName("locationInWindow");
-public static final int /*long*/ sel_lockFocus = sel_registerName("lockFocus");
-public static final int /*long*/ sel_lowercaseString = sel_registerName("lowercaseString");
-public static final int /*long*/ sel_magnification = sel_registerName("magnification");
-public static final int /*long*/ sel_magnifyWithEvent_ = sel_registerName("magnifyWithEvent:");
-public static final int /*long*/ sel_mainBundle = sel_registerName("mainBundle");
-public static final int /*long*/ sel_mainFrame = sel_registerName("mainFrame");
-public static final int /*long*/ sel_mainMenu = sel_registerName("mainMenu");
-public static final int /*long*/ sel_mainRunLoop = sel_registerName("mainRunLoop");
-public static final int /*long*/ sel_mainScreen = sel_registerName("mainScreen");
-public static final int /*long*/ sel_mainWindow = sel_registerName("mainWindow");
-public static final int /*long*/ sel_makeCurrentContext = sel_registerName("makeCurrentContext");
-public static final int /*long*/ sel_makeFirstResponder_ = sel_registerName("makeFirstResponder:");
-public static final int /*long*/ sel_makeKeyAndOrderFront_ = sel_registerName("makeKeyAndOrderFront:");
-public static final int /*long*/ sel_markedRange = sel_registerName("markedRange");
-public static final int /*long*/ sel_markedTextAttributes = sel_registerName("markedTextAttributes");
-public static final int /*long*/ sel_maxValue = sel_registerName("maxValue");
-public static final int /*long*/ sel_maximum = sel_registerName("maximum");
-public static final int /*long*/ sel_maximumFractionDigits = sel_registerName("maximumFractionDigits");
-public static final int /*long*/ sel_maximumIntegerDigits = sel_registerName("maximumIntegerDigits");
-public static final int /*long*/ sel_menu = sel_registerName("menu");
-public static final int /*long*/ sel_menu_willHighlightItem_ = sel_registerName("menu:willHighlightItem:");
-public static final int /*long*/ sel_menuBarFontOfSize_ = sel_registerName("menuBarFontOfSize:");
-public static final int /*long*/ sel_menuDidClose_ = sel_registerName("menuDidClose:");
-public static final int /*long*/ sel_menuFontOfSize_ = sel_registerName("menuFontOfSize:");
-public static final int /*long*/ sel_menuForEvent_ = sel_registerName("menuForEvent:");
-public static final int /*long*/ sel_menuNeedsUpdate_ = sel_registerName("menuNeedsUpdate:");
-public static final int /*long*/ sel_menuWillOpen_ = sel_registerName("menuWillOpen:");
-public static final int /*long*/ sel_metaKey = sel_registerName("metaKey");
-public static final int /*long*/ sel_minFrameWidthWithTitle_styleMask_ = sel_registerName("minFrameWidthWithTitle:styleMask:");
-public static final int /*long*/ sel_minSize = sel_registerName("minSize");
-public static final int /*long*/ sel_minValue = sel_registerName("minValue");
-public static final int /*long*/ sel_miniaturize_ = sel_registerName("miniaturize:");
-public static final int /*long*/ sel_minimum = sel_registerName("minimum");
-public static final int /*long*/ sel_minimumSize = sel_registerName("minimumSize");
-public static final int /*long*/ sel_minuteOfHour = sel_registerName("minuteOfHour");
-public static final int /*long*/ sel_modifierFlags = sel_registerName("modifierFlags");
-public static final int /*long*/ sel_monthOfYear = sel_registerName("monthOfYear");
-public static final int /*long*/ sel_mouse_inRect_ = sel_registerName("mouse:inRect:");
-public static final int /*long*/ sel_mouseDown_ = sel_registerName("mouseDown:");
-public static final int /*long*/ sel_mouseDownCanMoveWindow = sel_registerName("mouseDownCanMoveWindow");
-public static final int /*long*/ sel_mouseDragged_ = sel_registerName("mouseDragged:");
-public static final int /*long*/ sel_mouseEntered_ = sel_registerName("mouseEntered:");
-public static final int /*long*/ sel_mouseExited_ = sel_registerName("mouseExited:");
-public static final int /*long*/ sel_mouseLocation = sel_registerName("mouseLocation");
-public static final int /*long*/ sel_mouseLocationOutsideOfEventStream = sel_registerName("mouseLocationOutsideOfEventStream");
-public static final int /*long*/ sel_mouseMoved_ = sel_registerName("mouseMoved:");
-public static final int /*long*/ sel_mouseUp_ = sel_registerName("mouseUp:");
-public static final int /*long*/ sel_moveColumn_toColumn_ = sel_registerName("moveColumn:toColumn:");
-public static final int /*long*/ sel_moveToBeginningOfParagraph_ = sel_registerName("moveToBeginningOfParagraph:");
-public static final int /*long*/ sel_moveToEndOfParagraph_ = sel_registerName("moveToEndOfParagraph:");
-public static final int /*long*/ sel_moveToPoint_ = sel_registerName("moveToPoint:");
-public static final int /*long*/ sel_moveUp_ = sel_registerName("moveUp:");
-public static final int /*long*/ sel_mutableCopy = sel_registerName("mutableCopy");
-public static final int /*long*/ sel_mutableString = sel_registerName("mutableString");
-public static final int /*long*/ sel_name = sel_registerName("name");
-public static final int /*long*/ sel_needsPanelToBecomeKey = sel_registerName("needsPanelToBecomeKey");
-public static final int /*long*/ sel_nextEventMatchingMask_untilDate_inMode_dequeue_ = sel_registerName("nextEventMatchingMask:untilDate:inMode:dequeue:");
-public static final int /*long*/ sel_nextObject = sel_registerName("nextObject");
-public static final int /*long*/ sel_nextState = sel_registerName("nextState");
-public static final int /*long*/ sel_nextWordFromIndex_forward_ = sel_registerName("nextWordFromIndex:forward:");
-public static final int /*long*/ sel_noResponderFor_ = sel_registerName("noResponderFor:");
-public static final int /*long*/ sel_normalizedPosition = sel_registerName("normalizedPosition");
-public static final int /*long*/ sel_noteNumberOfRowsChanged = sel_registerName("noteNumberOfRowsChanged");
-public static final int /*long*/ sel_numberOfColumns = sel_registerName("numberOfColumns");
-public static final int /*long*/ sel_numberOfComponents = sel_registerName("numberOfComponents");
-public static final int /*long*/ sel_numberOfGlyphs = sel_registerName("numberOfGlyphs");
-public static final int /*long*/ sel_numberOfItems = sel_registerName("numberOfItems");
-public static final int /*long*/ sel_numberOfPlanes = sel_registerName("numberOfPlanes");
-public static final int /*long*/ sel_numberOfRows = sel_registerName("numberOfRows");
-public static final int /*long*/ sel_numberOfRowsInTableView_ = sel_registerName("numberOfRowsInTableView:");
-public static final int /*long*/ sel_numberOfSelectedRows = sel_registerName("numberOfSelectedRows");
-public static final int /*long*/ sel_numberOfVisibleItems = sel_registerName("numberOfVisibleItems");
-public static final int /*long*/ sel_numberWithBool_ = sel_registerName("numberWithBool:");
-public static final int /*long*/ sel_numberWithDouble_ = sel_registerName("numberWithDouble:");
-public static final int /*long*/ sel_numberWithInt_ = sel_registerName("numberWithInt:");
-public static final int /*long*/ sel_numberWithInteger_ = sel_registerName("numberWithInteger:");
-public static final int /*long*/ sel_objCType = sel_registerName("objCType");
-public static final int /*long*/ sel_object = sel_registerName("object");
-public static final int /*long*/ sel_objectAtIndex_ = sel_registerName("objectAtIndex:");
-public static final int /*long*/ sel_objectEnumerator = sel_registerName("objectEnumerator");
-public static final int /*long*/ sel_objectForInfoDictionaryKey_ = sel_registerName("objectForInfoDictionaryKey:");
-public static final int /*long*/ sel_objectForKey_ = sel_registerName("objectForKey:");
-public static final int /*long*/ sel_objectValues = sel_registerName("objectValues");
-public static final int /*long*/ sel_openFile_withApplication_ = sel_registerName("openFile:withApplication:");
-public static final int /*long*/ sel_openPanel = sel_registerName("openPanel");
-public static final int /*long*/ sel_openURL_ = sel_registerName("openURL:");
-public static final int /*long*/ sel_openURLs_withAppBundleIdentifier_options_additionalEventParamDescriptor_launchIdentifiers_ = sel_registerName("openURLs:withAppBundleIdentifier:options:additionalEventParamDescriptor:launchIdentifiers:");
-public static final int /*long*/ sel_options = sel_registerName("options");
-public static final int /*long*/ sel_orderBack_ = sel_registerName("orderBack:");
-public static final int /*long*/ sel_orderFront_ = sel_registerName("orderFront:");
-public static final int /*long*/ sel_orderFrontRegardless = sel_registerName("orderFrontRegardless");
-public static final int /*long*/ sel_orderFrontStandardAboutPanel_ = sel_registerName("orderFrontStandardAboutPanel:");
-public static final int /*long*/ sel_orderOut_ = sel_registerName("orderOut:");
-public static final int /*long*/ sel_orderWindow_relativeTo_ = sel_registerName("orderWindow:relativeTo:");
-public static final int /*long*/ sel_orderedWindows = sel_registerName("orderedWindows");
-public static final int /*long*/ sel_otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2_ = sel_registerName("otherEventWithType:location:modifierFlags:timestamp:windowNumber:context:subtype:data1:data2:");
-public static final int /*long*/ sel_otherMouseDown_ = sel_registerName("otherMouseDown:");
-public static final int /*long*/ sel_otherMouseDragged_ = sel_registerName("otherMouseDragged:");
-public static final int /*long*/ sel_otherMouseUp_ = sel_registerName("otherMouseUp:");
-public static final int /*long*/ sel_outlineTableColumn = sel_registerName("outlineTableColumn");
-public static final int /*long*/ sel_outlineView_acceptDrop_item_childIndex_ = sel_registerName("outlineView:acceptDrop:item:childIndex:");
-public static final int /*long*/ sel_outlineView_child_ofItem_ = sel_registerName("outlineView:child:ofItem:");
-public static final int /*long*/ sel_outlineView_didClickTableColumn_ = sel_registerName("outlineView:didClickTableColumn:");
-public static final int /*long*/ sel_outlineView_isItemExpandable_ = sel_registerName("outlineView:isItemExpandable:");
-public static final int /*long*/ sel_outlineView_numberOfChildrenOfItem_ = sel_registerName("outlineView:numberOfChildrenOfItem:");
-public static final int /*long*/ sel_outlineView_objectValueForTableColumn_byItem_ = sel_registerName("outlineView:objectValueForTableColumn:byItem:");
-public static final int /*long*/ sel_outlineView_setObjectValue_forTableColumn_byItem_ = sel_registerName("outlineView:setObjectValue:forTableColumn:byItem:");
-public static final int /*long*/ sel_outlineView_shouldCollapseItem_ = sel_registerName("outlineView:shouldCollapseItem:");
-public static final int /*long*/ sel_outlineView_shouldEditTableColumn_item_ = sel_registerName("outlineView:shouldEditTableColumn:item:");
-public static final int /*long*/ sel_outlineView_shouldExpandItem_ = sel_registerName("outlineView:shouldExpandItem:");
-public static final int /*long*/ sel_outlineView_shouldReorderColumn_toColumn_ = sel_registerName("outlineView:shouldReorderColumn:toColumn:");
-public static final int /*long*/ sel_outlineView_shouldSelectItem_ = sel_registerName("outlineView:shouldSelectItem:");
-public static final int /*long*/ sel_outlineView_shouldTrackCell_forTableColumn_item_ = sel_registerName("outlineView:shouldTrackCell:forTableColumn:item:");
-public static final int /*long*/ sel_outlineView_validateDrop_proposedItem_proposedChildIndex_ = sel_registerName("outlineView:validateDrop:proposedItem:proposedChildIndex:");
-public static final int /*long*/ sel_outlineView_willDisplayCell_forTableColumn_item_ = sel_registerName("outlineView:willDisplayCell:forTableColumn:item:");
-public static final int /*long*/ sel_outlineView_writeItems_toPasteboard_ = sel_registerName("outlineView:writeItems:toPasteboard:");
-public static final int /*long*/ sel_outlineViewColumnDidMove_ = sel_registerName("outlineViewColumnDidMove:");
-public static final int /*long*/ sel_outlineViewColumnDidResize_ = sel_registerName("outlineViewColumnDidResize:");
-public static final int /*long*/ sel_outlineViewItemDidExpand_ = sel_registerName("outlineViewItemDidExpand:");
-public static final int /*long*/ sel_outlineViewSelectionDidChange_ = sel_registerName("outlineViewSelectionDidChange:");
-public static final int /*long*/ sel_outlineViewSelectionIsChanging_ = sel_registerName("outlineViewSelectionIsChanging:");
-public static final int /*long*/ sel_owner = sel_registerName("owner");
-public static final int /*long*/ sel_pageDown_ = sel_registerName("pageDown:");
-public static final int /*long*/ sel_pageTitle = sel_registerName("pageTitle");
-public static final int /*long*/ sel_pageUp_ = sel_registerName("pageUp:");
-public static final int /*long*/ sel_panel_shouldShowFilename_ = sel_registerName("panel:shouldShowFilename:");
-public static final int /*long*/ sel_panelConvertFont_ = sel_registerName("panelConvertFont:");
-public static final int /*long*/ sel_paperSize = sel_registerName("paperSize");
-public static final int /*long*/ sel_paragraphs = sel_registerName("paragraphs");
-public static final int /*long*/ sel_parentWindow = sel_registerName("parentWindow");
-public static final int /*long*/ sel_password = sel_registerName("password");
-public static final int /*long*/ sel_paste_ = sel_registerName("paste:");
-public static final int /*long*/ sel_pasteboard_provideDataForType_ = sel_registerName("pasteboard:provideDataForType:");
-public static final int /*long*/ sel_pasteboardWithName_ = sel_registerName("pasteboardWithName:");
-public static final int /*long*/ sel_path = sel_registerName("path");
-public static final int /*long*/ sel_pathExtension = sel_registerName("pathExtension");
-public static final int /*long*/ sel_pathForResource_ofType_ = sel_registerName("pathForResource:ofType:");
-public static final int /*long*/ sel_pathForResource_ofType_inDirectory_forLocalization_ = sel_registerName("pathForResource:ofType:inDirectory:forLocalization:");
-public static final int /*long*/ sel_performDragOperation_ = sel_registerName("performDragOperation:");
-public static final int /*long*/ sel_performKeyEquivalent_ = sel_registerName("performKeyEquivalent:");
-public static final int /*long*/ sel_performSelector_withObject_afterDelay_inModes_ = sel_registerName("performSelector:withObject:afterDelay:inModes:");
-public static final int /*long*/ sel_performSelectorOnMainThread_withObject_waitUntilDone_ = sel_registerName("performSelectorOnMainThread:withObject:waitUntilDone:");
-public static final int /*long*/ sel_phase = sel_registerName("phase");
-public static final int /*long*/ sel_pixelsHigh = sel_registerName("pixelsHigh");
-public static final int /*long*/ sel_pixelsWide = sel_registerName("pixelsWide");
-public static final int /*long*/ sel_pointSize = sel_registerName("pointSize");
-public static final int /*long*/ sel_pointValue = sel_registerName("pointValue");
-public static final int /*long*/ sel_pointingHandCursor = sel_registerName("pointingHandCursor");
-public static final int /*long*/ sel_pop = sel_registerName("pop");
-public static final int /*long*/ sel_popUpContextMenu_withEvent_forView_ = sel_registerName("popUpContextMenu:withEvent:forView:");
-public static final int /*long*/ sel_popUpStatusItemMenu_ = sel_registerName("popUpStatusItemMenu:");
-public static final int /*long*/ sel_port = sel_registerName("port");
-public static final int /*long*/ sel_postEvent_atStart_ = sel_registerName("postEvent:atStart:");
-public static final int /*long*/ sel_preparedCellAtColumn_row_ = sel_registerName("preparedCellAtColumn:row:");
-public static final int /*long*/ sel_prependTransform_ = sel_registerName("prependTransform:");
-public static final int /*long*/ sel_preventDefault = sel_registerName("preventDefault");
-public static final int /*long*/ sel_previousFailureCount = sel_registerName("previousFailureCount");
-public static final int /*long*/ sel_printDocumentView = sel_registerName("printDocumentView");
-public static final int /*long*/ sel_printOperationWithPrintInfo_ = sel_registerName("printOperationWithPrintInfo:");
-public static final int /*long*/ sel_printOperationWithView_printInfo_ = sel_registerName("printOperationWithView:printInfo:");
-public static final int /*long*/ sel_printPanel = sel_registerName("printPanel");
-public static final int /*long*/ sel_printSettings = sel_registerName("printSettings");
-public static final int /*long*/ sel_printer = sel_registerName("printer");
-public static final int /*long*/ sel_printerNames = sel_registerName("printerNames");
-public static final int /*long*/ sel_printerWithName_ = sel_registerName("printerWithName:");
-public static final int /*long*/ sel_propertyListForType_ = sel_registerName("propertyListForType:");
-public static final int /*long*/ sel_proposedCredential = sel_registerName("proposedCredential");
-public static final int /*long*/ sel_protectionSpace = sel_registerName("protectionSpace");
-public static final int /*long*/ sel_push = sel_registerName("push");
-public static final int /*long*/ sel_rangeValue = sel_registerName("rangeValue");
-public static final int /*long*/ sel_readSelectionFromPasteboard_ = sel_registerName("readSelectionFromPasteboard:");
-public static final int /*long*/ sel_realm = sel_registerName("realm");
-public static final int /*long*/ sel_recentSearches = sel_registerName("recentSearches");
-public static final int /*long*/ sel_rectArrayForCharacterRange_withinSelectedCharacterRange_inTextContainer_rectCount_ = sel_registerName("rectArrayForCharacterRange:withinSelectedCharacterRange:inTextContainer:rectCount:");
-public static final int /*long*/ sel_rectArrayForGlyphRange_withinSelectedGlyphRange_inTextContainer_rectCount_ = sel_registerName("rectArrayForGlyphRange:withinSelectedGlyphRange:inTextContainer:rectCount:");
-public static final int /*long*/ sel_rectForPart_ = sel_registerName("rectForPart:");
-public static final int /*long*/ sel_rectOfColumn_ = sel_registerName("rectOfColumn:");
-public static final int /*long*/ sel_rectOfRow_ = sel_registerName("rectOfRow:");
-public static final int /*long*/ sel_rectValue = sel_registerName("rectValue");
-public static final int /*long*/ sel_redComponent = sel_registerName("redComponent");
-public static final int /*long*/ sel_redo = sel_registerName("redo");
-public static final int /*long*/ sel_reflectScrolledClipView_ = sel_registerName("reflectScrolledClipView:");
-public static final int /*long*/ sel_registerForDraggedTypes_ = sel_registerName("registerForDraggedTypes:");
-public static final int /*long*/ sel_release = sel_registerName("release");
-public static final int /*long*/ sel_reload_ = sel_registerName("reload:");
-public static final int /*long*/ sel_reloadData = sel_registerName("reloadData");
-public static final int /*long*/ sel_reloadItem_reloadChildren_ = sel_registerName("reloadItem:reloadChildren:");
-public static final int /*long*/ sel_removeAllItems = sel_registerName("removeAllItems");
-public static final int /*long*/ sel_removeAllPoints = sel_registerName("removeAllPoints");
-public static final int /*long*/ sel_removeAttribute_range_ = sel_registerName("removeAttribute:range:");
-public static final int /*long*/ sel_removeChildWindow_ = sel_registerName("removeChildWindow:");
-public static final int /*long*/ sel_removeColorWithKey_ = sel_registerName("removeColorWithKey:");
-public static final int /*long*/ sel_removeFromSuperview = sel_registerName("removeFromSuperview");
-public static final int /*long*/ sel_removeIndex_ = sel_registerName("removeIndex:");
-public static final int /*long*/ sel_removeItem_ = sel_registerName("removeItem:");
-public static final int /*long*/ sel_removeItemAtIndex_ = sel_registerName("removeItemAtIndex:");
-public static final int /*long*/ sel_removeItemAtPath_error_ = sel_registerName("removeItemAtPath:error:");
-public static final int /*long*/ sel_removeLastObject = sel_registerName("removeLastObject");
-public static final int /*long*/ sel_removeObject_ = sel_registerName("removeObject:");
-public static final int /*long*/ sel_removeObjectAtIndex_ = sel_registerName("removeObjectAtIndex:");
-public static final int /*long*/ sel_removeObjectForKey_ = sel_registerName("removeObjectForKey:");
-public static final int /*long*/ sel_removeObjectIdenticalTo_ = sel_registerName("removeObjectIdenticalTo:");
-public static final int /*long*/ sel_removeObserver_ = sel_registerName("removeObserver:");
-public static final int /*long*/ sel_removeObserver_name_object_ = sel_registerName("removeObserver:name:object:");
-public static final int /*long*/ sel_removeRepresentation_ = sel_registerName("removeRepresentation:");
-public static final int /*long*/ sel_removeStatusItem_ = sel_registerName("removeStatusItem:");
-public static final int /*long*/ sel_removeTabViewItem_ = sel_registerName("removeTabViewItem:");
-public static final int /*long*/ sel_removeTableColumn_ = sel_registerName("removeTableColumn:");
-public static final int /*long*/ sel_removeTemporaryAttribute_forCharacterRange_ = sel_registerName("removeTemporaryAttribute:forCharacterRange:");
-public static final int /*long*/ sel_removeToolTip_ = sel_registerName("removeToolTip:");
-public static final int /*long*/ sel_removeTrackingArea_ = sel_registerName("removeTrackingArea:");
-public static final int /*long*/ sel_replaceCharactersInRange_withString_ = sel_registerName("replaceCharactersInRange:withString:");
-public static final int /*long*/ sel_replyToOpenOrPrint_ = sel_registerName("replyToOpenOrPrint:");
-public static final int /*long*/ sel_representation = sel_registerName("representation");
-public static final int /*long*/ sel_representations = sel_registerName("representations");
-public static final int /*long*/ sel_request = sel_registerName("request");
-public static final int /*long*/ sel_requestWithURL_ = sel_registerName("requestWithURL:");
-public static final int /*long*/ sel_resetCursorRects = sel_registerName("resetCursorRects");
-public static final int /*long*/ sel_resignFirstResponder = sel_registerName("resignFirstResponder");
-public static final int /*long*/ sel_resizeDownCursor = sel_registerName("resizeDownCursor");
-public static final int /*long*/ sel_resizeLeftCursor = sel_registerName("resizeLeftCursor");
-public static final int /*long*/ sel_resizeLeftRightCursor = sel_registerName("resizeLeftRightCursor");
-public static final int /*long*/ sel_resizeRightCursor = sel_registerName("resizeRightCursor");
-public static final int /*long*/ sel_resizeUpCursor = sel_registerName("resizeUpCursor");
-public static final int /*long*/ sel_resizeUpDownCursor = sel_registerName("resizeUpDownCursor");
-public static final int /*long*/ sel_resizingMask = sel_registerName("resizingMask");
-public static final int /*long*/ sel_resourcePath = sel_registerName("resourcePath");
-public static final int /*long*/ sel_respondsToSelector_ = sel_registerName("respondsToSelector:");
-public static final int /*long*/ sel_restoreGraphicsState = sel_registerName("restoreGraphicsState");
-public static final int /*long*/ sel_retain = sel_registerName("retain");
-public static final int /*long*/ sel_retainCount = sel_registerName("retainCount");
-public static final int /*long*/ sel_rightMouseDown_ = sel_registerName("rightMouseDown:");
-public static final int /*long*/ sel_rightMouseDragged_ = sel_registerName("rightMouseDragged:");
-public static final int /*long*/ sel_rightMouseUp_ = sel_registerName("rightMouseUp:");
-public static final int /*long*/ sel_rotateByDegrees_ = sel_registerName("rotateByDegrees:");
-public static final int /*long*/ sel_rotateWithEvent_ = sel_registerName("rotateWithEvent:");
-public static final int /*long*/ sel_rotation = sel_registerName("rotation");
-public static final int /*long*/ sel_rowAtPoint_ = sel_registerName("rowAtPoint:");
-public static final int /*long*/ sel_rowForItem_ = sel_registerName("rowForItem:");
-public static final int /*long*/ sel_rowHeight = sel_registerName("rowHeight");
-public static final int /*long*/ sel_rowsInRect_ = sel_registerName("rowsInRect:");
-public static final int /*long*/ sel_run = sel_registerName("run");
-public static final int /*long*/ sel_runModal = sel_registerName("runModal");
-public static final int /*long*/ sel_runModalForDirectory_file_ = sel_registerName("runModalForDirectory:file:");
-public static final int /*long*/ sel_runModalForWindow_ = sel_registerName("runModalForWindow:");
-public static final int /*long*/ sel_runModalWithPrintInfo_ = sel_registerName("runModalWithPrintInfo:");
-public static final int /*long*/ sel_runMode_beforeDate_ = sel_registerName("runMode:beforeDate:");
-public static final int /*long*/ sel_runOperation = sel_registerName("runOperation");
-public static final int /*long*/ sel_samplesPerPixel = sel_registerName("samplesPerPixel");
-public static final int /*long*/ sel_saveGraphicsState = sel_registerName("saveGraphicsState");
-public static final int /*long*/ sel_savePanel = sel_registerName("savePanel");
-public static final int /*long*/ sel_scaleXBy_yBy_ = sel_registerName("scaleXBy:yBy:");
-public static final int /*long*/ sel_scheduledTimerWithTimeInterval_target_selector_userInfo_repeats_ = sel_registerName("scheduledTimerWithTimeInterval:target:selector:userInfo:repeats:");
-public static final int /*long*/ sel_screen = sel_registerName("screen");
-public static final int /*long*/ sel_screenX = sel_registerName("screenX");
-public static final int /*long*/ sel_screenY = sel_registerName("screenY");
-public static final int /*long*/ sel_screens = sel_registerName("screens");
-public static final int /*long*/ sel_scrollClipView_toPoint_ = sel_registerName("scrollClipView:toPoint:");
-public static final int /*long*/ sel_scrollColumnToVisible_ = sel_registerName("scrollColumnToVisible:");
-public static final int /*long*/ sel_scrollPoint_ = sel_registerName("scrollPoint:");
-public static final int /*long*/ sel_scrollRangeToVisible_ = sel_registerName("scrollRangeToVisible:");
-public static final int /*long*/ sel_scrollRectToVisible_ = sel_registerName("scrollRectToVisible:");
-public static final int /*long*/ sel_scrollRowToVisible_ = sel_registerName("scrollRowToVisible:");
-public static final int /*long*/ sel_scrollToPoint_ = sel_registerName("scrollToPoint:");
-public static final int /*long*/ sel_scrollWheel_ = sel_registerName("scrollWheel:");
-public static final int /*long*/ sel_scrollerWidth = sel_registerName("scrollerWidth");
-public static final int /*long*/ sel_scrollerWidthForControlSize_ = sel_registerName("scrollerWidthForControlSize:");
-public static final int /*long*/ sel_searchButtonCell = sel_registerName("searchButtonCell");
-public static final int /*long*/ sel_searchTextRectForBounds_ = sel_registerName("searchTextRectForBounds:");
-public static final int /*long*/ sel_secondOfMinute = sel_registerName("secondOfMinute");
-public static final int /*long*/ sel_secondarySelectedControlColor = sel_registerName("secondarySelectedControlColor");
-public static final int /*long*/ sel_selectAll_ = sel_registerName("selectAll:");
-public static final int /*long*/ sel_selectItem_ = sel_registerName("selectItem:");
-public static final int /*long*/ sel_selectItemAtIndex_ = sel_registerName("selectItemAtIndex:");
-public static final int /*long*/ sel_selectRowIndexes_byExtendingSelection_ = sel_registerName("selectRowIndexes:byExtendingSelection:");
-public static final int /*long*/ sel_selectTabViewItemAtIndex_ = sel_registerName("selectTabViewItemAtIndex:");
-public static final int /*long*/ sel_selectText_ = sel_registerName("selectText:");
-public static final int /*long*/ sel_selectedControlColor = sel_registerName("selectedControlColor");
-public static final int /*long*/ sel_selectedControlTextColor = sel_registerName("selectedControlTextColor");
-public static final int /*long*/ sel_selectedRange = sel_registerName("selectedRange");
-public static final int /*long*/ sel_selectedRow = sel_registerName("selectedRow");
-public static final int /*long*/ sel_selectedRowIndexes = sel_registerName("selectedRowIndexes");
-public static final int /*long*/ sel_selectedTabViewItem = sel_registerName("selectedTabViewItem");
-public static final int /*long*/ sel_selectedTextAttributes = sel_registerName("selectedTextAttributes");
-public static final int /*long*/ sel_selectedTextBackgroundColor = sel_registerName("selectedTextBackgroundColor");
-public static final int /*long*/ sel_selectedTextColor = sel_registerName("selectedTextColor");
-public static final int /*long*/ sel_sendAction_to_ = sel_registerName("sendAction:to:");
-public static final int /*long*/ sel_sendAction_to_from_ = sel_registerName("sendAction:to:from:");
-public static final int /*long*/ sel_sendEvent_ = sel_registerName("sendEvent:");
-public static final int /*long*/ sel_sender = sel_registerName("sender");
-public static final int /*long*/ sel_separatorItem = sel_registerName("separatorItem");
-public static final int /*long*/ sel_set = sel_registerName("set");
-public static final int /*long*/ sel_setAcceptsMouseMovedEvents_ = sel_registerName("setAcceptsMouseMovedEvents:");
-public static final int /*long*/ sel_setAcceptsTouchEvents_ = sel_registerName("setAcceptsTouchEvents:");
-public static final int /*long*/ sel_setAccessoryView_ = sel_registerName("setAccessoryView:");
-public static final int /*long*/ sel_setAction_ = sel_registerName("setAction:");
-public static final int /*long*/ sel_setAlertStyle_ = sel_registerName("setAlertStyle:");
-public static final int /*long*/ sel_setAlignment_ = sel_registerName("setAlignment:");
-public static final int /*long*/ sel_setAllowsColumnReordering_ = sel_registerName("setAllowsColumnReordering:");
-public static final int /*long*/ sel_setAllowsFloats_ = sel_registerName("setAllowsFloats:");
-public static final int /*long*/ sel_setAllowsMixedState_ = sel_registerName("setAllowsMixedState:");
-public static final int /*long*/ sel_setAllowsMultipleSelection_ = sel_registerName("setAllowsMultipleSelection:");
-public static final int /*long*/ sel_setAllowsUndo_ = sel_registerName("setAllowsUndo:");
-public static final int /*long*/ sel_setAllowsUserCustomization_ = sel_registerName("setAllowsUserCustomization:");
-public static final int /*long*/ sel_setAlpha_ = sel_registerName("setAlpha:");
-public static final int /*long*/ sel_setAlphaValue_ = sel_registerName("setAlphaValue:");
-public static final int /*long*/ sel_setAlternateButtonTitle_ = sel_registerName("setAlternateButtonTitle:");
-public static final int /*long*/ sel_setApplicationIconImage_ = sel_registerName("setApplicationIconImage:");
-public static final int /*long*/ sel_setApplicationNameForUserAgent_ = sel_registerName("setApplicationNameForUserAgent:");
-public static final int /*long*/ sel_setAttachmentCell_ = sel_registerName("setAttachmentCell:");
-public static final int /*long*/ sel_setAttributedString_ = sel_registerName("setAttributedString:");
-public static final int /*long*/ sel_setAttributedStringValue_ = sel_registerName("setAttributedStringValue:");
-public static final int /*long*/ sel_setAttributedTitle_ = sel_registerName("setAttributedTitle:");
-public static final int /*long*/ sel_setAutoenablesItems_ = sel_registerName("setAutoenablesItems:");
-public static final int /*long*/ sel_setAutohidesScrollers_ = sel_registerName("setAutohidesScrollers:");
-public static final int /*long*/ sel_setAutoresizesOutlineColumn_ = sel_registerName("setAutoresizesOutlineColumn:");
-public static final int /*long*/ sel_setAutoresizesSubviews_ = sel_registerName("setAutoresizesSubviews:");
-public static final int /*long*/ sel_setAutoresizingMask_ = sel_registerName("setAutoresizingMask:");
-public static final int /*long*/ sel_setAutosaveExpandedItems_ = sel_registerName("setAutosaveExpandedItems:");
-public static final int /*long*/ sel_setBackgroundColor_ = sel_registerName("setBackgroundColor:");
-public static final int /*long*/ sel_setBackgroundLayoutEnabled_ = sel_registerName("setBackgroundLayoutEnabled:");
-public static final int /*long*/ sel_setBackgroundStyle_ = sel_registerName("setBackgroundStyle:");
-public static final int /*long*/ sel_setBadgeLabel_ = sel_registerName("setBadgeLabel:");
-public static final int /*long*/ sel_setBaseWritingDirection_ = sel_registerName("setBaseWritingDirection:");
-public static final int /*long*/ sel_setBaseWritingDirection_range_ = sel_registerName("setBaseWritingDirection:range:");
-public static final int /*long*/ sel_setBecomesKeyOnlyIfNeeded_ = sel_registerName("setBecomesKeyOnlyIfNeeded:");
-public static final int /*long*/ sel_setBezelStyle_ = sel_registerName("setBezelStyle:");
-public static final int /*long*/ sel_setBezeled_ = sel_registerName("setBezeled:");
-public static final int /*long*/ sel_setBorderType_ = sel_registerName("setBorderType:");
-public static final int /*long*/ sel_setBorderWidth_ = sel_registerName("setBorderWidth:");
-public static final int /*long*/ sel_setBordered_ = sel_registerName("setBordered:");
-public static final int /*long*/ sel_setBoundsRotation_ = sel_registerName("setBoundsRotation:");
-public static final int /*long*/ sel_setBoxType_ = sel_registerName("setBoxType:");
-public static final int /*long*/ sel_setButtonType_ = sel_registerName("setButtonType:");
-public static final int /*long*/ sel_setCacheMode_ = sel_registerName("setCacheMode:");
-public static final int /*long*/ sel_setCachePolicy_ = sel_registerName("setCachePolicy:");
-public static final int /*long*/ sel_setCanChooseDirectories_ = sel_registerName("setCanChooseDirectories:");
-public static final int /*long*/ sel_setCanChooseFiles_ = sel_registerName("setCanChooseFiles:");
-public static final int /*long*/ sel_setCanCreateDirectories_ = sel_registerName("setCanCreateDirectories:");
-public static final int /*long*/ sel_setCancelButtonCell_ = sel_registerName("setCancelButtonCell:");
-public static final int /*long*/ sel_setCell_ = sel_registerName("setCell:");
-public static final int /*long*/ sel_setCellClass_ = sel_registerName("setCellClass:");
-public static final int /*long*/ sel_setClip = sel_registerName("setClip");
-public static final int /*long*/ sel_setCollectionBehavior_ = sel_registerName("setCollectionBehavior:");
-public static final int /*long*/ sel_setColor_ = sel_registerName("setColor:");
-public static final int /*long*/ sel_setColumnAutoresizingStyle_ = sel_registerName("setColumnAutoresizingStyle:");
-public static final int /*long*/ sel_setCompositingOperation_ = sel_registerName("setCompositingOperation:");
-public static final int /*long*/ sel_setContainerSize_ = sel_registerName("setContainerSize:");
-public static final int /*long*/ sel_setContentView_ = sel_registerName("setContentView:");
-public static final int /*long*/ sel_setContentViewMargins_ = sel_registerName("setContentViewMargins:");
-public static final int /*long*/ sel_setControlSize_ = sel_registerName("setControlSize:");
-public static final int /*long*/ sel_setCookie_ = sel_registerName("setCookie:");
-public static final int /*long*/ sel_setCopiesOnScroll_ = sel_registerName("setCopiesOnScroll:");
-public static final int /*long*/ sel_setCurrentContext_ = sel_registerName("setCurrentContext:");
-public static final int /*long*/ sel_setCurrentOperation_ = sel_registerName("setCurrentOperation:");
-public static final int /*long*/ sel_setCustomUserAgent_ = sel_registerName("setCustomUserAgent:");
-public static final int /*long*/ sel_setData_forType_ = sel_registerName("setData:forType:");
-public static final int /*long*/ sel_setDataCell_ = sel_registerName("setDataCell:");
-public static final int /*long*/ sel_setDataSource_ = sel_registerName("setDataSource:");
-public static final int /*long*/ sel_setDatePickerElements_ = sel_registerName("setDatePickerElements:");
-public static final int /*long*/ sel_setDatePickerStyle_ = sel_registerName("setDatePickerStyle:");
-public static final int /*long*/ sel_setDateValue_ = sel_registerName("setDateValue:");
-public static final int /*long*/ sel_setDefaultButtonCell_ = sel_registerName("setDefaultButtonCell:");
-public static final int /*long*/ sel_setDefaultFlatness_ = sel_registerName("setDefaultFlatness:");
-public static final int /*long*/ sel_setDefaultParagraphStyle_ = sel_registerName("setDefaultParagraphStyle:");
-public static final int /*long*/ sel_setDefaultTabInterval_ = sel_registerName("setDefaultTabInterval:");
-public static final int /*long*/ sel_setDelegate_ = sel_registerName("setDelegate:");
-public static final int /*long*/ sel_setDestination_allowOverwrite_ = sel_registerName("setDestination:allowOverwrite:");
-public static final int /*long*/ sel_setDictionary_ = sel_registerName("setDictionary:");
-public static final int /*long*/ sel_setDirectory_ = sel_registerName("setDirectory:");
-public static final int /*long*/ sel_setDisplayMode_ = sel_registerName("setDisplayMode:");
-public static final int /*long*/ sel_setDisplaysLinkToolTips_ = sel_registerName("setDisplaysLinkToolTips:");
-public static final int /*long*/ sel_setDocumentCursor_ = sel_registerName("setDocumentCursor:");
-public static final int /*long*/ sel_setDocumentEdited_ = sel_registerName("setDocumentEdited:");
-public static final int /*long*/ sel_setDocumentView_ = sel_registerName("setDocumentView:");
-public static final int /*long*/ sel_setDoubleAction_ = sel_registerName("setDoubleAction:");
-public static final int /*long*/ sel_setDoubleValue_ = sel_registerName("setDoubleValue:");
-public static final int /*long*/ sel_setDownloadDelegate_ = sel_registerName("setDownloadDelegate:");
-public static final int /*long*/ sel_setDrawsBackground_ = sel_registerName("setDrawsBackground:");
-public static final int /*long*/ sel_setDropItem_dropChildIndex_ = sel_registerName("setDropItem:dropChildIndex:");
-public static final int /*long*/ sel_setDropRow_dropOperation_ = sel_registerName("setDropRow:dropOperation:");
-public static final int /*long*/ sel_setEditable_ = sel_registerName("setEditable:");
-public static final int /*long*/ sel_setEnabled_ = sel_registerName("setEnabled:");
-public static final int /*long*/ sel_setEnabled_forSegment_ = sel_registerName("setEnabled:forSegment:");
-public static final int /*long*/ sel_setFill = sel_registerName("setFill");
-public static final int /*long*/ sel_setFillColor_ = sel_registerName("setFillColor:");
-public static final int /*long*/ sel_setFireDate_ = sel_registerName("setFireDate:");
-public static final int /*long*/ sel_setFirstLineHeadIndent_ = sel_registerName("setFirstLineHeadIndent:");
-public static final int /*long*/ sel_setFloatingPanel_ = sel_registerName("setFloatingPanel:");
-public static final int /*long*/ sel_setFocusRingType_ = sel_registerName("setFocusRingType:");
-public static final int /*long*/ sel_setFont_ = sel_registerName("setFont:");
-public static final int /*long*/ sel_setFormatter_ = sel_registerName("setFormatter:");
-public static final int /*long*/ sel_setFrame_ = sel_registerName("setFrame:");
-public static final int /*long*/ sel_setFrame_display_ = sel_registerName("setFrame:display:");
-public static final int /*long*/ sel_setFrame_display_animate_ = sel_registerName("setFrame:display:animate:");
-public static final int /*long*/ sel_setFrameFromContentFrame_ = sel_registerName("setFrameFromContentFrame:");
-public static final int /*long*/ sel_setFrameLoadDelegate_ = sel_registerName("setFrameLoadDelegate:");
-public static final int /*long*/ sel_setFrameOrigin_ = sel_registerName("setFrameOrigin:");
-public static final int /*long*/ sel_setFrameSize_ = sel_registerName("setFrameSize:");
-public static final int /*long*/ sel_setGridStyleMask_ = sel_registerName("setGridStyleMask:");
-public static final int /*long*/ sel_setHTTPBody_ = sel_registerName("setHTTPBody:");
-public static final int /*long*/ sel_setHTTPMethod_ = sel_registerName("setHTTPMethod:");
-public static final int /*long*/ sel_setHasHorizontalScroller_ = sel_registerName("setHasHorizontalScroller:");
-public static final int /*long*/ sel_setHasShadow_ = sel_registerName("setHasShadow:");
-public static final int /*long*/ sel_setHasVerticalScroller_ = sel_registerName("setHasVerticalScroller:");
-public static final int /*long*/ sel_setHeadIndent_ = sel_registerName("setHeadIndent:");
-public static final int /*long*/ sel_setHeaderCell_ = sel_registerName("setHeaderCell:");
-public static final int /*long*/ sel_setHeaderView_ = sel_registerName("setHeaderView:");
-public static final int /*long*/ sel_setHidden_ = sel_registerName("setHidden:");
-public static final int /*long*/ sel_setHiddenUntilMouseMoves_ = sel_registerName("setHiddenUntilMouseMoves:");
-public static final int /*long*/ sel_setHidesOnDeactivate_ = sel_registerName("setHidesOnDeactivate:");
-public static final int /*long*/ sel_setHighlightMode_ = sel_registerName("setHighlightMode:");
-public static final int /*long*/ sel_setHighlighted_ = sel_registerName("setHighlighted:");
-public static final int /*long*/ sel_setHighlightedTableColumn_ = sel_registerName("setHighlightedTableColumn:");
-public static final int /*long*/ sel_setHighlightsBy_ = sel_registerName("setHighlightsBy:");
-public static final int /*long*/ sel_setHorizontalScroller_ = sel_registerName("setHorizontalScroller:");
-public static final int /*long*/ sel_setHorizontallyResizable_ = sel_registerName("setHorizontallyResizable:");
-public static final int /*long*/ sel_setIcon_ = sel_registerName("setIcon:");
-public static final int /*long*/ sel_setIdentifier_ = sel_registerName("setIdentifier:");
-public static final int /*long*/ sel_setImage_ = sel_registerName("setImage:");
-public static final int /*long*/ sel_setImage_forSegment_ = sel_registerName("setImage:forSegment:");
-public static final int /*long*/ sel_setImageAlignment_ = sel_registerName("setImageAlignment:");
-public static final int /*long*/ sel_setImageInterpolation_ = sel_registerName("setImageInterpolation:");
-public static final int /*long*/ sel_setImagePosition_ = sel_registerName("setImagePosition:");
-public static final int /*long*/ sel_setImageScaling_ = sel_registerName("setImageScaling:");
-public static final int /*long*/ sel_setIncrement_ = sel_registerName("setIncrement:");
-public static final int /*long*/ sel_setIndeterminate_ = sel_registerName("setIndeterminate:");
-public static final int /*long*/ sel_setIndicatorImage_inTableColumn_ = sel_registerName("setIndicatorImage:inTableColumn:");
-public static final int /*long*/ sel_setIntercellSpacing_ = sel_registerName("setIntercellSpacing:");
-public static final int /*long*/ sel_setJavaEnabled_ = sel_registerName("setJavaEnabled:");
-public static final int /*long*/ sel_setJavaScriptEnabled_ = sel_registerName("setJavaScriptEnabled:");
-public static final int /*long*/ sel_setJobDisposition_ = sel_registerName("setJobDisposition:");
-public static final int /*long*/ sel_setJobTitle_ = sel_registerName("setJobTitle:");
-public static final int /*long*/ sel_setKeyEquivalent_ = sel_registerName("setKeyEquivalent:");
-public static final int /*long*/ sel_setKeyEquivalentModifierMask_ = sel_registerName("setKeyEquivalentModifierMask:");
-public static final int /*long*/ sel_setKnobProportion_ = sel_registerName("setKnobProportion:");
-public static final int /*long*/ sel_setLabel_ = sel_registerName("setLabel:");
-public static final int /*long*/ sel_setLabel_forSegment_ = sel_registerName("setLabel:forSegment:");
-public static final int /*long*/ sel_setLeaf_ = sel_registerName("setLeaf:");
-public static final int /*long*/ sel_setLength_ = sel_registerName("setLength:");
-public static final int /*long*/ sel_setLevel_ = sel_registerName("setLevel:");
-public static final int /*long*/ sel_setLineBreakMode_ = sel_registerName("setLineBreakMode:");
-public static final int /*long*/ sel_setLineCapStyle_ = sel_registerName("setLineCapStyle:");
-public static final int /*long*/ sel_setLineDash_count_phase_ = sel_registerName("setLineDash:count:phase:");
-public static final int /*long*/ sel_setLineFragmentPadding_ = sel_registerName("setLineFragmentPadding:");
-public static final int /*long*/ sel_setLineFragmentRect_forGlyphRange_usedRect_ = sel_registerName("setLineFragmentRect:forGlyphRange:usedRect:");
-public static final int /*long*/ sel_setLineJoinStyle_ = sel_registerName("setLineJoinStyle:");
-public static final int /*long*/ sel_setLineSpacing_ = sel_registerName("setLineSpacing:");
-public static final int /*long*/ sel_setLineWidth_ = sel_registerName("setLineWidth:");
-public static final int /*long*/ sel_setLinkTextAttributes_ = sel_registerName("setLinkTextAttributes:");
-public static final int /*long*/ sel_setMainMenu_ = sel_registerName("setMainMenu:");
-public static final int /*long*/ sel_setMarkedText_selectedRange_ = sel_registerName("setMarkedText:selectedRange:");
-public static final int /*long*/ sel_setMaxSize_ = sel_registerName("setMaxSize:");
-public static final int /*long*/ sel_setMaxValue_ = sel_registerName("setMaxValue:");
-public static final int /*long*/ sel_setMaximum_ = sel_registerName("setMaximum:");
-public static final int /*long*/ sel_setMaximumFractionDigits_ = sel_registerName("setMaximumFractionDigits:");
-public static final int /*long*/ sel_setMaximumIntegerDigits_ = sel_registerName("setMaximumIntegerDigits:");
-public static final int /*long*/ sel_setMenu_ = sel_registerName("setMenu:");
-public static final int /*long*/ sel_setMenu_forSegment_ = sel_registerName("setMenu:forSegment:");
-public static final int /*long*/ sel_setMenuFormRepresentation_ = sel_registerName("setMenuFormRepresentation:");
-public static final int /*long*/ sel_setMessage_ = sel_registerName("setMessage:");
-public static final int /*long*/ sel_setMessageText_ = sel_registerName("setMessageText:");
-public static final int /*long*/ sel_setMinSize_ = sel_registerName("setMinSize:");
-public static final int /*long*/ sel_setMinValue_ = sel_registerName("setMinValue:");
-public static final int /*long*/ sel_setMinWidth_ = sel_registerName("setMinWidth:");
-public static final int /*long*/ sel_setMinimum_ = sel_registerName("setMinimum:");
-public static final int /*long*/ sel_setMinimumFractionDigits_ = sel_registerName("setMinimumFractionDigits:");
-public static final int /*long*/ sel_setMinimumIntegerDigits_ = sel_registerName("setMinimumIntegerDigits:");
-public static final int /*long*/ sel_setMiterLimit_ = sel_registerName("setMiterLimit:");
-public static final int /*long*/ sel_setNeedsDisplay_ = sel_registerName("setNeedsDisplay:");
-public static final int /*long*/ sel_setNeedsDisplayInRect_ = sel_registerName("setNeedsDisplayInRect:");
-public static final int /*long*/ sel_setNumberOfVisibleItems_ = sel_registerName("setNumberOfVisibleItems:");
-public static final int /*long*/ sel_setNumberStyle_ = sel_registerName("setNumberStyle:");
-public static final int /*long*/ sel_setObject_forKey_ = sel_registerName("setObject:forKey:");
-public static final int /*long*/ sel_setObjectValue_ = sel_registerName("setObjectValue:");
-public static final int /*long*/ sel_setOnMouseEntered_ = sel_registerName("setOnMouseEntered:");
-public static final int /*long*/ sel_setOpaque_ = sel_registerName("setOpaque:");
-public static final int /*long*/ sel_setOptions_ = sel_registerName("setOptions:");
-public static final int /*long*/ sel_setOutlineTableColumn_ = sel_registerName("setOutlineTableColumn:");
-public static final int /*long*/ sel_setPaletteLabel_ = sel_registerName("setPaletteLabel:");
-public static final int /*long*/ sel_setPanelFont_isMultiple_ = sel_registerName("setPanelFont:isMultiple:");
-public static final int /*long*/ sel_setPartialStringValidationEnabled_ = sel_registerName("setPartialStringValidationEnabled:");
-public static final int /*long*/ sel_setPatternPhase_ = sel_registerName("setPatternPhase:");
-public static final int /*long*/ sel_setPlaceholderString_ = sel_registerName("setPlaceholderString:");
-public static final int /*long*/ sel_setPolicyDelegate_ = sel_registerName("setPolicyDelegate:");
-public static final int /*long*/ sel_setPreferences_ = sel_registerName("setPreferences:");
-public static final int /*long*/ sel_setPrinter_ = sel_registerName("setPrinter:");
-public static final int /*long*/ sel_setPropertyList_forType_ = sel_registerName("setPropertyList:forType:");
-public static final int /*long*/ sel_setPullsDown_ = sel_registerName("setPullsDown:");
-public static final int /*long*/ sel_setReleasedWhenClosed_ = sel_registerName("setReleasedWhenClosed:");
-public static final int /*long*/ sel_setRepresentedFilename_ = sel_registerName("setRepresentedFilename:");
-public static final int /*long*/ sel_setRepresentedURL_ = sel_registerName("setRepresentedURL:");
-public static final int /*long*/ sel_setResizingMask_ = sel_registerName("setResizingMask:");
-public static final int /*long*/ sel_setResourceLoadDelegate_ = sel_registerName("setResourceLoadDelegate:");
-public static final int /*long*/ sel_setRichText_ = sel_registerName("setRichText:");
-public static final int /*long*/ sel_setRowHeight_ = sel_registerName("setRowHeight:");
-public static final int /*long*/ sel_setScalesWhenResized_ = sel_registerName("setScalesWhenResized:");
-public static final int /*long*/ sel_setScrollable_ = sel_registerName("setScrollable:");
-public static final int /*long*/ sel_setSearchButtonCell_ = sel_registerName("setSearchButtonCell:");
-public static final int /*long*/ sel_setSegmentCount_ = sel_registerName("setSegmentCount:");
-public static final int /*long*/ sel_setSegmentStyle_ = sel_registerName("setSegmentStyle:");
-public static final int /*long*/ sel_setSelectable_ = sel_registerName("setSelectable:");
-public static final int /*long*/ sel_setSelected_forSegment_ = sel_registerName("setSelected:forSegment:");
-public static final int /*long*/ sel_setSelectedItemIdentifier_ = sel_registerName("setSelectedItemIdentifier:");
-public static final int /*long*/ sel_setSelectedRange_ = sel_registerName("setSelectedRange:");
-public static final int /*long*/ sel_setSelectedSegment_ = sel_registerName("setSelectedSegment:");
-public static final int /*long*/ sel_setSelectedTextAttributes_ = sel_registerName("setSelectedTextAttributes:");
-public static final int /*long*/ sel_setServicesMenu_ = sel_registerName("setServicesMenu:");
-public static final int /*long*/ sel_setShouldAntialias_ = sel_registerName("setShouldAntialias:");
-public static final int /*long*/ sel_setShowsHelp_ = sel_registerName("setShowsHelp:");
-public static final int /*long*/ sel_setShowsPrintPanel_ = sel_registerName("setShowsPrintPanel:");
-public static final int /*long*/ sel_setShowsProgressPanel_ = sel_registerName("setShowsProgressPanel:");
-public static final int /*long*/ sel_setShowsResizeIndicator_ = sel_registerName("setShowsResizeIndicator:");
-public static final int /*long*/ sel_setShowsToolbarButton_ = sel_registerName("setShowsToolbarButton:");
-public static final int /*long*/ sel_setSize_ = sel_registerName("setSize:");
-public static final int /*long*/ sel_setState_ = sel_registerName("setState:");
-public static final int /*long*/ sel_setString_ = sel_registerName("setString:");
-public static final int /*long*/ sel_setString_forType_ = sel_registerName("setString:forType:");
-public static final int /*long*/ sel_setStringValue_ = sel_registerName("setStringValue:");
-public static final int /*long*/ sel_setStroke = sel_registerName("setStroke");
-public static final int /*long*/ sel_setSubmenu_ = sel_registerName("setSubmenu:");
-public static final int /*long*/ sel_setSubmenu_forItem_ = sel_registerName("setSubmenu:forItem:");
-public static final int /*long*/ sel_setTabStops_ = sel_registerName("setTabStops:");
-public static final int /*long*/ sel_setTabViewType_ = sel_registerName("setTabViewType:");
-public static final int /*long*/ sel_setTag_ = sel_registerName("setTag:");
-public static final int /*long*/ sel_setTag_forSegment_ = sel_registerName("setTag:forSegment:");
-public static final int /*long*/ sel_setTarget_ = sel_registerName("setTarget:");
-public static final int /*long*/ sel_setTextColor_ = sel_registerName("setTextColor:");
-public static final int /*long*/ sel_setTextStorage_ = sel_registerName("setTextStorage:");
-public static final int /*long*/ sel_setTitle_ = sel_registerName("setTitle:");
-public static final int /*long*/ sel_setTitleFont_ = sel_registerName("setTitleFont:");
-public static final int /*long*/ sel_setTitlePosition_ = sel_registerName("setTitlePosition:");
-public static final int /*long*/ sel_setToolTip_ = sel_registerName("setToolTip:");
-public static final int /*long*/ sel_setToolTip_forSegment_ = sel_registerName("setToolTip:forSegment:");
-public static final int /*long*/ sel_setToolbar_ = sel_registerName("setToolbar:");
-public static final int /*long*/ sel_setTrackingMode_ = sel_registerName("setTrackingMode:");
-public static final int /*long*/ sel_setTransformStruct_ = sel_registerName("setTransformStruct:");
-public static final int /*long*/ sel_setUIDelegate_ = sel_registerName("setUIDelegate:");
-public static final int /*long*/ sel_setURL_ = sel_registerName("setURL:");
-public static final int /*long*/ sel_setUpPrintOperationDefaultValues = sel_registerName("setUpPrintOperationDefaultValues");
-public static final int /*long*/ sel_setUsesAlternatingRowBackgroundColors_ = sel_registerName("setUsesAlternatingRowBackgroundColors:");
-public static final int /*long*/ sel_setUsesFontPanel_ = sel_registerName("setUsesFontPanel:");
-public static final int /*long*/ sel_setUsesScreenFonts_ = sel_registerName("setUsesScreenFonts:");
-public static final int /*long*/ sel_setUsesThreadedAnimation_ = sel_registerName("setUsesThreadedAnimation:");
-public static final int /*long*/ sel_setValue_forHTTPHeaderField_ = sel_registerName("setValue:forHTTPHeaderField:");
-public static final int /*long*/ sel_setValue_forKey_ = sel_registerName("setValue:forKey:");
-public static final int /*long*/ sel_setValueWraps_ = sel_registerName("setValueWraps:");
-public static final int /*long*/ sel_setValues_forParameter_ = sel_registerName("setValues:forParameter:");
-public static final int /*long*/ sel_setVerticalScroller_ = sel_registerName("setVerticalScroller:");
-public static final int /*long*/ sel_setView_ = sel_registerName("setView:");
-public static final int /*long*/ sel_setVisible_ = sel_registerName("setVisible:");
-public static final int /*long*/ sel_setWantsRestingTouches_ = sel_registerName("setWantsRestingTouches:");
-public static final int /*long*/ sel_setWidth_ = sel_registerName("setWidth:");
-public static final int /*long*/ sel_setWidth_forSegment_ = sel_registerName("setWidth:forSegment:");
-public static final int /*long*/ sel_setWidthTracksTextView_ = sel_registerName("setWidthTracksTextView:");
-public static final int /*long*/ sel_setWindingRule_ = sel_registerName("setWindingRule:");
-public static final int /*long*/ sel_setWorksWhenModal_ = sel_registerName("setWorksWhenModal:");
-public static final int /*long*/ sel_setWraps_ = sel_registerName("setWraps:");
-public static final int /*long*/ sel_sharedApplication = sel_registerName("sharedApplication");
-public static final int /*long*/ sel_sharedCertificateTrustPanel = sel_registerName("sharedCertificateTrustPanel");
-public static final int /*long*/ sel_sharedColorPanel = sel_registerName("sharedColorPanel");
-public static final int /*long*/ sel_sharedFontManager = sel_registerName("sharedFontManager");
-public static final int /*long*/ sel_sharedFontPanel = sel_registerName("sharedFontPanel");
-public static final int /*long*/ sel_sharedHTTPCookieStorage = sel_registerName("sharedHTTPCookieStorage");
-public static final int /*long*/ sel_sharedPrintInfo = sel_registerName("sharedPrintInfo");
-public static final int /*long*/ sel_sharedWorkspace = sel_registerName("sharedWorkspace");
-public static final int /*long*/ sel_shiftKey = sel_registerName("shiftKey");
-public static final int /*long*/ sel_shouldAntialias = sel_registerName("shouldAntialias");
-public static final int /*long*/ sel_shouldChangeTextInRange_replacementString_ = sel_registerName("shouldChangeTextInRange:replacementString:");
-public static final int /*long*/ sel_shouldDelayWindowOrderingForEvent_ = sel_registerName("shouldDelayWindowOrderingForEvent:");
-public static final int /*long*/ sel_shouldDrawInsertionPoint = sel_registerName("shouldDrawInsertionPoint");
-public static final int /*long*/ sel_size = sel_registerName("size");
-public static final int /*long*/ sel_sizeOfLabel_ = sel_registerName("sizeOfLabel:");
-public static final int /*long*/ sel_sizeToFit = sel_registerName("sizeToFit");
-public static final int /*long*/ sel_sizeValue = sel_registerName("sizeValue");
-public static final int /*long*/ sel_skipDescendents = sel_registerName("skipDescendents");
-public static final int /*long*/ sel_smallSystemFontSize = sel_registerName("smallSystemFontSize");
-public static final int /*long*/ sel_sortIndicatorRectForBounds_ = sel_registerName("sortIndicatorRectForBounds:");
-public static final int /*long*/ sel_standardPreferences = sel_registerName("standardPreferences");
-public static final int /*long*/ sel_standardUserDefaults = sel_registerName("standardUserDefaults");
-public static final int /*long*/ sel_standardWindowButton_ = sel_registerName("standardWindowButton:");
-public static final int /*long*/ sel_startAnimation_ = sel_registerName("startAnimation:");
-public static final int /*long*/ sel_state = sel_registerName("state");
-public static final int /*long*/ sel_statusItemWithLength_ = sel_registerName("statusItemWithLength:");
-public static final int /*long*/ sel_stop_ = sel_registerName("stop:");
-public static final int /*long*/ sel_stopAnimation_ = sel_registerName("stopAnimation:");
-public static final int /*long*/ sel_stopLoading_ = sel_registerName("stopLoading:");
-public static final int /*long*/ sel_string = sel_registerName("string");
-public static final int /*long*/ sel_stringByAddingPercentEscapesUsingEncoding_ = sel_registerName("stringByAddingPercentEscapesUsingEncoding:");
-public static final int /*long*/ sel_stringByAppendingPathComponent_ = sel_registerName("stringByAppendingPathComponent:");
-public static final int /*long*/ sel_stringByAppendingPathExtension_ = sel_registerName("stringByAppendingPathExtension:");
-public static final int /*long*/ sel_stringByAppendingString_ = sel_registerName("stringByAppendingString:");
-public static final int /*long*/ sel_stringByDeletingLastPathComponent = sel_registerName("stringByDeletingLastPathComponent");
-public static final int /*long*/ sel_stringByDeletingPathExtension = sel_registerName("stringByDeletingPathExtension");
-public static final int /*long*/ sel_stringByReplacingOccurrencesOfString_withString_ = sel_registerName("stringByReplacingOccurrencesOfString:withString:");
-public static final int /*long*/ sel_stringByReplacingPercentEscapesUsingEncoding_ = sel_registerName("stringByReplacingPercentEscapesUsingEncoding:");
-public static final int /*long*/ sel_stringForObjectValue_ = sel_registerName("stringForObjectValue:");
-public static final int /*long*/ sel_stringForType_ = sel_registerName("stringForType:");
-public static final int /*long*/ sel_stringValue = sel_registerName("stringValue");
-public static final int /*long*/ sel_stringWithCharacters_length_ = sel_registerName("stringWithCharacters:length:");
-public static final int /*long*/ sel_stringWithFormat_ = sel_registerName("stringWithFormat:");
-public static final int /*long*/ sel_stringWithUTF8String_ = sel_registerName("stringWithUTF8String:");
-public static final int /*long*/ sel_stroke = sel_registerName("stroke");
-public static final int /*long*/ sel_strokeRect_ = sel_registerName("strokeRect:");
-public static final int /*long*/ sel_styleMask = sel_registerName("styleMask");
-public static final int /*long*/ sel_submenu = sel_registerName("submenu");
-public static final int /*long*/ sel_subviews = sel_registerName("subviews");
-public static final int /*long*/ sel_superclass = sel_registerName("superclass");
-public static final int /*long*/ sel_superview = sel_registerName("superview");
-public static final int /*long*/ sel_swipeWithEvent_ = sel_registerName("swipeWithEvent:");
-public static final int /*long*/ sel_systemFontOfSize_ = sel_registerName("systemFontOfSize:");
-public static final int /*long*/ sel_systemFontSize = sel_registerName("systemFontSize");
-public static final int /*long*/ sel_systemFontSizeForControlSize_ = sel_registerName("systemFontSizeForControlSize:");
-public static final int /*long*/ sel_systemStatusBar = sel_registerName("systemStatusBar");
-public static final int /*long*/ sel_systemVersion = sel_registerName("systemVersion");
-public static final int /*long*/ sel_tabStopType = sel_registerName("tabStopType");
-public static final int /*long*/ sel_tabStops = sel_registerName("tabStops");
-public static final int /*long*/ sel_tabView_didSelectTabViewItem_ = sel_registerName("tabView:didSelectTabViewItem:");
-public static final int /*long*/ sel_tabView_shouldSelectTabViewItem_ = sel_registerName("tabView:shouldSelectTabViewItem:");
-public static final int /*long*/ sel_tabView_willSelectTabViewItem_ = sel_registerName("tabView:willSelectTabViewItem:");
-public static final int /*long*/ sel_tabViewItemAtPoint_ = sel_registerName("tabViewItemAtPoint:");
-public static final int /*long*/ sel_tableColumns = sel_registerName("tableColumns");
-public static final int /*long*/ sel_tableView_acceptDrop_row_dropOperation_ = sel_registerName("tableView:acceptDrop:row:dropOperation:");
-public static final int /*long*/ sel_tableView_didClickTableColumn_ = sel_registerName("tableView:didClickTableColumn:");
-public static final int /*long*/ sel_tableView_objectValueForTableColumn_row_ = sel_registerName("tableView:objectValueForTableColumn:row:");
-public static final int /*long*/ sel_tableView_setObjectValue_forTableColumn_row_ = sel_registerName("tableView:setObjectValue:forTableColumn:row:");
-public static final int /*long*/ sel_tableView_shouldEditTableColumn_row_ = sel_registerName("tableView:shouldEditTableColumn:row:");
-public static final int /*long*/ sel_tableView_shouldReorderColumn_toColumn_ = sel_registerName("tableView:shouldReorderColumn:toColumn:");
-public static final int /*long*/ sel_tableView_shouldSelectRow_ = sel_registerName("tableView:shouldSelectRow:");
-public static final int /*long*/ sel_tableView_shouldTrackCell_forTableColumn_row_ = sel_registerName("tableView:shouldTrackCell:forTableColumn:row:");
-public static final int /*long*/ sel_tableView_validateDrop_proposedRow_proposedDropOperation_ = sel_registerName("tableView:validateDrop:proposedRow:proposedDropOperation:");
-public static final int /*long*/ sel_tableView_willDisplayCell_forTableColumn_row_ = sel_registerName("tableView:willDisplayCell:forTableColumn:row:");
-public static final int /*long*/ sel_tableView_writeRowsWithIndexes_toPasteboard_ = sel_registerName("tableView:writeRowsWithIndexes:toPasteboard:");
-public static final int /*long*/ sel_tableViewColumnDidMove_ = sel_registerName("tableViewColumnDidMove:");
-public static final int /*long*/ sel_tableViewColumnDidResize_ = sel_registerName("tableViewColumnDidResize:");
-public static final int /*long*/ sel_tableViewSelectionDidChange_ = sel_registerName("tableViewSelectionDidChange:");
-public static final int /*long*/ sel_tableViewSelectionIsChanging_ = sel_registerName("tableViewSelectionIsChanging:");
-public static final int /*long*/ sel_tag = sel_registerName("tag");
-public static final int /*long*/ sel_target = sel_registerName("target");
-public static final int /*long*/ sel_terminate_ = sel_registerName("terminate:");
-public static final int /*long*/ sel_testPart_ = sel_registerName("testPart:");
-public static final int /*long*/ sel_textBackgroundColor = sel_registerName("textBackgroundColor");
-public static final int /*long*/ sel_textColor = sel_registerName("textColor");
-public static final int /*long*/ sel_textContainer = sel_registerName("textContainer");
-public static final int /*long*/ sel_textDidChange_ = sel_registerName("textDidChange:");
-public static final int /*long*/ sel_textDidEndEditing_ = sel_registerName("textDidEndEditing:");
-public static final int /*long*/ sel_textStorage = sel_registerName("textStorage");
-public static final int /*long*/ sel_textView_clickedOnLink_atIndex_ = sel_registerName("textView:clickedOnLink:atIndex:");
-public static final int /*long*/ sel_textView_willChangeSelectionFromCharacterRange_toCharacterRange_ = sel_registerName("textView:willChangeSelectionFromCharacterRange:toCharacterRange:");
-public static final int /*long*/ sel_textViewDidChangeSelection_ = sel_registerName("textViewDidChangeSelection:");
-public static final int /*long*/ sel_thickness = sel_registerName("thickness");
-public static final int /*long*/ sel_threadDictionary = sel_registerName("threadDictionary");
-public static final int /*long*/ sel_tile = sel_registerName("tile");
-public static final int /*long*/ sel_timeZone = sel_registerName("timeZone");
-public static final int /*long*/ sel_timestamp = sel_registerName("timestamp");
-public static final int /*long*/ sel_title = sel_registerName("title");
-public static final int /*long*/ sel_titleCell = sel_registerName("titleCell");
-public static final int /*long*/ sel_titleFont = sel_registerName("titleFont");
-public static final int /*long*/ sel_titleOfSelectedItem = sel_registerName("titleOfSelectedItem");
-public static final int /*long*/ sel_titleRectForBounds_ = sel_registerName("titleRectForBounds:");
-public static final int /*long*/ sel_toggleToolbarShown_ = sel_registerName("toggleToolbarShown:");
-public static final int /*long*/ sel_toolbar = sel_registerName("toolbar");
-public static final int /*long*/ sel_toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar_ = sel_registerName("toolbar:itemForItemIdentifier:willBeInsertedIntoToolbar:");
-public static final int /*long*/ sel_toolbarAllowedItemIdentifiers_ = sel_registerName("toolbarAllowedItemIdentifiers:");
-public static final int /*long*/ sel_toolbarDefaultItemIdentifiers_ = sel_registerName("toolbarDefaultItemIdentifiers:");
-public static final int /*long*/ sel_toolbarDidRemoveItem_ = sel_registerName("toolbarDidRemoveItem:");
-public static final int /*long*/ sel_toolbarSelectableItemIdentifiers_ = sel_registerName("toolbarSelectableItemIdentifiers:");
-public static final int /*long*/ sel_toolbarWillAddItem_ = sel_registerName("toolbarWillAddItem:");
-public static final int /*long*/ sel_touchesBeganWithEvent_ = sel_registerName("touchesBeganWithEvent:");
-public static final int /*long*/ sel_touchesCancelledWithEvent_ = sel_registerName("touchesCancelledWithEvent:");
-public static final int /*long*/ sel_touchesEndedWithEvent_ = sel_registerName("touchesEndedWithEvent:");
-public static final int /*long*/ sel_touchesMatchingPhase_inView_ = sel_registerName("touchesMatchingPhase:inView:");
-public static final int /*long*/ sel_touchesMovedWithEvent_ = sel_registerName("touchesMovedWithEvent:");
-public static final int /*long*/ sel_trackingAreas = sel_registerName("trackingAreas");
-public static final int /*long*/ sel_traitsOfFont_ = sel_registerName("traitsOfFont:");
-public static final int /*long*/ sel_transform = sel_registerName("transform");
-public static final int /*long*/ sel_transformPoint_ = sel_registerName("transformPoint:");
-public static final int /*long*/ sel_transformSize_ = sel_registerName("transformSize:");
-public static final int /*long*/ sel_transformStruct = sel_registerName("transformStruct");
-public static final int /*long*/ sel_transformUsingAffineTransform_ = sel_registerName("transformUsingAffineTransform:");
-public static final int /*long*/ sel_translateXBy_yBy_ = sel_registerName("translateXBy:yBy:");
-public static final int /*long*/ sel_type = sel_registerName("type");
-public static final int /*long*/ sel_type_conformsToType_ = sel_registerName("type:conformsToType:");
-public static final int /*long*/ sel_typeOfFile_error_ = sel_registerName("typeOfFile:error:");
-public static final int /*long*/ sel_types = sel_registerName("types");
-public static final int /*long*/ sel_typesetter = sel_registerName("typesetter");
-public static final int /*long*/ sel_unarchiveObjectWithData_ = sel_registerName("unarchiveObjectWithData:");
-public static final int /*long*/ sel_undefined = sel_registerName("undefined");
-public static final int /*long*/ sel_undo = sel_registerName("undo");
-public static final int /*long*/ sel_undoManager = sel_registerName("undoManager");
-public static final int /*long*/ sel_unhideAllApplications_ = sel_registerName("unhideAllApplications:");
-public static final int /*long*/ sel_unlockFocus = sel_registerName("unlockFocus");
-public static final int /*long*/ sel_unmarkText = sel_registerName("unmarkText");
-public static final int /*long*/ sel_unregisterDraggedTypes = sel_registerName("unregisterDraggedTypes");
-public static final int /*long*/ sel_update = sel_registerName("update");
-public static final int /*long*/ sel_updateFromPMPrintSettings = sel_registerName("updateFromPMPrintSettings");
-public static final int /*long*/ sel_updateTrackingAreas = sel_registerName("updateTrackingAreas");
-public static final int /*long*/ sel_use = sel_registerName("use");
-public static final int /*long*/ sel_useCredential_forAuthenticationChallenge_ = sel_registerName("useCredential:forAuthenticationChallenge:");
-public static final int /*long*/ sel_usedRectForTextContainer_ = sel_registerName("usedRectForTextContainer:");
-public static final int /*long*/ sel_user = sel_registerName("user");
-public static final int /*long*/ sel_userInfo = sel_registerName("userInfo");
-public static final int /*long*/ sel_userSpaceScaleFactor = sel_registerName("userSpaceScaleFactor");
-public static final int /*long*/ sel_usesAlternatingRowBackgroundColors = sel_registerName("usesAlternatingRowBackgroundColors");
-public static final int /*long*/ sel_validAttributesForMarkedText = sel_registerName("validAttributesForMarkedText");
-public static final int /*long*/ sel_validModesForFontPanel_ = sel_registerName("validModesForFontPanel:");
-public static final int /*long*/ sel_validRequestorForSendType_returnType_ = sel_registerName("validRequestorForSendType:returnType:");
-public static final int /*long*/ sel_validateMenuItem_ = sel_registerName("validateMenuItem:");
-public static final int /*long*/ sel_validateVisibleColumns = sel_registerName("validateVisibleColumns");
-public static final int /*long*/ sel_value = sel_registerName("value");
-public static final int /*long*/ sel_valueForKey_ = sel_registerName("valueForKey:");
-public static final int /*long*/ sel_valueWithPoint_ = sel_registerName("valueWithPoint:");
-public static final int /*long*/ sel_valueWithRange_ = sel_registerName("valueWithRange:");
-public static final int /*long*/ sel_valueWithRect_ = sel_registerName("valueWithRect:");
-public static final int /*long*/ sel_valueWithSize_ = sel_registerName("valueWithSize:");
-public static final int /*long*/ sel_view = sel_registerName("view");
-public static final int /*long*/ sel_view_stringForToolTip_point_userData_ = sel_registerName("view:stringForToolTip:point:userData:");
-public static final int /*long*/ sel_viewDidMoveToWindow = sel_registerName("viewDidMoveToWindow");
-public static final int /*long*/ sel_viewWillMoveToWindow_ = sel_registerName("viewWillMoveToWindow:");
-public static final int /*long*/ sel_visibleFrame = sel_registerName("visibleFrame");
-public static final int /*long*/ sel_visibleRect = sel_registerName("visibleRect");
-public static final int /*long*/ sel_wantsPeriodicDraggingUpdates = sel_registerName("wantsPeriodicDraggingUpdates");
-public static final int /*long*/ sel_wantsToHandleMouseEvents = sel_registerName("wantsToHandleMouseEvents");
-public static final int /*long*/ sel_webFrame = sel_registerName("webFrame");
-public static final int /*long*/ sel_webScriptValueAtIndex_ = sel_registerName("webScriptValueAtIndex:");
-public static final int /*long*/ sel_webView_contextMenuItemsForElement_defaultMenuItems_ = sel_registerName("webView:contextMenuItemsForElement:defaultMenuItems:");
-public static final int /*long*/ sel_webView_createWebViewWithRequest_ = sel_registerName("webView:createWebViewWithRequest:");
-public static final int /*long*/ sel_webView_decidePolicyForMIMEType_request_frame_decisionListener_ = sel_registerName("webView:decidePolicyForMIMEType:request:frame:decisionListener:");
-public static final int /*long*/ sel_webView_decidePolicyForNavigationAction_request_frame_decisionListener_ = sel_registerName("webView:decidePolicyForNavigationAction:request:frame:decisionListener:");
-public static final int /*long*/ sel_webView_decidePolicyForNewWindowAction_request_newFrameName_decisionListener_ = sel_registerName("webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:");
-public static final int /*long*/ sel_webView_didChangeLocationWithinPageForFrame_ = sel_registerName("webView:didChangeLocationWithinPageForFrame:");
-public static final int /*long*/ sel_webView_didCommitLoadForFrame_ = sel_registerName("webView:didCommitLoadForFrame:");
-public static final int /*long*/ sel_webView_didFailProvisionalLoadWithError_forFrame_ = sel_registerName("webView:didFailProvisionalLoadWithError:forFrame:");
-public static final int /*long*/ sel_webView_didFinishLoadForFrame_ = sel_registerName("webView:didFinishLoadForFrame:");
-public static final int /*long*/ sel_webView_didReceiveTitle_forFrame_ = sel_registerName("webView:didReceiveTitle:forFrame:");
-public static final int /*long*/ sel_webView_didStartProvisionalLoadForFrame_ = sel_registerName("webView:didStartProvisionalLoadForFrame:");
-public static final int /*long*/ sel_webView_identifierForInitialRequest_fromDataSource_ = sel_registerName("webView:identifierForInitialRequest:fromDataSource:");
-public static final int /*long*/ sel_webView_mouseDidMoveOverElement_modifierFlags_ = sel_registerName("webView:mouseDidMoveOverElement:modifierFlags:");
-public static final int /*long*/ sel_webView_printFrameView_ = sel_registerName("webView:printFrameView:");
-public static final int /*long*/ sel_webView_resource_didFailLoadingWithError_fromDataSource_ = sel_registerName("webView:resource:didFailLoadingWithError:fromDataSource:");
-public static final int /*long*/ sel_webView_resource_didFinishLoadingFromDataSource_ = sel_registerName("webView:resource:didFinishLoadingFromDataSource:");
-public static final int /*long*/ sel_webView_resource_didReceiveAuthenticationChallenge_fromDataSource_ = sel_registerName("webView:resource:didReceiveAuthenticationChallenge:fromDataSource:");
-public static final int /*long*/ sel_webView_resource_willSendRequest_redirectResponse_fromDataSource_ = sel_registerName("webView:resource:willSendRequest:redirectResponse:fromDataSource:");
-public static final int /*long*/ sel_webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame_ = sel_registerName("webView:runBeforeUnloadConfirmPanelWithMessage:initiatedByFrame:");
-public static final int /*long*/ sel_webView_runJavaScriptAlertPanelWithMessage_ = sel_registerName("webView:runJavaScriptAlertPanelWithMessage:");
-public static final int /*long*/ sel_webView_runJavaScriptAlertPanelWithMessage_initiatedByFrame_ = sel_registerName("webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:");
-public static final int /*long*/ sel_webView_runJavaScriptConfirmPanelWithMessage_ = sel_registerName("webView:runJavaScriptConfirmPanelWithMessage:");
-public static final int /*long*/ sel_webView_runJavaScriptConfirmPanelWithMessage_initiatedByFrame_ = sel_registerName("webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:");
-public static final int /*long*/ sel_webView_runOpenPanelForFileButtonWithResultListener_ = sel_registerName("webView:runOpenPanelForFileButtonWithResultListener:");
-public static final int /*long*/ sel_webView_setFrame_ = sel_registerName("webView:setFrame:");
-public static final int /*long*/ sel_webView_setResizable_ = sel_registerName("webView:setResizable:");
-public static final int /*long*/ sel_webView_setStatusBarVisible_ = sel_registerName("webView:setStatusBarVisible:");
-public static final int /*long*/ sel_webView_setStatusText_ = sel_registerName("webView:setStatusText:");
-public static final int /*long*/ sel_webView_setToolbarsVisible_ = sel_registerName("webView:setToolbarsVisible:");
-public static final int /*long*/ sel_webView_unableToImplementPolicyWithError_frame_ = sel_registerName("webView:unableToImplementPolicyWithError:frame:");
-public static final int /*long*/ sel_webView_windowScriptObjectAvailable_ = sel_registerName("webView:windowScriptObjectAvailable:");
-public static final int /*long*/ sel_webViewClose_ = sel_registerName("webViewClose:");
-public static final int /*long*/ sel_webViewFocus_ = sel_registerName("webViewFocus:");
-public static final int /*long*/ sel_webViewShow_ = sel_registerName("webViewShow:");
-public static final int /*long*/ sel_webViewUnfocus_ = sel_registerName("webViewUnfocus:");
-public static final int /*long*/ sel_weightOfFont_ = sel_registerName("weightOfFont:");
-public static final int /*long*/ sel_wheelDelta = sel_registerName("wheelDelta");
-public static final int /*long*/ sel_width = sel_registerName("width");
-public static final int /*long*/ sel_window = sel_registerName("window");
-public static final int /*long*/ sel_windowBackgroundColor = sel_registerName("windowBackgroundColor");
-public static final int /*long*/ sel_windowDidBecomeKey_ = sel_registerName("windowDidBecomeKey:");
-public static final int /*long*/ sel_windowDidDeminiaturize_ = sel_registerName("windowDidDeminiaturize:");
-public static final int /*long*/ sel_windowDidMiniaturize_ = sel_registerName("windowDidMiniaturize:");
-public static final int /*long*/ sel_windowDidMove_ = sel_registerName("windowDidMove:");
-public static final int /*long*/ sel_windowDidResignKey_ = sel_registerName("windowDidResignKey:");
-public static final int /*long*/ sel_windowDidResize_ = sel_registerName("windowDidResize:");
-public static final int /*long*/ sel_windowFrameColor = sel_registerName("windowFrameColor");
-public static final int /*long*/ sel_windowFrameTextColor = sel_registerName("windowFrameTextColor");
-public static final int /*long*/ sel_windowNumber = sel_registerName("windowNumber");
-public static final int /*long*/ sel_windowNumberAtPoint_belowWindowWithWindowNumber_ = sel_registerName("windowNumberAtPoint:belowWindowWithWindowNumber:");
-public static final int /*long*/ sel_windowRef = sel_registerName("windowRef");
-public static final int /*long*/ sel_windowShouldClose_ = sel_registerName("windowShouldClose:");
-public static final int /*long*/ sel_windowWillClose_ = sel_registerName("windowWillClose:");
-public static final int /*long*/ sel_windowWithWindowNumber_ = sel_registerName("windowWithWindowNumber:");
-public static final int /*long*/ sel_windows = sel_registerName("windows");
-public static final int /*long*/ sel_worksWhenModal = sel_registerName("worksWhenModal");
-public static final int /*long*/ sel_wraps = sel_registerName("wraps");
-public static final int /*long*/ sel_writeSelectionToPasteboard_types_ = sel_registerName("writeSelectionToPasteboard:types:");
-public static final int /*long*/ sel_writeToPasteboard_ = sel_registerName("writeToPasteboard:");
-public static final int /*long*/ sel_yearOfCommonEra = sel_registerName("yearOfCommonEra");
-public static final int /*long*/ sel_zoom_ = sel_registerName("zoom:");
+public static final long /*int*/ sel_CGEvent = sel_registerName("CGEvent");
+public static final long /*int*/ sel_DOMDocument = sel_registerName("DOMDocument");
+public static final long /*int*/ sel_IBeamCursor = sel_registerName("IBeamCursor");
+public static final long /*int*/ sel_PMPrintSession = sel_registerName("PMPrintSession");
+public static final long /*int*/ sel_PMPrintSettings = sel_registerName("PMPrintSettings");
+public static final long /*int*/ sel_TIFFRepresentation = sel_registerName("TIFFRepresentation");
+public static final long /*int*/ sel_URL = sel_registerName("URL");
+public static final long /*int*/ sel_URLFromPasteboard_ = sel_registerName("URLFromPasteboard:");
+public static final long /*int*/ sel_URLWithString_ = sel_registerName("URLWithString:");
+public static final long /*int*/ sel_URLsForDirectory_inDomains_ = sel_registerName("URLsForDirectory:inDomains:");
+public static final long /*int*/ sel_UTF8String = sel_registerName("UTF8String");
+public static final long /*int*/ sel_abortEditing = sel_registerName("abortEditing");
+public static final long /*int*/ sel_absoluteString = sel_registerName("absoluteString");
+public static final long /*int*/ sel_acceptsFirstMouse_ = sel_registerName("acceptsFirstMouse:");
+public static final long /*int*/ sel_acceptsFirstResponder = sel_registerName("acceptsFirstResponder");
+public static final long /*int*/ sel_accessibilityActionDescription_ = sel_registerName("accessibilityActionDescription:");
+public static final long /*int*/ sel_accessibilityActionNames = sel_registerName("accessibilityActionNames");
+public static final long /*int*/ sel_accessibilityAttributeNames = sel_registerName("accessibilityAttributeNames");
+public static final long /*int*/ sel_accessibilityAttributeValue_ = sel_registerName("accessibilityAttributeValue:");
+public static final long /*int*/ sel_accessibilityAttributeValue_forParameter_ = sel_registerName("accessibilityAttributeValue:forParameter:");
+public static final long /*int*/ sel_accessibilityFocusedUIElement = sel_registerName("accessibilityFocusedUIElement");
+public static final long /*int*/ sel_accessibilityHitTest_ = sel_registerName("accessibilityHitTest:");
+public static final long /*int*/ sel_accessibilityIsAttributeSettable_ = sel_registerName("accessibilityIsAttributeSettable:");
+public static final long /*int*/ sel_accessibilityIsIgnored = sel_registerName("accessibilityIsIgnored");
+public static final long /*int*/ sel_accessibilityParameterizedAttributeNames = sel_registerName("accessibilityParameterizedAttributeNames");
+public static final long /*int*/ sel_accessibilityPerformAction_ = sel_registerName("accessibilityPerformAction:");
+public static final long /*int*/ sel_accessibilitySetOverrideValue_forAttribute_ = sel_registerName("accessibilitySetOverrideValue:forAttribute:");
+public static final long /*int*/ sel_accessibilitySetValue_forAttribute_ = sel_registerName("accessibilitySetValue:forAttribute:");
+public static final long /*int*/ sel_action = sel_registerName("action");
+public static final long /*int*/ sel_activateIgnoringOtherApps_ = sel_registerName("activateIgnoringOtherApps:");
+public static final long /*int*/ sel_addAttribute_value_range_ = sel_registerName("addAttribute:value:range:");
+public static final long /*int*/ sel_addButtonWithTitle_ = sel_registerName("addButtonWithTitle:");
+public static final long /*int*/ sel_addChildWindow_ordered_ = sel_registerName("addChildWindow:ordered:");
+public static final long /*int*/ sel_addClip = sel_registerName("addClip");
+public static final long /*int*/ sel_addEventListener_listener_useCapture_ = sel_registerName("addEventListener:listener:useCapture:");
+public static final long /*int*/ sel_addIndex_ = sel_registerName("addIndex:");
+public static final long /*int*/ sel_addItem_ = sel_registerName("addItem:");
+public static final long /*int*/ sel_addItemWithObjectValue_ = sel_registerName("addItemWithObjectValue:");
+public static final long /*int*/ sel_addItemWithTitle_action_keyEquivalent_ = sel_registerName("addItemWithTitle:action:keyEquivalent:");
+public static final long /*int*/ sel_addLayoutManager_ = sel_registerName("addLayoutManager:");
+public static final long /*int*/ sel_addObject_ = sel_registerName("addObject:");
+public static final long /*int*/ sel_addObjectsFromArray_ = sel_registerName("addObjectsFromArray:");
+public static final long /*int*/ sel_addObserver_selector_name_object_ = sel_registerName("addObserver:selector:name:object:");
+public static final long /*int*/ sel_addRepresentation_ = sel_registerName("addRepresentation:");
+public static final long /*int*/ sel_addSubview_ = sel_registerName("addSubview:");
+public static final long /*int*/ sel_addSubview_positioned_relativeTo_ = sel_registerName("addSubview:positioned:relativeTo:");
+public static final long /*int*/ sel_addTabStop_ = sel_registerName("addTabStop:");
+public static final long /*int*/ sel_addTabViewItem_ = sel_registerName("addTabViewItem:");
+public static final long /*int*/ sel_addTableColumn_ = sel_registerName("addTableColumn:");
+public static final long /*int*/ sel_addTemporaryAttribute_value_forCharacterRange_ = sel_registerName("addTemporaryAttribute:value:forCharacterRange:");
+public static final long /*int*/ sel_addTextContainer_ = sel_registerName("addTextContainer:");
+public static final long /*int*/ sel_addTimer_forMode_ = sel_registerName("addTimer:forMode:");
+public static final long /*int*/ sel_addToolTipRect_owner_userData_ = sel_registerName("addToolTipRect:owner:userData:");
+public static final long /*int*/ sel_addTypes_owner_ = sel_registerName("addTypes:owner:");
+public static final long /*int*/ sel_alignment = sel_registerName("alignment");
+public static final long /*int*/ sel_allKeys = sel_registerName("allKeys");
+public static final long /*int*/ sel_allObjects = sel_registerName("allObjects");
+public static final long /*int*/ sel_alloc = sel_registerName("alloc");
+public static final long /*int*/ sel_allowsColumnReordering = sel_registerName("allowsColumnReordering");
+public static final long /*int*/ sel_allowsFloats = sel_registerName("allowsFloats");
+public static final long /*int*/ sel_alphaComponent = sel_registerName("alphaComponent");
+public static final long /*int*/ sel_alphaValue = sel_registerName("alphaValue");
+public static final long /*int*/ sel_altKey = sel_registerName("altKey");
+public static final long /*int*/ sel_alternateSelectedControlColor = sel_registerName("alternateSelectedControlColor");
+public static final long /*int*/ sel_alternateSelectedControlTextColor = sel_registerName("alternateSelectedControlTextColor");
+public static final long /*int*/ sel_alwaysShowsDecimalSeparator = sel_registerName("alwaysShowsDecimalSeparator");
+public static final long /*int*/ sel_appendAttributedString_ = sel_registerName("appendAttributedString:");
+public static final long /*int*/ sel_appendBezierPath_ = sel_registerName("appendBezierPath:");
+public static final long /*int*/ sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_ = sel_registerName("appendBezierPathWithArcWithCenter:radius:startAngle:endAngle:");
+public static final long /*int*/ sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_clockwise_ = sel_registerName("appendBezierPathWithArcWithCenter:radius:startAngle:endAngle:clockwise:");
+public static final long /*int*/ sel_appendBezierPathWithGlyphs_count_inFont_ = sel_registerName("appendBezierPathWithGlyphs:count:inFont:");
+public static final long /*int*/ sel_appendBezierPathWithOvalInRect_ = sel_registerName("appendBezierPathWithOvalInRect:");
+public static final long /*int*/ sel_appendBezierPathWithRect_ = sel_registerName("appendBezierPathWithRect:");
+public static final long /*int*/ sel_appendBezierPathWithRoundedRect_xRadius_yRadius_ = sel_registerName("appendBezierPathWithRoundedRect:xRadius:yRadius:");
+public static final long /*int*/ sel_appendString_ = sel_registerName("appendString:");
+public static final long /*int*/ sel_application_openFile_ = sel_registerName("application:openFile:");
+public static final long /*int*/ sel_application_openFiles_ = sel_registerName("application:openFiles:");
+public static final long /*int*/ sel_applicationDidBecomeActive_ = sel_registerName("applicationDidBecomeActive:");
+public static final long /*int*/ sel_applicationDidFinishLaunching_ = sel_registerName("applicationDidFinishLaunching:");
+public static final long /*int*/ sel_applicationDidResignActive_ = sel_registerName("applicationDidResignActive:");
+public static final long /*int*/ sel_applicationDockMenu_ = sel_registerName("applicationDockMenu:");
+public static final long /*int*/ sel_applicationIconImage = sel_registerName("applicationIconImage");
+public static final long /*int*/ sel_applicationShouldHandleReopen_hasVisibleWindows_ = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:");
+public static final long /*int*/ sel_applicationShouldTerminate_ = sel_registerName("applicationShouldTerminate:");
+public static final long /*int*/ sel_applicationWillFinishLaunching_ = sel_registerName("applicationWillFinishLaunching:");
+public static final long /*int*/ sel_applicationWillTerminate_ = sel_registerName("applicationWillTerminate:");
+public static final long /*int*/ sel_archivedDataWithRootObject_ = sel_registerName("archivedDataWithRootObject:");
+public static final long /*int*/ sel_areCursorRectsEnabled = sel_registerName("areCursorRectsEnabled");
+public static final long /*int*/ sel_arrangeInFront_ = sel_registerName("arrangeInFront:");
+public static final long /*int*/ sel_array = sel_registerName("array");
+public static final long /*int*/ sel_arrayWithCapacity_ = sel_registerName("arrayWithCapacity:");
+public static final long /*int*/ sel_arrayWithObject_ = sel_registerName("arrayWithObject:");
+public static final long /*int*/ sel_arrowCursor = sel_registerName("arrowCursor");
+public static final long /*int*/ sel_ascender = sel_registerName("ascender");
+public static final long /*int*/ sel_attachColorList_ = sel_registerName("attachColorList:");
+public static final long /*int*/ sel_attribute_atIndex_effectiveRange_ = sel_registerName("attribute:atIndex:effectiveRange:");
+public static final long /*int*/ sel_attributedStringValue = sel_registerName("attributedStringValue");
+public static final long /*int*/ sel_attributedStringWithAttachment_ = sel_registerName("attributedStringWithAttachment:");
+public static final long /*int*/ sel_attributedSubstringFromRange_ = sel_registerName("attributedSubstringFromRange:");
+public static final long /*int*/ sel_attributedTitle = sel_registerName("attributedTitle");
+public static final long /*int*/ sel_attributesAtIndex_longestEffectiveRange_inRange_ = sel_registerName("attributesAtIndex:longestEffectiveRange:inRange:");
+public static final long /*int*/ sel_autorelease = sel_registerName("autorelease");
+public static final long /*int*/ sel_availableFontFamilies = sel_registerName("availableFontFamilies");
+public static final long /*int*/ sel_availableFonts = sel_registerName("availableFonts");
+public static final long /*int*/ sel_availableMembersOfFontFamily_ = sel_registerName("availableMembersOfFontFamily:");
+public static final long /*int*/ sel_availableTypeFromArray_ = sel_registerName("availableTypeFromArray:");
+public static final long /*int*/ sel_backgroundColor = sel_registerName("backgroundColor");
+public static final long /*int*/ sel_badgeLabel = sel_registerName("badgeLabel");
+public static final long /*int*/ sel_baselineOffsetInLayoutManager_glyphIndex_ = sel_registerName("baselineOffsetInLayoutManager:glyphIndex:");
+public static final long /*int*/ sel_becomeFirstResponder = sel_registerName("becomeFirstResponder");
+public static final long /*int*/ sel_becomeKeyWindow = sel_registerName("becomeKeyWindow");
+public static final long /*int*/ sel_beginDocument = sel_registerName("beginDocument");
+public static final long /*int*/ sel_beginEditing = sel_registerName("beginEditing");
+public static final long /*int*/ sel_beginGestureWithEvent_ = sel_registerName("beginGestureWithEvent:");
+public static final long /*int*/ sel_beginPageInRect_atPlacement_ = sel_registerName("beginPageInRect:atPlacement:");
+public static final long /*int*/ sel_beginSheet_modalForWindow_modalDelegate_didEndSelector_contextInfo_ = sel_registerName("beginSheet:modalForWindow:modalDelegate:didEndSelector:contextInfo:");
+public static final long /*int*/ sel_beginSheetForWindow_modalDelegate_didEndSelector_contextInfo_trust_message_ = sel_registerName("beginSheetForWindow:modalDelegate:didEndSelector:contextInfo:trust:message:");
+public static final long /*int*/ sel_beginSheetModalForWindow_modalDelegate_didEndSelector_contextInfo_ = sel_registerName("beginSheetModalForWindow:modalDelegate:didEndSelector:contextInfo:");
+public static final long /*int*/ sel_beginSheetWithPrintInfo_modalForWindow_delegate_didEndSelector_contextInfo_ = sel_registerName("beginSheetWithPrintInfo:modalForWindow:delegate:didEndSelector:contextInfo:");
+public static final long /*int*/ sel_bestRepresentationForDevice_ = sel_registerName("bestRepresentationForDevice:");
+public static final long /*int*/ sel_bezierPath = sel_registerName("bezierPath");
+public static final long /*int*/ sel_bezierPathByFlatteningPath = sel_registerName("bezierPathByFlatteningPath");
+public static final long /*int*/ sel_bezierPathWithRect_ = sel_registerName("bezierPathWithRect:");
+public static final long /*int*/ sel_bitmapData = sel_registerName("bitmapData");
+public static final long /*int*/ sel_bitmapFormat = sel_registerName("bitmapFormat");
+public static final long /*int*/ sel_bitsPerPixel = sel_registerName("bitsPerPixel");
+public static final long /*int*/ sel_bitsPerSample = sel_registerName("bitsPerSample");
+public static final long /*int*/ sel_blackColor = sel_registerName("blackColor");
+public static final long /*int*/ sel_blueComponent = sel_registerName("blueComponent");
+public static final long /*int*/ sel_boolValue = sel_registerName("boolValue");
+public static final long /*int*/ sel_borderWidth = sel_registerName("borderWidth");
+public static final long /*int*/ sel_boundingRectForGlyphRange_inTextContainer_ = sel_registerName("boundingRectForGlyphRange:inTextContainer:");
+public static final long /*int*/ sel_boundingRectWithSize_options_ = sel_registerName("boundingRectWithSize:options:");
+public static final long /*int*/ sel_bounds = sel_registerName("bounds");
+public static final long /*int*/ sel_bundleIdentifier = sel_registerName("bundleIdentifier");
+public static final long /*int*/ sel_bundlePath = sel_registerName("bundlePath");
+public static final long /*int*/ sel_bundleWithIdentifier_ = sel_registerName("bundleWithIdentifier:");
+public static final long /*int*/ sel_bundleWithPath_ = sel_registerName("bundleWithPath:");
+public static final long /*int*/ sel_button = sel_registerName("button");
+public static final long /*int*/ sel_buttonNumber = sel_registerName("buttonNumber");
+public static final long /*int*/ sel_bytes = sel_registerName("bytes");
+public static final long /*int*/ sel_bytesPerPlane = sel_registerName("bytesPerPlane");
+public static final long /*int*/ sel_bytesPerRow = sel_registerName("bytesPerRow");
+public static final long /*int*/ sel_calendarDate = sel_registerName("calendarDate");
+public static final long /*int*/ sel_canBecomeKeyView = sel_registerName("canBecomeKeyView");
+public static final long /*int*/ sel_canBecomeKeyWindow = sel_registerName("canBecomeKeyWindow");
+public static final long /*int*/ sel_canDragRowsWithIndexes_atPoint_ = sel_registerName("canDragRowsWithIndexes:atPoint:");
+public static final long /*int*/ sel_canGoBack = sel_registerName("canGoBack");
+public static final long /*int*/ sel_canGoForward = sel_registerName("canGoForward");
+public static final long /*int*/ sel_canRedo = sel_registerName("canRedo");
+public static final long /*int*/ sel_canShowMIMEType_ = sel_registerName("canShowMIMEType:");
+public static final long /*int*/ sel_canUndo = sel_registerName("canUndo");
+public static final long /*int*/ sel_cancel = sel_registerName("cancel");
+public static final long /*int*/ sel_cancelAuthenticationChallenge_ = sel_registerName("cancelAuthenticationChallenge:");
+public static final long /*int*/ sel_cancelButtonCell = sel_registerName("cancelButtonCell");
+public static final long /*int*/ sel_cancelOperation_ = sel_registerName("cancelOperation:");
+public static final long /*int*/ sel_cancelTracking = sel_registerName("cancelTracking");
+public static final long /*int*/ sel_cascadeTopLeftFromPoint_ = sel_registerName("cascadeTopLeftFromPoint:");
+public static final long /*int*/ sel_cell = sel_registerName("cell");
+public static final long /*int*/ sel_cellClass = sel_registerName("cellClass");
+public static final long /*int*/ sel_cellSize = sel_registerName("cellSize");
+public static final long /*int*/ sel_cellSizeForBounds_ = sel_registerName("cellSizeForBounds:");
+public static final long /*int*/ sel_changeColor_ = sel_registerName("changeColor:");
+public static final long /*int*/ sel_changeFont_ = sel_registerName("changeFont:");
+public static final long /*int*/ sel_charCode = sel_registerName("charCode");
+public static final long /*int*/ sel_characterAtIndex_ = sel_registerName("characterAtIndex:");
+public static final long /*int*/ sel_characterIndexForGlyphAtIndex_ = sel_registerName("characterIndexForGlyphAtIndex:");
+public static final long /*int*/ sel_characterIndexForInsertionAtPoint_ = sel_registerName("characterIndexForInsertionAtPoint:");
+public static final long /*int*/ sel_characterIndexForPoint_ = sel_registerName("characterIndexForPoint:");
+public static final long /*int*/ sel_characterIsMember_ = sel_registerName("characterIsMember:");
+public static final long /*int*/ sel_characters = sel_registerName("characters");
+public static final long /*int*/ sel_charactersIgnoringModifiers = sel_registerName("charactersIgnoringModifiers");
+public static final long /*int*/ sel_chooseFilename_ = sel_registerName("chooseFilename:");
+public static final long /*int*/ sel_className = sel_registerName("className");
+public static final long /*int*/ sel_cleanUpOperation = sel_registerName("cleanUpOperation");
+public static final long /*int*/ sel_clearColor = sel_registerName("clearColor");
+public static final long /*int*/ sel_clearCurrentContext = sel_registerName("clearCurrentContext");
+public static final long /*int*/ sel_clearDrawable = sel_registerName("clearDrawable");
+public static final long /*int*/ sel_clickCount = sel_registerName("clickCount");
+public static final long /*int*/ sel_clickedColumn = sel_registerName("clickedColumn");
+public static final long /*int*/ sel_clickedRow = sel_registerName("clickedRow");
+public static final long /*int*/ sel_close = sel_registerName("close");
+public static final long /*int*/ sel_closePath = sel_registerName("closePath");
+public static final long /*int*/ sel_code = sel_registerName("code");
+public static final long /*int*/ sel_collapseItem_ = sel_registerName("collapseItem:");
+public static final long /*int*/ sel_collapseItem_collapseChildren_ = sel_registerName("collapseItem:collapseChildren:");
+public static final long /*int*/ sel_collectionBehavior = sel_registerName("collectionBehavior");
+public static final long /*int*/ sel_color = sel_registerName("color");
+public static final long /*int*/ sel_colorAtX_y_ = sel_registerName("colorAtX:y:");
+public static final long /*int*/ sel_colorListNamed_ = sel_registerName("colorListNamed:");
+public static final long /*int*/ sel_colorSpace = sel_registerName("colorSpace");
+public static final long /*int*/ sel_colorSpaceModel = sel_registerName("colorSpaceModel");
+public static final long /*int*/ sel_colorSpaceName = sel_registerName("colorSpaceName");
+public static final long /*int*/ sel_colorUsingColorSpaceName_ = sel_registerName("colorUsingColorSpaceName:");
+public static final long /*int*/ sel_colorWithCalibratedRed_green_blue_alpha_ = sel_registerName("colorWithCalibratedRed:green:blue:alpha:");
+public static final long /*int*/ sel_colorWithDeviceRed_green_blue_alpha_ = sel_registerName("colorWithDeviceRed:green:blue:alpha:");
+public static final long /*int*/ sel_colorWithKey_ = sel_registerName("colorWithKey:");
+public static final long /*int*/ sel_colorWithPatternImage_ = sel_registerName("colorWithPatternImage:");
+public static final long /*int*/ sel_columnAtPoint_ = sel_registerName("columnAtPoint:");
+public static final long /*int*/ sel_columnIndexesInRect_ = sel_registerName("columnIndexesInRect:");
+public static final long /*int*/ sel_columnWithIdentifier_ = sel_registerName("columnWithIdentifier:");
+public static final long /*int*/ sel_comboBoxSelectionDidChange_ = sel_registerName("comboBoxSelectionDidChange:");
+public static final long /*int*/ sel_comboBoxWillDismiss_ = sel_registerName("comboBoxWillDismiss:");
+public static final long /*int*/ sel_comboBoxWillPopUp_ = sel_registerName("comboBoxWillPopUp:");
+public static final long /*int*/ sel_compare_ = sel_registerName("compare:");
+public static final long /*int*/ sel_concat = sel_registerName("concat");
+public static final long /*int*/ sel_conformsToProtocol_ = sel_registerName("conformsToProtocol:");
+public static final long /*int*/ sel_containerSize = sel_registerName("containerSize");
+public static final long /*int*/ sel_containsIndex_ = sel_registerName("containsIndex:");
+public static final long /*int*/ sel_containsObject_ = sel_registerName("containsObject:");
+public static final long /*int*/ sel_containsPoint_ = sel_registerName("containsPoint:");
+public static final long /*int*/ sel_contentRect = sel_registerName("contentRect");
+public static final long /*int*/ sel_contentSize = sel_registerName("contentSize");
+public static final long /*int*/ sel_contentSizeForFrameSize_hasHorizontalScroller_hasVerticalScroller_borderType_ = sel_registerName("contentSizeForFrameSize:hasHorizontalScroller:hasVerticalScroller:borderType:");
+public static final long /*int*/ sel_contentView = sel_registerName("contentView");
+public static final long /*int*/ sel_contentViewMargins = sel_registerName("contentViewMargins");
+public static final long /*int*/ sel_context = sel_registerName("context");
+public static final long /*int*/ sel_controlBackgroundColor = sel_registerName("controlBackgroundColor");
+public static final long /*int*/ sel_controlContentFontOfSize_ = sel_registerName("controlContentFontOfSize:");
+public static final long /*int*/ sel_controlDarkShadowColor = sel_registerName("controlDarkShadowColor");
+public static final long /*int*/ sel_controlHighlightColor = sel_registerName("controlHighlightColor");
+public static final long /*int*/ sel_controlLightHighlightColor = sel_registerName("controlLightHighlightColor");
+public static final long /*int*/ sel_controlPointBounds = sel_registerName("controlPointBounds");
+public static final long /*int*/ sel_controlShadowColor = sel_registerName("controlShadowColor");
+public static final long /*int*/ sel_controlSize = sel_registerName("controlSize");
+public static final long /*int*/ sel_controlTextColor = sel_registerName("controlTextColor");
+public static final long /*int*/ sel_convertBaseToScreen_ = sel_registerName("convertBaseToScreen:");
+public static final long /*int*/ sel_convertFont_toHaveTrait_ = sel_registerName("convertFont:toHaveTrait:");
+public static final long /*int*/ sel_convertPoint_fromView_ = sel_registerName("convertPoint:fromView:");
+public static final long /*int*/ sel_convertPoint_toView_ = sel_registerName("convertPoint:toView:");
+public static final long /*int*/ sel_convertPointFromBase_ = sel_registerName("convertPointFromBase:");
+public static final long /*int*/ sel_convertPointToBase_ = sel_registerName("convertPointToBase:");
+public static final long /*int*/ sel_convertRect_fromView_ = sel_registerName("convertRect:fromView:");
+public static final long /*int*/ sel_convertRect_toView_ = sel_registerName("convertRect:toView:");
+public static final long /*int*/ sel_convertRectFromBase_ = sel_registerName("convertRectFromBase:");
+public static final long /*int*/ sel_convertRectToBase_ = sel_registerName("convertRectToBase:");
+public static final long /*int*/ sel_convertScreenToBase_ = sel_registerName("convertScreenToBase:");
+public static final long /*int*/ sel_convertSize_fromView_ = sel_registerName("convertSize:fromView:");
+public static final long /*int*/ sel_convertSize_toView_ = sel_registerName("convertSize:toView:");
+public static final long /*int*/ sel_convertSizeFromBase_ = sel_registerName("convertSizeFromBase:");
+public static final long /*int*/ sel_convertSizeToBase_ = sel_registerName("convertSizeToBase:");
+public static final long /*int*/ sel_cookies = sel_registerName("cookies");
+public static final long /*int*/ sel_cookiesForURL_ = sel_registerName("cookiesForURL:");
+public static final long /*int*/ sel_cookiesWithResponseHeaderFields_forURL_ = sel_registerName("cookiesWithResponseHeaderFields:forURL:");
+public static final long /*int*/ sel_copiesOnScroll = sel_registerName("copiesOnScroll");
+public static final long /*int*/ sel_copy = sel_registerName("copy");
+public static final long /*int*/ sel_copy_ = sel_registerName("copy:");
+public static final long /*int*/ sel_count = sel_registerName("count");
+public static final long /*int*/ sel_createContext = sel_registerName("createContext");
+public static final long /*int*/ sel_createFileAtPath_contents_attributes_ = sel_registerName("createFileAtPath:contents:attributes:");
+public static final long /*int*/ sel_credentialWithUser_password_persistence_ = sel_registerName("credentialWithUser:password:persistence:");
+public static final long /*int*/ sel_crosshairCursor = sel_registerName("crosshairCursor");
+public static final long /*int*/ sel_ctrlKey = sel_registerName("ctrlKey");
+public static final long /*int*/ sel_currentContext = sel_registerName("currentContext");
+public static final long /*int*/ sel_currentCursor = sel_registerName("currentCursor");
+public static final long /*int*/ sel_currentEditor = sel_registerName("currentEditor");
+public static final long /*int*/ sel_currentEvent = sel_registerName("currentEvent");
+public static final long /*int*/ sel_currentHandler = sel_registerName("currentHandler");
+public static final long /*int*/ sel_currentInputManager = sel_registerName("currentInputManager");
+public static final long /*int*/ sel_currentPoint = sel_registerName("currentPoint");
+public static final long /*int*/ sel_currentRunLoop = sel_registerName("currentRunLoop");
+public static final long /*int*/ sel_currentThread = sel_registerName("currentThread");
+public static final long /*int*/ sel_cursorUpdate_ = sel_registerName("cursorUpdate:");
+public static final long /*int*/ sel_curveToPoint_controlPoint1_controlPoint2_ = sel_registerName("curveToPoint:controlPoint1:controlPoint2:");
+public static final long /*int*/ sel_cut_ = sel_registerName("cut:");
+public static final long /*int*/ sel_dataCell = sel_registerName("dataCell");
+public static final long /*int*/ sel_dataForType_ = sel_registerName("dataForType:");
+public static final long /*int*/ sel_dataSource = sel_registerName("dataSource");
+public static final long /*int*/ sel_dataWithBytes_length_ = sel_registerName("dataWithBytes:length:");
+public static final long /*int*/ sel_dateValue = sel_registerName("dateValue");
+public static final long /*int*/ sel_dateWithCalendarFormat_timeZone_ = sel_registerName("dateWithCalendarFormat:timeZone:");
+public static final long /*int*/ sel_dateWithTimeIntervalSinceNow_ = sel_registerName("dateWithTimeIntervalSinceNow:");
+public static final long /*int*/ sel_dateWithYear_month_day_hour_minute_second_timeZone_ = sel_registerName("dateWithYear:month:day:hour:minute:second:timeZone:");
+public static final long /*int*/ sel_dayOfMonth = sel_registerName("dayOfMonth");
+public static final long /*int*/ sel_dealloc = sel_registerName("dealloc");
+public static final long /*int*/ sel_decimalDigitCharacterSet = sel_registerName("decimalDigitCharacterSet");
+public static final long /*int*/ sel_decimalSeparator = sel_registerName("decimalSeparator");
+public static final long /*int*/ sel_declareTypes_owner_ = sel_registerName("declareTypes:owner:");
+public static final long /*int*/ sel_defaultBaselineOffsetForFont_ = sel_registerName("defaultBaselineOffsetForFont:");
+public static final long /*int*/ sel_defaultButtonCell = sel_registerName("defaultButtonCell");
+public static final long /*int*/ sel_defaultCenter = sel_registerName("defaultCenter");
+public static final long /*int*/ sel_defaultFlatness = sel_registerName("defaultFlatness");
+public static final long /*int*/ sel_defaultLineHeightForFont_ = sel_registerName("defaultLineHeightForFont:");
+public static final long /*int*/ sel_defaultManager = sel_registerName("defaultManager");
+public static final long /*int*/ sel_defaultParagraphStyle = sel_registerName("defaultParagraphStyle");
+public static final long /*int*/ sel_defaultPrinter = sel_registerName("defaultPrinter");
+public static final long /*int*/ sel_defaultTimeZone = sel_registerName("defaultTimeZone");
+public static final long /*int*/ sel_delegate = sel_registerName("delegate");
+public static final long /*int*/ sel_deleteCookie_ = sel_registerName("deleteCookie:");
+public static final long /*int*/ sel_deliverResult = sel_registerName("deliverResult");
+public static final long /*int*/ sel_deltaX = sel_registerName("deltaX");
+public static final long /*int*/ sel_deltaY = sel_registerName("deltaY");
+public static final long /*int*/ sel_deminiaturize_ = sel_registerName("deminiaturize:");
+public static final long /*int*/ sel_depth = sel_registerName("depth");
+public static final long /*int*/ sel_descender = sel_registerName("descender");
+public static final long /*int*/ sel_description = sel_registerName("description");
+public static final long /*int*/ sel_deselectAll_ = sel_registerName("deselectAll:");
+public static final long /*int*/ sel_deselectItemAtIndex_ = sel_registerName("deselectItemAtIndex:");
+public static final long /*int*/ sel_deselectRow_ = sel_registerName("deselectRow:");
+public static final long /*int*/ sel_destroyContext = sel_registerName("destroyContext");
+public static final long /*int*/ sel_detail = sel_registerName("detail");
+public static final long /*int*/ sel_device = sel_registerName("device");
+public static final long /*int*/ sel_deviceDescription = sel_registerName("deviceDescription");
+public static final long /*int*/ sel_deviceSize = sel_registerName("deviceSize");
+public static final long /*int*/ sel_dictionary = sel_registerName("dictionary");
+public static final long /*int*/ sel_dictionaryWithCapacity_ = sel_registerName("dictionaryWithCapacity:");
+public static final long /*int*/ sel_dictionaryWithObject_forKey_ = sel_registerName("dictionaryWithObject:forKey:");
+public static final long /*int*/ sel_disableCursorRects = sel_registerName("disableCursorRects");
+public static final long /*int*/ sel_disableFlushWindow = sel_registerName("disableFlushWindow");
+public static final long /*int*/ sel_disabledControlTextColor = sel_registerName("disabledControlTextColor");
+public static final long /*int*/ sel_discardCursorRects = sel_registerName("discardCursorRects");
+public static final long /*int*/ sel_display = sel_registerName("display");
+public static final long /*int*/ sel_displayIfNeeded = sel_registerName("displayIfNeeded");
+public static final long /*int*/ sel_displayName = sel_registerName("displayName");
+public static final long /*int*/ sel_displayNameForKey_value_ = sel_registerName("displayNameForKey:value:");
+public static final long /*int*/ sel_displayRectIgnoringOpacity_inContext_ = sel_registerName("displayRectIgnoringOpacity:inContext:");
+public static final long /*int*/ sel_distantFuture = sel_registerName("distantFuture");
+public static final long /*int*/ sel_doCommandBySelector_ = sel_registerName("doCommandBySelector:");
+public static final long /*int*/ sel_dockTile = sel_registerName("dockTile");
+public static final long /*int*/ sel_documentCursor = sel_registerName("documentCursor");
+public static final long /*int*/ sel_documentSource = sel_registerName("documentSource");
+public static final long /*int*/ sel_documentView = sel_registerName("documentView");
+public static final long /*int*/ sel_documentViewShouldHandlePrint = sel_registerName("documentViewShouldHandlePrint");
+public static final long /*int*/ sel_documentVisibleRect = sel_registerName("documentVisibleRect");
+public static final long /*int*/ sel_doubleClickAtIndex_ = sel_registerName("doubleClickAtIndex:");
+public static final long /*int*/ sel_doubleValue = sel_registerName("doubleValue");
+public static final long /*int*/ sel_download = sel_registerName("download");
+public static final long /*int*/ sel_download_decideDestinationWithSuggestedFilename_ = sel_registerName("download:decideDestinationWithSuggestedFilename:");
+public static final long /*int*/ sel_dragImage_at_offset_event_pasteboard_source_slideBack_ = sel_registerName("dragImage:at:offset:event:pasteboard:source:slideBack:");
+public static final long /*int*/ sel_dragImageForRowsWithIndexes_tableColumns_event_offset_ = sel_registerName("dragImageForRowsWithIndexes:tableColumns:event:offset:");
+public static final long /*int*/ sel_dragSelectionWithEvent_offset_slideBack_ = sel_registerName("dragSelectionWithEvent:offset:slideBack:");
+public static final long /*int*/ sel_draggedImage_beganAt_ = sel_registerName("draggedImage:beganAt:");
+public static final long /*int*/ sel_draggedImage_endedAt_operation_ = sel_registerName("draggedImage:endedAt:operation:");
+public static final long /*int*/ sel_draggingDestinationWindow = sel_registerName("draggingDestinationWindow");
+public static final long /*int*/ sel_draggingEnded_ = sel_registerName("draggingEnded:");
+public static final long /*int*/ sel_draggingEntered_ = sel_registerName("draggingEntered:");
+public static final long /*int*/ sel_draggingExited_ = sel_registerName("draggingExited:");
+public static final long /*int*/ sel_draggingLocation = sel_registerName("draggingLocation");
+public static final long /*int*/ sel_draggingPasteboard = sel_registerName("draggingPasteboard");
+public static final long /*int*/ sel_draggingSourceOperationMask = sel_registerName("draggingSourceOperationMask");
+public static final long /*int*/ sel_draggingSourceOperationMaskForLocal_ = sel_registerName("draggingSourceOperationMaskForLocal:");
+public static final long /*int*/ sel_draggingUpdated_ = sel_registerName("draggingUpdated:");
+public static final long /*int*/ sel_drawAtPoint_ = sel_registerName("drawAtPoint:");
+public static final long /*int*/ sel_drawAtPoint_fromRect_operation_fraction_ = sel_registerName("drawAtPoint:fromRect:operation:fraction:");
+public static final long /*int*/ sel_drawBackgroundForGlyphRange_atPoint_ = sel_registerName("drawBackgroundForGlyphRange:atPoint:");
+public static final long /*int*/ sel_drawBackgroundInClipRect_ = sel_registerName("drawBackgroundInClipRect:");
+public static final long /*int*/ sel_drawFromPoint_toPoint_options_ = sel_registerName("drawFromPoint:toPoint:options:");
+public static final long /*int*/ sel_drawGlyphsForGlyphRange_atPoint_ = sel_registerName("drawGlyphsForGlyphRange:atPoint:");
+public static final long /*int*/ sel_drawImage_withFrame_inView_ = sel_registerName("drawImage:withFrame:inView:");
+public static final long /*int*/ sel_drawInRect_ = sel_registerName("drawInRect:");
+public static final long /*int*/ sel_drawInRect_angle_ = sel_registerName("drawInRect:angle:");
+public static final long /*int*/ sel_drawInRect_fromRect_operation_fraction_ = sel_registerName("drawInRect:fromRect:operation:fraction:");
+public static final long /*int*/ sel_drawInteriorWithFrame_inView_ = sel_registerName("drawInteriorWithFrame:inView:");
+public static final long /*int*/ sel_drawLabel_inRect_ = sel_registerName("drawLabel:inRect:");
+public static final long /*int*/ sel_drawRect_ = sel_registerName("drawRect:");
+public static final long /*int*/ sel_drawSortIndicatorWithFrame_inView_ascending_priority_ = sel_registerName("drawSortIndicatorWithFrame:inView:ascending:priority:");
+public static final long /*int*/ sel_drawStatusBarBackgroundInRect_withHighlight_ = sel_registerName("drawStatusBarBackgroundInRect:withHighlight:");
+public static final long /*int*/ sel_drawTitle_withFrame_inView_ = sel_registerName("drawTitle:withFrame:inView:");
+public static final long /*int*/ sel_drawViewBackgroundInRect_ = sel_registerName("drawViewBackgroundInRect:");
+public static final long /*int*/ sel_drawWithExpansionFrame_inView_ = sel_registerName("drawWithExpansionFrame:inView:");
+public static final long /*int*/ sel_drawingRectForBounds_ = sel_registerName("drawingRectForBounds:");
+public static final long /*int*/ sel_elementAtIndex_associatedPoints_ = sel_registerName("elementAtIndex:associatedPoints:");
+public static final long /*int*/ sel_elementCount = sel_registerName("elementCount");
+public static final long /*int*/ sel_enableCursorRects = sel_registerName("enableCursorRects");
+public static final long /*int*/ sel_enableFlushWindow = sel_registerName("enableFlushWindow");
+public static final long /*int*/ sel_endDocument = sel_registerName("endDocument");
+public static final long /*int*/ sel_endEditing = sel_registerName("endEditing");
+public static final long /*int*/ sel_endEditingFor_ = sel_registerName("endEditingFor:");
+public static final long /*int*/ sel_endGestureWithEvent_ = sel_registerName("endGestureWithEvent:");
+public static final long /*int*/ sel_endPage = sel_registerName("endPage");
+public static final long /*int*/ sel_endSheet_returnCode_ = sel_registerName("endSheet:returnCode:");
+public static final long /*int*/ sel_enterExitEventWithType_location_modifierFlags_timestamp_windowNumber_context_eventNumber_trackingNumber_userData_ = sel_registerName("enterExitEventWithType:location:modifierFlags:timestamp:windowNumber:context:eventNumber:trackingNumber:userData:");
+public static final long /*int*/ sel_enumeratorAtPath_ = sel_registerName("enumeratorAtPath:");
+public static final long /*int*/ sel_expandItem_ = sel_registerName("expandItem:");
+public static final long /*int*/ sel_expandItem_expandChildren_ = sel_registerName("expandItem:expandChildren:");
+public static final long /*int*/ sel_expansionFrameWithFrame_inView_ = sel_registerName("expansionFrameWithFrame:inView:");
+public static final long /*int*/ sel_familyName = sel_registerName("familyName");
+public static final long /*int*/ sel_fieldEditor_forObject_ = sel_registerName("fieldEditor:forObject:");
+public static final long /*int*/ sel_fileExistsAtPath_ = sel_registerName("fileExistsAtPath:");
+public static final long /*int*/ sel_fileExistsAtPath_isDirectory_ = sel_registerName("fileExistsAtPath:isDirectory:");
+public static final long /*int*/ sel_fileSystemRepresentation = sel_registerName("fileSystemRepresentation");
+public static final long /*int*/ sel_fileURLWithPath_ = sel_registerName("fileURLWithPath:");
+public static final long /*int*/ sel_filename = sel_registerName("filename");
+public static final long /*int*/ sel_filenames = sel_registerName("filenames");
+public static final long /*int*/ sel_fill = sel_registerName("fill");
+public static final long /*int*/ sel_fillRect_ = sel_registerName("fillRect:");
+public static final long /*int*/ sel_finishLaunching = sel_registerName("finishLaunching");
+public static final long /*int*/ sel_firstIndex = sel_registerName("firstIndex");
+public static final long /*int*/ sel_firstRectForCharacterRange_ = sel_registerName("firstRectForCharacterRange:");
+public static final long /*int*/ sel_firstResponder = sel_registerName("firstResponder");
+public static final long /*int*/ sel_flagsChanged_ = sel_registerName("flagsChanged:");
+public static final long /*int*/ sel_floatValue = sel_registerName("floatValue");
+public static final long /*int*/ sel_flushBuffer = sel_registerName("flushBuffer");
+public static final long /*int*/ sel_flushGraphics = sel_registerName("flushGraphics");
+public static final long /*int*/ sel_flushWindowIfNeeded = sel_registerName("flushWindowIfNeeded");
+public static final long /*int*/ sel_font = sel_registerName("font");
+public static final long /*int*/ sel_fontName = sel_registerName("fontName");
+public static final long /*int*/ sel_fontWithFamily_traits_weight_size_ = sel_registerName("fontWithFamily:traits:weight:size:");
+public static final long /*int*/ sel_fontWithName_size_ = sel_registerName("fontWithName:size:");
+public static final long /*int*/ sel_frame = sel_registerName("frame");
+public static final long /*int*/ sel_frameOfCellAtColumn_row_ = sel_registerName("frameOfCellAtColumn:row:");
+public static final long /*int*/ sel_frameOfOutlineCellAtRow_ = sel_registerName("frameOfOutlineCellAtRow:");
+public static final long /*int*/ sel_frameRectForContentRect_ = sel_registerName("frameRectForContentRect:");
+public static final long /*int*/ sel_frameSizeForContentSize_hasHorizontalScroller_hasVerticalScroller_borderType_ = sel_registerName("frameSizeForContentSize:hasHorizontalScroller:hasVerticalScroller:borderType:");
+public static final long /*int*/ sel_fullPathForApplication_ = sel_registerName("fullPathForApplication:");
+public static final long /*int*/ sel_generalPasteboard = sel_registerName("generalPasteboard");
+public static final long /*int*/ sel_genericRGBColorSpace = sel_registerName("genericRGBColorSpace");
+public static final long /*int*/ sel_getBitmapDataPlanes_ = sel_registerName("getBitmapDataPlanes:");
+public static final long /*int*/ sel_getBytes_ = sel_registerName("getBytes:");
+public static final long /*int*/ sel_getBytes_length_ = sel_registerName("getBytes:length:");
+public static final long /*int*/ sel_getCharacters_ = sel_registerName("getCharacters:");
+public static final long /*int*/ sel_getCharacters_range_ = sel_registerName("getCharacters:range:");
+public static final long /*int*/ sel_getComponents_ = sel_registerName("getComponents:");
+public static final long /*int*/ sel_getGlyphs_range_ = sel_registerName("getGlyphs:range:");
+public static final long /*int*/ sel_getGlyphsInRange_glyphs_characterIndexes_glyphInscriptions_elasticBits_bidiLevels_ = sel_registerName("getGlyphsInRange:glyphs:characterIndexes:glyphInscriptions:elasticBits:bidiLevels:");
+public static final long /*int*/ sel_getIndexes_maxCount_inIndexRange_ = sel_registerName("getIndexes:maxCount:inIndexRange:");
+public static final long /*int*/ sel_getInfoForFile_application_type_ = sel_registerName("getInfoForFile:application:type:");
+public static final long /*int*/ sel_getValues_forAttribute_forVirtualScreen_ = sel_registerName("getValues:forAttribute:forVirtualScreen:");
+public static final long /*int*/ sel_globalContext = sel_registerName("globalContext");
+public static final long /*int*/ sel_glyphIndexForCharacterAtIndex_ = sel_registerName("glyphIndexForCharacterAtIndex:");
+public static final long /*int*/ sel_glyphIndexForPoint_inTextContainer_fractionOfDistanceThroughGlyph_ = sel_registerName("glyphIndexForPoint:inTextContainer:fractionOfDistanceThroughGlyph:");
+public static final long /*int*/ sel_glyphRangeForCharacterRange_actualCharacterRange_ = sel_registerName("glyphRangeForCharacterRange:actualCharacterRange:");
+public static final long /*int*/ sel_glyphRangeForTextContainer_ = sel_registerName("glyphRangeForTextContainer:");
+public static final long /*int*/ sel_goBack = sel_registerName("goBack");
+public static final long /*int*/ sel_goForward = sel_registerName("goForward");
+public static final long /*int*/ sel_graphicsContext = sel_registerName("graphicsContext");
+public static final long /*int*/ sel_graphicsContextWithBitmapImageRep_ = sel_registerName("graphicsContextWithBitmapImageRep:");
+public static final long /*int*/ sel_graphicsContextWithGraphicsPort_flipped_ = sel_registerName("graphicsContextWithGraphicsPort:flipped:");
+public static final long /*int*/ sel_graphicsContextWithWindow_ = sel_registerName("graphicsContextWithWindow:");
+public static final long /*int*/ sel_graphicsPort = sel_registerName("graphicsPort");
+public static final long /*int*/ sel_greenComponent = sel_registerName("greenComponent");
+public static final long /*int*/ sel_handleEvent_ = sel_registerName("handleEvent:");
+public static final long /*int*/ sel_handleFailureInFunction_file_lineNumber_description_ = sel_registerName("handleFailureInFunction:file:lineNumber:description:");
+public static final long /*int*/ sel_handleFailureInMethod_object_file_lineNumber_description_ = sel_registerName("handleFailureInMethod:object:file:lineNumber:description:");
+public static final long /*int*/ sel_handleMouseEvent_ = sel_registerName("handleMouseEvent:");
+public static final long /*int*/ sel_hasAlpha = sel_registerName("hasAlpha");
+public static final long /*int*/ sel_hasMarkedText = sel_registerName("hasMarkedText");
+public static final long /*int*/ sel_hasPassword = sel_registerName("hasPassword");
+public static final long /*int*/ sel_hasShadow = sel_registerName("hasShadow");
+public static final long /*int*/ sel_headerCell = sel_registerName("headerCell");
+public static final long /*int*/ sel_headerRectOfColumn_ = sel_registerName("headerRectOfColumn:");
+public static final long /*int*/ sel_headerView = sel_registerName("headerView");
+public static final long /*int*/ sel_helpRequested_ = sel_registerName("helpRequested:");
+public static final long /*int*/ sel_hide_ = sel_registerName("hide:");
+public static final long /*int*/ sel_hideOtherApplications_ = sel_registerName("hideOtherApplications:");
+public static final long /*int*/ sel_highlightColorInView_ = sel_registerName("highlightColorInView:");
+public static final long /*int*/ sel_highlightColorWithFrame_inView_ = sel_registerName("highlightColorWithFrame:inView:");
+public static final long /*int*/ sel_highlightSelectionInClipRect_ = sel_registerName("highlightSelectionInClipRect:");
+public static final long /*int*/ sel_hitPart = sel_registerName("hitPart");
+public static final long /*int*/ sel_hitTest_ = sel_registerName("hitTest:");
+public static final long /*int*/ sel_hitTestForEvent_inRect_ofView_ = sel_registerName("hitTestForEvent:inRect:ofView:");
+public static final long /*int*/ sel_host = sel_registerName("host");
+public static final long /*int*/ sel_hotSpot = sel_registerName("hotSpot");
+public static final long /*int*/ sel_hourOfDay = sel_registerName("hourOfDay");
+public static final long /*int*/ sel_iconForFile_ = sel_registerName("iconForFile:");
+public static final long /*int*/ sel_iconForFileType_ = sel_registerName("iconForFileType:");
+public static final long /*int*/ sel_ignore = sel_registerName("ignore");
+public static final long /*int*/ sel_ignoreModifierKeysWhileDragging = sel_registerName("ignoreModifierKeysWhileDragging");
+public static final long /*int*/ sel_image = sel_registerName("image");
+public static final long /*int*/ sel_imageInterpolation = sel_registerName("imageInterpolation");
+public static final long /*int*/ sel_imageNamed_ = sel_registerName("imageNamed:");
+public static final long /*int*/ sel_imageRectForBounds_ = sel_registerName("imageRectForBounds:");
+public static final long /*int*/ sel_imageRepWithData_ = sel_registerName("imageRepWithData:");
+public static final long /*int*/ sel_imageablePageBounds = sel_registerName("imageablePageBounds");
+public static final long /*int*/ sel_increment = sel_registerName("increment");
+public static final long /*int*/ sel_indentationPerLevel = sel_registerName("indentationPerLevel");
+public static final long /*int*/ sel_indexOfItemWithTarget_andAction_ = sel_registerName("indexOfItemWithTarget:andAction:");
+public static final long /*int*/ sel_indexOfObjectIdenticalTo_ = sel_registerName("indexOfObjectIdenticalTo:");
+public static final long /*int*/ sel_indexOfSelectedItem = sel_registerName("indexOfSelectedItem");
+public static final long /*int*/ sel_indexSetWithIndex_ = sel_registerName("indexSetWithIndex:");
+public static final long /*int*/ sel_infoDictionary = sel_registerName("infoDictionary");
+public static final long /*int*/ sel_init = sel_registerName("init");
+public static final long /*int*/ sel_initByReferencingFile_ = sel_registerName("initByReferencingFile:");
+public static final long /*int*/ sel_initListDescriptor = sel_registerName("initListDescriptor");
+public static final long /*int*/ sel_initWithAttributes_ = sel_registerName("initWithAttributes:");
+public static final long /*int*/ sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_ = sel_registerName("initWithBitmapDataPlanes:pixelsWide:pixelsHigh:bitsPerSample:samplesPerPixel:hasAlpha:isPlanar:colorSpaceName:bitmapFormat:bytesPerRow:bitsPerPixel:");
+public static final long /*int*/ sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_ = sel_registerName("initWithBitmapDataPlanes:pixelsWide:pixelsHigh:bitsPerSample:samplesPerPixel:hasAlpha:isPlanar:colorSpaceName:bytesPerRow:bitsPerPixel:");
+public static final long /*int*/ sel_initWithCapacity_ = sel_registerName("initWithCapacity:");
+public static final long /*int*/ sel_initWithCharacters_length_ = sel_registerName("initWithCharacters:length:");
+public static final long /*int*/ sel_initWithContainerSize_ = sel_registerName("initWithContainerSize:");
+public static final long /*int*/ sel_initWithContentRect_styleMask_backing_defer_ = sel_registerName("initWithContentRect:styleMask:backing:defer:");
+public static final long /*int*/ sel_initWithContentRect_styleMask_backing_defer_screen_ = sel_registerName("initWithContentRect:styleMask:backing:defer:screen:");
+public static final long /*int*/ sel_initWithContentsOfFile_ = sel_registerName("initWithContentsOfFile:");
+public static final long /*int*/ sel_initWithData_ = sel_registerName("initWithData:");
+public static final long /*int*/ sel_initWithDictionary_ = sel_registerName("initWithDictionary:");
+public static final long /*int*/ sel_initWithFileWrapper_ = sel_registerName("initWithFileWrapper:");
+public static final long /*int*/ sel_initWithFocusedViewRect_ = sel_registerName("initWithFocusedViewRect:");
+public static final long /*int*/ sel_initWithFormat_shareContext_ = sel_registerName("initWithFormat:shareContext:");
+public static final long /*int*/ sel_initWithFrame_ = sel_registerName("initWithFrame:");
+public static final long /*int*/ sel_initWithFrame_frameName_groupName_ = sel_registerName("initWithFrame:frameName:groupName:");
+public static final long /*int*/ sel_initWithFrame_pullsDown_ = sel_registerName("initWithFrame:pullsDown:");
+public static final long /*int*/ sel_initWithIconRef_ = sel_registerName("initWithIconRef:");
+public static final long /*int*/ sel_initWithIdentifier_ = sel_registerName("initWithIdentifier:");
+public static final long /*int*/ sel_initWithImage_hotSpot_ = sel_registerName("initWithImage:hotSpot:");
+public static final long /*int*/ sel_initWithIndex_ = sel_registerName("initWithIndex:");
+public static final long /*int*/ sel_initWithIndexSet_ = sel_registerName("initWithIndexSet:");
+public static final long /*int*/ sel_initWithIndexesInRange_ = sel_registerName("initWithIndexesInRange:");
+public static final long /*int*/ sel_initWithItemIdentifier_ = sel_registerName("initWithItemIdentifier:");
+public static final long /*int*/ sel_initWithLocaleIdentifier_ = sel_registerName("initWithLocaleIdentifier:");
+public static final long /*int*/ sel_initWithName_ = sel_registerName("initWithName:");
+public static final long /*int*/ sel_initWithRect_options_owner_userInfo_ = sel_registerName("initWithRect:options:owner:userInfo:");
+public static final long /*int*/ sel_initWithSize_ = sel_registerName("initWithSize:");
+public static final long /*int*/ sel_initWithStartingColor_endingColor_ = sel_registerName("initWithStartingColor:endingColor:");
+public static final long /*int*/ sel_initWithString_ = sel_registerName("initWithString:");
+public static final long /*int*/ sel_initWithString_attributes_ = sel_registerName("initWithString:attributes:");
+public static final long /*int*/ sel_initWithTitle_ = sel_registerName("initWithTitle:");
+public static final long /*int*/ sel_initWithTitle_action_keyEquivalent_ = sel_registerName("initWithTitle:action:keyEquivalent:");
+public static final long /*int*/ sel_initWithTransform_ = sel_registerName("initWithTransform:");
+public static final long /*int*/ sel_initWithType_location_ = sel_registerName("initWithType:location:");
+public static final long /*int*/ sel_initWithURL_ = sel_registerName("initWithURL:");
+public static final long /*int*/ sel_insertColor_key_atIndex_ = sel_registerName("insertColor:key:atIndex:");
+public static final long /*int*/ sel_insertItem_atIndex_ = sel_registerName("insertItem:atIndex:");
+public static final long /*int*/ sel_insertItemWithItemIdentifier_atIndex_ = sel_registerName("insertItemWithItemIdentifier:atIndex:");
+public static final long /*int*/ sel_insertItemWithObjectValue_atIndex_ = sel_registerName("insertItemWithObjectValue:atIndex:");
+public static final long /*int*/ sel_insertTabViewItem_atIndex_ = sel_registerName("insertTabViewItem:atIndex:");
+public static final long /*int*/ sel_insertText_ = sel_registerName("insertText:");
+public static final long /*int*/ sel_intValue = sel_registerName("intValue");
+public static final long /*int*/ sel_integerValue = sel_registerName("integerValue");
+public static final long /*int*/ sel_intercellSpacing = sel_registerName("intercellSpacing");
+public static final long /*int*/ sel_interpretKeyEvents_ = sel_registerName("interpretKeyEvents:");
+public static final long /*int*/ sel_invalidate = sel_registerName("invalidate");
+public static final long /*int*/ sel_invalidateShadow = sel_registerName("invalidateShadow");
+public static final long /*int*/ sel_invert = sel_registerName("invert");
+public static final long /*int*/ sel_isActive = sel_registerName("isActive");
+public static final long /*int*/ sel_isDocumentEdited = sel_registerName("isDocumentEdited");
+public static final long /*int*/ sel_isDrawingToScreen = sel_registerName("isDrawingToScreen");
+public static final long /*int*/ sel_isEmpty = sel_registerName("isEmpty");
+public static final long /*int*/ sel_isEnabled = sel_registerName("isEnabled");
+public static final long /*int*/ sel_isEqual_ = sel_registerName("isEqual:");
+public static final long /*int*/ sel_isEqualTo_ = sel_registerName("isEqualTo:");
+public static final long /*int*/ sel_isEqualToString_ = sel_registerName("isEqualToString:");
+public static final long /*int*/ sel_isExecutableFileAtPath_ = sel_registerName("isExecutableFileAtPath:");
+public static final long /*int*/ sel_isFieldEditor = sel_registerName("isFieldEditor");
+public static final long /*int*/ sel_isFilePackageAtPath_ = sel_registerName("isFilePackageAtPath:");
+public static final long /*int*/ sel_isFileURL = sel_registerName("isFileURL");
+public static final long /*int*/ sel_isFlipped = sel_registerName("isFlipped");
+public static final long /*int*/ sel_isHidden = sel_registerName("isHidden");
+public static final long /*int*/ sel_isHiddenOrHasHiddenAncestor = sel_registerName("isHiddenOrHasHiddenAncestor");
+public static final long /*int*/ sel_isHighlighted = sel_registerName("isHighlighted");
+public static final long /*int*/ sel_isItemExpanded_ = sel_registerName("isItemExpanded:");
+public static final long /*int*/ sel_isKeyWindow = sel_registerName("isKeyWindow");
+public static final long /*int*/ sel_isKindOfClass_ = sel_registerName("isKindOfClass:");
+public static final long /*int*/ sel_isMainThread = sel_registerName("isMainThread");
+public static final long /*int*/ sel_isMainWindow = sel_registerName("isMainWindow");
+public static final long /*int*/ sel_isMiniaturized = sel_registerName("isMiniaturized");
+public static final long /*int*/ sel_isOpaque = sel_registerName("isOpaque");
+public static final long /*int*/ sel_isPlanar = sel_registerName("isPlanar");
+public static final long /*int*/ sel_isResting = sel_registerName("isResting");
+public static final long /*int*/ sel_isRowSelected_ = sel_registerName("isRowSelected:");
+public static final long /*int*/ sel_isRunning = sel_registerName("isRunning");
+public static final long /*int*/ sel_isSeparatorItem = sel_registerName("isSeparatorItem");
+public static final long /*int*/ sel_isSessionOnly = sel_registerName("isSessionOnly");
+public static final long /*int*/ sel_isSheet = sel_registerName("isSheet");
+public static final long /*int*/ sel_isVisible = sel_registerName("isVisible");
+public static final long /*int*/ sel_isZoomed = sel_registerName("isZoomed");
+public static final long /*int*/ sel_itemArray = sel_registerName("itemArray");
+public static final long /*int*/ sel_itemAtIndex_ = sel_registerName("itemAtIndex:");
+public static final long /*int*/ sel_itemAtRow_ = sel_registerName("itemAtRow:");
+public static final long /*int*/ sel_itemHeight = sel_registerName("itemHeight");
+public static final long /*int*/ sel_itemIdentifier = sel_registerName("itemIdentifier");
+public static final long /*int*/ sel_itemObjectValueAtIndex_ = sel_registerName("itemObjectValueAtIndex:");
+public static final long /*int*/ sel_itemTitleAtIndex_ = sel_registerName("itemTitleAtIndex:");
+public static final long /*int*/ sel_itemWithTag_ = sel_registerName("itemWithTag:");
+public static final long /*int*/ sel_jobDisposition = sel_registerName("jobDisposition");
+public static final long /*int*/ sel_keyCode = sel_registerName("keyCode");
+public static final long /*int*/ sel_keyDown_ = sel_registerName("keyDown:");
+public static final long /*int*/ sel_keyEquivalent = sel_registerName("keyEquivalent");
+public static final long /*int*/ sel_keyEquivalentModifierMask = sel_registerName("keyEquivalentModifierMask");
+public static final long /*int*/ sel_keyUp_ = sel_registerName("keyUp:");
+public static final long /*int*/ sel_keyWindow = sel_registerName("keyWindow");
+public static final long /*int*/ sel_knobProportion = sel_registerName("knobProportion");
+public static final long /*int*/ sel_knobThickness = sel_registerName("knobThickness");
+public static final long /*int*/ sel_lastPathComponent = sel_registerName("lastPathComponent");
+public static final long /*int*/ sel_layoutManager = sel_registerName("layoutManager");
+public static final long /*int*/ sel_leading = sel_registerName("leading");
+public static final long /*int*/ sel_length = sel_registerName("length");
+public static final long /*int*/ sel_level = sel_registerName("level");
+public static final long /*int*/ sel_levelForItem_ = sel_registerName("levelForItem:");
+public static final long /*int*/ sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_ = sel_registerName("lineFragmentUsedRectForGlyphAtIndex:effectiveRange:");
+public static final long /*int*/ sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_withoutAdditionalLayout_ = sel_registerName("lineFragmentUsedRectForGlyphAtIndex:effectiveRange:withoutAdditionalLayout:");
+public static final long /*int*/ sel_lineToPoint_ = sel_registerName("lineToPoint:");
+public static final long /*int*/ sel_linkTextAttributes = sel_registerName("linkTextAttributes");
+public static final long /*int*/ sel_loadHTMLString_baseURL_ = sel_registerName("loadHTMLString:baseURL:");
+public static final long /*int*/ sel_loadNibFile_externalNameTable_withZone_ = sel_registerName("loadNibFile:externalNameTable:withZone:");
+public static final long /*int*/ sel_loadRequest_ = sel_registerName("loadRequest:");
+public static final long /*int*/ sel_localizedDescription = sel_registerName("localizedDescription");
+public static final long /*int*/ sel_location = sel_registerName("location");
+public static final long /*int*/ sel_locationForGlyphAtIndex_ = sel_registerName("locationForGlyphAtIndex:");
+public static final long /*int*/ sel_locationInWindow = sel_registerName("locationInWindow");
+public static final long /*int*/ sel_lockFocus = sel_registerName("lockFocus");
+public static final long /*int*/ sel_lowercaseString = sel_registerName("lowercaseString");
+public static final long /*int*/ sel_magnification = sel_registerName("magnification");
+public static final long /*int*/ sel_magnifyWithEvent_ = sel_registerName("magnifyWithEvent:");
+public static final long /*int*/ sel_mainBundle = sel_registerName("mainBundle");
+public static final long /*int*/ sel_mainFrame = sel_registerName("mainFrame");
+public static final long /*int*/ sel_mainMenu = sel_registerName("mainMenu");
+public static final long /*int*/ sel_mainRunLoop = sel_registerName("mainRunLoop");
+public static final long /*int*/ sel_mainScreen = sel_registerName("mainScreen");
+public static final long /*int*/ sel_mainWindow = sel_registerName("mainWindow");
+public static final long /*int*/ sel_makeCurrentContext = sel_registerName("makeCurrentContext");
+public static final long /*int*/ sel_makeFirstResponder_ = sel_registerName("makeFirstResponder:");
+public static final long /*int*/ sel_makeKeyAndOrderFront_ = sel_registerName("makeKeyAndOrderFront:");
+public static final long /*int*/ sel_markedRange = sel_registerName("markedRange");
+public static final long /*int*/ sel_markedTextAttributes = sel_registerName("markedTextAttributes");
+public static final long /*int*/ sel_maxValue = sel_registerName("maxValue");
+public static final long /*int*/ sel_maximum = sel_registerName("maximum");
+public static final long /*int*/ sel_maximumFractionDigits = sel_registerName("maximumFractionDigits");
+public static final long /*int*/ sel_maximumIntegerDigits = sel_registerName("maximumIntegerDigits");
+public static final long /*int*/ sel_menu = sel_registerName("menu");
+public static final long /*int*/ sel_menu_willHighlightItem_ = sel_registerName("menu:willHighlightItem:");
+public static final long /*int*/ sel_menuBarFontOfSize_ = sel_registerName("menuBarFontOfSize:");
+public static final long /*int*/ sel_menuDidClose_ = sel_registerName("menuDidClose:");
+public static final long /*int*/ sel_menuFontOfSize_ = sel_registerName("menuFontOfSize:");
+public static final long /*int*/ sel_menuForEvent_ = sel_registerName("menuForEvent:");
+public static final long /*int*/ sel_menuNeedsUpdate_ = sel_registerName("menuNeedsUpdate:");
+public static final long /*int*/ sel_menuWillOpen_ = sel_registerName("menuWillOpen:");
+public static final long /*int*/ sel_metaKey = sel_registerName("metaKey");
+public static final long /*int*/ sel_minFrameWidthWithTitle_styleMask_ = sel_registerName("minFrameWidthWithTitle:styleMask:");
+public static final long /*int*/ sel_minSize = sel_registerName("minSize");
+public static final long /*int*/ sel_minValue = sel_registerName("minValue");
+public static final long /*int*/ sel_miniaturize_ = sel_registerName("miniaturize:");
+public static final long /*int*/ sel_minimum = sel_registerName("minimum");
+public static final long /*int*/ sel_minimumSize = sel_registerName("minimumSize");
+public static final long /*int*/ sel_minuteOfHour = sel_registerName("minuteOfHour");
+public static final long /*int*/ sel_modifierFlags = sel_registerName("modifierFlags");
+public static final long /*int*/ sel_monthOfYear = sel_registerName("monthOfYear");
+public static final long /*int*/ sel_mouse_inRect_ = sel_registerName("mouse:inRect:");
+public static final long /*int*/ sel_mouseDown_ = sel_registerName("mouseDown:");
+public static final long /*int*/ sel_mouseDownCanMoveWindow = sel_registerName("mouseDownCanMoveWindow");
+public static final long /*int*/ sel_mouseDragged_ = sel_registerName("mouseDragged:");
+public static final long /*int*/ sel_mouseEntered_ = sel_registerName("mouseEntered:");
+public static final long /*int*/ sel_mouseExited_ = sel_registerName("mouseExited:");
+public static final long /*int*/ sel_mouseLocation = sel_registerName("mouseLocation");
+public static final long /*int*/ sel_mouseLocationOutsideOfEventStream = sel_registerName("mouseLocationOutsideOfEventStream");
+public static final long /*int*/ sel_mouseMoved_ = sel_registerName("mouseMoved:");
+public static final long /*int*/ sel_mouseUp_ = sel_registerName("mouseUp:");
+public static final long /*int*/ sel_moveColumn_toColumn_ = sel_registerName("moveColumn:toColumn:");
+public static final long /*int*/ sel_moveToBeginningOfParagraph_ = sel_registerName("moveToBeginningOfParagraph:");
+public static final long /*int*/ sel_moveToEndOfParagraph_ = sel_registerName("moveToEndOfParagraph:");
+public static final long /*int*/ sel_moveToPoint_ = sel_registerName("moveToPoint:");
+public static final long /*int*/ sel_moveUp_ = sel_registerName("moveUp:");
+public static final long /*int*/ sel_mutableCopy = sel_registerName("mutableCopy");
+public static final long /*int*/ sel_mutableString = sel_registerName("mutableString");
+public static final long /*int*/ sel_name = sel_registerName("name");
+public static final long /*int*/ sel_needsPanelToBecomeKey = sel_registerName("needsPanelToBecomeKey");
+public static final long /*int*/ sel_nextEventMatchingMask_untilDate_inMode_dequeue_ = sel_registerName("nextEventMatchingMask:untilDate:inMode:dequeue:");
+public static final long /*int*/ sel_nextObject = sel_registerName("nextObject");
+public static final long /*int*/ sel_nextState = sel_registerName("nextState");
+public static final long /*int*/ sel_nextWordFromIndex_forward_ = sel_registerName("nextWordFromIndex:forward:");
+public static final long /*int*/ sel_noResponderFor_ = sel_registerName("noResponderFor:");
+public static final long /*int*/ sel_normalizedPosition = sel_registerName("normalizedPosition");
+public static final long /*int*/ sel_noteNumberOfRowsChanged = sel_registerName("noteNumberOfRowsChanged");
+public static final long /*int*/ sel_numberOfColumns = sel_registerName("numberOfColumns");
+public static final long /*int*/ sel_numberOfComponents = sel_registerName("numberOfComponents");
+public static final long /*int*/ sel_numberOfGlyphs = sel_registerName("numberOfGlyphs");
+public static final long /*int*/ sel_numberOfItems = sel_registerName("numberOfItems");
+public static final long /*int*/ sel_numberOfPlanes = sel_registerName("numberOfPlanes");
+public static final long /*int*/ sel_numberOfRows = sel_registerName("numberOfRows");
+public static final long /*int*/ sel_numberOfRowsInTableView_ = sel_registerName("numberOfRowsInTableView:");
+public static final long /*int*/ sel_numberOfSelectedRows = sel_registerName("numberOfSelectedRows");
+public static final long /*int*/ sel_numberOfVisibleItems = sel_registerName("numberOfVisibleItems");
+public static final long /*int*/ sel_numberWithBool_ = sel_registerName("numberWithBool:");
+public static final long /*int*/ sel_numberWithDouble_ = sel_registerName("numberWithDouble:");
+public static final long /*int*/ sel_numberWithInt_ = sel_registerName("numberWithInt:");
+public static final long /*int*/ sel_numberWithInteger_ = sel_registerName("numberWithInteger:");
+public static final long /*int*/ sel_objCType = sel_registerName("objCType");
+public static final long /*int*/ sel_object = sel_registerName("object");
+public static final long /*int*/ sel_objectAtIndex_ = sel_registerName("objectAtIndex:");
+public static final long /*int*/ sel_objectEnumerator = sel_registerName("objectEnumerator");
+public static final long /*int*/ sel_objectForInfoDictionaryKey_ = sel_registerName("objectForInfoDictionaryKey:");
+public static final long /*int*/ sel_objectForKey_ = sel_registerName("objectForKey:");
+public static final long /*int*/ sel_objectValues = sel_registerName("objectValues");
+public static final long /*int*/ sel_openFile_withApplication_ = sel_registerName("openFile:withApplication:");
+public static final long /*int*/ sel_openPanel = sel_registerName("openPanel");
+public static final long /*int*/ sel_openURL_ = sel_registerName("openURL:");
+public static final long /*int*/ sel_openURLs_withAppBundleIdentifier_options_additionalEventParamDescriptor_launchIdentifiers_ = sel_registerName("openURLs:withAppBundleIdentifier:options:additionalEventParamDescriptor:launchIdentifiers:");
+public static final long /*int*/ sel_options = sel_registerName("options");
+public static final long /*int*/ sel_orderBack_ = sel_registerName("orderBack:");
+public static final long /*int*/ sel_orderFront_ = sel_registerName("orderFront:");
+public static final long /*int*/ sel_orderFrontRegardless = sel_registerName("orderFrontRegardless");
+public static final long /*int*/ sel_orderFrontStandardAboutPanel_ = sel_registerName("orderFrontStandardAboutPanel:");
+public static final long /*int*/ sel_orderOut_ = sel_registerName("orderOut:");
+public static final long /*int*/ sel_orderWindow_relativeTo_ = sel_registerName("orderWindow:relativeTo:");
+public static final long /*int*/ sel_orderedWindows = sel_registerName("orderedWindows");
+public static final long /*int*/ sel_otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2_ = sel_registerName("otherEventWithType:location:modifierFlags:timestamp:windowNumber:context:subtype:data1:data2:");
+public static final long /*int*/ sel_otherMouseDown_ = sel_registerName("otherMouseDown:");
+public static final long /*int*/ sel_otherMouseDragged_ = sel_registerName("otherMouseDragged:");
+public static final long /*int*/ sel_otherMouseUp_ = sel_registerName("otherMouseUp:");
+public static final long /*int*/ sel_outlineTableColumn = sel_registerName("outlineTableColumn");
+public static final long /*int*/ sel_outlineView_acceptDrop_item_childIndex_ = sel_registerName("outlineView:acceptDrop:item:childIndex:");
+public static final long /*int*/ sel_outlineView_child_ofItem_ = sel_registerName("outlineView:child:ofItem:");
+public static final long /*int*/ sel_outlineView_didClickTableColumn_ = sel_registerName("outlineView:didClickTableColumn:");
+public static final long /*int*/ sel_outlineView_isItemExpandable_ = sel_registerName("outlineView:isItemExpandable:");
+public static final long /*int*/ sel_outlineView_numberOfChildrenOfItem_ = sel_registerName("outlineView:numberOfChildrenOfItem:");
+public static final long /*int*/ sel_outlineView_objectValueForTableColumn_byItem_ = sel_registerName("outlineView:objectValueForTableColumn:byItem:");
+public static final long /*int*/ sel_outlineView_setObjectValue_forTableColumn_byItem_ = sel_registerName("outlineView:setObjectValue:forTableColumn:byItem:");
+public static final long /*int*/ sel_outlineView_shouldCollapseItem_ = sel_registerName("outlineView:shouldCollapseItem:");
+public static final long /*int*/ sel_outlineView_shouldEditTableColumn_item_ = sel_registerName("outlineView:shouldEditTableColumn:item:");
+public static final long /*int*/ sel_outlineView_shouldExpandItem_ = sel_registerName("outlineView:shouldExpandItem:");
+public static final long /*int*/ sel_outlineView_shouldReorderColumn_toColumn_ = sel_registerName("outlineView:shouldReorderColumn:toColumn:");
+public static final long /*int*/ sel_outlineView_shouldSelectItem_ = sel_registerName("outlineView:shouldSelectItem:");
+public static final long /*int*/ sel_outlineView_shouldTrackCell_forTableColumn_item_ = sel_registerName("outlineView:shouldTrackCell:forTableColumn:item:");
+public static final long /*int*/ sel_outlineView_validateDrop_proposedItem_proposedChildIndex_ = sel_registerName("outlineView:validateDrop:proposedItem:proposedChildIndex:");
+public static final long /*int*/ sel_outlineView_willDisplayCell_forTableColumn_item_ = sel_registerName("outlineView:willDisplayCell:forTableColumn:item:");
+public static final long /*int*/ sel_outlineView_writeItems_toPasteboard_ = sel_registerName("outlineView:writeItems:toPasteboard:");
+public static final long /*int*/ sel_outlineViewColumnDidMove_ = sel_registerName("outlineViewColumnDidMove:");
+public static final long /*int*/ sel_outlineViewColumnDidResize_ = sel_registerName("outlineViewColumnDidResize:");
+public static final long /*int*/ sel_outlineViewItemDidExpand_ = sel_registerName("outlineViewItemDidExpand:");
+public static final long /*int*/ sel_outlineViewSelectionDidChange_ = sel_registerName("outlineViewSelectionDidChange:");
+public static final long /*int*/ sel_outlineViewSelectionIsChanging_ = sel_registerName("outlineViewSelectionIsChanging:");
+public static final long /*int*/ sel_owner = sel_registerName("owner");
+public static final long /*int*/ sel_pageDown_ = sel_registerName("pageDown:");
+public static final long /*int*/ sel_pageTitle = sel_registerName("pageTitle");
+public static final long /*int*/ sel_pageUp_ = sel_registerName("pageUp:");
+public static final long /*int*/ sel_panel_shouldShowFilename_ = sel_registerName("panel:shouldShowFilename:");
+public static final long /*int*/ sel_panelConvertFont_ = sel_registerName("panelConvertFont:");
+public static final long /*int*/ sel_paperSize = sel_registerName("paperSize");
+public static final long /*int*/ sel_paragraphs = sel_registerName("paragraphs");
+public static final long /*int*/ sel_parentWindow = sel_registerName("parentWindow");
+public static final long /*int*/ sel_password = sel_registerName("password");
+public static final long /*int*/ sel_paste_ = sel_registerName("paste:");
+public static final long /*int*/ sel_pasteboard_provideDataForType_ = sel_registerName("pasteboard:provideDataForType:");
+public static final long /*int*/ sel_pasteboardWithName_ = sel_registerName("pasteboardWithName:");
+public static final long /*int*/ sel_path = sel_registerName("path");
+public static final long /*int*/ sel_pathExtension = sel_registerName("pathExtension");
+public static final long /*int*/ sel_pathForResource_ofType_ = sel_registerName("pathForResource:ofType:");
+public static final long /*int*/ sel_pathForResource_ofType_inDirectory_forLocalization_ = sel_registerName("pathForResource:ofType:inDirectory:forLocalization:");
+public static final long /*int*/ sel_performDragOperation_ = sel_registerName("performDragOperation:");
+public static final long /*int*/ sel_performKeyEquivalent_ = sel_registerName("performKeyEquivalent:");
+public static final long /*int*/ sel_performSelector_withObject_afterDelay_inModes_ = sel_registerName("performSelector:withObject:afterDelay:inModes:");
+public static final long /*int*/ sel_performSelectorOnMainThread_withObject_waitUntilDone_ = sel_registerName("performSelectorOnMainThread:withObject:waitUntilDone:");
+public static final long /*int*/ sel_phase = sel_registerName("phase");
+public static final long /*int*/ sel_pixelsHigh = sel_registerName("pixelsHigh");
+public static final long /*int*/ sel_pixelsWide = sel_registerName("pixelsWide");
+public static final long /*int*/ sel_pointSize = sel_registerName("pointSize");
+public static final long /*int*/ sel_pointValue = sel_registerName("pointValue");
+public static final long /*int*/ sel_pointingHandCursor = sel_registerName("pointingHandCursor");
+public static final long /*int*/ sel_pop = sel_registerName("pop");
+public static final long /*int*/ sel_popUpContextMenu_withEvent_forView_ = sel_registerName("popUpContextMenu:withEvent:forView:");
+public static final long /*int*/ sel_popUpStatusItemMenu_ = sel_registerName("popUpStatusItemMenu:");
+public static final long /*int*/ sel_port = sel_registerName("port");
+public static final long /*int*/ sel_postEvent_atStart_ = sel_registerName("postEvent:atStart:");
+public static final long /*int*/ sel_preparedCellAtColumn_row_ = sel_registerName("preparedCellAtColumn:row:");
+public static final long /*int*/ sel_prependTransform_ = sel_registerName("prependTransform:");
+public static final long /*int*/ sel_preventDefault = sel_registerName("preventDefault");
+public static final long /*int*/ sel_previousFailureCount = sel_registerName("previousFailureCount");
+public static final long /*int*/ sel_printDocumentView = sel_registerName("printDocumentView");
+public static final long /*int*/ sel_printOperationWithPrintInfo_ = sel_registerName("printOperationWithPrintInfo:");
+public static final long /*int*/ sel_printOperationWithView_printInfo_ = sel_registerName("printOperationWithView:printInfo:");
+public static final long /*int*/ sel_printPanel = sel_registerName("printPanel");
+public static final long /*int*/ sel_printSettings = sel_registerName("printSettings");
+public static final long /*int*/ sel_printer = sel_registerName("printer");
+public static final long /*int*/ sel_printerNames = sel_registerName("printerNames");
+public static final long /*int*/ sel_printerWithName_ = sel_registerName("printerWithName:");
+public static final long /*int*/ sel_propertyListForType_ = sel_registerName("propertyListForType:");
+public static final long /*int*/ sel_proposedCredential = sel_registerName("proposedCredential");
+public static final long /*int*/ sel_protectionSpace = sel_registerName("protectionSpace");
+public static final long /*int*/ sel_push = sel_registerName("push");
+public static final long /*int*/ sel_rangeValue = sel_registerName("rangeValue");
+public static final long /*int*/ sel_readSelectionFromPasteboard_ = sel_registerName("readSelectionFromPasteboard:");
+public static final long /*int*/ sel_realm = sel_registerName("realm");
+public static final long /*int*/ sel_recentSearches = sel_registerName("recentSearches");
+public static final long /*int*/ sel_rectArrayForCharacterRange_withinSelectedCharacterRange_inTextContainer_rectCount_ = sel_registerName("rectArrayForCharacterRange:withinSelectedCharacterRange:inTextContainer:rectCount:");
+public static final long /*int*/ sel_rectArrayForGlyphRange_withinSelectedGlyphRange_inTextContainer_rectCount_ = sel_registerName("rectArrayForGlyphRange:withinSelectedGlyphRange:inTextContainer:rectCount:");
+public static final long /*int*/ sel_rectForPart_ = sel_registerName("rectForPart:");
+public static final long /*int*/ sel_rectOfColumn_ = sel_registerName("rectOfColumn:");
+public static final long /*int*/ sel_rectOfRow_ = sel_registerName("rectOfRow:");
+public static final long /*int*/ sel_rectValue = sel_registerName("rectValue");
+public static final long /*int*/ sel_redComponent = sel_registerName("redComponent");
+public static final long /*int*/ sel_redo = sel_registerName("redo");
+public static final long /*int*/ sel_reflectScrolledClipView_ = sel_registerName("reflectScrolledClipView:");
+public static final long /*int*/ sel_registerForDraggedTypes_ = sel_registerName("registerForDraggedTypes:");
+public static final long /*int*/ sel_release = sel_registerName("release");
+public static final long /*int*/ sel_reload_ = sel_registerName("reload:");
+public static final long /*int*/ sel_reloadData = sel_registerName("reloadData");
+public static final long /*int*/ sel_reloadItem_reloadChildren_ = sel_registerName("reloadItem:reloadChildren:");
+public static final long /*int*/ sel_removeAllItems = sel_registerName("removeAllItems");
+public static final long /*int*/ sel_removeAllPoints = sel_registerName("removeAllPoints");
+public static final long /*int*/ sel_removeAttribute_range_ = sel_registerName("removeAttribute:range:");
+public static final long /*int*/ sel_removeChildWindow_ = sel_registerName("removeChildWindow:");
+public static final long /*int*/ sel_removeColorWithKey_ = sel_registerName("removeColorWithKey:");
+public static final long /*int*/ sel_removeFromSuperview = sel_registerName("removeFromSuperview");
+public static final long /*int*/ sel_removeIndex_ = sel_registerName("removeIndex:");
+public static final long /*int*/ sel_removeItem_ = sel_registerName("removeItem:");
+public static final long /*int*/ sel_removeItemAtIndex_ = sel_registerName("removeItemAtIndex:");
+public static final long /*int*/ sel_removeItemAtPath_error_ = sel_registerName("removeItemAtPath:error:");
+public static final long /*int*/ sel_removeLastObject = sel_registerName("removeLastObject");
+public static final long /*int*/ sel_removeObject_ = sel_registerName("removeObject:");
+public static final long /*int*/ sel_removeObjectAtIndex_ = sel_registerName("removeObjectAtIndex:");
+public static final long /*int*/ sel_removeObjectForKey_ = sel_registerName("removeObjectForKey:");
+public static final long /*int*/ sel_removeObjectIdenticalTo_ = sel_registerName("removeObjectIdenticalTo:");
+public static final long /*int*/ sel_removeObserver_ = sel_registerName("removeObserver:");
+public static final long /*int*/ sel_removeObserver_name_object_ = sel_registerName("removeObserver:name:object:");
+public static final long /*int*/ sel_removeRepresentation_ = sel_registerName("removeRepresentation:");
+public static final long /*int*/ sel_removeStatusItem_ = sel_registerName("removeStatusItem:");
+public static final long /*int*/ sel_removeTabViewItem_ = sel_registerName("removeTabViewItem:");
+public static final long /*int*/ sel_removeTableColumn_ = sel_registerName("removeTableColumn:");
+public static final long /*int*/ sel_removeTemporaryAttribute_forCharacterRange_ = sel_registerName("removeTemporaryAttribute:forCharacterRange:");
+public static final long /*int*/ sel_removeToolTip_ = sel_registerName("removeToolTip:");
+public static final long /*int*/ sel_removeTrackingArea_ = sel_registerName("removeTrackingArea:");
+public static final long /*int*/ sel_replaceCharactersInRange_withString_ = sel_registerName("replaceCharactersInRange:withString:");
+public static final long /*int*/ sel_replyToOpenOrPrint_ = sel_registerName("replyToOpenOrPrint:");
+public static final long /*int*/ sel_representation = sel_registerName("representation");
+public static final long /*int*/ sel_representations = sel_registerName("representations");
+public static final long /*int*/ sel_request = sel_registerName("request");
+public static final long /*int*/ sel_requestWithURL_ = sel_registerName("requestWithURL:");
+public static final long /*int*/ sel_resetCursorRects = sel_registerName("resetCursorRects");
+public static final long /*int*/ sel_resignFirstResponder = sel_registerName("resignFirstResponder");
+public static final long /*int*/ sel_resizeDownCursor = sel_registerName("resizeDownCursor");
+public static final long /*int*/ sel_resizeLeftCursor = sel_registerName("resizeLeftCursor");
+public static final long /*int*/ sel_resizeLeftRightCursor = sel_registerName("resizeLeftRightCursor");
+public static final long /*int*/ sel_resizeRightCursor = sel_registerName("resizeRightCursor");
+public static final long /*int*/ sel_resizeUpCursor = sel_registerName("resizeUpCursor");
+public static final long /*int*/ sel_resizeUpDownCursor = sel_registerName("resizeUpDownCursor");
+public static final long /*int*/ sel_resizingMask = sel_registerName("resizingMask");
+public static final long /*int*/ sel_resourcePath = sel_registerName("resourcePath");
+public static final long /*int*/ sel_respondsToSelector_ = sel_registerName("respondsToSelector:");
+public static final long /*int*/ sel_restoreGraphicsState = sel_registerName("restoreGraphicsState");
+public static final long /*int*/ sel_retain = sel_registerName("retain");
+public static final long /*int*/ sel_retainCount = sel_registerName("retainCount");
+public static final long /*int*/ sel_rightMouseDown_ = sel_registerName("rightMouseDown:");
+public static final long /*int*/ sel_rightMouseDragged_ = sel_registerName("rightMouseDragged:");
+public static final long /*int*/ sel_rightMouseUp_ = sel_registerName("rightMouseUp:");
+public static final long /*int*/ sel_rotateByDegrees_ = sel_registerName("rotateByDegrees:");
+public static final long /*int*/ sel_rotateWithEvent_ = sel_registerName("rotateWithEvent:");
+public static final long /*int*/ sel_rotation = sel_registerName("rotation");
+public static final long /*int*/ sel_rowAtPoint_ = sel_registerName("rowAtPoint:");
+public static final long /*int*/ sel_rowForItem_ = sel_registerName("rowForItem:");
+public static final long /*int*/ sel_rowHeight = sel_registerName("rowHeight");
+public static final long /*int*/ sel_rowsInRect_ = sel_registerName("rowsInRect:");
+public static final long /*int*/ sel_run = sel_registerName("run");
+public static final long /*int*/ sel_runModal = sel_registerName("runModal");
+public static final long /*int*/ sel_runModalForDirectory_file_ = sel_registerName("runModalForDirectory:file:");
+public static final long /*int*/ sel_runModalForWindow_ = sel_registerName("runModalForWindow:");
+public static final long /*int*/ sel_runModalWithPrintInfo_ = sel_registerName("runModalWithPrintInfo:");
+public static final long /*int*/ sel_runMode_beforeDate_ = sel_registerName("runMode:beforeDate:");
+public static final long /*int*/ sel_runOperation = sel_registerName("runOperation");
+public static final long /*int*/ sel_samplesPerPixel = sel_registerName("samplesPerPixel");
+public static final long /*int*/ sel_saveGraphicsState = sel_registerName("saveGraphicsState");
+public static final long /*int*/ sel_savePanel = sel_registerName("savePanel");
+public static final long /*int*/ sel_scaleXBy_yBy_ = sel_registerName("scaleXBy:yBy:");
+public static final long /*int*/ sel_scheduledTimerWithTimeInterval_target_selector_userInfo_repeats_ = sel_registerName("scheduledTimerWithTimeInterval:target:selector:userInfo:repeats:");
+public static final long /*int*/ sel_screen = sel_registerName("screen");
+public static final long /*int*/ sel_screenX = sel_registerName("screenX");
+public static final long /*int*/ sel_screenY = sel_registerName("screenY");
+public static final long /*int*/ sel_screens = sel_registerName("screens");
+public static final long /*int*/ sel_scrollClipView_toPoint_ = sel_registerName("scrollClipView:toPoint:");
+public static final long /*int*/ sel_scrollColumnToVisible_ = sel_registerName("scrollColumnToVisible:");
+public static final long /*int*/ sel_scrollPoint_ = sel_registerName("scrollPoint:");
+public static final long /*int*/ sel_scrollRangeToVisible_ = sel_registerName("scrollRangeToVisible:");
+public static final long /*int*/ sel_scrollRectToVisible_ = sel_registerName("scrollRectToVisible:");
+public static final long /*int*/ sel_scrollRowToVisible_ = sel_registerName("scrollRowToVisible:");
+public static final long /*int*/ sel_scrollToPoint_ = sel_registerName("scrollToPoint:");
+public static final long /*int*/ sel_scrollWheel_ = sel_registerName("scrollWheel:");
+public static final long /*int*/ sel_scrollerWidth = sel_registerName("scrollerWidth");
+public static final long /*int*/ sel_scrollerWidthForControlSize_ = sel_registerName("scrollerWidthForControlSize:");
+public static final long /*int*/ sel_searchButtonCell = sel_registerName("searchButtonCell");
+public static final long /*int*/ sel_searchTextRectForBounds_ = sel_registerName("searchTextRectForBounds:");
+public static final long /*int*/ sel_secondOfMinute = sel_registerName("secondOfMinute");
+public static final long /*int*/ sel_secondarySelectedControlColor = sel_registerName("secondarySelectedControlColor");
+public static final long /*int*/ sel_selectAll_ = sel_registerName("selectAll:");
+public static final long /*int*/ sel_selectItem_ = sel_registerName("selectItem:");
+public static final long /*int*/ sel_selectItemAtIndex_ = sel_registerName("selectItemAtIndex:");
+public static final long /*int*/ sel_selectRowIndexes_byExtendingSelection_ = sel_registerName("selectRowIndexes:byExtendingSelection:");
+public static final long /*int*/ sel_selectTabViewItemAtIndex_ = sel_registerName("selectTabViewItemAtIndex:");
+public static final long /*int*/ sel_selectText_ = sel_registerName("selectText:");
+public static final long /*int*/ sel_selectedControlColor = sel_registerName("selectedControlColor");
+public static final long /*int*/ sel_selectedControlTextColor = sel_registerName("selectedControlTextColor");
+public static final long /*int*/ sel_selectedRange = sel_registerName("selectedRange");
+public static final long /*int*/ sel_selectedRow = sel_registerName("selectedRow");
+public static final long /*int*/ sel_selectedRowIndexes = sel_registerName("selectedRowIndexes");
+public static final long /*int*/ sel_selectedTabViewItem = sel_registerName("selectedTabViewItem");
+public static final long /*int*/ sel_selectedTextAttributes = sel_registerName("selectedTextAttributes");
+public static final long /*int*/ sel_selectedTextBackgroundColor = sel_registerName("selectedTextBackgroundColor");
+public static final long /*int*/ sel_selectedTextColor = sel_registerName("selectedTextColor");
+public static final long /*int*/ sel_sendAction_to_ = sel_registerName("sendAction:to:");
+public static final long /*int*/ sel_sendAction_to_from_ = sel_registerName("sendAction:to:from:");
+public static final long /*int*/ sel_sendEvent_ = sel_registerName("sendEvent:");
+public static final long /*int*/ sel_sender = sel_registerName("sender");
+public static final long /*int*/ sel_separatorItem = sel_registerName("separatorItem");
+public static final long /*int*/ sel_set = sel_registerName("set");
+public static final long /*int*/ sel_setAcceptsMouseMovedEvents_ = sel_registerName("setAcceptsMouseMovedEvents:");
+public static final long /*int*/ sel_setAcceptsTouchEvents_ = sel_registerName("setAcceptsTouchEvents:");
+public static final long /*int*/ sel_setAccessoryView_ = sel_registerName("setAccessoryView:");
+public static final long /*int*/ sel_setAction_ = sel_registerName("setAction:");
+public static final long /*int*/ sel_setAlertStyle_ = sel_registerName("setAlertStyle:");
+public static final long /*int*/ sel_setAlignment_ = sel_registerName("setAlignment:");
+public static final long /*int*/ sel_setAllowsColumnReordering_ = sel_registerName("setAllowsColumnReordering:");
+public static final long /*int*/ sel_setAllowsFloats_ = sel_registerName("setAllowsFloats:");
+public static final long /*int*/ sel_setAllowsMixedState_ = sel_registerName("setAllowsMixedState:");
+public static final long /*int*/ sel_setAllowsMultipleSelection_ = sel_registerName("setAllowsMultipleSelection:");
+public static final long /*int*/ sel_setAllowsUndo_ = sel_registerName("setAllowsUndo:");
+public static final long /*int*/ sel_setAllowsUserCustomization_ = sel_registerName("setAllowsUserCustomization:");
+public static final long /*int*/ sel_setAlpha_ = sel_registerName("setAlpha:");
+public static final long /*int*/ sel_setAlphaValue_ = sel_registerName("setAlphaValue:");
+public static final long /*int*/ sel_setAlternateButtonTitle_ = sel_registerName("setAlternateButtonTitle:");
+public static final long /*int*/ sel_setApplicationIconImage_ = sel_registerName("setApplicationIconImage:");
+public static final long /*int*/ sel_setApplicationNameForUserAgent_ = sel_registerName("setApplicationNameForUserAgent:");
+public static final long /*int*/ sel_setAttachmentCell_ = sel_registerName("setAttachmentCell:");
+public static final long /*int*/ sel_setAttributedString_ = sel_registerName("setAttributedString:");
+public static final long /*int*/ sel_setAttributedStringValue_ = sel_registerName("setAttributedStringValue:");
+public static final long /*int*/ sel_setAttributedTitle_ = sel_registerName("setAttributedTitle:");
+public static final long /*int*/ sel_setAutoenablesItems_ = sel_registerName("setAutoenablesItems:");
+public static final long /*int*/ sel_setAutohidesScrollers_ = sel_registerName("setAutohidesScrollers:");
+public static final long /*int*/ sel_setAutoresizesOutlineColumn_ = sel_registerName("setAutoresizesOutlineColumn:");
+public static final long /*int*/ sel_setAutoresizesSubviews_ = sel_registerName("setAutoresizesSubviews:");
+public static final long /*int*/ sel_setAutoresizingMask_ = sel_registerName("setAutoresizingMask:");
+public static final long /*int*/ sel_setAutosaveExpandedItems_ = sel_registerName("setAutosaveExpandedItems:");
+public static final long /*int*/ sel_setBackgroundColor_ = sel_registerName("setBackgroundColor:");
+public static final long /*int*/ sel_setBackgroundLayoutEnabled_ = sel_registerName("setBackgroundLayoutEnabled:");
+public static final long /*int*/ sel_setBackgroundStyle_ = sel_registerName("setBackgroundStyle:");
+public static final long /*int*/ sel_setBadgeLabel_ = sel_registerName("setBadgeLabel:");
+public static final long /*int*/ sel_setBaseWritingDirection_ = sel_registerName("setBaseWritingDirection:");
+public static final long /*int*/ sel_setBaseWritingDirection_range_ = sel_registerName("setBaseWritingDirection:range:");
+public static final long /*int*/ sel_setBecomesKeyOnlyIfNeeded_ = sel_registerName("setBecomesKeyOnlyIfNeeded:");
+public static final long /*int*/ sel_setBezelStyle_ = sel_registerName("setBezelStyle:");
+public static final long /*int*/ sel_setBezeled_ = sel_registerName("setBezeled:");
+public static final long /*int*/ sel_setBorderType_ = sel_registerName("setBorderType:");
+public static final long /*int*/ sel_setBorderWidth_ = sel_registerName("setBorderWidth:");
+public static final long /*int*/ sel_setBordered_ = sel_registerName("setBordered:");
+public static final long /*int*/ sel_setBoundsRotation_ = sel_registerName("setBoundsRotation:");
+public static final long /*int*/ sel_setBoxType_ = sel_registerName("setBoxType:");
+public static final long /*int*/ sel_setButtonType_ = sel_registerName("setButtonType:");
+public static final long /*int*/ sel_setCacheMode_ = sel_registerName("setCacheMode:");
+public static final long /*int*/ sel_setCachePolicy_ = sel_registerName("setCachePolicy:");
+public static final long /*int*/ sel_setCanChooseDirectories_ = sel_registerName("setCanChooseDirectories:");
+public static final long /*int*/ sel_setCanChooseFiles_ = sel_registerName("setCanChooseFiles:");
+public static final long /*int*/ sel_setCanCreateDirectories_ = sel_registerName("setCanCreateDirectories:");
+public static final long /*int*/ sel_setCancelButtonCell_ = sel_registerName("setCancelButtonCell:");
+public static final long /*int*/ sel_setCell_ = sel_registerName("setCell:");
+public static final long /*int*/ sel_setCellClass_ = sel_registerName("setCellClass:");
+public static final long /*int*/ sel_setClip = sel_registerName("setClip");
+public static final long /*int*/ sel_setCollectionBehavior_ = sel_registerName("setCollectionBehavior:");
+public static final long /*int*/ sel_setColor_ = sel_registerName("setColor:");
+public static final long /*int*/ sel_setColumnAutoresizingStyle_ = sel_registerName("setColumnAutoresizingStyle:");
+public static final long /*int*/ sel_setCompositingOperation_ = sel_registerName("setCompositingOperation:");
+public static final long /*int*/ sel_setContainerSize_ = sel_registerName("setContainerSize:");
+public static final long /*int*/ sel_setContentView_ = sel_registerName("setContentView:");
+public static final long /*int*/ sel_setContentViewMargins_ = sel_registerName("setContentViewMargins:");
+public static final long /*int*/ sel_setControlSize_ = sel_registerName("setControlSize:");
+public static final long /*int*/ sel_setCookie_ = sel_registerName("setCookie:");
+public static final long /*int*/ sel_setCopiesOnScroll_ = sel_registerName("setCopiesOnScroll:");
+public static final long /*int*/ sel_setCurrentContext_ = sel_registerName("setCurrentContext:");
+public static final long /*int*/ sel_setCurrentOperation_ = sel_registerName("setCurrentOperation:");
+public static final long /*int*/ sel_setCustomUserAgent_ = sel_registerName("setCustomUserAgent:");
+public static final long /*int*/ sel_setData_forType_ = sel_registerName("setData:forType:");
+public static final long /*int*/ sel_setDataCell_ = sel_registerName("setDataCell:");
+public static final long /*int*/ sel_setDataSource_ = sel_registerName("setDataSource:");
+public static final long /*int*/ sel_setDatePickerElements_ = sel_registerName("setDatePickerElements:");
+public static final long /*int*/ sel_setDatePickerStyle_ = sel_registerName("setDatePickerStyle:");
+public static final long /*int*/ sel_setDateValue_ = sel_registerName("setDateValue:");
+public static final long /*int*/ sel_setDefaultButtonCell_ = sel_registerName("setDefaultButtonCell:");
+public static final long /*int*/ sel_setDefaultFlatness_ = sel_registerName("setDefaultFlatness:");
+public static final long /*int*/ sel_setDefaultParagraphStyle_ = sel_registerName("setDefaultParagraphStyle:");
+public static final long /*int*/ sel_setDefaultTabInterval_ = sel_registerName("setDefaultTabInterval:");
+public static final long /*int*/ sel_setDelegate_ = sel_registerName("setDelegate:");
+public static final long /*int*/ sel_setDestination_allowOverwrite_ = sel_registerName("setDestination:allowOverwrite:");
+public static final long /*int*/ sel_setDictionary_ = sel_registerName("setDictionary:");
+public static final long /*int*/ sel_setDirectory_ = sel_registerName("setDirectory:");
+public static final long /*int*/ sel_setDisplayMode_ = sel_registerName("setDisplayMode:");
+public static final long /*int*/ sel_setDisplaysLinkToolTips_ = sel_registerName("setDisplaysLinkToolTips:");
+public static final long /*int*/ sel_setDocumentCursor_ = sel_registerName("setDocumentCursor:");
+public static final long /*int*/ sel_setDocumentEdited_ = sel_registerName("setDocumentEdited:");
+public static final long /*int*/ sel_setDocumentView_ = sel_registerName("setDocumentView:");
+public static final long /*int*/ sel_setDoubleAction_ = sel_registerName("setDoubleAction:");
+public static final long /*int*/ sel_setDoubleValue_ = sel_registerName("setDoubleValue:");
+public static final long /*int*/ sel_setDownloadDelegate_ = sel_registerName("setDownloadDelegate:");
+public static final long /*int*/ sel_setDrawsBackground_ = sel_registerName("setDrawsBackground:");
+public static final long /*int*/ sel_setDropItem_dropChildIndex_ = sel_registerName("setDropItem:dropChildIndex:");
+public static final long /*int*/ sel_setDropRow_dropOperation_ = sel_registerName("setDropRow:dropOperation:");
+public static final long /*int*/ sel_setEditable_ = sel_registerName("setEditable:");
+public static final long /*int*/ sel_setEnabled_ = sel_registerName("setEnabled:");
+public static final long /*int*/ sel_setEnabled_forSegment_ = sel_registerName("setEnabled:forSegment:");
+public static final long /*int*/ sel_setFill = sel_registerName("setFill");
+public static final long /*int*/ sel_setFillColor_ = sel_registerName("setFillColor:");
+public static final long /*int*/ sel_setFireDate_ = sel_registerName("setFireDate:");
+public static final long /*int*/ sel_setFirstLineHeadIndent_ = sel_registerName("setFirstLineHeadIndent:");
+public static final long /*int*/ sel_setFloatingPanel_ = sel_registerName("setFloatingPanel:");
+public static final long /*int*/ sel_setFocusRingType_ = sel_registerName("setFocusRingType:");
+public static final long /*int*/ sel_setFont_ = sel_registerName("setFont:");
+public static final long /*int*/ sel_setFormatter_ = sel_registerName("setFormatter:");
+public static final long /*int*/ sel_setFrame_ = sel_registerName("setFrame:");
+public static final long /*int*/ sel_setFrame_display_ = sel_registerName("setFrame:display:");
+public static final long /*int*/ sel_setFrame_display_animate_ = sel_registerName("setFrame:display:animate:");
+public static final long /*int*/ sel_setFrameFromContentFrame_ = sel_registerName("setFrameFromContentFrame:");
+public static final long /*int*/ sel_setFrameLoadDelegate_ = sel_registerName("setFrameLoadDelegate:");
+public static final long /*int*/ sel_setFrameOrigin_ = sel_registerName("setFrameOrigin:");
+public static final long /*int*/ sel_setFrameSize_ = sel_registerName("setFrameSize:");
+public static final long /*int*/ sel_setGridStyleMask_ = sel_registerName("setGridStyleMask:");
+public static final long /*int*/ sel_setHTTPBody_ = sel_registerName("setHTTPBody:");
+public static final long /*int*/ sel_setHTTPMethod_ = sel_registerName("setHTTPMethod:");
+public static final long /*int*/ sel_setHasHorizontalScroller_ = sel_registerName("setHasHorizontalScroller:");
+public static final long /*int*/ sel_setHasShadow_ = sel_registerName("setHasShadow:");
+public static final long /*int*/ sel_setHasVerticalScroller_ = sel_registerName("setHasVerticalScroller:");
+public static final long /*int*/ sel_setHeadIndent_ = sel_registerName("setHeadIndent:");
+public static final long /*int*/ sel_setHeaderCell_ = sel_registerName("setHeaderCell:");
+public static final long /*int*/ sel_setHeaderView_ = sel_registerName("setHeaderView:");
+public static final long /*int*/ sel_setHidden_ = sel_registerName("setHidden:");
+public static final long /*int*/ sel_setHiddenUntilMouseMoves_ = sel_registerName("setHiddenUntilMouseMoves:");
+public static final long /*int*/ sel_setHidesOnDeactivate_ = sel_registerName("setHidesOnDeactivate:");
+public static final long /*int*/ sel_setHighlightMode_ = sel_registerName("setHighlightMode:");
+public static final long /*int*/ sel_setHighlighted_ = sel_registerName("setHighlighted:");
+public static final long /*int*/ sel_setHighlightedTableColumn_ = sel_registerName("setHighlightedTableColumn:");
+public static final long /*int*/ sel_setHighlightsBy_ = sel_registerName("setHighlightsBy:");
+public static final long /*int*/ sel_setHorizontalScroller_ = sel_registerName("setHorizontalScroller:");
+public static final long /*int*/ sel_setHorizontallyResizable_ = sel_registerName("setHorizontallyResizable:");
+public static final long /*int*/ sel_setIcon_ = sel_registerName("setIcon:");
+public static final long /*int*/ sel_setIdentifier_ = sel_registerName("setIdentifier:");
+public static final long /*int*/ sel_setImage_ = sel_registerName("setImage:");
+public static final long /*int*/ sel_setImage_forSegment_ = sel_registerName("setImage:forSegment:");
+public static final long /*int*/ sel_setImageAlignment_ = sel_registerName("setImageAlignment:");
+public static final long /*int*/ sel_setImageInterpolation_ = sel_registerName("setImageInterpolation:");
+public static final long /*int*/ sel_setImagePosition_ = sel_registerName("setImagePosition:");
+public static final long /*int*/ sel_setImageScaling_ = sel_registerName("setImageScaling:");
+public static final long /*int*/ sel_setIncrement_ = sel_registerName("setIncrement:");
+public static final long /*int*/ sel_setIndeterminate_ = sel_registerName("setIndeterminate:");
+public static final long /*int*/ sel_setIndicatorImage_inTableColumn_ = sel_registerName("setIndicatorImage:inTableColumn:");
+public static final long /*int*/ sel_setIntercellSpacing_ = sel_registerName("setIntercellSpacing:");
+public static final long /*int*/ sel_setJavaEnabled_ = sel_registerName("setJavaEnabled:");
+public static final long /*int*/ sel_setJavaScriptEnabled_ = sel_registerName("setJavaScriptEnabled:");
+public static final long /*int*/ sel_setJobDisposition_ = sel_registerName("setJobDisposition:");
+public static final long /*int*/ sel_setJobTitle_ = sel_registerName("setJobTitle:");
+public static final long /*int*/ sel_setKeyEquivalent_ = sel_registerName("setKeyEquivalent:");
+public static final long /*int*/ sel_setKeyEquivalentModifierMask_ = sel_registerName("setKeyEquivalentModifierMask:");
+public static final long /*int*/ sel_setKnobProportion_ = sel_registerName("setKnobProportion:");
+public static final long /*int*/ sel_setLabel_ = sel_registerName("setLabel:");
+public static final long /*int*/ sel_setLabel_forSegment_ = sel_registerName("setLabel:forSegment:");
+public static final long /*int*/ sel_setLeaf_ = sel_registerName("setLeaf:");
+public static final long /*int*/ sel_setLength_ = sel_registerName("setLength:");
+public static final long /*int*/ sel_setLevel_ = sel_registerName("setLevel:");
+public static final long /*int*/ sel_setLineBreakMode_ = sel_registerName("setLineBreakMode:");
+public static final long /*int*/ sel_setLineCapStyle_ = sel_registerName("setLineCapStyle:");
+public static final long /*int*/ sel_setLineDash_count_phase_ = sel_registerName("setLineDash:count:phase:");
+public static final long /*int*/ sel_setLineFragmentPadding_ = sel_registerName("setLineFragmentPadding:");
+public static final long /*int*/ sel_setLineFragmentRect_forGlyphRange_usedRect_ = sel_registerName("setLineFragmentRect:forGlyphRange:usedRect:");
+public static final long /*int*/ sel_setLineJoinStyle_ = sel_registerName("setLineJoinStyle:");
+public static final long /*int*/ sel_setLineSpacing_ = sel_registerName("setLineSpacing:");
+public static final long /*int*/ sel_setLineWidth_ = sel_registerName("setLineWidth:");
+public static final long /*int*/ sel_setLinkTextAttributes_ = sel_registerName("setLinkTextAttributes:");
+public static final long /*int*/ sel_setMainMenu_ = sel_registerName("setMainMenu:");
+public static final long /*int*/ sel_setMarkedText_selectedRange_ = sel_registerName("setMarkedText:selectedRange:");
+public static final long /*int*/ sel_setMaxSize_ = sel_registerName("setMaxSize:");
+public static final long /*int*/ sel_setMaxValue_ = sel_registerName("setMaxValue:");
+public static final long /*int*/ sel_setMaximum_ = sel_registerName("setMaximum:");
+public static final long /*int*/ sel_setMaximumFractionDigits_ = sel_registerName("setMaximumFractionDigits:");
+public static final long /*int*/ sel_setMaximumIntegerDigits_ = sel_registerName("setMaximumIntegerDigits:");
+public static final long /*int*/ sel_setMenu_ = sel_registerName("setMenu:");
+public static final long /*int*/ sel_setMenu_forSegment_ = sel_registerName("setMenu:forSegment:");
+public static final long /*int*/ sel_setMenuFormRepresentation_ = sel_registerName("setMenuFormRepresentation:");
+public static final long /*int*/ sel_setMessage_ = sel_registerName("setMessage:");
+public static final long /*int*/ sel_setMessageText_ = sel_registerName("setMessageText:");
+public static final long /*int*/ sel_setMinSize_ = sel_registerName("setMinSize:");
+public static final long /*int*/ sel_setMinValue_ = sel_registerName("setMinValue:");
+public static final long /*int*/ sel_setMinWidth_ = sel_registerName("setMinWidth:");
+public static final long /*int*/ sel_setMinimum_ = sel_registerName("setMinimum:");
+public static final long /*int*/ sel_setMinimumFractionDigits_ = sel_registerName("setMinimumFractionDigits:");
+public static final long /*int*/ sel_setMinimumIntegerDigits_ = sel_registerName("setMinimumIntegerDigits:");
+public static final long /*int*/ sel_setMiterLimit_ = sel_registerName("setMiterLimit:");
+public static final long /*int*/ sel_setNeedsDisplay_ = sel_registerName("setNeedsDisplay:");
+public static final long /*int*/ sel_setNeedsDisplayInRect_ = sel_registerName("setNeedsDisplayInRect:");
+public static final long /*int*/ sel_setNumberOfVisibleItems_ = sel_registerName("setNumberOfVisibleItems:");
+public static final long /*int*/ sel_setNumberStyle_ = sel_registerName("setNumberStyle:");
+public static final long /*int*/ sel_setObject_forKey_ = sel_registerName("setObject:forKey:");
+public static final long /*int*/ sel_setObjectValue_ = sel_registerName("setObjectValue:");
+public static final long /*int*/ sel_setOnMouseEntered_ = sel_registerName("setOnMouseEntered:");
+public static final long /*int*/ sel_setOpaque_ = sel_registerName("setOpaque:");
+public static final long /*int*/ sel_setOptions_ = sel_registerName("setOptions:");
+public static final long /*int*/ sel_setOutlineTableColumn_ = sel_registerName("setOutlineTableColumn:");
+public static final long /*int*/ sel_setPaletteLabel_ = sel_registerName("setPaletteLabel:");
+public static final long /*int*/ sel_setPanelFont_isMultiple_ = sel_registerName("setPanelFont:isMultiple:");
+public static final long /*int*/ sel_setPartialStringValidationEnabled_ = sel_registerName("setPartialStringValidationEnabled:");
+public static final long /*int*/ sel_setPatternPhase_ = sel_registerName("setPatternPhase:");
+public static final long /*int*/ sel_setPlaceholderString_ = sel_registerName("setPlaceholderString:");
+public static final long /*int*/ sel_setPolicyDelegate_ = sel_registerName("setPolicyDelegate:");
+public static final long /*int*/ sel_setPreferences_ = sel_registerName("setPreferences:");
+public static final long /*int*/ sel_setPrinter_ = sel_registerName("setPrinter:");
+public static final long /*int*/ sel_setPropertyList_forType_ = sel_registerName("setPropertyList:forType:");
+public static final long /*int*/ sel_setPullsDown_ = sel_registerName("setPullsDown:");
+public static final long /*int*/ sel_setReleasedWhenClosed_ = sel_registerName("setReleasedWhenClosed:");
+public static final long /*int*/ sel_setRepresentedFilename_ = sel_registerName("setRepresentedFilename:");
+public static final long /*int*/ sel_setRepresentedURL_ = sel_registerName("setRepresentedURL:");
+public static final long /*int*/ sel_setResizingMask_ = sel_registerName("setResizingMask:");
+public static final long /*int*/ sel_setResourceLoadDelegate_ = sel_registerName("setResourceLoadDelegate:");
+public static final long /*int*/ sel_setRichText_ = sel_registerName("setRichText:");
+public static final long /*int*/ sel_setRowHeight_ = sel_registerName("setRowHeight:");
+public static final long /*int*/ sel_setScalesWhenResized_ = sel_registerName("setScalesWhenResized:");
+public static final long /*int*/ sel_setScrollable_ = sel_registerName("setScrollable:");
+public static final long /*int*/ sel_setSearchButtonCell_ = sel_registerName("setSearchButtonCell:");
+public static final long /*int*/ sel_setSegmentCount_ = sel_registerName("setSegmentCount:");
+public static final long /*int*/ sel_setSegmentStyle_ = sel_registerName("setSegmentStyle:");
+public static final long /*int*/ sel_setSelectable_ = sel_registerName("setSelectable:");
+public static final long /*int*/ sel_setSelected_forSegment_ = sel_registerName("setSelected:forSegment:");
+public static final long /*int*/ sel_setSelectedItemIdentifier_ = sel_registerName("setSelectedItemIdentifier:");
+public static final long /*int*/ sel_setSelectedRange_ = sel_registerName("setSelectedRange:");
+public static final long /*int*/ sel_setSelectedSegment_ = sel_registerName("setSelectedSegment:");
+public static final long /*int*/ sel_setSelectedTextAttributes_ = sel_registerName("setSelectedTextAttributes:");
+public static final long /*int*/ sel_setServicesMenu_ = sel_registerName("setServicesMenu:");
+public static final long /*int*/ sel_setShouldAntialias_ = sel_registerName("setShouldAntialias:");
+public static final long /*int*/ sel_setShowsHelp_ = sel_registerName("setShowsHelp:");
+public static final long /*int*/ sel_setShowsPrintPanel_ = sel_registerName("setShowsPrintPanel:");
+public static final long /*int*/ sel_setShowsProgressPanel_ = sel_registerName("setShowsProgressPanel:");
+public static final long /*int*/ sel_setShowsResizeIndicator_ = sel_registerName("setShowsResizeIndicator:");
+public static final long /*int*/ sel_setShowsToolbarButton_ = sel_registerName("setShowsToolbarButton:");
+public static final long /*int*/ sel_setSize_ = sel_registerName("setSize:");
+public static final long /*int*/ sel_setState_ = sel_registerName("setState:");
+public static final long /*int*/ sel_setString_ = sel_registerName("setString:");
+public static final long /*int*/ sel_setString_forType_ = sel_registerName("setString:forType:");
+public static final long /*int*/ sel_setStringValue_ = sel_registerName("setStringValue:");
+public static final long /*int*/ sel_setStroke = sel_registerName("setStroke");
+public static final long /*int*/ sel_setSubmenu_ = sel_registerName("setSubmenu:");
+public static final long /*int*/ sel_setSubmenu_forItem_ = sel_registerName("setSubmenu:forItem:");
+public static final long /*int*/ sel_setTabStops_ = sel_registerName("setTabStops:");
+public static final long /*int*/ sel_setTabViewType_ = sel_registerName("setTabViewType:");
+public static final long /*int*/ sel_setTag_ = sel_registerName("setTag:");
+public static final long /*int*/ sel_setTag_forSegment_ = sel_registerName("setTag:forSegment:");
+public static final long /*int*/ sel_setTarget_ = sel_registerName("setTarget:");
+public static final long /*int*/ sel_setTextColor_ = sel_registerName("setTextColor:");
+public static final long /*int*/ sel_setTextStorage_ = sel_registerName("setTextStorage:");
+public static final long /*int*/ sel_setTitle_ = sel_registerName("setTitle:");
+public static final long /*int*/ sel_setTitleFont_ = sel_registerName("setTitleFont:");
+public static final long /*int*/ sel_setTitlePosition_ = sel_registerName("setTitlePosition:");
+public static final long /*int*/ sel_setToolTip_ = sel_registerName("setToolTip:");
+public static final long /*int*/ sel_setToolTip_forSegment_ = sel_registerName("setToolTip:forSegment:");
+public static final long /*int*/ sel_setToolbar_ = sel_registerName("setToolbar:");
+public static final long /*int*/ sel_setTrackingMode_ = sel_registerName("setTrackingMode:");
+public static final long /*int*/ sel_setTransformStruct_ = sel_registerName("setTransformStruct:");
+public static final long /*int*/ sel_setUIDelegate_ = sel_registerName("setUIDelegate:");
+public static final long /*int*/ sel_setURL_ = sel_registerName("setURL:");
+public static final long /*int*/ sel_setUpPrintOperationDefaultValues = sel_registerName("setUpPrintOperationDefaultValues");
+public static final long /*int*/ sel_setUsesAlternatingRowBackgroundColors_ = sel_registerName("setUsesAlternatingRowBackgroundColors:");
+public static final long /*int*/ sel_setUsesFontPanel_ = sel_registerName("setUsesFontPanel:");
+public static final long /*int*/ sel_setUsesScreenFonts_ = sel_registerName("setUsesScreenFonts:");
+public static final long /*int*/ sel_setUsesThreadedAnimation_ = sel_registerName("setUsesThreadedAnimation:");
+public static final long /*int*/ sel_setValue_forHTTPHeaderField_ = sel_registerName("setValue:forHTTPHeaderField:");
+public static final long /*int*/ sel_setValue_forKey_ = sel_registerName("setValue:forKey:");
+public static final long /*int*/ sel_setValueWraps_ = sel_registerName("setValueWraps:");
+public static final long /*int*/ sel_setValues_forParameter_ = sel_registerName("setValues:forParameter:");
+public static final long /*int*/ sel_setVerticalScroller_ = sel_registerName("setVerticalScroller:");
+public static final long /*int*/ sel_setView_ = sel_registerName("setView:");
+public static final long /*int*/ sel_setVisible_ = sel_registerName("setVisible:");
+public static final long /*int*/ sel_setWantsRestingTouches_ = sel_registerName("setWantsRestingTouches:");
+public static final long /*int*/ sel_setWidth_ = sel_registerName("setWidth:");
+public static final long /*int*/ sel_setWidth_forSegment_ = sel_registerName("setWidth:forSegment:");
+public static final long /*int*/ sel_setWidthTracksTextView_ = sel_registerName("setWidthTracksTextView:");
+public static final long /*int*/ sel_setWindingRule_ = sel_registerName("setWindingRule:");
+public static final long /*int*/ sel_setWorksWhenModal_ = sel_registerName("setWorksWhenModal:");
+public static final long /*int*/ sel_setWraps_ = sel_registerName("setWraps:");
+public static final long /*int*/ sel_sharedApplication = sel_registerName("sharedApplication");
+public static final long /*int*/ sel_sharedCertificateTrustPanel = sel_registerName("sharedCertificateTrustPanel");
+public static final long /*int*/ sel_sharedColorPanel = sel_registerName("sharedColorPanel");
+public static final long /*int*/ sel_sharedFontManager = sel_registerName("sharedFontManager");
+public static final long /*int*/ sel_sharedFontPanel = sel_registerName("sharedFontPanel");
+public static final long /*int*/ sel_sharedHTTPCookieStorage = sel_registerName("sharedHTTPCookieStorage");
+public static final long /*int*/ sel_sharedPrintInfo = sel_registerName("sharedPrintInfo");
+public static final long /*int*/ sel_sharedWorkspace = sel_registerName("sharedWorkspace");
+public static final long /*int*/ sel_shiftKey = sel_registerName("shiftKey");
+public static final long /*int*/ sel_shouldAntialias = sel_registerName("shouldAntialias");
+public static final long /*int*/ sel_shouldChangeTextInRange_replacementString_ = sel_registerName("shouldChangeTextInRange:replacementString:");
+public static final long /*int*/ sel_shouldDelayWindowOrderingForEvent_ = sel_registerName("shouldDelayWindowOrderingForEvent:");
+public static final long /*int*/ sel_shouldDrawInsertionPoint = sel_registerName("shouldDrawInsertionPoint");
+public static final long /*int*/ sel_size = sel_registerName("size");
+public static final long /*int*/ sel_sizeOfLabel_ = sel_registerName("sizeOfLabel:");
+public static final long /*int*/ sel_sizeToFit = sel_registerName("sizeToFit");
+public static final long /*int*/ sel_sizeValue = sel_registerName("sizeValue");
+public static final long /*int*/ sel_skipDescendents = sel_registerName("skipDescendents");
+public static final long /*int*/ sel_smallSystemFontSize = sel_registerName("smallSystemFontSize");
+public static final long /*int*/ sel_sortIndicatorRectForBounds_ = sel_registerName("sortIndicatorRectForBounds:");
+public static final long /*int*/ sel_standardPreferences = sel_registerName("standardPreferences");
+public static final long /*int*/ sel_standardUserDefaults = sel_registerName("standardUserDefaults");
+public static final long /*int*/ sel_standardWindowButton_ = sel_registerName("standardWindowButton:");
+public static final long /*int*/ sel_startAnimation_ = sel_registerName("startAnimation:");
+public static final long /*int*/ sel_state = sel_registerName("state");
+public static final long /*int*/ sel_statusItemWithLength_ = sel_registerName("statusItemWithLength:");
+public static final long /*int*/ sel_stop_ = sel_registerName("stop:");
+public static final long /*int*/ sel_stopAnimation_ = sel_registerName("stopAnimation:");
+public static final long /*int*/ sel_stopLoading_ = sel_registerName("stopLoading:");
+public static final long /*int*/ sel_string = sel_registerName("string");
+public static final long /*int*/ sel_stringByAddingPercentEscapesUsingEncoding_ = sel_registerName("stringByAddingPercentEscapesUsingEncoding:");
+public static final long /*int*/ sel_stringByAppendingPathComponent_ = sel_registerName("stringByAppendingPathComponent:");
+public static final long /*int*/ sel_stringByAppendingPathExtension_ = sel_registerName("stringByAppendingPathExtension:");
+public static final long /*int*/ sel_stringByAppendingString_ = sel_registerName("stringByAppendingString:");
+public static final long /*int*/ sel_stringByDeletingLastPathComponent = sel_registerName("stringByDeletingLastPathComponent");
+public static final long /*int*/ sel_stringByDeletingPathExtension = sel_registerName("stringByDeletingPathExtension");
+public static final long /*int*/ sel_stringByReplacingOccurrencesOfString_withString_ = sel_registerName("stringByReplacingOccurrencesOfString:withString:");
+public static final long /*int*/ sel_stringByReplacingPercentEscapesUsingEncoding_ = sel_registerName("stringByReplacingPercentEscapesUsingEncoding:");
+public static final long /*int*/ sel_stringForObjectValue_ = sel_registerName("stringForObjectValue:");
+public static final long /*int*/ sel_stringForType_ = sel_registerName("stringForType:");
+public static final long /*int*/ sel_stringValue = sel_registerName("stringValue");
+public static final long /*int*/ sel_stringWithCharacters_length_ = sel_registerName("stringWithCharacters:length:");
+public static final long /*int*/ sel_stringWithFormat_ = sel_registerName("stringWithFormat:");
+public static final long /*int*/ sel_stringWithUTF8String_ = sel_registerName("stringWithUTF8String:");
+public static final long /*int*/ sel_stroke = sel_registerName("stroke");
+public static final long /*int*/ sel_strokeRect_ = sel_registerName("strokeRect:");
+public static final long /*int*/ sel_styleMask = sel_registerName("styleMask");
+public static final long /*int*/ sel_submenu = sel_registerName("submenu");
+public static final long /*int*/ sel_subviews = sel_registerName("subviews");
+public static final long /*int*/ sel_superclass = sel_registerName("superclass");
+public static final long /*int*/ sel_superview = sel_registerName("superview");
+public static final long /*int*/ sel_swipeWithEvent_ = sel_registerName("swipeWithEvent:");
+public static final long /*int*/ sel_systemFontOfSize_ = sel_registerName("systemFontOfSize:");
+public static final long /*int*/ sel_systemFontSize = sel_registerName("systemFontSize");
+public static final long /*int*/ sel_systemFontSizeForControlSize_ = sel_registerName("systemFontSizeForControlSize:");
+public static final long /*int*/ sel_systemStatusBar = sel_registerName("systemStatusBar");
+public static final long /*int*/ sel_systemVersion = sel_registerName("systemVersion");
+public static final long /*int*/ sel_tabStopType = sel_registerName("tabStopType");
+public static final long /*int*/ sel_tabStops = sel_registerName("tabStops");
+public static final long /*int*/ sel_tabView_didSelectTabViewItem_ = sel_registerName("tabView:didSelectTabViewItem:");
+public static final long /*int*/ sel_tabView_shouldSelectTabViewItem_ = sel_registerName("tabView:shouldSelectTabViewItem:");
+public static final long /*int*/ sel_tabView_willSelectTabViewItem_ = sel_registerName("tabView:willSelectTabViewItem:");
+public static final long /*int*/ sel_tabViewItemAtPoint_ = sel_registerName("tabViewItemAtPoint:");
+public static final long /*int*/ sel_tableColumns = sel_registerName("tableColumns");
+public static final long /*int*/ sel_tableView_acceptDrop_row_dropOperation_ = sel_registerName("tableView:acceptDrop:row:dropOperation:");
+public static final long /*int*/ sel_tableView_didClickTableColumn_ = sel_registerName("tableView:didClickTableColumn:");
+public static final long /*int*/ sel_tableView_objectValueForTableColumn_row_ = sel_registerName("tableView:objectValueForTableColumn:row:");
+public static final long /*int*/ sel_tableView_setObjectValue_forTableColumn_row_ = sel_registerName("tableView:setObjectValue:forTableColumn:row:");
+public static final long /*int*/ sel_tableView_shouldEditTableColumn_row_ = sel_registerName("tableView:shouldEditTableColumn:row:");
+public static final long /*int*/ sel_tableView_shouldReorderColumn_toColumn_ = sel_registerName("tableView:shouldReorderColumn:toColumn:");
+public static final long /*int*/ sel_tableView_shouldSelectRow_ = sel_registerName("tableView:shouldSelectRow:");
+public static final long /*int*/ sel_tableView_shouldTrackCell_forTableColumn_row_ = sel_registerName("tableView:shouldTrackCell:forTableColumn:row:");
+public static final long /*int*/ sel_tableView_validateDrop_proposedRow_proposedDropOperation_ = sel_registerName("tableView:validateDrop:proposedRow:proposedDropOperation:");
+public static final long /*int*/ sel_tableView_willDisplayCell_forTableColumn_row_ = sel_registerName("tableView:willDisplayCell:forTableColumn:row:");
+public static final long /*int*/ sel_tableView_writeRowsWithIndexes_toPasteboard_ = sel_registerName("tableView:writeRowsWithIndexes:toPasteboard:");
+public static final long /*int*/ sel_tableViewColumnDidMove_ = sel_registerName("tableViewColumnDidMove:");
+public static final long /*int*/ sel_tableViewColumnDidResize_ = sel_registerName("tableViewColumnDidResize:");
+public static final long /*int*/ sel_tableViewSelectionDidChange_ = sel_registerName("tableViewSelectionDidChange:");
+public static final long /*int*/ sel_tableViewSelectionIsChanging_ = sel_registerName("tableViewSelectionIsChanging:");
+public static final long /*int*/ sel_tag = sel_registerName("tag");
+public static final long /*int*/ sel_target = sel_registerName("target");
+public static final long /*int*/ sel_terminate_ = sel_registerName("terminate:");
+public static final long /*int*/ sel_testPart_ = sel_registerName("testPart:");
+public static final long /*int*/ sel_textBackgroundColor = sel_registerName("textBackgroundColor");
+public static final long /*int*/ sel_textColor = sel_registerName("textColor");
+public static final long /*int*/ sel_textContainer = sel_registerName("textContainer");
+public static final long /*int*/ sel_textDidChange_ = sel_registerName("textDidChange:");
+public static final long /*int*/ sel_textDidEndEditing_ = sel_registerName("textDidEndEditing:");
+public static final long /*int*/ sel_textStorage = sel_registerName("textStorage");
+public static final long /*int*/ sel_textView_clickedOnLink_atIndex_ = sel_registerName("textView:clickedOnLink:atIndex:");
+public static final long /*int*/ sel_textView_willChangeSelectionFromCharacterRange_toCharacterRange_ = sel_registerName("textView:willChangeSelectionFromCharacterRange:toCharacterRange:");
+public static final long /*int*/ sel_textViewDidChangeSelection_ = sel_registerName("textViewDidChangeSelection:");
+public static final long /*int*/ sel_thickness = sel_registerName("thickness");
+public static final long /*int*/ sel_threadDictionary = sel_registerName("threadDictionary");
+public static final long /*int*/ sel_tile = sel_registerName("tile");
+public static final long /*int*/ sel_timeZone = sel_registerName("timeZone");
+public static final long /*int*/ sel_timestamp = sel_registerName("timestamp");
+public static final long /*int*/ sel_title = sel_registerName("title");
+public static final long /*int*/ sel_titleCell = sel_registerName("titleCell");
+public static final long /*int*/ sel_titleFont = sel_registerName("titleFont");
+public static final long /*int*/ sel_titleOfSelectedItem = sel_registerName("titleOfSelectedItem");
+public static final long /*int*/ sel_titleRectForBounds_ = sel_registerName("titleRectForBounds:");
+public static final long /*int*/ sel_toggleToolbarShown_ = sel_registerName("toggleToolbarShown:");
+public static final long /*int*/ sel_toolbar = sel_registerName("toolbar");
+public static final long /*int*/ sel_toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar_ = sel_registerName("toolbar:itemForItemIdentifier:willBeInsertedIntoToolbar:");
+public static final long /*int*/ sel_toolbarAllowedItemIdentifiers_ = sel_registerName("toolbarAllowedItemIdentifiers:");
+public static final long /*int*/ sel_toolbarDefaultItemIdentifiers_ = sel_registerName("toolbarDefaultItemIdentifiers:");
+public static final long /*int*/ sel_toolbarDidRemoveItem_ = sel_registerName("toolbarDidRemoveItem:");
+public static final long /*int*/ sel_toolbarSelectableItemIdentifiers_ = sel_registerName("toolbarSelectableItemIdentifiers:");
+public static final long /*int*/ sel_toolbarWillAddItem_ = sel_registerName("toolbarWillAddItem:");
+public static final long /*int*/ sel_touchesBeganWithEvent_ = sel_registerName("touchesBeganWithEvent:");
+public static final long /*int*/ sel_touchesCancelledWithEvent_ = sel_registerName("touchesCancelledWithEvent:");
+public static final long /*int*/ sel_touchesEndedWithEvent_ = sel_registerName("touchesEndedWithEvent:");
+public static final long /*int*/ sel_touchesMatchingPhase_inView_ = sel_registerName("touchesMatchingPhase:inView:");
+public static final long /*int*/ sel_touchesMovedWithEvent_ = sel_registerName("touchesMovedWithEvent:");
+public static final long /*int*/ sel_trackingAreas = sel_registerName("trackingAreas");
+public static final long /*int*/ sel_traitsOfFont_ = sel_registerName("traitsOfFont:");
+public static final long /*int*/ sel_transform = sel_registerName("transform");
+public static final long /*int*/ sel_transformPoint_ = sel_registerName("transformPoint:");
+public static final long /*int*/ sel_transformSize_ = sel_registerName("transformSize:");
+public static final long /*int*/ sel_transformStruct = sel_registerName("transformStruct");
+public static final long /*int*/ sel_transformUsingAffineTransform_ = sel_registerName("transformUsingAffineTransform:");
+public static final long /*int*/ sel_translateXBy_yBy_ = sel_registerName("translateXBy:yBy:");
+public static final long /*int*/ sel_type = sel_registerName("type");
+public static final long /*int*/ sel_type_conformsToType_ = sel_registerName("type:conformsToType:");
+public static final long /*int*/ sel_typeOfFile_error_ = sel_registerName("typeOfFile:error:");
+public static final long /*int*/ sel_types = sel_registerName("types");
+public static final long /*int*/ sel_typesetter = sel_registerName("typesetter");
+public static final long /*int*/ sel_unarchiveObjectWithData_ = sel_registerName("unarchiveObjectWithData:");
+public static final long /*int*/ sel_undefined = sel_registerName("undefined");
+public static final long /*int*/ sel_undo = sel_registerName("undo");
+public static final long /*int*/ sel_undoManager = sel_registerName("undoManager");
+public static final long /*int*/ sel_unhideAllApplications_ = sel_registerName("unhideAllApplications:");
+public static final long /*int*/ sel_unlockFocus = sel_registerName("unlockFocus");
+public static final long /*int*/ sel_unmarkText = sel_registerName("unmarkText");
+public static final long /*int*/ sel_unregisterDraggedTypes = sel_registerName("unregisterDraggedTypes");
+public static final long /*int*/ sel_update = sel_registerName("update");
+public static final long /*int*/ sel_updateFromPMPrintSettings = sel_registerName("updateFromPMPrintSettings");
+public static final long /*int*/ sel_updateTrackingAreas = sel_registerName("updateTrackingAreas");
+public static final long /*int*/ sel_use = sel_registerName("use");
+public static final long /*int*/ sel_useCredential_forAuthenticationChallenge_ = sel_registerName("useCredential:forAuthenticationChallenge:");
+public static final long /*int*/ sel_usedRectForTextContainer_ = sel_registerName("usedRectForTextContainer:");
+public static final long /*int*/ sel_user = sel_registerName("user");
+public static final long /*int*/ sel_userInfo = sel_registerName("userInfo");
+public static final long /*int*/ sel_userSpaceScaleFactor = sel_registerName("userSpaceScaleFactor");
+public static final long /*int*/ sel_usesAlternatingRowBackgroundColors = sel_registerName("usesAlternatingRowBackgroundColors");
+public static final long /*int*/ sel_validAttributesForMarkedText = sel_registerName("validAttributesForMarkedText");
+public static final long /*int*/ sel_validModesForFontPanel_ = sel_registerName("validModesForFontPanel:");
+public static final long /*int*/ sel_validRequestorForSendType_returnType_ = sel_registerName("validRequestorForSendType:returnType:");
+public static final long /*int*/ sel_validateMenuItem_ = sel_registerName("validateMenuItem:");
+public static final long /*int*/ sel_validateVisibleColumns = sel_registerName("validateVisibleColumns");
+public static final long /*int*/ sel_value = sel_registerName("value");
+public static final long /*int*/ sel_valueForKey_ = sel_registerName("valueForKey:");
+public static final long /*int*/ sel_valueWithPoint_ = sel_registerName("valueWithPoint:");
+public static final long /*int*/ sel_valueWithRange_ = sel_registerName("valueWithRange:");
+public static final long /*int*/ sel_valueWithRect_ = sel_registerName("valueWithRect:");
+public static final long /*int*/ sel_valueWithSize_ = sel_registerName("valueWithSize:");
+public static final long /*int*/ sel_view = sel_registerName("view");
+public static final long /*int*/ sel_view_stringForToolTip_point_userData_ = sel_registerName("view:stringForToolTip:point:userData:");
+public static final long /*int*/ sel_viewDidMoveToWindow = sel_registerName("viewDidMoveToWindow");
+public static final long /*int*/ sel_viewWillMoveToWindow_ = sel_registerName("viewWillMoveToWindow:");
+public static final long /*int*/ sel_visibleFrame = sel_registerName("visibleFrame");
+public static final long /*int*/ sel_visibleRect = sel_registerName("visibleRect");
+public static final long /*int*/ sel_wantsPeriodicDraggingUpdates = sel_registerName("wantsPeriodicDraggingUpdates");
+public static final long /*int*/ sel_wantsToHandleMouseEvents = sel_registerName("wantsToHandleMouseEvents");
+public static final long /*int*/ sel_webFrame = sel_registerName("webFrame");
+public static final long /*int*/ sel_webScriptValueAtIndex_ = sel_registerName("webScriptValueAtIndex:");
+public static final long /*int*/ sel_webView_contextMenuItemsForElement_defaultMenuItems_ = sel_registerName("webView:contextMenuItemsForElement:defaultMenuItems:");
+public static final long /*int*/ sel_webView_createWebViewWithRequest_ = sel_registerName("webView:createWebViewWithRequest:");
+public static final long /*int*/ sel_webView_decidePolicyForMIMEType_request_frame_decisionListener_ = sel_registerName("webView:decidePolicyForMIMEType:request:frame:decisionListener:");
+public static final long /*int*/ sel_webView_decidePolicyForNavigationAction_request_frame_decisionListener_ = sel_registerName("webView:decidePolicyForNavigationAction:request:frame:decisionListener:");
+public static final long /*int*/ sel_webView_decidePolicyForNewWindowAction_request_newFrameName_decisionListener_ = sel_registerName("webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:");
+public static final long /*int*/ sel_webView_didChangeLocationWithinPageForFrame_ = sel_registerName("webView:didChangeLocationWithinPageForFrame:");
+public static final long /*int*/ sel_webView_didCommitLoadForFrame_ = sel_registerName("webView:didCommitLoadForFrame:");
+public static final long /*int*/ sel_webView_didFailProvisionalLoadWithError_forFrame_ = sel_registerName("webView:didFailProvisionalLoadWithError:forFrame:");
+public static final long /*int*/ sel_webView_didFinishLoadForFrame_ = sel_registerName("webView:didFinishLoadForFrame:");
+public static final long /*int*/ sel_webView_didReceiveTitle_forFrame_ = sel_registerName("webView:didReceiveTitle:forFrame:");
+public static final long /*int*/ sel_webView_didStartProvisionalLoadForFrame_ = sel_registerName("webView:didStartProvisionalLoadForFrame:");
+public static final long /*int*/ sel_webView_identifierForInitialRequest_fromDataSource_ = sel_registerName("webView:identifierForInitialRequest:fromDataSource:");
+public static final long /*int*/ sel_webView_mouseDidMoveOverElement_modifierFlags_ = sel_registerName("webView:mouseDidMoveOverElement:modifierFlags:");
+public static final long /*int*/ sel_webView_printFrameView_ = sel_registerName("webView:printFrameView:");
+public static final long /*int*/ sel_webView_resource_didFailLoadingWithError_fromDataSource_ = sel_registerName("webView:resource:didFailLoadingWithError:fromDataSource:");
+public static final long /*int*/ sel_webView_resource_didFinishLoadingFromDataSource_ = sel_registerName("webView:resource:didFinishLoadingFromDataSource:");
+public static final long /*int*/ sel_webView_resource_didReceiveAuthenticationChallenge_fromDataSource_ = sel_registerName("webView:resource:didReceiveAuthenticationChallenge:fromDataSource:");
+public static final long /*int*/ sel_webView_resource_willSendRequest_redirectResponse_fromDataSource_ = sel_registerName("webView:resource:willSendRequest:redirectResponse:fromDataSource:");
+public static final long /*int*/ sel_webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame_ = sel_registerName("webView:runBeforeUnloadConfirmPanelWithMessage:initiatedByFrame:");
+public static final long /*int*/ sel_webView_runJavaScriptAlertPanelWithMessage_ = sel_registerName("webView:runJavaScriptAlertPanelWithMessage:");
+public static final long /*int*/ sel_webView_runJavaScriptAlertPanelWithMessage_initiatedByFrame_ = sel_registerName("webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:");
+public static final long /*int*/ sel_webView_runJavaScriptConfirmPanelWithMessage_ = sel_registerName("webView:runJavaScriptConfirmPanelWithMessage:");
+public static final long /*int*/ sel_webView_runJavaScriptConfirmPanelWithMessage_initiatedByFrame_ = sel_registerName("webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:");
+public static final long /*int*/ sel_webView_runOpenPanelForFileButtonWithResultListener_ = sel_registerName("webView:runOpenPanelForFileButtonWithResultListener:");
+public static final long /*int*/ sel_webView_setFrame_ = sel_registerName("webView:setFrame:");
+public static final long /*int*/ sel_webView_setResizable_ = sel_registerName("webView:setResizable:");
+public static final long /*int*/ sel_webView_setStatusBarVisible_ = sel_registerName("webView:setStatusBarVisible:");
+public static final long /*int*/ sel_webView_setStatusText_ = sel_registerName("webView:setStatusText:");
+public static final long /*int*/ sel_webView_setToolbarsVisible_ = sel_registerName("webView:setToolbarsVisible:");
+public static final long /*int*/ sel_webView_unableToImplementPolicyWithError_frame_ = sel_registerName("webView:unableToImplementPolicyWithError:frame:");
+public static final long /*int*/ sel_webView_windowScriptObjectAvailable_ = sel_registerName("webView:windowScriptObjectAvailable:");
+public static final long /*int*/ sel_webViewClose_ = sel_registerName("webViewClose:");
+public static final long /*int*/ sel_webViewFocus_ = sel_registerName("webViewFocus:");
+public static final long /*int*/ sel_webViewShow_ = sel_registerName("webViewShow:");
+public static final long /*int*/ sel_webViewUnfocus_ = sel_registerName("webViewUnfocus:");
+public static final long /*int*/ sel_weightOfFont_ = sel_registerName("weightOfFont:");
+public static final long /*int*/ sel_wheelDelta = sel_registerName("wheelDelta");
+public static final long /*int*/ sel_width = sel_registerName("width");
+public static final long /*int*/ sel_window = sel_registerName("window");
+public static final long /*int*/ sel_windowBackgroundColor = sel_registerName("windowBackgroundColor");
+public static final long /*int*/ sel_windowDidBecomeKey_ = sel_registerName("windowDidBecomeKey:");
+public static final long /*int*/ sel_windowDidDeminiaturize_ = sel_registerName("windowDidDeminiaturize:");
+public static final long /*int*/ sel_windowDidMiniaturize_ = sel_registerName("windowDidMiniaturize:");
+public static final long /*int*/ sel_windowDidMove_ = sel_registerName("windowDidMove:");
+public static final long /*int*/ sel_windowDidResignKey_ = sel_registerName("windowDidResignKey:");
+public static final long /*int*/ sel_windowDidResize_ = sel_registerName("windowDidResize:");
+public static final long /*int*/ sel_windowFrameColor = sel_registerName("windowFrameColor");
+public static final long /*int*/ sel_windowFrameTextColor = sel_registerName("windowFrameTextColor");
+public static final long /*int*/ sel_windowNumber = sel_registerName("windowNumber");
+public static final long /*int*/ sel_windowNumberAtPoint_belowWindowWithWindowNumber_ = sel_registerName("windowNumberAtPoint:belowWindowWithWindowNumber:");
+public static final long /*int*/ sel_windowRef = sel_registerName("windowRef");
+public static final long /*int*/ sel_windowShouldClose_ = sel_registerName("windowShouldClose:");
+public static final long /*int*/ sel_windowWillClose_ = sel_registerName("windowWillClose:");
+public static final long /*int*/ sel_windowWithWindowNumber_ = sel_registerName("windowWithWindowNumber:");
+public static final long /*int*/ sel_windows = sel_registerName("windows");
+public static final long /*int*/ sel_worksWhenModal = sel_registerName("worksWhenModal");
+public static final long /*int*/ sel_wraps = sel_registerName("wraps");
+public static final long /*int*/ sel_writeSelectionToPasteboard_types_ = sel_registerName("writeSelectionToPasteboard:types:");
+public static final long /*int*/ sel_writeToPasteboard_ = sel_registerName("writeToPasteboard:");
+public static final long /*int*/ sel_yearOfCommonEra = sel_registerName("yearOfCommonEra");
+public static final long /*int*/ sel_zoom_ = sel_registerName("zoom:");
/** Constants */
public static final int NSAlertFirstButtonReturn = 1000;
@@ -2564,596 +2564,596 @@ public static final int NSUserDomainMask = 1;
/** Globals */
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityAttributedStringForRangeParameterizedAttribute();
+public static final native long /*int*/ NSAccessibilityAttributedStringForRangeParameterizedAttribute();
public static final NSString NSAccessibilityAttributedStringForRangeParameterizedAttribute = new NSString(NSAccessibilityAttributedStringForRangeParameterizedAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityBackgroundColorTextAttribute();
+public static final native long /*int*/ NSAccessibilityBackgroundColorTextAttribute();
public static final NSString NSAccessibilityBackgroundColorTextAttribute = new NSString(NSAccessibilityBackgroundColorTextAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityBoundsForRangeParameterizedAttribute();
+public static final native long /*int*/ NSAccessibilityBoundsForRangeParameterizedAttribute();
public static final NSString NSAccessibilityBoundsForRangeParameterizedAttribute = new NSString(NSAccessibilityBoundsForRangeParameterizedAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityButtonRole();
+public static final native long /*int*/ NSAccessibilityButtonRole();
public static final NSString NSAccessibilityButtonRole = new NSString(NSAccessibilityButtonRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityCheckBoxRole();
+public static final native long /*int*/ NSAccessibilityCheckBoxRole();
public static final NSString NSAccessibilityCheckBoxRole = new NSString(NSAccessibilityCheckBoxRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityChildrenAttribute();
+public static final native long /*int*/ NSAccessibilityChildrenAttribute();
public static final NSString NSAccessibilityChildrenAttribute = new NSString(NSAccessibilityChildrenAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityColorWellRole();
+public static final native long /*int*/ NSAccessibilityColorWellRole();
public static final NSString NSAccessibilityColorWellRole = new NSString(NSAccessibilityColorWellRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityColumnRole();
+public static final native long /*int*/ NSAccessibilityColumnRole();
public static final NSString NSAccessibilityColumnRole = new NSString(NSAccessibilityColumnRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityColumnsAttribute();
+public static final native long /*int*/ NSAccessibilityColumnsAttribute();
public static final NSString NSAccessibilityColumnsAttribute = new NSString(NSAccessibilityColumnsAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityComboBoxRole();
+public static final native long /*int*/ NSAccessibilityComboBoxRole();
public static final NSString NSAccessibilityComboBoxRole = new NSString(NSAccessibilityComboBoxRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityConfirmAction();
+public static final native long /*int*/ NSAccessibilityConfirmAction();
public static final NSString NSAccessibilityConfirmAction = new NSString(NSAccessibilityConfirmAction());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityContentsAttribute();
+public static final native long /*int*/ NSAccessibilityContentsAttribute();
public static final NSString NSAccessibilityContentsAttribute = new NSString(NSAccessibilityContentsAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityDescriptionAttribute();
+public static final native long /*int*/ NSAccessibilityDescriptionAttribute();
public static final NSString NSAccessibilityDescriptionAttribute = new NSString(NSAccessibilityDescriptionAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityDialogSubrole();
+public static final native long /*int*/ NSAccessibilityDialogSubrole();
public static final NSString NSAccessibilityDialogSubrole = new NSString(NSAccessibilityDialogSubrole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityEnabledAttribute();
+public static final native long /*int*/ NSAccessibilityEnabledAttribute();
public static final NSString NSAccessibilityEnabledAttribute = new NSString(NSAccessibilityEnabledAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityExpandedAttribute();
+public static final native long /*int*/ NSAccessibilityExpandedAttribute();
public static final NSString NSAccessibilityExpandedAttribute = new NSString(NSAccessibilityExpandedAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityFloatingWindowSubrole();
+public static final native long /*int*/ NSAccessibilityFloatingWindowSubrole();
public static final NSString NSAccessibilityFloatingWindowSubrole = new NSString(NSAccessibilityFloatingWindowSubrole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityFocusedAttribute();
+public static final native long /*int*/ NSAccessibilityFocusedAttribute();
public static final NSString NSAccessibilityFocusedAttribute = new NSString(NSAccessibilityFocusedAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityFocusedUIElementChangedNotification();
+public static final native long /*int*/ NSAccessibilityFocusedUIElementChangedNotification();
public static final NSString NSAccessibilityFocusedUIElementChangedNotification = new NSString(NSAccessibilityFocusedUIElementChangedNotification());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityFocusedWindowChangedNotification();
+public static final native long /*int*/ NSAccessibilityFocusedWindowChangedNotification();
public static final NSString NSAccessibilityFocusedWindowChangedNotification = new NSString(NSAccessibilityFocusedWindowChangedNotification());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityFontFamilyKey();
+public static final native long /*int*/ NSAccessibilityFontFamilyKey();
public static final NSString NSAccessibilityFontFamilyKey = new NSString(NSAccessibilityFontFamilyKey());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityFontNameKey();
+public static final native long /*int*/ NSAccessibilityFontNameKey();
public static final NSString NSAccessibilityFontNameKey = new NSString(NSAccessibilityFontNameKey());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityFontSizeKey();
+public static final native long /*int*/ NSAccessibilityFontSizeKey();
public static final NSString NSAccessibilityFontSizeKey = new NSString(NSAccessibilityFontSizeKey());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityFontTextAttribute();
+public static final native long /*int*/ NSAccessibilityFontTextAttribute();
public static final NSString NSAccessibilityFontTextAttribute = new NSString(NSAccessibilityFontTextAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityForegroundColorTextAttribute();
+public static final native long /*int*/ NSAccessibilityForegroundColorTextAttribute();
public static final NSString NSAccessibilityForegroundColorTextAttribute = new NSString(NSAccessibilityForegroundColorTextAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityGridRole();
+public static final native long /*int*/ NSAccessibilityGridRole();
public static final NSString NSAccessibilityGridRole = new NSString(NSAccessibilityGridRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityGroupRole();
+public static final native long /*int*/ NSAccessibilityGroupRole();
public static final NSString NSAccessibilityGroupRole = new NSString(NSAccessibilityGroupRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityHeaderAttribute();
+public static final native long /*int*/ NSAccessibilityHeaderAttribute();
public static final NSString NSAccessibilityHeaderAttribute = new NSString(NSAccessibilityHeaderAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityHelpAttribute();
+public static final native long /*int*/ NSAccessibilityHelpAttribute();
public static final NSString NSAccessibilityHelpAttribute = new NSString(NSAccessibilityHelpAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityHelpTagRole();
+public static final native long /*int*/ NSAccessibilityHelpTagRole();
public static final NSString NSAccessibilityHelpTagRole = new NSString(NSAccessibilityHelpTagRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityHorizontalOrientationValue();
+public static final native long /*int*/ NSAccessibilityHorizontalOrientationValue();
public static final NSString NSAccessibilityHorizontalOrientationValue = new NSString(NSAccessibilityHorizontalOrientationValue());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityHorizontalScrollBarAttribute();
+public static final native long /*int*/ NSAccessibilityHorizontalScrollBarAttribute();
public static final NSString NSAccessibilityHorizontalScrollBarAttribute = new NSString(NSAccessibilityHorizontalScrollBarAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityImageRole();
+public static final native long /*int*/ NSAccessibilityImageRole();
public static final NSString NSAccessibilityImageRole = new NSString(NSAccessibilityImageRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityIncrementorRole();
+public static final native long /*int*/ NSAccessibilityIncrementorRole();
public static final NSString NSAccessibilityIncrementorRole = new NSString(NSAccessibilityIncrementorRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityIndexAttribute();
+public static final native long /*int*/ NSAccessibilityIndexAttribute();
public static final NSString NSAccessibilityIndexAttribute = new NSString(NSAccessibilityIndexAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityInsertionPointLineNumberAttribute();
+public static final native long /*int*/ NSAccessibilityInsertionPointLineNumberAttribute();
public static final NSString NSAccessibilityInsertionPointLineNumberAttribute = new NSString(NSAccessibilityInsertionPointLineNumberAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityLabelValueAttribute();
+public static final native long /*int*/ NSAccessibilityLabelValueAttribute();
public static final NSString NSAccessibilityLabelValueAttribute = new NSString(NSAccessibilityLabelValueAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityLineForIndexParameterizedAttribute();
+public static final native long /*int*/ NSAccessibilityLineForIndexParameterizedAttribute();
public static final NSString NSAccessibilityLineForIndexParameterizedAttribute = new NSString(NSAccessibilityLineForIndexParameterizedAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityLinkRole();
+public static final native long /*int*/ NSAccessibilityLinkRole();
public static final NSString NSAccessibilityLinkRole = new NSString(NSAccessibilityLinkRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityLinkTextAttribute();
+public static final native long /*int*/ NSAccessibilityLinkTextAttribute();
public static final NSString NSAccessibilityLinkTextAttribute = new NSString(NSAccessibilityLinkTextAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityLinkedUIElementsAttribute();
+public static final native long /*int*/ NSAccessibilityLinkedUIElementsAttribute();
public static final NSString NSAccessibilityLinkedUIElementsAttribute = new NSString(NSAccessibilityLinkedUIElementsAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityListRole();
+public static final native long /*int*/ NSAccessibilityListRole();
public static final NSString NSAccessibilityListRole = new NSString(NSAccessibilityListRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityMaxValueAttribute();
+public static final native long /*int*/ NSAccessibilityMaxValueAttribute();
public static final NSString NSAccessibilityMaxValueAttribute = new NSString(NSAccessibilityMaxValueAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityMenuBarRole();
+public static final native long /*int*/ NSAccessibilityMenuBarRole();
public static final NSString NSAccessibilityMenuBarRole = new NSString(NSAccessibilityMenuBarRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityMenuButtonRole();
+public static final native long /*int*/ NSAccessibilityMenuButtonRole();
public static final NSString NSAccessibilityMenuButtonRole = new NSString(NSAccessibilityMenuButtonRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityMenuItemRole();
+public static final native long /*int*/ NSAccessibilityMenuItemRole();
public static final NSString NSAccessibilityMenuItemRole = new NSString(NSAccessibilityMenuItemRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityMenuRole();
+public static final native long /*int*/ NSAccessibilityMenuRole();
public static final NSString NSAccessibilityMenuRole = new NSString(NSAccessibilityMenuRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityMinValueAttribute();
+public static final native long /*int*/ NSAccessibilityMinValueAttribute();
public static final NSString NSAccessibilityMinValueAttribute = new NSString(NSAccessibilityMinValueAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityMisspelledTextAttribute();
+public static final native long /*int*/ NSAccessibilityMisspelledTextAttribute();
public static final NSString NSAccessibilityMisspelledTextAttribute = new NSString(NSAccessibilityMisspelledTextAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityMovedNotification();
+public static final native long /*int*/ NSAccessibilityMovedNotification();
public static final NSString NSAccessibilityMovedNotification = new NSString(NSAccessibilityMovedNotification());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityNextContentsAttribute();
+public static final native long /*int*/ NSAccessibilityNextContentsAttribute();
public static final NSString NSAccessibilityNextContentsAttribute = new NSString(NSAccessibilityNextContentsAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityNumberOfCharactersAttribute();
+public static final native long /*int*/ NSAccessibilityNumberOfCharactersAttribute();
public static final NSString NSAccessibilityNumberOfCharactersAttribute = new NSString(NSAccessibilityNumberOfCharactersAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityOrientationAttribute();
+public static final native long /*int*/ NSAccessibilityOrientationAttribute();
public static final NSString NSAccessibilityOrientationAttribute = new NSString(NSAccessibilityOrientationAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityOutlineRole();
+public static final native long /*int*/ NSAccessibilityOutlineRole();
public static final NSString NSAccessibilityOutlineRole = new NSString(NSAccessibilityOutlineRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityOutlineRowSubrole();
+public static final native long /*int*/ NSAccessibilityOutlineRowSubrole();
public static final NSString NSAccessibilityOutlineRowSubrole = new NSString(NSAccessibilityOutlineRowSubrole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityParentAttribute();
+public static final native long /*int*/ NSAccessibilityParentAttribute();
public static final NSString NSAccessibilityParentAttribute = new NSString(NSAccessibilityParentAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityPopUpButtonRole();
+public static final native long /*int*/ NSAccessibilityPopUpButtonRole();
public static final NSString NSAccessibilityPopUpButtonRole = new NSString(NSAccessibilityPopUpButtonRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityPositionAttribute();
+public static final native long /*int*/ NSAccessibilityPositionAttribute();
public static final NSString NSAccessibilityPositionAttribute = new NSString(NSAccessibilityPositionAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityPressAction();
+public static final native long /*int*/ NSAccessibilityPressAction();
public static final NSString NSAccessibilityPressAction = new NSString(NSAccessibilityPressAction());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityPreviousContentsAttribute();
+public static final native long /*int*/ NSAccessibilityPreviousContentsAttribute();
public static final NSString NSAccessibilityPreviousContentsAttribute = new NSString(NSAccessibilityPreviousContentsAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityProgressIndicatorRole();
+public static final native long /*int*/ NSAccessibilityProgressIndicatorRole();
public static final NSString NSAccessibilityProgressIndicatorRole = new NSString(NSAccessibilityProgressIndicatorRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityRTFForRangeParameterizedAttribute();
+public static final native long /*int*/ NSAccessibilityRTFForRangeParameterizedAttribute();
public static final NSString NSAccessibilityRTFForRangeParameterizedAttribute = new NSString(NSAccessibilityRTFForRangeParameterizedAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityRadioButtonRole();
+public static final native long /*int*/ NSAccessibilityRadioButtonRole();
public static final NSString NSAccessibilityRadioButtonRole = new NSString(NSAccessibilityRadioButtonRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityRadioGroupRole();
+public static final native long /*int*/ NSAccessibilityRadioGroupRole();
public static final NSString NSAccessibilityRadioGroupRole = new NSString(NSAccessibilityRadioGroupRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityRangeForIndexParameterizedAttribute();
+public static final native long /*int*/ NSAccessibilityRangeForIndexParameterizedAttribute();
public static final NSString NSAccessibilityRangeForIndexParameterizedAttribute = new NSString(NSAccessibilityRangeForIndexParameterizedAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityRangeForLineParameterizedAttribute();
+public static final native long /*int*/ NSAccessibilityRangeForLineParameterizedAttribute();
public static final NSString NSAccessibilityRangeForLineParameterizedAttribute = new NSString(NSAccessibilityRangeForLineParameterizedAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityRangeForPositionParameterizedAttribute();
+public static final native long /*int*/ NSAccessibilityRangeForPositionParameterizedAttribute();
public static final NSString NSAccessibilityRangeForPositionParameterizedAttribute = new NSString(NSAccessibilityRangeForPositionParameterizedAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityResizedNotification();
+public static final native long /*int*/ NSAccessibilityResizedNotification();
public static final NSString NSAccessibilityResizedNotification = new NSString(NSAccessibilityResizedNotification());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityRoleAttribute();
+public static final native long /*int*/ NSAccessibilityRoleAttribute();
public static final NSString NSAccessibilityRoleAttribute = new NSString(NSAccessibilityRoleAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityRoleDescriptionAttribute();
+public static final native long /*int*/ NSAccessibilityRoleDescriptionAttribute();
public static final NSString NSAccessibilityRoleDescriptionAttribute = new NSString(NSAccessibilityRoleDescriptionAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityRowCountChangedNotification();
+public static final native long /*int*/ NSAccessibilityRowCountChangedNotification();
public static final NSString NSAccessibilityRowCountChangedNotification = new NSString(NSAccessibilityRowCountChangedNotification());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityRowRole();
+public static final native long /*int*/ NSAccessibilityRowRole();
public static final NSString NSAccessibilityRowRole = new NSString(NSAccessibilityRowRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityRowsAttribute();
+public static final native long /*int*/ NSAccessibilityRowsAttribute();
public static final NSString NSAccessibilityRowsAttribute = new NSString(NSAccessibilityRowsAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityScrollAreaRole();
+public static final native long /*int*/ NSAccessibilityScrollAreaRole();
public static final NSString NSAccessibilityScrollAreaRole = new NSString(NSAccessibilityScrollAreaRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityScrollBarRole();
+public static final native long /*int*/ NSAccessibilityScrollBarRole();
public static final NSString NSAccessibilityScrollBarRole = new NSString(NSAccessibilityScrollBarRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilitySelectedAttribute();
+public static final native long /*int*/ NSAccessibilitySelectedAttribute();
public static final NSString NSAccessibilitySelectedAttribute = new NSString(NSAccessibilitySelectedAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilitySelectedChildrenAttribute();
+public static final native long /*int*/ NSAccessibilitySelectedChildrenAttribute();
public static final NSString NSAccessibilitySelectedChildrenAttribute = new NSString(NSAccessibilitySelectedChildrenAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilitySelectedChildrenChangedNotification();
+public static final native long /*int*/ NSAccessibilitySelectedChildrenChangedNotification();
public static final NSString NSAccessibilitySelectedChildrenChangedNotification = new NSString(NSAccessibilitySelectedChildrenChangedNotification());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilitySelectedColumnsAttribute();
+public static final native long /*int*/ NSAccessibilitySelectedColumnsAttribute();
public static final NSString NSAccessibilitySelectedColumnsAttribute = new NSString(NSAccessibilitySelectedColumnsAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilitySelectedRowsAttribute();
+public static final native long /*int*/ NSAccessibilitySelectedRowsAttribute();
public static final NSString NSAccessibilitySelectedRowsAttribute = new NSString(NSAccessibilitySelectedRowsAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilitySelectedRowsChangedNotification();
+public static final native long /*int*/ NSAccessibilitySelectedRowsChangedNotification();
public static final NSString NSAccessibilitySelectedRowsChangedNotification = new NSString(NSAccessibilitySelectedRowsChangedNotification());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilitySelectedTextAttribute();
+public static final native long /*int*/ NSAccessibilitySelectedTextAttribute();
public static final NSString NSAccessibilitySelectedTextAttribute = new NSString(NSAccessibilitySelectedTextAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilitySelectedTextChangedNotification();
+public static final native long /*int*/ NSAccessibilitySelectedTextChangedNotification();
public static final NSString NSAccessibilitySelectedTextChangedNotification = new NSString(NSAccessibilitySelectedTextChangedNotification());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilitySelectedTextRangeAttribute();
+public static final native long /*int*/ NSAccessibilitySelectedTextRangeAttribute();
public static final NSString NSAccessibilitySelectedTextRangeAttribute = new NSString(NSAccessibilitySelectedTextRangeAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilitySelectedTextRangesAttribute();
+public static final native long /*int*/ NSAccessibilitySelectedTextRangesAttribute();
public static final NSString NSAccessibilitySelectedTextRangesAttribute = new NSString(NSAccessibilitySelectedTextRangesAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityServesAsTitleForUIElementsAttribute();
+public static final native long /*int*/ NSAccessibilityServesAsTitleForUIElementsAttribute();
public static final NSString NSAccessibilityServesAsTitleForUIElementsAttribute = new NSString(NSAccessibilityServesAsTitleForUIElementsAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityShowMenuAction();
+public static final native long /*int*/ NSAccessibilityShowMenuAction();
public static final NSString NSAccessibilityShowMenuAction = new NSString(NSAccessibilityShowMenuAction());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilitySizeAttribute();
+public static final native long /*int*/ NSAccessibilitySizeAttribute();
public static final NSString NSAccessibilitySizeAttribute = new NSString(NSAccessibilitySizeAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilitySliderRole();
+public static final native long /*int*/ NSAccessibilitySliderRole();
public static final NSString NSAccessibilitySliderRole = new NSString(NSAccessibilitySliderRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilitySortButtonRole();
+public static final native long /*int*/ NSAccessibilitySortButtonRole();
public static final NSString NSAccessibilitySortButtonRole = new NSString(NSAccessibilitySortButtonRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilitySplitterRole();
+public static final native long /*int*/ NSAccessibilitySplitterRole();
public static final NSString NSAccessibilitySplitterRole = new NSString(NSAccessibilitySplitterRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityStandardWindowSubrole();
+public static final native long /*int*/ NSAccessibilityStandardWindowSubrole();
public static final NSString NSAccessibilityStandardWindowSubrole = new NSString(NSAccessibilityStandardWindowSubrole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityStaticTextRole();
+public static final native long /*int*/ NSAccessibilityStaticTextRole();
public static final NSString NSAccessibilityStaticTextRole = new NSString(NSAccessibilityStaticTextRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityStrikethroughColorTextAttribute();
+public static final native long /*int*/ NSAccessibilityStrikethroughColorTextAttribute();
public static final NSString NSAccessibilityStrikethroughColorTextAttribute = new NSString(NSAccessibilityStrikethroughColorTextAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityStrikethroughTextAttribute();
+public static final native long /*int*/ NSAccessibilityStrikethroughTextAttribute();
public static final NSString NSAccessibilityStrikethroughTextAttribute = new NSString(NSAccessibilityStrikethroughTextAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityStringForRangeParameterizedAttribute();
+public static final native long /*int*/ NSAccessibilityStringForRangeParameterizedAttribute();
public static final NSString NSAccessibilityStringForRangeParameterizedAttribute = new NSString(NSAccessibilityStringForRangeParameterizedAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityStyleRangeForIndexParameterizedAttribute();
+public static final native long /*int*/ NSAccessibilityStyleRangeForIndexParameterizedAttribute();
public static final NSString NSAccessibilityStyleRangeForIndexParameterizedAttribute = new NSString(NSAccessibilityStyleRangeForIndexParameterizedAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilitySubroleAttribute();
+public static final native long /*int*/ NSAccessibilitySubroleAttribute();
public static final NSString NSAccessibilitySubroleAttribute = new NSString(NSAccessibilitySubroleAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilitySuperscriptTextAttribute();
+public static final native long /*int*/ NSAccessibilitySuperscriptTextAttribute();
public static final NSString NSAccessibilitySuperscriptTextAttribute = new NSString(NSAccessibilitySuperscriptTextAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilitySystemDialogSubrole();
+public static final native long /*int*/ NSAccessibilitySystemDialogSubrole();
public static final NSString NSAccessibilitySystemDialogSubrole = new NSString(NSAccessibilitySystemDialogSubrole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityTabGroupRole();
+public static final native long /*int*/ NSAccessibilityTabGroupRole();
public static final NSString NSAccessibilityTabGroupRole = new NSString(NSAccessibilityTabGroupRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityTableRole();
+public static final native long /*int*/ NSAccessibilityTableRole();
public static final NSString NSAccessibilityTableRole = new NSString(NSAccessibilityTableRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityTableRowSubrole();
+public static final native long /*int*/ NSAccessibilityTableRowSubrole();
public static final NSString NSAccessibilityTableRowSubrole = new NSString(NSAccessibilityTableRowSubrole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityTabsAttribute();
+public static final native long /*int*/ NSAccessibilityTabsAttribute();
public static final NSString NSAccessibilityTabsAttribute = new NSString(NSAccessibilityTabsAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityTextAreaRole();
+public static final native long /*int*/ NSAccessibilityTextAreaRole();
public static final NSString NSAccessibilityTextAreaRole = new NSString(NSAccessibilityTextAreaRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityTextFieldRole();
+public static final native long /*int*/ NSAccessibilityTextFieldRole();
public static final NSString NSAccessibilityTextFieldRole = new NSString(NSAccessibilityTextFieldRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityTextLinkSubrole();
+public static final native long /*int*/ NSAccessibilityTextLinkSubrole();
public static final NSString NSAccessibilityTextLinkSubrole = new NSString(NSAccessibilityTextLinkSubrole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityTitleAttribute();
+public static final native long /*int*/ NSAccessibilityTitleAttribute();
public static final NSString NSAccessibilityTitleAttribute = new NSString(NSAccessibilityTitleAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityTitleChangedNotification();
+public static final native long /*int*/ NSAccessibilityTitleChangedNotification();
public static final NSString NSAccessibilityTitleChangedNotification = new NSString(NSAccessibilityTitleChangedNotification());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityTitleUIElementAttribute();
+public static final native long /*int*/ NSAccessibilityTitleUIElementAttribute();
public static final NSString NSAccessibilityTitleUIElementAttribute = new NSString(NSAccessibilityTitleUIElementAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityToolbarRole();
+public static final native long /*int*/ NSAccessibilityToolbarRole();
public static final NSString NSAccessibilityToolbarRole = new NSString(NSAccessibilityToolbarRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityTopLevelUIElementAttribute();
+public static final native long /*int*/ NSAccessibilityTopLevelUIElementAttribute();
public static final NSString NSAccessibilityTopLevelUIElementAttribute = new NSString(NSAccessibilityTopLevelUIElementAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityURLAttribute();
+public static final native long /*int*/ NSAccessibilityURLAttribute();
public static final NSString NSAccessibilityURLAttribute = new NSString(NSAccessibilityURLAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityUnderlineColorTextAttribute();
+public static final native long /*int*/ NSAccessibilityUnderlineColorTextAttribute();
public static final NSString NSAccessibilityUnderlineColorTextAttribute = new NSString(NSAccessibilityUnderlineColorTextAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityUnderlineTextAttribute();
+public static final native long /*int*/ NSAccessibilityUnderlineTextAttribute();
public static final NSString NSAccessibilityUnderlineTextAttribute = new NSString(NSAccessibilityUnderlineTextAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityUnknownRole();
+public static final native long /*int*/ NSAccessibilityUnknownRole();
public static final NSString NSAccessibilityUnknownRole = new NSString(NSAccessibilityUnknownRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityUnknownSubrole();
+public static final native long /*int*/ NSAccessibilityUnknownSubrole();
public static final NSString NSAccessibilityUnknownSubrole = new NSString(NSAccessibilityUnknownSubrole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityValueAttribute();
+public static final native long /*int*/ NSAccessibilityValueAttribute();
public static final NSString NSAccessibilityValueAttribute = new NSString(NSAccessibilityValueAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityValueChangedNotification();
+public static final native long /*int*/ NSAccessibilityValueChangedNotification();
public static final NSString NSAccessibilityValueChangedNotification = new NSString(NSAccessibilityValueChangedNotification());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityValueDescriptionAttribute();
+public static final native long /*int*/ NSAccessibilityValueDescriptionAttribute();
public static final NSString NSAccessibilityValueDescriptionAttribute = new NSString(NSAccessibilityValueDescriptionAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityValueIndicatorRole();
+public static final native long /*int*/ NSAccessibilityValueIndicatorRole();
public static final NSString NSAccessibilityValueIndicatorRole = new NSString(NSAccessibilityValueIndicatorRole());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityVerticalOrientationValue();
+public static final native long /*int*/ NSAccessibilityVerticalOrientationValue();
public static final NSString NSAccessibilityVerticalOrientationValue = new NSString(NSAccessibilityVerticalOrientationValue());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityVerticalScrollBarAttribute();
+public static final native long /*int*/ NSAccessibilityVerticalScrollBarAttribute();
public static final NSString NSAccessibilityVerticalScrollBarAttribute = new NSString(NSAccessibilityVerticalScrollBarAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityVisibleCharacterRangeAttribute();
+public static final native long /*int*/ NSAccessibilityVisibleCharacterRangeAttribute();
public static final NSString NSAccessibilityVisibleCharacterRangeAttribute = new NSString(NSAccessibilityVisibleCharacterRangeAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityVisibleChildrenAttribute();
+public static final native long /*int*/ NSAccessibilityVisibleChildrenAttribute();
public static final NSString NSAccessibilityVisibleChildrenAttribute = new NSString(NSAccessibilityVisibleChildrenAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityVisibleColumnsAttribute();
+public static final native long /*int*/ NSAccessibilityVisibleColumnsAttribute();
public static final NSString NSAccessibilityVisibleColumnsAttribute = new NSString(NSAccessibilityVisibleColumnsAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityVisibleNameKey();
+public static final native long /*int*/ NSAccessibilityVisibleNameKey();
public static final NSString NSAccessibilityVisibleNameKey = new NSString(NSAccessibilityVisibleNameKey());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityVisibleRowsAttribute();
+public static final native long /*int*/ NSAccessibilityVisibleRowsAttribute();
public static final NSString NSAccessibilityVisibleRowsAttribute = new NSString(NSAccessibilityVisibleRowsAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityWindowAttribute();
+public static final native long /*int*/ NSAccessibilityWindowAttribute();
public static final NSString NSAccessibilityWindowAttribute = new NSString(NSAccessibilityWindowAttribute());
/** @method flags=const */
-public static final native int /*long*/ NSAccessibilityWindowRole();
+public static final native long /*int*/ NSAccessibilityWindowRole();
public static final NSString NSAccessibilityWindowRole = new NSString(NSAccessibilityWindowRole());
/** @method flags=const */
-public static final native int /*long*/ NSApplicationDidChangeScreenParametersNotification();
+public static final native long /*int*/ NSApplicationDidChangeScreenParametersNotification();
public static final NSString NSApplicationDidChangeScreenParametersNotification = new NSString(NSApplicationDidChangeScreenParametersNotification());
/** @method flags=const */
-public static final native int /*long*/ NSAttachmentAttributeName();
+public static final native long /*int*/ NSAttachmentAttributeName();
public static final NSString NSAttachmentAttributeName = new NSString(NSAttachmentAttributeName());
/** @method flags=const */
-public static final native int /*long*/ NSBackgroundColorAttributeName();
+public static final native long /*int*/ NSBackgroundColorAttributeName();
public static final NSString NSBackgroundColorAttributeName = new NSString(NSBackgroundColorAttributeName());
/** @method flags=const */
-public static final native int /*long*/ NSBaselineOffsetAttributeName();
+public static final native long /*int*/ NSBaselineOffsetAttributeName();
public static final NSString NSBaselineOffsetAttributeName = new NSString(NSBaselineOffsetAttributeName());
/** @method flags=const */
-public static final native int /*long*/ NSCalibratedRGBColorSpace();
+public static final native long /*int*/ NSCalibratedRGBColorSpace();
public static final NSString NSCalibratedRGBColorSpace = new NSString(NSCalibratedRGBColorSpace());
/** @method flags=const */
-public static final native int /*long*/ NSCursorAttributeName();
+public static final native long /*int*/ NSCursorAttributeName();
public static final NSString NSCursorAttributeName = new NSString(NSCursorAttributeName());
/** @method flags=const */
-public static final native int /*long*/ NSDeviceRGBColorSpace();
+public static final native long /*int*/ NSDeviceRGBColorSpace();
public static final NSString NSDeviceRGBColorSpace = new NSString(NSDeviceRGBColorSpace());
/** @method flags=const */
-public static final native int /*long*/ NSDeviceResolution();
+public static final native long /*int*/ NSDeviceResolution();
public static final NSString NSDeviceResolution = new NSString(NSDeviceResolution());
/** @method flags=const */
-public static final native int /*long*/ NSDragPboard();
+public static final native long /*int*/ NSDragPboard();
public static final NSString NSDragPboard = new NSString(NSDragPboard());
/** @method flags=const */
-public static final native int /*long*/ NSEventTrackingRunLoopMode();
+public static final native long /*int*/ NSEventTrackingRunLoopMode();
public static final NSString NSEventTrackingRunLoopMode = new NSString(NSEventTrackingRunLoopMode());
/** @method flags=const */
-public static final native int /*long*/ NSFilenamesPboardType();
+public static final native long /*int*/ NSFilenamesPboardType();
public static final NSString NSFilenamesPboardType = new NSString(NSFilenamesPboardType());
/** @method flags=const */
-public static final native int /*long*/ NSFontAttributeName();
+public static final native long /*int*/ NSFontAttributeName();
public static final NSString NSFontAttributeName = new NSString(NSFontAttributeName());
/** @method flags=const */
-public static final native int /*long*/ NSForegroundColorAttributeName();
+public static final native long /*int*/ NSForegroundColorAttributeName();
public static final NSString NSForegroundColorAttributeName = new NSString(NSForegroundColorAttributeName());
/** @method flags=const */
-public static final native int /*long*/ NSHTMLPboardType();
+public static final native long /*int*/ NSHTMLPboardType();
public static final NSString NSHTMLPboardType = new NSString(NSHTMLPboardType());
/** @method flags=const */
-public static final native int /*long*/ NSLigatureAttributeName();
+public static final native long /*int*/ NSLigatureAttributeName();
public static final NSString NSLigatureAttributeName = new NSString(NSLigatureAttributeName());
/** @method flags=const */
-public static final native int /*long*/ NSLinkAttributeName();
+public static final native long /*int*/ NSLinkAttributeName();
public static final NSString NSLinkAttributeName = new NSString(NSLinkAttributeName());
/** @method flags=const */
-public static final native int /*long*/ NSModalPanelRunLoopMode();
+public static final native long /*int*/ NSModalPanelRunLoopMode();
public static final NSString NSModalPanelRunLoopMode = new NSString(NSModalPanelRunLoopMode());
/** @method flags=const */
-public static final native int /*long*/ NSObliquenessAttributeName();
+public static final native long /*int*/ NSObliquenessAttributeName();
public static final NSString NSObliquenessAttributeName = new NSString(NSObliquenessAttributeName());
/** @method flags=const */
-public static final native int /*long*/ NSOutlineViewColumnDidMoveNotification();
+public static final native long /*int*/ NSOutlineViewColumnDidMoveNotification();
public static final NSString NSOutlineViewColumnDidMoveNotification = new NSString(NSOutlineViewColumnDidMoveNotification());
/** @method flags=const */
-public static final native int /*long*/ NSParagraphStyleAttributeName();
+public static final native long /*int*/ NSParagraphStyleAttributeName();
public static final NSString NSParagraphStyleAttributeName = new NSString(NSParagraphStyleAttributeName());
/** @method flags=const */
-public static final native int /*long*/ NSPrintAllPages();
+public static final native long /*int*/ NSPrintAllPages();
public static final NSString NSPrintAllPages = new NSString(NSPrintAllPages());
/** @method flags=const */
-public static final native int /*long*/ NSPrintCopies();
+public static final native long /*int*/ NSPrintCopies();
public static final NSString NSPrintCopies = new NSString(NSPrintCopies());
/** @method flags=const */
-public static final native int /*long*/ NSPrintFirstPage();
+public static final native long /*int*/ NSPrintFirstPage();
public static final NSString NSPrintFirstPage = new NSString(NSPrintFirstPage());
/** @method flags=const */
-public static final native int /*long*/ NSPrintJobDisposition();
+public static final native long /*int*/ NSPrintJobDisposition();
public static final NSString NSPrintJobDisposition = new NSString(NSPrintJobDisposition());
/** @method flags=const */
-public static final native int /*long*/ NSPrintLastPage();
+public static final native long /*int*/ NSPrintLastPage();
public static final NSString NSPrintLastPage = new NSString(NSPrintLastPage());
/** @method flags=const */
-public static final native int /*long*/ NSPrintMustCollate();
+public static final native long /*int*/ NSPrintMustCollate();
public static final NSString NSPrintMustCollate = new NSString(NSPrintMustCollate());
/** @method flags=const */
-public static final native int /*long*/ NSPrintOrientation();
+public static final native long /*int*/ NSPrintOrientation();
public static final NSString NSPrintOrientation = new NSString(NSPrintOrientation());
/** @method flags=const */
-public static final native int /*long*/ NSPrintPreviewJob();
+public static final native long /*int*/ NSPrintPreviewJob();
public static final NSString NSPrintPreviewJob = new NSString(NSPrintPreviewJob());
/** @method flags=const */
-public static final native int /*long*/ NSPrintSaveJob();
+public static final native long /*int*/ NSPrintSaveJob();
public static final NSString NSPrintSaveJob = new NSString(NSPrintSaveJob());
/** @method flags=const */
-public static final native int /*long*/ NSPrintSavePath();
+public static final native long /*int*/ NSPrintSavePath();
public static final NSString NSPrintSavePath = new NSString(NSPrintSavePath());
/** @method flags=const */
-public static final native int /*long*/ NSPrintScalingFactor();
+public static final native long /*int*/ NSPrintScalingFactor();
public static final NSString NSPrintScalingFactor = new NSString(NSPrintScalingFactor());
/** @method flags=const */
-public static final native int /*long*/ NSPrintSpoolJob();
+public static final native long /*int*/ NSPrintSpoolJob();
public static final NSString NSPrintSpoolJob = new NSString(NSPrintSpoolJob());
/** @method flags=const */
-public static final native int /*long*/ NSRTFPboardType();
+public static final native long /*int*/ NSRTFPboardType();
public static final NSString NSRTFPboardType = new NSString(NSRTFPboardType());
/** @method flags=const */
-public static final native int /*long*/ NSSpellingStateAttributeName();
+public static final native long /*int*/ NSSpellingStateAttributeName();
public static final NSString NSSpellingStateAttributeName = new NSString(NSSpellingStateAttributeName());
/** @method flags=const */
-public static final native int /*long*/ NSStrikethroughColorAttributeName();
+public static final native long /*int*/ NSStrikethroughColorAttributeName();
public static final NSString NSStrikethroughColorAttributeName = new NSString(NSStrikethroughColorAttributeName());
/** @method flags=const */
-public static final native int /*long*/ NSStrikethroughStyleAttributeName();
+public static final native long /*int*/ NSStrikethroughStyleAttributeName();
public static final NSString NSStrikethroughStyleAttributeName = new NSString(NSStrikethroughStyleAttributeName());
/** @method flags=const */
-public static final native int /*long*/ NSStringPboardType();
+public static final native long /*int*/ NSStringPboardType();
public static final NSString NSStringPboardType = new NSString(NSStringPboardType());
/** @method flags=const */
-public static final native int /*long*/ NSStrokeWidthAttributeName();
+public static final native long /*int*/ NSStrokeWidthAttributeName();
public static final NSString NSStrokeWidthAttributeName = new NSString(NSStrokeWidthAttributeName());
/** @method flags=const */
-public static final native int /*long*/ NSSystemColorsDidChangeNotification();
+public static final native long /*int*/ NSSystemColorsDidChangeNotification();
public static final NSString NSSystemColorsDidChangeNotification = new NSString(NSSystemColorsDidChangeNotification());
/** @method flags=const */
-public static final native int /*long*/ NSTIFFPboardType();
+public static final native long /*int*/ NSTIFFPboardType();
public static final NSString NSTIFFPboardType = new NSString(NSTIFFPboardType());
/** @method flags=const */
-public static final native int /*long*/ NSTableViewColumnDidMoveNotification();
+public static final native long /*int*/ NSTableViewColumnDidMoveNotification();
public static final NSString NSTableViewColumnDidMoveNotification = new NSString(NSTableViewColumnDidMoveNotification());
/** @method flags=const */
-public static final native int /*long*/ NSToolbarCustomizeToolbarItemIdentifier();
+public static final native long /*int*/ NSToolbarCustomizeToolbarItemIdentifier();
public static final NSString NSToolbarCustomizeToolbarItemIdentifier = new NSString(NSToolbarCustomizeToolbarItemIdentifier());
/** @method flags=const */
-public static final native int /*long*/ NSToolbarDidRemoveItemNotification();
+public static final native long /*int*/ NSToolbarDidRemoveItemNotification();
public static final NSString NSToolbarDidRemoveItemNotification = new NSString(NSToolbarDidRemoveItemNotification());
/** @method flags=const */
-public static final native int /*long*/ NSToolbarFlexibleSpaceItemIdentifier();
+public static final native long /*int*/ NSToolbarFlexibleSpaceItemIdentifier();
public static final NSString NSToolbarFlexibleSpaceItemIdentifier = new NSString(NSToolbarFlexibleSpaceItemIdentifier());
/** @method flags=const */
-public static final native int /*long*/ NSToolbarPrintItemIdentifier();
+public static final native long /*int*/ NSToolbarPrintItemIdentifier();
public static final NSString NSToolbarPrintItemIdentifier = new NSString(NSToolbarPrintItemIdentifier());
/** @method flags=const */
-public static final native int /*long*/ NSToolbarSeparatorItemIdentifier();
+public static final native long /*int*/ NSToolbarSeparatorItemIdentifier();
public static final NSString NSToolbarSeparatorItemIdentifier = new NSString(NSToolbarSeparatorItemIdentifier());
/** @method flags=const */
-public static final native int /*long*/ NSToolbarShowColorsItemIdentifier();
+public static final native long /*int*/ NSToolbarShowColorsItemIdentifier();
public static final NSString NSToolbarShowColorsItemIdentifier = new NSString(NSToolbarShowColorsItemIdentifier());
/** @method flags=const */
-public static final native int /*long*/ NSToolbarShowFontsItemIdentifier();
+public static final native long /*int*/ NSToolbarShowFontsItemIdentifier();
public static final NSString NSToolbarShowFontsItemIdentifier = new NSString(NSToolbarShowFontsItemIdentifier());
/** @method flags=const */
-public static final native int /*long*/ NSToolbarSpaceItemIdentifier();
+public static final native long /*int*/ NSToolbarSpaceItemIdentifier();
public static final NSString NSToolbarSpaceItemIdentifier = new NSString(NSToolbarSpaceItemIdentifier());
/** @method flags=const */
-public static final native int /*long*/ NSToolbarWillAddItemNotification();
+public static final native long /*int*/ NSToolbarWillAddItemNotification();
public static final NSString NSToolbarWillAddItemNotification = new NSString(NSToolbarWillAddItemNotification());
/** @method flags=const */
-public static final native int /*long*/ NSURLPboardType();
+public static final native long /*int*/ NSURLPboardType();
public static final NSString NSURLPboardType = new NSString(NSURLPboardType());
/** @method flags=const */
-public static final native int /*long*/ NSUnderlineColorAttributeName();
+public static final native long /*int*/ NSUnderlineColorAttributeName();
public static final NSString NSUnderlineColorAttributeName = new NSString(NSUnderlineColorAttributeName());
/** @method flags=const */
-public static final native int /*long*/ NSUnderlineStyleAttributeName();
+public static final native long /*int*/ NSUnderlineStyleAttributeName();
public static final NSString NSUnderlineStyleAttributeName = new NSString(NSUnderlineStyleAttributeName());
/** @method flags=const */
-public static final native int /*long*/ NSViewGlobalFrameDidChangeNotification();
+public static final native long /*int*/ NSViewGlobalFrameDidChangeNotification();
public static final NSString NSViewGlobalFrameDidChangeNotification = new NSString(NSViewGlobalFrameDidChangeNotification());
/** @method flags=const */
-public static final native int /*long*/ NSWindowDidBecomeKeyNotification();
+public static final native long /*int*/ NSWindowDidBecomeKeyNotification();
public static final NSString NSWindowDidBecomeKeyNotification = new NSString(NSWindowDidBecomeKeyNotification());
/** @method flags=const */
-public static final native int /*long*/ NSWindowDidDeminiaturizeNotification();
+public static final native long /*int*/ NSWindowDidDeminiaturizeNotification();
public static final NSString NSWindowDidDeminiaturizeNotification = new NSString(NSWindowDidDeminiaturizeNotification());
/** @method flags=const */
-public static final native int /*long*/ NSWindowDidMiniaturizeNotification();
+public static final native long /*int*/ NSWindowDidMiniaturizeNotification();
public static final NSString NSWindowDidMiniaturizeNotification = new NSString(NSWindowDidMiniaturizeNotification());
/** @method flags=const */
-public static final native int /*long*/ NSWindowDidMoveNotification();
+public static final native long /*int*/ NSWindowDidMoveNotification();
public static final NSString NSWindowDidMoveNotification = new NSString(NSWindowDidMoveNotification());
/** @method flags=const */
-public static final native int /*long*/ NSWindowDidResignKeyNotification();
+public static final native long /*int*/ NSWindowDidResignKeyNotification();
public static final NSString NSWindowDidResignKeyNotification = new NSString(NSWindowDidResignKeyNotification());
/** @method flags=const */
-public static final native int /*long*/ NSWindowDidResizeNotification();
+public static final native long /*int*/ NSWindowDidResizeNotification();
public static final NSString NSWindowDidResizeNotification = new NSString(NSWindowDidResizeNotification());
/** @method flags=const */
-public static final native int /*long*/ NSWindowWillCloseNotification();
+public static final native long /*int*/ NSWindowWillCloseNotification();
public static final NSString NSWindowWillCloseNotification = new NSString(NSWindowWillCloseNotification());
/** @method flags=const */
-public static final native int /*long*/ kCFAllocatorDefault();
+public static final native long /*int*/ kCFAllocatorDefault();
/** @method flags=const */
-public static final native int /*long*/ kCFRunLoopCommonModes();
+public static final native long /*int*/ kCFRunLoopCommonModes();
/** @method flags=const */
-public static final native int /*long*/ kCTFontAttributeName();
+public static final native long /*int*/ kCTFontAttributeName();
/** @method flags=const */
-public static final native int /*long*/ kCTForegroundColorAttributeName();
+public static final native long /*int*/ kCTForegroundColorAttributeName();
/** @method flags=const */
-public static final native int /*long*/ kCTParagraphStyleAttributeName();
+public static final native long /*int*/ kCTParagraphStyleAttributeName();
/** @method flags=const */
-public static final native int /*long*/ NSDefaultRunLoopMode();
+public static final native long /*int*/ NSDefaultRunLoopMode();
public static final NSString NSDefaultRunLoopMode = new NSString(NSDefaultRunLoopMode());
/** @method flags=const */
-public static final native int /*long*/ NSErrorFailingURLStringKey();
+public static final native long /*int*/ NSErrorFailingURLStringKey();
public static final NSString NSErrorFailingURLStringKey = new NSString(NSErrorFailingURLStringKey());
/** @method flags=const */
-public static final native int /*long*/ NSLocaleLanguageCode();
+public static final native long /*int*/ NSLocaleLanguageCode();
public static final NSString NSLocaleLanguageCode = new NSString(NSLocaleLanguageCode());
/** Functions */
@@ -3161,110 +3161,110 @@ public static final NSString NSLocaleLanguageCode = new NSString(NSLocaleLanguag
/**
* @param action cast=(NSString*)
*/
-public static final native int /*long*/ NSAccessibilityActionDescription(int /*long*/ action);
+public static final native long /*int*/ NSAccessibilityActionDescription(long /*int*/ action);
/**
* @param element cast=(id)
* @param notification cast=(NSString*)
*/
-public static final native void NSAccessibilityPostNotification(int /*long*/ element, int /*long*/ notification);
+public static final native void NSAccessibilityPostNotification(long /*int*/ element, long /*int*/ notification);
/**
* @param element cast=(id)
* @param attribute cast=(NSString*)
* @param value cast=(id)
*/
-public static final native void NSAccessibilityRaiseBadArgumentException(int /*long*/ element, int /*long*/ attribute, int /*long*/ value);
+public static final native void NSAccessibilityRaiseBadArgumentException(long /*int*/ element, long /*int*/ attribute, long /*int*/ value);
/**
* @param role cast=(NSString*)
* @param subrole cast=(NSString*)
*/
-public static final native int /*long*/ NSAccessibilityRoleDescription(int /*long*/ role, int /*long*/ subrole);
+public static final native long /*int*/ NSAccessibilityRoleDescription(long /*int*/ role, long /*int*/ subrole);
/**
* @param element cast=(id)
*/
-public static final native int /*long*/ NSAccessibilityRoleDescriptionForUIElement(int /*long*/ element);
+public static final native long /*int*/ NSAccessibilityRoleDescriptionForUIElement(long /*int*/ element);
/**
* @param element cast=(id)
*/
-public static final native int /*long*/ NSAccessibilityUnignoredAncestor(int /*long*/ element);
+public static final native long /*int*/ NSAccessibilityUnignoredAncestor(long /*int*/ element);
/**
* @param originalChildren cast=(NSArray*)
*/
-public static final native int /*long*/ NSAccessibilityUnignoredChildren(int /*long*/ originalChildren);
+public static final native long /*int*/ NSAccessibilityUnignoredChildren(long /*int*/ originalChildren);
/**
* @param originalChild cast=(id)
*/
-public static final native int /*long*/ NSAccessibilityUnignoredChildrenForOnlyChild(int /*long*/ originalChild);
+public static final native long /*int*/ NSAccessibilityUnignoredChildrenForOnlyChild(long /*int*/ originalChild);
/**
* @param element cast=(id)
*/
-public static final native int /*long*/ NSAccessibilityUnignoredDescendant(int /*long*/ element);
+public static final native long /*int*/ NSAccessibilityUnignoredDescendant(long /*int*/ element);
public static final native void NSBeep();
/**
* @param depth cast=(NSWindowDepth)
*/
-public static final native int /*long*/ NSBitsPerPixelFromDepth(int depth);
+public static final native long /*int*/ NSBitsPerPixelFromDepth(int depth);
/**
* @param srcGState cast=(NSInteger)
* @param srcRect flags=struct
* @param destPoint flags=struct
*/
-public static final native void NSCopyBits(int /*long*/ srcGState, NSRect srcRect, NSPoint destPoint);
+public static final native void NSCopyBits(long /*int*/ srcGState, NSRect srcRect, NSPoint destPoint);
/**
* @param count cast=(NSInteger*)
*/
-public static final native void NSCountWindows(int[] /*long[]*/ count);
+public static final native void NSCountWindows(long[] /*int[]*/ count);
/**
* @param colorSpaceName cast=(NSString*)
*/
-public static final native int /*long*/ NSNumberOfColorComponents(int /*long*/ colorSpaceName);
+public static final native long /*int*/ NSNumberOfColorComponents(long /*int*/ colorSpaceName);
/**
* @param aRect flags=struct
* @param op cast=(NSCompositingOperation)
*/
-public static final native void NSRectFillUsingOperation(NSRect aRect, int /*long*/ op);
+public static final native void NSRectFillUsingOperation(NSRect aRect, long /*int*/ op);
/**
* @param size cast=(NSInteger)
* @param list cast=(NSInteger*)
*/
-public static final native void NSWindowList(int /*long*/ size, int[] /*long[]*/ list);
+public static final native void NSWindowList(long /*int*/ size, long[] /*int[]*/ list);
/**
* @param alloc cast=(CFAllocatorRef)
* @param str cast=(CFStringRef)
* @param attributes cast=(CFDictionaryRef)
*/
-public static final native int /*long*/ CFAttributedStringCreate(int /*long*/ alloc, int /*long*/ str, int /*long*/ attributes);
+public static final native long /*int*/ CFAttributedStringCreate(long /*int*/ alloc, long /*int*/ str, long /*int*/ attributes);
/**
* @param theData cast=(CFDataRef)
*/
-public static final native int /*long*/ CFDataGetBytePtr(int /*long*/ theData);
+public static final native long /*int*/ CFDataGetBytePtr(long /*int*/ theData);
/**
* @param theData cast=(CFDataRef)
*/
-public static final native int /*long*/ CFDataGetLength(int /*long*/ theData);
+public static final native long /*int*/ CFDataGetLength(long /*int*/ theData);
/**
* @param theDict cast=(CFMutableDictionaryRef)
* @param key cast=(void*)
* @param value cast=(void*)
*/
-public static final native void CFDictionaryAddValue(int /*long*/ theDict, int /*long*/ key, int /*long*/ value);
+public static final native void CFDictionaryAddValue(long /*int*/ theDict, long /*int*/ key, long /*int*/ value);
/**
* @param allocator cast=(CFAllocatorRef)
* @param capacity cast=(CFIndex)
* @param keyCallBacks cast=(CFDictionaryKeyCallBacks*)
* @param valueCallBacks cast=(CFDictionaryValueCallBacks*)
*/
-public static final native int /*long*/ CFDictionaryCreateMutable(int /*long*/ allocator, int /*long*/ capacity, int /*long*/ keyCallBacks, int /*long*/ valueCallBacks);
+public static final native long /*int*/ CFDictionaryCreateMutable(long /*int*/ allocator, long /*int*/ capacity, long /*int*/ keyCallBacks, long /*int*/ valueCallBacks);
/**
* @param cf cast=(CFTypeRef)
*/
-public static final native void CFRelease(int /*long*/ cf);
+public static final native void CFRelease(long /*int*/ cf);
/**
* @param rl cast=(CFRunLoopRef)
* @param observer cast=(CFRunLoopObserverRef)
* @param mode cast=(CFStringRef)
*/
-public static final native void CFRunLoopAddObserver(int /*long*/ rl, int /*long*/ observer, int /*long*/ mode);
-public static final native int /*long*/ CFRunLoopGetCurrent();
+public static final native void CFRunLoopAddObserver(long /*int*/ rl, long /*int*/ observer, long /*int*/ mode);
+public static final native long /*int*/ CFRunLoopGetCurrent();
/**
* @param allocator cast=(CFAllocatorRef)
* @param activities cast=(CFOptionFlags)
@@ -3273,32 +3273,32 @@ public static final native int /*long*/ CFRunLoopGetCurrent();
* @param callout cast=(CFRunLoopObserverCallBack)
* @param context cast=(CFRunLoopObserverContext*)
*/
-public static final native int /*long*/ CFRunLoopObserverCreate(int /*long*/ allocator, int /*long*/ activities, boolean repeats, int /*long*/ order, int /*long*/ callout, int /*long*/ context);
+public static final native long /*int*/ CFRunLoopObserverCreate(long /*int*/ allocator, long /*int*/ activities, boolean repeats, long /*int*/ order, long /*int*/ callout, long /*int*/ context);
/**
* @param observer cast=(CFRunLoopObserverRef)
*/
-public static final native void CFRunLoopObserverInvalidate(int /*long*/ observer);
+public static final native void CFRunLoopObserverInvalidate(long /*int*/ observer);
/**
* @param mode cast=(CFStringRef)
* @param seconds cast=(CFTimeInterval)
* @param returnAfterSourceHandled cast=(Boolean)
*/
-public static final native int CFRunLoopRunInMode(int /*long*/ mode, double seconds, boolean returnAfterSourceHandled);
+public static final native int CFRunLoopRunInMode(long /*int*/ mode, double seconds, boolean returnAfterSourceHandled);
/**
* @param rl cast=(CFRunLoopRef)
*/
-public static final native void CFRunLoopStop(int /*long*/ rl);
+public static final native void CFRunLoopStop(long /*int*/ rl);
/**
* @param alloc cast=(CFAllocatorRef)
* @param chars cast=(UniChar*)
* @param numChars cast=(CFIndex)
*/
-public static final native int /*long*/ CFStringCreateWithCharacters(int /*long*/ alloc, char[] chars, int /*long*/ numChars);
+public static final native long /*int*/ CFStringCreateWithCharacters(long /*int*/ alloc, char[] chars, long /*int*/ numChars);
/**
* @param allocator cast=(CFAllocatorRef)
* @param fsRef cast=(struct FSRef*)
*/
-public static final native int /*long*/ CFURLCreateFromFSRef(int /*long*/ allocator, byte[] fsRef);
+public static final native long /*int*/ CFURLCreateFromFSRef(long /*int*/ allocator, byte[] fsRef);
/**
* @param allocator cast=(CFAllocatorRef)
* @param originalString cast=(CFStringRef)
@@ -3306,7 +3306,7 @@ public static final native int /*long*/ CFURLCreateFromFSRef(int /*long*/ alloca
* @param legalURLCharactersToBeEscaped cast=(CFStringRef)
* @param encoding cast=(CFStringEncoding)
*/
-public static final native int /*long*/ CFURLCreateStringByAddingPercentEscapes(int /*long*/ allocator, int /*long*/ originalString, int /*long*/ charactersToLeaveUnescaped, int /*long*/ legalURLCharactersToBeEscaped, int encoding);
+public static final native long /*int*/ CFURLCreateStringByAddingPercentEscapes(long /*int*/ allocator, long /*int*/ originalString, long /*int*/ charactersToLeaveUnescaped, long /*int*/ legalURLCharactersToBeEscaped, int encoding);
/**
* @param data cast=(void*)
* @param width cast=(size_t)
@@ -3316,210 +3316,210 @@ public static final native int /*long*/ CFURLCreateStringByAddingPercentEscapes(
* @param colorspace cast=(CGColorSpaceRef)
* @param bitmapInfo cast=(CGBitmapInfo)
*/
-public static final native int /*long*/ CGBitmapContextCreate(int /*long*/ data, int /*long*/ width, int /*long*/ height, int /*long*/ bitsPerComponent, int /*long*/ bytesPerRow, int /*long*/ colorspace, int bitmapInfo);
+public static final native long /*int*/ CGBitmapContextCreate(long /*int*/ data, long /*int*/ width, long /*int*/ height, long /*int*/ bitsPerComponent, long /*int*/ bytesPerRow, long /*int*/ colorspace, int bitmapInfo);
/**
* @param c cast=(CGContextRef)
*/
-public static final native int /*long*/ CGBitmapContextCreateImage(int /*long*/ c);
+public static final native long /*int*/ CGBitmapContextCreateImage(long /*int*/ c);
/**
* @param c cast=(CGContextRef)
*/
-public static final native int /*long*/ CGBitmapContextGetData(int /*long*/ c);
+public static final native long /*int*/ CGBitmapContextGetData(long /*int*/ c);
/**
* @param space cast=(CGColorSpaceRef)
* @param components cast=(CGFloat*)
*/
-public static final native int /*long*/ CGColorCreate(int /*long*/ space, float[] /*double[]*/ components);
+public static final native long /*int*/ CGColorCreate(long /*int*/ space, double[] /*float[]*/ components);
/**
* @param color cast=(CGColorRef)
*/
-public static final native void CGColorRelease(int /*long*/ color);
-public static final native int /*long*/ CGColorSpaceCreateDeviceRGB();
+public static final native void CGColorRelease(long /*int*/ color);
+public static final native long /*int*/ CGColorSpaceCreateDeviceRGB();
/**
* @param space cast=(CGColorSpaceRef)
*/
-public static final native void CGColorSpaceRelease(int /*long*/ space);
+public static final native void CGColorSpaceRelease(long /*int*/ space);
/**
* @param context cast=(CGContextRef)
* @param path cast=(CGPathRef)
*/
-public static final native void CGContextAddPath(int /*long*/ context, int /*long*/ path);
+public static final native void CGContextAddPath(long /*int*/ context, long /*int*/ path);
/**
* @param context cast=(CGContextRef)
* @param rect flags=struct
* @param auxiliaryInfo cast=(CFDictionaryRef)
*/
-public static final native void CGContextBeginTransparencyLayerWithRect(int /*long*/ context, CGRect rect, int /*long*/ auxiliaryInfo);
+public static final native void CGContextBeginTransparencyLayerWithRect(long /*int*/ context, CGRect rect, long /*int*/ auxiliaryInfo);
/**
* @param c cast=(CGContextRef)
* @param rect flags=struct
* @param image cast=(CGImageRef)
*/
-public static final native void CGContextDrawImage(int /*long*/ c, CGRect rect, int /*long*/ image);
+public static final native void CGContextDrawImage(long /*int*/ c, CGRect rect, long /*int*/ image);
/**
* @param context cast=(CGContextRef)
*/
-public static final native void CGContextEndTransparencyLayer(int /*long*/ context);
+public static final native void CGContextEndTransparencyLayer(long /*int*/ context);
/**
* @param c cast=(CGContextRef)
* @param rect flags=struct
*/
-public static final native void CGContextFillRect(int /*long*/ c, CGRect rect);
+public static final native void CGContextFillRect(long /*int*/ c, CGRect rect);
/**
* @param c cast=(CGContextRef)
*/
-public static final native void CGContextRelease(int /*long*/ c);
+public static final native void CGContextRelease(long /*int*/ c);
/**
* @param c cast=(CGContextRef)
*/
-public static final native void CGContextReplacePathWithStrokedPath(int /*long*/ c);
+public static final native void CGContextReplacePathWithStrokedPath(long /*int*/ c);
/**
* @param c cast=(CGContextRef)
*/
-public static final native void CGContextRestoreGState(int /*long*/ c);
+public static final native void CGContextRestoreGState(long /*int*/ c);
/**
* @param c cast=(CGContextRef)
*/
-public static final native void CGContextSaveGState(int /*long*/ c);
+public static final native void CGContextSaveGState(long /*int*/ c);
/**
* @param c cast=(CGContextRef)
* @param sx cast=(CGFloat)
* @param sy cast=(CGFloat)
*/
-public static final native void CGContextScaleCTM(int /*long*/ c, float /*double*/ sx, float /*double*/ sy);
+public static final native void CGContextScaleCTM(long /*int*/ c, double /*float*/ sx, double /*float*/ sy);
/**
* @param context cast=(CGContextRef)
* @param mode cast=(CGBlendMode)
*/
-public static final native void CGContextSetBlendMode(int /*long*/ context, int mode);
+public static final native void CGContextSetBlendMode(long /*int*/ context, int mode);
/**
* @param c cast=(CGContextRef)
* @param components cast=(CGFloat*)
*/
-public static final native void CGContextSetFillColor(int /*long*/ c, float[] /*double[]*/ components);
+public static final native void CGContextSetFillColor(long /*int*/ c, double[] /*float[]*/ components);
/**
* @param c cast=(CGContextRef)
* @param colorspace cast=(CGColorSpaceRef)
*/
-public static final native void CGContextSetFillColorSpace(int /*long*/ c, int /*long*/ colorspace);
+public static final native void CGContextSetFillColorSpace(long /*int*/ c, long /*int*/ colorspace);
/**
* @param c cast=(CGContextRef)
* @param cap cast=(CGLineCap)
*/
-public static final native void CGContextSetLineCap(int /*long*/ c, int cap);
+public static final native void CGContextSetLineCap(long /*int*/ c, int cap);
/**
* @param c cast=(CGContextRef)
* @param phase cast=(CGFloat)
* @param lengths cast=(CGFloat*)
* @param count cast=(size_t)
*/
-public static final native void CGContextSetLineDash(int /*long*/ c, float /*double*/ phase, float[] lengths, int /*long*/ count);
+public static final native void CGContextSetLineDash(long /*int*/ c, double /*float*/ phase, float[] lengths, long /*int*/ count);
/**
* @param c cast=(CGContextRef)
* @param join cast=(CGLineJoin)
*/
-public static final native void CGContextSetLineJoin(int /*long*/ c, int join);
+public static final native void CGContextSetLineJoin(long /*int*/ c, int join);
/**
* @param c cast=(CGContextRef)
* @param width cast=(CGFloat)
*/
-public static final native void CGContextSetLineWidth(int /*long*/ c, float /*double*/ width);
+public static final native void CGContextSetLineWidth(long /*int*/ c, double /*float*/ width);
/**
* @param c cast=(CGContextRef)
* @param limit cast=(CGFloat)
*/
-public static final native void CGContextSetMiterLimit(int /*long*/ c, float /*double*/ limit);
+public static final native void CGContextSetMiterLimit(long /*int*/ c, double /*float*/ limit);
/**
* @param c cast=(CGContextRef)
* @param shouldAntialias cast=(_Bool)
*/
-public static final native void CGContextSetShouldAntialias(int /*long*/ c, boolean shouldAntialias);
+public static final native void CGContextSetShouldAntialias(long /*int*/ c, boolean shouldAntialias);
/**
* @param c cast=(CGContextRef)
* @param mode cast=(CGTextDrawingMode)
*/
-public static final native void CGContextSetTextDrawingMode(int /*long*/ c, int mode);
+public static final native void CGContextSetTextDrawingMode(long /*int*/ c, int mode);
/**
* @param c cast=(CGContextRef)
* @param t flags=struct
*/
-public static final native void CGContextSetTextMatrix(int /*long*/ c, CGAffineTransform t);
+public static final native void CGContextSetTextMatrix(long /*int*/ c, CGAffineTransform t);
/**
* @param c cast=(CGContextRef)
* @param x cast=(CGFloat)
* @param y cast=(CGFloat)
*/
-public static final native void CGContextSetTextPosition(int /*long*/ c, float /*double*/ x, float /*double*/ y);
+public static final native void CGContextSetTextPosition(long /*int*/ c, double /*float*/ x, double /*float*/ y);
/**
* @param c cast=(CGContextRef)
*/
-public static final native void CGContextStrokePath(int /*long*/ c);
+public static final native void CGContextStrokePath(long /*int*/ c);
/**
* @param c cast=(CGContextRef)
* @param tx cast=(CGFloat)
* @param ty cast=(CGFloat)
*/
-public static final native void CGContextTranslateCTM(int /*long*/ c, float /*double*/ tx, float /*double*/ ty);
+public static final native void CGContextTranslateCTM(long /*int*/ c, double /*float*/ tx, double /*float*/ ty);
/**
* @param info cast=(void*)
* @param data cast=(void*)
* @param size cast=(size_t)
* @param releaseData cast=(CGDataProviderReleaseDataCallback)
*/
-public static final native int /*long*/ CGDataProviderCreateWithData(int /*long*/ info, int /*long*/ data, int /*long*/ size, int /*long*/ releaseData);
+public static final native long /*int*/ CGDataProviderCreateWithData(long /*int*/ info, long /*int*/ data, long /*int*/ size, long /*int*/ releaseData);
/**
* @param provider cast=(CGDataProviderRef)
*/
-public static final native void CGDataProviderRelease(int /*long*/ provider);
+public static final native void CGDataProviderRelease(long /*int*/ provider);
/**
* @param display cast=(CGDirectDisplayID)
*/
-public static final native int /*long*/ CGDisplayPixelsHigh(int display);
+public static final native long /*int*/ CGDisplayPixelsHigh(int display);
/**
* @param display cast=(CGDirectDisplayID)
*/
-public static final native int /*long*/ CGDisplayPixelsWide(int display);
+public static final native long /*int*/ CGDisplayPixelsWide(int display);
/**
* @param source cast=(CGEventSourceRef)
* @param virtualKey cast=(CGKeyCode)
* @param keyDown cast=(_Bool)
*/
-public static final native int /*long*/ CGEventCreateKeyboardEvent(int /*long*/ source, short virtualKey, boolean keyDown);
+public static final native long /*int*/ CGEventCreateKeyboardEvent(long /*int*/ source, short virtualKey, boolean keyDown);
/**
* @param source cast=(CGEventSourceRef)
* @param mouseType cast=(CGEventType)
* @param mouseCursorPosition flags=struct
* @param mouseButton cast=(CGMouseButton)
*/
-public static final native int /*long*/ CGEventCreateMouseEvent(int /*long*/ source, int mouseType, CGPoint mouseCursorPosition, int mouseButton);
+public static final native long /*int*/ CGEventCreateMouseEvent(long /*int*/ source, int mouseType, CGPoint mouseCursorPosition, int mouseButton);
/**
* @param source cast=(CGEventSourceRef)
* @param units cast=(CGScrollEventUnit)
* @param wheelCount cast=(CGWheelCount)
* @param wheel1 cast=(int32_t)
*/
-public static final native int /*long*/ CGEventCreateScrollWheelEvent(int /*long*/ source, int units, int wheelCount, int wheel1);
+public static final native long /*int*/ CGEventCreateScrollWheelEvent(long /*int*/ source, int units, int wheelCount, int wheel1);
/**
* @param event cast=(CGEventRef)
* @param field cast=(CGEventField)
*/
-public static final native long CGEventGetIntegerValueField(int /*long*/ event, int field);
+public static final native long CGEventGetIntegerValueField(long /*int*/ event, int field);
/**
* @param tap cast=(CGEventTapLocation)
* @param event cast=(CGEventRef)
*/
-public static final native void CGEventPost(int tap, int /*long*/ event);
+public static final native void CGEventPost(int tap, long /*int*/ event);
/**
* @param sourceState cast=(CGEventSourceStateID)
*/
-public static final native int /*long*/ CGEventSourceCreate(int sourceState);
+public static final native long /*int*/ CGEventSourceCreate(int sourceState);
/**
* @param rect flags=struct
* @param maxDisplays cast=(CGDisplayCount)
* @param dspys cast=(CGDirectDisplayID*)
* @param dspyCnt cast=(CGDisplayCount*)
*/
-public static final native int CGGetDisplaysWithRect(CGRect rect, int maxDisplays, int /*long*/ dspys, int /*long*/ dspyCnt);
+public static final native int CGGetDisplaysWithRect(CGRect rect, int maxDisplays, long /*int*/ dspys, long /*int*/ dspyCnt);
/**
* @param width cast=(size_t)
* @param height cast=(size_t)
@@ -3533,19 +3533,19 @@ public static final native int CGGetDisplaysWithRect(CGRect rect, int maxDisplay
* @param shouldInterpolate cast=(_Bool)
* @param intent cast=(CGColorRenderingIntent)
*/
-public static final native int /*long*/ CGImageCreate(int /*long*/ width, int /*long*/ height, int /*long*/ bitsPerComponent, int /*long*/ bitsPerPixel, int /*long*/ bytesPerRow, int /*long*/ colorspace, int bitmapInfo, int /*long*/ provider, int /*long*/ decode, boolean shouldInterpolate, int intent);
+public static final native long /*int*/ CGImageCreate(long /*int*/ width, long /*int*/ height, long /*int*/ bitsPerComponent, long /*int*/ bitsPerPixel, long /*int*/ bytesPerRow, long /*int*/ colorspace, int bitmapInfo, long /*int*/ provider, long /*int*/ decode, boolean shouldInterpolate, int intent);
/**
* @param image cast=(CGImageRef)
*/
-public static final native int /*long*/ CGImageGetHeight(int /*long*/ image);
+public static final native long /*int*/ CGImageGetHeight(long /*int*/ image);
/**
* @param image cast=(CGImageRef)
*/
-public static final native int /*long*/ CGImageGetWidth(int /*long*/ image);
+public static final native long /*int*/ CGImageGetWidth(long /*int*/ image);
/**
* @param image cast=(CGImageRef)
*/
-public static final native void CGImageRelease(int /*long*/ image);
+public static final native void CGImageRelease(long /*int*/ image);
/**
* @param path cast=(CGMutablePathRef)
* @param m cast=(CGAffineTransform*)
@@ -3556,46 +3556,46 @@ public static final native void CGImageRelease(int /*long*/ image);
* @param x cast=(CGFloat)
* @param y cast=(CGFloat)
*/
-public static final native void CGPathAddCurveToPoint(int /*long*/ path, int /*long*/ m, float /*double*/ cp1x, float /*double*/ cp1y, float /*double*/ cp2x, float /*double*/ cp2y, float /*double*/ x, float /*double*/ y);
+public static final native void CGPathAddCurveToPoint(long /*int*/ path, long /*int*/ m, double /*float*/ cp1x, double /*float*/ cp1y, double /*float*/ cp2x, double /*float*/ cp2y, double /*float*/ x, double /*float*/ y);
/**
* @param path cast=(CGMutablePathRef)
* @param m cast=(CGAffineTransform*)
* @param x cast=(CGFloat)
* @param y cast=(CGFloat)
*/
-public static final native void CGPathAddLineToPoint(int /*long*/ path, int /*long*/ m, float /*double*/ x, float /*double*/ y);
+public static final native void CGPathAddLineToPoint(long /*int*/ path, long /*int*/ m, double /*float*/ x, double /*float*/ y);
/**
* @param path cast=(CGMutablePathRef)
* @param m cast=(CGAffineTransform*)
* @param rect flags=struct
*/
-public static final native void CGPathAddRect(int /*long*/ path, int /*long*/ m, CGRect rect);
+public static final native void CGPathAddRect(long /*int*/ path, long /*int*/ m, CGRect rect);
/**
* @param path cast=(CGPathRef)
* @param info cast=(void*)
* @param function cast=(CGPathApplierFunction)
*/
-public static final native void CGPathApply(int /*long*/ path, int /*long*/ info, int /*long*/ function);
+public static final native void CGPathApply(long /*int*/ path, long /*int*/ info, long /*int*/ function);
/**
* @param path cast=(CGMutablePathRef)
*/
-public static final native void CGPathCloseSubpath(int /*long*/ path);
+public static final native void CGPathCloseSubpath(long /*int*/ path);
/**
* @param path cast=(CGPathRef)
*/
-public static final native int /*long*/ CGPathCreateCopy(int /*long*/ path);
-public static final native int /*long*/ CGPathCreateMutable();
+public static final native long /*int*/ CGPathCreateCopy(long /*int*/ path);
+public static final native long /*int*/ CGPathCreateMutable();
/**
* @param path cast=(CGMutablePathRef)
* @param m cast=(CGAffineTransform*)
* @param x cast=(CGFloat)
* @param y cast=(CGFloat)
*/
-public static final native void CGPathMoveToPoint(int /*long*/ path, int /*long*/ m, float /*double*/ x, float /*double*/ y);
+public static final native void CGPathMoveToPoint(long /*int*/ path, long /*int*/ m, double /*float*/ x, double /*float*/ y);
/**
* @param path cast=(CGPathRef)
*/
-public static final native void CGPathRelease(int /*long*/ path);
+public static final native void CGPathRelease(long /*int*/ path);
/**
* @param keyChar cast=(CGCharCode)
* @param virtualKey cast=(CGKeyCode)
@@ -3618,51 +3618,51 @@ public static final native int CGWarpMouseCursorPosition(CGPoint newCursorPositi
/**
* @param font cast=(CTFontRef)
*/
-public static final native float /*double*/ CTFontGetAscent(int /*long*/ font);
+public static final native double /*float*/ CTFontGetAscent(long /*int*/ font);
/**
* @param font cast=(CTFontRef)
*/
-public static final native float /*double*/ CTFontGetDescent(int /*long*/ font);
+public static final native double /*float*/ CTFontGetDescent(long /*int*/ font);
/**
* @param font cast=(CTFontRef)
*/
-public static final native float /*double*/ CTFontGetLeading(int /*long*/ font);
+public static final native double /*float*/ CTFontGetLeading(long /*int*/ font);
/**
* @param string cast=(CFAttributedStringRef)
*/
-public static final native int /*long*/ CTLineCreateWithAttributedString(int /*long*/ string);
+public static final native long /*int*/ CTLineCreateWithAttributedString(long /*int*/ string);
/**
* @param line cast=(CTLineRef)
* @param context cast=(CGContextRef)
*/
-public static final native void CTLineDraw(int /*long*/ line, int /*long*/ context);
+public static final native void CTLineDraw(long /*int*/ line, long /*int*/ context);
/**
* @param line cast=(CTLineRef)
* @param ascent cast=(CGFloat*)
* @param descent cast=(CGFloat*)
* @param leading cast=(CGFloat*)
*/
-public static final native double CTLineGetTypographicBounds(int /*long*/ line, float[] /*double[]*/ ascent, float[] /*double[]*/ descent, float[] /*double[]*/ leading);
+public static final native double CTLineGetTypographicBounds(long /*int*/ line, double[] /*float[]*/ ascent, double[] /*float[]*/ descent, double[] /*float[]*/ leading);
/**
* @param settings cast=(CTParagraphStyleSetting*)
* @param settingCount cast=(CFIndex)
*/
-public static final native int /*long*/ CTParagraphStyleCreate(int /*long*/ settings, int /*long*/ settingCount);
+public static final native long /*int*/ CTParagraphStyleCreate(long /*int*/ settings, long /*int*/ settingCount);
/**
* @param typesetter cast=(CTTypesetterRef)
* @param stringRange flags=struct
*/
-public static final native int /*long*/ CTTypesetterCreateLine(int /*long*/ typesetter, CFRange stringRange);
+public static final native long /*int*/ CTTypesetterCreateLine(long /*int*/ typesetter, CFRange stringRange);
/**
* @param string cast=(CFAttributedStringRef)
*/
-public static final native int /*long*/ CTTypesetterCreateWithAttributedString(int /*long*/ string);
+public static final native long /*int*/ CTTypesetterCreateWithAttributedString(long /*int*/ string);
/**
* @param typesetter cast=(CTTypesetterRef)
* @param startIndex cast=(CFIndex)
* @param width cast=(double)
*/
-public static final native int /*long*/ CTTypesetterSuggestLineBreak(int /*long*/ typesetter, int /*long*/ startIndex, double width);
+public static final native long /*int*/ CTTypesetterSuggestLineBreak(long /*int*/ typesetter, long /*int*/ startIndex, double width);
/**
* @param aRect flags=struct
* @param bRect flags=struct
@@ -3671,13 +3671,13 @@ public static final native boolean NSEqualRects(NSRect aRect, NSRect bRect);
/**
* @param hfsFileTypeCode cast=(OSType)
*/
-public static final native int /*long*/ NSFileTypeForHFSTypeCode(int hfsFileTypeCode);
+public static final native long /*int*/ NSFileTypeForHFSTypeCode(int hfsFileTypeCode);
/**
* @param typePtr cast=(char*)
* @param sizep cast=(NSUInteger*)
* @param alignp cast=(NSUInteger*)
*/
-public static final native int /*long*/ NSGetSizeAndAlignment(int /*long*/ typePtr, int[] /*long[]*/ sizep, int[] /*long[]*/ alignp);
+public static final native long /*int*/ NSGetSizeAndAlignment(long /*int*/ typePtr, long[] /*int[]*/ sizep, long[] /*int[]*/ alignp);
/**
* @param aPoint flags=struct
* @param aRect flags=struct
@@ -3688,8 +3688,8 @@ public static final native boolean NSPointInRect(NSPoint aPoint, NSRect aRect);
* @param domainMask cast=(NSSearchPathDomainMask)
* @param expandTilde cast=(BOOL)
*/
-public static final native int /*long*/ NSSearchPathForDirectoriesInDomains(int /*long*/ directory, int /*long*/ domainMask, boolean expandTilde);
-public static final native int /*long*/ NSTemporaryDirectory();
+public static final native long /*int*/ NSSearchPathForDirectoriesInDomains(long /*int*/ directory, long /*int*/ domainMask, boolean expandTilde);
+public static final native long /*int*/ NSTemporaryDirectory();
/** Super Sends */
@@ -3697,418 +3697,418 @@ public static final native int /*long*/ NSTemporaryDirectory();
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native boolean objc_msgSendSuper_bool(objc_super superId, int /*long*/ sel, NSRange arg0, int /*long*/ arg1);
+public static final native boolean objc_msgSendSuper_bool(objc_super superId, long /*int*/ sel, NSRange arg0, long /*int*/ arg1);
/**
* @method flags=cast
* @param arg1 flags=struct
*/
-public static final native boolean objc_msgSendSuper_bool(objc_super superId, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1);
+public static final native boolean objc_msgSendSuper_bool(objc_super superId, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel);
+public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, NSPoint arg0);
+public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, NSPoint arg0);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, NSRect arg0);
+public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, NSRect arg0);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, NSRect arg0, int /*long*/ arg1);
+public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, NSRect arg0, long /*int*/ arg1);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, NSSize arg0);
+public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, NSSize arg0);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, boolean arg0);
+public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, boolean arg0);
/**
* @method flags=cast
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, boolean arg0, NSRect arg1);
+public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, boolean arg0, NSRect arg1);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, int /*long*/ arg0);
+public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, long /*int*/ arg0);
/**
* @method flags=cast
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1);
+public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1);
/**
* @method flags=cast
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1, int /*long*/ arg2);
+public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1, long /*int*/ arg2);
/**
* @method flags=cast
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, int /*long*/ arg0, NSRect arg1, int /*long*/ arg2);
+public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, long /*int*/ arg0, NSRect arg1, long /*int*/ arg2);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, int /*long*/ arg0, boolean arg1);
+public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, long /*int*/ arg0, boolean arg1);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1);
+public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, boolean arg3);
+public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, boolean arg3);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSendSuper(objc_super superId, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3);
+public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native void objc_msgSendSuper_stret(NSRect result, objc_super superId, int /*long*/ sel, NSRect arg0);
+public static final native void objc_msgSendSuper_stret(NSRect result, objc_super superId, long /*int*/ sel, NSRect arg0);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native void objc_msgSendSuper_stret(NSRect result, objc_super superId, int /*long*/ sel, NSRect arg0, int /*long*/ arg1);
+public static final native void objc_msgSendSuper_stret(NSRect result, objc_super superId, long /*int*/ sel, NSRect arg0, long /*int*/ arg1);
/** @method flags=cast */
-public static final native void objc_msgSendSuper_stret(NSRect result, objc_super superId, int /*long*/ sel, int /*long*/ arg0);
+public static final native void objc_msgSendSuper_stret(NSRect result, objc_super superId, long /*int*/ sel, long /*int*/ arg0);
/**
* @method flags=cast
* @param arg1 flags=struct
*/
-public static final native void objc_msgSendSuper_stret(NSRect result, objc_super superId, int /*long*/ sel, int /*long*/ arg0, NSRect arg1, int /*long*/ arg2);
+public static final native void objc_msgSendSuper_stret(NSRect result, objc_super superId, long /*int*/ sel, long /*int*/ arg0, NSRect arg1, long /*int*/ arg2);
/** @method flags=cast */
-public static final native void objc_msgSendSuper_stret(NSSize result, objc_super superId, int /*long*/ sel);
+public static final native void objc_msgSendSuper_stret(NSSize result, objc_super superId, long /*int*/ sel);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native void objc_msgSendSuper_stret(NSSize result, objc_super superId, int /*long*/ sel, NSRect arg0);
+public static final native void objc_msgSendSuper_stret(NSSize result, objc_super superId, long /*int*/ sel, NSRect arg0);
/** @method flags=cast */
-public static final native void objc_msgSendSuper_stret(NSSize result, objc_super superId, int /*long*/ sel, boolean arg0);
+public static final native void objc_msgSendSuper_stret(NSSize result, objc_super superId, long /*int*/ sel, boolean arg0);
/** Sends */
/** @method flags=cast */
-public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel);
+public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, NSPoint arg0);
+public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, NSPoint arg0);
/**
* @method flags=cast
* @param arg0 flags=struct
* @param arg1 flags=struct
*/
-public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, NSPoint arg0, NSRect arg1);
+public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, NSPoint arg0, NSRect arg1);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, NSRange arg0, int /*long*/ arg1);
+public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, NSRange arg0, long /*int*/ arg1);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, NSRect arg0);
+public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, NSRect arg0);
/** @method flags=cast */
-public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0);
+public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0);
/**
* @method flags=cast
* @param arg1 flags=struct
*/
-public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1);
+public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1);
/**
* @method flags=cast
* @param arg1 flags=struct
*/
-public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSSize arg1, boolean arg2);
+public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSSize arg1, boolean arg2);
/** @method flags=cast */
-public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1);
+public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1);
/** @method flags=cast */
-public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2);
+public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2);
/** @method flags=cast */
-public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3);
+public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3);
/** @method flags=cast */
-public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4);
+public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4);
/** @method flags=cast */
-public static final native boolean objc_msgSend_bool(int /*long*/ id, int /*long*/ sel, short arg0);
+public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, short arg0);
/** @method flags=cast */
-public static final native double objc_msgSend_fpret(int /*long*/ id, int /*long*/ sel);
+public static final native double objc_msgSend_fpret(long /*int*/ id, long /*int*/ sel);
/** @method flags=cast */
-public static final native double objc_msgSend_fpret(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0);
+public static final native double objc_msgSend_fpret(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0);
/** @method flags=cast */
-public static final native double objc_msgSend_fpret(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1);
+public static final native double objc_msgSend_fpret(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1);
/** @method flags=cast */
-public static final native float objc_msgSend_floatret(int /*long*/ id, int /*long*/ sel);
+public static final native float objc_msgSend_floatret(long /*int*/ id, long /*int*/ sel);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSAffineTransformStruct arg0);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSAffineTransformStruct arg0);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSPoint arg0);
/**
* @method flags=cast
* @param arg0 flags=struct
* @param arg1 flags=struct
* @param arg2 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, NSPoint arg1, NSPoint arg2);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSPoint arg0, NSPoint arg1, NSPoint arg2);
/**
* @method flags=cast
* @param arg0 flags=struct
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, NSPoint arg1, int /*long*/ arg2);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSPoint arg0, NSPoint arg1, long /*int*/ arg2);
/**
* @method flags=cast
* @param arg0 flags=struct
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, NSRect arg1, int /*long*/ arg2, float /*double*/ arg3);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSPoint arg0, NSRect arg1, long /*int*/ arg2, double /*float*/ arg3);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, float /*double*/ arg1, float /*double*/ arg2, float /*double*/ arg3);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSPoint arg0, double /*float*/ arg1, double /*float*/ arg2, double /*float*/ arg3);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, float /*double*/ arg1, float /*double*/ arg2, float /*double*/ arg3, boolean arg4);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSPoint arg0, double /*float*/ arg1, double /*float*/ arg2, double /*float*/ arg3, boolean arg4);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, int /*long*/ arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSPoint arg0, long /*int*/ arg1);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSPoint arg0, int /*long*/ arg1, float[] /*double[]*/ arg2);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSPoint arg0, long /*int*/ arg1, double[] /*float[]*/ arg2);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRange arg0);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRange arg0);
/**
* @method flags=cast
* @param arg0 flags=struct
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRange arg0, NSPoint arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRange arg0, NSPoint arg1);
/**
* @method flags=cast
* @param arg0 flags=struct
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRange arg0, NSRange arg1, int /*long*/ arg2, int[] /*long[]*/ arg3);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRange arg0, NSRange arg1, long /*int*/ arg2, long[] /*int[]*/ arg3);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRange arg0, int /*long*/ arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRange arg0, long /*int*/ arg1);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRange arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, byte[] arg5);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRange arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, byte[] arg5);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0);
/**
* @method flags=cast
* @param arg0 flags=struct
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, NSPoint arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, NSPoint arg1);
/**
* @method flags=cast
* @param arg0 flags=struct
* @param arg1 flags=struct
* @param arg2 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, NSRange arg1, NSRect arg2);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, NSRange arg1, NSRect arg2);
/**
* @method flags=cast
* @param arg0 flags=struct
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, NSRect arg1, int /*long*/ arg2, float /*double*/ arg3);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, NSRect arg1, long /*int*/ arg2, double /*float*/ arg3);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, boolean arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, boolean arg1);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, boolean arg1, boolean arg2);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, boolean arg1, boolean arg2);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, float /*double*/ arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, double /*float*/ arg1);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, float /*double*/ arg1, float /*double*/ arg2);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, double /*float*/ arg1, double /*float*/ arg2);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, long /*int*/ arg1);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1, boolean arg2, int /*long*/ arg3);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, long /*int*/ arg1, boolean arg2, long /*int*/ arg3);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1, int /*long*/ arg2);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, long /*int*/ arg1, long /*int*/ arg2);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1, int /*long*/ arg2, boolean arg3);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, long /*int*/ arg1, long /*int*/ arg2, boolean arg3);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1, int /*long*/ arg2, boolean arg3, int /*long*/ arg4);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, long /*int*/ arg1, long /*int*/ arg2, boolean arg3, long /*int*/ arg4);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, NSSize arg0);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSSize arg0);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, boolean arg0);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, boolean arg0);
/**
* @method flags=cast
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, boolean arg0, NSRect arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, boolean arg0, NSRect arg1);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, boolean arg0, int /*long*/ arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, boolean arg0, long /*int*/ arg1);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, byte[] arg0);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, byte[] arg0);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, byte[] arg0, int /*long*/ arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, byte[] arg0, long /*int*/ arg1);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, char[] arg0);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, char[] arg0);
/**
* @method flags=cast
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, char[] arg0, NSRange arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, char[] arg0, NSRange arg1);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, char[] arg0, int /*long*/ arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, char[] arg0, long /*int*/ arg1);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, double arg0);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, double arg0);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, double arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, boolean arg4);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, double arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, boolean arg4);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, float /*double*/ arg0, float /*double*/ arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, double /*float*/ arg0, double /*float*/ arg1);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, float /*double*/ arg0, float /*double*/ arg1, float /*double*/ arg2, float /*double*/ arg3);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, double /*float*/ arg0, double /*float*/ arg1, double /*float*/ arg2, double /*float*/ arg3);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, float /*double*/ arg0, int /*long*/ arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, double /*float*/ arg0, long /*int*/ arg1);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, float[] /*double[]*/ arg0);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, double[] /*float[]*/ arg0);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, float[] /*double[]*/ arg0, int /*long*/ arg1, float /*double*/ arg2);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, double[] /*float[]*/ arg0, long /*int*/ arg1, double /*float*/ arg2);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0);
/**
* @method flags=cast
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1);
/**
* @method flags=cast
* @param arg1 flags=struct
* @param arg2 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1, NSSize arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5, boolean arg6);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1, NSSize arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5, boolean arg6);
/**
* @method flags=cast
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1, int /*long*/ arg2);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1, long /*int*/ arg2);
/**
* @method flags=cast
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1, int /*long*/ arg2, double arg3, int /*long*/ arg4, int /*long*/ arg5, int /*long*/ arg6, int /*long*/ arg7, int /*long*/ arg8);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1, long /*int*/ arg2, double arg3, long /*int*/ arg4, long /*int*/ arg5, long /*int*/ arg6, long /*int*/ arg7, long /*int*/ arg8);
/**
* @method flags=cast
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSPoint arg1, int /*long*/ arg2, double arg3, int /*long*/ arg4, int /*long*/ arg5, short arg6, int /*long*/ arg7, int /*long*/ arg8);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1, long /*int*/ arg2, double arg3, long /*int*/ arg4, long /*int*/ arg5, short arg6, long /*int*/ arg7, long /*int*/ arg8);
/**
* @method flags=cast
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSRange arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSRange arg1);
/**
* @method flags=cast
* @param arg1 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSRect arg1, int /*long*/ arg2);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSRect arg1, long /*int*/ arg2);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, boolean arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, boolean arg1);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, float /*double*/ arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, double /*float*/ arg1);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1);
/**
* @method flags=cast
* @param arg2 flags=struct
*/
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, NSRange arg2);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, NSRange arg2);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, boolean arg2);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, boolean arg2);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, double arg2, int /*long*/ arg3);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, double arg2, long /*int*/ arg3);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, boolean arg3);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, boolean arg3);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, float /*double*/ arg3);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, double /*float*/ arg3);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, boolean arg5, boolean arg6, int /*long*/ arg7, int /*long*/ arg8, int /*long*/ arg9);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, boolean arg5, boolean arg6, long /*int*/ arg7, long /*int*/ arg8, long /*int*/ arg9);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, boolean arg5, boolean arg6, int /*long*/ arg7, int /*long*/ arg8, int /*long*/ arg9, int /*long*/ arg10);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, boolean arg5, boolean arg6, long /*int*/ arg7, long /*int*/ arg8, long /*int*/ arg9, long /*int*/ arg10);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5, int /*long*/ arg6);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5, long /*int*/ arg6);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int[] /*long[]*/ arg0);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long[] /*int[]*/ arg0);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int[] /*long[]*/ arg0, int arg1, int arg2);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long[] /*int[]*/ arg0, int arg1, int arg2);
/** @method flags=cast */
-public static final native int /*long*/ objc_msgSend(int /*long*/ id, int /*long*/ sel, int[] arg0, int arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, int[] arg0, int arg1);
/** @method flags=cast */
public static final native int objc_msgSend(int id, int sel, float arg0);
/** @method flags=cast */
@@ -4118,92 +4118,92 @@ public static final native long objc_msgSend(long id, long sel, int[] arg0);
/** @method flags=cast */
public static final native long objc_msgSend(long id, long sel, long[] arg0, long arg1, long arg2);
/** @method flags=cast */
-public static final native void objc_msgSend_stret(NSAffineTransformStruct result, int /*long*/ id, int /*long*/ sel);
+public static final native void objc_msgSend_stret(NSAffineTransformStruct result, long /*int*/ id, long /*int*/ sel);
/** @method flags=cast */
-public static final native void objc_msgSend_stret(NSPoint result, int /*long*/ id, int /*long*/ sel);
+public static final native void objc_msgSend_stret(NSPoint result, long /*int*/ id, long /*int*/ sel);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native void objc_msgSend_stret(NSPoint result, int /*long*/ id, int /*long*/ sel, NSPoint arg0);
+public static final native void objc_msgSend_stret(NSPoint result, long /*int*/ id, long /*int*/ sel, NSPoint arg0);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native void objc_msgSend_stret(NSPoint result, int /*long*/ id, int /*long*/ sel, NSPoint arg0, int /*long*/ arg1);
+public static final native void objc_msgSend_stret(NSPoint result, long /*int*/ id, long /*int*/ sel, NSPoint arg0, long /*int*/ arg1);
/** @method flags=cast */
-public static final native void objc_msgSend_stret(NSPoint result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0);
+public static final native void objc_msgSend_stret(NSPoint result, long /*int*/ id, long /*int*/ sel, long /*int*/ arg0);
/** @method flags=cast */
-public static final native void objc_msgSend_stret(NSRange result, int /*long*/ id, int /*long*/ sel);
+public static final native void objc_msgSend_stret(NSRange result, long /*int*/ id, long /*int*/ sel);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native void objc_msgSend_stret(NSRange result, int /*long*/ id, int /*long*/ sel, NSRange arg0, int /*long*/ arg1);
+public static final native void objc_msgSend_stret(NSRange result, long /*int*/ id, long /*int*/ sel, NSRange arg0, long /*int*/ arg1);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native void objc_msgSend_stret(NSRange result, int /*long*/ id, int /*long*/ sel, NSRect arg0);
+public static final native void objc_msgSend_stret(NSRange result, long /*int*/ id, long /*int*/ sel, NSRect arg0);
/** @method flags=cast */
-public static final native void objc_msgSend_stret(NSRange result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0);
+public static final native void objc_msgSend_stret(NSRange result, long /*int*/ id, long /*int*/ sel, long /*int*/ arg0);
/** @method flags=cast */
-public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel);
+public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, NSRange arg0, int /*long*/ arg1);
+public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel, NSRange arg0, long /*int*/ arg1);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, NSRect arg0);
+public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel, NSRect arg0);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1);
+public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel, NSRect arg0, long /*int*/ arg1);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, NSSize arg0, int /*long*/ arg1);
+public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel, NSSize arg0, long /*int*/ arg1);
/** @method flags=cast */
-public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0);
+public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel, long /*int*/ arg0);
/**
* @method flags=cast
* @param arg1 flags=struct
*/
-public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSRect arg1, int /*long*/ arg2);
+public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSRect arg1, long /*int*/ arg2);
/** @method flags=cast */
-public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1);
+public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1);
/** @method flags=cast */
-public static final native void objc_msgSend_stret(NSRect result, int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, boolean arg2);
+public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, boolean arg2);
/** @method flags=cast */
-public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel);
+public static final native void objc_msgSend_stret(NSSize result, long /*int*/ id, long /*int*/ sel);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel, NSRect arg0);
+public static final native void objc_msgSend_stret(NSSize result, long /*int*/ id, long /*int*/ sel, NSRect arg0);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel, NSSize arg0);
+public static final native void objc_msgSend_stret(NSSize result, long /*int*/ id, long /*int*/ sel, NSSize arg0);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel, NSSize arg0, boolean arg1, boolean arg2, int /*long*/ arg3);
+public static final native void objc_msgSend_stret(NSSize result, long /*int*/ id, long /*int*/ sel, NSSize arg0, boolean arg1, boolean arg2, long /*int*/ arg3);
/**
* @method flags=cast
* @param arg0 flags=struct
*/
-public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel, NSSize arg0, int /*long*/ arg1);
+public static final native void objc_msgSend_stret(NSSize result, long /*int*/ id, long /*int*/ sel, NSSize arg0, long /*int*/ arg1);
/** @method flags=cast */
-public static final native void objc_msgSend_stret(NSSize result, int /*long*/ id, int /*long*/ sel, boolean arg0);
+public static final native void objc_msgSend_stret(NSSize result, long /*int*/ id, long /*int*/ sel, boolean arg0);
/** Sizeof natives */
public static final native int CFRange_sizeof();
@@ -4225,122 +4225,122 @@ public static final native int NSSize_sizeof();
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(int /*long*/ dest, CFRange src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, CFRange src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(CFRange dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(CFRange dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(int /*long*/ dest, CGAffineTransform src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, CGAffineTransform src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(CGAffineTransform dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(CGAffineTransform dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(int /*long*/ dest, CGPathElement src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, CGPathElement src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(CGPathElement dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(CGPathElement dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(int /*long*/ dest, CGPoint src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, CGPoint src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(CGPoint dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(CGPoint dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(int /*long*/ dest, CGRect src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, CGRect src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(CGRect dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(CGRect dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(int /*long*/ dest, CGSize src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, CGSize src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(CGSize dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(CGSize dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(int /*long*/ dest, CTParagraphStyleSetting src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, CTParagraphStyleSetting src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(CTParagraphStyleSetting dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(CTParagraphStyleSetting dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(int /*long*/ dest, NSAffineTransformStruct src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, NSAffineTransformStruct src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(NSAffineTransformStruct dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(NSAffineTransformStruct dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(int /*long*/ dest, NSPoint src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, NSPoint src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(NSPoint dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(NSPoint dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(int /*long*/ dest, NSRange src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, NSRange src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(NSRange dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(NSRange dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(int /*long*/ dest, NSRect src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, NSRect src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(NSRect dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(NSRect dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(int /*long*/ dest, NSSize src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, NSSize src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(void *),flags=critical
*/
-public static final native void memmove(NSSize dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(NSSize dest, long /*int*/ src, long /*int*/ size);
/** This section is auto generated */
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Protocol.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Protocol.java
index c23340b371..05617a3f69 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Protocol.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Protocol.java
@@ -16,7 +16,7 @@ public Protocol() {
super();
}
-public Protocol(int /*long*/ id) {
+public Protocol(long /*int*/ id) {
super(id);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificatePanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificatePanel.java
index 147057bf35..598a6c3930 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificatePanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificatePanel.java
@@ -16,7 +16,7 @@ public SFCertificatePanel() {
super();
}
-public SFCertificatePanel(int /*long*/ id) {
+public SFCertificatePanel(long /*int*/ id) {
super(id);
}
@@ -32,11 +32,11 @@ public void setShowsHelp(boolean showsHelp) {
OS.objc_msgSend(this.id, OS.sel_setShowsHelp_, showsHelp);
}
-public static float /*double*/ minFrameWidthWithTitle(NSString aTitle, int /*long*/ aStyle) {
- return (float /*double*/)OS.objc_msgSend_fpret(OS.class_SFCertificatePanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+public static double /*float*/ minFrameWidthWithTitle(NSString aTitle, long /*int*/ aStyle) {
+ return (double /*float*/)OS.objc_msgSend_fpret(OS.class_SFCertificatePanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
}
-public static int /*long*/ windowNumberAtPoint(NSPoint point, int /*long*/ windowNumber) {
+public static long /*int*/ windowNumberAtPoint(NSPoint point, long /*int*/ windowNumber) {
return OS.objc_msgSend(OS.class_SFCertificatePanel, OS.sel_windowNumberAtPoint_belowWindowWithWindowNumber_, point, windowNumber);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificateTrustPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificateTrustPanel.java
index 776a533669..a02543ca94 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificateTrustPanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificateTrustPanel.java
@@ -16,7 +16,7 @@ public SFCertificateTrustPanel() {
super();
}
-public SFCertificateTrustPanel(int /*long*/ id) {
+public SFCertificateTrustPanel(long /*int*/ id) {
super(id);
}
@@ -24,20 +24,20 @@ public SFCertificateTrustPanel(id id) {
super(id);
}
-public void beginSheetForWindow(NSWindow docWindow, id delegate, int /*long*/ didEndSelector, int /*long*/ contextInfo, int /*long*/ trust, NSString message) {
+public void beginSheetForWindow(NSWindow docWindow, id delegate, long /*int*/ didEndSelector, long /*int*/ contextInfo, long /*int*/ trust, NSString message) {
OS.objc_msgSend(this.id, OS.sel_beginSheetForWindow_modalDelegate_didEndSelector_contextInfo_trust_message_, docWindow != null ? docWindow.id : 0, delegate != null ? delegate.id : 0, didEndSelector, contextInfo, trust, message != null ? message.id : 0);
}
public static SFCertificateTrustPanel sharedCertificateTrustPanel() {
- int /*long*/ result = OS.objc_msgSend(OS.class_SFCertificateTrustPanel, OS.sel_sharedCertificateTrustPanel);
+ long /*int*/ result = OS.objc_msgSend(OS.class_SFCertificateTrustPanel, OS.sel_sharedCertificateTrustPanel);
return result != 0 ? new SFCertificateTrustPanel(result) : null;
}
-public static float /*double*/ minFrameWidthWithTitle(NSString aTitle, int /*long*/ aStyle) {
- return (float /*double*/)OS.objc_msgSend_fpret(OS.class_SFCertificateTrustPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+public static double /*float*/ minFrameWidthWithTitle(NSString aTitle, long /*int*/ aStyle) {
+ return (double /*float*/)OS.objc_msgSend_fpret(OS.class_SFCertificateTrustPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
}
-public static int /*long*/ windowNumberAtPoint(NSPoint point, int /*long*/ windowNumber) {
+public static long /*int*/ windowNumberAtPoint(NSPoint point, long /*int*/ windowNumber) {
return OS.objc_msgSend(OS.class_SFCertificateTrustPanel, OS.sel_windowNumberAtPoint_belowWindowWithWindowNumber_, point, windowNumber);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDataSource.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDataSource.java
index 51e6ac69bd..ed29bbdbbf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDataSource.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDataSource.java
@@ -16,7 +16,7 @@ public WebDataSource() {
super();
}
-public WebDataSource(int /*long*/ id) {
+public WebDataSource(long /*int*/ id) {
super(id);
}
@@ -25,22 +25,22 @@ public WebDataSource(id id) {
}
public NSString pageTitle() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_pageTitle);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_pageTitle);
return result != 0 ? new NSString(result) : null;
}
public WebDocumentRepresentation representation() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_representation);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_representation);
return result != 0 ? new WebDocumentRepresentation(result) : null;
}
public NSMutableURLRequest request() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_request);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_request);
return result != 0 ? new NSMutableURLRequest(result) : null;
}
public WebFrame webFrame() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_webFrame);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_webFrame);
return result != 0 ? new WebFrame(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDocumentRepresentation.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDocumentRepresentation.java
index 36e16c9118..34d508f5d5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDocumentRepresentation.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDocumentRepresentation.java
@@ -16,7 +16,7 @@ public WebDocumentRepresentation() {
super();
}
-public WebDocumentRepresentation(int /*long*/ id) {
+public WebDocumentRepresentation(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public WebDocumentRepresentation(id id) {
}
public NSString documentSource() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_documentSource);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_documentSource);
return result != 0 ? new NSString(result) : null;
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrame.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrame.java
index 8e0f16aaf9..c686dd6f82 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrame.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrame.java
@@ -16,7 +16,7 @@ public WebFrame() {
super();
}
-public WebFrame(int /*long*/ id) {
+public WebFrame(long /*int*/ id) {
super(id);
}
@@ -25,16 +25,16 @@ public WebFrame(id id) {
}
public DOMDocument DOMDocument() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_DOMDocument);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_DOMDocument);
return result != 0 ? new DOMDocument(result) : null;
}
public WebDataSource dataSource() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_dataSource);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_dataSource);
return result != 0 ? new WebDataSource(result) : null;
}
-public int /*long*/ globalContext() {
+public long /*int*/ globalContext() {
return OS.objc_msgSend(this.id, OS.sel_globalContext);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrameView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrameView.java
index 5075e8edea..bc1026e355 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrameView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrameView.java
@@ -16,7 +16,7 @@ public WebFrameView() {
super();
}
-public WebFrameView(int /*long*/ id) {
+public WebFrameView(long /*int*/ id) {
super(id);
}
@@ -33,7 +33,7 @@ public void printDocumentView() {
}
public NSPrintOperation printOperationWithPrintInfo(NSPrintInfo printInfo) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_printOperationWithPrintInfo_, printInfo != null ? printInfo.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_printOperationWithPrintInfo_, printInfo != null ? printInfo.id : 0);
return result != 0 ? new NSPrintOperation(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebOpenPanelResultListener.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebOpenPanelResultListener.java
index 19f1ba7cb3..5877a3f067 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebOpenPanelResultListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebOpenPanelResultListener.java
@@ -16,7 +16,7 @@ public WebOpenPanelResultListener() {
super();
}
-public WebOpenPanelResultListener(int /*long*/ id) {
+public WebOpenPanelResultListener(long /*int*/ id) {
super(id);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPolicyDecisionListener.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPolicyDecisionListener.java
index ffa3aa11b7..6172d99992 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPolicyDecisionListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPolicyDecisionListener.java
@@ -16,7 +16,7 @@ public WebPolicyDecisionListener() {
super();
}
-public WebPolicyDecisionListener(int /*long*/ id) {
+public WebPolicyDecisionListener(long /*int*/ id) {
super(id);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPreferences.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPreferences.java
index da9bc92d75..5c53dca464 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPreferences.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPreferences.java
@@ -16,7 +16,7 @@ public WebPreferences() {
super();
}
-public WebPreferences(int /*long*/ id) {
+public WebPreferences(long /*int*/ id) {
super(id);
}
@@ -33,7 +33,7 @@ public void setJavaScriptEnabled(boolean flag) {
}
public static WebPreferences standardPreferences() {
- int /*long*/ result = OS.objc_msgSend(OS.class_WebPreferences, OS.sel_standardPreferences);
+ long /*int*/ result = OS.objc_msgSend(OS.class_WebPreferences, OS.sel_standardPreferences);
return result != 0 ? new WebPreferences(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebScriptObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebScriptObject.java
index c25eb95546..ce779b1da5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebScriptObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebScriptObject.java
@@ -16,7 +16,7 @@ public WebScriptObject() {
super();
}
-public WebScriptObject(int /*long*/ id) {
+public WebScriptObject(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public WebScriptObject(id id) {
}
public id webScriptValueAtIndex(int index) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_webScriptValueAtIndex_, index);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_webScriptValueAtIndex_, index);
return result != 0 ? new id(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebUndefined.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebUndefined.java
index dd75807a91..17ac2e0637 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebUndefined.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebUndefined.java
@@ -16,7 +16,7 @@ public WebUndefined() {
super();
}
-public WebUndefined(int /*long*/ id) {
+public WebUndefined(long /*int*/ id) {
super(id);
}
@@ -25,7 +25,7 @@ public WebUndefined(id id) {
}
public static WebUndefined undefined() {
- int /*long*/ result = OS.objc_msgSend(OS.class_WebUndefined, OS.sel_undefined);
+ long /*int*/ result = OS.objc_msgSend(OS.class_WebUndefined, OS.sel_undefined);
return result != 0 ? new WebUndefined(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebView.java
index 5277868165..f1aaebc53c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebView.java
@@ -16,7 +16,7 @@ public WebView() {
super();
}
-public WebView(int /*long*/ id) {
+public WebView(long /*int*/ id) {
super(id);
}
@@ -53,12 +53,12 @@ public boolean goForward() {
}
public WebView initWithFrame(NSRect frame, NSString frameName, NSString groupName) {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_frameName_groupName_, frame, frameName != null ? frameName.id : 0, groupName != null ? groupName.id : 0);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_frameName_groupName_, frame, frameName != null ? frameName.id : 0, groupName != null ? groupName.id : 0);
return result == this.id ? this : (result != 0 ? new WebView(result) : null);
}
public WebFrame mainFrame() {
- int /*long*/ result = OS.objc_msgSend(this.id, OS.sel_mainFrame);
+ long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_mainFrame);
return result != 0 ? new WebFrame(result) : null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/id.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/id.java
index e812879e55..2a77e7807d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/id.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/id.java
@@ -15,12 +15,12 @@ package org.eclipse.swt.internal.cocoa;
*/
public class id {
-public int /*long*/ id;
+public long /*int*/ id;
public id() {
}
-public id(int /*long*/ id) {
+public id(long /*int*/ id) {
this.id = id;
}
@@ -36,7 +36,7 @@ public boolean equals(Object other) {
return (this.id == ((id)other).id);
}
-public int /*long*/ objc_getClass() {
+public long /*int*/ objc_getClass() {
String name = getClass().getName();
int index = name.lastIndexOf('.');
if (index != -1) name = name.substring(index + 1);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/objc_super.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/objc_super.java
index e9bf5d52fb..aa66d9a1b3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/objc_super.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/objc_super.java
@@ -15,8 +15,8 @@ package org.eclipse.swt.internal.cocoa;
*/
public class objc_super {
/** @field cast=(id) */
- public int /*long*/ receiver;
+ public long /*int*/ receiver;
/** @field accessor=swt_super_class,cast=(Class) */
- public int /*long*/ super_class;
+ public long /*int*/ super_class;
public static final int sizeof = OS.objc_super_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/C.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/C.java
index 886cb6ef20..34d0658cf3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/C.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/C.java
@@ -24,118 +24,118 @@ public class C extends Platform {
public static final int PTR_SIZEOF = PTR_sizeof ();
/** @param ptr cast=(void *) */
-public static final native void free (int /*long*/ ptr);
+public static final native void free (long /*int*/ ptr);
/** @param env cast=(const char *) */
-public static final native int /*long*/ getenv (byte[] env);
-public static final native int /*long*/ malloc (int /*long*/ size);
+public static final native long /*int*/ getenv (byte[] env);
+public static final native long /*int*/ malloc (long /*int*/ size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out critical
* @param size cast=(size_t)
*/
-public static final native void memmove (int /*long*/ dest, byte[] src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, byte[] src, long /*int*/ size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out critical
* @param size cast=(size_t)
*/
-public static final native void memmove (int /*long*/ dest, char[] src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, char[] src, long /*int*/ size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out critical
* @param size cast=(size_t)
*/
-public static final native void memmove (int /*long*/ dest, double[] src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, double[] src, long /*int*/ size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out critical
* @param size cast=(size_t)
*/
-public static final native void memmove (int /*long*/ dest, float[] src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, float[] src, long /*int*/ size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out critical
* @param size cast=(size_t)
*/
-public static final native void memmove (int /*long*/ dest, int[] src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, int[] src, long /*int*/ size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out critical
* @param size cast=(size_t)
*/
-public static final native void memmove (int /*long*/ dest, long[] src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, long[] src, long /*int*/ size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out critical
* @param size cast=(size_t)
*/
-public static final native void memmove (int /*long*/ dest, short[] src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, short[] src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(const void *),flags=no_out critical
* @param size cast=(size_t)
*/
-public static final native void memmove (byte[] dest, char[] src, int /*long*/ size);
+public static final native void memmove (byte[] dest, char[] src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove (byte[] dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove (byte[] dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove (int /*long*/ dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove (char[] dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove (char[] dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove (double[] dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove (double[] dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove (float[] dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove (float[] dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove (int[] dest, byte[] src, int /*long*/ size);
+public static final native void memmove (int[] dest, byte[] src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove (short[] dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove (short[] dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove (int[] dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove (int[] dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in critical
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove (long[] dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove (long[] dest, long /*int*/ src, long /*int*/ size);
/**
* @param buffer cast=(void *),flags=critical
* @param num cast=(size_t)
*/
-public static final native int /*long*/ memset (int /*long*/ buffer, int c, int /*long*/ num);
+public static final native long /*int*/ memset (long /*int*/ buffer, int c, long /*int*/ num);
public static final native int PTR_sizeof ();
/** @param s cast=(char *) */
-public static final native int strlen (int /*long*/ s);
+public static final native int strlen (long /*int*/ s);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/LONG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/LONG.java
index 91f0a09c79..60a68829ca 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/LONG.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/LONG.java
@@ -12,9 +12,9 @@ package org.eclipse.swt.internal;
/** @jniclass flags=no_gen */
public class LONG {
- public int /*long*/ value;
+ public long /*int*/ value;
- public LONG (int /*long*/ value) {
+ public LONG (long /*int*/ value) {
this.value = value;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
index 97024bf864..faa2b82a16 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
@@ -42,7 +42,7 @@ public class Library {
static final String DELIMITER;
/* 64-bit support */
- static final boolean IS_64 = longConst() == (int /*long*/)longConst();
+ static final boolean IS_64 = longConst() == (long /*int*/)longConst();
static final String SUFFIX_64 = "-64"; //$NON-NLS-1$
static final String SWT_LIB_DIR;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java
index d643afc48e..c6c4f29e55 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java
@@ -198,28 +198,28 @@ public static final native int AtkTextRectangle_sizeof ();
/** Natives */
/** @method flags=const */
-public static final native int /*long*/ GTK_TYPE_ACCESSIBLE ();
+public static final native long /*int*/ GTK_TYPE_ACCESSIBLE ();
/** @method flags=const */
-public static final native int /*long*/ ATK_TYPE_ACTION ();
+public static final native long /*int*/ ATK_TYPE_ACTION ();
/** @method flags=const */
-public static final native int /*long*/ ATK_TYPE_COMPONENT ();
+public static final native long /*int*/ ATK_TYPE_COMPONENT ();
/** @method flags=const */
-public static final native int /*long*/ ATK_TYPE_EDITABLE_TEXT ();
+public static final native long /*int*/ ATK_TYPE_EDITABLE_TEXT ();
/** @method flags=const */
-public static final native int /*long*/ ATK_TYPE_HYPERTEXT ();
+public static final native long /*int*/ ATK_TYPE_HYPERTEXT ();
/** @method flags=const */
-public static final native int /*long*/ ATK_TYPE_SELECTION ();
+public static final native long /*int*/ ATK_TYPE_SELECTION ();
/** @method flags=const */
-public static final native int /*long*/ ATK_TYPE_TABLE ();
+public static final native long /*int*/ ATK_TYPE_TABLE ();
/** @method flags=const */
-public static final native int /*long*/ ATK_TYPE_TEXT ();
+public static final native long /*int*/ ATK_TYPE_TEXT ();
/** @method flags=const */
-public static final native int /*long*/ ATK_TYPE_VALUE ();
+public static final native long /*int*/ ATK_TYPE_VALUE ();
/** @method flags=const */
-public static final native int /*long*/ ATK_TYPE_OBJECT_FACTORY ();
-public static final native boolean ATK_IS_NO_OP_OBJECT_FACTORY (int /*long*/ obj);
-public static final native int /*long*/ _ATK_ACTION_GET_IFACE (int /*long*/ obj);
-public static final int /*long*/ ATK_ACTION_GET_IFACE (int /*long*/ obj) {
+public static final native long /*int*/ ATK_TYPE_OBJECT_FACTORY ();
+public static final native boolean ATK_IS_NO_OP_OBJECT_FACTORY (long /*int*/ obj);
+public static final native long /*int*/ _ATK_ACTION_GET_IFACE (long /*int*/ obj);
+public static final long /*int*/ ATK_ACTION_GET_IFACE (long /*int*/ obj) {
lock.lock();
try {
return _ATK_ACTION_GET_IFACE(obj);
@@ -227,8 +227,8 @@ public static final int /*long*/ ATK_ACTION_GET_IFACE (int /*long*/ obj) {
lock.unlock();
}
}
-public static final native int /*long*/ _ATK_COMPONENT_GET_IFACE(int /*long*/ atkHandle);
-public static final int /*long*/ ATK_COMPONENT_GET_IFACE(int /*long*/ atkHandle) {
+public static final native long /*int*/ _ATK_COMPONENT_GET_IFACE(long /*int*/ atkHandle);
+public static final long /*int*/ ATK_COMPONENT_GET_IFACE(long /*int*/ atkHandle) {
lock.lock();
try {
return _ATK_COMPONENT_GET_IFACE(atkHandle);
@@ -236,9 +236,9 @@ public static final int /*long*/ ATK_COMPONENT_GET_IFACE(int /*long*/ atkHandle)
lock.unlock();
}
}
-public static final native int /*long*/ _ATK_OBJECT_FACTORY_CLASS (int /*long*/ klass);
-public static final native int /*long*/ _ATK_SELECTION_GET_IFACE (int /*long*/ obj);
-public static final int /*long*/ ATK_SELECTION_GET_IFACE (int /*long*/ obj) {
+public static final native long /*int*/ _ATK_OBJECT_FACTORY_CLASS (long /*int*/ klass);
+public static final native long /*int*/ _ATK_SELECTION_GET_IFACE (long /*int*/ obj);
+public static final long /*int*/ ATK_SELECTION_GET_IFACE (long /*int*/ obj) {
lock.lock();
try {
return _ATK_SELECTION_GET_IFACE(obj);
@@ -246,8 +246,8 @@ public static final int /*long*/ ATK_SELECTION_GET_IFACE (int /*long*/ obj) {
lock.unlock();
}
}
-public static final native int /*long*/ _ATK_EDITABLE_TEXT_GET_IFACE (int /*long*/ handle);
-public static final int /*long*/ ATK_EDITABLE_TEXT_GET_IFACE (int /*long*/ handle) {
+public static final native long /*int*/ _ATK_EDITABLE_TEXT_GET_IFACE (long /*int*/ handle);
+public static final long /*int*/ ATK_EDITABLE_TEXT_GET_IFACE (long /*int*/ handle) {
lock.lock();
try {
return _ATK_EDITABLE_TEXT_GET_IFACE(handle);
@@ -255,8 +255,8 @@ public static final int /*long*/ ATK_EDITABLE_TEXT_GET_IFACE (int /*long*/ handl
lock.unlock();
}
}
-public static final native int /*long*/ _ATK_HYPERTEXT_GET_IFACE (int /*long*/ handle);
-public static final int /*long*/ ATK_HYPERTEXT_GET_IFACE (int /*long*/ handle) {
+public static final native long /*int*/ _ATK_HYPERTEXT_GET_IFACE (long /*int*/ handle);
+public static final long /*int*/ ATK_HYPERTEXT_GET_IFACE (long /*int*/ handle) {
lock.lock();
try {
return _ATK_HYPERTEXT_GET_IFACE(handle);
@@ -264,8 +264,8 @@ public static final int /*long*/ ATK_HYPERTEXT_GET_IFACE (int /*long*/ handle) {
lock.unlock();
}
}
-public static final native int /*long*/ _ATK_TABLE_GET_IFACE (int /*long*/ handle);
-public static final int /*long*/ ATK_TABLE_GET_IFACE (int /*long*/ handle) {
+public static final native long /*int*/ _ATK_TABLE_GET_IFACE (long /*int*/ handle);
+public static final long /*int*/ ATK_TABLE_GET_IFACE (long /*int*/ handle) {
lock.lock();
try {
return _ATK_TABLE_GET_IFACE(handle);
@@ -273,8 +273,8 @@ public static final int /*long*/ ATK_TABLE_GET_IFACE (int /*long*/ handle) {
lock.unlock();
}
}
-public static final native int /*long*/ _ATK_TEXT_GET_IFACE (int /*long*/ handle);
-public static final int /*long*/ ATK_TEXT_GET_IFACE (int /*long*/ handle) {
+public static final native long /*int*/ _ATK_TEXT_GET_IFACE (long /*int*/ handle);
+public static final long /*int*/ ATK_TEXT_GET_IFACE (long /*int*/ handle) {
lock.lock();
try {
return _ATK_TEXT_GET_IFACE(handle);
@@ -282,8 +282,8 @@ public static final int /*long*/ ATK_TEXT_GET_IFACE (int /*long*/ handle) {
lock.unlock();
}
}
-public static final native int /*long*/ _ATK_VALUE_GET_IFACE (int /*long*/ handle);
-public static final int /*long*/ ATK_VALUE_GET_IFACE (int /*long*/ handle) {
+public static final native long /*int*/ _ATK_VALUE_GET_IFACE (long /*int*/ handle);
+public static final long /*int*/ ATK_VALUE_GET_IFACE (long /*int*/ handle) {
lock.lock();
try {
return _ATK_VALUE_GET_IFACE(handle);
@@ -291,8 +291,8 @@ public static final int /*long*/ ATK_VALUE_GET_IFACE (int /*long*/ handle) {
lock.unlock();
}
}
-public static final native int /*long*/ _GTK_ACCESSIBLE (int /*long*/ handle);
-public static final int /*long*/ GTK_ACCESSIBLE (int /*long*/ handle) {
+public static final native long /*int*/ _GTK_ACCESSIBLE (long /*int*/ handle);
+public static final long /*int*/ GTK_ACCESSIBLE (long /*int*/ handle) {
lock.lock();
try {
return _GTK_ACCESSIBLE(handle);
@@ -301,8 +301,8 @@ public static final int /*long*/ GTK_ACCESSIBLE (int /*long*/ handle) {
}
}
/** @param object cast=(AtkObject *) */
-public static final native void _atk_focus_tracker_notify (int /*long*/ object);
-public static final void atk_focus_tracker_notify (int /*long*/ object) {
+public static final native void _atk_focus_tracker_notify (long /*int*/ object);
+public static final void atk_focus_tracker_notify (long /*int*/ object) {
lock.lock();
try {
_atk_focus_tracker_notify(object);
@@ -310,8 +310,8 @@ public static final void atk_focus_tracker_notify (int /*long*/ object) {
lock.unlock();
}
}
-public static final native int /*long*/ _atk_get_default_registry ();
-public static final int /*long*/ atk_get_default_registry () {
+public static final native long /*int*/ _atk_get_default_registry ();
+public static final long /*int*/ atk_get_default_registry () {
lock.lock();
try {
return _atk_get_default_registry();
@@ -323,8 +323,8 @@ public static final int /*long*/ atk_get_default_registry () {
* @param factory cast=(AtkObjectFactory *)
* @param obj cast=(GObject *)
*/
-public static final native int /*long*/ _atk_object_factory_create_accessible (int /*long*/ factory, int /*long*/ obj);
-public static final int /*long*/ atk_object_factory_create_accessible (int /*long*/ factory, int /*long*/ obj) {
+public static final native long /*int*/ _atk_object_factory_create_accessible (long /*int*/ factory, long /*int*/ obj);
+public static final long /*int*/ atk_object_factory_create_accessible (long /*int*/ factory, long /*int*/ obj) {
lock.lock();
try {
return _atk_object_factory_create_accessible(factory, obj);
@@ -333,8 +333,8 @@ public static final int /*long*/ atk_object_factory_create_accessible (int /*lon
}
}
/** @param factory cast=(AtkObjectFactory *) */
-public static final native int /*long*/ _atk_object_factory_get_accessible_type (int /*long*/ factory);
-public static final int /*long*/ atk_object_factory_get_accessible_type (int /*long*/ factory) {
+public static final native long /*int*/ _atk_object_factory_get_accessible_type (long /*int*/ factory);
+public static final long /*int*/ atk_object_factory_get_accessible_type (long /*int*/ factory) {
lock.lock();
try {
return _atk_object_factory_get_accessible_type(factory);
@@ -346,8 +346,8 @@ public static final int /*long*/ atk_object_factory_get_accessible_type (int /*l
* @param accessible cast=(AtkObject *)
* @param data cast=(gpointer)
*/
-public static final native void _atk_object_initialize (int /*long*/ accessible, int /*long*/ data);
-public static final void atk_object_initialize (int /*long*/ accessible, int /*long*/ data) {
+public static final native void _atk_object_initialize (long /*int*/ accessible, long /*int*/ data);
+public static final void atk_object_initialize (long /*int*/ accessible, long /*int*/ data) {
lock.lock();
try {
_atk_object_initialize(accessible, data);
@@ -356,8 +356,8 @@ public static final void atk_object_initialize (int /*long*/ accessible, int /*l
}
}
/** @param accessible cast=(AtkObject *) */
-public static final native void _atk_object_notify_state_change (int /*long*/ accessible, int state, boolean value);
-public static final void atk_object_notify_state_change (int /*long*/ accessible, int state, boolean value) {
+public static final native void _atk_object_notify_state_change (long /*int*/ accessible, int state, boolean value);
+public static final void atk_object_notify_state_change (long /*int*/ accessible, int state, boolean value) {
lock.lock();
try {
_atk_object_notify_state_change(accessible, state, value);
@@ -366,8 +366,8 @@ public static final void atk_object_notify_state_change (int /*long*/ accessible
}
}
/** @param accessible cast=(AtkObject *) */
-public static final native int /*long*/ _atk_object_ref_relation_set (int /*long*/ accessible);
-public static final int /*long*/ atk_object_ref_relation_set (int /*long*/ accessible) {
+public static final native long /*int*/ _atk_object_ref_relation_set (long /*int*/ accessible);
+public static final long /*int*/ atk_object_ref_relation_set (long /*int*/ accessible) {
lock.lock();
try {
return _atk_object_ref_relation_set(accessible);
@@ -403,8 +403,8 @@ public static final int atk_text_attribute_register (byte[] name) {
* @param registry cast=(AtkRegistry *)
* @param type cast=(GType)
*/
-public static final native int /*long*/ _atk_registry_get_factory (int /*long*/ registry, int /*long*/ type);
-public static final int /*long*/ atk_registry_get_factory (int /*long*/ registry, int /*long*/ type) {
+public static final native long /*int*/ _atk_registry_get_factory (long /*int*/ registry, long /*int*/ type);
+public static final long /*int*/ atk_registry_get_factory (long /*int*/ registry, long /*int*/ type) {
lock.lock();
try {
return _atk_registry_get_factory(registry, type);
@@ -417,8 +417,8 @@ public static final int /*long*/ atk_registry_get_factory (int /*long*/ registry
* @param type cast=(GType)
* @param factory_type cast=(GType)
*/
-public static final native void _atk_registry_set_factory_type (int /*long*/ registry, int /*long*/ type, int /*long*/ factory_type);
-public static final void atk_registry_set_factory_type (int /*long*/ registry, int /*long*/ type, int /*long*/ factory_type) {
+public static final native void _atk_registry_set_factory_type (long /*int*/ registry, long /*int*/ type, long /*int*/ factory_type);
+public static final void atk_registry_set_factory_type (long /*int*/ registry, long /*int*/ type, long /*int*/ factory_type) {
lock.lock();
try {
_atk_registry_set_factory_type(registry, type, factory_type);
@@ -427,8 +427,8 @@ public static final void atk_registry_set_factory_type (int /*long*/ registry, i
}
}
/** @param set cast=(AtkRelationSet *) */
-public static final native int _atk_relation_set_get_n_relations (int /*long*/ set);
-public static final int atk_relation_set_get_n_relations (int /*long*/ set) {
+public static final native int _atk_relation_set_get_n_relations (long /*int*/ set);
+public static final int atk_relation_set_get_n_relations (long /*int*/ set) {
lock.lock();
try {
return _atk_relation_set_get_n_relations(set);
@@ -437,8 +437,8 @@ public static final int atk_relation_set_get_n_relations (int /*long*/ set) {
}
}
/** @param set cast=(AtkRelationSet *) */
-public static final native int /*long*/ _atk_relation_set_get_relation (int /*long*/ set, int i);
-public static final int /*long*/ atk_relation_set_get_relation (int /*long*/ set, int i) {
+public static final native long /*int*/ _atk_relation_set_get_relation (long /*int*/ set, int i);
+public static final long /*int*/ atk_relation_set_get_relation (long /*int*/ set, int i) {
lock.lock();
try {
return _atk_relation_set_get_relation (set, i);
@@ -450,8 +450,8 @@ public static final int /*long*/ atk_relation_set_get_relation (int /*long*/ set
* @param set cast=(AtkRelationSet *)
* @param relation cast=(AtkRelation *)
*/
-public static final native void _atk_relation_set_remove (int /*long*/ set, int /*long*/ relation);
-public static final void atk_relation_set_remove (int /*long*/ set, int /*long*/ relation) {
+public static final native void _atk_relation_set_remove (long /*int*/ set, long /*int*/ relation);
+public static final void atk_relation_set_remove (long /*int*/ set, long /*int*/ relation) {
lock.lock();
try {
_atk_relation_set_remove (set, relation);
@@ -463,8 +463,8 @@ public static final void atk_relation_set_remove (int /*long*/ set, int /*long*/
* @param set cast=(AtkStateSet *)
* @param type cast=(AtkStateType)
*/
-public static final native boolean _atk_state_set_add_state (int /*long*/ set, int type);
-public static final boolean atk_state_set_add_state (int /*long*/ set, int type) {
+public static final native boolean _atk_state_set_add_state (long /*int*/ set, int type);
+public static final boolean atk_state_set_add_state (long /*int*/ set, int type) {
lock.lock();
try {
return _atk_state_set_add_state(set, type);
@@ -472,8 +472,8 @@ public static final boolean atk_state_set_add_state (int /*long*/ set, int type)
lock.unlock();
}
}
-public static final native int /*long*/ _atk_state_set_new ();
-public static final int /*long*/ atk_state_set_new () {
+public static final native long /*int*/ _atk_state_set_new ();
+public static final long /*int*/ atk_state_set_new () {
lock.lock();
try {
return _atk_state_set_new();
@@ -481,8 +481,8 @@ public static final int /*long*/ atk_state_set_new () {
lock.unlock();
}
}
-public static final native int /*long*/ _atk_text_attribute_get_name (int attr);
-public static final int /*long*/ atk_text_attribute_get_name (int attr) {
+public static final native long /*int*/ _atk_text_attribute_get_name (int attr);
+public static final long /*int*/ atk_text_attribute_get_name (int attr) {
lock.lock();
try {
return _atk_text_attribute_get_name(attr);
@@ -490,8 +490,8 @@ public static final int /*long*/ atk_text_attribute_get_name (int attr) {
lock.unlock();
}
}
-public static final native int /*long*/ _atk_text_attribute_get_value (int attr, int index);
-public static final int /*long*/ atk_text_attribute_get_value (int attr, int index) {
+public static final native long /*int*/ _atk_text_attribute_get_value (int attr, int index);
+public static final long /*int*/ atk_text_attribute_get_value (int attr, int index) {
lock.lock();
try {
return _atk_text_attribute_get_value(attr, index);
@@ -499,8 +499,8 @@ public static final int /*long*/ atk_text_attribute_get_value (int attr, int ind
lock.unlock();
}
}
-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0);
-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0) {
+public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0);
+public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0) {
lock.lock();
try {
return _call(function, arg0);
@@ -508,8 +508,8 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0)
lock.unlock();
}
}
-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1);
-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1) {
+public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1);
+public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1) {
lock.lock();
try {
return _call(function, arg0, arg1);
@@ -517,8 +517,8 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0,
lock.unlock();
}
}
-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2);
-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2) {
+public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2);
+public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
lock.lock();
try {
return _call(function, arg0, arg1, arg2);
@@ -526,8 +526,8 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0,
lock.unlock();
}
}
-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3);
-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3) {
+public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3);
+public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) {
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3);
@@ -535,8 +535,8 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0,
lock.unlock();
}
}
-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4);
-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4) {
+public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4);
+public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4) {
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3, arg4);
@@ -544,8 +544,8 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0,
lock.unlock();
}
}
-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5);
-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5) {
+public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5);
+public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5) {
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3, arg4, arg5);
@@ -554,62 +554,62 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0,
}
}
/** @param str cast=(char *) */
-public static final native int /*long*/ g_strdup (int /*long*/ str);
-public static final native void memmove (AtkActionIface dest, int /*long*/ src);
-public static final native void memmove (AtkComponentIface dest, int /*long*/ src);
-public static final native void memmove (AtkEditableTextIface dest, int /*long*/ src);
-public static final native void memmove (AtkHypertextIface dest, int /*long*/ src);
-public static final native void memmove (AtkObjectClass dest, int /*long*/ src);
-public static final native void memmove (AtkObjectFactoryClass dest, int /*long*/ src);
-public static final native void memmove (AtkSelectionIface dest, int /*long*/ src);
-public static final native void memmove (AtkTableIface dest, int /*long*/ src);
-public static final native void memmove (AtkTextIface dest, int /*long*/ src);
-public static final native void memmove (AtkValueIface dest, int /*long*/ src);
-public static final native void memmove (GtkAccessible dest, int /*long*/ src);
-public static final native void memmove (int /*long*/ dest, AtkActionIface src);
-public static final native void memmove (int /*long*/ dest, AtkComponentIface src);
-public static final native void memmove (int /*long*/ dest, AtkEditableTextIface src);
-public static final native void memmove (int /*long*/ dest, AtkHypertextIface src);
-public static final native void memmove (int /*long*/ dest, AtkObjectClass src);
-public static final native void memmove (int /*long*/ dest, AtkObjectFactoryClass src);
-public static final native void memmove (int /*long*/ dest, AtkSelectionIface src);
-public static final native void memmove (int /*long*/ dest, AtkTableIface src);
-public static final native void memmove (int /*long*/ dest, AtkTextIface src);
-public static final native void memmove (int /*long*/ dest, AtkValueIface src);
+public static final native long /*int*/ g_strdup (long /*int*/ str);
+public static final native void memmove (AtkActionIface dest, long /*int*/ src);
+public static final native void memmove (AtkComponentIface dest, long /*int*/ src);
+public static final native void memmove (AtkEditableTextIface dest, long /*int*/ src);
+public static final native void memmove (AtkHypertextIface dest, long /*int*/ src);
+public static final native void memmove (AtkObjectClass dest, long /*int*/ src);
+public static final native void memmove (AtkObjectFactoryClass dest, long /*int*/ src);
+public static final native void memmove (AtkSelectionIface dest, long /*int*/ src);
+public static final native void memmove (AtkTableIface dest, long /*int*/ src);
+public static final native void memmove (AtkTextIface dest, long /*int*/ src);
+public static final native void memmove (AtkValueIface dest, long /*int*/ src);
+public static final native void memmove (GtkAccessible dest, long /*int*/ src);
+public static final native void memmove (long /*int*/ dest, AtkActionIface src);
+public static final native void memmove (long /*int*/ dest, AtkComponentIface src);
+public static final native void memmove (long /*int*/ dest, AtkEditableTextIface src);
+public static final native void memmove (long /*int*/ dest, AtkHypertextIface src);
+public static final native void memmove (long /*int*/ dest, AtkObjectClass src);
+public static final native void memmove (long /*int*/ dest, AtkObjectFactoryClass src);
+public static final native void memmove (long /*int*/ dest, AtkSelectionIface src);
+public static final native void memmove (long /*int*/ dest, AtkTableIface src);
+public static final native void memmove (long /*int*/ dest, AtkTextIface src);
+public static final native void memmove (long /*int*/ dest, AtkValueIface src);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove (int /*long*/ dest, AtkTextRectangle src, int size);
+public static final native void memmove (long /*int*/ dest, AtkTextRectangle src, int size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove (AtkTextRectangle dest, int /*long*/ src, int size);
+public static final native void memmove (AtkTextRectangle dest, long /*int*/ src, int size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove (int /*long*/ dest, AtkTextRange src, int size);
+public static final native void memmove (long /*int*/ dest, AtkTextRange src, int size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove (AtkTextRange dest, int /*long*/ src, int size);
+public static final native void memmove (AtkTextRange dest, long /*int*/ src, int size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove (int /*long*/ dest, AtkAttribute src, int size);
+public static final native void memmove (long /*int*/ dest, AtkAttribute src, int size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove (AtkAttribute dest, int /*long*/ src, int size);
+public static final native void memmove (AtkAttribute dest, long /*int*/ src, int size);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java
index 58ba164307..7c554a3349 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java
@@ -18,17 +18,17 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkActionIface {
// GTypeInterface parent;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ do_action;
+ public long /*int*/ do_action;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_n_actions;
+ public long /*int*/ get_n_actions;
/** @field cast=(const gchar *(*)()) */
- public int /*long*/ get_description;
+ public long /*int*/ get_description;
/** @field cast=(const gchar *(*)()) */
- public int /*long*/ get_name;
+ public long /*int*/ get_name;
/** @field cast=(const gchar *(*)()) */
- public int /*long*/ get_keybinding;
+ public long /*int*/ get_keybinding;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ set_description;
+ public long /*int*/ set_description;
// AtkFunction pad1;
// AtkFunction pad2;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java
index 1615e456e4..ae9a76ad5e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkAttribute.java
@@ -17,9 +17,9 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkAttribute {
/** @field cast=(char *) */
- public int /*long*/ name;
+ public long /*int*/ name;
/** @field cast=(char *) */
- public int /*long*/ value;
+ public long /*int*/ value;
public static final int sizeof = ATK.AtkAttribute_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java
index 50fdc76679..9902c138b7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java
@@ -17,29 +17,29 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkComponentIface {
/** @field cast=(guint (*)()) */
- public int /*long*/ add_focus_handler;
+ public long /*int*/ add_focus_handler;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ contains;
+ public long /*int*/ contains;
/** @field cast=(AtkObject *(*)()) */
- public int /*long*/ ref_accessible_at_point;
+ public long /*int*/ ref_accessible_at_point;
/** @field cast=(void (*)()) */
- public int /*long*/ get_extents;
+ public long /*int*/ get_extents;
/** @field cast=(void (*)()) */
- public int /*long*/ get_position;
+ public long /*int*/ get_position;
/** @field cast=(void (*)()) */
- public int /*long*/ get_size;
+ public long /*int*/ get_size;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ grab_focus;
+ public long /*int*/ grab_focus;
/** @field cast=(void (*)()) */
- public int /*long*/ remove_focus_handler;
+ public long /*int*/ remove_focus_handler;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ set_extents;
+ public long /*int*/ set_extents;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ set_position;
+ public long /*int*/ set_position;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ set_size;
+ public long /*int*/ set_size;
/** @field cast=(AtkLayer (*)()) */
- public int /*long*/ get_layer;
+ public long /*int*/ get_layer;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_mdi_zorder;
+ public long /*int*/ get_mdi_zorder;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkEditableTextIface.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkEditableTextIface.java
index f4f7723b1b..fc71726d34 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkEditableTextIface.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkEditableTextIface.java
@@ -16,17 +16,17 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkEditableTextIface {
/** @field cast=(gboolean (*)()) */
- public int /*long*/ set_run_attributes;
+ public long /*int*/ set_run_attributes;
/** @field cast=(void (*)()) */
- public int /*long*/ set_text_contents;
+ public long /*int*/ set_text_contents;
/** @field cast=(void (*)()) */
- public int /*long*/ insert_text;
+ public long /*int*/ insert_text;
/** @field cast=(void (*)()) */
- public int /*long*/ copy_text;
+ public long /*int*/ copy_text;
/** @field cast=(void (*)()) */
- public int /*long*/ cut_text;
+ public long /*int*/ cut_text;
/** @field cast=(void (*)()) */
- public int /*long*/ delete_text;
+ public long /*int*/ delete_text;
/** @field cast=(void (*)()) */
- public int /*long*/ paste_text;
+ public long /*int*/ paste_text;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java
index 44e2331c2a..436659500d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java
@@ -17,9 +17,9 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkHypertextIface {
/** @field cast=(AtkHyperlink *(*)()) */
- public int /*long*/ get_link;
+ public long /*int*/ get_link;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_n_links;
+ public long /*int*/ get_n_links;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_link_index;
+ public long /*int*/ get_link_index;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
index 1858a8c82a..dface5134a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
@@ -17,51 +17,51 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkObjectClass {
/** @field cast=(const gchar *(*)()) */
- public int /*long*/ get_name;
+ public long /*int*/ get_name;
/** @field cast=(const gchar *(*)()) */
- public int /*long*/ get_description;
+ public long /*int*/ get_description;
/** @field cast=(AtkObject *(*)()) */
- public int /*long*/ get_parent;
+ public long /*int*/ get_parent;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_n_children;
+ public long /*int*/ get_n_children;
/** @field cast=(AtkObject *(*)()) */
- public int /*long*/ ref_child;
+ public long /*int*/ ref_child;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_index_in_parent;
+ public long /*int*/ get_index_in_parent;
/** @field cast=(AtkRelationSet *(*)()) */
- public int /*long*/ ref_relation_set;
+ public long /*int*/ ref_relation_set;
/** @field cast=(AtkRole (*)()) */
- public int /*long*/ get_role;
+ public long /*int*/ get_role;
/** @field cast=(AtkLayer (*)()) */
- public int /*long*/ get_layer;
+ public long /*int*/ get_layer;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_mdi_zorder;
+ public long /*int*/ get_mdi_zorder;
/** @field cast=(AtkStateSet *(*)()) */
- public int /*long*/ ref_state_set;
+ public long /*int*/ ref_state_set;
/** @field cast=(void (*)()) */
- public int /*long*/ set_name;
+ public long /*int*/ set_name;
/** @field cast=(void (*)()) */
- public int /*long*/ set_description;
+ public long /*int*/ set_description;
/** @field cast=(void (*)()) */
- public int /*long*/ set_parent;
+ public long /*int*/ set_parent;
/** @field cast=(void (*)()) */
- public int /*long*/ set_role;
+ public long /*int*/ set_role;
/** @field cast=(guint (*)()) */
- public int /*long*/ connect_property_change_handler;
+ public long /*int*/ connect_property_change_handler;
/** @field cast=(void (*)()) */
- public int /*long*/ remove_property_change_handler;
+ public long /*int*/ remove_property_change_handler;
/** @field cast=(void (*)()) */
- public int /*long*/ initialize;
+ public long /*int*/ initialize;
/** @field cast=(void (*)()) */
- public int /*long*/ children_changed;
+ public long /*int*/ children_changed;
/** @field cast=(void (*)()) */
- public int /*long*/ focus_event;
+ public long /*int*/ focus_event;
/** @field cast=(void (*)()) */
- public int /*long*/ property_change;
+ public long /*int*/ property_change;
/** @field cast=(void (*)()) */
- public int /*long*/ state_change;
+ public long /*int*/ state_change;
/** @field cast=(void (*)()) */
- public int /*long*/ visible_data_changed;
+ public long /*int*/ visible_data_changed;
/** @field accessor=SWT_AtkObjectClass_get_attributes,cast=(SWT_AtkObjectClass_get_attributes_cast) */
- public int /*long*/ get_attributes;
+ public long /*int*/ get_attributes;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java
index cf340b800f..b7880e7b62 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java
@@ -17,9 +17,9 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkObjectFactoryClass {
/** @field cast=(AtkObject *(*)()) */
- public int /*long*/ create_accessible;
+ public long /*int*/ create_accessible;
/** @field cast=(void (*)()) */
- public int /*long*/ invalidate;
+ public long /*int*/ invalidate;
/** @field cast=(GType (*)()) */
- public int /*long*/ get_accessible_type;
+ public long /*int*/ get_accessible_type;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java
index 71052afff9..08f37ebed0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java
@@ -17,19 +17,19 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkSelectionIface {
/** @field cast=(gboolean (*)()) */
- public int /*long*/ add_selection;
+ public long /*int*/ add_selection;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ clear_selection;
+ public long /*int*/ clear_selection;
/** @field cast=(AtkObject *(*)()) */
- public int /*long*/ ref_selection;
+ public long /*int*/ ref_selection;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_selection_count;
+ public long /*int*/ get_selection_count;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ is_child_selected;
+ public long /*int*/ is_child_selected;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ remove_selection;
+ public long /*int*/ remove_selection;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ select_all_selection;
+ public long /*int*/ select_all_selection;
/** @field cast=(void (*)()) */
- public int /*long*/ selection_changed;
+ public long /*int*/ selection_changed;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java
index f03d9266ea..ced58e4d49 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTableIface.java
@@ -17,75 +17,75 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkTableIface {
/** @field cast=(AtkObject* (*)()) */
- public int /*long*/ ref_at;
+ public long /*int*/ ref_at;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_index_at;
+ public long /*int*/ get_index_at;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_column_at_index;
+ public long /*int*/ get_column_at_index;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_row_at_index;
+ public long /*int*/ get_row_at_index;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_n_columns;
+ public long /*int*/ get_n_columns;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_n_rows;
+ public long /*int*/ get_n_rows;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_column_extent_at;
+ public long /*int*/ get_column_extent_at;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_row_extent_at;
+ public long /*int*/ get_row_extent_at;
/** @field cast=(AtkObject* (*)()) */
- public int /*long*/ get_caption;
+ public long /*int*/ get_caption;
/** @field cast=(const gchar* (*)()) */
- public int /*long*/ get_column_description;
+ public long /*int*/ get_column_description;
/** @field cast=(AtkObject* (*)()) */
- public int /*long*/ get_column_header;
+ public long /*int*/ get_column_header;
/** @field cast=(const gchar* (*)()) */
- public int /*long*/ get_row_description;
+ public long /*int*/ get_row_description;
/** @field cast=(AtkObject* (*)()) */
- public int /*long*/ get_row_header;
+ public long /*int*/ get_row_header;
/** @field cast=(AtkObject* (*)()) */
- public int /*long*/ get_summary;
+ public long /*int*/ get_summary;
/** @field cast=(void (*)()) */
- public int /*long*/ set_caption;
+ public long /*int*/ set_caption;
/** @field cast=(void (*)()) */
- public int /*long*/ set_column_description;
+ public long /*int*/ set_column_description;
/** @field cast=(void (*)()) */
- public int /*long*/ set_column_header;
+ public long /*int*/ set_column_header;
/** @field cast=(void (*)()) */
- public int /*long*/ set_row_description;
+ public long /*int*/ set_row_description;
/** @field cast=(void (*)()) */
- public int /*long*/ set_row_header;
+ public long /*int*/ set_row_header;
/** @field cast=(void (*)()) */
- public int /*long*/ set_summary;
+ public long /*int*/ set_summary;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_selected_columns;
+ public long /*int*/ get_selected_columns;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_selected_rows;
+ public long /*int*/ get_selected_rows;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ is_column_selected;
+ public long /*int*/ is_column_selected;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ is_row_selected;
+ public long /*int*/ is_row_selected;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ is_selected;
+ public long /*int*/ is_selected;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ add_row_selection;
+ public long /*int*/ add_row_selection;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ remove_row_selection;
+ public long /*int*/ remove_row_selection;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ add_column_selection;
+ public long /*int*/ add_column_selection;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ remove_column_selection;
+ public long /*int*/ remove_column_selection;
/** @field cast=(void (*)()) */
- public int /*long*/ row_inserted;
+ public long /*int*/ row_inserted;
/** @field cast=(void (*)()) */
- public int /*long*/ column_inserted;
+ public long /*int*/ column_inserted;
/** @field cast=(void (*)()) */
- public int /*long*/ row_deleted;
+ public long /*int*/ row_deleted;
/** @field cast=(void (*)()) */
- public int /*long*/ column_deleted;
+ public long /*int*/ column_deleted;
/** @field cast=(void (*)()) */
- public int /*long*/ row_reordered;
+ public long /*int*/ row_reordered;
/** @field cast=(void (*)()) */
- public int /*long*/ column_reordered;
+ public long /*int*/ column_reordered;
/** @field cast=(void (*)()) */
- public int /*long*/ model_changed;
+ public long /*int*/ model_changed;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java
index 0ab9f657ec..eaa3a1d684 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java
@@ -17,47 +17,47 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkTextIface {
/** @field cast=(gchar *(*)()) */
- public int /*long*/ get_text;
+ public long /*int*/ get_text;
/** @field cast=(gchar *(*)()) */
- public int /*long*/ get_text_after_offset;
+ public long /*int*/ get_text_after_offset;
/** @field cast=(gchar *(*)()) */
- public int /*long*/ get_text_at_offset;
+ public long /*int*/ get_text_at_offset;
/** @field cast=(gunichar (*)()) */
- public int /*long*/ get_character_at_offset;
+ public long /*int*/ get_character_at_offset;
/** @field cast=(gchar *(*)()) */
- public int /*long*/ get_text_before_offset;
+ public long /*int*/ get_text_before_offset;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_caret_offset;
+ public long /*int*/ get_caret_offset;
/** @field cast=(AtkAttributeSet *(*)()) */
- public int /*long*/ get_run_attributes;
+ public long /*int*/ get_run_attributes;
/** @field cast=(AtkAttributeSet *(*)()) */
- public int /*long*/ get_default_attributes;
+ public long /*int*/ get_default_attributes;
/** @field cast=(void (*)()) */
- public int /*long*/ get_character_extents;
+ public long /*int*/ get_character_extents;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_character_count;
+ public long /*int*/ get_character_count;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_offset_at_point;
+ public long /*int*/ get_offset_at_point;
/** @field cast=(gint (*)()) */
- public int /*long*/ get_n_selections;
+ public long /*int*/ get_n_selections;
/** @field cast=(gchar *(*)()) */
- public int /*long*/ get_selection;
+ public long /*int*/ get_selection;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ add_selection;
+ public long /*int*/ add_selection;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ remove_selection;
+ public long /*int*/ remove_selection;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ set_selection;
+ public long /*int*/ set_selection;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ set_caret_offset;
+ public long /*int*/ set_caret_offset;
/** @field cast=(void (*)()) */
- public int /*long*/ text_changed;
+ public long /*int*/ text_changed;
/** @field cast=(void (*)()) */
- public int /*long*/ text_caret_moved;
+ public long /*int*/ text_caret_moved;
/** @field cast=(void (*)()) */
- public int /*long*/ text_selection_changed;
+ public long /*int*/ text_selection_changed;
/** @field cast=(void (*)()) */
- public int /*long*/ get_range_extents;
+ public long /*int*/ get_range_extents;
/** @field cast=(AtkTextRange** (*)()) */
- public int /*long*/ get_bounded_ranges;
+ public long /*int*/ get_bounded_ranges;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java
index fedd2951fd..93f313dbdd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkTextRange.java
@@ -20,7 +20,7 @@ public class AtkTextRange {
public int start_offset;
public int end_offset;
/** @field cast=(gchar *) */
- public int /*long*/ content;
+ public long /*int*/ content;
public static final int sizeof = ATK.AtkTextRange_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java
index 26cfe52e1b..f8e2162703 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/AtkValueIface.java
@@ -17,11 +17,11 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkValueIface {
/** @field cast=(void (*)()) */
- public int /*long*/ get_current_value;
+ public long /*int*/ get_current_value;
/** @field cast=(void (*)()) */
- public int /*long*/ get_maximum_value;
+ public long /*int*/ get_maximum_value;
/** @field cast=(void (*)()) */
- public int /*long*/ get_minimum_value;
+ public long /*int*/ get_minimum_value;
/** @field cast=(gboolean (*)()) */
- public int /*long*/ set_current_value;
+ public long /*int*/ set_current_value;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java
index 6b1013bb48..68ead1b008 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java
@@ -17,5 +17,5 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class GtkAccessible {
/** @field cast=(GtkWidget *) */
- public int /*long*/ widget;
+ public long /*int*/ widget;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GInterfaceInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GInterfaceInfo.java
index 6e5b7461d9..3d55333e7a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GInterfaceInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GInterfaceInfo.java
@@ -17,10 +17,10 @@ package org.eclipse.swt.internal.gtk;
public class GInterfaceInfo {
/** @field cast=(GInterfaceInitFunc) */
- public int /*long*/ interface_init;
+ public long /*int*/ interface_init;
/** @field cast=(GInterfaceFinalizeFunc) */
- public int /*long*/ interface_finalize;
+ public long /*int*/ interface_finalize;
/** @field cast=(gpointer) */
- public int /*long*/ interface_data;
+ public long /*int*/ interface_data;
public static final int sizeof = OS.GInterfaceInfo_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GObjectClass.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GObjectClass.java
index 649eba2287..84a3f0661e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GObjectClass.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GObjectClass.java
@@ -17,17 +17,17 @@ package org.eclipse.swt.internal.gtk;
public class GObjectClass {
/** @field cast=(GObject *(*)()) */
- public int /*long*/ constructor;
+ public long /*int*/ constructor;
/** @field cast=(void (*)()) */
- public int /*long*/ set_property;
+ public long /*int*/ set_property;
/** @field cast=(void (*)()) */
- public int /*long*/ get_property;
+ public long /*int*/ get_property;
/** @field cast=(void (*)()) */
- public int /*long*/ dispose;
+ public long /*int*/ dispose;
/** @field cast=(void (*)()) */
- public int /*long*/ finalize;
+ public long /*int*/ finalize;
/** @field cast=(void (*)()) */
- public int /*long*/ dispatch_properties_changed;
+ public long /*int*/ dispatch_properties_changed;
/** @field cast=(void (*)()) */
- public int /*long*/ notify;
+ public long /*int*/ notify;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeInfo.java
index 645454e6a6..4dbd0a7b9d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeInfo.java
@@ -19,22 +19,22 @@ public class GTypeInfo {
/** @field cast=(guint16) */
public short class_size;
/** @field cast=(GBaseInitFunc) */
- public int /*long*/ base_init;
+ public long /*int*/ base_init;
/** @field cast=(GBaseFinalizeFunc) */
- public int /*long*/ base_finalize;
+ public long /*int*/ base_finalize;
/** @field cast=(GClassInitFunc) */
- public int /*long*/ class_init;
+ public long /*int*/ class_init;
/** @field cast=(GClassFinalizeFunc) */
- public int /*long*/ class_finalize;
+ public long /*int*/ class_finalize;
/** @field cast=(gconstpointer) */
- public int /*long*/ class_data;
+ public long /*int*/ class_data;
/** @field cast=(guint16) */
public short instance_size;
/** @field cast=(guint16) */
public short n_preallocs;
/** @field cast=(GInstanceInitFunc) */
- public int /*long*/ instance_init;
+ public long /*int*/ instance_init;
/** @field cast=(GTypeValueTable *) */
- public int /*long*/ value_table;
+ public long /*int*/ value_table;
public static final int sizeof = OS.GTypeInfo_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeQuery.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeQuery.java
index 56d24af422..c0f5c6de88 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeQuery.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeQuery.java
@@ -19,7 +19,7 @@ public class GTypeQuery {
/** @field cast=(GType) */
public int type;
/** @field cast=(const gchar *) */
- public int /*long*/ type_name;
+ public long /*int*/ type_name;
/** @field cast=(guint) */
public int class_size;
/** @field cast=(guint) */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkDragContext.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkDragContext.java
index 912bd5f559..3305c565d9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkDragContext.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkDragContext.java
@@ -21,11 +21,11 @@ public class GdkDragContext {
/** @field cast=(gboolean) */
public boolean is_source;
/** @field cast=(GdkWindow *) */
- public int /*long*/ source_window;
+ public long /*int*/ source_window;
/** @field cast=(GdkWindow *) */
- public int /*long*/ dest_window;
+ public long /*int*/ dest_window;
/** @field cast=(GList *) */
- public int /*long*/ targets;
+ public long /*int*/ targets;
/** @field cast=(GdkDragAction) */
public int actions;
/** @field cast=(GdkDragAction) */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventAny.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventAny.java
index 5519285d95..f88641c89c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventAny.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventAny.java
@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventAny extends GdkEvent {
/** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
/** @field cast=(gint8) */
public byte send_event;
public static final int sizeof = OS.GdkEventAny_sizeof();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventButton.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventButton.java
index 68a2789f7c..132126eafd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventButton.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventButton.java
@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventButton extends GdkEvent {
/** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(guint32) */
@@ -27,13 +27,13 @@ public class GdkEventButton extends GdkEvent {
/** @field cast=(gdouble) */
public double y;
/** @field cast=(gdouble *) */
- public int /*long*/ axes;
+ public long /*int*/ axes;
/** @field cast=(guint) */
public int state;
/** @field cast=(guint) */
public int button;
/** @field cast=(GdkDevice *) */
- public int /*long*/ device;
+ public long /*int*/ device;
/** @field cast=(gdouble) */
public double x_root;
/** @field cast=(gdouble) */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventCrossing.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventCrossing.java
index 0c1b40ef99..7cc3f4e629 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventCrossing.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventCrossing.java
@@ -17,11 +17,11 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventCrossing extends GdkEvent {
/** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(GdkWindow *) */
- public int /*long*/ subwindow;
+ public long /*int*/ subwindow;
public int time;
public double x;
public double y;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventExpose.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventExpose.java
index df0afac429..d54b41d851 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventExpose.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventExpose.java
@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventExpose extends GdkEvent {
/** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
/** @field cast=(gint8) */
public byte send_event;
/** @field accessor=area.x */
@@ -29,7 +29,7 @@ public class GdkEventExpose extends GdkEvent {
/** @field accessor=area.height */
public int area_height;
/** @field cast=(GdkRegion *) */
- public int /*long*/ region;
+ public long /*int*/ region;
/** @field cast=(gint) */
public int count;
public static final int sizeof = OS.GdkEventExpose_sizeof();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventFocus.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventFocus.java
index 83d66a908d..a8f9bdb1ef 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventFocus.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventFocus.java
@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventFocus extends GdkEvent {
/** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(gint16) */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventKey.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventKey.java
index 423dc2ec62..108699acd0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventKey.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventKey.java
@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventKey extends GdkEvent {
/** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(guint32) */
@@ -29,7 +29,7 @@ public class GdkEventKey extends GdkEvent {
/** @field cast=(gint) */
public int length;
/** @field cast=(gchar *) */
- public int /*long*/ string;
+ public long /*int*/ string;
/** @field cast=(guint16) */
public short hardware_keycode;
/** @field cast=(guint8) */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventMotion.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventMotion.java
index e813867216..4091cfb5d7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventMotion.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventMotion.java
@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventMotion extends GdkEvent {
/** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(guint32) */
@@ -27,13 +27,13 @@ public class GdkEventMotion extends GdkEvent {
/** @field cast=(gdouble) */
public double y;
/** @field cast=(gdouble *) */
- public int /*long*/ axes;
+ public long /*int*/ axes;
/** @field cast=(guint) */
public int state;
/** @field cast=(gint16) */
public short is_hint;
/** @field cast=(GdkDevice *) */
- public int /*long*/ device;
+ public long /*int*/ device;
/** @field cast=(gdouble) */
public double x_root;
/** @field cast=(gdouble) */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventProperty.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventProperty.java
index 1abcbd6811..480421a666 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventProperty.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventProperty.java
@@ -16,11 +16,11 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventProperty extends GdkEvent {
/** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(GdkAtom) */
- public int /*long*/ atom;
+ public long /*int*/ atom;
/** @field cast=(guint32) */
public int time;
/** @field cast=(guint) */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventScroll.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventScroll.java
index f364cd6b5c..ca84ca0a6b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventScroll.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventScroll.java
@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventScroll extends GdkEvent {
/** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(guint32) */
@@ -31,7 +31,7 @@ public class GdkEventScroll extends GdkEvent {
/** @field cast=(GdkScrollDirection) */
public int direction;
/** @field cast=(GdkDevice *) */
- public int /*long*/ device;
+ public long /*int*/ device;
/** @field cast=(gdouble) */
public double x_root;
/** @field cast=(gdouble) */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventVisibility.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventVisibility.java
index 3613c178d3..f5650ac911 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventVisibility.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventVisibility.java
@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventVisibility extends GdkEvent {
/** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
/** @field cast=(gint8) */
public byte send_event;
/** @field cast=(GdkVisibilityState) */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventWindowState.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventWindowState.java
index 1a5dfdf6ee..8159249541 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventWindowState.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventWindowState.java
@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventWindowState extends GdkEvent {
/** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
public byte send_event;
public int changed_mask;
public int new_window_state;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkGCValues.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkGCValues.java
index b05fc32eb7..0bde74d929 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkGCValues.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkGCValues.java
@@ -33,17 +33,17 @@ public class GdkGCValues {
/** @field accessor=background.blue,cast=(guint16) */
public short background_blue;
/** @field cast=(GdkFont *) */
- public int /*long*/ font;
+ public long /*int*/ font;
/** @field cast=(GdkFunction) */
- public int /*long*/ function;
+ public long /*int*/ function;
/** @field cast=(GdkFill) */
public int fill;
/** @field cast=(GdkPixmap *) */
- public int /*long*/ tile;
+ public long /*int*/ tile;
/** @field cast=(GdkPixmap *) */
- public int /*long*/ stipple;
+ public long /*int*/ stipple;
/** @field cast=(GdkPixmap *) */
- public int /*long*/ clip_mask;
+ public long /*int*/ clip_mask;
/** @field cast=(GdkSubwindowMode) */
public int subwindow_mode;
/** @field cast=(gint) */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkImage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkImage.java
index e0dcf546c1..a9948253ba 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkImage.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkImage.java
@@ -19,7 +19,7 @@ public class GdkImage {
/** @field cast=(GdkImageType) */
public int type;
/** @field cast=(GdkVisual *) */
- public int /*long*/ visual;
+ public long /*int*/ visual;
/** @field cast=(GdkByteOrder) */
public int byte_order;
/** @field cast=(gint) */
@@ -35,9 +35,9 @@ public class GdkImage {
/** @field cast=(guint16) */
public short bits_per_pixel;
/** @field cast=(gpointer) */
- public int /*long*/ mem;
+ public long /*int*/ mem;
/** @field cast=(GdkColormap *) */
- public int /*long*/ colormap;
+ public long /*int*/ colormap;
/** @field cast=(gpointer) */
- public int /*long*/ windowing_data;
+ public long /*int*/ windowing_data;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkWindowAttr.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkWindowAttr.java
index 33e9930ae3..3c871ac19d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkWindowAttr.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkWindowAttr.java
@@ -17,23 +17,23 @@ package org.eclipse.swt.internal.gtk;
public class GdkWindowAttr {
/** @field cast=(gchar *) */
- public int /*long*/ title;
+ public long /*int*/ title;
public int event_mask;
public int x, y;
public int width;
public int height;
public int wclass;
/** @field cast=(GdkVisual *) */
- public int /*long*/ visual;
+ public long /*int*/ visual;
/** @field cast=(GdkColormap *) */
- public int /*long*/ colormap;
+ public long /*int*/ colormap;
public int window_type;
/** @field cast=(GdkCursor *) */
- public int /*long*/ cursor;
+ public long /*int*/ cursor;
/** @field cast=(gchar *) */
- public int /*long*/ wmclass_name;
+ public long /*int*/ wmclass_name;
/** @field cast=(gchar *) */
- public int /*long*/ wmclass_class;
+ public long /*int*/ wmclass_class;
public boolean override_redirect;
public static final int sizeof = OS.GdkWindowAttr_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
index d82483bcfa..f8308286dc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GtkCellRendererClass {
/** @field cast=(void(*)()) */
- public int /*long*/ render;
+ public long /*int*/ render;
/** @field cast=(void(*)()) */
- public int /*long*/ get_size;
+ public long /*int*/ get_size;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java
index b94ccfa383..a9af3750e7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java
@@ -17,11 +17,11 @@ package org.eclipse.swt.internal.gtk;
public class GtkColorSelectionDialog {
/** @field cast=(GtkWidget *) */
- public int /*long*/ colorsel;
+ public long /*int*/ colorsel;
/** @field cast=(GtkWidget *) */
- public int /*long*/ ok_button;
+ public long /*int*/ ok_button;
/** @field cast=(GtkWidget *) */
- public int /*long*/ cancel_button;
+ public long /*int*/ cancel_button;
/** @field cast=(GtkWidget *) */
- public int /*long*/ help_button;
+ public long /*int*/ help_button;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkFixed.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkFixed.java
index 93b1af7b52..9ca6e7a01e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkFixed.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkFixed.java
@@ -17,5 +17,5 @@ package org.eclipse.swt.internal.gtk;
public class GtkFixed {
/** @field cast=(GList *) */
- public int /*long*/ children;
+ public long /*int*/ children;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkSelectionData.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkSelectionData.java
index 6c413af9ea..6cc4fcca4a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkSelectionData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkSelectionData.java
@@ -17,15 +17,15 @@ package org.eclipse.swt.internal.gtk;
public class GtkSelectionData {
/** @field cast=(GdkAtom) */
- public int /*long*/ selection;
+ public long /*int*/ selection;
/** @field cast=(GdkAtom) */
- public int /*long*/ target;
+ public long /*int*/ target;
/** @field cast=(GdkAtom) */
- public int /*long*/ type;
+ public long /*int*/ type;
/** @field cast=(gint) */
public int format;
/** @field cast=(guchar *) */
- public int /*long*/ data;
+ public long /*int*/ data;
/** @field cast=(gint) */
public int length;
public static final int sizeof = OS.GtkSelectionData_sizeof();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetEntry.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
index cf317742c1..cfc4dffc47 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GtkTargetEntry {
/** @field cast=(gchar *) */
- public int /*long*/ target;
+ public long /*int*/ target;
/** @field cast=(guint) */
public int flags;
/** @field cast=(guint) */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetPair.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetPair.java
index c98fb12ee0..beef1cfe6f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetPair.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetPair.java
@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class GtkTargetPair {
/** @field cast=(GdkAtom) */
- public int /*long*/ target;
+ public long /*int*/ target;
/** @field cast=(guint) */
public int flags;
/** @field cast=(guint) */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkWidgetClass.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkWidgetClass.java
index 691a60f407..4de85dc986 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkWidgetClass.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkWidgetClass.java
@@ -19,127 +19,127 @@ public class GtkWidgetClass extends GObjectClass {
public int activate_signal;
public int set_scroll_adjustments_signal;
/** @field cast=(void(*)()) */
- public int /*long*/ dispatch_child_properties_changed;
+ public long /*int*/ dispatch_child_properties_changed;
/** @field cast=(void(*)()) */
- public int /*long*/ show;
+ public long /*int*/ show;
/** @field cast=(void(*)()) */
- public int /*long*/ show_all;
+ public long /*int*/ show_all;
/** @field cast=(void(*)()) */
- public int /*long*/ hide;
+ public long /*int*/ hide;
/** @field cast=(void(*)()) */
- public int /*long*/ hide_all;
+ public long /*int*/ hide_all;
/** @field cast=(void(*)()) */
- public int /*long*/ map;
+ public long /*int*/ map;
/** @field cast=(void(*)()) */
- public int /*long*/ unmap;
+ public long /*int*/ unmap;
/** @field cast=(void(*)()) */
- public int /*long*/ realize;
+ public long /*int*/ realize;
/** @field cast=(void(*)()) */
- public int /*long*/ unrealize;
+ public long /*int*/ unrealize;
/** @field cast=(void(*)()) */
- public int /*long*/ size_request;
+ public long /*int*/ size_request;
/** @field cast=(void(*)()) */
- public int /*long*/ size_allocate;
+ public long /*int*/ size_allocate;
/** @field cast=(void(*)()) */
- public int /*long*/ state_changed;
+ public long /*int*/ state_changed;
/** @field cast=(void(*)()) */
- public int /*long*/ parent_set;
+ public long /*int*/ parent_set;
/** @field cast=(void(*)()) */
- public int /*long*/ hierarchy_changed;
+ public long /*int*/ hierarchy_changed;
/** @field cast=(void(*)()) */
- public int /*long*/ style_set;
+ public long /*int*/ style_set;
/** @field cast=(void(*)()) */
- public int /*long*/ direction_changed;
+ public long /*int*/ direction_changed;
/** @field cast=(void(*)()) */
- public int /*long*/ grab_notify;
+ public long /*int*/ grab_notify;
/** @field cast=(void(*)()) */
- public int /*long*/ child_notify;
+ public long /*int*/ child_notify;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ mnemonic_activate;
+ public long /*int*/ mnemonic_activate;
/** @field cast=(void(*)()) */
- public int /*long*/ grab_focus;
+ public long /*int*/ grab_focus;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ focus;
+ public long /*int*/ focus;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ event;
+ public long /*int*/ event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ button_press_event;
+ public long /*int*/ button_press_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ button_release_event;
+ public long /*int*/ button_release_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ scroll_event;
+ public long /*int*/ scroll_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ motion_notify_event;
+ public long /*int*/ motion_notify_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ delete_event;
+ public long /*int*/ delete_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ destroy_event;
+ public long /*int*/ destroy_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ expose_event;
+ public long /*int*/ expose_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ key_press_event;
+ public long /*int*/ key_press_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ key_release_event;
+ public long /*int*/ key_release_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ enter_notify_event;
+ public long /*int*/ enter_notify_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ leave_notify_event;
+ public long /*int*/ leave_notify_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ configure_event;
+ public long /*int*/ configure_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ focus_in_event;
+ public long /*int*/ focus_in_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ focus_out_event;
+ public long /*int*/ focus_out_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ map_event;
+ public long /*int*/ map_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ unmap_event;
+ public long /*int*/ unmap_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ property_notify_event;
+ public long /*int*/ property_notify_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ selection_clear_event;
+ public long /*int*/ selection_clear_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ selection_request_event;
+ public long /*int*/ selection_request_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ selection_notify_event;
+ public long /*int*/ selection_notify_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ proximity_in_event;
+ public long /*int*/ proximity_in_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ proximity_out_event;
+ public long /*int*/ proximity_out_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ visibility_notify_event;
+ public long /*int*/ visibility_notify_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ client_event;
+ public long /*int*/ client_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ no_expose_event;
+ public long /*int*/ no_expose_event;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ window_state_event;
+ public long /*int*/ window_state_event;
/** @field cast=(void(*)()) */
- public int /*long*/ selection_get;
+ public long /*int*/ selection_get;
/** @field cast=(void(*)()) */
- public int /*long*/ selection_received;
+ public long /*int*/ selection_received;
/** @field cast=(void(*)()) */
- public int /*long*/ drag_begin;
+ public long /*int*/ drag_begin;
/** @field cast=(void(*)()) */
- public int /*long*/ drag_end;
+ public long /*int*/ drag_end;
/** @field cast=(void(*)()) */
- public int /*long*/ drag_data_get;
+ public long /*int*/ drag_data_get;
/** @field cast=(void(*)()) */
- public int /*long*/ drag_data_delete;
+ public long /*int*/ drag_data_delete;
/** @field cast=(void(*)()) */
- public int /*long*/ drag_leave;
+ public long /*int*/ drag_leave;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ drag_motion;
+ public long /*int*/ drag_motion;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ drag_drop;
+ public long /*int*/ drag_drop;
/** @field cast=(void(*)()) */
- public int /*long*/ drag_data_received;
+ public long /*int*/ drag_data_received;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ popup_menu;
+ public long /*int*/ popup_menu;
/** @field cast=(gboolean(*)()) */
- public int /*long*/ show_help;
+ public long /*int*/ show_help;
/** @field cast=(AtkObject*(*)()) */
- public int /*long*/ get_accessible;
+ public long /*int*/ get_accessible;
/** @field cast=(void(*)()) */
- public int /*long*/ screen_changed;
+ public long /*int*/ screen_changed;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
index 421703038c..1baf52b0ca 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
@@ -37,7 +37,7 @@ public class OS extends C {
IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsHPUX = isHPUX;
byte[] buffer = new byte[4];
- int /*long*/ ptr = OS.malloc(4);
+ long /*int*/ ptr = OS.malloc(4);
OS.memmove(ptr, new int[]{1}, 4);
OS.memmove(buffer, ptr, 1);
OS.free(ptr);
@@ -45,7 +45,7 @@ public class OS extends C {
}
/** Constants */
- public static final int /*long*/ AnyPropertyType = 0;
+ public static final long /*int*/ AnyPropertyType = 0;
public static final int ATK_RELATION_LABELLED_BY = 4;
public static final int G_FILE_TEST_IS_DIR = 1 << 2;
public static final int G_FILE_TEST_IS_EXECUTABLE = 1 << 3;
@@ -675,12 +675,12 @@ public static final native int XExposeEvent_sizeof();
public static final native int XFocusChangeEvent_sizeof();
public static final native int XVisibilityEvent_sizeof();
public static final native int XWindowChanges_sizeof();
-public static final native int /*long*/ localeconv_decimal_point();
+public static final native long /*int*/ localeconv_decimal_point();
/**
* @param path cast=(const char *)
* @param realPath cast=(char *)
*/
-public static final native int /*long*/ realpath(byte[] path, byte[] realPath);
+public static final native long /*int*/ realpath(byte[] path, byte[] realPath);
@@ -688,70 +688,70 @@ public static final native int /*long*/ realpath(byte[] path, byte[] realPath);
/** @param object_class cast=(GObjectClass *) */
-public static final native int /*long*/ G_OBJECT_CLASS_CONSTRUCTOR(int /*long*/ object_class);
+public static final native long /*int*/ G_OBJECT_CLASS_CONSTRUCTOR(long /*int*/ object_class);
/**
* @param object_class cast=(GObjectClass *)
* @paramOFF constructor cast=(GObject* (*) (GType, guint, GObjectConstructParam *))
*/
-public static final native void G_OBJECT_CLASS_SET_CONSTRUCTOR(int /*long*/ object_class, int /*long*/ constructor);
+public static final native void G_OBJECT_CLASS_SET_CONSTRUCTOR(long /*int*/ object_class, long /*int*/ constructor);
/** @param widget cast=(GtkWidget *) */
-public static final native int GTK_WIDGET_HEIGHT(int /*long*/ widget);
+public static final native int GTK_WIDGET_HEIGHT(long /*int*/ widget);
/** @param widget cast=(GtkWidget *) */
-public static final native int GTK_WIDGET_WIDTH(int /*long*/ widget);
+public static final native int GTK_WIDGET_WIDTH(long /*int*/ widget);
/** @param widget cast=(GtkWidget *) */
-public static final native int /*long*/ GTK_WIDGET_WINDOW(int /*long*/ widget);
+public static final native long /*int*/ GTK_WIDGET_WINDOW(long /*int*/ widget);
/** @param widget cast=(GtkWidget *) */
-public static final native int GTK_WIDGET_X(int /*long*/ widget);
+public static final native int GTK_WIDGET_X(long /*int*/ widget);
/** @param widget cast=(GtkWidget *) */
-public static final native int GTK_WIDGET_Y(int /*long*/ widget);
+public static final native int GTK_WIDGET_Y(long /*int*/ widget);
/** @param widget cast=(GtkRange *) */
-public static final native int GTK_RANGE_SLIDER_START(int /*long*/ widget);
+public static final native int GTK_RANGE_SLIDER_START(long /*int*/ widget);
/** @param widget cast=(GtkRange *) */
-public static final native int GTK_RANGE_SLIDER_END(int /*long*/ widget);
+public static final native int GTK_RANGE_SLIDER_END(long /*int*/ widget);
/** @param widget cast=(GtkScrolledWindow *) */
-public static final native int /*long*/ GTK_SCROLLED_WINDOW_HSCROLLBAR(int /*long*/ widget);
+public static final native long /*int*/ GTK_SCROLLED_WINDOW_HSCROLLBAR(long /*int*/ widget);
/** @param widget cast=(GtkScrolledWindow *) */
-public static final native int /*long*/ GTK_SCROLLED_WINDOW_VSCROLLBAR(int /*long*/ widget);
+public static final native long /*int*/ GTK_SCROLLED_WINDOW_VSCROLLBAR(long /*int*/ widget);
/** @param widget cast=(GtkScrolledWindow *) */
-public static final native int GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING(int /*long*/ widget);
+public static final native int GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING(long /*int*/ widget);
/**
* @param acce_label cast=(GtkAccelLabel *)
* @param string cast=(gchar *)
*/
-public static final native void GTK_ACCEL_LABEL_SET_ACCEL_STRING(int /*long*/ acce_label, int /*long*/ string);
+public static final native void GTK_ACCEL_LABEL_SET_ACCEL_STRING(long /*int*/ acce_label, long /*int*/ string);
/** @param acce_label cast=(GtkAccelLabel *) */
-public static final native int /*long*/ GTK_ACCEL_LABEL_GET_ACCEL_STRING(int /*long*/ acce_label);
+public static final native long /*int*/ GTK_ACCEL_LABEL_GET_ACCEL_STRING(long /*int*/ acce_label);
/** @param widget cast=(GtkEntry *) */
-public static final native int /*long*/ GTK_ENTRY_IM_CONTEXT(int /*long*/ widget);
+public static final native long /*int*/ GTK_ENTRY_IM_CONTEXT(long /*int*/ widget);
/** @param widget cast=(GtkTextView *) */
-public static final native int /*long*/ GTK_TEXTVIEW_IM_CONTEXT(int /*long*/ widget);
+public static final native long /*int*/ GTK_TEXTVIEW_IM_CONTEXT(long /*int*/ widget);
/** @param widget cast=(GtkTooltips *) */
-public static final native int /*long*/ GTK_TOOLTIPS_TIP_WINDOW(int /*long*/ widget);
+public static final native long /*int*/ GTK_TOOLTIPS_TIP_WINDOW(long /*int*/ widget);
/**
* @param widget cast=(GtkTooltips *)
* @param data cast=(GtkTooltipsData *)
*/
-public static final native void GTK_TOOLTIPS_SET_ACTIVE(int /*long*/ widget, int /*long*/ data);
+public static final native void GTK_TOOLTIPS_SET_ACTIVE(long /*int*/ widget, long /*int*/ data);
/**
* @param data cast=(GtkTooltipsData *)
*/
-public static final native int /*long*/ GTK_TOOLTIPS_GET_TIP_TEXT(int /*long*/ data);
+public static final native long /*int*/ GTK_TOOLTIPS_GET_TIP_TEXT(long /*int*/ data);
/** @param widget cast=(GtkWidget *) */
-public static final native void GTK_WIDGET_SET_X(int /*long*/ widget, int x);
+public static final native void GTK_WIDGET_SET_X(long /*int*/ widget, int x);
/** @param widget cast=(GtkWidget *) */
-public static final native void GTK_WIDGET_SET_Y(int /*long*/ widget, int y);
+public static final native void GTK_WIDGET_SET_Y(long /*int*/ widget, int y);
/** @param widget cast=(GtkWidget *) */
-public static final native int GTK_WIDGET_REQUISITION_WIDTH(int /*long*/ widget);
+public static final native int GTK_WIDGET_REQUISITION_WIDTH(long /*int*/ widget);
/** @param widget cast=(GtkWidget *) */
-public static final native int GTK_WIDGET_REQUISITION_HEIGHT(int /*long*/ widget);
+public static final native int GTK_WIDGET_REQUISITION_HEIGHT(long /*int*/ widget);
/** @param event cast=(GdkEvent *) */
-public static final native int GDK_EVENT_TYPE(int /*long*/ event);
+public static final native int GDK_EVENT_TYPE(long /*int*/ event);
/** @param event cast=(GdkEventAny *) */
-public static final native int /*long*/ GDK_EVENT_WINDOW(int /*long*/ event);
+public static final native long /*int*/ GDK_EVENT_WINDOW(long /*int*/ event);
/** @param xevent cast=(XEvent *) */
-public static final native int X_EVENT_TYPE(int /*long*/ xevent);
+public static final native int X_EVENT_TYPE(long /*int*/ xevent);
/** @param xevent cast=(XAnyEvent *) */
-public static final native int /*long*/ X_EVENT_WINDOW(int /*long*/ xevent);
+public static final native long /*int*/ X_EVENT_WINDOW(long /*int*/ xevent);
/** X11 Native methods and constants */
public static final int Above = 0;
@@ -769,7 +769,7 @@ public static final int FocusOut = 10;
public static final int GraphicsExpose = 13;
public static final int NoExpose = 14;
public static final int ExposureMask = 1 << 15;
-public static final int /*long*/ NoEventMask = 0;
+public static final long /*int*/ NoEventMask = 0;
public static final int NotifyNormal = 0;
public static final int NotifyGrab = 1;
public static final int NotifyHint = 1;
@@ -785,8 +785,8 @@ public static final int VisibilityChangeMask = 1 << 16;
public static final int VisibilityFullyObscured = 2;
public static final int VisibilityNotify = 15;
public static final int SYSTEM_TRAY_REQUEST_DOCK = 0;
-public static final native int _Call(int /*long*/ proc, int /*long*/ arg1, int /*long*/ arg2);
-public static final int Call(int /*long*/ proc, int /*long*/ arg1, int /*long*/ arg2) {
+public static final native int _Call(long /*int*/ proc, long /*int*/ arg1, long /*int*/ arg2);
+public static final int Call(long /*int*/ proc, long /*int*/ arg1, long /*int*/ arg2) {
lock.lock();
try {
return _Call(proc, arg1, arg2);
@@ -794,8 +794,8 @@ public static final int Call(int /*long*/ proc, int /*long*/ arg1, int /*long*/
lock.unlock();
}
}
-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5, int /*long*/ arg6);
-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5, int /*long*/ arg6) {
+public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5, long /*int*/ arg6);
+public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5, long /*int*/ arg6) {
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -804,8 +804,8 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0,
}
}
/** @method flags=no_gen */
-public static final native void _call_get_size (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5, int /*long*/ arg6);
-public static final void call_get_size (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5, int /*long*/ arg6) {
+public static final native void _call_get_size (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5, long /*int*/ arg6);
+public static final void call_get_size (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5, long /*int*/ arg6) {
lock.lock();
try {
_call_get_size(function, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -816,8 +816,8 @@ public static final void call_get_size (int /*long*/ function, int /*long*/ arg0
/** @method flags=no_gen */
public static final native boolean GDK_WINDOWING_X11();
/** @param pixmap cast=(GdkPixmap *) */
-public static final native int /*long*/ _GDK_PIXMAP_XID(int /*long*/ pixmap);
-public static final int /*long*/ GDK_PIXMAP_XID(int /*long*/ pixmap) {
+public static final native long /*int*/ _GDK_PIXMAP_XID(long /*int*/ pixmap);
+public static final long /*int*/ GDK_PIXMAP_XID(long /*int*/ pixmap) {
lock.lock();
try {
return _GDK_PIXMAP_XID(pixmap);
@@ -831,8 +831,8 @@ public static final int /*long*/ GDK_PIXMAP_XID(int /*long*/ pixmap) {
* @param predicate cast=(Bool (*)())
* @param arg cast=(XPointer)
*/
-public static final native boolean _XCheckIfEvent(int /*long*/ display, int /*long*/ event_return, int /*long*/ predicate, int /*long*/ arg);
-public static final boolean XCheckIfEvent(int /*long*/ display, int /*long*/ event_return, int /*long*/ predicate, int /*long*/ arg) {
+public static final native boolean _XCheckIfEvent(long /*int*/ display, long /*int*/ event_return, long /*int*/ predicate, long /*int*/ arg);
+public static final boolean XCheckIfEvent(long /*int*/ display, long /*int*/ event_return, long /*int*/ predicate, long /*int*/ arg) {
lock.lock();
try {
return _XCheckIfEvent(display, event_return, predicate, arg);
@@ -841,8 +841,8 @@ public static final boolean XCheckIfEvent(int /*long*/ display, int /*long*/ eve
}
}
/** @param display cast=(Display *) */
-public static final native int _XDefaultScreen(int /*long*/ display);
-public static final int XDefaultScreen(int /*long*/ display) {
+public static final native int _XDefaultScreen(long /*int*/ display);
+public static final int XDefaultScreen(long /*int*/ display) {
lock.lock();
try {
return _XDefaultScreen(display);
@@ -851,8 +851,8 @@ public static final int XDefaultScreen(int /*long*/ display) {
}
}
/** @param display cast=(Display *) */
-public static final native int /*long*/ _XDefaultRootWindow(int /*long*/ display);
-public static final int /*long*/ XDefaultRootWindow(int /*long*/ display) {
+public static final native long /*int*/ _XDefaultRootWindow(long /*int*/ display);
+public static final long /*int*/ XDefaultRootWindow(long /*int*/ display) {
lock.lock();
try {
return _XDefaultRootWindow(display);
@@ -861,8 +861,8 @@ public static final int /*long*/ XDefaultRootWindow(int /*long*/ display) {
}
}
/** @param display cast=(Display *) */
-public static final native void _XFlush(int /*long*/ display);
-public static final void XFlush(int /*long*/ display) {
+public static final native void _XFlush(long /*int*/ display);
+public static final void XFlush(long /*int*/ display) {
lock.lock();
try {
_XFlush(display);
@@ -871,8 +871,8 @@ public static final void XFlush(int /*long*/ display) {
}
}
/** @param address cast=(void *) */
-public static final native void _XFree(int /*long*/ address);
-public static final void XFree(int /*long*/ address) {
+public static final native void _XFree(long /*int*/ address);
+public static final void XFree(long /*int*/ address) {
lock.lock();
try {
_XFree(address);
@@ -886,8 +886,8 @@ public static final void XFree(int /*long*/ address) {
* @param window cast=(Window)
* @param time cast=(Time)
*/
-public static final native int /*long*/ _XSetSelectionOwner(int /*long*/ display, int /*long*/ selection, int /*long*/ window, int time);
-public static final int /*long*/ XSetSelectionOwner(int /*long*/ display, int /*long*/ selection, int /*long*/ window, int time) {
+public static final native long /*int*/ _XSetSelectionOwner(long /*int*/ display, long /*int*/ selection, long /*int*/ window, int time);
+public static final long /*int*/ XSetSelectionOwner(long /*int*/ display, long /*int*/ selection, long /*int*/ window, int time) {
lock.lock();
try {
return _XSetSelectionOwner(display, selection, window, time);
@@ -899,8 +899,8 @@ public static final int /*long*/ XSetSelectionOwner(int /*long*/ display, int /*
* @param display cast=(Display *)
* @param selection cast=(Atom)
*/
-public static final native int /*long*/ _XGetSelectionOwner(int /*long*/ display, int /*long*/ selection);
-public static final int /*long*/ XGetSelectionOwner(int /*long*/ display, int /*long*/ selection) {
+public static final native long /*int*/ _XGetSelectionOwner(long /*int*/ display, long /*int*/ selection);
+public static final long /*int*/ XGetSelectionOwner(long /*int*/ display, long /*int*/ selection) {
lock.lock();
try {
return _XGetSelectionOwner(display, selection);
@@ -920,8 +920,8 @@ public static final int /*long*/ XGetSelectionOwner(int /*long*/ display, int /*
* @param bytes_after_return cast=(unsigned long *)
* @param prop_return cast=(unsigned char **)
*/
-public static final native int /*long*/ _XGetWindowProperty(int /*long*/ display, int /*long*/ window, int /*long*/ property, int offset, int length, boolean delete, int /*long*/ req_type, int /*long*/ [] actual_type_return, int [] actual_format_return , int[] nitems_return, int[] bytes_after_return, int /*long*/ [] prop_return);
-public static final int /*long*/ XGetWindowProperty(int /*long*/ display, int /*long*/ window, int /*long*/ property, int offset, int length, boolean delete, int /*long*/ req_type, int /*long*/ [] actual_type_return, int [] actual_format_return, int[] nitems_return, int[] bytes_after_return, int /*long*/ [] prop_return) {
+public static final native long /*int*/ _XGetWindowProperty(long /*int*/ display, long /*int*/ window, long /*int*/ property, int offset, int length, boolean delete, long /*int*/ req_type, long /*int*/ [] actual_type_return, int [] actual_format_return , int[] nitems_return, int[] bytes_after_return, long /*int*/ [] prop_return);
+public static final long /*int*/ XGetWindowProperty(long /*int*/ display, long /*int*/ window, long /*int*/ property, int offset, int length, boolean delete, long /*int*/ req_type, long /*int*/ [] actual_type_return, int [] actual_format_return, int[] nitems_return, int[] bytes_after_return, long /*int*/ [] prop_return) {
lock.lock();
try {
return _XGetWindowProperty(display, window, property, offset, length, delete, req_type, actual_type_return, actual_format_return , nitems_return, bytes_after_return, prop_return);
@@ -936,8 +936,8 @@ public static final int /*long*/ XGetWindowProperty(int /*long*/ display, int /*
* @param name cast=(char *)
* @param ifExists cast=(Bool)
*/
-public static final native int /*long*/ _XInternAtom(int /*long*/ display, byte[] name, boolean ifExists);
-public static final int /*long*/ XInternAtom(int /*long*/ display, byte[] name, boolean ifExists) {
+public static final native long /*int*/ _XInternAtom(long /*int*/ display, byte[] name, boolean ifExists);
+public static final long /*int*/ XInternAtom(long /*int*/ display, byte[] name, boolean ifExists) {
lock.lock();
try {
return _XInternAtom(display, name, ifExists);
@@ -956,8 +956,8 @@ public static final int /*long*/ XInternAtom(int /*long*/ display, byte[] name,
* @param win_y_return cast=(int *)
* @param mask_return cast=(unsigned int *)
*/
-public static final native int _XQueryPointer(int /*long*/ display, int /*long*/ w, int /*long*/[] root_return, int /*long*/[] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return);
-public static final int XQueryPointer(int /*long*/ display, int /*long*/ w, int /*long*/[] root_return, int /*long*/[] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return) {
+public static final native int _XQueryPointer(long /*int*/ display, long /*int*/ w, long /*int*/[] root_return, long /*int*/[] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return);
+public static final int XQueryPointer(long /*int*/ display, long /*int*/ w, long /*int*/[] root_return, long /*int*/[] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return) {
lock.lock();
try {
return _XQueryPointer(display, w, root_return, child_return, root_x_return, root_y_return, win_x_return, win_y_return, mask_return);
@@ -969,8 +969,8 @@ public static final int XQueryPointer(int /*long*/ display, int /*long*/ w, int
* @param display cast=(Display *)
* @param keysym cast=(KeySym)
*/
-public static final native int _XKeysymToKeycode(int /*long*/ display, int /*long*/ keysym);
-public static final int XKeysymToKeycode(int /*long*/ display, int /*long*/ keysym) {
+public static final native int _XKeysymToKeycode(long /*int*/ display, long /*int*/ keysym);
+public static final int XKeysymToKeycode(long /*int*/ display, long /*int*/ keysym) {
lock.lock();
try {
return _XKeysymToKeycode(display, keysym);
@@ -983,8 +983,8 @@ public static final int XKeysymToKeycode(int /*long*/ display, int /*long*/ keys
* @param window cast=(Window)
* @param num_prop_return cast=(int *)
*/
-public static final native int /*long*/ _XListProperties(int /*long*/ display, int /*long*/ window, int[] num_prop_return);
-public static final int /*long*/ XListProperties(int /*long*/ display, int /*long*/ window, int[] num_prop_return) {
+public static final native long /*int*/ _XListProperties(long /*int*/ display, long /*int*/ window, int[] num_prop_return);
+public static final long /*int*/ XListProperties(long /*int*/ display, long /*int*/ window, int[] num_prop_return) {
lock.lock();
try {
return _XListProperties(display, window, num_prop_return);
@@ -997,8 +997,8 @@ public static final int /*long*/ XListProperties(int /*long*/ display, int /*lon
* @param window cast=(Window)
* @param values flags=no_out
*/
-public static final native int _XReconfigureWMWindow(int /*long*/ display, int /*long*/ window, int screen, int valueMask, XWindowChanges values);
-public static final int XReconfigureWMWindow(int /*long*/ display, int /*long*/ window, int screen, int valueMask, XWindowChanges values) {
+public static final native int _XReconfigureWMWindow(long /*int*/ display, long /*int*/ window, int screen, int valueMask, XWindowChanges values);
+public static final int XReconfigureWMWindow(long /*int*/ display, long /*int*/ window, int screen, int valueMask, XWindowChanges values) {
lock.lock();
try {
return _XReconfigureWMWindow(display, window, screen, valueMask, values);
@@ -1011,8 +1011,8 @@ public static final int XReconfigureWMWindow(int /*long*/ display, int /*long*/
* @param w cast=(Window)
* @param event_send cast=(XEvent *)
*/
-public static final native int _XSendEvent(int /*long*/ display, int /*long*/ w, boolean propogate, int /*long*/ event_mask, int /*long*/ event_send);
-public static final int XSendEvent(int /*long*/ display, int /*long*/ w, boolean propogate, int /*long*/ event_mask, int /*long*/ event_send) {
+public static final native int _XSendEvent(long /*int*/ display, long /*int*/ w, boolean propogate, long /*int*/ event_mask, long /*int*/ event_send);
+public static final int XSendEvent(long /*int*/ display, long /*int*/ w, boolean propogate, long /*int*/ event_mask, long /*int*/ event_send) {
lock.lock();
try {
return _XSendEvent(display, w, propogate, event_mask, event_send);
@@ -1021,8 +1021,8 @@ public static final int XSendEvent(int /*long*/ display, int /*long*/ w, boolean
}
}
/** @param handler cast=(XIOErrorHandler) */
-public static final native int /*long*/ _XSetIOErrorHandler(int /*long*/ handler);
-public static final int /*long*/ XSetIOErrorHandler(int /*long*/ handler) {
+public static final native long /*int*/ _XSetIOErrorHandler(long /*int*/ handler);
+public static final long /*int*/ XSetIOErrorHandler(long /*int*/ handler) {
lock.lock();
try {
return _XSetIOErrorHandler(handler);
@@ -1031,8 +1031,8 @@ public static final int /*long*/ XSetIOErrorHandler(int /*long*/ handler) {
}
}
/** @param handler cast=(XErrorHandler) */
-public static final native int /*long*/ _XSetErrorHandler(int /*long*/ handler);
-public static final int /*long*/ XSetErrorHandler(int /*long*/ handler) {
+public static final native long /*int*/ _XSetErrorHandler(long /*int*/ handler);
+public static final long /*int*/ XSetErrorHandler(long /*int*/ handler) {
lock.lock();
try {
return _XSetErrorHandler(handler);
@@ -1044,8 +1044,8 @@ public static final int /*long*/ XSetErrorHandler(int /*long*/ handler) {
* @param display cast=(Display *)
* @param window cast=(Window)
*/
-public static final native int _XSetInputFocus(int /*long*/ display, int /*long*/ window, int revert, int time);
-public static final int XSetInputFocus(int /*long*/ display, int /*long*/ window, int revert, int time) {
+public static final native int _XSetInputFocus(long /*int*/ display, long /*int*/ window, int revert, int time);
+public static final int XSetInputFocus(long /*int*/ display, long /*int*/ window, int revert, int time) {
lock.lock();
try {
return _XSetInputFocus(display, window, revert, time);
@@ -1058,8 +1058,8 @@ public static final int XSetInputFocus(int /*long*/ display, int /*long*/ window
* @param w cast=(Window)
* @param prop_window cast=(Window)
*/
-public static final native int _XSetTransientForHint(int /*long*/ display, int /*long*/ w, int /*long*/ prop_window);
-public static final int XSetTransientForHint(int /*long*/ display, int /*long*/ w, int /*long*/ prop_window) {
+public static final native int _XSetTransientForHint(long /*int*/ display, long /*int*/ w, long /*int*/ prop_window);
+public static final int XSetTransientForHint(long /*int*/ display, long /*int*/ w, long /*int*/ prop_window) {
lock.lock();
try {
return _XSetTransientForHint(display, w, prop_window);
@@ -1068,8 +1068,8 @@ public static final int XSetTransientForHint(int /*long*/ display, int /*long*/
}
}
/** @param display cast=(Display *) */
-public static final native int /*long*/ _XSynchronize(int /*long*/ display, boolean onoff);
-public static final int /*long*/ XSynchronize(int /*long*/ display, boolean onoff) {
+public static final native long /*int*/ _XSynchronize(long /*int*/ display, boolean onoff);
+public static final long /*int*/ XSynchronize(long /*int*/ display, boolean onoff) {
lock.lock();
try {
return _XSynchronize(display, onoff);
@@ -1082,8 +1082,8 @@ public static final int /*long*/ XSynchronize(int /*long*/ display, boolean onof
* @param is_press cast=(Bool)
* @param delay cast=(unsigned long)
*/
-public static final native void _XTestFakeButtonEvent(int /*long*/ display, int button, boolean is_press, int /*long*/ delay);
-public static final void XTestFakeButtonEvent(int /*long*/ display, int button, boolean is_press, int /*long*/ delay) {
+public static final native void _XTestFakeButtonEvent(long /*int*/ display, int button, boolean is_press, long /*int*/ delay);
+public static final void XTestFakeButtonEvent(long /*int*/ display, int button, boolean is_press, long /*int*/ delay) {
lock.lock();
try {
_XTestFakeButtonEvent(display, button, is_press, delay);
@@ -1096,8 +1096,8 @@ public static final void XTestFakeButtonEvent(int /*long*/ display, int button,
* @param is_press cast=(Bool)
* @param delay cast=(unsigned long)
*/
-public static final native void _XTestFakeKeyEvent(int /*long*/ display, int keycode, boolean is_press, int /*long*/ delay);
-public static final void XTestFakeKeyEvent(int /*long*/ display, int keycode, boolean is_press, int /*long*/ delay) {
+public static final native void _XTestFakeKeyEvent(long /*int*/ display, int keycode, boolean is_press, long /*int*/ delay);
+public static final void XTestFakeKeyEvent(long /*int*/ display, int keycode, boolean is_press, long /*int*/ delay) {
lock.lock();
try {
_XTestFakeKeyEvent(display, keycode, is_press, delay);
@@ -1109,8 +1109,8 @@ public static final void XTestFakeKeyEvent(int /*long*/ display, int keycode, bo
* @param display cast=(Display *)
* @param delay cast=(unsigned long)
*/
-public static final native void _XTestFakeMotionEvent(int /*long*/ display, int screen_number, int x, int y, int /*long*/ delay);
-public static final void XTestFakeMotionEvent(int /*long*/ display, int screen_number, int x, int y, int /*long*/ delay) {
+public static final native void _XTestFakeMotionEvent(long /*int*/ display, int screen_number, int x, int y, long /*int*/ delay);
+public static final void XTestFakeMotionEvent(long /*int*/ display, int screen_number, int x, int y, long /*int*/ delay) {
lock.lock();
try {
_XTestFakeMotionEvent(display, screen_number, x, y, delay);
@@ -1123,8 +1123,8 @@ public static final void XTestFakeMotionEvent(int /*long*/ display, int screen_n
* @param sourceWindow cast=(Window)
* @param destWindow cast=(Window)
*/
-public static final native int _XWarpPointer(int /*long*/ display, int /*long*/ sourceWindow, int /*long*/ destWindow, int sourceX, int sourceY, int sourceWidth, int sourceHeight, int destX, int destY);
-public static final int XWarpPointer(int /*long*/ display, int /*long*/ sourceWindow, int /*long*/ destWindow, int sourceX, int sourceY, int sourceWidth, int sourceHeight, int destX, int destY) {
+public static final native int _XWarpPointer(long /*int*/ display, long /*int*/ sourceWindow, long /*int*/ destWindow, int sourceX, int sourceY, int sourceWidth, int sourceHeight, int destX, int destY);
+public static final int XWarpPointer(long /*int*/ display, long /*int*/ sourceWindow, long /*int*/ destWindow, int sourceX, int sourceY, int sourceWidth, int sourceHeight, int destX, int destY) {
lock.lock();
try {
return _XWarpPointer(display, sourceWindow, destWindow, sourceX, sourceY, sourceWidth, sourceHeight, destX, destY);
@@ -1133,8 +1133,8 @@ public static final int XWarpPointer(int /*long*/ display, int /*long*/ sourceWi
}
}
/** @param atom cast=(GdkAtom) */
-public static final native int /*long*/ _gdk_x11_atom_to_xatom(int /*long*/ atom);
-public static final int /*long*/ gdk_x11_atom_to_xatom(int /*long*/ atom) {
+public static final native long /*int*/ _gdk_x11_atom_to_xatom(long /*int*/ atom);
+public static final long /*int*/ gdk_x11_atom_to_xatom(long /*int*/ atom) {
lock.lock();
try {
return _gdk_x11_atom_to_xatom(atom);
@@ -1143,8 +1143,8 @@ public static final int /*long*/ gdk_x11_atom_to_xatom(int /*long*/ atom) {
}
}
/** @param gdkdisplay cast=(GdkDisplay *) */
-public static final native int /*long*/ _gdk_x11_display_get_xdisplay(int /*long*/ gdkdisplay);
-public static final int /*long*/ gdk_x11_display_get_xdisplay (int /*long*/ gdkdisplay) {
+public static final native long /*int*/ _gdk_x11_display_get_xdisplay(long /*int*/ gdkdisplay);
+public static final long /*int*/ gdk_x11_display_get_xdisplay (long /*int*/ gdkdisplay) {
lock.lock();
try {
return _gdk_x11_display_get_xdisplay(gdkdisplay);
@@ -1153,8 +1153,8 @@ public static final int /*long*/ gdk_x11_display_get_xdisplay (int /*long*/ gdkd
}
}
/** @param drawable cast=(GdkDrawable *) */
-public static final native int /*long*/ _gdk_x11_drawable_get_xdisplay(int /*long*/ drawable);
-public static final int /*long*/ gdk_x11_drawable_get_xdisplay(int /*long*/ drawable) {
+public static final native long /*int*/ _gdk_x11_drawable_get_xdisplay(long /*int*/ drawable);
+public static final long /*int*/ gdk_x11_drawable_get_xdisplay(long /*int*/ drawable) {
lock.lock();
try {
return _gdk_x11_drawable_get_xdisplay(drawable);
@@ -1163,8 +1163,8 @@ public static final int /*long*/ gdk_x11_drawable_get_xdisplay(int /*long*/ draw
}
}
/** @param drawable cast=(GdkDrawable *) */
-public static final native int /*long*/ _gdk_x11_drawable_get_xid(int /*long*/ drawable);
-public static final int /*long*/ gdk_x11_drawable_get_xid(int /*long*/ drawable) {
+public static final native long /*int*/ _gdk_x11_drawable_get_xid(long /*int*/ drawable);
+public static final long /*int*/ gdk_x11_drawable_get_xid(long /*int*/ drawable) {
lock.lock();
try {
return _gdk_x11_drawable_get_xid(drawable);
@@ -1177,8 +1177,8 @@ public static final int /*long*/ gdk_x11_drawable_get_xid(int /*long*/ drawable)
* @param screen cast=(GdkScreen *)
* @param xvisualid cast=(VisualID)
*/
-public static final native int /*long*/ _gdk_x11_screen_lookup_visual(int /*long*/ screen, int xvisualid);
-public static final int /*long*/ gdk_x11_screen_lookup_visual(int /*long*/ screen, int xvisualid) {
+public static final native long /*int*/ _gdk_x11_screen_lookup_visual(long /*int*/ screen, int xvisualid);
+public static final long /*int*/ gdk_x11_screen_lookup_visual(long /*int*/ screen, int xvisualid) {
lock.lock();
try {
return _gdk_x11_screen_lookup_visual(screen, xvisualid);
@@ -1190,8 +1190,8 @@ public static final int /*long*/ gdk_x11_screen_lookup_visual(int /*long*/ scree
* @method flags=dynamic
* @param screen cast=(GdkScreen *)
*/
-public static final native int /*long*/ _gdk_x11_screen_get_window_manager_name(int /*long*/ screen);
-public static final int /*long*/ gdk_x11_screen_get_window_manager_name(int /*long*/ screen) {
+public static final native long /*int*/ _gdk_x11_screen_get_window_manager_name(long /*int*/ screen);
+public static final long /*int*/ gdk_x11_screen_get_window_manager_name(long /*int*/ screen) {
lock.lock();
try {
return _gdk_x11_screen_get_window_manager_name(screen);
@@ -1200,8 +1200,8 @@ public static final int /*long*/ gdk_x11_screen_get_window_manager_name(int /*lo
}
}
/** @param visual cast=(GdkVisual *) */
-public static final native int /*long*/ _gdk_x11_visual_get_xvisual(int /*long*/ visual);
-public static final int /*long*/ gdk_x11_visual_get_xvisual(int /*long*/ visual) {
+public static final native long /*int*/ _gdk_x11_visual_get_xvisual(long /*int*/ visual);
+public static final long /*int*/ gdk_x11_visual_get_xvisual(long /*int*/ visual) {
lock.lock();
try {
return _gdk_x11_visual_get_xvisual(visual);
@@ -1213,8 +1213,8 @@ public static final int /*long*/ gdk_x11_visual_get_xvisual(int /*long*/ visual)
* @method flags=dynamic
* @param gdkdisplay cast=(GdkDisplay *)
*/
-public static final native int /*long*/ _gdk_x11_window_lookup_for_display(int /*long*/ gdkdisplay, int /*long*/ xid);
-public static final int /*long*/ gdk_x11_window_lookup_for_display(int /*long*/ gdkdisplay, int /*long*/ xid) {
+public static final native long /*int*/ _gdk_x11_window_lookup_for_display(long /*int*/ gdkdisplay, long /*int*/ xid);
+public static final long /*int*/ gdk_x11_window_lookup_for_display(long /*int*/ gdkdisplay, long /*int*/ xid) {
lock.lock();
try {
return _gdk_x11_window_lookup_for_display(gdkdisplay, xid);
@@ -1225,8 +1225,8 @@ public static final int /*long*/ gdk_x11_window_lookup_for_display(int /*long*/
/**
* @method flags=dynamic
*/
-public static final native int /*long*/ _gdk_window_lookup(int /*long*/ xid);
-public static final int /*long*/ gdk_window_lookup(int /*long*/ xid) {
+public static final native long /*int*/ _gdk_window_lookup(long /*int*/ xid);
+public static final long /*int*/ gdk_window_lookup(long /*int*/ xid) {
lock.lock();
try {
return _gdk_window_lookup(xid);
@@ -1239,8 +1239,8 @@ public static final int /*long*/ gdk_window_lookup(int /*long*/ xid) {
* @param function cast=(GdkFilterFunc)
* @param data cast=(gpointer)
*/
-public static final native void _gdk_window_add_filter(int /*long*/ window, int /*long*/ function, int /*long*/ data);
-public static final void gdk_window_add_filter(int /*long*/ window, int /*long*/ function, int /*long*/ data) {
+public static final native void _gdk_window_add_filter(long /*int*/ window, long /*int*/ function, long /*int*/ data);
+public static final void gdk_window_add_filter(long /*int*/ window, long /*int*/ function, long /*int*/ data) {
lock.lock();
try {
_gdk_window_add_filter(window, function, data);
@@ -1253,8 +1253,8 @@ public static final void gdk_window_add_filter(int /*long*/ window, int /*long*/
* @param function cast=(GdkFilterFunc)
* @param data cast=(gpointer)
*/
-public static final native void _gdk_window_remove_filter(int /*long*/ window, int /*long*/ function, int /*long*/ data);
-public static final void gdk_window_remove_filter(int /*long*/ window, int /*long*/ function, int /*long*/ data) {
+public static final native void _gdk_window_remove_filter(long /*int*/ window, long /*int*/ function, long /*int*/ data);
+public static final void gdk_window_remove_filter(long /*int*/ window, long /*int*/ function, long /*int*/ data) {
lock.lock();
try {
_gdk_window_remove_filter(window, function, data);
@@ -1267,31 +1267,31 @@ public static final void gdk_window_remove_filter(int /*long*/ window, int /*lon
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove(int /*long*/ dest, XClientMessageEvent src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, XClientMessageEvent src, long /*int*/ size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove(int /*long*/ dest, XExposeEvent src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, XExposeEvent src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(XExposeEvent dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(XExposeEvent dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(XFocusChangeEvent dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(XFocusChangeEvent dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(XVisibilityEvent dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(XVisibilityEvent dest, long /*int*/ src, long /*int*/ size);
/** @method flags=const */
public static final native int RTLD_GLOBAL();
@@ -1311,8 +1311,8 @@ public static final int PictOpOver = 3;
public static final native int XRenderPictureAttributes_sizeof();
/** @method flags=dynamic */
-public static final native boolean _XRenderQueryExtension(int /*long*/ display, int[] event_basep, int[] error_basep);
-public static final boolean XRenderQueryExtension(int /*long*/ display, int[] event_basep, int[] error_basep) {
+public static final native boolean _XRenderQueryExtension(long /*int*/ display, int[] event_basep, int[] error_basep);
+public static final boolean XRenderQueryExtension(long /*int*/ display, int[] event_basep, int[] error_basep) {
lock.lock();
try {
return _XRenderQueryExtension(display, event_basep, error_basep);
@@ -1321,8 +1321,8 @@ public static final boolean XRenderQueryExtension(int /*long*/ display, int[] ev
}
}
/** @method flags=dynamic */
-public static final native int _XRenderQueryVersion(int /*long*/ display, int[] major_versionp, int[] minor_versionp);
-public static final int XRenderQueryVersion(int /*long*/ display, int[] major_versionp, int[] minor_versionp) {
+public static final native int _XRenderQueryVersion(long /*int*/ display, int[] major_versionp, int[] minor_versionp);
+public static final int XRenderQueryVersion(long /*int*/ display, int[] major_versionp, int[] minor_versionp) {
lock.lock();
try {
return _XRenderQueryVersion(display, major_versionp, minor_versionp);
@@ -1334,8 +1334,8 @@ public static final int XRenderQueryVersion(int /*long*/ display, int[] major_ve
* @method flags=dynamic
* @param attributes flags=no_out
*/
-public static final native int /*long*/ _XRenderCreatePicture(int /*long*/ display, int /*long*/ drawable, int /*long*/ format, int /*long*/ valuemask, XRenderPictureAttributes attributes);
-public static final int /*long*/ XRenderCreatePicture(int /*long*/ display, int /*long*/ drawable, int /*long*/ format, int /*long*/ valuemask, XRenderPictureAttributes attributes) {
+public static final native long /*int*/ _XRenderCreatePicture(long /*int*/ display, long /*int*/ drawable, long /*int*/ format, long /*int*/ valuemask, XRenderPictureAttributes attributes);
+public static final long /*int*/ XRenderCreatePicture(long /*int*/ display, long /*int*/ drawable, long /*int*/ format, long /*int*/ valuemask, XRenderPictureAttributes attributes) {
lock.lock();
try {
return _XRenderCreatePicture(display, drawable, format, valuemask, attributes);
@@ -1344,8 +1344,8 @@ public static final int /*long*/ XRenderCreatePicture(int /*long*/ display, int
}
}
/** @method flags=dynamic */
-public static final native void _XRenderSetPictureClipRectangles(int /*long*/ display, int /*long*/ picture, int xOrigin, int yOrigin, short[] rects, int count);
-public static final void XRenderSetPictureClipRectangles(int /*long*/ display, int /*long*/ picture, int xOrigin, int yOrigin, short[] rects, int count) {
+public static final native void _XRenderSetPictureClipRectangles(long /*int*/ display, long /*int*/ picture, int xOrigin, int yOrigin, short[] rects, int count);
+public static final void XRenderSetPictureClipRectangles(long /*int*/ display, long /*int*/ picture, int xOrigin, int yOrigin, short[] rects, int count) {
lock.lock();
try {
_XRenderSetPictureClipRectangles(display, picture, xOrigin, yOrigin, rects, count);
@@ -1354,8 +1354,8 @@ public static final void XRenderSetPictureClipRectangles(int /*long*/ display, i
}
}
/** @method flags=dynamic */
-public static final native void _XRenderSetPictureTransform(int /*long*/ display, int /*long*/ picture, int[] transform);
-public static final void XRenderSetPictureTransform(int /*long*/ display, int /*long*/ picture, int[] transform) {
+public static final native void _XRenderSetPictureTransform(long /*int*/ display, long /*int*/ picture, int[] transform);
+public static final void XRenderSetPictureTransform(long /*int*/ display, long /*int*/ picture, int[] transform) {
lock.lock();
try {
_XRenderSetPictureTransform(display, picture, transform);
@@ -1364,8 +1364,8 @@ public static final void XRenderSetPictureTransform(int /*long*/ display, int /*
}
}
/** @method flags=dynamic */
-public static final native void _XRenderFreePicture(int /*long*/ display, int /*long*/ picture);
-public static final void XRenderFreePicture(int /*long*/ display, int /*long*/ picture) {
+public static final native void _XRenderFreePicture(long /*int*/ display, long /*int*/ picture);
+public static final void XRenderFreePicture(long /*int*/ display, long /*int*/ picture) {
lock.lock();
try {
_XRenderFreePicture(display, picture);
@@ -1374,8 +1374,8 @@ public static final void XRenderFreePicture(int /*long*/ display, int /*long*/ p
}
}
/** @method flags=dynamic */
-public static final native void _XRenderComposite(int /*long*/ display, int op, int /*long*/ src, int /*long*/ mask, int /*long*/ dst, int src_x, int src_y, int mask_x, int mask_y, int dst_x, int dst_y, int width, int height);
-public static final void XRenderComposite(int /*long*/ display, int op, int /*long*/ src, int /*long*/ mask, int /*long*/ dst, int src_x, int src_y, int mask_x, int mask_y, int dst_x, int dst_y, int width, int height) {
+public static final native void _XRenderComposite(long /*int*/ display, int op, long /*int*/ src, long /*int*/ mask, long /*int*/ dst, int src_x, int src_y, int mask_x, int mask_y, int dst_x, int dst_y, int width, int height);
+public static final void XRenderComposite(long /*int*/ display, int op, long /*int*/ src, long /*int*/ mask, long /*int*/ dst, int src_x, int src_y, int mask_x, int mask_y, int dst_x, int dst_y, int width, int height) {
lock.lock();
try {
_XRenderComposite(display, op, src, mask, dst, src_x, src_y, mask_x, mask_y, dst_x, dst_y, width, height);
@@ -1384,8 +1384,8 @@ public static final void XRenderComposite(int /*long*/ display, int op, int /*lo
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _XRenderFindStandardFormat(int /*long*/ display, int format);
-public static final int /*long*/ XRenderFindStandardFormat(int /*long*/ display, int format) {
+public static final native long /*int*/ _XRenderFindStandardFormat(long /*int*/ display, int format);
+public static final long /*int*/ XRenderFindStandardFormat(long /*int*/ display, int format) {
lock.lock();
try {
return _XRenderFindStandardFormat(display, format);
@@ -1394,8 +1394,8 @@ public static final int /*long*/ XRenderFindStandardFormat(int /*long*/ display,
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _XRenderFindVisualFormat(int /*long*/ display, int /*long*/ visual);
-public static final int /*long*/ XRenderFindVisualFormat(int /*long*/ display, int /*long*/ visual) {
+public static final native long /*int*/ _XRenderFindVisualFormat(long /*int*/ display, long /*int*/ visual);
+public static final long /*int*/ XRenderFindVisualFormat(long /*int*/ display, long /*int*/ visual) {
lock.lock();
try {
return _XRenderFindVisualFormat(display, visual);
@@ -1407,15 +1407,15 @@ public static final int /*long*/ XRenderFindVisualFormat(int /*long*/ display, i
/** Custom callbacks */
/** @method flags=no_gen */
-public static final native int /*long*/ pangoLayoutNewProc_CALLBACK(int /*long*/ func);
+public static final native long /*int*/ pangoLayoutNewProc_CALLBACK(long /*int*/ func);
/** Natives */
-public static final native int Call (int /*long*/ func, int /*long*/ arg0, int arg1, int arg2);
-public static final native long Call (int /*long*/ func, int /*long*/ arg0, int arg1, long arg2);
+public static final native int Call (long /*int*/ func, long /*int*/ arg0, int arg1, int arg2);
+public static final native long Call (long /*int*/ func, long /*int*/ arg0, int arg1, long arg2);
/** @method flags=const */
-public static final native int /*long*/ _GDK_TYPE_COLOR();
-public static final int /*long*/ GDK_TYPE_COLOR() {
+public static final native long /*int*/ _GDK_TYPE_COLOR();
+public static final long /*int*/ GDK_TYPE_COLOR() {
lock.lock();
try {
return _GDK_TYPE_COLOR();
@@ -1424,8 +1424,8 @@ public static final int /*long*/ GDK_TYPE_COLOR() {
}
}
/** @method flags=const */
-public static final native int /*long*/ _GDK_TYPE_PIXBUF();
-public static final int /*long*/ GDK_TYPE_PIXBUF() {
+public static final native long /*int*/ _GDK_TYPE_PIXBUF();
+public static final long /*int*/ GDK_TYPE_PIXBUF() {
lock.lock();
try {
return _GDK_TYPE_PIXBUF();
@@ -1433,8 +1433,8 @@ public static final int /*long*/ GDK_TYPE_PIXBUF() {
lock.unlock();
}
}
-public static final native boolean _GTK_IS_ACCEL_LABEL(int /*long*/ obj);
-public static final boolean GTK_IS_ACCEL_LABEL(int /*long*/ obj) {
+public static final native boolean _GTK_IS_ACCEL_LABEL(long /*int*/ obj);
+public static final boolean GTK_IS_ACCEL_LABEL(long /*int*/ obj) {
lock.lock();
try {
return _GTK_IS_ACCEL_LABEL(obj);
@@ -1442,8 +1442,8 @@ public static final boolean GTK_IS_ACCEL_LABEL(int /*long*/ obj) {
lock.unlock();
}
}
-public static final native boolean _GTK_IS_BUTTON(int /*long*/ obj);
-public static final boolean GTK_IS_BUTTON(int /*long*/ obj) {
+public static final native boolean _GTK_IS_BUTTON(long /*int*/ obj);
+public static final boolean GTK_IS_BUTTON(long /*int*/ obj) {
lock.lock();
try {
return _GTK_IS_BUTTON(obj);
@@ -1451,8 +1451,8 @@ public static final boolean GTK_IS_BUTTON(int /*long*/ obj) {
lock.unlock();
}
}
-public static final native boolean _GTK_IS_LABEL(int /*long*/ obj);
-public static final boolean GTK_IS_LABEL(int /*long*/ obj) {
+public static final native boolean _GTK_IS_LABEL(long /*int*/ obj);
+public static final boolean GTK_IS_LABEL(long /*int*/ obj) {
lock.lock();
try {
return _GTK_IS_LABEL(obj);
@@ -1460,8 +1460,8 @@ public static final boolean GTK_IS_LABEL(int /*long*/ obj) {
lock.unlock();
}
}
-public static final native boolean _GTK_IS_SCROLLED_WINDOW(int /*long*/ obj);
-public static final boolean GTK_IS_SCROLLED_WINDOW(int /*long*/ obj) {
+public static final native boolean _GTK_IS_SCROLLED_WINDOW(long /*int*/ obj);
+public static final boolean GTK_IS_SCROLLED_WINDOW(long /*int*/ obj) {
lock.lock();
try {
return _GTK_IS_SCROLLED_WINDOW(obj);
@@ -1469,8 +1469,8 @@ public static final boolean GTK_IS_SCROLLED_WINDOW(int /*long*/ obj) {
lock.unlock();
}
}
-public static final native boolean _GTK_IS_WINDOW(int /*long*/ obj);
-public static final boolean GTK_IS_WINDOW(int /*long*/ obj) {
+public static final native boolean _GTK_IS_WINDOW(long /*int*/ obj);
+public static final boolean GTK_IS_WINDOW(long /*int*/ obj) {
lock.lock();
try {
return _GTK_IS_WINDOW(obj);
@@ -1478,8 +1478,8 @@ public static final boolean GTK_IS_WINDOW(int /*long*/ obj) {
lock.unlock();
}
}
-public static final native boolean _GTK_IS_CELL_RENDERER_PIXBUF(int /*long*/ obj);
-public static final boolean GTK_IS_CELL_RENDERER_PIXBUF(int /*long*/ obj) {
+public static final native boolean _GTK_IS_CELL_RENDERER_PIXBUF(long /*int*/ obj);
+public static final boolean GTK_IS_CELL_RENDERER_PIXBUF(long /*int*/ obj) {
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_PIXBUF(obj);
@@ -1487,8 +1487,8 @@ public static final boolean GTK_IS_CELL_RENDERER_PIXBUF(int /*long*/ obj) {
lock.unlock();
}
}
-public static final native boolean _GTK_IS_CELL_RENDERER_TEXT(int /*long*/ obj);
-public static final boolean GTK_IS_CELL_RENDERER_TEXT(int /*long*/ obj) {
+public static final native boolean _GTK_IS_CELL_RENDERER_TEXT(long /*int*/ obj);
+public static final boolean GTK_IS_CELL_RENDERER_TEXT(long /*int*/ obj) {
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_TEXT(obj);
@@ -1496,8 +1496,8 @@ public static final boolean GTK_IS_CELL_RENDERER_TEXT(int /*long*/ obj) {
lock.unlock();
}
}
-public static final native boolean _GTK_IS_CELL_RENDERER_TOGGLE(int /*long*/ obj);
-public static final boolean GTK_IS_CELL_RENDERER_TOGGLE(int /*long*/ obj) {
+public static final native boolean _GTK_IS_CELL_RENDERER_TOGGLE(long /*int*/ obj);
+public static final boolean GTK_IS_CELL_RENDERER_TOGGLE(long /*int*/ obj) {
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_TOGGLE(obj);
@@ -1505,8 +1505,8 @@ public static final boolean GTK_IS_CELL_RENDERER_TOGGLE(int /*long*/ obj) {
lock.unlock();
}
}
-public static final native boolean _GTK_IS_CONTAINER(int /*long*/ obj);
-public static final boolean GTK_IS_CONTAINER(int /*long*/ obj) {
+public static final native boolean _GTK_IS_CONTAINER(long /*int*/ obj);
+public static final boolean GTK_IS_CONTAINER(long /*int*/ obj) {
lock.lock();
try {
return _GTK_IS_CONTAINER(obj);
@@ -1514,8 +1514,8 @@ public static final boolean GTK_IS_CONTAINER(int /*long*/ obj) {
lock.unlock();
}
}
-public static final native boolean _GTK_IS_IMAGE_MENU_ITEM(int /*long*/ obj);
-public static final boolean GTK_IS_IMAGE_MENU_ITEM(int /*long*/ obj) {
+public static final native boolean _GTK_IS_IMAGE_MENU_ITEM(long /*int*/ obj);
+public static final boolean GTK_IS_IMAGE_MENU_ITEM(long /*int*/ obj) {
lock.lock();
try {
return _GTK_IS_IMAGE_MENU_ITEM(obj);
@@ -1523,8 +1523,8 @@ public static final boolean GTK_IS_IMAGE_MENU_ITEM(int /*long*/ obj) {
lock.unlock();
}
}
-public static final native boolean _GTK_IS_MENU_ITEM(int /*long*/ obj);
-public static final boolean GTK_IS_MENU_ITEM(int /*long*/ obj) {
+public static final native boolean _GTK_IS_MENU_ITEM(long /*int*/ obj);
+public static final boolean GTK_IS_MENU_ITEM(long /*int*/ obj) {
lock.lock();
try {
return _GTK_IS_MENU_ITEM(obj);
@@ -1532,8 +1532,8 @@ public static final boolean GTK_IS_MENU_ITEM(int /*long*/ obj) {
lock.unlock();
}
}
-public static final native boolean _GTK_IS_PLUG(int /*long*/ obj);
-public static final boolean GTK_IS_PLUG(int /*long*/ obj) {
+public static final native boolean _GTK_IS_PLUG(long /*int*/ obj);
+public static final boolean GTK_IS_PLUG(long /*int*/ obj) {
lock.lock();
try {
return _GTK_IS_PLUG(obj);
@@ -1541,8 +1541,8 @@ public static final boolean GTK_IS_PLUG(int /*long*/ obj) {
lock.unlock();
}
}
-public static final native boolean _GTK_IS_SOCKET(int /*long*/ obj);
-public static final boolean GTK_IS_SOCKET(int /*long*/ obj) {
+public static final native boolean _GTK_IS_SOCKET(long /*int*/ obj);
+public static final boolean GTK_IS_SOCKET(long /*int*/ obj) {
lock.lock();
try {
return _GTK_IS_SOCKET(obj);
@@ -1551,8 +1551,8 @@ public static final boolean GTK_IS_SOCKET(int /*long*/ obj) {
}
}
/** @method flags=const */
-public static final native int /*long*/ _GTK_STOCK_CANCEL();
-public static final int /*long*/ GTK_STOCK_CANCEL() {
+public static final native long /*int*/ _GTK_STOCK_CANCEL();
+public static final long /*int*/ GTK_STOCK_CANCEL() {
lock.lock();
try {
return _GTK_STOCK_CANCEL();
@@ -1561,8 +1561,8 @@ public static final int /*long*/ GTK_STOCK_CANCEL() {
}
}
/** @method flags=const */
-public static final native int /*long*/ _GTK_STOCK_OK();
-public static final int /*long*/ GTK_STOCK_OK() {
+public static final native long /*int*/ _GTK_STOCK_OK();
+public static final long /*int*/ GTK_STOCK_OK() {
lock.lock();
try {
return _GTK_STOCK_OK();
@@ -1571,8 +1571,8 @@ public static final int /*long*/ GTK_STOCK_OK() {
}
}
/** @method flags=const */
-public static final native int /*long*/ _GTK_TYPE_CELL_RENDERER_TEXT();
-public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TEXT() {
+public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_TEXT();
+public static final long /*int*/ GTK_TYPE_CELL_RENDERER_TEXT() {
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_TEXT();
@@ -1581,8 +1581,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TEXT() {
}
}
/** @method flags=const */
-public static final native int /*long*/ _GTK_TYPE_CELL_RENDERER_PIXBUF();
-public static final int /*long*/ GTK_TYPE_CELL_RENDERER_PIXBUF() {
+public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_PIXBUF();
+public static final long /*int*/ GTK_TYPE_CELL_RENDERER_PIXBUF() {
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_PIXBUF();
@@ -1591,8 +1591,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_PIXBUF() {
}
}
/** @method flags=const */
-public static final native int /*long*/ _GTK_TYPE_CELL_RENDERER_TOGGLE();
-public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TOGGLE() {
+public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_TOGGLE();
+public static final long /*int*/ GTK_TYPE_CELL_RENDERER_TOGGLE() {
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_TOGGLE();
@@ -1601,8 +1601,8 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TOGGLE() {
}
}
/** @method flags=const */
-public static final native int /*long*/ _GTK_TYPE_FIXED();
-public static final int /*long*/ GTK_TYPE_FIXED() {
+public static final native long /*int*/ _GTK_TYPE_FIXED();
+public static final long /*int*/ GTK_TYPE_FIXED() {
lock.lock();
try {
return _GTK_TYPE_FIXED();
@@ -1611,8 +1611,8 @@ public static final int /*long*/ GTK_TYPE_FIXED() {
}
}
/** @method flags=const */
-public static final native int /*long*/ _GTK_TYPE_MENU();
-public static final int /*long*/ GTK_TYPE_MENU() {
+public static final native long /*int*/ _GTK_TYPE_MENU();
+public static final long /*int*/ GTK_TYPE_MENU() {
lock.lock();
try {
return _GTK_TYPE_MENU();
@@ -1621,8 +1621,8 @@ public static final int /*long*/ GTK_TYPE_MENU() {
}
}
/** @method flags=const */
-public static final native int /*long*/ _GTK_TYPE_WIDGET();
-public static final int /*long*/ GTK_TYPE_WIDGET() {
+public static final native long /*int*/ _GTK_TYPE_WIDGET();
+public static final long /*int*/ GTK_TYPE_WIDGET() {
lock.lock();
try {
return _GTK_TYPE_WIDGET();
@@ -1630,8 +1630,8 @@ public static final int /*long*/ GTK_TYPE_WIDGET() {
lock.unlock();
}
}
-public static final native int _GTK_WIDGET_FLAGS(int /*long*/ wid);
-public static final int GTK_WIDGET_FLAGS(int /*long*/ wid) {
+public static final native int _GTK_WIDGET_FLAGS(long /*int*/ wid);
+public static final int GTK_WIDGET_FLAGS(long /*int*/ wid) {
lock.lock();
try {
return _GTK_WIDGET_FLAGS(wid);
@@ -1639,8 +1639,8 @@ public static final int GTK_WIDGET_FLAGS(int /*long*/ wid) {
lock.unlock();
}
}
-public static final native boolean _GTK_WIDGET_HAS_DEFAULT(int /*long*/ wid);
-public static final boolean GTK_WIDGET_HAS_DEFAULT(int /*long*/ wid) {
+public static final native boolean _GTK_WIDGET_HAS_DEFAULT(long /*int*/ wid);
+public static final boolean GTK_WIDGET_HAS_DEFAULT(long /*int*/ wid) {
lock.lock();
try {
return _GTK_WIDGET_HAS_DEFAULT(wid);
@@ -1649,8 +1649,8 @@ public static final boolean GTK_WIDGET_HAS_DEFAULT(int /*long*/ wid) {
}
}
/** @method flags=dynamic */
-public static final native boolean _gtk_widget_has_default(int /*long*/ widget);
-public static final boolean gtk_widget_has_default(int /*long*/ widget) {
+public static final native boolean _gtk_widget_has_default(long /*int*/ widget);
+public static final boolean gtk_widget_has_default(long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_has_default(widget);
@@ -1658,8 +1658,8 @@ public static final boolean gtk_widget_has_default(int /*long*/ widget) {
lock.unlock();
}
}
-public static final native boolean _GTK_WIDGET_HAS_FOCUS(int /*long*/ wid);
-public static final boolean GTK_WIDGET_HAS_FOCUS(int /*long*/ wid) {
+public static final native boolean _GTK_WIDGET_HAS_FOCUS(long /*int*/ wid);
+public static final boolean GTK_WIDGET_HAS_FOCUS(long /*int*/ wid) {
lock.lock();
try {
return _GTK_WIDGET_HAS_FOCUS(wid);
@@ -1667,8 +1667,8 @@ public static final boolean GTK_WIDGET_HAS_FOCUS(int /*long*/ wid) {
lock.unlock();
}
}
-public static final native boolean _GTK_WIDGET_MAPPED(int /*long*/ wid);
-public static final boolean GTK_WIDGET_MAPPED(int /*long*/ wid) {
+public static final native boolean _GTK_WIDGET_MAPPED(long /*int*/ wid);
+public static final boolean GTK_WIDGET_MAPPED(long /*int*/ wid) {
lock.lock();
try {
return _GTK_WIDGET_MAPPED(wid);
@@ -1676,8 +1676,8 @@ public static final boolean GTK_WIDGET_MAPPED(int /*long*/ wid) {
lock.unlock();
}
}
-public static final native boolean _GTK_WIDGET_SENSITIVE(int /*long*/ wid);
-public static final boolean GTK_WIDGET_SENSITIVE(int /*long*/ wid) {
+public static final native boolean _GTK_WIDGET_SENSITIVE(long /*int*/ wid);
+public static final boolean GTK_WIDGET_SENSITIVE(long /*int*/ wid) {
lock.lock();
try {
return _GTK_WIDGET_SENSITIVE(wid);
@@ -1686,8 +1686,8 @@ public static final boolean GTK_WIDGET_SENSITIVE(int /*long*/ wid) {
}
}
/** @method flags=dynamic */
-public static final native boolean _gtk_widget_get_sensitive(int /*long*/ widget);
-public static final boolean gtk_widget_get_sensitive(int /*long*/ widget) {
+public static final native boolean _gtk_widget_get_sensitive(long /*int*/ widget);
+public static final boolean gtk_widget_get_sensitive(long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_get_sensitive(widget);
@@ -1695,8 +1695,8 @@ public static final boolean gtk_widget_get_sensitive(int /*long*/ widget) {
lock.unlock();
}
}
-public static final native void _GTK_WIDGET_SET_FLAGS(int /*long*/ wid, int flag);
-public static final void GTK_WIDGET_SET_FLAGS(int /*long*/ wid, int flag) {
+public static final native void _GTK_WIDGET_SET_FLAGS(long /*int*/ wid, int flag);
+public static final void GTK_WIDGET_SET_FLAGS(long /*int*/ wid, int flag) {
lock.lock();
try {
_GTK_WIDGET_SET_FLAGS(wid, flag);
@@ -1704,8 +1704,8 @@ public static final void GTK_WIDGET_SET_FLAGS(int /*long*/ wid, int flag) {
lock.unlock();
}
}
-public static final native void _GTK_WIDGET_UNSET_FLAGS(int /*long*/ wid, int flag);
-public static final void GTK_WIDGET_UNSET_FLAGS(int /*long*/ wid, int flag) {
+public static final native void _GTK_WIDGET_UNSET_FLAGS(long /*int*/ wid, int flag);
+public static final void GTK_WIDGET_UNSET_FLAGS(long /*int*/ wid, int flag) {
lock.lock();
try {
_GTK_WIDGET_UNSET_FLAGS(wid, flag);
@@ -1713,8 +1713,8 @@ public static final void GTK_WIDGET_UNSET_FLAGS(int /*long*/ wid, int flag) {
lock.unlock();
}
}
-public static final native boolean _GTK_WIDGET_VISIBLE(int /*long*/ wid);
-public static final boolean GTK_WIDGET_VISIBLE(int /*long*/ wid) {
+public static final native boolean _GTK_WIDGET_VISIBLE(long /*int*/ wid);
+public static final boolean GTK_WIDGET_VISIBLE(long /*int*/ wid) {
lock.lock();
try {
return _GTK_WIDGET_VISIBLE(wid);
@@ -1722,8 +1722,8 @@ public static final boolean GTK_WIDGET_VISIBLE(int /*long*/ wid) {
lock.unlock();
}
}
-public static final native int /*long*/ _G_OBJECT_CLASS (int /*long*/ klass);
-public static final int /*long*/ G_OBJECT_CLASS (int /*long*/ klass) {
+public static final native long /*int*/ _G_OBJECT_CLASS (long /*int*/ klass);
+public static final long /*int*/ G_OBJECT_CLASS (long /*int*/ klass) {
lock.lock();
try {
return _G_OBJECT_CLASS(klass);
@@ -1731,8 +1731,8 @@ public static final int /*long*/ G_OBJECT_CLASS (int /*long*/ klass) {
lock.unlock();
}
}
-public static final native int /*long*/ _G_OBJECT_GET_CLASS (int /*long*/ object);
-public static final int /*long*/ G_OBJECT_GET_CLASS (int /*long*/ object) {
+public static final native long /*int*/ _G_OBJECT_GET_CLASS (long /*int*/ object);
+public static final long /*int*/ G_OBJECT_GET_CLASS (long /*int*/ object) {
lock.lock();
try {
return _G_OBJECT_GET_CLASS(object);
@@ -1740,8 +1740,8 @@ public static final int /*long*/ G_OBJECT_GET_CLASS (int /*long*/ object) {
lock.unlock();
}
}
-public static final native int /*long*/ _G_OBJECT_TYPE_NAME (int /*long*/ object);
-public static final int /*long*/ G_OBJECT_TYPE_NAME (int /*long*/ object) {
+public static final native long /*int*/ _G_OBJECT_TYPE_NAME (long /*int*/ object);
+public static final long /*int*/ G_OBJECT_TYPE_NAME (long /*int*/ object) {
lock.lock();
try {
return _G_OBJECT_TYPE_NAME(object);
@@ -1749,8 +1749,8 @@ public static final int /*long*/ G_OBJECT_TYPE_NAME (int /*long*/ object) {
lock.unlock();
}
}
-public static final native boolean _G_TYPE_CHECK_INSTANCE_TYPE (int /*long*/ instance, int /*long*/ type);
-public static final boolean G_TYPE_CHECK_INSTANCE_TYPE (int /*long*/ instance, int /*long*/ type) {
+public static final native boolean _G_TYPE_CHECK_INSTANCE_TYPE (long /*int*/ instance, long /*int*/ type);
+public static final boolean G_TYPE_CHECK_INSTANCE_TYPE (long /*int*/ instance, long /*int*/ type) {
lock.lock();
try {
return _G_TYPE_CHECK_INSTANCE_TYPE(instance, type);
@@ -1759,18 +1759,18 @@ public static final boolean G_TYPE_CHECK_INSTANCE_TYPE (int /*long*/ instance, i
}
}
/** @method flags=const */
-public static final native int /*long*/ G_TYPE_BOOLEAN();
+public static final native long /*int*/ G_TYPE_BOOLEAN();
/** @method flags=const */
-public static final native int /*long*/ G_TYPE_DOUBLE();
+public static final native long /*int*/ G_TYPE_DOUBLE();
/** @method flags=const */
-public static final native int /*long*/ G_TYPE_FLOAT();
+public static final native long /*int*/ G_TYPE_FLOAT();
/** @method flags=const */
-public static final native int /*long*/ G_TYPE_INT();
+public static final native long /*int*/ G_TYPE_INT();
/** @method flags=const */
-public static final native int /*long*/ G_TYPE_INT64();
-public static final native int /*long*/ G_VALUE_TYPE(int /*long*/ value);
-public static final native int /*long*/ _G_OBJECT_TYPE (int /*long*/ instance);
-public static final int /*long*/ G_OBJECT_TYPE (int /*long*/ instance) {
+public static final native long /*int*/ G_TYPE_INT64();
+public static final native long /*int*/ G_VALUE_TYPE(long /*int*/ value);
+public static final native long /*int*/ _G_OBJECT_TYPE (long /*int*/ instance);
+public static final long /*int*/ G_OBJECT_TYPE (long /*int*/ instance) {
lock.lock();
try {
return _G_OBJECT_TYPE(instance);
@@ -1779,8 +1779,8 @@ public static final int /*long*/ G_OBJECT_TYPE (int /*long*/ instance) {
}
}
/** @method flags=const */
-public static final native int /*long*/ _G_TYPE_STRING();
-public static final int /*long*/ G_TYPE_STRING() {
+public static final native long /*int*/ _G_TYPE_STRING();
+public static final long /*int*/ G_TYPE_STRING() {
lock.lock();
try {
return _G_TYPE_STRING();
@@ -1798,8 +1798,8 @@ public static final int PANGO_PIXELS(int dimension) {
}
}
/** @method flags=const */
-public static final native int /*long*/ _PANGO_TYPE_FONT_DESCRIPTION();
-public static final int /*long*/ PANGO_TYPE_FONT_DESCRIPTION() {
+public static final native long /*int*/ _PANGO_TYPE_FONT_DESCRIPTION();
+public static final long /*int*/ PANGO_TYPE_FONT_DESCRIPTION() {
lock.lock();
try {
return _PANGO_TYPE_FONT_DESCRIPTION();
@@ -1808,8 +1808,8 @@ public static final int /*long*/ PANGO_TYPE_FONT_DESCRIPTION() {
}
}
/** @method flags=const */
-public static final native int /*long*/ _PANGO_TYPE_LAYOUT();
-public static final int /*long*/ PANGO_TYPE_LAYOUT() {
+public static final native long /*int*/ _PANGO_TYPE_LAYOUT();
+public static final long /*int*/ PANGO_TYPE_LAYOUT() {
lock.lock();
try {
return _PANGO_TYPE_LAYOUT();
@@ -1818,8 +1818,8 @@ public static final int /*long*/ PANGO_TYPE_LAYOUT() {
}
}
/** @param handle cast=(void *) */
-public static final native int _dlclose(int /*long*/ handle);
-public static final int dlclose(int /*long*/ handle) {
+public static final native int _dlclose(long /*int*/ handle);
+public static final int dlclose(long /*int*/ handle) {
lock.lock();
try {
return _dlclose(handle);
@@ -1828,8 +1828,8 @@ public static final int dlclose(int /*long*/ handle) {
}
}
/** @param filename cast=(const char *) */
-public static final native int /*long*/ _dlopen(byte[] filename, int flag);
-public static final int /*long*/ dlopen(byte[] filename, int flag) {
+public static final native long /*int*/ _dlopen(byte[] filename, int flag);
+public static final long /*int*/ dlopen(byte[] filename, int flag) {
lock.lock();
try {
return _dlopen(filename, flag);
@@ -1841,8 +1841,8 @@ public static final int /*long*/ dlopen(byte[] filename, int flag) {
* @param handle cast=(void *)
* @param symbol cast=(const char *)
*/
-public static final native int /*long*/ _dlsym(int /*long*/ handle, byte[] symbol);
-public static final int /*long*/ dlsym(int /*long*/ handle, byte[] symbol) {
+public static final native long /*int*/ _dlsym(long /*int*/ handle, byte[] symbol);
+public static final long /*int*/ dlsym(long /*int*/ handle, byte[] symbol) {
lock.lock();
try {
return _dlsym(handle, symbol);
@@ -1851,8 +1851,8 @@ public static final int /*long*/ dlsym(int /*long*/ handle, byte[] symbol) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_app_info_create_from_commandline(byte[] commandline, byte[] applName, int /*long*/ flags, int /*long*/ error);
-public static final int /*long*/ g_app_info_create_from_commandline(byte[] commandline, byte[] applName, int /*long*/ flags, int /*long*/ error) {
+public static final native long /*int*/ _g_app_info_create_from_commandline(byte[] commandline, byte[] applName, long /*int*/ flags, long /*int*/ error);
+public static final long /*int*/ g_app_info_create_from_commandline(byte[] commandline, byte[] applName, long /*int*/ flags, long /*int*/ error) {
lock.lock();
try {
return _g_app_info_create_from_commandline(commandline, applName, flags, error);
@@ -1861,8 +1861,8 @@ public static final int /*long*/ g_app_info_create_from_commandline(byte[] comma
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_app_info_get_all();
-public static final int /*long*/ g_app_info_get_all() {
+public static final native long /*int*/ _g_app_info_get_all();
+public static final long /*int*/ g_app_info_get_all() {
lock.lock();
try {
return _g_app_info_get_all();
@@ -1871,8 +1871,8 @@ public static final int /*long*/ g_app_info_get_all() {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_app_info_get_executable(int /*long*/ appInfo);
-public static final int /*long*/ g_app_info_get_executable(int /*long*/ appInfo) {
+public static final native long /*int*/ _g_app_info_get_executable(long /*int*/ appInfo);
+public static final long /*int*/ g_app_info_get_executable(long /*int*/ appInfo) {
lock.lock();
try {
return _g_app_info_get_executable(appInfo);
@@ -1881,8 +1881,8 @@ public static final int /*long*/ g_app_info_get_executable(int /*long*/ appInfo)
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_app_info_get_icon(int /*long*/ appInfo);
-public static final int /*long*/ g_app_info_get_icon(int /*long*/ appInfo) {
+public static final native long /*int*/ _g_app_info_get_icon(long /*int*/ appInfo);
+public static final long /*int*/ g_app_info_get_icon(long /*int*/ appInfo) {
lock.lock();
try {
return _g_app_info_get_icon(appInfo);
@@ -1891,8 +1891,8 @@ public static final int /*long*/ g_app_info_get_icon(int /*long*/ appInfo) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_app_info_get_name(int /*long*/ appInfo);
-public static final int /*long*/ g_app_info_get_name(int /*long*/ appInfo) {
+public static final native long /*int*/ _g_app_info_get_name(long /*int*/ appInfo);
+public static final long /*int*/ g_app_info_get_name(long /*int*/ appInfo) {
lock.lock();
try {
return _g_app_info_get_name(appInfo);
@@ -1901,8 +1901,8 @@ public static final int /*long*/ g_app_info_get_name(int /*long*/ appInfo) {
}
}
/** @method flags=dynamic */
-public static final native boolean _g_app_info_launch(int /*long*/ appInfo, int /*long*/ list, int /*long*/ launchContext, int /*long*/ error);
-public static final boolean g_app_info_launch(int /*long*/ appInfo, int /*long*/ list, int /*long*/ launchContext, int /*long*/ error) {
+public static final native boolean _g_app_info_launch(long /*int*/ appInfo, long /*int*/ list, long /*int*/ launchContext, long /*int*/ error);
+public static final boolean g_app_info_launch(long /*int*/ appInfo, long /*int*/ list, long /*int*/ launchContext, long /*int*/ error) {
lock.lock();
try {
return _g_app_info_launch(appInfo, list, launchContext, error);
@@ -1911,8 +1911,8 @@ public static final boolean g_app_info_launch(int /*long*/ appInfo, int /*long*/
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_app_info_get_default_for_type(byte[] mimeType, boolean mustSupportURIs);
-public static final int /*long*/ g_app_info_get_default_for_type(byte[] mimeType, boolean mustSupportURIs) {
+public static final native long /*int*/ _g_app_info_get_default_for_type(byte[] mimeType, boolean mustSupportURIs);
+public static final long /*int*/ g_app_info_get_default_for_type(byte[] mimeType, boolean mustSupportURIs) {
lock.lock();
try {
return _g_app_info_get_default_for_type(mimeType, mustSupportURIs);
@@ -1921,8 +1921,8 @@ public static final int /*long*/ g_app_info_get_default_for_type(byte[] mimeType
}
}
/** @method flags=dynamic */
-public static final native boolean _g_app_info_launch_default_for_uri(int /*long*/ uri, int /*long*/ launchContext, int /*long*/ error);
-public static final boolean g_app_info_launch_default_for_uri(int /*long*/ appInfo, int /*long*/ launchContext, int /*long*/ error) {
+public static final native boolean _g_app_info_launch_default_for_uri(long /*int*/ uri, long /*int*/ launchContext, long /*int*/ error);
+public static final boolean g_app_info_launch_default_for_uri(long /*int*/ appInfo, long /*int*/ launchContext, long /*int*/ error) {
lock.lock();
try {
return _g_app_info_launch_default_for_uri(appInfo, launchContext, error);
@@ -1931,8 +1931,8 @@ public static final boolean g_app_info_launch_default_for_uri(int /*long*/ appIn
}
}
/** @method flags=dynamic */
-public static final native boolean _g_app_info_should_show(int /*long*/ appInfo);
-public static final boolean g_app_info_should_show(int /*long*/ appInfo) {
+public static final native boolean _g_app_info_should_show(long /*int*/ appInfo);
+public static final boolean g_app_info_should_show(long /*int*/ appInfo) {
lock.lock();
try {
return _g_app_info_should_show(appInfo);
@@ -1941,8 +1941,8 @@ public static final boolean g_app_info_should_show(int /*long*/ appInfo) {
}
}
/** @method flags=dynamic */
-public static final native boolean _g_app_info_supports_uris(int /*long*/ appInfo);
-public static final boolean g_app_info_supports_uris(int /*long*/ appInfo) {
+public static final native boolean _g_app_info_supports_uris(long /*int*/ appInfo);
+public static final boolean g_app_info_supports_uris(long /*int*/ appInfo) {
lock.lock();
try {
return _g_app_info_supports_uris(appInfo);
@@ -1951,8 +1951,8 @@ public static final boolean g_app_info_supports_uris(int /*long*/ appInfo) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_data_input_stream_new(int /*long*/ input_stream);
-public static final int /*long*/ g_data_input_stream_new(int /*long*/ input_stream) {
+public static final native long /*int*/ _g_data_input_stream_new(long /*int*/ input_stream);
+public static final long /*int*/ g_data_input_stream_new(long /*int*/ input_stream) {
lock.lock();
try {
return _g_data_input_stream_new(input_stream);
@@ -1961,8 +1961,8 @@ public static final int /*long*/ g_data_input_stream_new(int /*long*/ input_stre
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_data_input_stream_read_line(int /*long*/ stream, int[] count, int /*long*/ cancellable, int /*long*/ error);
-public static final int /*long*/ g_data_input_stream_read_line(int /*long*/ stream, int[] count, int /*long*/ cancellable, int /*long*/ error) {
+public static final native long /*int*/ _g_data_input_stream_read_line(long /*int*/ stream, int[] count, long /*int*/ cancellable, long /*int*/ error);
+public static final long /*int*/ g_data_input_stream_read_line(long /*int*/ stream, int[] count, long /*int*/ cancellable, long /*int*/ error) {
lock.lock();
try {
return _g_data_input_stream_read_line(stream, count, cancellable, error);
@@ -1971,8 +1971,8 @@ public static final int /*long*/ g_data_input_stream_read_line(int /*long*/ stre
}
}
/** @method flags=dynamic */
-public static final native boolean _g_content_type_equals(int /*long*/ type1, byte[] type2);
-public static final boolean g_content_type_equals(int /*long*/ type1, byte[] type2) {
+public static final native boolean _g_content_type_equals(long /*int*/ type1, byte[] type2);
+public static final boolean g_content_type_equals(long /*int*/ type1, byte[] type2) {
lock.lock();
try {
return _g_content_type_equals(type1, type2);
@@ -1981,8 +1981,8 @@ public static final boolean g_content_type_equals(int /*long*/ type1, byte[] typ
}
}
/** @method flags=dynamic */
-public static final native boolean _g_content_type_is_a(int /*long*/ type, byte[] supertype);
-public static final boolean g_content_type_is_a(int /*long*/ type, byte[] supertype) {
+public static final native boolean _g_content_type_is_a(long /*int*/ type, byte[] supertype);
+public static final boolean g_content_type_is_a(long /*int*/ type, byte[] supertype) {
lock.lock();
try {
return _g_content_type_is_a(type, supertype);
@@ -1991,8 +1991,8 @@ public static final boolean g_content_type_is_a(int /*long*/ type, byte[] supert
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_file_info_get_content_type (int /*long*/ info);
-public static final int /*long*/ g_file_info_get_content_type (int /*long*/ info) {
+public static final native long /*int*/ _g_file_info_get_content_type (long /*int*/ info);
+public static final long /*int*/ g_file_info_get_content_type (long /*int*/ info) {
lock.lock();
try {
return _g_file_info_get_content_type (info);
@@ -2001,8 +2001,8 @@ public static final int /*long*/ g_file_info_get_content_type (int /*long*/ info
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_file_get_uri(int /*long*/ file);
-public static final int /*long*/ g_file_get_uri (int /*long*/ file) {
+public static final native long /*int*/ _g_file_get_uri(long /*int*/ file);
+public static final long /*int*/ g_file_get_uri (long /*int*/ file) {
lock.lock();
try {
return _g_file_get_uri(file);
@@ -2011,8 +2011,8 @@ public static final int /*long*/ g_file_get_uri (int /*long*/ file) {
}
}
/** @method flags=dynamic */
-public static final native void _g_file_info_get_modification_time(int /*long*/ info, int /*long*/[] result);
-public static final void g_file_info_get_modification_time(int /*long*/ info, int /*long*/[] result) {
+public static final native void _g_file_info_get_modification_time(long /*int*/ info, long /*int*/[] result);
+public static final void g_file_info_get_modification_time(long /*int*/ info, long /*int*/[] result) {
lock.lock();
try {
_g_file_info_get_modification_time(info, result);
@@ -2021,8 +2021,8 @@ public static final void g_file_info_get_modification_time(int /*long*/ info, in
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_file_new_for_path(byte[] fileName);
-public static final int /*long*/ g_file_new_for_path(byte[] fileName) {
+public static final native long /*int*/ _g_file_new_for_path(byte[] fileName);
+public static final long /*int*/ g_file_new_for_path(byte[] fileName) {
lock.lock();
try {
return _g_file_new_for_path(fileName);
@@ -2031,8 +2031,8 @@ public static final int /*long*/ g_file_new_for_path(byte[] fileName) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_file_new_for_commandline_arg(byte[] fileName);
-public static final int /*long*/ g_file_new_for_commandline_arg(byte[] fileName) {
+public static final native long /*int*/ _g_file_new_for_commandline_arg(byte[] fileName);
+public static final long /*int*/ g_file_new_for_commandline_arg(byte[] fileName) {
lock.lock();
try {
return _g_file_new_for_commandline_arg(fileName);
@@ -2041,8 +2041,8 @@ public static final int /*long*/ g_file_new_for_commandline_arg(byte[] fileName)
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_file_new_for_uri(byte[] fileName);
-public static final int /*long*/ g_file_new_for_uri(byte[] fileName) {
+public static final native long /*int*/ _g_file_new_for_uri(byte[] fileName);
+public static final long /*int*/ g_file_new_for_uri(byte[] fileName) {
lock.lock();
try {
return _g_file_new_for_uri(fileName);
@@ -2051,8 +2051,8 @@ public static final int /*long*/ g_file_new_for_uri(byte[] fileName) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_file_query_info (int /*long*/ file, byte[] attributes, int /*long*/ flags, int /*long*/ cancellable, int /*long*/ error);
-public static final int /*long*/ g_file_query_info (int /*long*/ file,byte[] attributes, int /*long*/ flags, int /*long*/ cancellable, int /*long*/ error) {
+public static final native long /*int*/ _g_file_query_info (long /*int*/ file, byte[] attributes, long /*int*/ flags, long /*int*/ cancellable, long /*int*/ error);
+public static final long /*int*/ g_file_query_info (long /*int*/ file,byte[] attributes, long /*int*/ flags, long /*int*/ cancellable, long /*int*/ error) {
lock.lock();
try {
return _g_file_query_info (file, attributes, flags, cancellable, error);
@@ -2062,8 +2062,8 @@ public static final int /*long*/ g_file_query_info (int /*long*/ file,byte[] at
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_file_read(int /*long*/ file, int /*long*/ cancellable, int /*long*/ error);
-public static final int /*long*/ g_file_read(int /*long*/ file, int /*long*/ cancellable, int /*long*/ error) {
+public static final native long /*int*/ _g_file_read(long /*int*/ file, long /*int*/ cancellable, long /*int*/ error);
+public static final long /*int*/ g_file_read(long /*int*/ file, long /*int*/ cancellable, long /*int*/ error) {
lock.lock();
try {
return _g_file_read(file, cancellable, error);
@@ -2082,8 +2082,8 @@ public static final boolean /*long*/ g_file_test(byte[] file, int test) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_icon_to_string(int /*long*/ icon);
-public static final int /*long*/ g_icon_to_string (int /*long*/ icon) {
+public static final native long /*int*/ _g_icon_to_string(long /*int*/ icon);
+public static final long /*int*/ g_icon_to_string (long /*int*/ icon) {
lock.lock();
try {
return _g_icon_to_string(icon);
@@ -2092,8 +2092,8 @@ public static final int /*long*/ g_icon_to_string (int /*long*/ icon) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_icon_new_for_string(byte[] str, int /*long*/ error[]);
-public static final int /*long*/ g_icon_new_for_string (byte[] str, int /*long*/ error[]) {
+public static final native long /*int*/ _g_icon_new_for_string(byte[] str, long /*int*/ error[]);
+public static final long /*int*/ g_icon_new_for_string (byte[] str, long /*int*/ error[]) {
lock.lock();
try {
return _g_icon_new_for_string(str, error);
@@ -2108,8 +2108,8 @@ public static final int /*long*/ g_icon_new_for_string (byte[] str, int /*long*/
* @param hook_data cast=(gpointer)
* @param data_destroy cast=(GDestroyNotify)
*/
-public static final native int /*long*/ _g_signal_add_emission_hook(int signal_id, int detail, int /*long*/ hook_func, int /*long*/ hook_data, int /*long*/ data_destroy);
-public static final int /*long*/ g_signal_add_emission_hook(int signal_id, int detail, int /*long*/ hook_func, int /*long*/ hook_data, int /*long*/ data_destroy) {
+public static final native long /*int*/ _g_signal_add_emission_hook(int signal_id, int detail, long /*int*/ hook_func, long /*int*/ hook_data, long /*int*/ data_destroy);
+public static final long /*int*/ g_signal_add_emission_hook(int signal_id, int detail, long /*int*/ hook_func, long /*int*/ hook_data, long /*int*/ data_destroy) {
lock.lock();
try {
return _g_signal_add_emission_hook(signal_id, detail, hook_func, hook_data, data_destroy);
@@ -2121,8 +2121,8 @@ public static final int /*long*/ g_signal_add_emission_hook(int signal_id, int d
* @param signal_id cast=(guint)
* @param hook_id cast=(gulong)
*/
-public static final native void _g_signal_remove_emission_hook(int signal_id, int /*long*/ hook_id);
-public static final void g_signal_remove_emission_hook(int signal_id, int /*long*/ hook_id) {
+public static final native void _g_signal_remove_emission_hook(int signal_id, long /*int*/ hook_id);
+public static final void g_signal_remove_emission_hook(int signal_id, long /*int*/ hook_id) {
lock.lock();
try {
_g_signal_remove_emission_hook (signal_id, hook_id);
@@ -2135,8 +2135,8 @@ public static final void g_signal_remove_emission_hook(int signal_id, int /*long
* @param user_data cast=(gpointer)
* @param destroy_data cast=(GClosureNotify)
*/
-public static final native int /*long*/ _g_cclosure_new(int /*long*/ callback_func, int /*long*/ user_data, int /*long*/ destroy_data);
-public static final int /*long*/ g_cclosure_new(int /*long*/ callback_func, int /*long*/ user_data, int /*long*/ destroy_data) {
+public static final native long /*int*/ _g_cclosure_new(long /*int*/ callback_func, long /*int*/ user_data, long /*int*/ destroy_data);
+public static final long /*int*/ g_cclosure_new(long /*int*/ callback_func, long /*int*/ user_data, long /*int*/ destroy_data) {
lock.lock();
try {
return _g_cclosure_new(callback_func, user_data, destroy_data);
@@ -2145,8 +2145,8 @@ public static final int /*long*/ g_cclosure_new(int /*long*/ callback_func, int
}
}
/** @param closure cast=(GClosure *) */
-public static final native int /*long*/ _g_closure_ref(int /*long*/ closure);
-public static final int /*long*/ g_closure_ref(int /*long*/ closure) {
+public static final native long /*int*/ _g_closure_ref(long /*int*/ closure);
+public static final long /*int*/ g_closure_ref(long /*int*/ closure) {
lock.lock();
try {
return _g_closure_ref(closure);
@@ -2155,8 +2155,8 @@ public static final int /*long*/ g_closure_ref(int /*long*/ closure) {
}
}
/** @param closure cast=(GClosure *) */
-public static final native void _g_closure_unref(int /*long*/ closure);
-public static final void g_closure_unref(int /*long*/ closure) {
+public static final native void _g_closure_unref(long /*int*/ closure);
+public static final void g_closure_unref(long /*int*/ closure) {
lock.lock();
try {
_g_closure_unref(closure);
@@ -2165,8 +2165,8 @@ public static final void g_closure_unref(int /*long*/ closure) {
}
}
/** @param context cast=(GMainContext *) */
-public static final native boolean _g_main_context_acquire(int /*long*/ context);
-public static final boolean g_main_context_acquire(int /*long*/ context) {
+public static final native boolean _g_main_context_acquire(long /*int*/ context);
+public static final boolean g_main_context_acquire(long /*int*/ context) {
lock.lock();
try {
return _g_main_context_acquire(context);
@@ -2178,8 +2178,8 @@ public static final boolean g_main_context_acquire(int /*long*/ context) {
* @param context cast=(GMainContext *)
* @param fds cast=(GPollFD *)
*/
-public static final native int _g_main_context_check(int /*long*/ context, int max_priority, int /*long*/ fds, int n_fds);
-public static final int g_main_context_check(int /*long*/ context, int max_priority, int /*long*/ fds, int n_fds) {
+public static final native int _g_main_context_check(long /*int*/ context, int max_priority, long /*int*/ fds, int n_fds);
+public static final int g_main_context_check(long /*int*/ context, int max_priority, long /*int*/ fds, int n_fds) {
lock.lock();
try {
return _g_main_context_check(context, max_priority, fds, n_fds);
@@ -2187,8 +2187,8 @@ public static final int g_main_context_check(int /*long*/ context, int max_prior
lock.unlock();
}
}
-public static final native int /*long*/ _g_main_context_default();
-public static final int /*long*/ g_main_context_default() {
+public static final native long /*int*/ _g_main_context_default();
+public static final long /*int*/ g_main_context_default() {
lock.lock();
try {
return _g_main_context_default();
@@ -2197,8 +2197,8 @@ public static final int /*long*/ g_main_context_default() {
}
}
/** @param context cast=(GMainContext *) */
-public static final native boolean _g_main_context_iteration(int /*long*/ context, boolean may_block);
-public static final boolean g_main_context_iteration(int /*long*/ context, boolean may_block) {
+public static final native boolean _g_main_context_iteration(long /*int*/ context, boolean may_block);
+public static final boolean g_main_context_iteration(long /*int*/ context, boolean may_block) {
lock.lock();
try {
return _g_main_context_iteration(context, may_block);
@@ -2207,8 +2207,8 @@ public static final boolean g_main_context_iteration(int /*long*/ context, boole
}
}
/** @param context cast=(GMainContext *) */
-public static final native int /*long*/ _g_main_context_get_poll_func(int /*long*/ context);
-public static final int /*long*/ g_main_context_get_poll_func(int /*long*/ context) {
+public static final native long /*int*/ _g_main_context_get_poll_func(long /*int*/ context);
+public static final long /*int*/ g_main_context_get_poll_func(long /*int*/ context) {
lock.lock();
try {
return _g_main_context_get_poll_func(context);
@@ -2217,8 +2217,8 @@ public static final int /*long*/ g_main_context_get_poll_func(int /*long*/ conte
}
}
/** @param context cast=(GMainContext *) */
-public static final native boolean _g_main_context_prepare(int /*long*/ context, int[] priority);
-public static final boolean g_main_context_prepare(int /*long*/ context, int[] priority) {
+public static final native boolean _g_main_context_prepare(long /*int*/ context, int[] priority);
+public static final boolean g_main_context_prepare(long /*int*/ context, int[] priority) {
lock.lock();
try {
return _g_main_context_prepare(context, priority);
@@ -2230,8 +2230,8 @@ public static final boolean g_main_context_prepare(int /*long*/ context, int[] p
* @param context cast=(GMainContext *)
* @param fds cast=(GPollFD *)
*/
-public static final native int _g_main_context_query(int /*long*/ context, int max_priority, int[] timeout_, int /*long*/ fds, int n_fds);
-public static final int g_main_context_query(int /*long*/ context, int max_priority, int[] timeout_, int /*long*/ fds, int n_fds) {
+public static final native int _g_main_context_query(long /*int*/ context, int max_priority, int[] timeout_, long /*int*/ fds, int n_fds);
+public static final int g_main_context_query(long /*int*/ context, int max_priority, int[] timeout_, long /*int*/ fds, int n_fds) {
lock.lock();
try {
return _g_main_context_query(context, max_priority, timeout_, fds, n_fds);
@@ -2240,8 +2240,8 @@ public static final int g_main_context_query(int /*long*/ context, int max_prior
}
}
/** @param context cast=(GMainContext *) */
-public static final native void _g_main_context_release(int /*long*/ context);
-public static final void g_main_context_release(int /*long*/ context) {
+public static final native void _g_main_context_release(long /*int*/ context);
+public static final void g_main_context_release(long /*int*/ context) {
lock.lock();
try {
_g_main_context_release(context);
@@ -2250,7 +2250,7 @@ public static final void g_main_context_release(int /*long*/ context) {
}
}
/** @param context cast=(GMainContext *) */
-public static final native void g_main_context_wakeup(int /*long*/ context);
+public static final native void g_main_context_wakeup(long /*int*/ context);
/**
* @param opsysstring cast=(const gchar *)
* @param len cast=(gssize)
@@ -2258,8 +2258,8 @@ public static final native void g_main_context_wakeup(int /*long*/ context);
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
-public static final native int /*long*/ _g_filename_to_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error);
-public static final int /*long*/ g_filename_to_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error) {
+public static final native long /*int*/ _g_filename_to_utf8(long /*int*/ opsysstring, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error);
+public static final long /*int*/ g_filename_to_utf8(long /*int*/ opsysstring, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error) {
lock.lock();
try {
return _g_filename_to_utf8(opsysstring, len, bytes_read, bytes_written, error);
@@ -2270,8 +2270,8 @@ public static final int /*long*/ g_filename_to_utf8(int /*long*/ opsysstring, in
/**
* @method flags=dynamic
*/
-public static final native int /*long*/ _g_filename_display_name(int /*long*/ filename);
-public static final int /*long*/ g_filename_display_name(int /*long*/ filename) {
+public static final native long /*int*/ _g_filename_display_name(long /*int*/ filename);
+public static final long /*int*/ g_filename_display_name(long /*int*/ filename) {
lock.lock();
try {
return _g_filename_display_name(filename);
@@ -2284,8 +2284,8 @@ public static final int /*long*/ g_filename_display_name(int /*long*/ filename)
* @param hostname cast=(const char *)
* @param error cast=(GError **)
*/
-public static final native int /*long*/ _g_filename_to_uri(int /*long*/ filename, int /*long*/ hostname, int /*long*/[] error);
-public static final int /*long*/ g_filename_to_uri(int /*long*/ filename, int /*long*/ hostname, int /*long*/[] error) {
+public static final native long /*int*/ _g_filename_to_uri(long /*int*/ filename, long /*int*/ hostname, long /*int*/[] error);
+public static final long /*int*/ g_filename_to_uri(long /*int*/ filename, long /*int*/ hostname, long /*int*/[] error) {
lock.lock();
try {
return _g_filename_to_uri(filename, hostname, error);
@@ -2300,8 +2300,8 @@ public static final int /*long*/ g_filename_to_uri(int /*long*/ filename, int /*
* @param bytes_written cast=(gsize *)
* @param error cast=(GError **)
*/
-public static final native int /*long*/ _g_filename_from_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error);
-public static final int /*long*/ g_filename_from_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error) {
+public static final native long /*int*/ _g_filename_from_utf8(long /*int*/ opsysstring, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error);
+public static final long /*int*/ g_filename_from_utf8(long /*int*/ opsysstring, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error) {
lock.lock();
try {
return _g_filename_from_utf8(opsysstring, len, bytes_read, bytes_written, error);
@@ -2314,8 +2314,8 @@ public static final int /*long*/ g_filename_from_utf8(int /*long*/ opsysstring,
* @param hostname cast=(char **)
* @param error cast=(GError **)
*/
-public static final native int /*long*/ _g_filename_from_uri(int /*long*/ uri, int /*long*/[] hostname, int /*long*/[] error);
-public static final int /*long*/ g_filename_from_uri(int /*long*/ uri, int /*long*/[] hostname, int /*long*/[] error) {
+public static final native long /*int*/ _g_filename_from_uri(long /*int*/ uri, long /*int*/[] hostname, long /*int*/[] error);
+public static final long /*int*/ g_filename_from_uri(long /*int*/ uri, long /*int*/[] hostname, long /*int*/[] error) {
lock.lock();
try {
return _g_filename_from_uri(uri, hostname, error);
@@ -2324,8 +2324,8 @@ public static final int /*long*/ g_filename_from_uri(int /*long*/ uri, int /*lon
}
}
/** @param mem cast=(gpointer) */
-public static final native void _g_free(int /*long*/ mem);
-public static final void g_free(int /*long*/ mem) {
+public static final native void _g_free(long /*int*/ mem);
+public static final void g_free(long /*int*/ mem) {
lock.lock();
try {
_g_free(mem);
@@ -2337,8 +2337,8 @@ public static final void g_free(int /*long*/ mem) {
* @param function cast=(GSourceFunc)
* @param data cast=(gpointer)
*/
-public static final native int _g_idle_add(int /*long*/ function, int /*long*/ data);
-public static final int g_idle_add(int /*long*/ function, int /*long*/ data) {
+public static final native int _g_idle_add(long /*int*/ function, long /*int*/ data);
+public static final int g_idle_add(long /*int*/ function, long /*int*/ data) {
lock.lock();
try {
return _g_idle_add(function, data);
@@ -2350,8 +2350,8 @@ public static final int g_idle_add(int /*long*/ function, int /*long*/ data) {
* @param list cast=(GList *)
* @param data cast=(gpointer)
*/
-public static final native int /*long*/ _g_list_append(int /*long*/ list, int /*long*/ data);
-public static final int /*long*/ g_list_append(int /*long*/ list, int /*long*/ data) {
+public static final native long /*int*/ _g_list_append(long /*int*/ list, long /*int*/ data);
+public static final long /*int*/ g_list_append(long /*int*/ list, long /*int*/ data) {
lock.lock();
try {
return _g_list_append(list, data);
@@ -2360,8 +2360,8 @@ public static final int /*long*/ g_list_append(int /*long*/ list, int /*long*/ d
}
}
/** @param list cast=(GList *) */
-public static final native int /*long*/ _g_list_data(int /*long*/ list);
-public static final int /*long*/ g_list_data(int /*long*/ list) {
+public static final native long /*int*/ _g_list_data(long /*int*/ list);
+public static final long /*int*/ g_list_data(long /*int*/ list) {
lock.lock();
try {
return _g_list_data(list);
@@ -2370,8 +2370,8 @@ public static final int /*long*/ g_list_data(int /*long*/ list) {
}
}
/** @param list cast=(GList *) */
-public static final native void _g_list_free(int /*long*/ list);
-public static final void g_list_free(int /*long*/ list) {
+public static final native void _g_list_free(long /*int*/ list);
+public static final void g_list_free(long /*int*/ list) {
lock.lock();
try {
_g_list_free(list);
@@ -2380,8 +2380,8 @@ public static final void g_list_free(int /*long*/ list) {
}
}
/** @param list cast=(GList *) */
-public static final native void _g_list_free_1(int /*long*/ list);
-public static final void g_list_free_1(int /*long*/ list) {
+public static final native void _g_list_free_1(long /*int*/ list);
+public static final void g_list_free_1(long /*int*/ list) {
lock.lock();
try {
_g_list_free_1(list);
@@ -2392,8 +2392,8 @@ public static final void g_list_free_1(int /*long*/ list) {
/**
* @param list cast=(GList *)
*/
-public static final native int /*long*/ _g_list_last(int /*long*/ list);
-public static final int /*long*/ g_list_last(int /*long*/ list) {
+public static final native long /*int*/ _g_list_last(long /*int*/ list);
+public static final long /*int*/ g_list_last(long /*int*/ list) {
lock.lock();
try {
return _g_list_last(list);
@@ -2402,8 +2402,8 @@ public static final int /*long*/ g_list_last(int /*long*/ list) {
}
}
/** @param list cast=(GList *) */
-public static final native int _g_list_length(int /*long*/ list);
-public static final int g_list_length(int /*long*/ list) {
+public static final native int _g_list_length(long /*int*/ list);
+public static final int g_list_length(long /*int*/ list) {
lock.lock();
try {
return _g_list_length(list);
@@ -2415,8 +2415,8 @@ public static final int g_list_length(int /*long*/ list) {
* @param list cast=(GList *)
* @param llist cast=(GList *)
*/
-public static final native void _g_list_set_next(int /*long*/ list, int /*long*/ llist);
-public static final void g_list_set_next(int /*long*/ list, int /*long*/ llist) {
+public static final native void _g_list_set_next(long /*int*/ list, long /*int*/ llist);
+public static final void g_list_set_next(long /*int*/ list, long /*int*/ llist) {
lock.lock();
try {
_g_list_set_next(list, llist);
@@ -2424,8 +2424,8 @@ public static final void g_list_set_next(int /*long*/ list, int /*long*/ llist)
lock.unlock();
}
}
-public static final native int /*long*/ _g_list_next(int /*long*/ list);
-public static final int /*long*/ g_list_next(int /*long*/ list) {
+public static final native long /*int*/ _g_list_next(long /*int*/ list);
+public static final long /*int*/ g_list_next(long /*int*/ list) {
lock.lock();
try {
return _g_list_next(list);
@@ -2437,8 +2437,8 @@ public static final int /*long*/ g_list_next(int /*long*/ list) {
* @param list cast=(GList *)
* @param n cast=(guint)
*/
-public static final native int /*long*/ _g_list_nth(int /*long*/ list, int n);
-public static final int /*long*/ g_list_nth(int /*long*/ list, int n) {
+public static final native long /*int*/ _g_list_nth(long /*int*/ list, int n);
+public static final long /*int*/ g_list_nth(long /*int*/ list, int n) {
lock.lock();
try {
return _g_list_nth(list, n);
@@ -2450,8 +2450,8 @@ public static final int /*long*/ g_list_nth(int /*long*/ list, int n) {
* @param list cast=(GList *)
* @param n cast=(guint)
*/
-public static final native int /*long*/ _g_list_nth_data(int /*long*/ list, int n);
-public static final int /*long*/ g_list_nth_data(int /*long*/ list, int n) {
+public static final native long /*int*/ _g_list_nth_data(long /*int*/ list, int n);
+public static final long /*int*/ g_list_nth_data(long /*int*/ list, int n) {
lock.lock();
try {
return _g_list_nth_data(list, n);
@@ -2463,8 +2463,8 @@ public static final int /*long*/ g_list_nth_data(int /*long*/ list, int n) {
* @param list cast=(GList *)
* @param data cast=(gpointer)
*/
-public static final native int /*long*/ _g_list_prepend(int /*long*/ list, int /*long*/ data);
-public static final int /*long*/ g_list_prepend(int /*long*/ list, int /*long*/ data) {
+public static final native long /*int*/ _g_list_prepend(long /*int*/ list, long /*int*/ data);
+public static final long /*int*/ g_list_prepend(long /*int*/ list, long /*int*/ data) {
lock.lock();
try {
return _g_list_prepend(list, data);
@@ -2476,8 +2476,8 @@ public static final int /*long*/ g_list_prepend(int /*long*/ list, int /*long*/
* @param list cast=(GList *)
* @param llist cast=(GList *)
*/
-public static final native void _g_list_set_previous(int /*long*/ list, int /*long*/ llist);
-public static final void g_list_set_previous(int /*long*/ list, int /*long*/ llist) {
+public static final native void _g_list_set_previous(long /*int*/ list, long /*int*/ llist);
+public static final void g_list_set_previous(long /*int*/ list, long /*int*/ llist) {
lock.lock();
try {
_g_list_set_previous(list, llist);
@@ -2485,8 +2485,8 @@ public static final void g_list_set_previous(int /*long*/ list, int /*long*/ lli
lock.unlock();
}
}
-public static final native int /*long*/ _g_list_previous(int /*long*/ list);
-public static final int /*long*/ g_list_previous(int /*long*/ list) {
+public static final native long /*int*/ _g_list_previous(long /*int*/ list);
+public static final long /*int*/ g_list_previous(long /*int*/ list) {
lock.lock();
try {
return _g_list_previous(list);
@@ -2498,8 +2498,8 @@ public static final int /*long*/ g_list_previous(int /*long*/ list) {
* @param list cast=(GList *)
* @param link cast=(GList *)
*/
-public static final native int /*long*/ _g_list_remove_link(int /*long*/ list, int /*long*/ link);
-public static final int /*long*/ g_list_remove_link(int /*long*/ list, int /*long*/ link) {
+public static final native long /*int*/ _g_list_remove_link(long /*int*/ list, long /*int*/ link);
+public static final long /*int*/ g_list_remove_link(long /*int*/ list, long /*int*/ link) {
lock.lock();
try {
return _g_list_remove_link(list, link);
@@ -2513,8 +2513,8 @@ public static final int /*long*/ g_list_remove_link(int /*long*/ list, int /*lon
* @param message cast=(gchar *)
* @param unused_data cast=(gpointer)
*/
-public static final native void _g_log_default_handler(int /*long*/ log_domain, int log_levels, int /*long*/ message, int /*long*/ unused_data);
-public static final void g_log_default_handler(int /*long*/ log_domain, int log_levels, int /*long*/ message, int /*long*/ unused_data) {
+public static final native void _g_log_default_handler(long /*int*/ log_domain, int log_levels, long /*int*/ message, long /*int*/ unused_data);
+public static final void g_log_default_handler(long /*int*/ log_domain, int log_levels, long /*int*/ message, long /*int*/ unused_data) {
lock.lock();
try {
_g_log_default_handler(log_domain, log_levels, message, unused_data);
@@ -2541,8 +2541,8 @@ public static final void g_log_remove_handler(byte[] log_domain, int handler_id)
* @param log_func cast=(GLogFunc)
* @param user_data cast=(gpointer)
*/
-public static final native int _g_log_set_handler(byte[] log_domain, int log_levels, int /*long*/ log_func, int /*long*/ user_data);
-public static final int g_log_set_handler(byte[] log_domain, int log_levels, int /*long*/ log_func, int /*long*/ user_data) {
+public static final native int _g_log_set_handler(byte[] log_domain, int log_levels, long /*int*/ log_func, long /*int*/ user_data);
+public static final int g_log_set_handler(byte[] log_domain, int log_levels, long /*int*/ log_func, long /*int*/ user_data) {
lock.lock();
try {
return _g_log_set_handler(log_domain, log_levels, log_func, user_data);
@@ -2551,8 +2551,8 @@ public static final int g_log_set_handler(byte[] log_domain, int log_levels, int
}
}
/** @param size cast=(gulong) */
-public static final native int /*long*/ _g_malloc(int /*long*/ size);
-public static final int /*long*/ g_malloc(int /*long*/ size) {
+public static final native long /*int*/ _g_malloc(long /*int*/ size);
+public static final long /*int*/ g_malloc(long /*int*/ size) {
lock.lock();
try {
return _g_malloc(size);
@@ -2564,8 +2564,8 @@ public static final int /*long*/ g_malloc(int /*long*/ size) {
* @param oclass cast=(GObjectClass *)
* @param property_name cast=(const gchar *)
*/
-public static final native int /*long*/ _g_object_class_find_property(int /*long*/ oclass, byte[] property_name);
-public static final int /*long*/ g_object_class_find_property(int /*long*/ oclass, byte[] property_name) {
+public static final native long /*int*/ _g_object_class_find_property(long /*int*/ oclass, byte[] property_name);
+public static final long /*int*/ g_object_class_find_property(long /*int*/ oclass, byte[] property_name) {
lock.lock();
try {
return _g_object_class_find_property(oclass, property_name);
@@ -2578,8 +2578,8 @@ public static final int /*long*/ g_object_class_find_property(int /*long*/ oclas
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
-public static final native void _g_object_get(int /*long*/ object, byte[] first_property_name, int[] value, int /*long*/ terminator);
-public static final void g_object_get(int /*long*/ object, byte[] first_property_name, int[] value, int /*long*/ terminator) {
+public static final native void _g_object_get(long /*int*/ object, byte[] first_property_name, int[] value, long /*int*/ terminator);
+public static final void g_object_get(long /*int*/ object, byte[] first_property_name, int[] value, long /*int*/ terminator) {
lock.lock();
try {
_g_object_get(object, first_property_name, value, terminator);
@@ -2592,8 +2592,8 @@ public static final void g_object_get(int /*long*/ object, byte[] first_property
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
-public static final native void _g_object_get(int /*long*/ object, byte[] first_property_name, long[] value, int /*long*/ terminator);
-public static final void g_object_get(int /*long*/ object, byte[] first_property_name, long[] value, int /*long*/ terminator) {
+public static final native void _g_object_get(long /*int*/ object, byte[] first_property_name, long[] value, long /*int*/ terminator);
+public static final void g_object_get(long /*int*/ object, byte[] first_property_name, long[] value, long /*int*/ terminator) {
lock.lock();
try {
_g_object_get(object, first_property_name, value, terminator);
@@ -2605,8 +2605,8 @@ public static final void g_object_get(int /*long*/ object, byte[] first_property
* @param object cast=(GObject *)
* @param quark cast=(GQuark)
*/
-public static final native int /*long*/ _g_object_get_qdata(int /*long*/ object, int quark);
-public static final int /*long*/ g_object_get_qdata(int /*long*/ object, int quark) {
+public static final native long /*int*/ _g_object_get_qdata(long /*int*/ object, int quark);
+public static final long /*int*/ g_object_get_qdata(long /*int*/ object, int quark) {
lock.lock();
try {
return _g_object_get_qdata(object, quark);
@@ -2618,8 +2618,8 @@ public static final int /*long*/ g_object_get_qdata(int /*long*/ object, int qua
* @param type cast=(GType)
* @param first_property_name cast=(const gchar *)
*/
-public static final native int /*long*/ _g_object_new (int /*long*/ type, int /*long*/ first_property_name);
-public static final int /*long*/ g_object_new (int /*long*/ type, int /*long*/ first_property_name) {
+public static final native long /*int*/ _g_object_new (long /*int*/ type, long /*int*/ first_property_name);
+public static final long /*int*/ g_object_new (long /*int*/ type, long /*int*/ first_property_name) {
lock.lock();
try {
return _g_object_new(type, first_property_name);
@@ -2631,8 +2631,8 @@ public static final int /*long*/ g_object_new (int /*long*/ type, int /*long*/ f
* @param object cast=(GObject *)
* @param property_name cast=(const gchar *)
*/
-public static final native void _g_object_notify (int /*long*/ object, byte[] property_name);
-public static final void g_object_notify (int /*long*/ object, byte[] property_name) {
+public static final native void _g_object_notify (long /*int*/ object, byte[] property_name);
+public static final void g_object_notify (long /*int*/ object, byte[] property_name) {
lock.lock();
try {
_g_object_notify(object, property_name);
@@ -2641,8 +2641,8 @@ public static final void g_object_notify (int /*long*/ object, byte[] property_n
}
}
/** @param object cast=(gpointer) */
-public static final native int /*long*/ _g_object_ref(int /*long*/ object);
-public static final int /*long*/ g_object_ref(int /*long*/ object) {
+public static final native long /*int*/ _g_object_ref(long /*int*/ object);
+public static final long /*int*/ g_object_ref(long /*int*/ object) {
lock.lock();
try {
return _g_object_ref(object);
@@ -2655,8 +2655,8 @@ public static final int /*long*/ g_object_ref(int /*long*/ object) {
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
-public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, boolean data, int /*long*/ terminator);
-public static final void g_object_set(int /*long*/ object, byte[] first_property_name, boolean data, int /*long*/ terminator) {
+public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, boolean data, long /*int*/ terminator);
+public static final void g_object_set(long /*int*/ object, byte[] first_property_name, boolean data, long /*int*/ terminator) {
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
@@ -2669,8 +2669,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
-public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, byte[] data, int /*long*/ terminator);
-public static final void g_object_set(int /*long*/ object, byte[] first_property_name, byte[] data, int /*long*/ terminator) {
+public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, byte[] data, long /*int*/ terminator);
+public static final void g_object_set(long /*int*/ object, byte[] first_property_name, byte[] data, long /*int*/ terminator) {
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
@@ -2683,8 +2683,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
* @param first_property_name cast=(const gchar *)
* @param terminator cast=(const gchar *),flags=sentinel
*/
-public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, GdkColor data, int /*long*/ terminator);
-public static final void g_object_set(int /*long*/ object, byte[] first_property_name, GdkColor data, int /*long*/ terminator) {
+public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, GdkColor data, long /*int*/ terminator);
+public static final void g_object_set(long /*int*/ object, byte[] first_property_name, GdkColor data, long /*int*/ terminator) {
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
@@ -2697,8 +2697,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
-public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, int data, int /*long*/ terminator);
-public static final void g_object_set(int /*long*/ object, byte[] first_property_name, int data, int /*long*/ terminator) {
+public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, int data, long /*int*/ terminator);
+public static final void g_object_set(long /*int*/ object, byte[] first_property_name, int data, long /*int*/ terminator) {
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
@@ -2711,8 +2711,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
-public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, float data, int /*long*/ terminator);
-public static final void g_object_set(int /*long*/ object, byte[] first_property_name, float data, int /*long*/ terminator) {
+public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, float data, long /*int*/ terminator);
+public static final void g_object_set(long /*int*/ object, byte[] first_property_name, float data, long /*int*/ terminator) {
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
@@ -2725,8 +2725,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
* @param first_property_name cast=(const gchar *),flags=no_out
* @param terminator cast=(const gchar *),flags=sentinel
*/
-public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, long data, int /*long*/ terminator);
-public static final void g_object_set(int /*long*/ object, byte[] first_property_name, long data, int /*long*/ terminator) {
+public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, long data, long /*int*/ terminator);
+public static final void g_object_set(long /*int*/ object, byte[] first_property_name, long data, long /*int*/ terminator) {
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
@@ -2739,8 +2739,8 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
* @param quark cast=(GQuark)
* @param data cast=(gpointer)
*/
-public static final native void _g_object_set_qdata(int /*long*/ object, int quark, int /*long*/ data);
-public static final void g_object_set_qdata(int /*long*/ object, int quark, int /*long*/ data) {
+public static final native void _g_object_set_qdata(long /*int*/ object, int quark, long /*int*/ data);
+public static final void g_object_set_qdata(long /*int*/ object, int quark, long /*int*/ data) {
lock.lock();
try {
_g_object_set_qdata(object, quark, data);
@@ -2749,8 +2749,8 @@ public static final void g_object_set_qdata(int /*long*/ object, int quark, int
}
}
/** @param object cast=(gpointer) */
-public static final native void _g_object_unref(int /*long*/ object);
-public static final void g_object_unref(int /*long*/ object) {
+public static final native void _g_object_unref(long /*int*/ object);
+public static final void g_object_unref(long /*int*/ object) {
lock.lock();
try {
_g_object_unref(object);
@@ -2784,8 +2784,8 @@ public static final void g_set_prgname(byte[] prgname) {
* @param proc cast=(GCallback)
* @param data cast=(gpointer)
*/
-public static final native int _g_signal_connect(int /*long*/ instance, byte[] detailed_signal, int /*long*/ proc, int /*long*/ data);
-public static final int g_signal_connect(int /*long*/ instance, byte[] detailed_signal, int /*long*/ proc, int /*long*/ data) {
+public static final native int _g_signal_connect(long /*int*/ instance, byte[] detailed_signal, long /*int*/ proc, long /*int*/ data);
+public static final int g_signal_connect(long /*int*/ instance, byte[] detailed_signal, long /*int*/ proc, long /*int*/ data) {
lock.lock();
try {
return _g_signal_connect(instance, detailed_signal, proc, data);
@@ -2799,8 +2799,8 @@ public static final int g_signal_connect(int /*long*/ instance, byte[] detailed_
* @param closure cast=(GClosure *)
* @param after cast=(gboolean)
*/
-public static final native int _g_signal_connect_closure(int /*long*/ instance, byte[] detailed_signal, int /*long*/ closure, boolean after);
-public static final int g_signal_connect_closure(int /*long*/ instance, byte[] detailed_signal, int /*long*/ closure, boolean after) {
+public static final native int _g_signal_connect_closure(long /*int*/ instance, byte[] detailed_signal, long /*int*/ closure, boolean after);
+public static final int g_signal_connect_closure(long /*int*/ instance, byte[] detailed_signal, long /*int*/ closure, boolean after) {
lock.lock();
try {
return _g_signal_connect_closure(instance, detailed_signal, closure, after);
@@ -2815,8 +2815,8 @@ public static final int g_signal_connect_closure(int /*long*/ instance, byte[] d
* @param closure cast=(GClosure *)
* @param after cast=(gboolean)
*/
-public static final native int _g_signal_connect_closure_by_id(int /*long*/ instance, int signal_id, int detail, int /*long*/ closure, boolean after);
-public static final int g_signal_connect_closure_by_id(int /*long*/ instance, int signal_id, int detail, int /*long*/ closure, boolean after) {
+public static final native int _g_signal_connect_closure_by_id(long /*int*/ instance, int signal_id, int detail, long /*int*/ closure, boolean after);
+public static final int g_signal_connect_closure_by_id(long /*int*/ instance, int signal_id, int detail, long /*int*/ closure, boolean after) {
lock.lock();
try {
return _g_signal_connect_closure_by_id(instance, signal_id, detail, closure, after);
@@ -2828,8 +2828,8 @@ public static final int g_signal_connect_closure_by_id(int /*long*/ instance, in
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
-public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal);
-public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal) {
+public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal);
+public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal) {
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal);
@@ -2841,8 +2841,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
-public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, int /*long*/ data);
-public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, int /*long*/ data) {
+public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, long /*int*/ data);
+public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, long /*int*/ data) {
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
@@ -2854,8 +2854,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
-public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, GdkRectangle data);
-public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, GdkRectangle data) {
+public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, GdkRectangle data);
+public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, GdkRectangle data) {
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
@@ -2867,8 +2867,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
-public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, int /*long*/ data1, int /*long*/ data2);
-public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, int /*long*/ data1, int /*long*/ data2) {
+public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, long /*int*/ data1, long /*int*/ data2);
+public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, long /*int*/ data1, long /*int*/ data2) {
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data1, data2);
@@ -2880,8 +2880,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
-public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, byte [] data);
-public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, byte [] data) {
+public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, byte [] data);
+public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, byte [] data) {
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
@@ -2893,8 +2893,8 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
* @param instance cast=(gpointer)
* @param handler_id cast=(gulong)
*/
-public static final native void _g_signal_handler_disconnect(int /*long*/ instance, int handler_id);
-public static final void g_signal_handler_disconnect(int /*long*/ instance, int handler_id) {
+public static final native void _g_signal_handler_disconnect(long /*int*/ instance, int handler_id);
+public static final void g_signal_handler_disconnect(long /*int*/ instance, int handler_id) {
lock.lock();
try {
_g_signal_handler_disconnect(instance, handler_id);
@@ -2909,8 +2909,8 @@ public static final void g_signal_handler_disconnect(int /*long*/ instance, int
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
-public static final native int _g_signal_handler_find(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data);
-public static final int g_signal_handler_find(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data) {
+public static final native int _g_signal_handler_find(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data);
+public static final int g_signal_handler_find(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data) {
lock.lock();
try {
return _g_signal_handler_find(instance, mask, signal_id, detail, closure, func, data);
@@ -2927,8 +2927,8 @@ public static final int g_signal_handler_find(int /*long*/ instance, int mask, i
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
-public static final native int _g_signal_handlers_block_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data);
-public static final int g_signal_handlers_block_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data) {
+public static final native int _g_signal_handlers_block_matched(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data);
+public static final int g_signal_handlers_block_matched(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data) {
lock.lock();
try {
return _g_signal_handlers_block_matched(instance, mask, signal_id, detail, closure, func, data);
@@ -2945,8 +2945,8 @@ public static final int g_signal_handlers_block_matched(int /*long*/ instance, i
* @param func cast=(gpointer)
* @param data cast=(gpointer)
*/
-public static final native int _g_signal_handlers_unblock_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data);
-public static final int g_signal_handlers_unblock_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data) {
+public static final native int _g_signal_handlers_unblock_matched(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data);
+public static final int g_signal_handlers_unblock_matched(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data) {
lock.lock();
try {
return _g_signal_handlers_unblock_matched(instance, mask, signal_id, detail, closure, func, data);
@@ -2955,8 +2955,8 @@ public static final int g_signal_handlers_unblock_matched(int /*long*/ instance,
}
}
/** @param name cast=(const gchar *),flags=no_out */
-public static final native int _g_signal_lookup (byte[] name, int /*long*/ itype);
-public static final int g_signal_lookup (byte[] name, int /*long*/ itype) {
+public static final native int _g_signal_lookup (byte[] name, long /*int*/ itype);
+public static final int g_signal_lookup (byte[] name, long /*int*/ itype) {
lock.lock();
try {
return _g_signal_lookup(name, itype);
@@ -2968,8 +2968,8 @@ public static final int g_signal_lookup (byte[] name, int /*long*/ itype) {
* @param instance cast=(gpointer)
* @param detailed_signal cast=(const gchar *),flags=no_out
*/
-public static final native void _g_signal_stop_emission_by_name(int /*long*/ instance, byte[] detailed_signal);
-public static final void g_signal_stop_emission_by_name(int /*long*/ instance, byte[] detailed_signal) {
+public static final native void _g_signal_stop_emission_by_name(long /*int*/ instance, byte[] detailed_signal);
+public static final void g_signal_stop_emission_by_name(long /*int*/ instance, byte[] detailed_signal) {
lock.lock();
try {
_g_signal_stop_emission_by_name(instance, detailed_signal);
@@ -2978,8 +2978,8 @@ public static final void g_signal_stop_emission_by_name(int /*long*/ instance, b
}
}
/** @param tag cast=(guint) */
-public static final native boolean /*long*/ _g_source_remove (int /*long*/ tag);
-public static final boolean /*long*/ g_source_remove (int /*long*/ tag) {
+public static final native boolean /*long*/ _g_source_remove (long /*int*/ tag);
+public static final boolean /*long*/ g_source_remove (long /*int*/ tag) {
lock.lock();
try {
return _g_source_remove(tag);
@@ -2991,8 +2991,8 @@ public static final boolean /*long*/ g_source_remove (int /*long*/ tag) {
* @param list cast=(GSList *)
* @param data cast=(gpointer)
*/
-public static final native int /*long*/ _g_slist_append(int /*long*/ list, int /*long*/ data);
-public static final int /*long*/ g_slist_append(int /*long*/ list, int /*long*/ data) {
+public static final native long /*int*/ _g_slist_append(long /*int*/ list, long /*int*/ data);
+public static final long /*int*/ g_slist_append(long /*int*/ list, long /*int*/ data) {
lock.lock();
try {
return _g_slist_append(list, data);
@@ -3001,8 +3001,8 @@ public static final int /*long*/ g_slist_append(int /*long*/ list, int /*long*/
}
}
/** @param list cast=(GSList *) */
-public static final native int /*long*/ _g_slist_data (int /*long*/ list);
-public static final int /*long*/ g_slist_data (int /*long*/ list) {
+public static final native long /*int*/ _g_slist_data (long /*int*/ list);
+public static final long /*int*/ g_slist_data (long /*int*/ list) {
lock.lock();
try {
return _g_slist_data(list);
@@ -3011,8 +3011,8 @@ public static final int /*long*/ g_slist_data (int /*long*/ list) {
}
}
/** @param list cast=(GSList *) */
-public static final native void _g_slist_free (int /*long*/ list);
-public static final void g_slist_free (int /*long*/ list) {
+public static final native void _g_slist_free (long /*int*/ list);
+public static final void g_slist_free (long /*int*/ list) {
lock.lock();
try {
_g_slist_free(list);
@@ -3021,8 +3021,8 @@ public static final void g_slist_free (int /*long*/ list) {
}
}
/** @param list cast=(GSList *) */
-public static final native int /*long*/ _g_slist_next (int /*long*/ list);
-public static final int /*long*/ g_slist_next (int /*long*/ list) {
+public static final native long /*int*/ _g_slist_next (long /*int*/ list);
+public static final long /*int*/ g_slist_next (long /*int*/ list) {
lock.lock();
try {
return _g_slist_next(list);
@@ -3031,8 +3031,8 @@ public static final int /*long*/ g_slist_next (int /*long*/ list) {
}
}
/** @param list cast=(GSList *) */
-public static final native int _g_slist_length (int /*long*/ list);
-public static final int g_slist_length (int /*long*/ list) {
+public static final native int _g_slist_length (long /*int*/ list);
+public static final int g_slist_length (long /*int*/ list) {
lock.lock();
try {
return _g_slist_length(list);
@@ -3041,8 +3041,8 @@ public static final int g_slist_length (int /*long*/ list) {
}
}
/** @param string_array cast=(gchar **) */
-public static final native void _g_strfreev(int /*long*/ string_array);
-public static final void g_strfreev(int /*long*/ string_array) {
+public static final native void _g_strfreev(long /*int*/ string_array);
+public static final void g_strfreev(long /*int*/ string_array) {
lock.lock();
try {
_g_strfreev(string_array);
@@ -3054,8 +3054,8 @@ public static final void g_strfreev(int /*long*/ string_array) {
* @method flags=getter
* @param string cast=(GString *)
*/
-public static final native int _GString_len(int /*long*/ string);
-public static final int GString_len(int /*long*/ string) {
+public static final native int _GString_len(long /*int*/ string);
+public static final int GString_len(long /*int*/ string) {
lock.lock();
try {
return _GString_len(string);
@@ -3067,8 +3067,8 @@ public static final int GString_len(int /*long*/ string) {
* @method flags=getter
* @param string cast=(GString *)
*/
-public static final native int /*long*/ _GString_str(int /*long*/ string);
-public static final int /*long*/ GString_str(int /*long*/ string) {
+public static final native long /*int*/ _GString_str(long /*int*/ string);
+public static final long /*int*/ GString_str(long /*int*/ string) {
lock.lock();
try {
return _GString_str(string);
@@ -3080,8 +3080,8 @@ public static final int /*long*/ GString_str(int /*long*/ string) {
* @param str cast=(const gchar *)
* @param endptr cast=(gchar **)
*/
-public static final native double _g_strtod(int /*long*/ str, int /*long*/[] endptr);
-public static final double g_strtod(int /*long*/ str, int /*long*/[] endptr) {
+public static final native double _g_strtod(long /*int*/ str, long /*int*/[] endptr);
+public static final double g_strtod(long /*int*/ str, long /*int*/[] endptr) {
lock.lock();
try {
return _g_strtod(str, endptr);
@@ -3094,8 +3094,8 @@ public static final double g_strtod(int /*long*/ str, int /*long*/[] endptr) {
* @param interface_type cast=(GType)
* @param info cast=(const GInterfaceInfo *)
*/
-public static final native void _g_type_add_interface_static (int /*long*/ instance_type, int /*long*/ interface_type, int /*long*/ info);
-public static final void g_type_add_interface_static (int /*long*/ instance_type, int /*long*/ interface_type, int /*long*/ info) {
+public static final native void _g_type_add_interface_static (long /*int*/ instance_type, long /*int*/ interface_type, long /*int*/ info);
+public static final void g_type_add_interface_static (long /*int*/ instance_type, long /*int*/ interface_type, long /*int*/ info) {
lock.lock();
try {
_g_type_add_interface_static(instance_type, interface_type, info);
@@ -3104,8 +3104,8 @@ public static final void g_type_add_interface_static (int /*long*/ instance_type
}
}
/** @param g_class cast=(GType) */
-public static final native int /*long*/ _g_type_class_peek (int /*long*/ g_class);
-public static final int /*long*/ g_type_class_peek (int /*long*/ g_class) {
+public static final native long /*int*/ _g_type_class_peek (long /*int*/ g_class);
+public static final long /*int*/ g_type_class_peek (long /*int*/ g_class) {
lock.lock();
try {
return _g_type_class_peek(g_class);
@@ -3114,8 +3114,8 @@ public static final int /*long*/ g_type_class_peek (int /*long*/ g_class) {
}
}
/** @param g_class cast=(gpointer) */
-public static final native int /*long*/ _g_type_class_peek_parent (int /*long*/ g_class);
-public static final int /*long*/ g_type_class_peek_parent (int /*long*/ g_class) {
+public static final native long /*int*/ _g_type_class_peek_parent (long /*int*/ g_class);
+public static final long /*int*/ g_type_class_peek_parent (long /*int*/ g_class) {
lock.lock();
try {
return _g_type_class_peek_parent(g_class);
@@ -3124,8 +3124,8 @@ public static final int /*long*/ g_type_class_peek_parent (int /*long*/ g_class)
}
}
/** @param g_class cast=(GType) */
-public static final native int /*long*/ _g_type_class_ref (int /*long*/ g_class);
-public static final int /*long*/ g_type_class_ref (int /*long*/ g_class) {
+public static final native long /*int*/ _g_type_class_ref (long /*int*/ g_class);
+public static final long /*int*/ g_type_class_ref (long /*int*/ g_class) {
lock.lock();
try {
return _g_type_class_ref(g_class);
@@ -3134,8 +3134,8 @@ public static final int /*long*/ g_type_class_ref (int /*long*/ g_class) {
}
}
/** @param g_class cast=(gpointer) */
-public static final native void _g_type_class_unref (int /*long*/ g_class);
-public static final void g_type_class_unref (int /*long*/ g_class) {
+public static final native void _g_type_class_unref (long /*int*/ g_class);
+public static final void g_type_class_unref (long /*int*/ g_class) {
lock.lock();
try {
_g_type_class_unref(g_class);
@@ -3144,8 +3144,8 @@ public static final void g_type_class_unref (int /*long*/ g_class) {
}
}
/** @param name cast=(const gchar *) */
-public static final native int /*long*/ _g_type_from_name (byte[] name);
-public static final int /*long*/ g_type_from_name (byte[] name) {
+public static final native long /*int*/ _g_type_from_name (byte[] name);
+public static final long /*int*/ g_type_from_name (byte[] name) {
lock.lock();
try {
return _g_type_from_name(name);
@@ -3154,8 +3154,8 @@ public static final int /*long*/ g_type_from_name (byte[] name) {
}
}
/** @param iface cast=(gpointer) */
-public static final native int /*long*/ _g_type_interface_peek_parent (int /*long*/ iface);
-public static final int /*long*/ g_type_interface_peek_parent (int /*long*/ iface) {
+public static final native long /*int*/ _g_type_interface_peek_parent (long /*int*/ iface);
+public static final long /*int*/ g_type_interface_peek_parent (long /*int*/ iface) {
lock.lock();
try {
return _g_type_interface_peek_parent(iface);
@@ -3167,8 +3167,8 @@ public static final int /*long*/ g_type_interface_peek_parent (int /*long*/ ifac
* @param type cast=(GType)
* @param is_a_type cast=(GType)
*/
-public static final native boolean _g_type_is_a (int /*long*/ type, int /*long*/ is_a_type);
-public static final boolean g_type_is_a (int /*long*/ type, int /*long*/ is_a_type) {
+public static final native boolean _g_type_is_a (long /*int*/ type, long /*int*/ is_a_type);
+public static final boolean g_type_is_a (long /*int*/ type, long /*int*/ is_a_type) {
lock.lock();
try {
return _g_type_is_a(type, is_a_type);
@@ -3177,8 +3177,8 @@ public static final boolean g_type_is_a (int /*long*/ type, int /*long*/ is_a_ty
}
}
/** @param handle cast=(GType) */
-public static final native int /*long*/ _g_type_name (int /*long*/ handle);
-public static final int /*long*/ g_type_name (int /*long*/ handle) {
+public static final native long /*int*/ _g_type_name (long /*int*/ handle);
+public static final long /*int*/ g_type_name (long /*int*/ handle) {
lock.lock();
try {
return _g_type_name(handle);
@@ -3187,8 +3187,8 @@ public static final int /*long*/ g_type_name (int /*long*/ handle) {
}
}
/** @param type cast=(GType) */
-public static final native int /*long*/ _g_type_parent (int /*long*/ type);
-public static final int /*long*/ g_type_parent (int /*long*/ type) {
+public static final native long /*int*/ _g_type_parent (long /*int*/ type);
+public static final long /*int*/ g_type_parent (long /*int*/ type) {
lock.lock();
try {
return _g_type_parent(type);
@@ -3200,8 +3200,8 @@ public static final int /*long*/ g_type_parent (int /*long*/ type) {
* @param type cast=(GType)
* @param query cast=(GTypeQuery *)
*/
-public static final native void _g_type_query (int /*long*/ type, int /*long*/ query);
-public static final void g_type_query (int /*long*/ type, int /*long*/ query) {
+public static final native void _g_type_query (long /*int*/ type, long /*int*/ query);
+public static final void g_type_query (long /*int*/ type, long /*int*/ query) {
lock.lock();
try {
_g_type_query(type, query);
@@ -3215,8 +3215,8 @@ public static final void g_type_query (int /*long*/ type, int /*long*/ query) {
* @param info cast=(const GTypeInfo *)
* @param flags cast=(GTypeFlags)
*/
-public static final native int /*long*/ _g_type_register_static (int /*long*/ parent_type, byte[] type_name, int /*long*/ info, int flags);
-public static final int /*long*/ g_type_register_static (int /*long*/ parent_type, byte[] type_name, int /*long*/ info, int flags) {
+public static final native long /*int*/ _g_type_register_static (long /*int*/ parent_type, byte[] type_name, long /*int*/ info, int flags);
+public static final long /*int*/ g_type_register_static (long /*int*/ parent_type, byte[] type_name, long /*int*/ info, int flags) {
lock.lock();
try {
return _g_type_register_static(parent_type, type_name, info, flags);
@@ -3225,8 +3225,8 @@ public static final int /*long*/ g_type_register_static (int /*long*/ parent_typ
}
}
/** @param vtable cast=(GThreadFunctions *) */
-public static final native void _g_thread_init(int /*long*/ vtable);
-public static final void g_thread_init(int /*long*/ vtable) {
+public static final native void _g_thread_init(long /*int*/ vtable);
+public static final void g_thread_init(long /*int*/ vtable) {
lock.lock();
try {
_g_thread_init(vtable);
@@ -3250,8 +3250,8 @@ public static final boolean g_thread_supported() {
* @param items_written cast=(glong *),flags=critical
* @param error cast=(GError **),flags=critical
*/
-public static final native int /*long*/ _g_utf16_to_utf8(char[] str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error);
-public static final int /*long*/ g_utf16_to_utf8(char[] str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error) {
+public static final native long /*int*/ _g_utf16_to_utf8(char[] str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error);
+public static final long /*int*/ g_utf16_to_utf8(char[] str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error) {
lock.lock();
try {
return _g_utf16_to_utf8(str, len, items_read, items_written, error);
@@ -3263,8 +3263,8 @@ public static final int /*long*/ g_utf16_to_utf8(char[] str, int /*long*/ len, i
* @param str cast=(const gchar *)
* @param pos cast=(const gchar *)
*/
-public static final native int /*long*/ _g_utf8_pointer_to_offset(int /*long*/ str, int /*long*/ pos);
-public static final int /*long*/ g_utf8_pointer_to_offset(int /*long*/ str, int /*long*/ pos) {
+public static final native long /*int*/ _g_utf8_pointer_to_offset(long /*int*/ str, long /*int*/ pos);
+public static final long /*int*/ g_utf8_pointer_to_offset(long /*int*/ str, long /*int*/ pos) {
lock.lock();
try {
return _g_utf8_pointer_to_offset(str, pos);
@@ -3273,8 +3273,8 @@ public static final int /*long*/ g_utf8_pointer_to_offset(int /*long*/ str, int
}
}
/** @param str cast=(const gchar *) */
-public static final native int /*long*/ _g_utf16_offset_to_pointer(int /*long*/ str, int /*long*/ offset);
-public static final int /*long*/ g_utf16_offset_to_pointer(int /*long*/ str, int /*long*/ offset) {
+public static final native long /*int*/ _g_utf16_offset_to_pointer(long /*int*/ str, long /*int*/ offset);
+public static final long /*int*/ g_utf16_offset_to_pointer(long /*int*/ str, long /*int*/ offset) {
lock.lock();
try {
return _g_utf16_offset_to_pointer(str, offset);
@@ -3286,8 +3286,8 @@ public static final int /*long*/ g_utf16_offset_to_pointer(int /*long*/ str, int
* @param str cast=(const gchar *)
* @param pos cast=(const gchar *)
*/
-public static final native int /*long*/ _g_utf16_pointer_to_offset(int /*long*/ str, int /*long*/ pos);
-public static final int /*long*/ g_utf16_pointer_to_offset(int /*long*/ str, int /*long*/ pos) {
+public static final native long /*int*/ _g_utf16_pointer_to_offset(long /*int*/ str, long /*int*/ pos);
+public static final long /*int*/ g_utf16_pointer_to_offset(long /*int*/ str, long /*int*/ pos) {
lock.lock();
try {
return _g_utf16_pointer_to_offset(str, pos);
@@ -3296,8 +3296,8 @@ public static final int /*long*/ g_utf16_pointer_to_offset(int /*long*/ str, int
}
}
/** @param str cast=(const gchar *) */
-public static final native int /*long*/ _g_utf16_strlen(int /*long*/ str, int /*long*/ max);
-public static final int /*long*/ g_utf16_strlen(int /*long*/ str, int /*long*/ max) {
+public static final native long /*int*/ _g_utf16_strlen(long /*int*/ str, long /*int*/ max);
+public static final long /*int*/ g_utf16_strlen(long /*int*/ str, long /*int*/ max) {
lock.lock();
try {
return _g_utf16_strlen(str, max);
@@ -3306,8 +3306,8 @@ public static final int /*long*/ g_utf16_strlen(int /*long*/ str, int /*long*/ m
}
}
/** @param str cast=(const gchar *) */
-public static final native int /*long*/ _g_utf8_offset_to_utf16_offset(int /*long*/ str, int /*long*/ offset);
-public static final int /*long*/ g_utf8_offset_to_utf16_offset(int /*long*/ str, int /*long*/ offset) {
+public static final native long /*int*/ _g_utf8_offset_to_utf16_offset(long /*int*/ str, long /*int*/ offset);
+public static final long /*int*/ g_utf8_offset_to_utf16_offset(long /*int*/ str, long /*int*/ offset) {
lock.lock();
try {
return _g_utf8_offset_to_utf16_offset(str, offset);
@@ -3316,8 +3316,8 @@ public static final int /*long*/ g_utf8_offset_to_utf16_offset(int /*long*/ str,
}
}
/** @param str cast=(const gchar *) */
-public static final native int /*long*/ _g_utf16_offset_to_utf8_offset(int /*long*/ str, int /*long*/ offset);
-public static final int /*long*/ g_utf16_offset_to_utf8_offset(int /*long*/ str, int /*long*/ offset) {
+public static final native long /*int*/ _g_utf16_offset_to_utf8_offset(long /*int*/ str, long /*int*/ offset);
+public static final long /*int*/ g_utf16_offset_to_utf8_offset(long /*int*/ str, long /*int*/ offset) {
lock.lock();
try {
return _g_utf16_offset_to_utf8_offset(str, offset);
@@ -3326,8 +3326,8 @@ public static final int /*long*/ g_utf16_offset_to_utf8_offset(int /*long*/ str,
}
}
/** @param str cast=(const gchar *) */
-public static final native int /*long*/ _g_utf8_strlen(int /*long*/ str, int /*long*/ max);
-public static final int /*long*/ g_utf8_strlen(int /*long*/ str, int /*long*/ max) {
+public static final native long /*int*/ _g_utf8_strlen(long /*int*/ str, long /*int*/ max);
+public static final long /*int*/ g_utf8_strlen(long /*int*/ str, long /*int*/ max) {
lock.lock();
try {
return _g_utf8_strlen(str, max);
@@ -3342,8 +3342,8 @@ public static final int /*long*/ g_utf8_strlen(int /*long*/ str, int /*long*/ ma
* @param items_written cast=(glong *),flags=critical
* @param error cast=(GError **),flags=critical
*/
-public static final native int /*long*/ _g_utf8_to_utf16(byte[] str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error);
-public static final int /*long*/ g_utf8_to_utf16(byte[] str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error) {
+public static final native long /*int*/ _g_utf8_to_utf16(byte[] str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error);
+public static final long /*int*/ g_utf8_to_utf16(byte[] str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error) {
lock.lock();
try {
return _g_utf8_to_utf16(str, len, items_read, items_written, error);
@@ -3358,8 +3358,8 @@ public static final int /*long*/ g_utf8_to_utf16(byte[] str, int /*long*/ len, i
* @param items_written cast=(glong *),flags=critical
* @param error cast=(GError **),flags=critical
*/
-public static final native int /*long*/ _g_utf8_to_utf16(int /*long*/ str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error);
-public static final int /*long*/ g_utf8_to_utf16(int /*long*/ str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error) {
+public static final native long /*int*/ _g_utf8_to_utf16(long /*int*/ str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error);
+public static final long /*int*/ g_utf8_to_utf16(long /*int*/ str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error) {
lock.lock();
try {
return _g_utf8_to_utf16(str, len, items_read, items_written, error);
@@ -3371,28 +3371,28 @@ public static final int /*long*/ g_utf8_to_utf16(int /*long*/ str, int /*long*/
* @param value cast=(GValue *)
* @param type cast=(GType)
*/
-public static final native int /*long*/ g_value_init (int /*long*/ value, int /*long*/ type);
+public static final native long /*int*/ g_value_init (long /*int*/ value, long /*int*/ type);
/** @param value cast=(GValue *) */
-public static final native int g_value_get_int (int /*long*/ value);
+public static final native int g_value_get_int (long /*int*/ value);
/** @param value cast=(GValue *) */
-public static final native void g_value_set_int (int /*long*/ value, int v);
+public static final native void g_value_set_int (long /*int*/ value, int v);
/** @param value cast=(GValue *) */
-public static final native double g_value_get_double (int /*long*/ value);
+public static final native double g_value_get_double (long /*int*/ value);
/** @param value cast=(GValue *) */
-public static final native void g_value_set_double (int /*long*/ value, double v);
+public static final native void g_value_set_double (long /*int*/ value, double v);
/** @param value cast=(GValue *) */
-public static final native float g_value_get_float (int /*long*/ value);
+public static final native float g_value_get_float (long /*int*/ value);
/** @param value cast=(GValue *) */
-public static final native void g_value_set_float (int /*long*/ value, float v);
+public static final native void g_value_set_float (long /*int*/ value, float v);
/** @param value cast=(GValue *) */
-public static final native long g_value_get_int64 (int /*long*/ value);
+public static final native long g_value_get_int64 (long /*int*/ value);
/** @param value cast=(GValue *) */
-public static final native void g_value_set_int64 (int /*long*/ value, long v);
+public static final native void g_value_set_int64 (long /*int*/ value, long v);
/** @param value cast=(GValue *) */
-public static final native void g_value_unset (int /*long*/ value);
+public static final native void g_value_unset (long /*int*/ value);
/** @param value cast=(const GValue *) */
-public static final native int /*long*/ _g_value_peek_pointer (int /*long*/ value);
-public static final int /*long*/ g_value_peek_pointer (int /*long*/ value) {
+public static final native long /*int*/ _g_value_peek_pointer (long /*int*/ value);
+public static final long /*int*/ g_value_peek_pointer (long /*int*/ value) {
lock.lock();
try {
return _g_value_peek_pointer(value);
@@ -3401,8 +3401,8 @@ public static final int /*long*/ g_value_peek_pointer (int /*long*/ value) {
}
}
/** @param atom_name cast=(const gchar *),flags=no_out critical */
-public static final native int /*long*/ _gdk_atom_intern(byte[] atom_name, boolean only_if_exists);
-public static final int /*long*/ gdk_atom_intern(byte[] atom_name, boolean only_if_exists) {
+public static final native long /*int*/ _gdk_atom_intern(byte[] atom_name, boolean only_if_exists);
+public static final long /*int*/ gdk_atom_intern(byte[] atom_name, boolean only_if_exists) {
lock.lock();
try {
return _gdk_atom_intern(atom_name, only_if_exists);
@@ -3411,8 +3411,8 @@ public static final int /*long*/ gdk_atom_intern(byte[] atom_name, boolean only_
}
}
/** @param atom cast=(GdkAtom) */
-public static final native int /*long*/ _gdk_atom_name(int /*long*/ atom);
-public static final int /*long*/ gdk_atom_name(int /*long*/ atom) {
+public static final native long /*int*/ _gdk_atom_name(long /*int*/ atom);
+public static final long /*int*/ gdk_atom_name(long /*int*/ atom) {
lock.lock();
try {
return _gdk_atom_name(atom);
@@ -3435,8 +3435,8 @@ public static final void gdk_beep() {
* @param width cast=(gint)
* @param height cast=(gint)
*/
-public static final native int /*long*/ _gdk_bitmap_create_from_data(int /*long*/ window, byte[] data, int width, int height);
-public static final int /*long*/ gdk_bitmap_create_from_data(int /*long*/ window, byte[] data, int width, int height) {
+public static final native long /*int*/ _gdk_bitmap_create_from_data(long /*int*/ window, byte[] data, int width, int height);
+public static final long /*int*/ gdk_bitmap_create_from_data(long /*int*/ window, byte[] data, int width, int height) {
lock.lock();
try {
return _gdk_bitmap_create_from_data(window, data, width, height);
@@ -3445,8 +3445,8 @@ public static final int /*long*/ gdk_bitmap_create_from_data(int /*long*/ window
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gdk_cairo_create(int /*long*/ drawable);
-public static final int /*long*/ gdk_cairo_create(int /*long*/ drawable) {
+public static final native long /*int*/ _gdk_cairo_create(long /*int*/ drawable);
+public static final long /*int*/ gdk_cairo_create(long /*int*/ drawable) {
lock.lock();
try {
return _gdk_cairo_create(drawable);
@@ -3455,8 +3455,8 @@ public static final int /*long*/ gdk_cairo_create(int /*long*/ drawable) {
}
}
/** @method flags=dynamic */
-public static final native void _gdk_cairo_region(int /*long*/ cairo, int /*long*/ region);
-public static final void gdk_cairo_region(int /*long*/ cairo, int /*long*/ region) {
+public static final native void _gdk_cairo_region(long /*int*/ cairo, long /*int*/ region);
+public static final void gdk_cairo_region(long /*int*/ cairo, long /*int*/ region) {
lock.lock();
try {
_gdk_cairo_region(cairo, region);
@@ -3465,8 +3465,8 @@ public static final void gdk_cairo_region(int /*long*/ cairo, int /*long*/ regio
}
}
/** @method flags=dynamic */
-public static final native void _gdk_cairo_reset_clip(int /*long*/ cairo, int /*long*/ drawable);
-public static final void gdk_cairo_reset_clip(int /*long*/ cairo, int /*long*/ drawable) {
+public static final native void _gdk_cairo_reset_clip(long /*int*/ cairo, long /*int*/ drawable);
+public static final void gdk_cairo_reset_clip(long /*int*/ cairo, long /*int*/ drawable) {
lock.lock();
try {
_gdk_cairo_reset_clip(cairo, drawable);
@@ -3475,8 +3475,8 @@ public static final void gdk_cairo_reset_clip(int /*long*/ cairo, int /*long*/ d
}
}
/** @method flags=dynamic */
-public static final native void _gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor color);
-public static final void gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor color) {
+public static final native void _gdk_cairo_set_source_color(long /*int*/ cairo, GdkColor color);
+public static final void gdk_cairo_set_source_color(long /*int*/ cairo, GdkColor color) {
lock.lock();
try {
_gdk_cairo_set_source_color(cairo, color);
@@ -3488,8 +3488,8 @@ public static final void gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor
* @param window cast=(GdkWindow *)
* @method flags=dynamic
*/
-public static final native int _gdk_window_get_width(int /*long*/ window);
-public static final int gdk_window_get_width(int /*long*/ window) {
+public static final native int _gdk_window_get_width(long /*int*/ window);
+public static final int gdk_window_get_width(long /*int*/ window) {
lock.lock();
try {
return _gdk_window_get_width(window);
@@ -3501,8 +3501,8 @@ public static final int gdk_window_get_width(int /*long*/ window) {
* @param window cast=(GdkWindow *)
* @method flags=dynamic
*/
-public static final native int _gdk_window_get_height(int /*long*/ window);
-public static final int gdk_window_get_height(int /*long*/ window) {
+public static final native int _gdk_window_get_height(long /*int*/ window);
+public static final int gdk_window_get_height(long /*int*/ window) {
lock.lock();
try {
return _gdk_window_get_height(window);
@@ -3514,8 +3514,8 @@ public static final int gdk_window_get_height(int /*long*/ window) {
* @method flags=dynamic
* @param pixbuf cast=(const GdkPixbuf *)
*/
-public static final native void _gdk_cairo_set_source_pixbuf(int /*long*/ cairo, int /*long*/ pixbuf, double pixbuf_x, double pixbuf_y);
-public static final void gdk_cairo_set_source_pixbuf(int /*long*/ cairo, int /*long*/ pixbuf, double pixbuf_x, double pixbuf_y) {
+public static final native void _gdk_cairo_set_source_pixbuf(long /*int*/ cairo, long /*int*/ pixbuf, double pixbuf_x, double pixbuf_y);
+public static final void gdk_cairo_set_source_pixbuf(long /*int*/ cairo, long /*int*/ pixbuf, double pixbuf_x, double pixbuf_y) {
lock.lock();
try {
_gdk_cairo_set_source_pixbuf(cairo,pixbuf,pixbuf_x,pixbuf_y);
@@ -3528,8 +3528,8 @@ public static final void gdk_cairo_set_source_pixbuf(int /*long*/ cairo, int /*l
* @method flags=dynamic
* @param window cast=(GdkWindow *)
*/
-public static final native void _gdk_cairo_set_source_window(int /*long*/ cairo, int /*long*/ window, int x, int y);
-public static final void gdk_cairo_set_source_window(int /*long*/ cairo, int /*long*/ window, int x, int y) {
+public static final native void _gdk_cairo_set_source_window(long /*int*/ cairo, long /*int*/ window, int x, int y);
+public static final void gdk_cairo_set_source_window(long /*int*/ cairo, long /*int*/ window, int x, int y) {
lock.lock();
try {
_gdk_cairo_set_source_window(cairo, window, x, y);
@@ -3539,8 +3539,8 @@ public static final void gdk_cairo_set_source_window(int /*long*/ cairo, int /*l
}
}
/** @param color cast=(GdkColor *) */
-public static final native void _gdk_color_free(int /*long*/ color);
-public static final void gdk_color_free(int /*long*/ color) {
+public static final native void _gdk_color_free(long /*int*/ color);
+public static final void gdk_color_free(long /*int*/ color) {
lock.lock();
try {
_gdk_color_free(color);
@@ -3565,8 +3565,8 @@ public static final boolean gdk_color_parse(byte[] spec, GdkColor color) {
* @param colormap cast=(GdkColormap *)
* @param color cast=(GdkColor *),flags=no_in
*/
-public static final native boolean _gdk_color_white(int /*long*/ colormap, GdkColor color);
-public static final boolean gdk_color_white(int /*long*/ colormap, GdkColor color) {
+public static final native boolean _gdk_color_white(long /*int*/ colormap, GdkColor color);
+public static final boolean gdk_color_white(long /*int*/ colormap, GdkColor color) {
lock.lock();
try {
return _gdk_color_white(colormap, color);
@@ -3580,8 +3580,8 @@ public static final boolean gdk_color_white(int /*long*/ colormap, GdkColor colo
* @param writeable cast=(gboolean)
* @param best_match cast=(gboolean)
*/
-public static final native boolean _gdk_colormap_alloc_color(int /*long*/ colormap, GdkColor color, boolean writeable, boolean best_match);
-public static final boolean gdk_colormap_alloc_color(int /*long*/ colormap, GdkColor color, boolean writeable, boolean best_match) {
+public static final native boolean _gdk_colormap_alloc_color(long /*int*/ colormap, GdkColor color, boolean writeable, boolean best_match);
+public static final boolean gdk_colormap_alloc_color(long /*int*/ colormap, GdkColor color, boolean writeable, boolean best_match) {
lock.lock();
try {
return _gdk_colormap_alloc_color(colormap, color, writeable, best_match);
@@ -3594,8 +3594,8 @@ public static final boolean gdk_colormap_alloc_color(int /*long*/ colormap, GdkC
* @param colors cast=(GdkColor *),flags=no_out
* @param ncolors cast=(gint)
*/
-public static final native void _gdk_colormap_free_colors(int /*long*/ colormap, GdkColor colors, int ncolors);
-public static final void gdk_colormap_free_colors(int /*long*/ colormap, GdkColor colors, int ncolors) {
+public static final native void _gdk_colormap_free_colors(long /*int*/ colormap, GdkColor colors, int ncolors);
+public static final void gdk_colormap_free_colors(long /*int*/ colormap, GdkColor colors, int ncolors) {
lock.lock();
try {
_gdk_colormap_free_colors(colormap, colors, ncolors);
@@ -3603,8 +3603,8 @@ public static final void gdk_colormap_free_colors(int /*long*/ colormap, GdkColo
lock.unlock();
}
}
-public static final native int /*long*/ _gdk_colormap_get_system();
-public static final int /*long*/ gdk_colormap_get_system() {
+public static final native long /*int*/ _gdk_colormap_get_system();
+public static final long /*int*/ gdk_colormap_get_system() {
lock.lock();
try {
return _gdk_colormap_get_system();
@@ -3613,8 +3613,8 @@ public static final int /*long*/ gdk_colormap_get_system() {
}
}
/** @param cursor cast=(GdkCursor *) */
-public static final native void _gdk_cursor_unref(int /*long*/ cursor);
-public static final void gdk_cursor_unref(int /*long*/ cursor) {
+public static final native void _gdk_cursor_unref(long /*int*/ cursor);
+public static final void gdk_cursor_unref(long /*int*/ cursor) {
lock.lock();
try {
_gdk_cursor_unref(cursor);
@@ -3623,8 +3623,8 @@ public static final void gdk_cursor_unref(int /*long*/ cursor) {
}
}
/** @param cursor_type cast=(GdkCursorType) */
-public static final native int /*long*/ _gdk_cursor_new(int /*long*/ cursor_type);
-public static final int /*long*/ gdk_cursor_new(int /*long*/ cursor_type) {
+public static final native long /*int*/ _gdk_cursor_new(long /*int*/ cursor_type);
+public static final long /*int*/ gdk_cursor_new(long /*int*/ cursor_type) {
lock.lock();
try {
return _gdk_cursor_new(cursor_type);
@@ -3640,8 +3640,8 @@ public static final int /*long*/ gdk_cursor_new(int /*long*/ cursor_type) {
* @param x cast=(gint)
* @param y cast=(gint)
*/
-public static final native int /*long*/ _gdk_cursor_new_from_pixmap(int /*long*/ source, int /*long*/ mask, GdkColor fg, GdkColor bg, int x, int y);
-public static final int /*long*/ gdk_cursor_new_from_pixmap(int /*long*/ source, int /*long*/ mask, GdkColor fg, GdkColor bg, int x, int y) {
+public static final native long /*int*/ _gdk_cursor_new_from_pixmap(long /*int*/ source, long /*int*/ mask, GdkColor fg, GdkColor bg, int x, int y);
+public static final long /*int*/ gdk_cursor_new_from_pixmap(long /*int*/ source, long /*int*/ mask, GdkColor fg, GdkColor bg, int x, int y) {
lock.lock();
try {
return _gdk_cursor_new_from_pixmap(source, mask, fg, bg, x, y);
@@ -3650,8 +3650,8 @@ public static final int /*long*/ gdk_cursor_new_from_pixmap(int /*long*/ source,
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gdk_cursor_new_from_pixbuf(int /*long*/ display, int /*long*/ pixbuf, int x, int y);
-public static final int /*long*/ gdk_cursor_new_from_pixbuf(int /*long*/ display, int /*long*/ pixbuf, int x, int y) {
+public static final native long /*int*/ _gdk_cursor_new_from_pixbuf(long /*int*/ display, long /*int*/ pixbuf, int x, int y);
+public static final long /*int*/ gdk_cursor_new_from_pixbuf(long /*int*/ display, long /*int*/ pixbuf, int x, int y) {
lock.lock();
try {
return _gdk_cursor_new_from_pixbuf(display, pixbuf, x, y);
@@ -3660,8 +3660,8 @@ public static final int /*long*/ gdk_cursor_new_from_pixbuf(int /*long*/ display
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gdk_display_get_default();
-public static final int /*long*/ gdk_display_get_default() {
+public static final native long /*int*/ _gdk_display_get_default();
+public static final long /*int*/ gdk_display_get_default() {
lock.lock();
try {
return _gdk_display_get_default();
@@ -3673,8 +3673,8 @@ public static final int /*long*/ gdk_display_get_default() {
* @method flags=dynamic
* @param window cast=(GdkWindow *)
*/
-public static final native int /*long*/ _gdk_window_get_display(int /*long*/ window);
-public static final int /*long*/ gdk_window_get_display(int /*long*/ window) {
+public static final native long /*int*/ _gdk_window_get_display(long /*int*/ window);
+public static final long /*int*/ gdk_window_get_display(long /*int*/ window) {
lock.lock();
try {
return _gdk_window_get_display(window);
@@ -3686,8 +3686,8 @@ public static final int /*long*/ gdk_window_get_display(int /*long*/ window) {
* @method flags=dynamic
* @param display cast=(GdkDisplay *)
*/
-public static final native int /*long*/ _gdk_display_get_device_manager(int /*long*/ display);
-public static final int /*long*/ gdk_display_get_device_manager(int /*long*/ display) {
+public static final native long /*int*/ _gdk_display_get_device_manager(long /*int*/ display);
+public static final long /*int*/ gdk_display_get_device_manager(long /*int*/ display) {
lock.lock();
try {
return _gdk_display_get_device_manager(display);
@@ -3696,8 +3696,8 @@ public static final int /*long*/ gdk_display_get_device_manager(int /*long*/ dis
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gdk_device_manager_get_client_pointer(int /*long*/ device_manager);
-public static final int /*long*/ gdk_device_manager_get_client_pointer(int /*long*/ device_manager) {
+public static final native long /*int*/ _gdk_device_manager_get_client_pointer(long /*int*/ device_manager);
+public static final long /*int*/ gdk_device_manager_get_client_pointer(long /*int*/ device_manager) {
lock.lock();
try {
return _gdk_device_manager_get_client_pointer(device_manager);
@@ -3706,8 +3706,8 @@ public static final int /*long*/ gdk_device_manager_get_client_pointer(int /*lon
}
}
/** @method flags=dynamic */
-public static final native boolean _gdk_display_supports_cursor_color(int /*long*/ display);
-public static final boolean gdk_display_supports_cursor_color(int /*long*/ display) {
+public static final native boolean _gdk_display_supports_cursor_color(long /*int*/ display);
+public static final boolean gdk_display_supports_cursor_color(long /*int*/ display) {
lock.lock();
try {
return _gdk_display_supports_cursor_color(display);
@@ -3720,8 +3720,8 @@ public static final boolean gdk_display_supports_cursor_color(int /*long*/ displ
* @param action cast=(GdkDragAction)
* @param time cast=(guint32)
*/
-public static final native void _gdk_drag_status(int /*long*/ context, int action, int time);
-public static final void gdk_drag_status(int /*long*/ context, int action, int time) {
+public static final native void _gdk_drag_status(long /*int*/ context, int action, int time);
+public static final void gdk_drag_status(long /*int*/ context, int action, int time) {
lock.lock();
try {
_gdk_drag_status(context, action, time);
@@ -3739,8 +3739,8 @@ public static final void gdk_drag_status(int /*long*/ context, int action, int t
* @param angle1 cast=(gint)
* @param angle2 cast=(gint)
*/
-public static final native void _gdk_draw_arc(int /*long*/ drawable, int /*long*/ gc, int filled, int x, int y, int width, int height, int angle1, int angle2);
-public static final void gdk_draw_arc(int /*long*/ drawable, int /*long*/ gc, int filled, int x, int y, int width, int height, int angle1, int angle2) {
+public static final native void _gdk_draw_arc(long /*int*/ drawable, long /*int*/ gc, int filled, int x, int y, int width, int height, int angle1, int angle2);
+public static final void gdk_draw_arc(long /*int*/ drawable, long /*int*/ gc, int filled, int x, int y, int width, int height, int angle1, int angle2) {
lock.lock();
try {
_gdk_draw_arc(drawable, gc, filled, x, y, width, height, angle1, angle2);
@@ -3759,8 +3759,8 @@ public static final void gdk_draw_arc(int /*long*/ drawable, int /*long*/ gc, in
* @param width cast=(gint)
* @param height cast=(gint)
*/
-public static final native void _gdk_draw_drawable(int /*long*/ drawable, int /*long*/ gc, int /*long*/ src, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
-public static final void gdk_draw_drawable(int /*long*/ drawable, int /*long*/ gc, int /*long*/ src, int xsrc, int ysrc, int xdest, int ydest, int width, int height) {
+public static final native void _gdk_draw_drawable(long /*int*/ drawable, long /*int*/ gc, long /*int*/ src, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
+public static final void gdk_draw_drawable(long /*int*/ drawable, long /*int*/ gc, long /*int*/ src, int xsrc, int ysrc, int xdest, int ydest, int width, int height) {
lock.lock();
try {
_gdk_draw_drawable(drawable, gc, src, xsrc, ysrc, xdest, ydest, width, height);
@@ -3771,8 +3771,8 @@ public static final void gdk_draw_drawable(int /*long*/ drawable, int /*long*/ g
/**
* @method flags=dynamic
*/
-public static final native void _gdk_draw_image(int /*long*/ drawable, int /*long*/ gc, int /*long*/ image, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
-public static final void gdk_draw_image(int /*long*/ drawable, int /*long*/ gc, int /*long*/ image, int xsrc, int ysrc, int xdest, int ydest, int width, int height) {
+public static final native void _gdk_draw_image(long /*int*/ drawable, long /*int*/ gc, long /*int*/ image, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
+public static final void gdk_draw_image(long /*int*/ drawable, long /*int*/ gc, long /*int*/ image, int xsrc, int ysrc, int xdest, int ydest, int width, int height) {
lock.lock();
try {
_gdk_draw_image(drawable, gc, image, xsrc, ysrc, xdest, ydest, width, height);
@@ -3783,8 +3783,8 @@ public static final void gdk_draw_image(int /*long*/ drawable, int /*long*/ gc,
/**
@method flags=dynamic
*/
-public static final native void _gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc, int x, int y, int /*long*/ layout);
-public static final void gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc, int x, int y, int /*long*/ layout) {
+public static final native void _gdk_draw_layout(long /*int*/ drawable, long /*int*/ gc, int x, int y, long /*int*/ layout);
+public static final void gdk_draw_layout(long /*int*/ drawable, long /*int*/ gc, int x, int y, long /*int*/ layout) {
lock.lock();
try {
_gdk_draw_layout(drawable, gc, x, y, layout);
@@ -3800,8 +3800,8 @@ public static final void gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc,
* @param foreground flags=no_out
* @param background flags=no_out
*/
-public static final native void _gdk_draw_layout_with_colors(int /*long*/ drawable, int /*long*/ gc, int x, int y, int /*long*/ layout, GdkColor foreground, GdkColor background);
-public static final void gdk_draw_layout_with_colors(int /*long*/ drawable, int /*long*/ gc, int x, int y, int /*long*/ layout, GdkColor foreground, GdkColor background) {
+public static final native void _gdk_draw_layout_with_colors(long /*int*/ drawable, long /*int*/ gc, int x, int y, long /*int*/ layout, GdkColor foreground, GdkColor background);
+public static final void gdk_draw_layout_with_colors(long /*int*/ drawable, long /*int*/ gc, int x, int y, long /*int*/ layout, GdkColor foreground, GdkColor background) {
lock.lock();
try {
_gdk_draw_layout_with_colors(drawable, gc, x, y, layout, foreground, background);
@@ -3816,8 +3816,8 @@ public static final void gdk_draw_layout_with_colors(int /*long*/ drawable, int
* @param x2 cast=(gint)
* @param y2 cast=(gint)
*/
-public static final native void _gdk_draw_line(int /*long*/ drawable, int /*long*/ gc, int x1, int y1, int x2, int y2);
-public static final void gdk_draw_line(int /*long*/ drawable, int /*long*/ gc, int x1, int y1, int x2, int y2) {
+public static final native void _gdk_draw_line(long /*int*/ drawable, long /*int*/ gc, int x1, int y1, int x2, int y2);
+public static final void gdk_draw_line(long /*int*/ drawable, long /*int*/ gc, int x1, int y1, int x2, int y2) {
lock.lock();
try {
_gdk_draw_line(drawable, gc, x1, y1, x2, y2);
@@ -3830,8 +3830,8 @@ public static final void gdk_draw_line(int /*long*/ drawable, int /*long*/ gc, i
* @param points cast=(GdkPoint *),flags=no_out critical
* @param npoints cast=(gint)
*/
-public static final native void _gdk_draw_lines(int /*long*/ drawable, int /*long*/ gc, int[] points, int npoints);
-public static final void gdk_draw_lines(int /*long*/ drawable, int /*long*/ gc, int[] points, int npoints) {
+public static final native void _gdk_draw_lines(long /*int*/ drawable, long /*int*/ gc, int[] points, int npoints);
+public static final void gdk_draw_lines(long /*int*/ drawable, long /*int*/ gc, int[] points, int npoints) {
lock.lock();
try {
_gdk_draw_lines(drawable, gc, points, npoints);
@@ -3854,8 +3854,8 @@ public static final void gdk_draw_lines(int /*long*/ drawable, int /*long*/ gc,
* @param x_dither cast=(gint)
* @param y_dither cast=(gint)
*/
-public static final native void _gdk_draw_pixbuf(int /*long*/ drawable, int /*long*/ gc, int /*long*/ pixbuf, int xsrc, int ysrc, int xdest, int ydest, int width, int height, int dither, int x_dither, int y_dither);
-public static final void gdk_draw_pixbuf(int /*long*/ drawable, int /*long*/ gc, int /*long*/ pixbuf, int xsrc, int ysrc, int xdest, int ydest, int width, int height, int dither, int x_dither, int y_dither) {
+public static final native void _gdk_draw_pixbuf(long /*int*/ drawable, long /*int*/ gc, long /*int*/ pixbuf, int xsrc, int ysrc, int xdest, int ydest, int width, int height, int dither, int x_dither, int y_dither);
+public static final void gdk_draw_pixbuf(long /*int*/ drawable, long /*int*/ gc, long /*int*/ pixbuf, int xsrc, int ysrc, int xdest, int ydest, int width, int height, int dither, int x_dither, int y_dither) {
lock.lock();
try {
_gdk_draw_pixbuf(drawable, gc, pixbuf, xsrc, ysrc, xdest, ydest, width, height, dither, x_dither, y_dither);
@@ -3866,8 +3866,8 @@ public static final void gdk_draw_pixbuf(int /*long*/ drawable, int /*long*/ gc,
/**
* @method flags=dynamic
*/
-public static final native void _gdk_draw_point(int /*long*/ drawable, int /*long*/ gc, int x, int y);
-public static final void gdk_draw_point(int /*long*/ drawable, int /*long*/ gc, int x, int y) {
+public static final native void _gdk_draw_point(long /*int*/ drawable, long /*int*/ gc, int x, int y);
+public static final void gdk_draw_point(long /*int*/ drawable, long /*int*/ gc, int x, int y) {
lock.lock();
try {
_gdk_draw_point(drawable, gc, x, y);
@@ -3879,8 +3879,8 @@ public static final void gdk_draw_point(int /*long*/ drawable, int /*long*/ gc,
* @method flags=dynamic
* @param points flags=no_out critical
*/
-public static final native void _gdk_draw_polygon(int /*long*/ drawable, int /*long*/ gc, int filled, int[] points, int npoints);
-public static final void gdk_draw_polygon(int /*long*/ drawable, int /*long*/ gc, int filled, int[] points, int npoints) {
+public static final native void _gdk_draw_polygon(long /*int*/ drawable, long /*int*/ gc, int filled, int[] points, int npoints);
+public static final void gdk_draw_polygon(long /*int*/ drawable, long /*int*/ gc, int filled, int[] points, int npoints) {
lock.lock();
try {
_gdk_draw_polygon(drawable, gc, filled, points, npoints);
@@ -3897,8 +3897,8 @@ public static final void gdk_draw_polygon(int /*long*/ drawable, int /*long*/ gc
* @param width cast=(gint)
* @param height cast=(gint)
*/
-public static final native void _gdk_draw_rectangle(int /*long*/ drawable, int /*long*/ gc, int filled, int x, int y, int width, int height);
-public static final void gdk_draw_rectangle(int /*long*/ drawable, int /*long*/ gc, int filled, int x, int y, int width, int height) {
+public static final native void _gdk_draw_rectangle(long /*int*/ drawable, long /*int*/ gc, int filled, int x, int y, int width, int height);
+public static final void gdk_draw_rectangle(long /*int*/ drawable, long /*int*/ gc, int filled, int x, int y, int width, int height) {
lock.lock();
try {
_gdk_draw_rectangle(drawable, gc, filled, x, y, width, height);
@@ -3907,8 +3907,8 @@ public static final void gdk_draw_rectangle(int /*long*/ drawable, int /*long*/
}
}
/** @param drawable cast=(GdkDrawable *) */
-public static final native int _gdk_drawable_get_depth(int /*long*/ drawable);
-public static final int gdk_drawable_get_depth(int /*long*/ drawable) {
+public static final native int _gdk_drawable_get_depth(long /*int*/ drawable);
+public static final int gdk_drawable_get_depth(long /*int*/ drawable) {
lock.lock();
try {
return _gdk_drawable_get_depth(drawable);
@@ -3922,8 +3922,8 @@ public static final int gdk_drawable_get_depth(int /*long*/ drawable) {
* @param height cast=(gint *),flags=no_in critical
* @method flags=dynamic
*/
-public static final native void _gdk_pixmap_get_size(int /*long*/ pixmap, int[] width, int[] height);
-public static final void gdk_pixmap_get_size(int /*long*/ pixmap, int[] width, int[] height) {
+public static final native void _gdk_pixmap_get_size(long /*int*/ pixmap, int[] width, int[] height);
+public static final void gdk_pixmap_get_size(long /*int*/ pixmap, int[] width, int[] height) {
lock.lock();
try {
_gdk_pixmap_get_size (pixmap,width,height);
@@ -3938,8 +3938,8 @@ public static final void gdk_pixmap_get_size(int /*long*/ pixmap, int[] width, i
* @param width cast=(gint)
* @param height cast=(gint)
*/
-public static final native int /*long*/ _gdk_drawable_get_image(int /*long*/ drawable, int x, int y, int width, int height);
-public static final int /*long*/ gdk_drawable_get_image(int /*long*/ drawable, int x, int y, int width, int height) {
+public static final native long /*int*/ _gdk_drawable_get_image(long /*int*/ drawable, int x, int y, int width, int height);
+public static final long /*int*/ gdk_drawable_get_image(long /*int*/ drawable, int x, int y, int width, int height) {
lock.lock();
try {
return _gdk_drawable_get_image(drawable, x, y, width, height);
@@ -3952,8 +3952,8 @@ public static final int /*long*/ gdk_drawable_get_image(int /*long*/ drawable, i
* @param width cast=(gint *),flags=no_in critical
* @param height cast=(gint *),flags=no_in critical
*/
-public static final native void _gdk_drawable_get_size(int /*long*/ drawable, int[] width, int[] height);
-public static final void gdk_drawable_get_size(int /*long*/ drawable, int[] width, int[] height) {
+public static final native void _gdk_drawable_get_size(long /*int*/ drawable, int[] width, int[] height);
+public static final void gdk_drawable_get_size(long /*int*/ drawable, int[] width, int[] height) {
lock.lock();
try {
_gdk_drawable_get_size(drawable, width, height);
@@ -3962,8 +3962,8 @@ public static final void gdk_drawable_get_size(int /*long*/ drawable, int[] widt
}
}
/** @param drawable cast=(GdkDrawable *) */
-public static final native int /*long*/ _gdk_drawable_get_visible_region(int /*long*/ drawable);
-public static final int /*long*/ gdk_drawable_get_visible_region(int /*long*/ drawable) {
+public static final native long /*int*/ _gdk_drawable_get_visible_region(long /*int*/ drawable);
+public static final long /*int*/ gdk_drawable_get_visible_region(long /*int*/ drawable) {
lock.lock();
try {
return _gdk_drawable_get_visible_region(drawable);
@@ -3972,8 +3972,8 @@ public static final int /*long*/ gdk_drawable_get_visible_region(int /*long*/ dr
}
}
/** @param event cast=(GdkEvent *) */
-public static final native int /*long*/ _gdk_event_copy(int /*long*/ event);
-public static final int /*long*/ gdk_event_copy(int /*long*/ event) {
+public static final native long /*int*/ _gdk_event_copy(long /*int*/ event);
+public static final long /*int*/ gdk_event_copy(long /*int*/ event) {
lock.lock();
try {
return _gdk_event_copy(event);
@@ -3982,8 +3982,8 @@ public static final int /*long*/ gdk_event_copy(int /*long*/ event) {
}
}
/** @param event cast=(GdkEvent *) */
-public static final native void _gdk_event_free(int /*long*/ event);
-public static final void gdk_event_free(int /*long*/ event) {
+public static final native void _gdk_event_free(long /*int*/ event);
+public static final void gdk_event_free(long /*int*/ event) {
lock.lock();
try {
_gdk_event_free(event);
@@ -3991,8 +3991,8 @@ public static final void gdk_event_free(int /*long*/ event) {
lock.unlock();
}
}
-public static final native int /*long*/ _gdk_event_get();
-public static final int /*long*/ gdk_event_get() {
+public static final native long /*int*/ _gdk_event_get();
+public static final long /*int*/ gdk_event_get() {
lock.lock();
try {
return _gdk_event_get();
@@ -4005,8 +4005,8 @@ public static final int /*long*/ gdk_event_get() {
* @param px cast=(gdouble *)
* @param py cast=(gdouble *)
*/
-public static final native boolean _gdk_event_get_coords(int /*long*/ event, double[] px, double[] py);
-public static final boolean gdk_event_get_coords(int /*long*/ event, double[] px, double[] py) {
+public static final native boolean _gdk_event_get_coords(long /*int*/ event, double[] px, double[] py);
+public static final boolean gdk_event_get_coords(long /*int*/ event, double[] px, double[] py) {
lock.lock();
try {
return _gdk_event_get_coords(event, px, py);
@@ -4018,8 +4018,8 @@ public static final boolean gdk_event_get_coords(int /*long*/ event, double[] px
* @param event cast=(GdkEvent *)
* @param pmod cast=(GdkModifierType *)
*/
-public static final native boolean _gdk_event_get_state(int /*long*/ event, int[] pmod);
-public static final boolean gdk_event_get_state(int /*long*/ event, int[] pmod) {
+public static final native boolean _gdk_event_get_state(long /*int*/ event, int[] pmod);
+public static final boolean gdk_event_get_state(long /*int*/ event, int[] pmod) {
lock.lock();
try {
return _gdk_event_get_state(event, pmod);
@@ -4028,8 +4028,8 @@ public static final boolean gdk_event_get_state(int /*long*/ event, int[] pmod)
}
}
/** @param event cast=(GdkEvent *) */
-public static final native int _gdk_event_get_time(int /*long*/ event);
-public static final int gdk_event_get_time(int /*long*/ event) {
+public static final native int _gdk_event_get_time(long /*int*/ event);
+public static final int gdk_event_get_time(long /*int*/ event) {
lock.lock();
try {
return _gdk_event_get_time(event);
@@ -4042,8 +4042,8 @@ public static final int gdk_event_get_time(int /*long*/ event) {
* @param data cast=(gpointer)
* @param notify cast=(GDestroyNotify)
*/
-public static final native void _gdk_event_handler_set(int /*long*/ func, int /*long*/ data, int /*long*/ notify);
-public static final void gdk_event_handler_set(int /*long*/ func, int /*long*/ data, int /*long*/ notify) {
+public static final native void _gdk_event_handler_set(long /*int*/ func, long /*int*/ data, long /*int*/ notify);
+public static final void gdk_event_handler_set(long /*int*/ func, long /*int*/ data, long /*int*/ notify) {
lock.lock();
try {
_gdk_event_handler_set(func, data, notify);
@@ -4051,8 +4051,8 @@ public static final void gdk_event_handler_set(int /*long*/ func, int /*long*/ d
lock.unlock();
}
}
-public static final native int /*long*/ _gdk_event_new(int type);
-public static final int /*long*/ gdk_event_new(int type) {
+public static final native long /*int*/ _gdk_event_new(int type);
+public static final long /*int*/ gdk_event_new(int type) {
lock.lock();
try {
return _gdk_event_new(type);
@@ -4060,8 +4060,8 @@ public static final int /*long*/ gdk_event_new(int type) {
lock.unlock();
}
}
-public static final native int /*long*/ _gdk_event_peek();
-public static final int /*long*/ gdk_event_peek() {
+public static final native long /*int*/ _gdk_event_peek();
+public static final long /*int*/ gdk_event_peek() {
lock.lock();
try {
return _gdk_event_peek();
@@ -4070,8 +4070,8 @@ public static final int /*long*/ gdk_event_peek() {
}
}
/** @param event cast=(GdkEvent *) */
-public static final native void _gdk_event_put(int /*long*/ event);
-public static final void gdk_event_put(int /*long*/ event) {
+public static final native void _gdk_event_put(long /*int*/ event);
+public static final void gdk_event_put(long /*int*/ event) {
lock.lock();
try {
_gdk_event_put(event);
@@ -4110,8 +4110,8 @@ public static final void gdk_flush() {
* @method flags=dynamic
* @param values flags=no_in
*/
-public static final native void _gdk_gc_get_values(int /*long*/ gc, GdkGCValues values);
-public static final void gdk_gc_get_values(int /*long*/ gc, GdkGCValues values) {
+public static final native void _gdk_gc_get_values(long /*int*/ gc, GdkGCValues values);
+public static final void gdk_gc_get_values(long /*int*/ gc, GdkGCValues values) {
lock.lock();
try {
_gdk_gc_get_values(gc, values);
@@ -4120,8 +4120,8 @@ public static final void gdk_gc_get_values(int /*long*/ gc, GdkGCValues values)
}
}
/** @param window cast=(GdkDrawable *) */
-public static final native int /*long*/ _gdk_gc_new(int /*long*/ window);
-public static final int /*long*/ gdk_gc_new(int /*long*/ window) {
+public static final native long /*int*/ _gdk_gc_new(long /*int*/ window);
+public static final long /*int*/ gdk_gc_new(long /*int*/ window) {
lock.lock();
try {
return _gdk_gc_new(window);
@@ -4133,8 +4133,8 @@ public static final int /*long*/ gdk_gc_new(int /*long*/ window) {
* @method flags=dynamic
* @param color cast=(GdkColor *),flags=no_out
*/
-public static final native void _gdk_gc_set_background(int /*long*/ gc, GdkColor color);
-public static final void gdk_gc_set_background(int /*long*/ gc, GdkColor color) {
+public static final native void _gdk_gc_set_background(long /*int*/ gc, GdkColor color);
+public static final void gdk_gc_set_background(long /*int*/ gc, GdkColor color) {
lock.lock();
try {
_gdk_gc_set_background(gc, color);
@@ -4145,8 +4145,8 @@ public static final void gdk_gc_set_background(int /*long*/ gc, GdkColor color)
/**
* @method flags=dynamic
*/
-public static final native void _gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask);
-public static final void gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask) {
+public static final native void _gdk_gc_set_clip_mask(long /*int*/ gc, long /*int*/ mask);
+public static final void gdk_gc_set_clip_mask(long /*int*/ gc, long /*int*/ mask) {
lock.lock();
try {
_gdk_gc_set_clip_mask(gc, mask);
@@ -4159,8 +4159,8 @@ public static final void gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask
* @param x cast=(gint)
* @param y cast=(gint)
*/
-public static final native void _gdk_gc_set_clip_origin(int /*long*/ gc, int x, int y);
-public static final void gdk_gc_set_clip_origin(int /*long*/ gc, int x, int y) {
+public static final native void _gdk_gc_set_clip_origin(long /*int*/ gc, int x, int y);
+public static final void gdk_gc_set_clip_origin(long /*int*/ gc, int x, int y) {
lock.lock();
try {
_gdk_gc_set_clip_origin(gc, x, y);
@@ -4172,8 +4172,8 @@ public static final void gdk_gc_set_clip_origin(int /*long*/ gc, int x, int y) {
* @param gc cast=(GdkGC *)
* @param region cast=(GdkRegion *)
*/
-public static final native void _gdk_gc_set_clip_region(int /*long*/ gc, int /*long*/ region);
-public static final void gdk_gc_set_clip_region(int /*long*/ gc, int /*long*/ region) {
+public static final native void _gdk_gc_set_clip_region(long /*int*/ gc, long /*int*/ region);
+public static final void gdk_gc_set_clip_region(long /*int*/ gc, long /*int*/ region) {
lock.lock();
try {
_gdk_gc_set_clip_region(gc, region);
@@ -4187,8 +4187,8 @@ public static final void gdk_gc_set_clip_region(int /*long*/ gc, int /*long*/ re
* @param dash_list cast=(gint8 *),flags=no_out critical
* @param n cast=(gint)
*/
-public static final native void _gdk_gc_set_dashes(int /*long*/ gc, int dash_offset, byte[] dash_list, int n);
-public static final void gdk_gc_set_dashes(int /*long*/ gc, int dash_offset, byte[] dash_list, int n) {
+public static final native void _gdk_gc_set_dashes(long /*int*/ gc, int dash_offset, byte[] dash_list, int n);
+public static final void gdk_gc_set_dashes(long /*int*/ gc, int dash_offset, byte[] dash_list, int n) {
lock.lock();
try {
_gdk_gc_set_dashes(gc, dash_offset, dash_list, n);
@@ -4199,8 +4199,8 @@ public static final void gdk_gc_set_dashes(int /*long*/ gc, int dash_offset, byt
/**
* @method flags=dynamic
*/
-public static final native void _gdk_gc_set_exposures(int /*long*/ gc, boolean exposures);
-public static final void gdk_gc_set_exposures(int /*long*/ gc, boolean exposures) {
+public static final native void _gdk_gc_set_exposures(long /*int*/ gc, boolean exposures);
+public static final void gdk_gc_set_exposures(long /*int*/ gc, boolean exposures) {
lock.lock();
try {
_gdk_gc_set_exposures(gc, exposures);
@@ -4212,8 +4212,8 @@ public static final void gdk_gc_set_exposures(int /*long*/ gc, boolean exposures
* @param gc cast=(GdkGC *)
* @param fill cast=(GdkFill)
*/
-public static final native void _gdk_gc_set_fill(int /*long*/ gc, int fill);
-public static final void gdk_gc_set_fill(int /*long*/ gc, int fill) {
+public static final native void _gdk_gc_set_fill(long /*int*/ gc, int fill);
+public static final void gdk_gc_set_fill(long /*int*/ gc, int fill) {
lock.lock();
try {
_gdk_gc_set_fill(gc, fill);
@@ -4225,8 +4225,8 @@ public static final void gdk_gc_set_fill(int /*long*/ gc, int fill) {
* @param gc cast=(GdkGC *)
* @param color cast=(GdkColor *),flags=no_out
*/
-public static final native void _gdk_gc_set_foreground(int /*long*/ gc, GdkColor color);
-public static final void gdk_gc_set_foreground(int /*long*/ gc, GdkColor color) {
+public static final native void _gdk_gc_set_foreground(long /*int*/ gc, GdkColor color);
+public static final void gdk_gc_set_foreground(long /*int*/ gc, GdkColor color) {
lock.lock();
try {
_gdk_gc_set_foreground(gc, color);
@@ -4238,8 +4238,8 @@ public static final void gdk_gc_set_foreground(int /*long*/ gc, GdkColor color)
* @param gc cast=(GdkGC *)
* @param function cast=(GdkFunction)
*/
-public static final native void _gdk_gc_set_function(int /*long*/ gc, int /*long*/ function);
-public static final void gdk_gc_set_function(int /*long*/ gc, int /*long*/ function) {
+public static final native void _gdk_gc_set_function(long /*int*/ gc, long /*int*/ function);
+public static final void gdk_gc_set_function(long /*int*/ gc, long /*int*/ function) {
lock.lock();
try {
_gdk_gc_set_function(gc, function);
@@ -4250,8 +4250,8 @@ public static final void gdk_gc_set_function(int /*long*/ gc, int /*long*/ funct
/**
* @method flags=dynamic
*/
-public static final native void _gdk_gc_set_line_attributes(int /*long*/ gc, int line_width, int line_style, int cap_style, int join_style);
-public static final void gdk_gc_set_line_attributes(int /*long*/ gc, int line_width, int line_style, int cap_style, int join_style) {
+public static final native void _gdk_gc_set_line_attributes(long /*int*/ gc, int line_width, int line_style, int cap_style, int join_style);
+public static final void gdk_gc_set_line_attributes(long /*int*/ gc, int line_width, int line_style, int cap_style, int join_style) {
lock.lock();
try {
_gdk_gc_set_line_attributes(gc, line_width, line_style, cap_style, join_style);
@@ -4263,8 +4263,8 @@ public static final void gdk_gc_set_line_attributes(int /*long*/ gc, int line_wi
* @param gc cast=(GdkGC *)
* @param stipple cast=(GdkPixmap *)
*/
-public static final native void _gdk_gc_set_stipple(int /*long*/ gc, int /*long*/ stipple);
-public static final void gdk_gc_set_stipple(int /*long*/ gc, int /*long*/ stipple) {
+public static final native void _gdk_gc_set_stipple(long /*int*/ gc, long /*int*/ stipple);
+public static final void gdk_gc_set_stipple(long /*int*/ gc, long /*int*/ stipple) {
lock.lock();
try {
_gdk_gc_set_stipple(gc, stipple);
@@ -4276,8 +4276,8 @@ public static final void gdk_gc_set_stipple(int /*long*/ gc, int /*long*/ stippl
* @param gc cast=(GdkGC *)
* @param mode cast=(GdkSubwindowMode)
*/
-public static final native void _gdk_gc_set_subwindow(int /*long*/ gc, int /*long*/ mode);
-public static final void gdk_gc_set_subwindow(int /*long*/ gc, int /*long*/ mode) {
+public static final native void _gdk_gc_set_subwindow(long /*int*/ gc, long /*int*/ mode);
+public static final void gdk_gc_set_subwindow(long /*int*/ gc, long /*int*/ mode) {
lock.lock();
try {
_gdk_gc_set_subwindow(gc, mode);
@@ -4288,8 +4288,8 @@ public static final void gdk_gc_set_subwindow(int /*long*/ gc, int /*long*/ mode
/**
* @method flags=dynamic
*/
-public static final native void _gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile);
-public static final void gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile) {
+public static final native void _gdk_gc_set_tile(long /*int*/ gc, long /*int*/ tile);
+public static final void gdk_gc_set_tile(long /*int*/ gc, long /*int*/ tile) {
lock.lock();
try {
_gdk_gc_set_tile(gc, tile);
@@ -4300,8 +4300,8 @@ public static final void gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile) {
/**
* @method flags=dynamic
*/
-public static final native void _gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y);
-public static final void gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y) {
+public static final native void _gdk_gc_set_ts_origin(long /*int*/ gc, int x, int y);
+public static final void gdk_gc_set_ts_origin(long /*int*/ gc, int x, int y) {
lock.lock();
try {
_gdk_gc_set_ts_origin(gc, x, y);
@@ -4313,8 +4313,8 @@ public static final void gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y) {
* @method flags=dynamic
* @param values cast=(GdkGCValues *),flags=no_out
*/
-public static final native void _gdk_gc_set_values(int /*long*/ gc, GdkGCValues values, int values_mask);
-public static final void gdk_gc_set_values(int /*long*/ gc, GdkGCValues values, int values_mask) {
+public static final native void _gdk_gc_set_values(long /*int*/ gc, GdkGCValues values, int values_mask);
+public static final void gdk_gc_set_values(long /*int*/ gc, GdkGCValues values, int values_mask) {
lock.lock();
try {
_gdk_gc_set_values(gc, values, values_mask);
@@ -4322,8 +4322,8 @@ public static final void gdk_gc_set_values(int /*long*/ gc, GdkGCValues values,
lock.unlock();
}
}
-public static final native int /*long*/ _gdk_get_default_root_window();
-public static final int /*long*/ gdk_get_default_root_window() {
+public static final native long /*int*/ _gdk_get_default_root_window();
+public static final long /*int*/ gdk_get_default_root_window() {
lock.lock();
try {
return _gdk_get_default_root_window();
@@ -4340,8 +4340,8 @@ public static final void gdk_keyboard_ungrab(int time) {
lock.unlock();
}
}
-public static final native int /*long*/ _gdk_keymap_get_default();
-public static final int /*long*/ gdk_keymap_get_default() {
+public static final native long /*int*/ _gdk_keymap_get_default();
+public static final long /*int*/ gdk_keymap_get_default() {
lock.lock();
try {
return _gdk_keymap_get_default();
@@ -4357,8 +4357,8 @@ public static final int /*long*/ gdk_keymap_get_default() {
* @param level cast=(gint*)
* @param consumed_modifiers cast=(GdkModifierType *)
*/
-public static final native boolean _gdk_keymap_translate_keyboard_state (int /*long*/ keymap, int hardware_keycode, int state, int group, int[] keyval, int[] effective_group, int[] level, int[] consumed_modifiers);
-public static final boolean gdk_keymap_translate_keyboard_state (int /*long*/ keymap, int hardware_keycode, int state, int group, int[] keyval, int[] effective_group, int[] level, int[] consumed_modifiers) {
+public static final native boolean _gdk_keymap_translate_keyboard_state (long /*int*/ keymap, int hardware_keycode, int state, int group, int[] keyval, int[] effective_group, int[] level, int[] consumed_modifiers);
+public static final boolean gdk_keymap_translate_keyboard_state (long /*int*/ keymap, int hardware_keycode, int state, int group, int[] keyval, int[] effective_group, int[] level, int[] consumed_modifiers) {
lock.lock();
try {
return _gdk_keymap_translate_keyboard_state(keymap, hardware_keycode, state, group, keyval, effective_group, level, consumed_modifiers);
@@ -4384,8 +4384,8 @@ public static final int gdk_keyval_to_unicode(int keyval) {
lock.unlock();
}
}
-public static final native int /*long*/ _gdk_pango_context_get();
-public static final int /*long*/ gdk_pango_context_get() {
+public static final native long /*int*/ _gdk_pango_context_get();
+public static final long /*int*/ gdk_pango_context_get() {
lock.lock();
try {
return _gdk_pango_context_get();
@@ -4397,8 +4397,8 @@ public static final int /*long*/ gdk_pango_context_get() {
* @method flags=dynamic
* @param context cast=(PangoContext *)
*/
-public static final native void _gdk_pango_context_set_colormap(int /*long*/ context, int /*long*/ colormap);
-public static final void gdk_pango_context_set_colormap(int /*long*/ context, int /*long*/ colormap) {
+public static final native void _gdk_pango_context_set_colormap(long /*int*/ context, long /*int*/ colormap);
+public static final void gdk_pango_context_set_colormap(long /*int*/ context, long /*int*/ colormap) {
lock.lock();
try {
_gdk_pango_context_set_colormap(context, colormap);
@@ -4407,8 +4407,8 @@ public static final void gdk_pango_context_set_colormap(int /*long*/ context, in
}
}
/** @param layout cast=(PangoLayout *) */
-public static final native int /*long*/ _gdk_pango_layout_get_clip_region(int /*long*/ layout, int x_origin, int y_origin, int[] index_ranges, int n_ranges);
-public static final int /*long*/ gdk_pango_layout_get_clip_region(int /*long*/ layout, int x_origin, int y_origin, int[] index_ranges, int n_ranges) {
+public static final native long /*int*/ _gdk_pango_layout_get_clip_region(long /*int*/ layout, int x_origin, int y_origin, int[] index_ranges, int n_ranges);
+public static final long /*int*/ gdk_pango_layout_get_clip_region(long /*int*/ layout, int x_origin, int y_origin, int[] index_ranges, int n_ranges) {
lock.lock();
try {
return _gdk_pango_layout_get_clip_region(layout, x_origin, y_origin, index_ranges, n_ranges);
@@ -4420,8 +4420,8 @@ public static final int /*long*/ gdk_pango_layout_get_clip_region(int /*long*/ l
* @param src_pixbuf cast=(GdkPixbuf *)
* @param dest_pixbuf cast=(GdkPixbuf *)
*/
-public static final native void _gdk_pixbuf_copy_area(int /*long*/ src_pixbuf, int src_x, int src_y, int width, int height, int /*long*/ dest_pixbuf, int dest_x, int dest_y);
-public static final void gdk_pixbuf_copy_area(int /*long*/ src_pixbuf, int src_x, int src_y, int width, int height, int /*long*/ dest_pixbuf, int dest_x, int dest_y) {
+public static final native void _gdk_pixbuf_copy_area(long /*int*/ src_pixbuf, int src_x, int src_y, int width, int height, long /*int*/ dest_pixbuf, int dest_x, int dest_y);
+public static final void gdk_pixbuf_copy_area(long /*int*/ src_pixbuf, int src_x, int src_y, int width, int height, long /*int*/ dest_pixbuf, int dest_x, int dest_y) {
lock.lock();
try {
_gdk_pixbuf_copy_area(src_pixbuf, src_x, src_y, width, height, dest_pixbuf, dest_x, dest_y);
@@ -4434,8 +4434,8 @@ public static final void gdk_pixbuf_copy_area(int /*long*/ src_pixbuf, int src_x
* @param src cast=(GdkDrawable *)
* @param cmap cast=(GdkColormap *)
*/
-public static final native int /*long*/ _gdk_pixbuf_get_from_drawable(int /*long*/ dest, int /*long*/ src, int /*long*/ cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
-public static final int /*long*/ gdk_pixbuf_get_from_drawable(int /*long*/ dest, int /*long*/ src, int /*long*/ cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height) {
+public static final native long /*int*/ _gdk_pixbuf_get_from_drawable(long /*int*/ dest, long /*int*/ src, long /*int*/ cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
+public static final long /*int*/ gdk_pixbuf_get_from_drawable(long /*int*/ dest, long /*int*/ src, long /*int*/ cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height) {
lock.lock();
try {
return _gdk_pixbuf_get_from_drawable(dest, src, cmap, src_x, src_y, dest_x, dest_y, width, height);
@@ -4444,8 +4444,8 @@ public static final int /*long*/ gdk_pixbuf_get_from_drawable(int /*long*/ dest,
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
-public static final native boolean _gdk_pixbuf_get_has_alpha(int /*long*/ pixbuf);
-public static final boolean gdk_pixbuf_get_has_alpha(int /*long*/ pixbuf) {
+public static final native boolean _gdk_pixbuf_get_has_alpha(long /*int*/ pixbuf);
+public static final boolean gdk_pixbuf_get_has_alpha(long /*int*/ pixbuf) {
lock.lock();
try {
return _gdk_pixbuf_get_has_alpha(pixbuf);
@@ -4454,8 +4454,8 @@ public static final boolean gdk_pixbuf_get_has_alpha(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
-public static final native int _gdk_pixbuf_get_height(int /*long*/ pixbuf);
-public static final int gdk_pixbuf_get_height(int /*long*/ pixbuf) {
+public static final native int _gdk_pixbuf_get_height(long /*int*/ pixbuf);
+public static final int gdk_pixbuf_get_height(long /*int*/ pixbuf) {
lock.lock();
try {
return _gdk_pixbuf_get_height(pixbuf);
@@ -4464,8 +4464,8 @@ public static final int gdk_pixbuf_get_height(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
-public static final native int /*long*/ _gdk_pixbuf_get_pixels(int /*long*/ pixbuf);
-public static final int /*long*/ gdk_pixbuf_get_pixels(int /*long*/ pixbuf) {
+public static final native long /*int*/ _gdk_pixbuf_get_pixels(long /*int*/ pixbuf);
+public static final long /*int*/ gdk_pixbuf_get_pixels(long /*int*/ pixbuf) {
lock.lock();
try {
return _gdk_pixbuf_get_pixels(pixbuf);
@@ -4474,8 +4474,8 @@ public static final int /*long*/ gdk_pixbuf_get_pixels(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
-public static final native int _gdk_pixbuf_get_rowstride(int /*long*/ pixbuf);
-public static final int gdk_pixbuf_get_rowstride(int /*long*/ pixbuf) {
+public static final native int _gdk_pixbuf_get_rowstride(long /*int*/ pixbuf);
+public static final int gdk_pixbuf_get_rowstride(long /*int*/ pixbuf) {
lock.lock();
try {
return _gdk_pixbuf_get_rowstride(pixbuf);
@@ -4484,8 +4484,8 @@ public static final int gdk_pixbuf_get_rowstride(int /*long*/ pixbuf) {
}
}
/** @param pixbuf cast=(const GdkPixbuf *) */
-public static final native int _gdk_pixbuf_get_width(int /*long*/ pixbuf);
-public static final int gdk_pixbuf_get_width(int /*long*/ pixbuf) {
+public static final native int _gdk_pixbuf_get_width(long /*int*/ pixbuf);
+public static final int gdk_pixbuf_get_width(long /*int*/ pixbuf) {
lock.lock();
try {
return _gdk_pixbuf_get_width(pixbuf);
@@ -4493,8 +4493,8 @@ public static final int gdk_pixbuf_get_width(int /*long*/ pixbuf) {
lock.unlock();
}
}
-public static final native int /*long*/ _gdk_pixbuf_loader_new();
-public static final int /*long*/ gdk_pixbuf_loader_new() {
+public static final native long /*int*/ _gdk_pixbuf_loader_new();
+public static final long /*int*/ gdk_pixbuf_loader_new() {
lock.lock();
try {
return _gdk_pixbuf_loader_new();
@@ -4506,8 +4506,8 @@ public static final int /*long*/ gdk_pixbuf_loader_new() {
* @param loader cast=(GdkPixbufLoader *)
* @param error cast=(GError **)
*/
-public static final native boolean _gdk_pixbuf_loader_close(int /*long*/ loader, int /*long*/ [] error);
-public static final boolean gdk_pixbuf_loader_close(int /*long*/ loader, int /*long*/ [] error) {
+public static final native boolean _gdk_pixbuf_loader_close(long /*int*/ loader, long /*int*/ [] error);
+public static final boolean gdk_pixbuf_loader_close(long /*int*/ loader, long /*int*/ [] error) {
lock.lock();
try {
return _gdk_pixbuf_loader_close(loader, error);
@@ -4516,8 +4516,8 @@ public static final boolean gdk_pixbuf_loader_close(int /*long*/ loader, int /*l
}
}
/** @param loader cast=(GdkPixbufLoader *) */
-public static final native int /*long*/ _gdk_pixbuf_loader_get_pixbuf(int /*long*/ loader);
-public static final int /*long*/ gdk_pixbuf_loader_get_pixbuf(int /*long*/ loader) {
+public static final native long /*int*/ _gdk_pixbuf_loader_get_pixbuf(long /*int*/ loader);
+public static final long /*int*/ gdk_pixbuf_loader_get_pixbuf(long /*int*/ loader) {
lock.lock();
try {
return _gdk_pixbuf_loader_get_pixbuf(loader);
@@ -4531,8 +4531,8 @@ public static final int /*long*/ gdk_pixbuf_loader_get_pixbuf(int /*long*/ loade
* @param count cast=(gsize)
* @param error cast=(GError **)
*/
-public static final native boolean _gdk_pixbuf_loader_write(int /*long*/ loader, int /*long*/ buffer, int count, int /*long*/ [] error);
-public static final boolean gdk_pixbuf_loader_write(int /*long*/ loader, int /*long*/ buffer, int count, int /*long*/ [] error) {
+public static final native boolean _gdk_pixbuf_loader_write(long /*int*/ loader, long /*int*/ buffer, int count, long /*int*/ [] error);
+public static final boolean gdk_pixbuf_loader_write(long /*int*/ loader, long /*int*/ buffer, int count, long /*int*/ [] error) {
lock.lock();
try {
return _gdk_pixbuf_loader_write(loader, buffer, count, error);
@@ -4544,8 +4544,8 @@ public static final boolean gdk_pixbuf_loader_write(int /*long*/ loader, int /*l
* @param colorspace cast=(GdkColorspace)
* @param has_alpha cast=(gboolean)
*/
-public static final native int /*long*/ _gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height);
-public static final int /*long*/ gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height) {
+public static final native long /*int*/ _gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height);
+public static final long /*int*/ gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height) {
lock.lock();
try {
return _gdk_pixbuf_new(colorspace, has_alpha, bits_per_sample, width, height);
@@ -4557,8 +4557,8 @@ public static final int /*long*/ gdk_pixbuf_new(int colorspace, boolean has_alph
* @param filename cast=(const char *)
* @param error cast=(GError**)
*/
-public static final native int /*long*/ _gdk_pixbuf_new_from_file(byte[] filename, int /*long*/ [] error);
-public static final int /*long*/ gdk_pixbuf_new_from_file(byte[] filename, int /*long*/ [] error) {
+public static final native long /*int*/ _gdk_pixbuf_new_from_file(byte[] filename, long /*int*/ [] error);
+public static final long /*int*/ gdk_pixbuf_new_from_file(byte[] filename, long /*int*/ [] error) {
lock.lock();
try {
return _gdk_pixbuf_new_from_file(filename, error);
@@ -4569,8 +4569,8 @@ public static final int /*long*/ gdk_pixbuf_new_from_file(byte[] filename, int /
/**
* @method flags=dynamic
*/
-public static final native void _gdk_pixbuf_render_to_drawable(int /*long*/ pixbuf, int /*long*/ drawable, int /*long*/ gc, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int dither, int x_dither, int y_dither);
-public static final void gdk_pixbuf_render_to_drawable(int /*long*/ pixbuf, int /*long*/ drawable, int /*long*/ gc, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int dither, int x_dither, int y_dither) {
+public static final native void _gdk_pixbuf_render_to_drawable(long /*int*/ pixbuf, long /*int*/ drawable, long /*int*/ gc, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int dither, int x_dither, int y_dither);
+public static final void gdk_pixbuf_render_to_drawable(long /*int*/ pixbuf, long /*int*/ drawable, long /*int*/ gc, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int dither, int x_dither, int y_dither) {
lock.lock();
try {
_gdk_pixbuf_render_to_drawable(pixbuf, drawable, gc, src_x, src_y, dest_x, dest_y, width, height, dither, x_dither, y_dither);
@@ -4583,8 +4583,8 @@ public static final void gdk_pixbuf_render_to_drawable(int /*long*/ pixbuf, int
* @param pixmap_return cast=(GdkDrawable **)
* @param mask_return cast=(GdkBitmap **)
*/
-public static final native void _gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf, int /*long*/[] pixmap_return, int /*long*/[] mask_return, int alpha_threshold);
-public static final void gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf, int /*long*/[] pixmap_return, int /*long*/[] mask_return, int alpha_threshold) {
+public static final native void _gdk_pixbuf_render_pixmap_and_mask(long /*int*/ pixbuf, long /*int*/[] pixmap_return, long /*int*/[] mask_return, int alpha_threshold);
+public static final void gdk_pixbuf_render_pixmap_and_mask(long /*int*/ pixbuf, long /*int*/[] pixmap_return, long /*int*/[] mask_return, int alpha_threshold) {
lock.lock();
try {
_gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, mask_return, alpha_threshold);
@@ -4602,8 +4602,8 @@ public static final void gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf,
* @param option_values cast=(char **)
* @param error cast=(GError **)
*/
-public static final native boolean _gdk_pixbuf_save_to_bufferv(int /*long*/ pixbuf, int /*long*/ [] buffer, int /*long*/ [] buffer_size, byte [] type, int /*long*/ [] option_keys, int /*long*/ [] option_values, int /*long*/ [] error);
-public static final boolean gdk_pixbuf_save_to_bufferv(int /*long*/ pixbuf, int /*long*/ [] buffer, int /*long*/ [] buffer_size, byte [] type, int /*long*/ [] option_keys, int /*long*/ [] option_values, int /*long*/ [] error) {
+public static final native boolean _gdk_pixbuf_save_to_bufferv(long /*int*/ pixbuf, long /*int*/ [] buffer, long /*int*/ [] buffer_size, byte [] type, long /*int*/ [] option_keys, long /*int*/ [] option_values, long /*int*/ [] error);
+public static final boolean gdk_pixbuf_save_to_bufferv(long /*int*/ pixbuf, long /*int*/ [] buffer, long /*int*/ [] buffer_size, byte [] type, long /*int*/ [] option_keys, long /*int*/ [] option_values, long /*int*/ [] error) {
lock.lock();
try {
return _gdk_pixbuf_save_to_bufferv(pixbuf, buffer, buffer_size, type, option_keys, option_values, error);
@@ -4615,8 +4615,8 @@ public static final boolean gdk_pixbuf_save_to_bufferv(int /*long*/ pixbuf, int
* @param src cast=(const GdkPixbuf *)
* @param interp_type cast=(GdkInterpType)
*/
-public static final native int /*long*/ _gdk_pixbuf_scale_simple(int /*long*/ src, int dest_width, int dest_height, int interp_type);
-public static final int /*long*/ gdk_pixbuf_scale_simple(int /*long*/ src, int dest_width, int dest_height, int interp_type) {
+public static final native long /*int*/ _gdk_pixbuf_scale_simple(long /*int*/ src, int dest_width, int dest_height, int interp_type);
+public static final long /*int*/ gdk_pixbuf_scale_simple(long /*int*/ src, int dest_width, int dest_height, int interp_type) {
lock.lock();
try {
return _gdk_pixbuf_scale_simple(src, dest_width, dest_height, interp_type);
@@ -4630,8 +4630,8 @@ public static final int /*long*/ gdk_pixbuf_scale_simple(int /*long*/ src, int d
* @param height cast=(gint)
* @param depth cast=(gint)
*/
-public static final native int /*long*/ _gdk_pixmap_new(int /*long*/ window, int width, int height, int depth);
-public static final int /*long*/ gdk_pixmap_new(int /*long*/ window, int width, int height, int depth) {
+public static final native long /*int*/ _gdk_pixmap_new(long /*int*/ window, int width, int height, int depth);
+public static final long /*int*/ gdk_pixmap_new(long /*int*/ window, int width, int height, int depth) {
lock.lock();
try {
return _gdk_pixmap_new(window, width, height, depth);
@@ -4648,8 +4648,8 @@ public static final int /*long*/ gdk_pixmap_new(int /*long*/ window, int width,
* @param cursor cast=(GdkCursor *)
* @param time cast=(guint32)
*/
-public static final native int _gdk_pointer_grab(int /*long*/ window, boolean owner_events, int event_mask, int /*long*/ confine_to, int /*long*/ cursor, int time);
-public static final int gdk_pointer_grab(int /*long*/ window, boolean owner_events, int event_mask, int /*long*/ confine_to, int /*long*/ cursor, int time) {
+public static final native int _gdk_pointer_grab(long /*int*/ window, boolean owner_events, int event_mask, long /*int*/ confine_to, long /*int*/ cursor, int time);
+public static final int gdk_pointer_grab(long /*int*/ window, boolean owner_events, int event_mask, long /*int*/ confine_to, long /*int*/ cursor, int time) {
lock.lock();
try {
return _gdk_pointer_grab(window, owner_events, event_mask, confine_to, cursor, time);
@@ -4666,8 +4666,8 @@ public static final int gdk_pointer_grab(int /*long*/ window, boolean owner_even
* @param cursor cast=(GdkCursor *)
* @param time_ cast=(guint32)
*/
-public static final native int _gdk_device_grab(int /*long*/ device, int /*long*/ window, int grab_ownership, boolean owner_events, int event_mask, int /*long*/ cursor, int time_);
-public static final int gdk_device_grab(int /*long*/ device, int /*long*/ window, int grab_ownership, boolean owner_events, int event_mask, int /*long*/ cursor, int time_) {
+public static final native int _gdk_device_grab(long /*int*/ device, long /*int*/ window, int grab_ownership, boolean owner_events, int event_mask, long /*int*/ cursor, int time_);
+public static final int gdk_device_grab(long /*int*/ device, long /*int*/ window, int grab_ownership, boolean owner_events, int event_mask, long /*int*/ cursor, int time_) {
lock.lock();
try {
return _gdk_device_grab(device, window, grab_ownership, owner_events, event_mask, cursor,time_);
@@ -4694,8 +4694,8 @@ public static final void gdk_pointer_ungrab(int time) {
* @param actual_length cast=(gint *)
* @param data cast=(guchar **)
*/
-public static final native boolean _gdk_property_get(int /*long*/ window, int /*long*/ property, int /*long*/ type, int /*long*/ offset, int /*long*/ length, int pdelete, int /*long*/[] actual_property_type, int[] actual_format, int[] actual_length, int /*long*/[] data);
-public static final boolean gdk_property_get(int /*long*/ window, int /*long*/ property, int /*long*/ type, int /*long*/ offset, int /*long*/ length, int pdelete, int /*long*/[] actual_property_type, int[] actual_format, int[] actual_length, int /*long*/[] data) {
+public static final native boolean _gdk_property_get(long /*int*/ window, long /*int*/ property, long /*int*/ type, long /*int*/ offset, long /*int*/ length, int pdelete, long /*int*/[] actual_property_type, int[] actual_format, int[] actual_length, long /*int*/[] data);
+public static final boolean gdk_property_get(long /*int*/ window, long /*int*/ property, long /*int*/ type, long /*int*/ offset, long /*int*/ length, int pdelete, long /*int*/[] actual_property_type, int[] actual_format, int[] actual_length, long /*int*/[] data) {
lock.lock();
try {
return _gdk_property_get(window, property, type, offset, length, pdelete, actual_property_type, actual_format, actual_length, data);
@@ -4704,8 +4704,8 @@ public static final boolean gdk_property_get(int /*long*/ window, int /*long*/ p
}
}
/** @param region cast=(GdkRegion *) */
-public static final native void _gdk_region_destroy(int /*long*/ region);
-public static final void gdk_region_destroy(int /*long*/ region) {
+public static final native void _gdk_region_destroy(long /*int*/ region);
+public static final void gdk_region_destroy(long /*int*/ region) {
lock.lock();
try {
_gdk_region_destroy(region);
@@ -4714,8 +4714,8 @@ public static final void gdk_region_destroy(int /*long*/ region) {
}
}
/** @param region cast=(GdkRegion *) */
-public static final native boolean _gdk_region_empty(int /*long*/ region);
-public static final boolean gdk_region_empty(int /*long*/ region) {
+public static final native boolean _gdk_region_empty(long /*int*/ region);
+public static final boolean gdk_region_empty(long /*int*/ region) {
lock.lock();
try {
return _gdk_region_empty(region);
@@ -4727,8 +4727,8 @@ public static final boolean gdk_region_empty(int /*long*/ region) {
* @param region cast=(GdkRegion *)
* @param rectangle cast=(GdkRectangle *),flags=no_in
*/
-public static final native void _gdk_region_get_clipbox(int /*long*/ region, GdkRectangle rectangle);
-public static final void gdk_region_get_clipbox(int /*long*/ region, GdkRectangle rectangle) {
+public static final native void _gdk_region_get_clipbox(long /*int*/ region, GdkRectangle rectangle);
+public static final void gdk_region_get_clipbox(long /*int*/ region, GdkRectangle rectangle) {
lock.lock();
try {
_gdk_region_get_clipbox(region, rectangle);
@@ -4741,8 +4741,8 @@ public static final void gdk_region_get_clipbox(int /*long*/ region, GdkRectangl
* @param rectangles cast=(GdkRectangle **)
* @param n_rectangles cast=(gint *)
*/
-public static final native void _gdk_region_get_rectangles(int /*long*/ region, int /*long*/[] rectangles, int[] n_rectangles);
-public static final void gdk_region_get_rectangles(int /*long*/ region, int /*long*/[] rectangles, int[] n_rectangles) {
+public static final native void _gdk_region_get_rectangles(long /*int*/ region, long /*int*/[] rectangles, int[] n_rectangles);
+public static final void gdk_region_get_rectangles(long /*int*/ region, long /*int*/[] rectangles, int[] n_rectangles) {
lock.lock();
try {
_gdk_region_get_rectangles(region, rectangles, n_rectangles);
@@ -4754,8 +4754,8 @@ public static final void gdk_region_get_rectangles(int /*long*/ region, int /*lo
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
-public static final native void _gdk_region_intersect(int /*long*/ source1, int /*long*/ source2);
-public static final void gdk_region_intersect(int /*long*/ source1, int /*long*/ source2) {
+public static final native void _gdk_region_intersect(long /*int*/ source1, long /*int*/ source2);
+public static final void gdk_region_intersect(long /*int*/ source1, long /*int*/ source2) {
lock.lock();
try {
_gdk_region_intersect(source1, source2);
@@ -4763,8 +4763,8 @@ public static final void gdk_region_intersect(int /*long*/ source1, int /*long*/
lock.unlock();
}
}
-public static final native int /*long*/ _gdk_region_new();
-public static final int /*long*/ gdk_region_new() {
+public static final native long /*int*/ _gdk_region_new();
+public static final long /*int*/ gdk_region_new() {
lock.lock();
try {
return _gdk_region_new();
@@ -4777,8 +4777,8 @@ public static final int /*long*/ gdk_region_new() {
* @param dx cast=(gint)
* @param dy cast=(gint)
*/
-public static final native void _gdk_region_offset(int /*long*/ region, int dx, int dy);
-public static final void gdk_region_offset(int /*long*/ region, int dx, int dy) {
+public static final native void _gdk_region_offset(long /*int*/ region, int dx, int dy);
+public static final void gdk_region_offset(long /*int*/ region, int dx, int dy) {
lock.lock();
try {
_gdk_region_offset(region, dx, dy);
@@ -4791,8 +4791,8 @@ public static final void gdk_region_offset(int /*long*/ region, int dx, int dy)
* @param x cast=(gint)
* @param y cast=(gint)
*/
-public static final native boolean _gdk_region_point_in(int /*long*/ region, int x, int y);
-public static final boolean gdk_region_point_in(int /*long*/ region, int x, int y) {
+public static final native boolean _gdk_region_point_in(long /*int*/ region, int x, int y);
+public static final boolean gdk_region_point_in(long /*int*/ region, int x, int y) {
lock.lock();
try {
return _gdk_region_point_in(region, x, y);
@@ -4804,8 +4804,8 @@ public static final boolean gdk_region_point_in(int /*long*/ region, int x, int
* @param points cast=(GdkPoint *)
* @param fill_rule cast=(GdkFillRule)
*/
-public static final native int /*long*/ _gdk_region_polygon(int[] points, int npoints, int fill_rule);
-public static final int /*long*/ gdk_region_polygon(int[] points, int npoints, int fill_rule) {
+public static final native long /*int*/ _gdk_region_polygon(int[] points, int npoints, int fill_rule);
+public static final long /*int*/ gdk_region_polygon(int[] points, int npoints, int fill_rule) {
lock.lock();
try {
return _gdk_region_polygon(points, npoints, fill_rule);
@@ -4814,8 +4814,8 @@ public static final int /*long*/ gdk_region_polygon(int[] points, int npoints, i
}
}
/** @param rectangle flags=no_out */
-public static final native int /*long*/ _gdk_region_rectangle(GdkRectangle rectangle);
-public static final int /*long*/ gdk_region_rectangle(GdkRectangle rectangle) {
+public static final native long /*int*/ _gdk_region_rectangle(GdkRectangle rectangle);
+public static final long /*int*/ gdk_region_rectangle(GdkRectangle rectangle) {
lock.lock();
try {
return _gdk_region_rectangle(rectangle);
@@ -4827,8 +4827,8 @@ public static final int /*long*/ gdk_region_rectangle(GdkRectangle rectangle) {
* @param region cast=(GdkRegion *)
* @param rect cast=(GdkRectangle *),flags=no_out
*/
-public static final native int /*long*/ _gdk_region_rect_in(int /*long*/ region, GdkRectangle rect);
-public static final int /*long*/ gdk_region_rect_in(int /*long*/ region, GdkRectangle rect) {
+public static final native long /*int*/ _gdk_region_rect_in(long /*int*/ region, GdkRectangle rect);
+public static final long /*int*/ gdk_region_rect_in(long /*int*/ region, GdkRectangle rect) {
lock.lock();
try {
return _gdk_region_rect_in(region, rect);
@@ -4840,8 +4840,8 @@ public static final int /*long*/ gdk_region_rect_in(int /*long*/ region, GdkRect
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
-public static final native void _gdk_region_subtract(int /*long*/ source1, int /*long*/ source2);
-public static final void gdk_region_subtract(int /*long*/ source1, int /*long*/ source2) {
+public static final native void _gdk_region_subtract(long /*int*/ source1, long /*int*/ source2);
+public static final void gdk_region_subtract(long /*int*/ source1, long /*int*/ source2) {
lock.lock();
try {
_gdk_region_subtract(source1, source2);
@@ -4853,8 +4853,8 @@ public static final void gdk_region_subtract(int /*long*/ source1, int /*long*/
* @param source1 cast=(GdkRegion *)
* @param source2 cast=(GdkRegion *)
*/
-public static final native void _gdk_region_union(int /*long*/ source1, int /*long*/ source2);
-public static final void gdk_region_union(int /*long*/ source1, int /*long*/ source2) {
+public static final native void _gdk_region_union(long /*int*/ source1, long /*int*/ source2);
+public static final void gdk_region_union(long /*int*/ source1, long /*int*/ source2) {
lock.lock();
try {
_gdk_region_union(source1, source2);
@@ -4866,8 +4866,8 @@ public static final void gdk_region_union(int /*long*/ source1, int /*long*/ sou
* @param region cast=(GdkRegion *)
* @param rect cast=(GdkRectangle *),flags=no_out
*/
-public static final native void _gdk_region_union_with_rect(int /*long*/ region, GdkRectangle rect);
-public static final void gdk_region_union_with_rect(int /*long*/ region, GdkRectangle rect) {
+public static final native void _gdk_region_union_with_rect(long /*int*/ region, GdkRectangle rect);
+public static final void gdk_region_union_with_rect(long /*int*/ region, GdkRectangle rect) {
lock.lock();
try {
_gdk_region_union_with_rect(region, rect);
@@ -4876,8 +4876,8 @@ public static final void gdk_region_union_with_rect(int /*long*/ region, GdkRect
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gdk_screen_get_default();
-public static final int /*long*/ gdk_screen_get_default() {
+public static final native long /*int*/ _gdk_screen_get_default();
+public static final long /*int*/ gdk_screen_get_default() {
lock.lock();
try {
return _gdk_screen_get_default();
@@ -4891,8 +4891,8 @@ public static final int /*long*/ gdk_screen_get_default() {
* @param x cast=(gint)
* @param y cast=(gint)
*/
-public static final native int _gdk_screen_get_monitor_at_point (int /*long*/ screen, int x, int y);
-public static final int gdk_screen_get_monitor_at_point (int /*long*/ screen, int x, int y) {
+public static final native int _gdk_screen_get_monitor_at_point (long /*int*/ screen, int x, int y);
+public static final int gdk_screen_get_monitor_at_point (long /*int*/ screen, int x, int y) {
lock.lock();
try {
return _gdk_screen_get_monitor_at_point (screen, x, y);
@@ -4905,8 +4905,8 @@ public static final int gdk_screen_get_monitor_at_point (int /*long*/ screen, in
* @param screen cast=(GdkScreen *)
* @param window cast=(GdkWindow *)
*/
-public static final native int _gdk_screen_get_monitor_at_window(int /*long*/ screen, int /*long*/ window);
-public static final int gdk_screen_get_monitor_at_window(int /*long*/ screen, int /*long*/ window) {
+public static final native int _gdk_screen_get_monitor_at_window(long /*int*/ screen, long /*int*/ window);
+public static final int gdk_screen_get_monitor_at_window(long /*int*/ screen, long /*int*/ window) {
lock.lock();
try {
return _gdk_screen_get_monitor_at_window(screen, window);
@@ -4919,8 +4919,8 @@ public static final int gdk_screen_get_monitor_at_window(int /*long*/ screen, in
* @param screen cast=(GdkScreen *)
* @param dest flags=no_in
*/
-public static final native void _gdk_screen_get_monitor_geometry (int /*long*/ screen, int monitor_num, GdkRectangle dest);
-public static final void gdk_screen_get_monitor_geometry (int /*long*/ screen, int monitor_num, GdkRectangle dest) {
+public static final native void _gdk_screen_get_monitor_geometry (long /*int*/ screen, int monitor_num, GdkRectangle dest);
+public static final void gdk_screen_get_monitor_geometry (long /*int*/ screen, int monitor_num, GdkRectangle dest) {
lock.lock();
try {
_gdk_screen_get_monitor_geometry(screen, monitor_num, dest);
@@ -4932,8 +4932,8 @@ public static final void gdk_screen_get_monitor_geometry (int /*long*/ screen, i
* @method flags=dynamic
* @param screen cast=(GdkScreen *)
*/
-public static final native int _gdk_screen_get_n_monitors(int /*long*/ screen);
-public static final int gdk_screen_get_n_monitors(int /*long*/ screen) {
+public static final native int _gdk_screen_get_n_monitors(long /*int*/ screen);
+public static final int gdk_screen_get_n_monitors(long /*int*/ screen) {
lock.lock();
try {
return _gdk_screen_get_n_monitors(screen);
@@ -4945,8 +4945,8 @@ public static final int gdk_screen_get_n_monitors(int /*long*/ screen) {
* @method flags=dynamic
* @param screen cast=(GdkScreen *)
*/
-public static final native int _gdk_screen_get_number(int /*long*/ screen);
-public static final int gdk_screen_get_number(int /*long*/ screen) {
+public static final native int _gdk_screen_get_number(long /*int*/ screen);
+public static final int gdk_screen_get_number(long /*int*/ screen) {
lock.lock();
try {
return _gdk_screen_get_number(screen);
@@ -4994,8 +4994,8 @@ public static final void gdk_set_program_class(byte[] program_class) {
/**
* @method flags=dynamic
*/
-public static final native boolean _gdk_utf8_to_compound_text(byte[] str, int /*long*/[] encoding, int[] format, int /*long*/[] ctext, int[] length);
-public static final boolean gdk_utf8_to_compound_text(byte[] str, int /*long*/[] encoding, int[] format, int /*long*/[] ctext, int[] length) {
+public static final native boolean _gdk_utf8_to_compound_text(byte[] str, long /*int*/[] encoding, int[] format, long /*int*/[] ctext, int[] length);
+public static final boolean gdk_utf8_to_compound_text(byte[] str, long /*int*/[] encoding, int[] format, long /*int*/[] ctext, int[] length) {
lock.lock();
try {
return _gdk_utf8_to_compound_text(str, encoding, format, ctext, length);
@@ -5007,8 +5007,8 @@ public static final boolean gdk_utf8_to_compound_text(byte[] str, int /*long*/[]
* @param display cast=(GdkDisplay *)
* @method flags=dynamic
*/
-public static final native boolean _gdk_x11_display_utf8_to_compound_text(int /*long*/ display, byte[] str, int /*long*/[] encoding, int[] format, int /*long*/[] ctext, int[] length);
-public static final boolean gdk_x11_display_utf8_to_compound_text(int /*long*/ display, byte[] str, int /*long*/[] encoding, int[] format, int /*long*/[] ctext, int[] length) {
+public static final native boolean _gdk_x11_display_utf8_to_compound_text(long /*int*/ display, byte[] str, long /*int*/[] encoding, int[] format, long /*int*/[] ctext, int[] length);
+public static final boolean gdk_x11_display_utf8_to_compound_text(long /*int*/ display, byte[] str, long /*int*/[] encoding, int[] format, long /*int*/[] ctext, int[] length) {
lock.lock();
try {
return _gdk_x11_display_utf8_to_compound_text(display, str, encoding, format, ctext, length);
@@ -5017,8 +5017,8 @@ public static final boolean gdk_x11_display_utf8_to_compound_text(int /*long*/ d
}
}
/** @param str cast=(const gchar *) */
-public static final native int /*long*/ _gdk_utf8_to_string_target(byte[] str);
-public static final int /*long*/ gdk_utf8_to_string_target(byte[] str) {
+public static final native long /*int*/ _gdk_utf8_to_string_target(byte[] str);
+public static final long /*int*/ gdk_utf8_to_string_target(byte[] str) {
lock.lock();
try {
return _gdk_utf8_to_string_target(str);
@@ -5032,8 +5032,8 @@ public static final int /*long*/ gdk_utf8_to_string_target(byte[] str) {
* @param text cast=(guchar *)
* @param list cast=(gchar ***)
*/
-public static final native int _gdk_text_property_to_utf8_list_for_display (int /*long*/ display, int /*long*/ encoding, int format, int /*long*/ text, int length, int /*long*/[] list);
-public static final int gdk_text_property_to_utf8_list_for_display (int /*long*/ display, int /*long*/ encoding, int format, int /*long*/ text, int length, int /*long*/[] list) {
+public static final native int _gdk_text_property_to_utf8_list_for_display (long /*int*/ display, long /*int*/ encoding, int format, long /*int*/ text, int length, long /*int*/[] list);
+public static final int gdk_text_property_to_utf8_list_for_display (long /*int*/ display, long /*int*/ encoding, int format, long /*int*/ text, int length, long /*int*/[] list) {
lock.lock();
try {
return _gdk_text_property_to_utf8_list_for_display(display, encoding, format, text, length, list);
@@ -5047,7 +5047,7 @@ public static final native void gdk_threads_leave ();
/**
* @method flags=dynamic
*/
-public static final native void gdk_threads_set_lock_functions(int /*long*/ enter_fn, int /*long*/ leave_fn);
+public static final native void gdk_threads_set_lock_functions(long /*int*/ enter_fn, long /*int*/ leave_fn);
public static final native int _gdk_unicode_to_keyval(int wc);
public static final int gdk_unicode_to_keyval(int wc) {
@@ -5058,8 +5058,8 @@ public static final int gdk_unicode_to_keyval(int wc) {
lock.unlock();
}
}
-public static final native int /*long*/ _gdk_visual_get_system();
-public static final int /*long*/ gdk_visual_get_system() {
+public static final native long /*int*/ _gdk_visual_get_system();
+public static final long /*int*/ gdk_visual_get_system() {
lock.lock();
try {
return _gdk_visual_get_system();
@@ -5071,8 +5071,8 @@ public static final int /*long*/ gdk_visual_get_system() {
* @param win_x cast=(gint *)
* @param win_y cast=(gint *)
*/
-public static final native int /*long*/ _gdk_window_at_pointer(int[] win_x, int[] win_y);
-public static final int /*long*/ gdk_window_at_pointer(int[] win_x, int[] win_y) {
+public static final native long /*int*/ _gdk_window_at_pointer(int[] win_x, int[] win_y);
+public static final long /*int*/ gdk_window_at_pointer(int[] win_x, int[] win_y) {
lock.lock();
try {
return _gdk_window_at_pointer(win_x, win_y);
@@ -5084,8 +5084,8 @@ public static final int /*long*/ gdk_window_at_pointer(int[] win_x, int[] win_y)
* @param window cast=(GdkWindow *)
* @param rectangle cast=(GdkRectangle *),flags=no_out
*/
-public static final native void _gdk_window_begin_paint_rect(int /*long*/ window, GdkRectangle rectangle);
-public static final void gdk_window_begin_paint_rect(int /*long*/ window, GdkRectangle rectangle) {
+public static final native void _gdk_window_begin_paint_rect(long /*int*/ window, GdkRectangle rectangle);
+public static final void gdk_window_begin_paint_rect(long /*int*/ window, GdkRectangle rectangle) {
lock.lock();
try {
_gdk_window_begin_paint_rect(window, rectangle);
@@ -5097,8 +5097,8 @@ public static final void gdk_window_begin_paint_rect(int /*long*/ window, GdkRec
* @method flags=dynamic
* @param window cast=(GdkWindow *)
*/
-public static final native int /*long*/ _gdk_window_create_similar_surface(int /*long*/ window, int content, int width, int height);
-public static final int /*long*/ gdk_window_create_similar_surface(int /*long*/ window, int content, int width, int height) {
+public static final native long /*int*/ _gdk_window_create_similar_surface(long /*int*/ window, int content, int width, int height);
+public static final long /*int*/ gdk_window_create_similar_surface(long /*int*/ window, int content, int width, int height) {
lock.lock();
try {
return _gdk_window_create_similar_surface(window, content, width, height);
@@ -5107,8 +5107,8 @@ public static final int /*long*/ gdk_window_create_similar_surface(int /*long*/
}
}
/** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_destroy(int /*long*/ window);
-public static final void gdk_window_destroy(int /*long*/ window) {
+public static final native void _gdk_window_destroy(long /*int*/ window);
+public static final void gdk_window_destroy(long /*int*/ window) {
lock.lock();
try {
_gdk_window_destroy(window);
@@ -5117,8 +5117,8 @@ public static final void gdk_window_destroy(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_end_paint(int /*long*/ window);
-public static final void gdk_window_end_paint(int /*long*/ window) {
+public static final native void _gdk_window_end_paint(long /*int*/ window);
+public static final void gdk_window_end_paint(long /*int*/ window) {
lock.lock();
try {
_gdk_window_end_paint(window);
@@ -5127,8 +5127,8 @@ public static final void gdk_window_end_paint(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
-public static final native int /*long*/ _gdk_window_get_children(int /*long*/ window);
-public static final int /*long*/ gdk_window_get_children(int /*long*/ window) {
+public static final native long /*int*/ _gdk_window_get_children(long /*int*/ window);
+public static final long /*int*/ gdk_window_get_children(long /*int*/ window) {
lock.lock();
try {
return _gdk_window_get_children(window);
@@ -5137,8 +5137,8 @@ public static final int /*long*/ gdk_window_get_children(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
-public static final native int _gdk_window_get_events(int /*long*/ window);
-public static final int gdk_window_get_events(int /*long*/ window) {
+public static final native int _gdk_window_get_events(long /*int*/ window);
+public static final int gdk_window_get_events(long /*int*/ window) {
lock.lock();
try {
return _gdk_window_get_events(window);
@@ -5147,8 +5147,8 @@ public static final int gdk_window_get_events(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_focus(int /*long*/ window, int timestamp);
-public static final void gdk_window_focus(int /*long*/ window, int timestamp) {
+public static final native void _gdk_window_focus(long /*int*/ window, int timestamp);
+public static final void gdk_window_focus(long /*int*/ window, int timestamp) {
lock.lock();
try {
_gdk_window_focus(window, timestamp);
@@ -5160,8 +5160,8 @@ public static final void gdk_window_focus(int /*long*/ window, int timestamp) {
* @param window cast=(GdkWindow *)
* @param rect cast=(GdkRectangle *),flags=no_in
*/
-public static final native void _gdk_window_get_frame_extents(int /*long*/ window, GdkRectangle rect);
-public static final void gdk_window_get_frame_extents(int /*long*/ window, GdkRectangle rect) {
+public static final native void _gdk_window_get_frame_extents(long /*int*/ window, GdkRectangle rect);
+public static final void gdk_window_get_frame_extents(long /*int*/ window, GdkRectangle rect) {
lock.lock();
try {
_gdk_window_get_frame_extents(window, rect);
@@ -5175,8 +5175,8 @@ public static final void gdk_window_get_frame_extents(int /*long*/ window, GdkRe
* @param x_offset cast=(gint *)
* @param y_offset cast=(gint *)
*/
-public static final native void _gdk_window_get_internal_paint_info(int /*long*/ window, int /*long*/ [] real_drawable, int[] x_offset, int[] y_offset);
-public static final void gdk_window_get_internal_paint_info(int /*long*/ window, int /*long*/ [] real_drawable, int[] x_offset, int[] y_offset) {
+public static final native void _gdk_window_get_internal_paint_info(long /*int*/ window, long /*int*/ [] real_drawable, int[] x_offset, int[] y_offset);
+public static final void gdk_window_get_internal_paint_info(long /*int*/ window, long /*int*/ [] real_drawable, int[] x_offset, int[] y_offset) {
lock.lock();
try {
_gdk_window_get_internal_paint_info(window, real_drawable, x_offset, y_offset);
@@ -5189,8 +5189,8 @@ public static final void gdk_window_get_internal_paint_info(int /*long*/ window,
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
-public static final native int _gdk_window_get_origin(int /*long*/ window, int[] x, int[] y);
-public static final int gdk_window_get_origin(int /*long*/ window, int[] x, int[] y) {
+public static final native int _gdk_window_get_origin(long /*int*/ window, int[] x, int[] y);
+public static final int gdk_window_get_origin(long /*int*/ window, int[] x, int[] y) {
lock.lock();
try {
return _gdk_window_get_origin(window, x, y);
@@ -5199,8 +5199,8 @@ public static final int gdk_window_get_origin(int /*long*/ window, int[] x, int[
}
}
/** @param window cast=(GdkWindow *) */
-public static final native int /*long*/ _gdk_window_get_parent(int /*long*/ window);
-public static final int /*long*/ gdk_window_get_parent(int /*long*/ window) {
+public static final native long /*int*/ _gdk_window_get_parent(long /*int*/ window);
+public static final long /*int*/ gdk_window_get_parent(long /*int*/ window) {
lock.lock();
try {
return _gdk_window_get_parent(window);
@@ -5214,8 +5214,8 @@ public static final int /*long*/ gdk_window_get_parent(int /*long*/ window) {
* @param y cast=(gint *)
* @param mask cast=(GdkModifierType *)
*/
-public static final native int /*long*/ _gdk_window_get_pointer(int /*long*/ window, int[] x, int[] y, int[] mask);
-public static final int /*long*/ gdk_window_get_pointer(int /*long*/ window, int[] x, int[] y, int[] mask) {
+public static final native long /*int*/ _gdk_window_get_pointer(long /*int*/ window, int[] x, int[] y, int[] mask);
+public static final long /*int*/ gdk_window_get_pointer(long /*int*/ window, int[] x, int[] y, int[] mask) {
lock.lock();
try {
return _gdk_window_get_pointer(window, x, y, mask);
@@ -5228,8 +5228,8 @@ public static final int /*long*/ gdk_window_get_pointer(int /*long*/ window, int
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
-public static final native void _gdk_window_get_position(int /*long*/ window, int[] x, int[] y);
-public static final void gdk_window_get_position(int /*long*/ window, int[] x, int[] y) {
+public static final native void _gdk_window_get_position(long /*int*/ window, int[] x, int[] y);
+public static final void gdk_window_get_position(long /*int*/ window, int[] x, int[] y) {
lock.lock();
try {
_gdk_window_get_position(window, x, y);
@@ -5241,8 +5241,8 @@ public static final void gdk_window_get_position(int /*long*/ window, int[] x, i
* @param window cast=(GdkWindow *)
* @param data cast=(gpointer *)
*/
-public static final native void _gdk_window_get_user_data(int /*long*/ window, int /*long*/[] data);
-public static final void gdk_window_get_user_data(int /*long*/ window, int /*long*/[] data) {
+public static final native void _gdk_window_get_user_data(long /*int*/ window, long /*int*/[] data);
+public static final void gdk_window_get_user_data(long /*int*/ window, long /*int*/[] data) {
lock.lock();
try {
_gdk_window_get_user_data(window, data);
@@ -5251,8 +5251,8 @@ public static final void gdk_window_get_user_data(int /*long*/ window, int /*lon
}
}
/** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_hide(int /*long*/ window);
-public static final void gdk_window_hide(int /*long*/ window) {
+public static final native void _gdk_window_hide(long /*int*/ window);
+public static final void gdk_window_hide(long /*int*/ window) {
lock.lock();
try {
_gdk_window_hide(window);
@@ -5265,8 +5265,8 @@ public static final void gdk_window_hide(int /*long*/ window) {
* @param rectangle cast=(GdkRectangle *),flags=no_out
* @param invalidate_children cast=(gboolean)
*/
-public static final native void _gdk_window_invalidate_rect(int /*long*/ window, GdkRectangle rectangle, boolean invalidate_children);
-public static final void gdk_window_invalidate_rect(int /*long*/ window, GdkRectangle rectangle, boolean invalidate_children) {
+public static final native void _gdk_window_invalidate_rect(long /*int*/ window, GdkRectangle rectangle, boolean invalidate_children);
+public static final void gdk_window_invalidate_rect(long /*int*/ window, GdkRectangle rectangle, boolean invalidate_children) {
lock.lock();
try {
_gdk_window_invalidate_rect(window, rectangle, invalidate_children);
@@ -5279,8 +5279,8 @@ public static final void gdk_window_invalidate_rect(int /*long*/ window, GdkRect
* @param region cast=(GdkRegion *)
* @param invalidate_children cast=(gboolean)
*/
-public static final native void _gdk_window_invalidate_region(int /*long*/ window, int /*long*/ region, boolean invalidate_children);
-public static final void gdk_window_invalidate_region(int /*long*/ window, int /*long*/ region, boolean invalidate_children) {
+public static final native void _gdk_window_invalidate_region(long /*int*/ window, long /*int*/ region, boolean invalidate_children);
+public static final void gdk_window_invalidate_region(long /*int*/ window, long /*int*/ region, boolean invalidate_children) {
lock.lock();
try {
_gdk_window_invalidate_region(window, region, invalidate_children);
@@ -5289,8 +5289,8 @@ public static final void gdk_window_invalidate_region(int /*long*/ window, int /
}
}
/** @param window cast=(GdkWindow *) */
-public static final native boolean _gdk_window_is_visible(int /*long*/ window);
-public static final boolean gdk_window_is_visible(int /*long*/ window) {
+public static final native boolean _gdk_window_is_visible(long /*int*/ window);
+public static final boolean gdk_window_is_visible(long /*int*/ window) {
lock.lock();
try {
return _gdk_window_is_visible(window);
@@ -5299,8 +5299,8 @@ public static final boolean gdk_window_is_visible(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_move(int /*long*/ window, int x, int y);
-public static final void gdk_window_move(int /*long*/ window, int x, int y) {
+public static final native void _gdk_window_move(long /*int*/ window, int x, int y);
+public static final void gdk_window_move(long /*int*/ window, int x, int y) {
lock.lock();
try {
_gdk_window_move(window, x, y);
@@ -5309,8 +5309,8 @@ public static final void gdk_window_move(int /*long*/ window, int x, int y) {
}
}
/** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_move_resize(int /*long*/ window, int x, int y, int width, int height);
-public static final void gdk_window_move_resize(int /*long*/ window, int x, int y, int width, int height) {
+public static final native void _gdk_window_move_resize(long /*int*/ window, int x, int y, int width, int height);
+public static final void gdk_window_move_resize(long /*int*/ window, int x, int y, int width, int height) {
lock.lock();
try {
_gdk_window_move_resize(window, x, y, width, height);
@@ -5322,8 +5322,8 @@ public static final void gdk_window_move_resize(int /*long*/ window, int x, int
* @param parent cast=(GdkWindow *)
* @param attributes flags=no_out
*/
-public static final native int /*long*/ _gdk_window_new(int /*long*/ parent, GdkWindowAttr attributes, int attributes_mask);
-public static final int /*long*/ gdk_window_new(int /*long*/ parent, GdkWindowAttr attributes, int attributes_mask) {
+public static final native long /*int*/ _gdk_window_new(long /*int*/ parent, GdkWindowAttr attributes, int attributes_mask);
+public static final long /*int*/ gdk_window_new(long /*int*/ parent, GdkWindowAttr attributes, int attributes_mask) {
lock.lock();
try {
return _gdk_window_new(parent, attributes, attributes_mask);
@@ -5332,8 +5332,8 @@ public static final int /*long*/ gdk_window_new(int /*long*/ parent, GdkWindowAt
}
}
/** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_lower(int /*long*/ window);
-public static final void gdk_window_lower(int /*long*/ window) {
+public static final native void _gdk_window_lower(long /*int*/ window);
+public static final void gdk_window_lower(long /*int*/ window) {
lock.lock();
try {
_gdk_window_lower(window);
@@ -5354,8 +5354,8 @@ public static final void gdk_window_process_all_updates() {
* @param window cast=(GdkWindow *)
* @param update_children cast=(gboolean)
*/
-public static final native void _gdk_window_process_updates(int /*long*/ window, boolean update_children);
-public static final void gdk_window_process_updates(int /*long*/ window, boolean update_children) {
+public static final native void _gdk_window_process_updates(long /*int*/ window, boolean update_children);
+public static final void gdk_window_process_updates(long /*int*/ window, boolean update_children) {
lock.lock();
try {
_gdk_window_process_updates(window, update_children);
@@ -5364,8 +5364,8 @@ public static final void gdk_window_process_updates(int /*long*/ window, boolean
}
}
/** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_raise(int /*long*/ window);
-public static final void gdk_window_raise(int /*long*/ window) {
+public static final native void _gdk_window_raise(long /*int*/ window);
+public static final void gdk_window_raise(long /*int*/ window) {
lock.lock();
try {
_gdk_window_raise(window);
@@ -5374,8 +5374,8 @@ public static final void gdk_window_raise(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_resize(int /*long*/ window, int width, int height);
-public static final void gdk_window_resize(int /*long*/ window, int width, int height) {
+public static final native void _gdk_window_resize(long /*int*/ window, int width, int height);
+public static final void gdk_window_resize(long /*int*/ window, int width, int height) {
lock.lock();
try {
_gdk_window_resize(window, width, height);
@@ -5389,8 +5389,8 @@ public static final void gdk_window_resize(int /*long*/ window, int width, int h
* @param sibling cast=(GdkWindow *)
* @param above cast=(gboolean)
*/
-public static final native void _gdk_window_restack(int /*long*/ window, int /*long*/ sibling, boolean above);
-public static final void gdk_window_restack(int /*long*/ window, int /*long*/ sibling, boolean above) {
+public static final native void _gdk_window_restack(long /*int*/ window, long /*int*/ sibling, boolean above);
+public static final void gdk_window_restack(long /*int*/ window, long /*int*/ sibling, boolean above) {
lock.lock();
try {
_gdk_window_restack(window, sibling, above);
@@ -5403,8 +5403,8 @@ public static final void gdk_window_restack(int /*long*/ window, int /*long*/ si
* @param pixmap cast=(GdkPixmap *)
* @param parent_relative cast=(gboolean)
*/
-public static final native void _gdk_window_set_back_pixmap(int /*long*/ window, int /*long*/ pixmap, boolean parent_relative);
-public static final void gdk_window_set_back_pixmap(int /*long*/ window, int /*long*/ pixmap, boolean parent_relative) {
+public static final native void _gdk_window_set_back_pixmap(long /*int*/ window, long /*int*/ pixmap, boolean parent_relative);
+public static final void gdk_window_set_back_pixmap(long /*int*/ window, long /*int*/ pixmap, boolean parent_relative) {
lock.lock();
try {
_gdk_window_set_back_pixmap(window, pixmap, parent_relative);
@@ -5416,8 +5416,8 @@ public static final void gdk_window_set_back_pixmap(int /*long*/ window, int /*l
* @param window cast=(GdkWindow *)
* @param cursor cast=(GdkCursor *)
*/
-public static final native void _gdk_window_set_cursor(int /*long*/ window, int /*long*/ cursor);
-public static final void gdk_window_set_cursor(int /*long*/ window, int /*long*/ cursor) {
+public static final native void _gdk_window_set_cursor(long /*int*/ window, long /*int*/ cursor);
+public static final void gdk_window_set_cursor(long /*int*/ window, long /*int*/ cursor) {
lock.lock();
try {
_gdk_window_set_cursor(window, cursor);
@@ -5439,8 +5439,8 @@ public static final void gdk_window_set_debug_updates(boolean setting) {
* @param window cast=(GdkWindow *)
* @param decorations cast=(GdkWMDecoration)
*/
-public static final native void _gdk_window_set_decorations(int /*long*/ window, int decorations);
-public static final void gdk_window_set_decorations(int /*long*/ window, int decorations) {
+public static final native void _gdk_window_set_decorations(long /*int*/ window, int decorations);
+public static final void gdk_window_set_decorations(long /*int*/ window, int decorations) {
lock.lock();
try {
_gdk_window_set_decorations(window, decorations);
@@ -5449,8 +5449,8 @@ public static final void gdk_window_set_decorations(int /*long*/ window, int dec
}
}
/** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_set_events(int /*long*/ window, int event_mask);
-public static final void gdk_window_set_events(int /*long*/ window, int event_mask) {
+public static final native void _gdk_window_set_events(long /*int*/ window, int event_mask);
+public static final void gdk_window_set_events(long /*int*/ window, int event_mask) {
lock.lock();
try {
_gdk_window_set_events(window, event_mask);
@@ -5462,8 +5462,8 @@ public static final void gdk_window_set_events(int /*long*/ window, int event_ma
* @param window cast=(GdkWindow *)
* @param override_redirect cast=(gboolean)
*/
-public static final native void _gdk_window_set_override_redirect(int /*long*/ window, boolean override_redirect);
-public static final void gdk_window_set_override_redirect(int /*long*/ window, boolean override_redirect) {
+public static final native void _gdk_window_set_override_redirect(long /*int*/ window, boolean override_redirect);
+public static final void gdk_window_set_override_redirect(long /*int*/ window, boolean override_redirect) {
lock.lock();
try {
_gdk_window_set_override_redirect(window, override_redirect);
@@ -5475,8 +5475,8 @@ public static final void gdk_window_set_override_redirect(int /*long*/ window, b
* @param window cast=(GdkWindow *)
* @param user_data cast=(gpointer)
*/
-public static final native void _gdk_window_set_user_data(int /*long*/ window, int /*long*/ user_data);
-public static final void gdk_window_set_user_data(int /*long*/ window, int /*long*/ user_data) {
+public static final native void _gdk_window_set_user_data(long /*int*/ window, long /*int*/ user_data);
+public static final void gdk_window_set_user_data(long /*int*/ window, long /*int*/ user_data) {
lock.lock();
try {
_gdk_window_set_user_data(window, user_data);
@@ -5488,8 +5488,8 @@ public static final void gdk_window_set_user_data(int /*long*/ window, int /*lon
* @param window cast=(GdkWindow *)
* @param shape_region cast=(GdkRegion *)
*/
-public static final native void _gdk_window_shape_combine_region (int /*long*/ window, int /*long*/ shape_region, int offset_x, int offset_y);
-public static final void gdk_window_shape_combine_region (int /*long*/ window, int /*long*/ shape_region, int offset_x, int offset_y) {
+public static final native void _gdk_window_shape_combine_region (long /*int*/ window, long /*int*/ shape_region, int offset_x, int offset_y);
+public static final void gdk_window_shape_combine_region (long /*int*/ window, long /*int*/ shape_region, int offset_x, int offset_y) {
lock.lock();
try {
_gdk_window_shape_combine_region(window, shape_region, offset_x, offset_y);
@@ -5498,8 +5498,8 @@ public static final void gdk_window_shape_combine_region (int /*long*/ window, i
}
}
/** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_show(int /*long*/ window);
-public static final void gdk_window_show(int /*long*/ window) {
+public static final native void _gdk_window_show(long /*int*/ window);
+public static final void gdk_window_show(long /*int*/ window) {
lock.lock();
try {
_gdk_window_show(window);
@@ -5508,8 +5508,8 @@ public static final void gdk_window_show(int /*long*/ window) {
}
}
/** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_show_unraised(int /*long*/ window);
-public static final void gdk_window_show_unraised(int /*long*/ window) {
+public static final native void _gdk_window_show_unraised(long /*int*/ window);
+public static final void gdk_window_show_unraised(long /*int*/ window) {
lock.lock();
try {
_gdk_window_show_unraised(window);
@@ -5531,8 +5531,8 @@ public static final int gtk_accelerator_get_default_mod_mask() {
* @param accelerator_key cast=(guint *)
* @param accelerator_mods cast=(GdkModifierType *)
*/
-public static final native void _gtk_accelerator_parse(int /*long*/ accelerator, int [] accelerator_key, int [] accelerator_mods);
-public static final void gtk_accelerator_parse(int /*long*/ accelerator, int [] accelerator_key, int [] accelerator_mods) {
+public static final native void _gtk_accelerator_parse(long /*int*/ accelerator, int [] accelerator_key, int [] accelerator_mods);
+public static final void gtk_accelerator_parse(long /*int*/ accelerator, int [] accelerator_key, int [] accelerator_mods) {
lock.lock();
try {
_gtk_accelerator_parse(accelerator, accelerator_key, accelerator_mods);
@@ -5540,8 +5540,8 @@ public static final void gtk_accelerator_parse(int /*long*/ accelerator, int []
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_accel_group_new();
-public static final int /*long*/ gtk_accel_group_new() {
+public static final native long /*int*/ _gtk_accel_group_new();
+public static final long /*int*/ gtk_accel_group_new() {
lock.lock();
try {
return _gtk_accel_group_new();
@@ -5553,8 +5553,8 @@ public static final int /*long*/ gtk_accel_group_new() {
* @param accel_label cast=(GtkAccelLabel *)
* @param accel_widget cast=(GtkWidget *)
*/
-public static final native void _gtk_accel_label_set_accel_widget(int /*long*/ accel_label, int /*long*/ accel_widget);
-public static final void gtk_accel_label_set_accel_widget(int /*long*/ accel_label, int /*long*/ accel_widget) {
+public static final native void _gtk_accel_label_set_accel_widget(long /*int*/ accel_label, long /*int*/ accel_widget);
+public static final void gtk_accel_label_set_accel_widget(long /*int*/ accel_label, long /*int*/ accel_widget) {
lock.lock();
try {
_gtk_accel_label_set_accel_widget(accel_label, accel_widget);
@@ -5563,8 +5563,8 @@ public static final void gtk_accel_label_set_accel_widget(int /*long*/ accel_lab
}
}
/** @param adjustment cast=(GtkAdjustment *) */
-public static final native void _gtk_adjustment_changed(int /*long*/ adjustment);
-public static final void gtk_adjustment_changed(int /*long*/ adjustment) {
+public static final native void _gtk_adjustment_changed(long /*int*/ adjustment);
+public static final void gtk_adjustment_changed(long /*int*/ adjustment) {
lock.lock();
try {
_gtk_adjustment_changed(adjustment);
@@ -5579,8 +5579,8 @@ public static final void gtk_adjustment_changed(int /*long*/ adjustment) {
* @param step_increment cast=(gdouble)
* @param page_increment cast=(gdouble)
*/
-public static final native int /*long*/ _gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size);
-public static final int /*long*/ gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size) {
+public static final native long /*int*/ _gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size);
+public static final long /*int*/ gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size) {
lock.lock();
try {
return _gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size);
@@ -5592,8 +5592,8 @@ public static final int /*long*/ gtk_adjustment_new(double value, double lower,
* @param adjustment cast=(GtkAdjustment *)
* @param value cast=(gdouble)
*/
-public static final native void _gtk_adjustment_set_value(int /*long*/ adjustment, double value);
-public static final void gtk_adjustment_set_value(int /*long*/ adjustment, double value) {
+public static final native void _gtk_adjustment_set_value(long /*int*/ adjustment, double value);
+public static final void gtk_adjustment_set_value(long /*int*/ adjustment, double value) {
lock.lock();
try {
_gtk_adjustment_set_value(adjustment, value);
@@ -5602,8 +5602,8 @@ public static final void gtk_adjustment_set_value(int /*long*/ adjustment, doubl
}
}
/** @param adjustment cast=(GtkAdjustment *) */
-public static final native void _gtk_adjustment_value_changed(int /*long*/ adjustment);
-public static final void gtk_adjustment_value_changed(int /*long*/ adjustment) {
+public static final native void _gtk_adjustment_value_changed(long /*int*/ adjustment);
+public static final void gtk_adjustment_value_changed(long /*int*/ adjustment) {
lock.lock();
try {
_gtk_adjustment_value_changed(adjustment);
@@ -5615,8 +5615,8 @@ public static final void gtk_adjustment_value_changed(int /*long*/ adjustment) {
* @param arrow_type cast=(GtkArrowType)
* @param shadow_type cast=(GtkShadowType)
*/
-public static final native int /*long*/ _gtk_arrow_new(int arrow_type, int shadow_type);
-public static final int /*long*/ gtk_arrow_new(int arrow_type, int shadow_type) {
+public static final native long /*int*/ _gtk_arrow_new(int arrow_type, int shadow_type);
+public static final long /*int*/ gtk_arrow_new(int arrow_type, int shadow_type) {
lock.lock();
try {
return _gtk_arrow_new(arrow_type, shadow_type);
@@ -5629,8 +5629,8 @@ public static final int /*long*/ gtk_arrow_new(int arrow_type, int shadow_type)
* @param arrow_type cast=(GtkArrowType)
* @param shadow_type cast=(GtkShadowType)
*/
-public static final native void _gtk_arrow_set(int /*long*/ arrow, int arrow_type, int shadow_type);
-public static final void gtk_arrow_set(int /*long*/ arrow, int arrow_type, int shadow_type) {
+public static final native void _gtk_arrow_set(long /*int*/ arrow, int arrow_type, int shadow_type);
+public static final void gtk_arrow_set(long /*int*/ arrow, int arrow_type, int shadow_type) {
lock.lock();
try {
_gtk_arrow_set(arrow, arrow_type, shadow_type);
@@ -5639,8 +5639,8 @@ public static final void gtk_arrow_set(int /*long*/ arrow, int arrow_type, int s
}
}
/** @param bin cast=(GtkBin *) */
-public static final native int /*long*/ _gtk_bin_get_child(int /*long*/ bin);
-public static final int /*long*/ gtk_bin_get_child(int /*long*/ bin) {
+public static final native long /*int*/ _gtk_bin_get_child(long /*int*/ bin);
+public static final long /*int*/ gtk_bin_get_child(long /*int*/ bin) {
lock.lock();
try {
return _gtk_bin_get_child(bin);
@@ -5649,8 +5649,8 @@ public static final int /*long*/ gtk_bin_get_child(int /*long*/ bin) {
}
}
/** @param border cast=(GtkBorder *) */
-public static final native void _gtk_border_free(int /*long*/ border);
-public static final void gtk_border_free(int /*long*/ border) {
+public static final native void _gtk_border_free(long /*int*/ border);
+public static final void gtk_border_free(long /*int*/ border) {
lock.lock();
try {
_gtk_border_free(border);
@@ -5659,8 +5659,8 @@ public static final void gtk_border_free(int /*long*/ border) {
}
}
/** @param box cast=(GtkBox *) */
-public static final native void _gtk_box_set_spacing(int /*long*/ box, int spacing);
-public static final void gtk_box_set_spacing(int /*long*/ box, int spacing) {
+public static final native void _gtk_box_set_spacing(long /*int*/ box, int spacing);
+public static final void gtk_box_set_spacing(long /*int*/ box, int spacing) {
lock.lock();
try {
_gtk_box_set_spacing(box, spacing);
@@ -5672,8 +5672,8 @@ public static final void gtk_box_set_spacing(int /*long*/ box, int spacing) {
* @param box cast=(GtkBox *)
* @param child cast=(GtkWidget *)
*/
-public static final native void _gtk_box_set_child_packing(int /*long*/ box, int /*long*/ child, boolean expand, boolean fill, int padding, int pack_type);
-public static final void gtk_box_set_child_packing(int /*long*/ box, int /*long*/ child, boolean expand, boolean fill, int padding, int pack_type) {
+public static final native void _gtk_box_set_child_packing(long /*int*/ box, long /*int*/ child, boolean expand, boolean fill, int padding, int pack_type);
+public static final void gtk_box_set_child_packing(long /*int*/ box, long /*int*/ child, boolean expand, boolean fill, int padding, int pack_type) {
lock.lock();
try {
_gtk_box_set_child_packing(box, child, expand, fill, padding, pack_type);
@@ -5682,8 +5682,8 @@ public static final void gtk_box_set_child_packing(int /*long*/ box, int /*long*
}
}
/** @param button cast=(GtkButton *) */
-public static final native void _gtk_button_clicked(int /*long*/ button);
-public static final void gtk_button_clicked(int /*long*/ button) {
+public static final native void _gtk_button_clicked(long /*int*/ button);
+public static final void gtk_button_clicked(long /*int*/ button) {
lock.lock();
try {
_gtk_button_clicked(button);
@@ -5692,8 +5692,8 @@ public static final void gtk_button_clicked(int /*long*/ button) {
}
}
/** @param button cast=(GtkButton *) */
-public static final native int _gtk_button_get_relief(int /*long*/ button);
-public static final int gtk_button_get_relief(int /*long*/ button) {
+public static final native int _gtk_button_get_relief(long /*int*/ button);
+public static final int gtk_button_get_relief(long /*int*/ button) {
lock.lock();
try {
return _gtk_button_get_relief(button);
@@ -5701,8 +5701,8 @@ public static final int gtk_button_get_relief(int /*long*/ button) {
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_button_new();
-public static final int /*long*/ gtk_button_new() {
+public static final native long /*int*/ _gtk_button_new();
+public static final long /*int*/ gtk_button_new() {
lock.lock();
try {
return _gtk_button_new();
@@ -5714,8 +5714,8 @@ public static final int /*long*/ gtk_button_new() {
* @param button cast=(GtkButton *)
* @param newstyle cast=(GtkReliefStyle)
*/
-public static final native void _gtk_button_set_relief(int /*long*/ button, int newstyle);
-public static final void gtk_button_set_relief(int /*long*/ button, int newstyle) {
+public static final native void _gtk_button_set_relief(long /*int*/ button, int newstyle);
+public static final void gtk_button_set_relief(long /*int*/ button, int newstyle) {
lock.lock();
try {
_gtk_button_set_relief(button, newstyle);
@@ -5724,8 +5724,8 @@ public static final void gtk_button_set_relief(int /*long*/ button, int newstyle
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_calendar_new();
-public static final int /*long*/ gtk_calendar_new() {
+public static final native long /*int*/ _gtk_calendar_new();
+public static final long /*int*/ gtk_calendar_new() {
lock.lock();
try {
return _gtk_calendar_new();
@@ -5739,8 +5739,8 @@ public static final int /*long*/ gtk_calendar_new() {
* @param month cast=(guint)
* @param year cast=(guint)
*/
-public static final native boolean /*long*/ _gtk_calendar_select_month(int /*long*/ calendar, int month, int year);
-public static final boolean /*long*/ gtk_calendar_select_month(int /*long*/ calendar, int month, int year) {
+public static final native boolean /*long*/ _gtk_calendar_select_month(long /*int*/ calendar, int month, int year);
+public static final boolean /*long*/ gtk_calendar_select_month(long /*int*/ calendar, int month, int year) {
lock.lock();
try {
return _gtk_calendar_select_month(calendar, month, year);
@@ -5753,8 +5753,8 @@ public static final boolean /*long*/ gtk_calendar_select_month(int /*long*/ cale
* @param calendar cast=(GtkCalendar *)
* @param day cast=(guint)
*/
-public static final native void _gtk_calendar_select_day(int /*long*/ calendar, int day);
-public static final void gtk_calendar_select_day(int /*long*/ calendar, int day) {
+public static final native void _gtk_calendar_select_day(long /*int*/ calendar, int day);
+public static final void gtk_calendar_select_day(long /*int*/ calendar, int day) {
lock.lock();
try {
_gtk_calendar_select_day(calendar, day);
@@ -5767,8 +5767,8 @@ public static final void gtk_calendar_select_day(int /*long*/ calendar, int day)
* @param calendar cast=(GtkCalendar *)
* @param day cast=(guint)
*/
-public static final native void _gtk_calendar_mark_day(int /*long*/ calendar, int day);
-public static final void gtk_calendar_mark_day(int /*long*/ calendar, int day) {
+public static final native void _gtk_calendar_mark_day(long /*int*/ calendar, int day);
+public static final void gtk_calendar_mark_day(long /*int*/ calendar, int day) {
lock.lock();
try {
_gtk_calendar_mark_day(calendar, day);
@@ -5780,8 +5780,8 @@ public static final void gtk_calendar_mark_day(int /*long*/ calendar, int day) {
* @method flags=dynamic
* @param calendar cast=(GtkCalendar *)
*/
-public static final native void _gtk_calendar_clear_marks(int /*long*/ calendar);
-public static final void gtk_calendar_clear_marks(int /*long*/ calendar) {
+public static final native void _gtk_calendar_clear_marks(long /*int*/ calendar);
+public static final void gtk_calendar_clear_marks(long /*int*/ calendar) {
lock.lock();
try {
_gtk_calendar_clear_marks(calendar);
@@ -5794,8 +5794,8 @@ public static final void gtk_calendar_clear_marks(int /*long*/ calendar) {
* @param calendar cast=(GtkCalendar *)
* @param flags cast=(GtkCalendarDisplayOptions)
*/
-public static final native void _gtk_calendar_set_display_options(int /*long*/ calendar, int flags);
-public static final void gtk_calendar_set_display_options(int /*long*/ calendar, int flags) {
+public static final native void _gtk_calendar_set_display_options(long /*int*/ calendar, int flags);
+public static final void gtk_calendar_set_display_options(long /*int*/ calendar, int flags) {
lock.lock();
try {
_gtk_calendar_set_display_options(calendar, flags);
@@ -5810,8 +5810,8 @@ public static final void gtk_calendar_set_display_options(int /*long*/ calendar,
* @param month cast=(guint *)
* @param day cast=(guint *)
*/
-public static final native void _gtk_calendar_get_date(int /*long*/ calendar, int[] year, int[] month, int[] day);
-public static final void gtk_calendar_get_date(int /*long*/ calendar, int[] year, int[] month, int[] day) {
+public static final native void _gtk_calendar_get_date(long /*int*/ calendar, int[] year, int[] month, int[] day);
+public static final void gtk_calendar_get_date(long /*int*/ calendar, int[] year, int[] month, int[] day) {
lock.lock();
try {
_gtk_calendar_get_date(calendar, year, month, day);
@@ -5820,8 +5820,8 @@ public static final void gtk_calendar_get_date(int /*long*/ calendar, int[] year
}
}
/** @method flags=dynamic */
-public static final native void _gtk_cell_layout_clear(int /*long*/ cell_layout);
-public static final void gtk_cell_layout_clear(int /*long*/ cell_layout) {
+public static final native void _gtk_cell_layout_clear(long /*int*/ cell_layout);
+public static final void gtk_cell_layout_clear(long /*int*/ cell_layout) {
lock.lock();
try {
_gtk_cell_layout_clear(cell_layout);
@@ -5830,8 +5830,8 @@ public static final void gtk_cell_layout_clear(int /*long*/ cell_layout) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_cell_layout_get_cells(int /*long*/ cell_layout);
-public static final int /*long*/ gtk_cell_layout_get_cells(int /*long*/ cell_layout) {
+public static final native long /*int*/ _gtk_cell_layout_get_cells(long /*int*/ cell_layout);
+public static final long /*int*/ gtk_cell_layout_get_cells(long /*int*/ cell_layout) {
lock.lock();
try {
return _gtk_cell_layout_get_cells(cell_layout);
@@ -5840,8 +5840,8 @@ public static final int /*long*/ gtk_cell_layout_get_cells(int /*long*/ cell_lay
}
}
/** @method flags=no_gen */
-public static final native void _gtk_cell_layout_set_attributes(int /*long*/ cell_layout, int /*long*/ cell, byte[] attribute, int column, int /*long*/ sentinel);
-public static final void gtk_cell_layout_set_attributes(int /*long*/ cell_layout, int /*long*/ cell, byte[] attribute, int column, int /*long*/ sentinel) {
+public static final native void _gtk_cell_layout_set_attributes(long /*int*/ cell_layout, long /*int*/ cell, byte[] attribute, int column, long /*int*/ sentinel);
+public static final void gtk_cell_layout_set_attributes(long /*int*/ cell_layout, long /*int*/ cell, byte[] attribute, int column, long /*int*/ sentinel) {
lock.lock();
try {
_gtk_cell_layout_set_attributes(cell_layout, cell, attribute, column, sentinel);
@@ -5850,8 +5850,8 @@ public static final void gtk_cell_layout_set_attributes(int /*long*/ cell_layout
}
}
/** @method flags=dynamic */
-public static final native void _gtk_cell_layout_pack_start(int /*long*/ cell_layout, int /*long*/ cell, boolean expand);
-public static final void gtk_cell_layout_pack_start(int /*long*/ cell_layout, int /*long*/ cell, boolean expand) {
+public static final native void _gtk_cell_layout_pack_start(long /*int*/ cell_layout, long /*int*/ cell, boolean expand);
+public static final void gtk_cell_layout_pack_start(long /*int*/ cell_layout, long /*int*/ cell, boolean expand) {
lock.lock();
try {
_gtk_cell_layout_pack_start(cell_layout, cell, expand);
@@ -5868,8 +5868,8 @@ public static final void gtk_cell_layout_pack_start(int /*long*/ cell_layout, in
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
-public static final native void _gtk_cell_renderer_get_size(int /*long*/ cell, int /*long*/ widget, GdkRectangle area, int[] x_offset, int[] y_offset, int[] width, int[] height);
-public static final void gtk_cell_renderer_get_size(int /*long*/ cell, int /*long*/ widget, GdkRectangle area, int[] x_offset, int[] y_offset, int[] width, int[] height) {
+public static final native void _gtk_cell_renderer_get_size(long /*int*/ cell, long /*int*/ widget, GdkRectangle area, int[] x_offset, int[] y_offset, int[] width, int[] height);
+public static final void gtk_cell_renderer_get_size(long /*int*/ cell, long /*int*/ widget, GdkRectangle area, int[] x_offset, int[] y_offset, int[] width, int[] height) {
lock.lock();
try {
_gtk_cell_renderer_get_size(cell, widget, area, x_offset, y_offset, width, height);
@@ -5877,8 +5877,8 @@ public static final void gtk_cell_renderer_get_size(int /*long*/ cell, int /*lon
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_cell_renderer_pixbuf_new();
-public static final int /*long*/ gtk_cell_renderer_pixbuf_new() {
+public static final native long /*int*/ _gtk_cell_renderer_pixbuf_new();
+public static final long /*int*/ gtk_cell_renderer_pixbuf_new() {
lock.lock();
try {
return _gtk_cell_renderer_pixbuf_new();
@@ -5886,8 +5886,8 @@ public static final int /*long*/ gtk_cell_renderer_pixbuf_new() {
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_cell_renderer_text_new();
-public static final int /*long*/ gtk_cell_renderer_text_new() {
+public static final native long /*int*/ _gtk_cell_renderer_text_new();
+public static final long /*int*/ gtk_cell_renderer_text_new() {
lock.lock();
try {
return _gtk_cell_renderer_text_new();
@@ -5895,8 +5895,8 @@ public static final int /*long*/ gtk_cell_renderer_text_new() {
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_cell_renderer_toggle_new();
-public static final int /*long*/ gtk_cell_renderer_toggle_new() {
+public static final native long /*int*/ _gtk_cell_renderer_toggle_new();
+public static final long /*int*/ gtk_cell_renderer_toggle_new() {
lock.lock();
try {
return _gtk_cell_renderer_toggle_new();
@@ -5904,8 +5904,8 @@ public static final int /*long*/ gtk_cell_renderer_toggle_new() {
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_check_button_new();
-public static final int /*long*/ gtk_check_button_new() {
+public static final native long /*int*/ _gtk_check_button_new();
+public static final long /*int*/ gtk_check_button_new() {
lock.lock();
try {
return _gtk_check_button_new();
@@ -5914,8 +5914,8 @@ public static final int /*long*/ gtk_check_button_new() {
}
}
/** @param check_menu_item cast=(GtkCheckMenuItem *) */
-public static final native boolean _gtk_check_menu_item_get_active(int /*long*/ check_menu_item);
-public static final boolean gtk_check_menu_item_get_active(int /*long*/ check_menu_item) {
+public static final native boolean _gtk_check_menu_item_get_active(long /*int*/ check_menu_item);
+public static final boolean gtk_check_menu_item_get_active(long /*int*/ check_menu_item) {
lock.lock();
try {
return _gtk_check_menu_item_get_active(check_menu_item);
@@ -5924,8 +5924,8 @@ public static final boolean gtk_check_menu_item_get_active(int /*long*/ check_me
}
}
/** @param label cast=(const gchar *) */
-public static final native int /*long*/ _gtk_check_menu_item_new_with_label(byte[] label);
-public static final int /*long*/ gtk_check_menu_item_new_with_label(byte[] label) {
+public static final native long /*int*/ _gtk_check_menu_item_new_with_label(byte[] label);
+public static final long /*int*/ gtk_check_menu_item_new_with_label(byte[] label) {
lock.lock();
try {
return _gtk_check_menu_item_new_with_label(label);
@@ -5937,8 +5937,8 @@ public static final int /*long*/ gtk_check_menu_item_new_with_label(byte[] label
* @param wid cast=(GtkCheckMenuItem *)
* @param active cast=(gboolean)
*/
-public static final native void _gtk_check_menu_item_set_active(int /*long*/ wid, boolean active);
-public static final void gtk_check_menu_item_set_active(int /*long*/ wid, boolean active) {
+public static final native void _gtk_check_menu_item_set_active(long /*int*/ wid, boolean active);
+public static final void gtk_check_menu_item_set_active(long /*int*/ wid, boolean active) {
lock.lock();
try {
_gtk_check_menu_item_set_active(wid, active);
@@ -5946,8 +5946,8 @@ public static final void gtk_check_menu_item_set_active(int /*long*/ wid, boolea
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_check_version(int required_major, int required_minor, int required_micro);
-public static final int /*long*/ gtk_check_version(int required_major, int required_minor, int required_micro) {
+public static final native long /*int*/ _gtk_check_version(int required_major, int required_minor, int required_micro);
+public static final long /*int*/ gtk_check_version(int required_major, int required_minor, int required_micro) {
lock.lock();
try {
return _gtk_check_version(required_major, required_minor, required_micro);
@@ -5956,8 +5956,8 @@ public static final int /*long*/ gtk_check_version(int required_major, int requi
}
}
/** @param clipboard cast=(GtkClipboard *) */
-public static final native void _gtk_clipboard_clear(int /*long*/ clipboard);
-public static final void gtk_clipboard_clear(int /*long*/ clipboard) {
+public static final native void _gtk_clipboard_clear(long /*int*/ clipboard);
+public static final void gtk_clipboard_clear(long /*int*/ clipboard) {
lock.lock();
try {
_gtk_clipboard_clear(clipboard);
@@ -5966,8 +5966,8 @@ public static final void gtk_clipboard_clear(int /*long*/ clipboard) {
}
}
/** @param selection cast=(GdkAtom) */
-public static final native int /*long*/ _gtk_clipboard_get(int /*long*/ selection);
-public static final int /*long*/ gtk_clipboard_get(int /*long*/ selection) {
+public static final native long /*int*/ _gtk_clipboard_get(long /*int*/ selection);
+public static final long /*int*/ gtk_clipboard_get(long /*int*/ selection) {
lock.lock();
try {
return _gtk_clipboard_get(selection);
@@ -5983,8 +5983,8 @@ public static final int /*long*/ gtk_clipboard_get(int /*long*/ selection) {
* @param clear_func cast=(GtkClipboardClearFunc)
* @param user_data cast=(GObject *)
*/
-public static final native boolean _gtk_clipboard_set_with_owner(int /*long*/ clipboard, int /*long*/ target, int n_targets, int /*long*/ get_func, int /*long*/ clear_func, int /*long*/ user_data);
-public static final boolean gtk_clipboard_set_with_owner(int /*long*/ clipboard, int /*long*/ target, int n_targets, int /*long*/ get_func, int /*long*/ clear_func, int /*long*/ user_data) {
+public static final native boolean _gtk_clipboard_set_with_owner(long /*int*/ clipboard, long /*int*/ target, int n_targets, long /*int*/ get_func, long /*int*/ clear_func, long /*int*/ user_data);
+public static final boolean gtk_clipboard_set_with_owner(long /*int*/ clipboard, long /*int*/ target, int n_targets, long /*int*/ get_func, long /*int*/ clear_func, long /*int*/ user_data) {
lock.lock();
try {
return _gtk_clipboard_set_with_owner(clipboard, target, n_targets, get_func, clear_func, user_data);
@@ -5998,8 +5998,8 @@ public static final boolean gtk_clipboard_set_with_owner(int /*long*/ clipboard,
* @param targets cast=(const GtkTargetEntry *)
* @param n_targets cast=(gint)
*/
-public static final native void _gtk_clipboard_set_can_store(int /*long*/ clipboard, int /*long*/ targets, int n_targets);
-public static final void gtk_clipboard_set_can_store(int /*long*/ clipboard, int /*long*/ targets, int n_targets) {
+public static final native void _gtk_clipboard_set_can_store(long /*int*/ clipboard, long /*int*/ targets, int n_targets);
+public static final void gtk_clipboard_set_can_store(long /*int*/ clipboard, long /*int*/ targets, int n_targets) {
lock.lock();
try {
_gtk_clipboard_set_can_store(clipboard, targets, n_targets);
@@ -6011,8 +6011,8 @@ public static final void gtk_clipboard_set_can_store(int /*long*/ clipboard, int
* @method flags=dynamic
* @param clipboard cast=(GtkClipboard *)
*/
-public static final native void _gtk_clipboard_store(int /*long*/ clipboard);
-public static final void gtk_clipboard_store(int /*long*/ clipboard) {
+public static final native void _gtk_clipboard_store(long /*int*/ clipboard);
+public static final void gtk_clipboard_store(long /*int*/ clipboard) {
lock.lock();
try {
_gtk_clipboard_store(clipboard);
@@ -6024,8 +6024,8 @@ public static final void gtk_clipboard_store(int /*long*/ clipboard) {
* @param clipboard cast=(GtkClipboard *)
* @param target cast=(GdkAtom)
*/
-public static final native int /*long*/ _gtk_clipboard_wait_for_contents(int /*long*/ clipboard, int /*long*/ target);
-public static final int /*long*/ gtk_clipboard_wait_for_contents(int /*long*/ clipboard, int /*long*/ target) {
+public static final native long /*int*/ _gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*/ target);
+public static final long /*int*/ gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*/ target) {
lock.lock();
try {
return _gtk_clipboard_wait_for_contents(clipboard, target);
@@ -6034,8 +6034,8 @@ public static final int /*long*/ gtk_clipboard_wait_for_contents(int /*long*/ cl
}
}
/** @param title cast=(const gchar *) */
-public static final native int /*long*/ _gtk_color_selection_dialog_new(byte[] title);
-public static final int /*long*/ gtk_color_selection_dialog_new(byte[] title) {
+public static final native long /*int*/ _gtk_color_selection_dialog_new(byte[] title);
+public static final long /*int*/ gtk_color_selection_dialog_new(byte[] title) {
lock.lock();
try {
return _gtk_color_selection_dialog_new(title);
@@ -6047,8 +6047,8 @@ public static final int /*long*/ gtk_color_selection_dialog_new(byte[] title) {
* @param colorsel cast=(GtkColorSelection *)
* @param color cast=(GdkColor *),flags=no_in
*/
-public static final native void _gtk_color_selection_get_current_color(int /*long*/ colorsel, GdkColor color);
-public static final void gtk_color_selection_get_current_color(int /*long*/ colorsel, GdkColor color) {
+public static final native void _gtk_color_selection_get_current_color(long /*int*/ colorsel, GdkColor color);
+public static final void gtk_color_selection_get_current_color(long /*int*/ colorsel, GdkColor color) {
lock.lock();
try {
_gtk_color_selection_get_current_color(colorsel, color);
@@ -6060,8 +6060,8 @@ public static final void gtk_color_selection_get_current_color(int /*long*/ colo
* @param colors cast=(GdkColor *)
* @param n_colors cast=(gint)
*/
-public static final native int /*long*/ _gtk_color_selection_palette_to_string(int /*long*/ colors, int n_colors);
-public static final int /*long*/ gtk_color_selection_palette_to_string(int /*long*/ colors, int n_colors) {
+public static final native long /*int*/ _gtk_color_selection_palette_to_string(long /*int*/ colors, int n_colors);
+public static final long /*int*/ gtk_color_selection_palette_to_string(long /*int*/ colors, int n_colors) {
lock.lock();
try {
return _gtk_color_selection_palette_to_string(colors, n_colors);
@@ -6073,8 +6073,8 @@ public static final int /*long*/ gtk_color_selection_palette_to_string(int /*lon
* @param colorsel cast=(GtkColorSelection *)
* @param color cast=(GdkColor *),flags=no_out
*/
-public static final native void _gtk_color_selection_set_current_color(int /*long*/ colorsel, GdkColor color);
-public static final void gtk_color_selection_set_current_color(int /*long*/ colorsel, GdkColor color) {
+public static final native void _gtk_color_selection_set_current_color(long /*int*/ colorsel, GdkColor color);
+public static final void gtk_color_selection_set_current_color(long /*int*/ colorsel, GdkColor color) {
lock.lock();
try {
_gtk_color_selection_set_current_color(colorsel, color);
@@ -6083,8 +6083,8 @@ public static final void gtk_color_selection_set_current_color(int /*long*/ colo
}
}
/** @param colorsel cast=(GtkColorSelection *) */
-public static final native void _gtk_color_selection_set_has_palette(int /*long*/ colorsel, boolean has_palette);
-public static final void gtk_color_selection_set_has_palette(int /*long*/ colorsel, boolean has_palette) {
+public static final native void _gtk_color_selection_set_has_palette(long /*int*/ colorsel, boolean has_palette);
+public static final void gtk_color_selection_set_has_palette(long /*int*/ colorsel, boolean has_palette) {
lock.lock();
try {
_gtk_color_selection_set_has_palette(colorsel, has_palette);
@@ -6093,8 +6093,8 @@ public static final void gtk_color_selection_set_has_palette(int /*long*/ colors
}
}
/** @method flags=dynamic */
-public static final native void _gtk_combo_box_set_focus_on_click(int /*long*/ combo, boolean val);
-public static final void gtk_combo_box_set_focus_on_click(int /*long*/ combo, boolean val) {
+public static final native void _gtk_combo_box_set_focus_on_click(long /*int*/ combo, boolean val);
+public static final void gtk_combo_box_set_focus_on_click(long /*int*/ combo, boolean val) {
lock.lock();
try {
_gtk_combo_box_set_focus_on_click(combo, val);
@@ -6103,8 +6103,8 @@ public static final void gtk_combo_box_set_focus_on_click(int /*long*/ combo, bo
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_combo_box_entry_new_text();
-public static final int /*long*/ gtk_combo_box_entry_new_text() {
+public static final native long /*int*/ _gtk_combo_box_entry_new_text();
+public static final long /*int*/ gtk_combo_box_entry_new_text() {
lock.lock();
try {
return _gtk_combo_box_entry_new_text();
@@ -6113,8 +6113,8 @@ public static final int /*long*/ gtk_combo_box_entry_new_text() {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_combo_box_new_text();
-public static final int /*long*/ gtk_combo_box_new_text() {
+public static final native long /*int*/ _gtk_combo_box_new_text();
+public static final long /*int*/ gtk_combo_box_new_text() {
lock.lock();
try {
return _gtk_combo_box_new_text();
@@ -6123,8 +6123,8 @@ public static final int /*long*/ gtk_combo_box_new_text() {
}
}
/** @method flags=dynamic */
-public static final native void _gtk_combo_box_insert_text(int /*long*/ combo_box, int position, byte[] text);
-public static final void gtk_combo_box_insert_text(int /*long*/ combo_box, int position, byte[] text) {
+public static final native void _gtk_combo_box_insert_text(long /*int*/ combo_box, int position, byte[] text);
+public static final void gtk_combo_box_insert_text(long /*int*/ combo_box, int position, byte[] text) {
lock.lock();
try {
_gtk_combo_box_insert_text(combo_box, position, text);
@@ -6133,8 +6133,8 @@ public static final void gtk_combo_box_insert_text(int /*long*/ combo_box, int p
}
}
/** @method flags=dynamic */
-public static final native void _gtk_combo_box_remove_text(int /*long*/ combo_box, int position);
-public static final void gtk_combo_box_remove_text(int /*long*/ combo_box, int position) {
+public static final native void _gtk_combo_box_remove_text(long /*int*/ combo_box, int position);
+public static final void gtk_combo_box_remove_text(long /*int*/ combo_box, int position) {
lock.lock();
try {
_gtk_combo_box_remove_text(combo_box, position);
@@ -6143,8 +6143,8 @@ public static final void gtk_combo_box_remove_text(int /*long*/ combo_box, int p
}
}
/** @method flags=dynamic */
-public static final native int _gtk_combo_box_get_active(int /*long*/ combo_box);
-public static final int gtk_combo_box_get_active(int /*long*/ combo_box) {
+public static final native int _gtk_combo_box_get_active(long /*int*/ combo_box);
+public static final int gtk_combo_box_get_active(long /*int*/ combo_box) {
lock.lock();
try {
return _gtk_combo_box_get_active(combo_box);
@@ -6153,8 +6153,8 @@ public static final int gtk_combo_box_get_active(int /*long*/ combo_box) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_combo_box_get_model(int /*long*/ combo_box);
-public static final int /*long*/ gtk_combo_box_get_model(int /*long*/ combo_box) {
+public static final native long /*int*/ _gtk_combo_box_get_model(long /*int*/ combo_box);
+public static final long /*int*/ gtk_combo_box_get_model(long /*int*/ combo_box) {
lock.lock();
try {
return _gtk_combo_box_get_model(combo_box);
@@ -6163,8 +6163,8 @@ public static final int /*long*/ gtk_combo_box_get_model(int /*long*/ combo_box)
}
}
/** @method flags=dynamic */
-public static final native void _gtk_combo_box_set_active(int /*long*/ combo_box, int index);
-public static final void gtk_combo_box_set_active(int /*long*/ combo_box, int index) {
+public static final native void _gtk_combo_box_set_active(long /*int*/ combo_box, int index);
+public static final void gtk_combo_box_set_active(long /*int*/ combo_box, int index) {
lock.lock();
try {
_gtk_combo_box_set_active(combo_box, index);
@@ -6173,8 +6173,8 @@ public static final void gtk_combo_box_set_active(int /*long*/ combo_box, int in
}
}
/** @method flags=dynamic */
-public static final native void _gtk_combo_box_popup(int /*long*/ combo_box);
-public static final void gtk_combo_box_popup(int /*long*/ combo_box) {
+public static final native void _gtk_combo_box_popup(long /*int*/ combo_box);
+public static final void gtk_combo_box_popup(long /*int*/ combo_box) {
lock.lock();
try {
_gtk_combo_box_popup(combo_box);
@@ -6183,8 +6183,8 @@ public static final void gtk_combo_box_popup(int /*long*/ combo_box) {
}
}
/** @method flags=dynamic */
-public static final native void _gtk_combo_box_popdown(int /*long*/ combo_box);
-public static final void gtk_combo_box_popdown(int /*long*/ combo_box) {
+public static final native void _gtk_combo_box_popdown(long /*int*/ combo_box);
+public static final void gtk_combo_box_popdown(long /*int*/ combo_box) {
lock.lock();
try {
_gtk_combo_box_popdown(combo_box);
@@ -6196,8 +6196,8 @@ public static final void gtk_combo_box_popdown(int /*long*/ combo_box) {
* @param container cast=(GtkContainer *)
* @param widget cast=(GtkWidget *)
*/
-public static final native void _gtk_container_add(int /*long*/ container, int /*long*/ widget);
-public static final void gtk_container_add(int /*long*/ container, int /*long*/ widget) {
+public static final native void _gtk_container_add(long /*int*/ container, long /*int*/ widget);
+public static final void gtk_container_add(long /*int*/ container, long /*int*/ widget) {
lock.lock();
try {
_gtk_container_add(container, widget);
@@ -6210,8 +6210,8 @@ public static final void gtk_container_add(int /*long*/ container, int /*long*/
* @param callback cast=(GtkCallback)
* @param callback_data cast=(gpointer)
*/
-public static final native void _gtk_container_forall(int /*long*/ container, int /*long*/ callback, int /*long*/ callback_data);
-public static final void gtk_container_forall(int /*long*/ container, int /*long*/ callback, int /*long*/ callback_data) {
+public static final native void _gtk_container_forall(long /*int*/ container, long /*int*/ callback, long /*int*/ callback_data);
+public static final void gtk_container_forall(long /*int*/ container, long /*int*/ callback, long /*int*/ callback_data) {
lock.lock();
try {
_gtk_container_forall(container, callback, callback_data);
@@ -6220,8 +6220,8 @@ public static final void gtk_container_forall(int /*long*/ container, int /*long
}
}
/** @param container cast=(GtkContainer *) */
-public static final native int _gtk_container_get_border_width(int /*long*/ container);
-public static final int gtk_container_get_border_width(int /*long*/ container) {
+public static final native int _gtk_container_get_border_width(long /*int*/ container);
+public static final int gtk_container_get_border_width(long /*int*/ container) {
lock.lock();
try {
return _gtk_container_get_border_width(container);
@@ -6230,8 +6230,8 @@ public static final int gtk_container_get_border_width(int /*long*/ container) {
}
}
/** @param container cast=(GtkContainer *) */
-public static final native int /*long*/ _gtk_container_get_children(int /*long*/ container);
-public static final int /*long*/ gtk_container_get_children(int /*long*/ container) {
+public static final native long /*int*/ _gtk_container_get_children(long /*int*/ container);
+public static final long /*int*/ gtk_container_get_children(long /*int*/ container) {
lock.lock();
try {
return _gtk_container_get_children(container);
@@ -6243,8 +6243,8 @@ public static final int /*long*/ gtk_container_get_children(int /*long*/ contain
* @param container cast=(GtkContainer *)
* @param widget cast=(GtkWidget *)
*/
-public static final native void _gtk_container_remove(int /*long*/ container, int /*long*/ widget);
-public static final void gtk_container_remove(int /*long*/ container, int /*long*/ widget) {
+public static final native void _gtk_container_remove(long /*int*/ container, long /*int*/ widget);
+public static final void gtk_container_remove(long /*int*/ container, long /*int*/ widget) {
lock.lock();
try {
_gtk_container_remove(container, widget);
@@ -6253,8 +6253,8 @@ public static final void gtk_container_remove(int /*long*/ container, int /*long
}
}
/** @param container cast=(GtkContainer *) */
-public static final native void _gtk_container_resize_children(int /*long*/ container);
-public static final void gtk_container_resize_children(int /*long*/ container) {
+public static final native void _gtk_container_resize_children(long /*int*/ container);
+public static final void gtk_container_resize_children(long /*int*/ container) {
lock.lock();
try {
_gtk_container_resize_children(container);
@@ -6266,8 +6266,8 @@ public static final void gtk_container_resize_children(int /*long*/ container) {
* @param container cast=(GtkContainer *)
* @param border_width cast=(guint)
*/
-public static final native void _gtk_container_set_border_width(int /*long*/ container, int border_width);
-public static final void gtk_container_set_border_width(int /*long*/ container, int border_width) {
+public static final native void _gtk_container_set_border_width(long /*int*/ container, int border_width);
+public static final void gtk_container_set_border_width(long /*int*/ container, int border_width) {
lock.lock();
try {
_gtk_container_set_border_width(container, border_width);
@@ -6280,8 +6280,8 @@ public static final void gtk_container_set_border_width(int /*long*/ container,
* @param button_text cast=(const gchar *)
* @param response_id cast=(gint)
*/
-public static final native int /*long*/ _gtk_dialog_add_button(int /*long*/ dialog, byte[] button_text, int response_id);
-public static final int /*long*/ gtk_dialog_add_button(int /*long*/ dialog, byte[] button_text, int response_id) {
+public static final native long /*int*/ _gtk_dialog_add_button(long /*int*/ dialog, byte[] button_text, int response_id);
+public static final long /*int*/ gtk_dialog_add_button(long /*int*/ dialog, byte[] button_text, int response_id) {
lock.lock();
try {
return _gtk_dialog_add_button(dialog, button_text, response_id);
@@ -6290,8 +6290,8 @@ public static final int /*long*/ gtk_dialog_add_button(int /*long*/ dialog, byte
}
}
/** @param dialog cast=(GtkDialog *) */
-public static final native int _gtk_dialog_run(int /*long*/ dialog);
-public static final int gtk_dialog_run(int /*long*/ dialog) {
+public static final native int _gtk_dialog_run(long /*int*/ dialog);
+public static final int gtk_dialog_run(long /*int*/ dialog) {
lock.lock();
try {
return _gtk_dialog_run(dialog);
@@ -6306,8 +6306,8 @@ public static final int gtk_dialog_run(int /*long*/ dialog) {
* @param button cast=(gint)
* @param event cast=(GdkEvent *)
*/
-public static final native int /*long*/ _gtk_drag_begin(int /*long*/ widget, int /*long*/ targets, int actions, int button, int /*long*/ event);
-public static final int /*long*/ gtk_drag_begin(int /*long*/ widget, int /*long*/ targets, int actions, int button, int /*long*/ event) {
+public static final native long /*int*/ _gtk_drag_begin(long /*int*/ widget, long /*int*/ targets, int actions, int button, long /*int*/ event);
+public static final long /*int*/ gtk_drag_begin(long /*int*/ widget, long /*int*/ targets, int actions, int button, long /*int*/ event) {
lock.lock();
try {
return _gtk_drag_begin(widget, targets, actions, button, event);
@@ -6322,8 +6322,8 @@ public static final int /*long*/ gtk_drag_begin(int /*long*/ widget, int /*long*
* @param current_x cast=(gint)
* @param current_y cast=(gint)
*/
-public static final native boolean _gtk_drag_check_threshold(int /*long*/ widget, int start_x, int start_y, int current_x, int current_y);
-public static final boolean gtk_drag_check_threshold(int /*long*/ widget, int start_x, int start_y, int current_x, int current_y) {
+public static final native boolean _gtk_drag_check_threshold(long /*int*/ widget, int start_x, int start_y, int current_x, int current_y);
+public static final boolean gtk_drag_check_threshold(long /*int*/ widget, int start_x, int start_y, int current_x, int current_y) {
lock.lock();
try {
return _gtk_drag_check_threshold(widget, start_x, start_y, current_x, current_y);
@@ -6336,8 +6336,8 @@ public static final boolean gtk_drag_check_threshold(int /*long*/ widget, int st
* @param context cast=(GdkDragContext *)
* @param target_list cast=(GtkTargetList *)
*/
-public static final native int /*long*/ _gtk_drag_dest_find_target(int /*long*/ widget, int /*long*/ context, int /*long*/ target_list);
-public static final int /*long*/ gtk_drag_dest_find_target(int /*long*/ widget, int /*long*/ context, int /*long*/ target_list) {
+public static final native long /*int*/ _gtk_drag_dest_find_target(long /*int*/ widget, long /*int*/ context, long /*int*/ target_list);
+public static final long /*int*/ gtk_drag_dest_find_target(long /*int*/ widget, long /*int*/ context, long /*int*/ target_list) {
lock.lock();
try {
return _gtk_drag_dest_find_target(widget, context, target_list);
@@ -6352,8 +6352,8 @@ public static final int /*long*/ gtk_drag_dest_find_target(int /*long*/ widget,
* @param n_targets cast=(gint)
* @param actions cast=(GdkDragAction)
*/
-public static final native void _gtk_drag_dest_set(int /*long*/ widget, int flags, int /*long*/ targets, int n_targets, int actions);
-public static final void gtk_drag_dest_set(int /*long*/ widget, int flags, int /*long*/ targets, int n_targets, int actions) {
+public static final native void _gtk_drag_dest_set(long /*int*/ widget, int flags, long /*int*/ targets, int n_targets, int actions);
+public static final void gtk_drag_dest_set(long /*int*/ widget, int flags, long /*int*/ targets, int n_targets, int actions) {
lock.lock();
try {
_gtk_drag_dest_set(widget, flags, targets, n_targets, actions);
@@ -6362,8 +6362,8 @@ public static final void gtk_drag_dest_set(int /*long*/ widget, int flags, int /
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_drag_dest_unset(int /*long*/ widget);
-public static final void gtk_drag_dest_unset(int /*long*/ widget) {
+public static final native void _gtk_drag_dest_unset(long /*int*/ widget);
+public static final void gtk_drag_dest_unset(long /*int*/ widget) {
lock.lock();
try {
_gtk_drag_dest_unset(widget);
@@ -6377,8 +6377,8 @@ public static final void gtk_drag_dest_unset(int /*long*/ widget) {
* @param delete cast=(gboolean)
* @param time cast=(guint32)
*/
-public static final native void _gtk_drag_finish(int /*long*/ context, boolean success, boolean delete, int time);
-public static final void gtk_drag_finish(int /*long*/ context, boolean success, boolean delete, int time) {
+public static final native void _gtk_drag_finish(long /*int*/ context, boolean success, boolean delete, int time);
+public static final void gtk_drag_finish(long /*int*/ context, boolean success, boolean delete, int time) {
lock.lock();
try {
_gtk_drag_finish(context, success, delete, time);
@@ -6392,8 +6392,8 @@ public static final void gtk_drag_finish(int /*long*/ context, boolean success,
* @param target cast=(GdkAtom)
* @param time cast=(guint32)
*/
-public static final native void _gtk_drag_get_data(int /*long*/ widget, int /*long*/ context, int /*long*/ target, int time);
-public static final void gtk_drag_get_data(int /*long*/ widget, int /*long*/ context, int /*long*/ target, int time) {
+public static final native void _gtk_drag_get_data(long /*int*/ widget, long /*int*/ context, long /*int*/ target, int time);
+public static final void gtk_drag_get_data(long /*int*/ widget, long /*int*/ context, long /*int*/ target, int time) {
lock.lock();
try {
_gtk_drag_get_data(widget, context, target, time);
@@ -6405,8 +6405,8 @@ public static final void gtk_drag_get_data(int /*long*/ widget, int /*long*/ con
* @param context cast=(GdkDragContext *)
* @param pixbuf cast=(GdkPixbuf *)
*/
-public static final native void _gtk_drag_set_icon_pixbuf(int /*long*/ context, int /*long*/ pixbuf, int hot_x, int hot_y);
-public static final void gtk_drag_set_icon_pixbuf(int /*long*/ context, int /*long*/ pixbuf, int hot_x, int hot_y) {
+public static final native void _gtk_drag_set_icon_pixbuf(long /*int*/ context, long /*int*/ pixbuf, int hot_x, int hot_y);
+public static final void gtk_drag_set_icon_pixbuf(long /*int*/ context, long /*int*/ pixbuf, int hot_x, int hot_y) {
lock.lock();
try {
_gtk_drag_set_icon_pixbuf(context, pixbuf, hot_x, hot_y);
@@ -6415,8 +6415,8 @@ public static final void gtk_drag_set_icon_pixbuf(int /*long*/ context, int /*lo
}
}
/** @param editable cast=(GtkEditable *) */
-public static final native void _gtk_editable_copy_clipboard(int /*long*/ editable);
-public static final void gtk_editable_copy_clipboard(int /*long*/ editable) {
+public static final native void _gtk_editable_copy_clipboard(long /*int*/ editable);
+public static final void gtk_editable_copy_clipboard(long /*int*/ editable) {
lock.lock();
try {
_gtk_editable_copy_clipboard(editable);
@@ -6425,8 +6425,8 @@ public static final void gtk_editable_copy_clipboard(int /*long*/ editable) {
}
}
/** @param editable cast=(GtkEditable *) */
-public static final native void _gtk_editable_cut_clipboard(int /*long*/ editable);
-public static final void gtk_editable_cut_clipboard(int /*long*/ editable) {
+public static final native void _gtk_editable_cut_clipboard(long /*int*/ editable);
+public static final void gtk_editable_cut_clipboard(long /*int*/ editable) {
lock.lock();
try {
_gtk_editable_cut_clipboard(editable);
@@ -6435,8 +6435,8 @@ public static final void gtk_editable_cut_clipboard(int /*long*/ editable) {
}
}
/** @param editable cast=(GtkEditable *) */
-public static final native void _gtk_editable_delete_selection(int /*long*/ editable);
-public static final void gtk_editable_delete_selection(int /*long*/ editable) {
+public static final native void _gtk_editable_delete_selection(long /*int*/ editable);
+public static final void gtk_editable_delete_selection(long /*int*/ editable) {
lock.lock();
try {
_gtk_editable_delete_selection(editable);
@@ -6449,8 +6449,8 @@ public static final void gtk_editable_delete_selection(int /*long*/ editable) {
* @param start_pos cast=(gint)
* @param end_pos cast=(gint)
*/
-public static final native void _gtk_editable_delete_text(int /*long*/ editable, int start_pos, int end_pos);
-public static final void gtk_editable_delete_text(int /*long*/ editable, int start_pos, int end_pos) {
+public static final native void _gtk_editable_delete_text(long /*int*/ editable, int start_pos, int end_pos);
+public static final void gtk_editable_delete_text(long /*int*/ editable, int start_pos, int end_pos) {
lock.lock();
try {
_gtk_editable_delete_text(editable, start_pos, end_pos);
@@ -6459,8 +6459,8 @@ public static final void gtk_editable_delete_text(int /*long*/ editable, int sta
}
}
/** @param editable cast=(GtkEditable *) */
-public static final native boolean _gtk_editable_get_editable(int /*long*/ editable);
-public static final boolean gtk_editable_get_editable(int /*long*/ editable) {
+public static final native boolean _gtk_editable_get_editable(long /*int*/ editable);
+public static final boolean gtk_editable_get_editable(long /*int*/ editable) {
lock.lock();
try {
return _gtk_editable_get_editable(editable);
@@ -6469,8 +6469,8 @@ public static final boolean gtk_editable_get_editable(int /*long*/ editable) {
}
}
/** @param editable cast=(GtkEditable *) */
-public static final native int _gtk_editable_get_position(int /*long*/ editable);
-public static final int gtk_editable_get_position(int /*long*/ editable) {
+public static final native int _gtk_editable_get_position(long /*int*/ editable);
+public static final int gtk_editable_get_position(long /*int*/ editable) {
lock.lock();
try {
return _gtk_editable_get_position(editable);
@@ -6483,8 +6483,8 @@ public static final int gtk_editable_get_position(int /*long*/ editable) {
* @param start cast=(gint *)
* @param end cast=(gint *)
*/
-public static final native boolean _gtk_editable_get_selection_bounds(int /*long*/ editable, int[] start, int[] end);
-public static final boolean gtk_editable_get_selection_bounds(int /*long*/ editable, int[] start, int[] end) {
+public static final native boolean _gtk_editable_get_selection_bounds(long /*int*/ editable, int[] start, int[] end);
+public static final boolean gtk_editable_get_selection_bounds(long /*int*/ editable, int[] start, int[] end) {
lock.lock();
try {
return _gtk_editable_get_selection_bounds(editable, start, end);
@@ -6498,8 +6498,8 @@ public static final boolean gtk_editable_get_selection_bounds(int /*long*/ edita
* @param new_text_length cast=(gint)
* @param position cast=(gint *)
*/
-public static final native void _gtk_editable_insert_text(int /*long*/ editable, byte[] new_text, int new_text_length, int[] position);
-public static final void gtk_editable_insert_text(int /*long*/ editable, byte[] new_text, int new_text_length, int[] position) {
+public static final native void _gtk_editable_insert_text(long /*int*/ editable, byte[] new_text, int new_text_length, int[] position);
+public static final void gtk_editable_insert_text(long /*int*/ editable, byte[] new_text, int new_text_length, int[] position) {
lock.lock();
try {
_gtk_editable_insert_text(editable, new_text, new_text_length, position);
@@ -6508,8 +6508,8 @@ public static final void gtk_editable_insert_text(int /*long*/ editable, byte[]
}
}
/** @param editable cast=(GtkEditable *) */
-public static final native void _gtk_editable_paste_clipboard(int /*long*/ editable);
-public static final void gtk_editable_paste_clipboard(int /*long*/ editable) {
+public static final native void _gtk_editable_paste_clipboard(long /*int*/ editable);
+public static final void gtk_editable_paste_clipboard(long /*int*/ editable) {
lock.lock();
try {
_gtk_editable_paste_clipboard(editable);
@@ -6522,8 +6522,8 @@ public static final void gtk_editable_paste_clipboard(int /*long*/ editable) {
* @param start cast=(gint)
* @param end cast=(gint)
*/
-public static final native void _gtk_editable_select_region(int /*long*/ editable, int start, int end);
-public static final void gtk_editable_select_region(int /*long*/ editable, int start, int end) {
+public static final native void _gtk_editable_select_region(long /*int*/ editable, int start, int end);
+public static final void gtk_editable_select_region(long /*int*/ editable, int start, int end) {
lock.lock();
try {
_gtk_editable_select_region(editable, start, end);
@@ -6535,8 +6535,8 @@ public static final void gtk_editable_select_region(int /*long*/ editable, int s
* @param entry cast=(GtkEditable *)
* @param editable cast=(gboolean)
*/
-public static final native void _gtk_editable_set_editable(int /*long*/ entry, boolean editable);
-public static final void gtk_editable_set_editable(int /*long*/ entry, boolean editable) {
+public static final native void _gtk_editable_set_editable(long /*int*/ entry, boolean editable);
+public static final void gtk_editable_set_editable(long /*int*/ entry, boolean editable) {
lock.lock();
try {
_gtk_editable_set_editable(entry, editable);
@@ -6548,8 +6548,8 @@ public static final void gtk_editable_set_editable(int /*long*/ entry, boolean e
* @param editable cast=(GtkEditable *)
* @param position cast=(gint)
*/
-public static final native void _gtk_editable_set_position(int /*long*/ editable, int position);
-public static final void gtk_editable_set_position(int /*long*/ editable, int position) {
+public static final native void _gtk_editable_set_position(long /*int*/ editable, int position);
+public static final void gtk_editable_set_position(long /*int*/ editable, int position) {
lock.lock();
try {
_gtk_editable_set_position(editable, position);
@@ -6558,8 +6558,8 @@ public static final void gtk_editable_set_position(int /*long*/ editable, int po
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_entry_get_inner_border (int /*long*/ entry);
-public static final int /*long*/ gtk_entry_get_inner_border (int /*long*/ entry) {
+public static final native long /*int*/ _gtk_entry_get_inner_border (long /*int*/ entry);
+public static final long /*int*/ gtk_entry_get_inner_border (long /*int*/ entry) {
lock.lock();
try {
return _gtk_entry_get_inner_border(entry);
@@ -6568,8 +6568,8 @@ public static final int /*long*/ gtk_entry_get_inner_border (int /*long*/ entry)
}
}
/** @param entry cast=(GtkEntry *) */
-public static final native char _gtk_entry_get_invisible_char(int /*long*/ entry);
-public static final char gtk_entry_get_invisible_char(int /*long*/ entry) {
+public static final native char _gtk_entry_get_invisible_char(long /*int*/ entry);
+public static final char gtk_entry_get_invisible_char(long /*int*/ entry) {
lock.lock();
try {
return _gtk_entry_get_invisible_char(entry);
@@ -6578,8 +6578,8 @@ public static final char gtk_entry_get_invisible_char(int /*long*/ entry) {
}
}
/** @param entry cast=(GtkEntry *) */
-public static final native int /*long*/ _gtk_entry_get_layout (int /*long*/ entry);
-public static final int /*long*/ gtk_entry_get_layout (int /*long*/ entry) {
+public static final native long /*int*/ _gtk_entry_get_layout (long /*int*/ entry);
+public static final long /*int*/ gtk_entry_get_layout (long /*int*/ entry) {
lock.lock();
try {
return _gtk_entry_get_layout(entry);
@@ -6588,8 +6588,8 @@ public static final int /*long*/ gtk_entry_get_layout (int /*long*/ entry) {
}
}
/** @param entry cast=(GtkEntry *) */
-public static final native void _gtk_entry_get_layout_offsets (int /*long*/ entry, int[] x, int[] y);
-public static final void gtk_entry_get_layout_offsets (int /*long*/ entry, int[] x, int[] y) {
+public static final native void _gtk_entry_get_layout_offsets (long /*int*/ entry, int[] x, int[] y);
+public static final void gtk_entry_get_layout_offsets (long /*int*/ entry, int[] x, int[] y) {
lock.lock();
try {
_gtk_entry_get_layout_offsets(entry, x, y);
@@ -6598,8 +6598,8 @@ public static final void gtk_entry_get_layout_offsets (int /*long*/ entry, int[]
}
}
/** @method flags=dynamic */
-public static final native int _gtk_entry_text_index_to_layout_index (int /*long*/ entry, int index);
-public static final int gtk_entry_text_index_to_layout_index (int /*long*/ entry, int index) {
+public static final native int _gtk_entry_text_index_to_layout_index (long /*int*/ entry, int index);
+public static final int gtk_entry_text_index_to_layout_index (long /*int*/ entry, int index) {
lock.lock();
try {
return _gtk_entry_text_index_to_layout_index(entry, index);
@@ -6608,8 +6608,8 @@ public static final int gtk_entry_text_index_to_layout_index (int /*long*/ entry
}
}
/** @param entry cast=(GtkEntry *) */
-public static final native int _gtk_entry_get_max_length(int /*long*/ entry);
-public static final int gtk_entry_get_max_length(int /*long*/ entry) {
+public static final native int _gtk_entry_get_max_length(long /*int*/ entry);
+public static final int gtk_entry_get_max_length(long /*int*/ entry) {
lock.lock();
try {
return _gtk_entry_get_max_length(entry);
@@ -6618,8 +6618,8 @@ public static final int gtk_entry_get_max_length(int /*long*/ entry) {
}
}
/** @param entry cast=(GtkEntry *) */
-public static final native int /*long*/ _gtk_entry_get_text(int /*long*/ entry);
-public static final int /*long*/ gtk_entry_get_text(int /*long*/ entry) {
+public static final native long /*int*/ _gtk_entry_get_text(long /*int*/ entry);
+public static final long /*int*/ gtk_entry_get_text(long /*int*/ entry) {
lock.lock();
try {
return _gtk_entry_get_text(entry);
@@ -6628,8 +6628,8 @@ public static final int /*long*/ gtk_entry_get_text(int /*long*/ entry) {
}
}
/** @method flags=dynamic */
-public static final native boolean _FcConfigAppFontAddFile(int /*long*/ config, byte[] file);
-public static final boolean FcConfigAppFontAddFile(int /*long*/ config, byte[] file) {
+public static final native boolean _FcConfigAppFontAddFile(long /*int*/ config, byte[] file);
+public static final boolean FcConfigAppFontAddFile(long /*int*/ config, byte[] file) {
lock.lock();
try {
return _FcConfigAppFontAddFile(config, file);
@@ -6638,8 +6638,8 @@ public static final boolean FcConfigAppFontAddFile(int /*long*/ config, byte[] f
}
}
/** @param entry cast=(GtkEntry *) */
-public static final native boolean _gtk_entry_get_visibility(int /*long*/ entry);
-public static final boolean gtk_entry_get_visibility(int /*long*/ entry) {
+public static final native boolean _gtk_entry_get_visibility(long /*int*/ entry);
+public static final boolean gtk_entry_get_visibility(long /*int*/ entry) {
lock.lock();
try {
return _gtk_entry_get_visibility(entry);
@@ -6647,8 +6647,8 @@ public static final boolean gtk_entry_get_visibility(int /*long*/ entry) {
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_entry_new();
-public static final int /*long*/ gtk_entry_new() {
+public static final native long /*int*/ _gtk_entry_new();
+public static final long /*int*/ gtk_entry_new() {
lock.lock();
try {
return _gtk_entry_new();
@@ -6661,8 +6661,8 @@ public static final int /*long*/ gtk_entry_new() {
* @param entry cast=(GtkEntry *)
* @param xalign cast=(gfloat)
*/
-public static final native void _gtk_entry_set_alignment(int /*long*/ entry, float xalign);
-public static final void gtk_entry_set_alignment(int /*long*/ entry, float xalign) {
+public static final native void _gtk_entry_set_alignment(long /*int*/ entry, float xalign);
+public static final void gtk_entry_set_alignment(long /*int*/ entry, float xalign) {
lock.lock();
try {
_gtk_entry_set_alignment(entry, xalign);
@@ -6674,8 +6674,8 @@ public static final void gtk_entry_set_alignment(int /*long*/ entry, float xalig
* @param entry cast=(GtkEntry *)
* @param setting cast=(gboolean)
*/
-public static final native void _gtk_entry_set_has_frame(int /*long*/ entry, boolean setting);
-public static final void gtk_entry_set_has_frame(int /*long*/ entry, boolean setting) {
+public static final native void _gtk_entry_set_has_frame(long /*int*/ entry, boolean setting);
+public static final void gtk_entry_set_has_frame(long /*int*/ entry, boolean setting) {
lock.lock();
try {
_gtk_entry_set_has_frame(entry, setting);
@@ -6684,8 +6684,8 @@ public static final void gtk_entry_set_has_frame(int /*long*/ entry, boolean set
}
}
/** @method flags=dynamic */
-public static final native void _gtk_entry_set_icon_from_stock(int /*long*/ entry, int icon, byte[] stock);
-public static final void gtk_entry_set_icon_from_stock(int /*long*/ entry, int icon, byte[] stock) {
+public static final native void _gtk_entry_set_icon_from_stock(long /*int*/ entry, int icon, byte[] stock);
+public static final void gtk_entry_set_icon_from_stock(long /*int*/ entry, int icon, byte[] stock) {
lock.lock();
try {
_gtk_entry_set_icon_from_stock(entry, icon, stock);
@@ -6694,8 +6694,8 @@ public static final void gtk_entry_set_icon_from_stock(int /*long*/ entry, int i
}
}
/** @method flags=dynamic */
-public static final native void _gtk_entry_set_icon_sensitive(int /*long*/ entry, int icon_pos, boolean sensitive);
-public static final void gtk_entry_set_icon_sensitive(int /*long*/ entry, int icon_pos, boolean sensitive) {
+public static final native void _gtk_entry_set_icon_sensitive(long /*int*/ entry, int icon_pos, boolean sensitive);
+public static final void gtk_entry_set_icon_sensitive(long /*int*/ entry, int icon_pos, boolean sensitive) {
lock.lock();
try {
_gtk_entry_set_icon_sensitive(entry, icon_pos, sensitive);
@@ -6707,8 +6707,8 @@ public static final void gtk_entry_set_icon_sensitive(int /*long*/ entry, int ic
* @param entry cast=(GtkEntry *)
* @param ch cast=(gint)
*/
-public static final native void _gtk_entry_set_invisible_char(int /*long*/ entry, char ch);
-public static final void gtk_entry_set_invisible_char(int /*long*/ entry, char ch) {
+public static final native void _gtk_entry_set_invisible_char(long /*int*/ entry, char ch);
+public static final void gtk_entry_set_invisible_char(long /*int*/ entry, char ch) {
lock.lock();
try {
_gtk_entry_set_invisible_char(entry, ch);
@@ -6720,8 +6720,8 @@ public static final void gtk_entry_set_invisible_char(int /*long*/ entry, char c
* @param entry cast=(GtkEntry *)
* @param max cast=(gint)
*/
-public static final native void _gtk_entry_set_max_length(int /*long*/ entry, int max);
-public static final void gtk_entry_set_max_length(int /*long*/ entry, int max) {
+public static final native void _gtk_entry_set_max_length(long /*int*/ entry, int max);
+public static final void gtk_entry_set_max_length(long /*int*/ entry, int max) {
lock.lock();
try {
_gtk_entry_set_max_length(entry, max);
@@ -6733,8 +6733,8 @@ public static final void gtk_entry_set_max_length(int /*long*/ entry, int max) {
* @param entry cast=(GtkEntry *)
* @param text cast=(const gchar *)
*/
-public static final native void _gtk_entry_set_text(int /*long*/ entry, byte[] text);
-public static final void gtk_entry_set_text(int /*long*/ entry, byte[] text) {
+public static final native void _gtk_entry_set_text(long /*int*/ entry, byte[] text);
+public static final void gtk_entry_set_text(long /*int*/ entry, byte[] text) {
lock.lock();
try {
_gtk_entry_set_text(entry, text);
@@ -6746,8 +6746,8 @@ public static final void gtk_entry_set_text(int /*long*/ entry, byte[] text) {
* @param entry cast=(GtkEntry *)
* @param visible cast=(gboolean)
*/
-public static final native void _gtk_entry_set_visibility(int /*long*/ entry, boolean visible);
-public static final void gtk_entry_set_visibility(int /*long*/ entry, boolean visible) {
+public static final native void _gtk_entry_set_visibility(long /*int*/ entry, boolean visible);
+public static final void gtk_entry_set_visibility(long /*int*/ entry, boolean visible) {
lock.lock();
try {
_gtk_entry_set_visibility(entry, visible);
@@ -6756,8 +6756,8 @@ public static final void gtk_entry_set_visibility(int /*long*/ entry, boolean vi
}
}
/** @method flags=dynamic */
-public static final native boolean _gtk_expander_get_expanded(int /*long*/ expander);
-public static final boolean gtk_expander_get_expanded(int /*long*/ expander) {
+public static final native boolean _gtk_expander_get_expanded(long /*int*/ expander);
+public static final boolean gtk_expander_get_expanded(long /*int*/ expander) {
lock.lock();
try {
return _gtk_expander_get_expanded(expander);
@@ -6769,8 +6769,8 @@ public static final boolean gtk_expander_get_expanded(int /*long*/ expander) {
* @method flags=dynamic
* @param label cast=(const gchar *)
*/
-public static final native int /*long*/ _gtk_expander_new(byte[] label);
-public static final int /*long*/ gtk_expander_new(byte[] label) {
+public static final native long /*int*/ _gtk_expander_new(byte[] label);
+public static final long /*int*/ gtk_expander_new(byte[] label) {
lock.lock();
try {
return _gtk_expander_new(label);
@@ -6779,8 +6779,8 @@ public static final int /*long*/ gtk_expander_new(byte[] label) {
}
}
/** @method flags=dynamic */
-public static final native void _gtk_expander_set_expanded(int /*long*/ expander, boolean expanded);
-public static final void gtk_expander_set_expanded(int /*long*/ expander, boolean expanded) {
+public static final native void _gtk_expander_set_expanded(long /*int*/ expander, boolean expanded);
+public static final void gtk_expander_set_expanded(long /*int*/ expander, boolean expanded) {
lock.lock();
try {
_gtk_expander_set_expanded(expander, expanded);
@@ -6789,8 +6789,8 @@ public static final void gtk_expander_set_expanded(int /*long*/ expander, boolea
}
}
/** @method flags=dynamic */
-public static final native void _gtk_expander_set_label_widget(int /*long*/ expander, int /*long*/ label_widget);
-public static final void gtk_expander_set_label_widget(int /*long*/ expander, int /*long*/ label_widget) {
+public static final native void _gtk_expander_set_label_widget(long /*int*/ expander, long /*int*/ label_widget);
+public static final void gtk_expander_set_label_widget(long /*int*/ expander, long /*int*/ label_widget) {
lock.lock();
try {
_gtk_expander_set_label_widget(expander, label_widget);
@@ -6799,8 +6799,8 @@ public static final void gtk_expander_set_label_widget(int /*long*/ expander, i
}
}
/** @method flags=dynamic */
-public static final native void _gtk_file_chooser_add_filter(int /*long*/ chooser, int /*long*/ filter);
-public static final void gtk_file_chooser_add_filter(int /*long*/ chooser, int /*long*/ filter) {
+public static final native void _gtk_file_chooser_add_filter(long /*int*/ chooser, long /*int*/ filter);
+public static final void gtk_file_chooser_add_filter(long /*int*/ chooser, long /*int*/ filter) {
lock.lock();
try {
_gtk_file_chooser_add_filter(chooser, filter);
@@ -6809,8 +6809,8 @@ public static final void gtk_file_chooser_add_filter(int /*long*/ chooser, int /
}
}
/** @method flags=no_gen */
-public static final native int /*long*/ _gtk_file_chooser_dialog_new(byte[] title, int /*long*/ parent, int action, int /*long*/ first_button_text, int first_button_id, int /*long*/ second_button_text, int second_button_id, int /*long*/ terminator);
-public static final int /*long*/ gtk_file_chooser_dialog_new(byte[] title, int /*long*/ parent, int action, int /*long*/ first_button_text, int first_button_id, int /*long*/ second_button_text, int second_button_id, int /*long*/ terminator) {
+public static final native long /*int*/ _gtk_file_chooser_dialog_new(byte[] title, long /*int*/ parent, int action, long /*int*/ first_button_text, int first_button_id, long /*int*/ second_button_text, int second_button_id, long /*int*/ terminator);
+public static final long /*int*/ gtk_file_chooser_dialog_new(byte[] title, long /*int*/ parent, int action, long /*int*/ first_button_text, int first_button_id, long /*int*/ second_button_text, int second_button_id, long /*int*/ terminator) {
lock.lock();
try {
return _gtk_file_chooser_dialog_new(title, parent, action, first_button_text, first_button_id, second_button_text, second_button_id, terminator);
@@ -6819,8 +6819,8 @@ public static final int /*long*/ gtk_file_chooser_dialog_new(byte[] title, int /
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_file_chooser_get_filename(int /*long*/ chooser);
-public static final int /*long*/ gtk_file_chooser_get_filename(int /*long*/ chooser) {
+public static final native long /*int*/ _gtk_file_chooser_get_filename(long /*int*/ chooser);
+public static final long /*int*/ gtk_file_chooser_get_filename(long /*int*/ chooser) {
lock.lock();
try {
return _gtk_file_chooser_get_filename(chooser);
@@ -6829,8 +6829,8 @@ public static final int /*long*/ gtk_file_chooser_get_filename(int /*long*/ choo
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_file_chooser_get_filenames(int /*long*/ chooser);
-public static final int /*long*/ gtk_file_chooser_get_filenames(int /*long*/ chooser) {
+public static final native long /*int*/ _gtk_file_chooser_get_filenames(long /*int*/ chooser);
+public static final long /*int*/ gtk_file_chooser_get_filenames(long /*int*/ chooser) {
lock.lock();
try {
return _gtk_file_chooser_get_filenames(chooser);
@@ -6839,8 +6839,8 @@ public static final int /*long*/ gtk_file_chooser_get_filenames(int /*long*/ cho
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_file_chooser_get_uri(int /*long*/ chooser);
-public static final int /*long*/ gtk_file_chooser_get_uri(int /*long*/ chooser) {
+public static final native long /*int*/ _gtk_file_chooser_get_uri(long /*int*/ chooser);
+public static final long /*int*/ gtk_file_chooser_get_uri(long /*int*/ chooser) {
lock.lock();
try {
return _gtk_file_chooser_get_uri(chooser);
@@ -6849,8 +6849,8 @@ public static final int /*long*/ gtk_file_chooser_get_uri(int /*long*/ chooser)
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_file_chooser_get_uris(int /*long*/ chooser);
-public static final int /*long*/ gtk_file_chooser_get_uris(int /*long*/ chooser) {
+public static final native long /*int*/ _gtk_file_chooser_get_uris(long /*int*/ chooser);
+public static final long /*int*/ gtk_file_chooser_get_uris(long /*int*/ chooser) {
lock.lock();
try {
return _gtk_file_chooser_get_uris(chooser);
@@ -6859,8 +6859,8 @@ public static final int /*long*/ gtk_file_chooser_get_uris(int /*long*/ chooser)
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_file_chooser_get_filter(int /*long*/ chooser);
-public static final int /*long*/ gtk_file_chooser_get_filter(int /*long*/ chooser) {
+public static final native long /*int*/ _gtk_file_chooser_get_filter(long /*int*/ chooser);
+public static final long /*int*/ gtk_file_chooser_get_filter(long /*int*/ chooser) {
lock.lock();
try {
return _gtk_file_chooser_get_filter(chooser);
@@ -6869,8 +6869,8 @@ public static final int /*long*/ gtk_file_chooser_get_filter(int /*long*/ choose
}
}
/** @method flags=dynamic */
-public static final native void _gtk_file_chooser_set_current_folder(int /*long*/ chooser, int /*long*/ filename);
-public static final void gtk_file_chooser_set_current_folder(int /*long*/ chooser, int /*long*/ filename) {
+public static final native void _gtk_file_chooser_set_current_folder(long /*int*/ chooser, long /*int*/ filename);
+public static final void gtk_file_chooser_set_current_folder(long /*int*/ chooser, long /*int*/ filename) {
lock.lock();
try {
_gtk_file_chooser_set_current_folder(chooser, filename);
@@ -6879,8 +6879,8 @@ public static final void gtk_file_chooser_set_current_folder(int /*long*/ choose
}
}
/** @method flags=dynamic */
-public static final native void _gtk_file_chooser_set_current_folder_uri(int /*long*/ chooser, byte [] uri);
-public static final void gtk_file_chooser_set_current_folder_uri(int /*long*/ chooser, byte [] uri) {
+public static final native void _gtk_file_chooser_set_current_folder_uri(long /*int*/ chooser, byte [] uri);
+public static final void gtk_file_chooser_set_current_folder_uri(long /*int*/ chooser, byte [] uri) {
lock.lock();
try {
_gtk_file_chooser_set_current_folder_uri(chooser, uri);
@@ -6889,8 +6889,8 @@ public static final void gtk_file_chooser_set_current_folder_uri(int /*long*/ ch
}
}
/** @method flags=dynamic */
-public static final native void _gtk_file_chooser_set_current_name(int /*long*/ chooser, byte[] name);
-public static final void gtk_file_chooser_set_current_name(int /*long*/ chooser, byte[] name) {
+public static final native void _gtk_file_chooser_set_current_name(long /*int*/ chooser, byte[] name);
+public static final void gtk_file_chooser_set_current_name(long /*int*/ chooser, byte[] name) {
lock.lock();
try {
_gtk_file_chooser_set_current_name(chooser, name);
@@ -6899,8 +6899,8 @@ public static final void gtk_file_chooser_set_current_name(int /*long*/ chooser,
}
}
/** @method flags=dynamic */
-public static final native void _gtk_file_chooser_set_local_only(int /*long*/ chooser, boolean local_only);
-public static final void gtk_file_chooser_set_local_only(int /*long*/ chooser, boolean local_only) {
+public static final native void _gtk_file_chooser_set_local_only(long /*int*/ chooser, boolean local_only);
+public static final void gtk_file_chooser_set_local_only(long /*int*/ chooser, boolean local_only) {
lock.lock();
try {
_gtk_file_chooser_set_local_only(chooser, local_only);
@@ -6909,8 +6909,8 @@ public static final void gtk_file_chooser_set_local_only(int /*long*/ chooser, b
}
}
/** @method flags=dynamic */
-public static final native void _gtk_file_chooser_set_do_overwrite_confirmation(int /*long*/ chooser, boolean do_overwrite_confirmation);
-public static final void gtk_file_chooser_set_do_overwrite_confirmation(int /*long*/ chooser, boolean do_overwrite_confirmation) {
+public static final native void _gtk_file_chooser_set_do_overwrite_confirmation(long /*int*/ chooser, boolean do_overwrite_confirmation);
+public static final void gtk_file_chooser_set_do_overwrite_confirmation(long /*int*/ chooser, boolean do_overwrite_confirmation) {
lock.lock();
try {
_gtk_file_chooser_set_do_overwrite_confirmation(chooser, do_overwrite_confirmation);
@@ -6919,8 +6919,8 @@ public static final void gtk_file_chooser_set_do_overwrite_confirmation(int /*lo
}
}
/** @method flags=dynamic */
-public static final native void _gtk_file_chooser_set_extra_widget(int /*long*/ chooser, int /*long*/ extra_widget);
-public static final void gtk_file_chooser_set_extra_widget(int /*long*/ chooser, int /*long*/ extra_widget) {
+public static final native void _gtk_file_chooser_set_extra_widget(long /*int*/ chooser, long /*int*/ extra_widget);
+public static final void gtk_file_chooser_set_extra_widget(long /*int*/ chooser, long /*int*/ extra_widget) {
lock.lock();
try {
_gtk_file_chooser_set_extra_widget(chooser, extra_widget);
@@ -6929,8 +6929,8 @@ public static final void gtk_file_chooser_set_extra_widget(int /*long*/ chooser,
}
}
/** @method flags=dynamic */
-public static final native void _gtk_file_chooser_set_filename(int /*long*/ chooser, int /*long*/ name);
-public static final void gtk_file_chooser_set_filename(int /*long*/ chooser, int /*long*/ name) {
+public static final native void _gtk_file_chooser_set_filename(long /*int*/ chooser, long /*int*/ name);
+public static final void gtk_file_chooser_set_filename(long /*int*/ chooser, long /*int*/ name) {
lock.lock();
try {
_gtk_file_chooser_set_filename(chooser, name);
@@ -6939,8 +6939,8 @@ public static final void gtk_file_chooser_set_filename(int /*long*/ chooser, int
}
}
/** @method flags=dynamic */
-public static final native void _gtk_file_chooser_set_filter(int /*long*/ chooser, int /*long*/ filter);
-public static final void gtk_file_chooser_set_filter(int /*long*/ chooser, int /*long*/ filter) {
+public static final native void _gtk_file_chooser_set_filter(long /*int*/ chooser, long /*int*/ filter);
+public static final void gtk_file_chooser_set_filter(long /*int*/ chooser, long /*int*/ filter) {
lock.lock();
try {
_gtk_file_chooser_set_filter(chooser, filter);
@@ -6949,8 +6949,8 @@ public static final void gtk_file_chooser_set_filter(int /*long*/ chooser, int /
}
}
/** @method flags=dynamic */
-public static final native void _gtk_file_chooser_set_uri(int /*long*/ chooser, byte [] uri);
-public static final void gtk_file_chooser_set_uri(int /*long*/ chooser, byte [] uri) {
+public static final native void _gtk_file_chooser_set_uri(long /*int*/ chooser, byte [] uri);
+public static final void gtk_file_chooser_set_uri(long /*int*/ chooser, byte [] uri) {
lock.lock();
try {
_gtk_file_chooser_set_uri(chooser, uri);
@@ -6959,8 +6959,8 @@ public static final void gtk_file_chooser_set_uri(int /*long*/ chooser, byte []
}
}
/** @method flags=dynamic */
-public static final native void _gtk_file_chooser_set_select_multiple(int /*long*/ chooser, boolean select_multiple);
-public static final void gtk_file_chooser_set_select_multiple(int /*long*/ chooser, boolean select_multiple) {
+public static final native void _gtk_file_chooser_set_select_multiple(long /*int*/ chooser, boolean select_multiple);
+public static final void gtk_file_chooser_set_select_multiple(long /*int*/ chooser, boolean select_multiple) {
lock.lock();
try {
_gtk_file_chooser_set_select_multiple(chooser, select_multiple);
@@ -6969,8 +6969,8 @@ public static final void gtk_file_chooser_set_select_multiple(int /*long*/ choos
}
}
/** @method flags=dynamic */
-public static final native void _gtk_file_filter_add_pattern(int /*long*/ filter, byte[] pattern);
-public static final void gtk_file_filter_add_pattern(int /*long*/ filter, byte[] pattern) {
+public static final native void _gtk_file_filter_add_pattern(long /*int*/ filter, byte[] pattern);
+public static final void gtk_file_filter_add_pattern(long /*int*/ filter, byte[] pattern) {
lock.lock();
try {
_gtk_file_filter_add_pattern(filter, pattern);
@@ -6979,8 +6979,8 @@ public static final void gtk_file_filter_add_pattern(int /*long*/ filter, byte[]
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_file_filter_new();
-public static final int /*long*/ gtk_file_filter_new() {
+public static final native long /*int*/ _gtk_file_filter_new();
+public static final long /*int*/ gtk_file_filter_new() {
lock.lock();
try {
return _gtk_file_filter_new();
@@ -6989,8 +6989,8 @@ public static final int /*long*/ gtk_file_filter_new() {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_file_filter_get_name(int /*long*/ filter);
-public static final int /*long*/ gtk_file_filter_get_name(int /*long*/ filter) {
+public static final native long /*int*/ _gtk_file_filter_get_name(long /*int*/ filter);
+public static final long /*int*/ gtk_file_filter_get_name(long /*int*/ filter) {
lock.lock();
try {
return _gtk_file_filter_get_name(filter);
@@ -6999,8 +6999,8 @@ public static final int /*long*/ gtk_file_filter_get_name(int /*long*/ filter) {
}
}
/** @method flags=dynamic */
-public static final native void _gtk_file_filter_set_name(int /*long*/ filter, byte[] name);
-public static final void gtk_file_filter_set_name(int /*long*/ filter, byte[] name) {
+public static final native void _gtk_file_filter_set_name(long /*int*/ filter, byte[] name);
+public static final void gtk_file_filter_set_name(long /*int*/ filter, byte[] name) {
lock.lock();
try {
_gtk_file_filter_set_name(filter, name);
@@ -7014,8 +7014,8 @@ public static final void gtk_file_filter_set_name(int /*long*/ filter, byte[] na
* @param x cast=(gint)
* @param y cast=(gint)
*/
-public static final native void _gtk_fixed_move(int /*long*/ fixed, int /*long*/ widget, int x, int y);
-public static final void gtk_fixed_move(int /*long*/ fixed, int /*long*/ widget, int x, int y) {
+public static final native void _gtk_fixed_move(long /*int*/ fixed, long /*int*/ widget, int x, int y);
+public static final void gtk_fixed_move(long /*int*/ fixed, long /*int*/ widget, int x, int y) {
lock.lock();
try {
_gtk_fixed_move(fixed, widget, x, y);
@@ -7023,8 +7023,8 @@ public static final void gtk_fixed_move(int /*long*/ fixed, int /*long*/ widget,
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_fixed_new();
-public static final int /*long*/ gtk_fixed_new() {
+public static final native long /*int*/ _gtk_fixed_new();
+public static final long /*int*/ gtk_fixed_new() {
lock.lock();
try {
return _gtk_fixed_new();
@@ -7035,8 +7035,8 @@ public static final int /*long*/ gtk_fixed_new() {
/**
* @method flags=dynamic
*/
-public static final native void _gtk_fixed_set_has_window(int /*long*/ fixed, boolean has_window);
-public static final void gtk_fixed_set_has_window(int /*long*/ fixed, boolean has_window) {
+public static final native void _gtk_fixed_set_has_window(long /*int*/ fixed, boolean has_window);
+public static final void gtk_fixed_set_has_window(long /*int*/ fixed, boolean has_window) {
lock.lock();
try {
_gtk_fixed_set_has_window(fixed, has_window);
@@ -7047,8 +7047,8 @@ public static final void gtk_fixed_set_has_window(int /*long*/ fixed, boolean ha
/**
* @method flags=dynamic
*/
-public static final native void _gtk_widget_set_has_window(int /*long*/ widget, boolean has_window);
-public static final void gtk_widget_set_has_window(int /*long*/ widget, boolean has_window) {
+public static final native void _gtk_widget_set_has_window(long /*int*/ widget, boolean has_window);
+public static final void gtk_widget_set_has_window(long /*int*/ widget, boolean has_window) {
lock.lock();
try {
_gtk_fixed_set_has_window(widget, has_window);
@@ -7057,8 +7057,8 @@ public static final void gtk_widget_set_has_window(int /*long*/ widget, boolean
}
}
/** @param fsd cast=(GtkFontSelectionDialog *) */
-public static final native int /*long*/ _gtk_font_selection_dialog_get_font_name(int /*long*/ fsd);
-public static final int /*long*/ gtk_font_selection_dialog_get_font_name(int /*long*/ fsd) {
+public static final native long /*int*/ _gtk_font_selection_dialog_get_font_name(long /*int*/ fsd);
+public static final long /*int*/ gtk_font_selection_dialog_get_font_name(long /*int*/ fsd) {
lock.lock();
try {
return _gtk_font_selection_dialog_get_font_name(fsd);
@@ -7067,8 +7067,8 @@ public static final int /*long*/ gtk_font_selection_dialog_get_font_name(int /*l
}
}
/** @param title cast=(const gchar *) */
-public static final native int /*long*/ _gtk_font_selection_dialog_new(byte[] title);
-public static final int /*long*/ gtk_font_selection_dialog_new(byte[] title) {
+public static final native long /*int*/ _gtk_font_selection_dialog_new(byte[] title);
+public static final long /*int*/ gtk_font_selection_dialog_new(byte[] title) {
lock.lock();
try {
return _gtk_font_selection_dialog_new(title);
@@ -7080,8 +7080,8 @@ public static final int /*long*/ gtk_font_selection_dialog_new(byte[] title) {
* @param fsd cast=(GtkFontSelectionDialog *)
* @param fontname cast=(const gchar *)
*/
-public static final native boolean _gtk_font_selection_dialog_set_font_name(int /*long*/ fsd, byte[] fontname);
-public static final boolean gtk_font_selection_dialog_set_font_name(int /*long*/ fsd, byte[] fontname) {
+public static final native boolean _gtk_font_selection_dialog_set_font_name(long /*int*/ fsd, byte[] fontname);
+public static final boolean gtk_font_selection_dialog_set_font_name(long /*int*/ fsd, byte[] fontname) {
lock.lock();
try {
return _gtk_font_selection_dialog_set_font_name(fsd, fontname);
@@ -7090,8 +7090,8 @@ public static final boolean gtk_font_selection_dialog_set_font_name(int /*long*/
}
}
/** @param label cast=(const gchar *) */
-public static final native int /*long*/ _gtk_frame_new(byte[] label);
-public static final int /*long*/ gtk_frame_new(byte[] label) {
+public static final native long /*int*/ _gtk_frame_new(byte[] label);
+public static final long /*int*/ gtk_frame_new(byte[] label) {
lock.lock();
try {
return _gtk_frame_new(label);
@@ -7100,8 +7100,8 @@ public static final int /*long*/ gtk_frame_new(byte[] label) {
}
}
/** @param frame cast=(GtkFrame *) */
-public static final native int /*long*/ _gtk_frame_get_label_widget(int /*long*/ frame);
-public static final int /*long*/ gtk_frame_get_label_widget(int /*long*/ frame) {
+public static final native long /*int*/ _gtk_frame_get_label_widget(long /*int*/ frame);
+public static final long /*int*/ gtk_frame_get_label_widget(long /*int*/ frame) {
lock.lock();
try {
return _gtk_frame_get_label_widget(frame);
@@ -7113,8 +7113,8 @@ public static final int /*long*/ gtk_frame_get_label_widget(int /*long*/ frame)
* @param frame cast=(GtkFrame *)
* @param label_widget cast=(GtkWidget *)
*/
-public static final native void _gtk_frame_set_label_widget(int /*long*/ frame, int /*long*/ label_widget);
-public static final void gtk_frame_set_label_widget(int /*long*/ frame, int /*long*/ label_widget) {
+public static final native void _gtk_frame_set_label_widget(long /*int*/ frame, long /*int*/ label_widget);
+public static final void gtk_frame_set_label_widget(long /*int*/ frame, long /*int*/ label_widget) {
lock.lock();
try {
_gtk_frame_set_label_widget(frame, label_widget);
@@ -7126,8 +7126,8 @@ public static final void gtk_frame_set_label_widget(int /*long*/ frame, int /*lo
* @param frame cast=(GtkFrame *)
* @param type cast=(GtkShadowType)
*/
-public static final native void _gtk_frame_set_shadow_type(int /*long*/ frame, int type);
-public static final void gtk_frame_set_shadow_type(int /*long*/ frame, int type) {
+public static final native void _gtk_frame_set_shadow_type(long /*int*/ frame, int type);
+public static final void gtk_frame_set_shadow_type(long /*int*/ frame, int type) {
lock.lock();
try {
_gtk_frame_set_shadow_type(frame, type);
@@ -7135,8 +7135,8 @@ public static final void gtk_frame_set_shadow_type(int /*long*/ frame, int type)
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_get_current_event();
-public static final int /*long*/ gtk_get_current_event() {
+public static final native long /*int*/ _gtk_get_current_event();
+public static final long /*int*/ gtk_get_current_event() {
lock.lock();
try {
return _gtk_get_current_event();
@@ -7154,8 +7154,8 @@ public static final boolean gtk_get_current_event_state (int[] state) {
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_get_default_language();
-public static final int /*long*/ gtk_get_default_language() {
+public static final native long /*int*/ _gtk_get_default_language();
+public static final long /*int*/ gtk_get_default_language() {
lock.lock();
try {
return _gtk_get_default_language();
@@ -7164,8 +7164,8 @@ public static final int /*long*/ gtk_get_default_language() {
}
}
/** @param event cast=(GdkEvent *) */
-public static final native int /*long*/ _gtk_get_event_widget(int /*long*/ event);
-public static final int /*long*/ gtk_get_event_widget(int /*long*/ event) {
+public static final native long /*int*/ _gtk_get_event_widget(long /*int*/ event);
+public static final long /*int*/ gtk_get_event_widget(long /*int*/ event) {
lock.lock();
try {
return _gtk_get_event_widget(event);
@@ -7173,8 +7173,8 @@ public static final int /*long*/ gtk_get_event_widget(int /*long*/ event) {
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_grab_get_current();
-public static final int /*long*/ gtk_grab_get_current() {
+public static final native long /*int*/ _gtk_grab_get_current();
+public static final long /*int*/ gtk_grab_get_current() {
lock.lock();
try {
return _gtk_grab_get_current();
@@ -7187,8 +7187,8 @@ public static final int /*long*/ gtk_grab_get_current() {
* @param homogeneous cast=(gboolean)
* @param spacing cast=(gint)
*/
-public static final native int /*long*/ _gtk_hbox_new(boolean homogeneous, int spacing);
-public static final int /*long*/ gtk_hbox_new(boolean homogeneous, int spacing) {
+public static final native long /*int*/ _gtk_hbox_new(boolean homogeneous, int spacing);
+public static final long /*int*/ gtk_hbox_new(boolean homogeneous, int spacing) {
lock.lock();
try {
return _gtk_hbox_new(homogeneous, spacing);
@@ -7200,8 +7200,8 @@ public static final int /*long*/ gtk_hbox_new(boolean homogeneous, int spacing)
* @method flags=dynamic
* @param orientation cast=(GtkOrientation)
*/
-public static final native int /*long*/ _gtk_box_new(int orientation, int spacing);
-public static final int /*long*/ gtk_box_new(int orientation, int spacing) {
+public static final native long /*int*/ _gtk_box_new(int orientation, int spacing);
+public static final long /*int*/ gtk_box_new(int orientation, int spacing) {
lock.lock();
try {
return _gtk_box_new(orientation, spacing);
@@ -7213,8 +7213,8 @@ public static final int /*long*/ gtk_box_new(int orientation, int spacing) {
* @method flags=dynamic
* @param box cast=(GtkBox *)
*/
-public static final native void _gtk_box_set_homogeneous(int /*long*/ box, boolean homogeneous);
-public static final void gtk_box_set_homogeneous(int /*long*/ box, boolean homogeneous) {
+public static final native void _gtk_box_set_homogeneous(long /*int*/ box, boolean homogeneous);
+public static final void gtk_box_set_homogeneous(long /*int*/ box, boolean homogeneous) {
lock.lock();
try {
_gtk_box_set_homogeneous(box, homogeneous);
@@ -7226,8 +7226,8 @@ public static final void gtk_box_set_homogeneous(int /*long*/ box, boolean homog
* @method flags=dynamic
* @param adjustment cast=(GtkAdjustment *)
*/
-public static final native int /*long*/ _gtk_hscale_new(int /*long*/ adjustment);
-public static final int /*long*/ gtk_hscale_new(int /*long*/ adjustment) {
+public static final native long /*int*/ _gtk_hscale_new(long /*int*/ adjustment);
+public static final long /*int*/ gtk_hscale_new(long /*int*/ adjustment) {
lock.lock();
try {
return _gtk_hscale_new(adjustment);
@@ -7240,8 +7240,8 @@ public static final int /*long*/ gtk_hscale_new(int /*long*/ adjustment) {
* @param orientation cast=(GtkOrientation)
* @param adjustment cast=(GtkAdjustment *)
*/
-public static final native int /*long*/ _gtk_scale_new(int orientation, int /*long*/ adjustment);
-public static final int /*long*/ gtk_scale_new(int orientation, int /*long*/ adjustment) {
+public static final native long /*int*/ _gtk_scale_new(int orientation, long /*int*/ adjustment);
+public static final long /*int*/ gtk_scale_new(int orientation, long /*int*/ adjustment) {
lock.lock();
try {
return _gtk_scale_new(orientation, adjustment);
@@ -7253,8 +7253,8 @@ public static final int /*long*/ gtk_scale_new(int orientation, int /*long*/ adj
* @method flags=dynamic
* @param adjustment cast=(GtkAdjustment *)
*/
-public static final native int /*long*/ _gtk_hscrollbar_new(int /*long*/ adjustment);
-public static final int /*long*/ gtk_hscrollbar_new(int /*long*/ adjustment) {
+public static final native long /*int*/ _gtk_hscrollbar_new(long /*int*/ adjustment);
+public static final long /*int*/ gtk_hscrollbar_new(long /*int*/ adjustment) {
lock.lock();
try {
return _gtk_hscrollbar_new(adjustment);
@@ -7267,8 +7267,8 @@ public static final int /*long*/ gtk_hscrollbar_new(int /*long*/ adjustment) {
* @param orientation cast=(GtkOrientation)
* @param adjustment cast=(GtkAdjustment *)
* */
-public static final native int /*long*/ _gtk_scrollbar_new(int orientation, int /*long*/ adjustment);
-public static final int /*long*/ gtk_scrollbar_new(int orientation, int /*long*/ adjustment) {
+public static final native long /*int*/ _gtk_scrollbar_new(int orientation, long /*int*/ adjustment);
+public static final long /*int*/ gtk_scrollbar_new(int orientation, long /*int*/ adjustment) {
lock.lock();
try {
return _gtk_scrollbar_new(orientation, adjustment);
@@ -7277,8 +7277,8 @@ public static final int /*long*/ gtk_scrollbar_new(int orientation, int /*long*/
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_hseparator_new();
-public static final int /*long*/ gtk_hseparator_new() {
+public static final native long /*int*/ _gtk_hseparator_new();
+public static final long /*int*/ gtk_hseparator_new() {
lock.lock();
try {
return _gtk_hseparator_new();
@@ -7290,8 +7290,8 @@ public static final int /*long*/ gtk_hseparator_new() {
* @method flags=dynamic
* @param orientation cast=(GtkOrientation)
*/
-public static final native int /*long*/ _gtk_separator_new(int orientation);
-public static final int /*long*/ gtk_separator_new(int orientation) {
+public static final native long /*int*/ _gtk_separator_new(int orientation);
+public static final long /*int*/ gtk_separator_new(int orientation) {
lock.lock();
try {
return _gtk_separator_new(orientation);
@@ -7299,8 +7299,8 @@ public static final int /*long*/ gtk_separator_new(int orientation) {
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_status_icon_position_menu_func();
-public static final int /*long*/ gtk_status_icon_position_menu_func() {
+public static final native long /*int*/ _gtk_status_icon_position_menu_func();
+public static final long /*int*/ gtk_status_icon_position_menu_func() {
lock.lock();
try {
return _gtk_status_icon_position_menu_func();
@@ -7311,8 +7311,8 @@ public static final int /*long*/ gtk_status_icon_position_menu_func() {
/**
* @method flags=dynamic
*/
-public static final native void _gtk_icon_info_free(int /*long*/ icon_info);
-public static final void gtk_icon_info_free(int /*long*/ icon_info) {
+public static final native void _gtk_icon_info_free(long /*int*/ icon_info);
+public static final void gtk_icon_info_free(long /*int*/ icon_info) {
lock.lock();
try {
_gtk_icon_info_free(icon_info);
@@ -7321,8 +7321,8 @@ public static final void gtk_icon_info_free(int /*long*/ icon_info) {
}
}
/** @param stock_id cast=(const gchar *) */
-public static final native int /*long*/ _gtk_icon_factory_lookup_default(byte[] stock_id);
-public static final int /*long*/ gtk_icon_factory_lookup_default(byte[] stock_id) {
+public static final native long /*int*/ _gtk_icon_factory_lookup_default(byte[] stock_id);
+public static final long /*int*/ gtk_icon_factory_lookup_default(byte[] stock_id) {
lock.lock();
try {
return _gtk_icon_factory_lookup_default(stock_id);
@@ -7331,8 +7331,8 @@ public static final int /*long*/ gtk_icon_factory_lookup_default(byte[] stock_id
}
}
/** @param source cast=(GtkIconSource *) */
-public static final native void _gtk_icon_source_free(int /*long*/ source);
-public static final void gtk_icon_source_free(int /*long*/ source) {
+public static final native void _gtk_icon_source_free(long /*int*/ source);
+public static final void gtk_icon_source_free(long /*int*/ source) {
lock.lock();
try {
_gtk_icon_source_free(source);
@@ -7340,8 +7340,8 @@ public static final void gtk_icon_source_free(int /*long*/ source) {
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_icon_source_new();
-public static final int /*long*/ gtk_icon_source_new() {
+public static final native long /*int*/ _gtk_icon_source_new();
+public static final long /*int*/ gtk_icon_source_new() {
lock.lock();
try {
return _gtk_icon_source_new();
@@ -7353,8 +7353,8 @@ public static final int /*long*/ gtk_icon_source_new() {
* @param source cast=(GtkIconSource *)
* @param pixbuf cast=(GdkPixbuf *)
*/
-public static final native void _gtk_icon_source_set_pixbuf(int /*long*/ source, int /*long*/ pixbuf);
-public static final void gtk_icon_source_set_pixbuf(int /*long*/ source, int /*long*/ pixbuf) {
+public static final native void _gtk_icon_source_set_pixbuf(long /*int*/ source, long /*int*/ pixbuf);
+public static final void gtk_icon_source_set_pixbuf(long /*int*/ source, long /*int*/ pixbuf) {
lock.lock();
try {
_gtk_icon_source_set_pixbuf(source, pixbuf);
@@ -7371,8 +7371,8 @@ public static final void gtk_icon_source_set_pixbuf(int /*long*/ source, int /*l
* @param widget cast=(GtkWidget *)
* @param detail cast=(const char *)
*/
-public static final native int /*long*/ _gtk_icon_set_render_icon(int /*long*/ icon_set, int /*long*/ style, int direction, int state, int size, int /*long*/ widget, int /*long*/ detail);
-public static final int /*long*/ gtk_icon_set_render_icon(int /*long*/ icon_set, int /*long*/ style, int direction, int state, int size, int /*long*/ widget, int /*long*/ detail) {
+public static final native long /*int*/ _gtk_icon_set_render_icon(long /*int*/ icon_set, long /*int*/ style, int direction, int state, int size, long /*int*/ widget, long /*int*/ detail);
+public static final long /*int*/ gtk_icon_set_render_icon(long /*int*/ icon_set, long /*int*/ style, int direction, int state, int size, long /*int*/ widget, long /*int*/ detail) {
lock.lock();
try {
return _gtk_icon_set_render_icon(icon_set, style, direction, state, size, widget, detail);
@@ -7383,8 +7383,8 @@ public static final int /*long*/ gtk_icon_set_render_icon(int /*long*/ icon_set,
/**
* @method flags=dynamic
*/
-public static final native int /*long*/ _gtk_icon_theme_get_default();
-public static final int /*long*/ gtk_icon_theme_get_default() {
+public static final native long /*int*/ _gtk_icon_theme_get_default();
+public static final long /*int*/ gtk_icon_theme_get_default() {
lock.lock();
try {
return _gtk_icon_theme_get_default ();
@@ -7395,8 +7395,8 @@ public static final int /*long*/ gtk_icon_theme_get_default() {
/**
* @method flags=dynamic
*/
-public static final native int /*long*/ _gtk_icon_theme_lookup_by_gicon(int /*long*/ icon_theme, int /*long*/ icon, int size, int flags);
-public static final int /*long*/ gtk_icon_theme_lookup_by_gicon(int /*long*/ icon_theme, int /*long*/ icon, int size, int flags) {
+public static final native long /*int*/ _gtk_icon_theme_lookup_by_gicon(long /*int*/ icon_theme, long /*int*/ icon, int size, int flags);
+public static final long /*int*/ gtk_icon_theme_lookup_by_gicon(long /*int*/ icon_theme, long /*int*/ icon, int size, int flags) {
lock.lock();
try {
return _gtk_icon_theme_lookup_by_gicon (icon_theme, icon, size, flags);
@@ -7407,8 +7407,8 @@ public static final int /*long*/ gtk_icon_theme_lookup_by_gicon(int /*long*/ ico
/**
* @method flags=dynamic
*/
-public static final native int /*long*/ _gtk_icon_info_load_icon(int /*long*/ icon_info, int /*long*/ error[]);
-public static final int /*long*/ gtk_icon_info_load_icon(int /*long*/ icon_info, int /*long*/ error[]) {
+public static final native long /*int*/ _gtk_icon_info_load_icon(long /*int*/ icon_info, long /*int*/ error[]);
+public static final long /*int*/ gtk_icon_info_load_icon(long /*int*/ icon_info, long /*int*/ error[]) {
lock.lock();
try {
return _gtk_icon_info_load_icon(icon_info, error);
@@ -7420,8 +7420,8 @@ public static final int /*long*/ gtk_icon_info_load_icon(int /*long*/ icon_info,
* @param context cast=(GtkIMContext *)
* @param event cast=(GdkEventKey *)
*/
-public static final native boolean _gtk_im_context_filter_keypress(int /*long*/ context, int /*long*/ event);
-public static final boolean gtk_im_context_filter_keypress(int /*long*/ context, int /*long*/ event) {
+public static final native boolean _gtk_im_context_filter_keypress(long /*int*/ context, long /*int*/ event);
+public static final boolean gtk_im_context_filter_keypress(long /*int*/ context, long /*int*/ event) {
lock.lock();
try {
return _gtk_im_context_filter_keypress(context, event);
@@ -7430,8 +7430,8 @@ public static final boolean gtk_im_context_filter_keypress(int /*long*/ context,
}
}
/** @param context cast=(GtkIMContext *) */
-public static final native void _gtk_im_context_focus_in(int /*long*/ context);
-public static final void gtk_im_context_focus_in(int /*long*/ context) {
+public static final native void _gtk_im_context_focus_in(long /*int*/ context);
+public static final void gtk_im_context_focus_in(long /*int*/ context) {
lock.lock();
try {
_gtk_im_context_focus_in(context);
@@ -7440,8 +7440,8 @@ public static final void gtk_im_context_focus_in(int /*long*/ context) {
}
}
/** @param context cast=(GtkIMContext *) */
-public static final native void _gtk_im_context_focus_out(int /*long*/ context);
-public static final void gtk_im_context_focus_out(int /*long*/ context) {
+public static final native void _gtk_im_context_focus_out(long /*int*/ context);
+public static final void gtk_im_context_focus_out(long /*int*/ context) {
lock.lock();
try {
_gtk_im_context_focus_out(context);
@@ -7455,8 +7455,8 @@ public static final void gtk_im_context_focus_out(int /*long*/ context) {
* @param attrs cast=(PangoAttrList **)
* @param cursor_pos cast=(gint *)
*/
-public static final native void _gtk_im_context_get_preedit_string(int /*long*/ context, int /*long*/[] str, int /*long*/[] attrs, int[] cursor_pos);
-public static final void gtk_im_context_get_preedit_string(int /*long*/ context, int /*long*/[] str, int /*long*/[] attrs, int[] cursor_pos) {
+public static final native void _gtk_im_context_get_preedit_string(long /*int*/ context, long /*int*/[] str, long /*int*/[] attrs, int[] cursor_pos);
+public static final void gtk_im_context_get_preedit_string(long /*int*/ context, long /*int*/[] str, long /*int*/[] attrs, int[] cursor_pos) {
lock.lock();
try {
_gtk_im_context_get_preedit_string(context, str, attrs, cursor_pos);
@@ -7464,8 +7464,8 @@ public static final void gtk_im_context_get_preedit_string(int /*long*/ context,
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_im_context_get_type();
-public static final int /*long*/ gtk_im_context_get_type() {
+public static final native long /*int*/ _gtk_im_context_get_type();
+public static final long /*int*/ gtk_im_context_get_type() {
lock.lock();
try {
return _gtk_im_context_get_type();
@@ -7474,8 +7474,8 @@ public static final int /*long*/ gtk_im_context_get_type() {
}
}
/** @param context cast=(GtkIMContext *) */
-public static final native void _gtk_im_context_reset(int /*long*/ context);
-public static final void gtk_im_context_reset(int /*long*/ context) {
+public static final native void _gtk_im_context_reset(long /*int*/ context);
+public static final void gtk_im_context_reset(long /*int*/ context) {
lock.lock();
try {
_gtk_im_context_reset(context);
@@ -7487,8 +7487,8 @@ public static final void gtk_im_context_reset(int /*long*/ context) {
* @param context cast=(GtkIMContext *)
* @param window cast=(GdkWindow *)
*/
-public static final native void _gtk_im_context_set_client_window(int /*long*/ context, int /*long*/ window);
-public static final void gtk_im_context_set_client_window(int /*long*/ context, int /*long*/ window) {
+public static final native void _gtk_im_context_set_client_window(long /*int*/ context, long /*int*/ window);
+public static final void gtk_im_context_set_client_window(long /*int*/ context, long /*int*/ window) {
lock.lock();
try {
_gtk_im_context_set_client_window(context, window);
@@ -7500,8 +7500,8 @@ public static final void gtk_im_context_set_client_window(int /*long*/ context,
* @param context cast=(GtkIMContext *)
* @param area cast=(GdkRectangle *),flags=no_out
*/
-public static final native void _gtk_im_context_set_cursor_location(int /*long*/ context, GdkRectangle area);
-public static final void gtk_im_context_set_cursor_location(int /*long*/ context, GdkRectangle area) {
+public static final native void _gtk_im_context_set_cursor_location(long /*int*/ context, GdkRectangle area);
+public static final void gtk_im_context_set_cursor_location(long /*int*/ context, GdkRectangle area) {
lock.lock();
try {
_gtk_im_context_set_cursor_location(context, area);
@@ -7513,8 +7513,8 @@ public static final void gtk_im_context_set_cursor_location(int /*long*/ context
* @param context cast=(GtkIMMulticontext *)
* @param menushell cast=(GtkMenuShell *)
*/
-public static final native void _gtk_im_multicontext_append_menuitems (int /*long*/ context, int /*long*/ menushell);
-public static final void gtk_im_multicontext_append_menuitems (int /*long*/ context, int /*long*/ menushell) {
+public static final native void _gtk_im_multicontext_append_menuitems (long /*int*/ context, long /*int*/ menushell);
+public static final void gtk_im_multicontext_append_menuitems (long /*int*/ context, long /*int*/ menushell) {
lock.lock();
try {
_gtk_im_multicontext_append_menuitems(context, menushell);
@@ -7522,8 +7522,8 @@ public static final void gtk_im_multicontext_append_menuitems (int /*long*/ cont
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_im_multicontext_new();
-public static final int /*long*/ gtk_im_multicontext_new() {
+public static final native long /*int*/ _gtk_im_multicontext_new();
+public static final long /*int*/ gtk_im_multicontext_new() {
lock.lock();
try {
return _gtk_im_multicontext_new();
@@ -7532,8 +7532,8 @@ public static final int /*long*/ gtk_im_multicontext_new() {
}
}
/** @param label cast=(const gchar *) */
-public static final native int /*long*/ _gtk_image_menu_item_new_with_label(byte[] label);
-public static final int /*long*/ gtk_image_menu_item_new_with_label(byte[] label) {
+public static final native long /*int*/ _gtk_image_menu_item_new_with_label(byte[] label);
+public static final long /*int*/ gtk_image_menu_item_new_with_label(byte[] label) {
lock.lock();
try {
return _gtk_image_menu_item_new_with_label(label);
@@ -7545,8 +7545,8 @@ public static final int /*long*/ gtk_image_menu_item_new_with_label(byte[] label
* @param menu_item cast=(GtkImageMenuItem *)
* @param image cast=(GtkWidget *)
*/
-public static final native void _gtk_image_menu_item_set_image(int /*long*/ menu_item, int /*long*/ image);
-public static final void gtk_image_menu_item_set_image(int /*long*/ menu_item, int /*long*/ image) {
+public static final native void _gtk_image_menu_item_set_image(long /*int*/ menu_item, long /*int*/ image);
+public static final void gtk_image_menu_item_set_image(long /*int*/ menu_item, long /*int*/ image) {
lock.lock();
try {
_gtk_image_menu_item_set_image(menu_item, image);
@@ -7554,8 +7554,8 @@ public static final void gtk_image_menu_item_set_image(int /*long*/ menu_item, i
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_image_new();
-public static final int /*long*/ gtk_image_new() {
+public static final native long /*int*/ _gtk_image_new();
+public static final long /*int*/ gtk_image_new() {
lock.lock();
try {
return _gtk_image_new();
@@ -7564,8 +7564,8 @@ public static final int /*long*/ gtk_image_new() {
}
}
/** @param pixbuf cast=(GdkPixbuf *) */
-public static final native int /*long*/ _gtk_image_new_from_pixbuf(int /*long*/ pixbuf);
-public static final int /*long*/ gtk_image_new_from_pixbuf(int /*long*/ pixbuf) {
+public static final native long /*int*/ _gtk_image_new_from_pixbuf(long /*int*/ pixbuf);
+public static final long /*int*/ gtk_image_new_from_pixbuf(long /*int*/ pixbuf) {
lock.lock();
try {
return _gtk_image_new_from_pixbuf(pixbuf);
@@ -7577,8 +7577,8 @@ public static final int /*long*/ gtk_image_new_from_pixbuf(int /*long*/ pixbuf)
* @param image cast=(GtkImage *)
* @param pixbuf cast=(GdkPixbuf *)
*/
-public static final native void _gtk_image_set_from_pixbuf(int /*long*/ image, int /*long*/ pixbuf);
-public static final void gtk_image_set_from_pixbuf(int /*long*/ image, int /*long*/ pixbuf) {
+public static final native void _gtk_image_set_from_pixbuf(long /*int*/ image, long /*int*/ pixbuf);
+public static final void gtk_image_set_from_pixbuf(long /*int*/ image, long /*int*/ pixbuf) {
lock.lock();
try {
_gtk_image_set_from_pixbuf(image, pixbuf);
@@ -7590,8 +7590,8 @@ public static final void gtk_image_set_from_pixbuf(int /*long*/ image, int /*lon
* @param argc cast=(int *)
* @param argv cast=(char ***)
*/
-public static final native boolean _gtk_init_check(int /*long*/[] argc, int /*long*/[] argv);
-public static final boolean gtk_init_check(int /*long*/[] argc, int /*long*/[] argv) {
+public static final native boolean _gtk_init_check(long /*int*/[] argc, long /*int*/[] argv);
+public static final boolean gtk_init_check(long /*int*/[] argc, long /*int*/[] argv) {
lock.lock();
try {
return _gtk_init_check(argc, argv);
@@ -7600,8 +7600,8 @@ public static final boolean gtk_init_check(int /*long*/[] argc, int /*long*/[] a
}
}
/** @param label cast=(GtkLabel *) */
-public static final native int /*long*/ _gtk_label_get_layout(int /*long*/ label);
-public static final int /*long*/ gtk_label_get_layout(int /*long*/ label) {
+public static final native long /*int*/ _gtk_label_get_layout(long /*int*/ label);
+public static final long /*int*/ gtk_label_get_layout(long /*int*/ label) {
lock.lock();
try {
return _gtk_label_get_layout(label);
@@ -7610,8 +7610,8 @@ public static final int /*long*/ gtk_label_get_layout(int /*long*/ label) {
}
}
/** @param label cast=(GtkLabel *) */
-public static final native int _gtk_label_get_mnemonic_keyval(int /*long*/ label);
-public static final int gtk_label_get_mnemonic_keyval(int /*long*/ label) {
+public static final native int _gtk_label_get_mnemonic_keyval(long /*int*/ label);
+public static final int gtk_label_get_mnemonic_keyval(long /*int*/ label) {
lock.lock();
try {
return _gtk_label_get_mnemonic_keyval(label);
@@ -7620,8 +7620,8 @@ public static final int gtk_label_get_mnemonic_keyval(int /*long*/ label) {
}
}
/** @param label cast=(const gchar *) */
-public static final native int /*long*/ _gtk_label_new(byte[] label);
-public static final int /*long*/ gtk_label_new(byte[] label) {
+public static final native long /*int*/ _gtk_label_new(byte[] label);
+public static final long /*int*/ gtk_label_new(byte[] label) {
lock.lock();
try {
return _gtk_label_new(label);
@@ -7630,8 +7630,8 @@ public static final int /*long*/ gtk_label_new(byte[] label) {
}
}
/** @param str cast=(const gchar *) */
-public static final native int /*long*/ _gtk_label_new_with_mnemonic(byte[] str);
-public static final int /*long*/ gtk_label_new_with_mnemonic(byte[] str) {
+public static final native long /*int*/ _gtk_label_new_with_mnemonic(byte[] str);
+public static final long /*int*/ gtk_label_new_with_mnemonic(byte[] str) {
lock.lock();
try {
return _gtk_label_new_with_mnemonic(str);
@@ -7643,8 +7643,8 @@ public static final int /*long*/ gtk_label_new_with_mnemonic(byte[] str) {
* @param label cast=(GtkLabel *)
* @param attrs cast=(PangoAttrList *)
*/
-public static final native void _gtk_label_set_attributes(int /*long*/ label, int /*long*/ attrs);
-public static final void gtk_label_set_attributes(int /*long*/ label, int /*long*/ attrs) {
+public static final native void _gtk_label_set_attributes(long /*int*/ label, long /*int*/ attrs);
+public static final void gtk_label_set_attributes(long /*int*/ label, long /*int*/ attrs) {
lock.lock();
try {
_gtk_label_set_attributes(label, attrs);
@@ -7656,8 +7656,8 @@ public static final void gtk_label_set_attributes(int /*long*/ label, int /*long
* @param label cast=(GtkLabel *)
* @param jtype cast=(GtkJustification)
*/
-public static final native void _gtk_label_set_justify(int /*long*/ label, int jtype);
-public static final void gtk_label_set_justify(int /*long*/ label, int jtype) {
+public static final native void _gtk_label_set_justify(long /*int*/ label, int jtype);
+public static final void gtk_label_set_justify(long /*int*/ label, int jtype) {
lock.lock();
try {
_gtk_label_set_justify(label, jtype);
@@ -7669,8 +7669,8 @@ public static final void gtk_label_set_justify(int /*long*/ label, int jtype) {
* @param label cast=(GtkLabel *)
* @param wrap cast=(gboolean)
*/
-public static final native void _gtk_label_set_line_wrap(int /*long*/ label, boolean wrap);
-public static final void gtk_label_set_line_wrap(int /*long*/ label, boolean wrap) {
+public static final native void _gtk_label_set_line_wrap(long /*int*/ label, boolean wrap);
+public static final void gtk_label_set_line_wrap(long /*int*/ label, boolean wrap) {
lock.lock();
try {
_gtk_label_set_line_wrap(label, wrap);
@@ -7679,8 +7679,8 @@ public static final void gtk_label_set_line_wrap(int /*long*/ label, boolean wra
}
}
/** @method flags=dynamic */
-public static final native void _gtk_label_set_line_wrap_mode(int /*long*/ label, int wrap_mode);
-public static final void gtk_label_set_line_wrap_mode(int /*long*/ label, int wrap_mode) {
+public static final native void _gtk_label_set_line_wrap_mode(long /*int*/ label, int wrap_mode);
+public static final void gtk_label_set_line_wrap_mode(long /*int*/ label, int wrap_mode) {
lock.lock();
try {
_gtk_label_set_line_wrap_mode(label, wrap_mode);
@@ -7692,8 +7692,8 @@ public static final void gtk_label_set_line_wrap_mode(int /*long*/ label, int wr
* @param label cast=(GtkLabel *)
* @param str cast=(const gchar *)
*/
-public static final native void _gtk_label_set_text(int /*long*/ label, int /*long*/ str);
-public static final void gtk_label_set_text(int /*long*/ label, int /*long*/ str) {
+public static final native void _gtk_label_set_text(long /*int*/ label, long /*int*/ str);
+public static final void gtk_label_set_text(long /*int*/ label, long /*int*/ str) {
lock.lock();
try {
_gtk_label_set_text(label, str);
@@ -7705,8 +7705,8 @@ public static final void gtk_label_set_text(int /*long*/ label, int /*long*/ str
* @param label cast=(GtkLabel *)
* @param str cast=(const gchar *)
*/
-public static final native void _gtk_label_set_text(int /*long*/ label, byte[] str);
-public static final void gtk_label_set_text(int /*long*/ label, byte[] str) {
+public static final native void _gtk_label_set_text(long /*int*/ label, byte[] str);
+public static final void gtk_label_set_text(long /*int*/ label, byte[] str) {
lock.lock();
try {
_gtk_label_set_text(label, str);
@@ -7718,8 +7718,8 @@ public static final void gtk_label_set_text(int /*long*/ label, byte[] str) {
* @param label cast=(GtkLabel *)
* @param str cast=(const gchar *)
*/
-public static final native void _gtk_label_set_text_with_mnemonic(int /*long*/ label, byte[] str);
-public static final void gtk_label_set_text_with_mnemonic(int /*long*/ label, byte[] str) {
+public static final native void _gtk_label_set_text_with_mnemonic(long /*int*/ label, byte[] str);
+public static final void gtk_label_set_text_with_mnemonic(long /*int*/ label, byte[] str) {
lock.lock();
try {
_gtk_label_set_text_with_mnemonic(label, str);
@@ -7731,8 +7731,8 @@ public static final void gtk_label_set_text_with_mnemonic(int /*long*/ label, by
* @param list_store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native void _gtk_list_store_append(int /*long*/ list_store, int /*long*/ iter);
-public static final void gtk_list_store_append(int /*long*/ list_store, int /*long*/ iter) {
+public static final native void _gtk_list_store_append(long /*int*/ list_store, long /*int*/ iter);
+public static final void gtk_list_store_append(long /*int*/ list_store, long /*int*/ iter) {
lock.lock();
try {
_gtk_list_store_append(list_store, iter);
@@ -7741,8 +7741,8 @@ public static final void gtk_list_store_append(int /*long*/ list_store, int /*lo
}
}
/** @param store cast=(GtkListStore *) */
-public static final native void _gtk_list_store_clear(int /*long*/ store);
-public static final void gtk_list_store_clear(int /*long*/ store) {
+public static final native void _gtk_list_store_clear(long /*int*/ store);
+public static final void gtk_list_store_clear(long /*int*/ store) {
lock.lock();
try {
_gtk_list_store_clear(store);
@@ -7755,8 +7755,8 @@ public static final void gtk_list_store_clear(int /*long*/ store) {
* @param iter cast=(GtkTreeIter *)
* @param position cast=(gint)
*/
-public static final native void _gtk_list_store_insert(int /*long*/ list_store, int /*long*/ iter, int position);
-public static final void gtk_list_store_insert(int /*long*/ list_store, int /*long*/ iter, int position) {
+public static final native void _gtk_list_store_insert(long /*int*/ list_store, long /*int*/ iter, int position);
+public static final void gtk_list_store_insert(long /*int*/ list_store, long /*int*/ iter, int position) {
lock.lock();
try {
_gtk_list_store_insert(list_store, iter, position);
@@ -7768,8 +7768,8 @@ public static final void gtk_list_store_insert(int /*long*/ list_store, int /*lo
* @param numColumns cast=(gint)
* @param types cast=(GType *)
*/
-public static final native int /*long*/ _gtk_list_store_newv(int numColumns, int /*long*/[] types);
-public static final int /*long*/ gtk_list_store_newv(int numColumns, int /*long*/[] types) {
+public static final native long /*int*/ _gtk_list_store_newv(int numColumns, long /*int*/[] types);
+public static final long /*int*/ gtk_list_store_newv(int numColumns, long /*int*/[] types) {
lock.lock();
try {
return _gtk_list_store_newv(numColumns, types);
@@ -7781,8 +7781,8 @@ public static final int /*long*/ gtk_list_store_newv(int numColumns, int /*long*
* @param list_store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native void _gtk_list_store_remove(int /*long*/ list_store, int /*long*/ iter);
-public static final void gtk_list_store_remove(int /*long*/ list_store, int /*long*/ iter) {
+public static final native void _gtk_list_store_remove(long /*int*/ list_store, long /*int*/ iter);
+public static final void gtk_list_store_remove(long /*int*/ list_store, long /*int*/ iter) {
lock.lock();
try {
_gtk_list_store_remove(list_store, iter);
@@ -7794,8 +7794,8 @@ public static final void gtk_list_store_remove(int /*long*/ list_store, int /*lo
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int terminator);
-public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int terminator) {
+public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, int terminator);
+public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, int terminator) {
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
@@ -7807,8 +7807,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int terminator);
-public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int terminator) {
+public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, int terminator);
+public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, int terminator) {
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
@@ -7820,8 +7820,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int terminator);
-public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int terminator) {
+public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, int terminator);
+public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, int terminator) {
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
@@ -7834,8 +7834,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param iter cast=(GtkTreeIter *)
* @param value flags=no_out
*/
-public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int terminator);
-public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int terminator) {
+public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, int terminator);
+public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, int terminator) {
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
@@ -7847,8 +7847,8 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkListStore *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int terminator);
-public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int terminator) {
+public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, int terminator);
+public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, int terminator) {
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
@@ -7926,8 +7926,8 @@ public static final void gtk_main() {
}
}
/** @param event cast=(GdkEvent *) */
-public static final native void _gtk_main_do_event(int /*long*/ event);
-public static final void gtk_main_do_event(int /*long*/ event) {
+public static final native void _gtk_main_do_event(long /*int*/ event);
+public static final void gtk_main_do_event(long /*int*/ event) {
lock.lock();
try {
_gtk_main_do_event(event);
@@ -7935,8 +7935,8 @@ public static final void gtk_main_do_event(int /*long*/ event) {
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_menu_bar_new();
-public static final int /*long*/ gtk_menu_bar_new() {
+public static final native long /*int*/ _gtk_menu_bar_new();
+public static final long /*int*/ gtk_menu_bar_new() {
lock.lock();
try {
return _gtk_menu_bar_new();
@@ -7948,8 +7948,8 @@ public static final int /*long*/ gtk_menu_bar_new() {
* @method flags=dynamic
* @param menu_item cast=(GtkMenuItem *)
*/
-public static final native void _gtk_menu_item_remove_submenu(int /*long*/ menu_item);
-public static final void gtk_menu_item_remove_submenu(int /*long*/ menu_item) {
+public static final native void _gtk_menu_item_remove_submenu(long /*int*/ menu_item);
+public static final void gtk_menu_item_remove_submenu(long /*int*/ menu_item) {
lock.lock();
try {
_gtk_menu_item_remove_submenu(menu_item);
@@ -7958,8 +7958,8 @@ public static final void gtk_menu_item_remove_submenu(int /*long*/ menu_item) {
}
}
/** @param menu_item cast=(GtkMenuItem *) */
-public static final native int /*long*/ _gtk_menu_item_get_submenu(int /*long*/ menu_item);
-public static final int /*long*/ gtk_menu_item_get_submenu(int /*long*/ menu_item) {
+public static final native long /*int*/ _gtk_menu_item_get_submenu(long /*int*/ menu_item);
+public static final long /*int*/ gtk_menu_item_get_submenu(long /*int*/ menu_item) {
lock.lock();
try {
return _gtk_menu_item_get_submenu(menu_item);
@@ -7971,8 +7971,8 @@ public static final int /*long*/ gtk_menu_item_get_submenu(int /*long*/ menu_ite
* @param menu_item cast=(GtkMenuItem *)
* @param submenu cast=(GtkWidget *)
*/
-public static final native void _gtk_menu_item_set_submenu(int /*long*/ menu_item, int /*long*/ submenu);
-public static final void gtk_menu_item_set_submenu(int /*long*/ menu_item, int /*long*/ submenu) {
+public static final native void _gtk_menu_item_set_submenu(long /*int*/ menu_item, long /*int*/ submenu);
+public static final void gtk_menu_item_set_submenu(long /*int*/ menu_item, long /*int*/ submenu) {
lock.lock();
try {
_gtk_menu_item_set_submenu(menu_item, submenu);
@@ -7980,8 +7980,8 @@ public static final void gtk_menu_item_set_submenu(int /*long*/ menu_item, int /
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_menu_new();
-public static final int /*long*/ gtk_menu_new() {
+public static final native long /*int*/ _gtk_menu_new();
+public static final long /*int*/ gtk_menu_new() {
lock.lock();
try {
return _gtk_menu_new();
@@ -7990,8 +7990,8 @@ public static final int /*long*/ gtk_menu_new() {
}
}
/** @param menu cast=(GtkMenu *) */
-public static final native void _gtk_menu_popdown(int /*long*/ menu);
-public static final void gtk_menu_popdown(int /*long*/ menu) {
+public static final native void _gtk_menu_popdown(long /*int*/ menu);
+public static final void gtk_menu_popdown(long /*int*/ menu) {
lock.lock();
try {
_gtk_menu_popdown(menu);
@@ -8008,8 +8008,8 @@ public static final void gtk_menu_popdown(int /*long*/ menu) {
* @param button cast=(guint)
* @param activate_time cast=(guint32)
*/
-public static final native void _gtk_menu_popup(int /*long*/ menu, int /*long*/ parent_menu_shell, int /*long*/ parent_menu_item, int /*long*/ func, int /*long*/ data, int button, int activate_time);
-public static final void gtk_menu_popup(int /*long*/ menu, int /*long*/ parent_menu_shell, int /*long*/ parent_menu_item, int /*long*/ func, int /*long*/ data, int button, int activate_time) {
+public static final native void _gtk_menu_popup(long /*int*/ menu, long /*int*/ parent_menu_shell, long /*int*/ parent_menu_item, long /*int*/ func, long /*int*/ data, int button, int activate_time);
+public static final void gtk_menu_popup(long /*int*/ menu, long /*int*/ parent_menu_shell, long /*int*/ parent_menu_item, long /*int*/ func, long /*int*/ data, int button, int activate_time) {
lock.lock();
try {
_gtk_menu_popup(menu, parent_menu_shell, parent_menu_item, func, data, button, activate_time);
@@ -8018,8 +8018,8 @@ public static final void gtk_menu_popup(int /*long*/ menu, int /*long*/ parent_m
}
}
/** @param menu_shell cast=(GtkMenuShell *) */
-public static final native void _gtk_menu_shell_deactivate(int /*long*/ menu_shell);
-public static final void gtk_menu_shell_deactivate(int /*long*/ menu_shell) {
+public static final native void _gtk_menu_shell_deactivate(long /*int*/ menu_shell);
+public static final void gtk_menu_shell_deactivate(long /*int*/ menu_shell) {
lock.lock();
try {
_gtk_menu_shell_deactivate(menu_shell);
@@ -8032,8 +8032,8 @@ public static final void gtk_menu_shell_deactivate(int /*long*/ menu_shell) {
* @param child cast=(GtkWidget *)
* @param position cast=(gint)
*/
-public static final native void _gtk_menu_shell_insert(int /*long*/ menu_shell, int /*long*/ child, int position);
-public static final void gtk_menu_shell_insert(int /*long*/ menu_shell, int /*long*/ child, int position) {
+public static final native void _gtk_menu_shell_insert(long /*int*/ menu_shell, long /*int*/ child, int position);
+public static final void gtk_menu_shell_insert(long /*int*/ menu_shell, long /*int*/ child, int position) {
lock.lock();
try {
_gtk_menu_shell_insert(menu_shell, child, position);
@@ -8046,8 +8046,8 @@ public static final void gtk_menu_shell_insert(int /*long*/ menu_shell, int /*lo
* @param menu_shell cast=(GtkMenuShell *)
* @param take_focus cast=(gboolean)
*/
-public static final native void _gtk_menu_shell_set_take_focus(int /*long*/ menu_shell, boolean take_focus);
-public static final void gtk_menu_shell_set_take_focus(int /*long*/ menu_shell, boolean take_focus) {
+public static final native void _gtk_menu_shell_set_take_focus(long /*int*/ menu_shell, boolean take_focus);
+public static final void gtk_menu_shell_set_take_focus(long /*int*/ menu_shell, boolean take_focus) {
lock.lock();
try {
_gtk_menu_shell_set_take_focus(menu_shell, take_focus);
@@ -8056,8 +8056,8 @@ public static final void gtk_menu_shell_set_take_focus(int /*long*/ menu_shell,
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_menu_tool_button_new(int /*long*/ icon_widget, byte[] label);
-public static final int /*long*/ gtk_menu_tool_button_new(int /*long*/ icon_widget, byte[] label) {
+public static final native long /*int*/ _gtk_menu_tool_button_new(long /*int*/ icon_widget, byte[] label);
+public static final long /*int*/ gtk_menu_tool_button_new(long /*int*/ icon_widget, byte[] label) {
lock.lock();
try {
return _gtk_menu_tool_button_new(icon_widget, label);
@@ -8072,8 +8072,8 @@ public static final int /*long*/ gtk_menu_tool_button_new(int /*long*/ icon_widg
* @param buttons cast=(GtkButtonsType)
* @param message_format cast=(const gchar *)
*/
-public static final native int /*long*/ _gtk_message_dialog_new(int /*long*/ parent, int flags, int type, int buttons, byte[] message_format);
-public static final int /*long*/ gtk_message_dialog_new(int /*long*/ parent, int flags, int type, int buttons, byte[] message_format) {
+public static final native long /*int*/ _gtk_message_dialog_new(long /*int*/ parent, int flags, int type, int buttons, byte[] message_format);
+public static final long /*int*/ gtk_message_dialog_new(long /*int*/ parent, int flags, int type, int buttons, byte[] message_format) {
lock.lock();
try {
return _gtk_message_dialog_new(parent, flags, type, buttons, message_format);
@@ -8086,8 +8086,8 @@ public static final int /*long*/ gtk_message_dialog_new(int /*long*/ parent, int
* @param xalign cast=(gfloat)
* @param yalign cast=(gfloat)
*/
-public static final native void _gtk_misc_set_alignment(int /*long*/ misc, float xalign, float yalign);
-public static final void gtk_misc_set_alignment(int /*long*/ misc, float xalign, float yalign) {
+public static final native void _gtk_misc_set_alignment(long /*int*/ misc, float xalign, float yalign);
+public static final void gtk_misc_set_alignment(long /*int*/ misc, float xalign, float yalign) {
lock.lock();
try {
_gtk_misc_set_alignment(misc, xalign, yalign);
@@ -8096,8 +8096,8 @@ public static final void gtk_misc_set_alignment(int /*long*/ misc, float xalign,
}
}
/** @param notebook cast=(GtkNotebook *) */
-public static final native int _gtk_notebook_get_current_page(int /*long*/ notebook);
-public static final int gtk_notebook_get_current_page(int /*long*/ notebook) {
+public static final native int _gtk_notebook_get_current_page(long /*int*/ notebook);
+public static final int gtk_notebook_get_current_page(long /*int*/ notebook) {
lock.lock();
try {
return _gtk_notebook_get_current_page(notebook);
@@ -8106,8 +8106,8 @@ public static final int gtk_notebook_get_current_page(int /*long*/ notebook) {
}
}
/** @param notebook cast=(GtkNotebook *) */
-public static final native boolean _gtk_notebook_get_scrollable(int /*long*/ notebook);
-public static final boolean gtk_notebook_get_scrollable(int /*long*/ notebook) {
+public static final native boolean _gtk_notebook_get_scrollable(long /*int*/ notebook);
+public static final boolean gtk_notebook_get_scrollable(long /*int*/ notebook) {
lock.lock();
try {
return _gtk_notebook_get_scrollable(notebook);
@@ -8121,8 +8121,8 @@ public static final boolean gtk_notebook_get_scrollable(int /*long*/ notebook) {
* @param tab_label cast=(GtkWidget *)
* @param position cast=(gint)
*/
-public static final native void _gtk_notebook_insert_page(int /*long*/ notebook, int /*long*/ child, int /*long*/ tab_label, int position);
-public static final void gtk_notebook_insert_page(int /*long*/ notebook, int /*long*/ child, int /*long*/ tab_label, int position) {
+public static final native void _gtk_notebook_insert_page(long /*int*/ notebook, long /*int*/ child, long /*int*/ tab_label, int position);
+public static final void gtk_notebook_insert_page(long /*int*/ notebook, long /*int*/ child, long /*int*/ tab_label, int position) {
lock.lock();
try {
_gtk_notebook_insert_page(notebook, child, tab_label, position);
@@ -8130,8 +8130,8 @@ public static final void gtk_notebook_insert_page(int /*long*/ notebook, int /*l
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_notebook_new();
-public static final int /*long*/ gtk_notebook_new() {
+public static final native long /*int*/ _gtk_notebook_new();
+public static final long /*int*/ gtk_notebook_new() {
lock.lock();
try {
return _gtk_notebook_new();
@@ -8140,8 +8140,8 @@ public static final int /*long*/ gtk_notebook_new() {
}
}
/** @param notebook cast=(GtkNotebook *) */
-public static final native void _gtk_notebook_next_page(int /*long*/ notebook);
-public static final void gtk_notebook_next_page(int /*long*/ notebook) {
+public static final native void _gtk_notebook_next_page(long /*int*/ notebook);
+public static final void gtk_notebook_next_page(long /*int*/ notebook) {
lock.lock();
try {
_gtk_notebook_next_page(notebook);
@@ -8150,8 +8150,8 @@ public static final void gtk_notebook_next_page(int /*long*/ notebook) {
}
}
/** @param notebook cast=(GtkNotebook *) */
-public static final native void _gtk_notebook_prev_page(int /*long*/ notebook);
-public static final void gtk_notebook_prev_page(int /*long*/ notebook) {
+public static final native void _gtk_notebook_prev_page(long /*int*/ notebook);
+public static final void gtk_notebook_prev_page(long /*int*/ notebook) {
lock.lock();
try {
_gtk_notebook_prev_page(notebook);
@@ -8163,8 +8163,8 @@ public static final void gtk_notebook_prev_page(int /*long*/ notebook) {
* @param notebook cast=(GtkNotebook *)
* @param page_num cast=(gint)
*/
-public static final native void _gtk_notebook_remove_page(int /*long*/ notebook, int page_num);
-public static final void gtk_notebook_remove_page(int /*long*/ notebook, int page_num) {
+public static final native void _gtk_notebook_remove_page(long /*int*/ notebook, int page_num);
+public static final void gtk_notebook_remove_page(long /*int*/ notebook, int page_num) {
lock.lock();
try {
_gtk_notebook_remove_page(notebook, page_num);
@@ -8176,8 +8176,8 @@ public static final void gtk_notebook_remove_page(int /*long*/ notebook, int pag
* @param notebook cast=(GtkNotebook *)
* @param page_num cast=(gint)
*/
-public static final native void _gtk_notebook_set_current_page(int /*long*/ notebook, int page_num);
-public static final void gtk_notebook_set_current_page(int /*long*/ notebook, int page_num) {
+public static final native void _gtk_notebook_set_current_page(long /*int*/ notebook, int page_num);
+public static final void gtk_notebook_set_current_page(long /*int*/ notebook, int page_num) {
lock.lock();
try {
_gtk_notebook_set_current_page(notebook, page_num);
@@ -8189,8 +8189,8 @@ public static final void gtk_notebook_set_current_page(int /*long*/ notebook, in
* @param notebook cast=(GtkNotebook *)
* @param scrollable cast=(gboolean)
*/
-public static final native void _gtk_notebook_set_scrollable(int /*long*/ notebook, boolean scrollable);
-public static final void gtk_notebook_set_scrollable(int /*long*/ notebook, boolean scrollable) {
+public static final native void _gtk_notebook_set_scrollable(long /*int*/ notebook, boolean scrollable);
+public static final void gtk_notebook_set_scrollable(long /*int*/ notebook, boolean scrollable) {
lock.lock();
try {
_gtk_notebook_set_scrollable(notebook, scrollable);
@@ -8202,8 +8202,8 @@ public static final void gtk_notebook_set_scrollable(int /*long*/ notebook, bool
* @param notebook cast=(GtkNotebook *)
* @param show_tabs cast=(gboolean)
*/
-public static final native void _gtk_notebook_set_show_tabs(int /*long*/ notebook, boolean show_tabs);
-public static final void gtk_notebook_set_show_tabs(int /*long*/ notebook, boolean show_tabs) {
+public static final native void _gtk_notebook_set_show_tabs(long /*int*/ notebook, boolean show_tabs);
+public static final void gtk_notebook_set_show_tabs(long /*int*/ notebook, boolean show_tabs) {
lock.lock();
try {
_gtk_notebook_set_show_tabs(notebook, show_tabs);
@@ -8215,8 +8215,8 @@ public static final void gtk_notebook_set_show_tabs(int /*long*/ notebook, boole
* @param notebook cast=(GtkNotebook *)
* @param pos cast=(GtkPositionType)
*/
-public static final native void _gtk_notebook_set_tab_pos(int /*long*/ notebook, int pos);
-public static final void gtk_notebook_set_tab_pos(int /*long*/ notebook, int pos) {
+public static final native void _gtk_notebook_set_tab_pos(long /*int*/ notebook, int pos);
+public static final void gtk_notebook_set_tab_pos(long /*int*/ notebook, int pos) {
lock.lock();
try {
_gtk_notebook_set_tab_pos(notebook, pos);
@@ -8225,8 +8225,8 @@ public static final void gtk_notebook_set_tab_pos(int /*long*/ notebook, int pos
}
}
/** @method flags=dynamic */
-public static final native void _gtk_object_sink(int /*long*/ object);
-public static final void gtk_object_sink(int /*long*/ object) {
+public static final native void _gtk_object_sink(long /*int*/ object);
+public static final void gtk_object_sink(long /*int*/ object) {
lock.lock();
try {
_gtk_object_sink(object);
@@ -8235,8 +8235,8 @@ public static final void gtk_object_sink(int /*long*/ object) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _g_object_ref_sink(int /*long*/ object);
-public static final int /*long*/ g_object_ref_sink(int /*long*/ object) {
+public static final native long /*int*/ _g_object_ref_sink(long /*int*/ object);
+public static final long /*int*/ g_object_ref_sink(long /*int*/ object) {
lock.lock();
try {
return _g_object_ref_sink(object);
@@ -8245,8 +8245,8 @@ public static final int /*long*/ g_object_ref_sink(int /*long*/ object) {
}
}
/** @method flags=dynamic */
-public static final native void _gtk_orientable_set_orientation(int /*long*/ orientable, int orientation);
-public static final void gtk_orientable_set_orientation(int /*long*/ orientable, int orientation) {
+public static final native void _gtk_orientable_set_orientation(long /*int*/ orientable, int orientation);
+public static final void gtk_orientable_set_orientation(long /*int*/ orientable, int orientation) {
lock.lock();
try {
_gtk_orientable_set_orientation(orientable, orientation);
@@ -8255,8 +8255,8 @@ public static final void gtk_orientable_set_orientation(int /*long*/ orientable,
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_page_setup_new ();
-public static final int /*long*/ gtk_page_setup_new () {
+public static final native long /*int*/ _gtk_page_setup_new ();
+public static final long /*int*/ gtk_page_setup_new () {
lock.lock();
try {
return _gtk_page_setup_new ();
@@ -8265,8 +8265,8 @@ public static final int /*long*/ gtk_page_setup_new () {
}
}
/** @method flags=dynamic */
-public static final native int _gtk_page_setup_get_orientation(int /*long*/ setup);
-public static final int gtk_page_setup_get_orientation(int /*long*/ setup) {
+public static final native int _gtk_page_setup_get_orientation(long /*int*/ setup);
+public static final int gtk_page_setup_get_orientation(long /*int*/ setup) {
lock.lock();
try {
return _gtk_page_setup_get_orientation(setup);
@@ -8275,8 +8275,8 @@ public static final int gtk_page_setup_get_orientation(int /*long*/ setup) {
}
}
/** @method flags=dynamic */
-public static final native void _gtk_page_setup_set_orientation(int /*long*/ setup, int orientation);
-public static final void gtk_page_setup_set_orientation(int /*long*/ setup, int orientation) {
+public static final native void _gtk_page_setup_set_orientation(long /*int*/ setup, int orientation);
+public static final void gtk_page_setup_set_orientation(long /*int*/ setup, int orientation) {
lock.lock();
try {
_gtk_page_setup_set_orientation(setup, orientation);
@@ -8285,8 +8285,8 @@ public static final void gtk_page_setup_set_orientation(int /*long*/ setup, int
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_page_setup_get_paper_size(int /*long*/ setup);
-public static final int /*long*/ gtk_page_setup_get_paper_size(int /*long*/ setup) {
+public static final native long /*int*/ _gtk_page_setup_get_paper_size(long /*int*/ setup);
+public static final long /*int*/ gtk_page_setup_get_paper_size(long /*int*/ setup) {
lock.lock();
try {
return _gtk_page_setup_get_paper_size(setup);
@@ -8295,8 +8295,8 @@ public static final int /*long*/ gtk_page_setup_get_paper_size(int /*long*/ setu
}
}
/** @method flags=dynamic */
-public static final native void _gtk_page_setup_set_paper_size(int /*long*/ setup, int /*long*/ size);
-public static final void gtk_page_setup_set_paper_size(int /*long*/ setup, int /*long*/ size) {
+public static final native void _gtk_page_setup_set_paper_size(long /*int*/ setup, long /*int*/ size);
+public static final void gtk_page_setup_set_paper_size(long /*int*/ setup, long /*int*/ size) {
lock.lock();
try {
_gtk_page_setup_set_paper_size(setup, size);
@@ -8305,8 +8305,8 @@ public static final void gtk_page_setup_set_paper_size(int /*long*/ setup, int /
}
}
/** @method flags=dynamic */
-public static final native double _gtk_page_setup_get_top_margin(int /*long*/ setup, int unit);
-public static final double gtk_page_setup_get_top_margin(int /*long*/ setup, int unit) {
+public static final native double _gtk_page_setup_get_top_margin(long /*int*/ setup, int unit);
+public static final double gtk_page_setup_get_top_margin(long /*int*/ setup, int unit) {
lock.lock();
try {
return _gtk_page_setup_get_top_margin(setup, unit);
@@ -8315,8 +8315,8 @@ public static final double gtk_page_setup_get_top_margin(int /*long*/ setup, int
}
}
/** @method flags=dynamic */
-public static final native void _gtk_page_setup_set_top_margin(int /*long*/ setup, double margin, int unit);
-public static final void gtk_page_setup_set_top_margin(int /*long*/ setup, double margin, int unit) {
+public static final native void _gtk_page_setup_set_top_margin(long /*int*/ setup, double margin, int unit);
+public static final void gtk_page_setup_set_top_margin(long /*int*/ setup, double margin, int unit) {
lock.lock();
try {
_gtk_page_setup_set_top_margin(setup, margin, unit);
@@ -8325,8 +8325,8 @@ public static final void gtk_page_setup_set_top_margin(int /*long*/ setup, doubl
}
}
/** @method flags=dynamic */
-public static final native double _gtk_page_setup_get_bottom_margin(int /*long*/ setup, int unit);
-public static final double gtk_page_setup_get_bottom_margin(int /*long*/ setup, int unit) {
+public static final native double _gtk_page_setup_get_bottom_margin(long /*int*/ setup, int unit);
+public static final double gtk_page_setup_get_bottom_margin(long /*int*/ setup, int unit) {
lock.lock();
try {
return _gtk_page_setup_get_bottom_margin(setup, unit);
@@ -8335,8 +8335,8 @@ public static final double gtk_page_setup_get_bottom_margin(int /*long*/ setup,
}
}
/** @method flags=dynamic */
-public static final native void _gtk_page_setup_set_bottom_margin(int /*long*/ setup, double margin, int unit);
-public static final void gtk_page_setup_set_bottom_margin(int /*long*/ setup, double margin, int unit) {
+public static final native void _gtk_page_setup_set_bottom_margin(long /*int*/ setup, double margin, int unit);
+public static final void gtk_page_setup_set_bottom_margin(long /*int*/ setup, double margin, int unit) {
lock.lock();
try {
_gtk_page_setup_set_bottom_margin(setup, margin, unit);
@@ -8345,8 +8345,8 @@ public static final void gtk_page_setup_set_bottom_margin(int /*long*/ setup, do
}
}
/** @method flags=dynamic */
-public static final native double _gtk_page_setup_get_left_margin(int /*long*/ setup, int unit);
-public static final double gtk_page_setup_get_left_margin(int /*long*/ setup, int unit) {
+public static final native double _gtk_page_setup_get_left_margin(long /*int*/ setup, int unit);
+public static final double gtk_page_setup_get_left_margin(long /*int*/ setup, int unit) {
lock.lock();
try {
return _gtk_page_setup_get_left_margin(setup, unit);
@@ -8355,8 +8355,8 @@ public static final double gtk_page_setup_get_left_margin(int /*long*/ setup, in
}
}
/** @method flags=dynamic */
-public static final native void _gtk_page_setup_set_left_margin(int /*long*/ setup, double margin, int unit);
-public static final void gtk_page_setup_set_left_margin(int /*long*/ setup, double margin, int unit) {
+public static final native void _gtk_page_setup_set_left_margin(long /*int*/ setup, double margin, int unit);
+public static final void gtk_page_setup_set_left_margin(long /*int*/ setup, double margin, int unit) {
lock.lock();
try {
_gtk_page_setup_set_left_margin(setup, margin, unit);
@@ -8365,8 +8365,8 @@ public static final void gtk_page_setup_set_left_margin(int /*long*/ setup, doub
}
}
/** @method flags=dynamic */
-public static final native double _gtk_page_setup_get_right_margin(int /*long*/ setup, int unit);
-public static final double gtk_page_setup_get_right_margin(int /*long*/ setup, int unit) {
+public static final native double _gtk_page_setup_get_right_margin(long /*int*/ setup, int unit);
+public static final double gtk_page_setup_get_right_margin(long /*int*/ setup, int unit) {
lock.lock();
try {
return _gtk_page_setup_get_right_margin(setup, unit);
@@ -8375,8 +8375,8 @@ public static final double gtk_page_setup_get_right_margin(int /*long*/ setup, i
}
}
/** @method flags=dynamic */
-public static final native void _gtk_page_setup_set_right_margin(int /*long*/ setup, double margin, int unit);
-public static final void gtk_page_setup_set_right_margin(int /*long*/ setup, double margin, int unit) {
+public static final native void _gtk_page_setup_set_right_margin(long /*int*/ setup, double margin, int unit);
+public static final void gtk_page_setup_set_right_margin(long /*int*/ setup, double margin, int unit) {
lock.lock();
try {
_gtk_page_setup_set_right_margin(setup, margin, unit);
@@ -8385,8 +8385,8 @@ public static final void gtk_page_setup_set_right_margin(int /*long*/ setup, dou
}
}
/** @method flags=dynamic */
-public static final native double _gtk_page_setup_get_paper_width(int /*long*/ setup, int unit);
-public static final double gtk_page_setup_get_paper_width(int /*long*/ setup, int unit) {
+public static final native double _gtk_page_setup_get_paper_width(long /*int*/ setup, int unit);
+public static final double gtk_page_setup_get_paper_width(long /*int*/ setup, int unit) {
lock.lock();
try {
return _gtk_page_setup_get_paper_width(setup, unit);
@@ -8395,8 +8395,8 @@ public static final double gtk_page_setup_get_paper_width(int /*long*/ setup, in
}
}
/** @method flags=dynamic */
-public static final native double _gtk_page_setup_get_paper_height(int /*long*/ setup, int unit);
-public static final double gtk_page_setup_get_paper_height(int /*long*/ setup, int unit) {
+public static final native double _gtk_page_setup_get_paper_height(long /*int*/ setup, int unit);
+public static final double gtk_page_setup_get_paper_height(long /*int*/ setup, int unit) {
lock.lock();
try {
return _gtk_page_setup_get_paper_height(setup, unit);
@@ -8405,8 +8405,8 @@ public static final double gtk_page_setup_get_paper_height(int /*long*/ setup, i
}
}
/** @method flags=dynamic */
-public static final native double _gtk_page_setup_get_page_width(int /*long*/ setup, int unit);
-public static final double gtk_page_setup_get_page_width(int /*long*/ setup, int unit) {
+public static final native double _gtk_page_setup_get_page_width(long /*int*/ setup, int unit);
+public static final double gtk_page_setup_get_page_width(long /*int*/ setup, int unit) {
lock.lock();
try {
return _gtk_page_setup_get_page_width(setup, unit);
@@ -8415,8 +8415,8 @@ public static final double gtk_page_setup_get_page_width(int /*long*/ setup, int
}
}
/** @method flags=dynamic */
-public static final native double _gtk_page_setup_get_page_height(int /*long*/ setup, int unit);
-public static final double gtk_page_setup_get_page_height(int /*long*/ setup, int unit) {
+public static final native double _gtk_page_setup_get_page_height(long /*int*/ setup, int unit);
+public static final double gtk_page_setup_get_page_height(long /*int*/ setup, int unit) {
lock.lock();
try {
return _gtk_page_setup_get_page_height(setup, unit);
@@ -8431,8 +8431,8 @@ public static final double gtk_page_setup_get_page_height(int /*long*/ setup, in
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
-public static final native void _gtk_paint_handle(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int orientation);
-public static final void gtk_paint_handle(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int orientation) {
+public static final native void _gtk_paint_handle(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height, int orientation);
+public static final void gtk_paint_handle(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height, int orientation) {
lock.lock();
try {
_gtk_paint_handle(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
@@ -8446,8 +8446,8 @@ public static final void gtk_paint_handle(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
-public static final native void _gtk_paint_flat_box(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
-public static final void gtk_paint_flat_box(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
+public static final native void _gtk_paint_flat_box(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height);
+public static final void gtk_paint_flat_box(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height) {
lock.lock();
try {
_gtk_paint_flat_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
@@ -8462,8 +8462,8 @@ public static final void gtk_paint_flat_box(int /*long*/ style, int /*long*/ win
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
-public static final native void _gtk_paint_focus(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
-public static final void gtk_paint_focus(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
+public static final native void _gtk_paint_focus(long /*int*/ style, long /*int*/ window, int state_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height);
+public static final void gtk_paint_focus(long /*int*/ style, long /*int*/ window, int state_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height) {
lock.lock();
try {
_gtk_paint_focus(style, window, state_type, area, widget, detail, x, y, width, height);
@@ -8477,8 +8477,8 @@ public static final void gtk_paint_focus(int /*long*/ style, int /*long*/ window
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
-public static final native void _gtk_paint_option(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
-public static final void gtk_paint_option(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
+public static final native void _gtk_paint_option(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height);
+public static final void gtk_paint_option(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height) {
lock.lock();
try {
_gtk_paint_option(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
@@ -8492,8 +8492,8 @@ public static final void gtk_paint_option(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
-public static final native void _gtk_paint_arrow(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int arrow_type, boolean fill, int x, int y, int width, int height);
-public static final void gtk_paint_arrow(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int arrow_type, boolean fill, int x, int y, int width, int height) {
+public static final native void _gtk_paint_arrow(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int arrow_type, boolean fill, int x, int y, int width, int height);
+public static final void gtk_paint_arrow(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int arrow_type, boolean fill, int x, int y, int width, int height) {
lock.lock();
try {
_gtk_paint_arrow(style, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height);
@@ -8508,8 +8508,8 @@ public static final void gtk_paint_arrow(int /*long*/ style, int /*long*/ window
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
-public static final native void _gtk_paint_box(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
-public static final void gtk_paint_box(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
+public static final native void _gtk_paint_box(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height);
+public static final void gtk_paint_box(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height) {
lock.lock();
try {
_gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
@@ -8523,8 +8523,8 @@ public static final void gtk_paint_box(int /*long*/ style, int /*long*/ window,
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
-public static final native void _gtk_paint_box_gap(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width);
-public static final void gtk_paint_box_gap(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width) {
+public static final native void _gtk_paint_box_gap(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width);
+public static final void gtk_paint_box_gap(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width) {
lock.lock();
try {
_gtk_paint_box_gap(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
@@ -8538,8 +8538,8 @@ public static final void gtk_paint_box_gap(int /*long*/ style, int /*long*/ wind
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
-public static final native void _gtk_paint_check(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
-public static final void gtk_paint_check(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
+public static final native void _gtk_paint_check(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height);
+public static final void gtk_paint_check(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height) {
lock.lock();
try {
_gtk_paint_check(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
@@ -8553,8 +8553,8 @@ public static final void gtk_paint_check(int /*long*/ style, int /*long*/ window
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
-public static final native void _gtk_paint_expander(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int expander_style);
-public static final void gtk_paint_expander(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int expander_style) {
+public static final native void _gtk_paint_expander(long /*int*/ style, long /*int*/ window, int state_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int expander_style);
+public static final void gtk_paint_expander(long /*int*/ style, long /*int*/ window, int state_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int expander_style) {
lock.lock();
try {
_gtk_paint_expander(style, window, state_type, area, widget, detail, x, y, expander_style);
@@ -8568,8 +8568,8 @@ public static final void gtk_paint_expander(int /*long*/ style, int /*long*/ win
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
-public static final native void _gtk_paint_extension(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side);
-public static final void gtk_paint_extension(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side) {
+public static final native void _gtk_paint_extension(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side);
+public static final void gtk_paint_extension(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side) {
lock.lock();
try {
_gtk_paint_extension(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side);
@@ -8583,8 +8583,8 @@ public static final void gtk_paint_extension(int /*long*/ style, int /*long*/ wi
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
-public static final native void _gtk_paint_hline(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x1 , int x2, int y);
-public static final void gtk_paint_hline(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x1 , int x2, int y) {
+public static final native void _gtk_paint_hline(long /*int*/ style, long /*int*/ window, int state_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x1 , int x2, int y);
+public static final void gtk_paint_hline(long /*int*/ style, long /*int*/ window, int state_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x1 , int x2, int y) {
lock.lock();
try {
_gtk_paint_hline(style, window, state_type, area, widget, detail, x1, x2, y);
@@ -8599,8 +8599,8 @@ public static final void gtk_paint_hline(int /*long*/ style, int /*long*/ window
* @param detail cast=(const gchar *)
* @param layout cast=(PangoLayout *)
*/
-public static final native void _gtk_paint_layout(int /*long*/ style, int /*long*/ window, int state_type, boolean use_text, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int /*long*/ layout);
-public static final void gtk_paint_layout(int /*long*/ style, int /*long*/ window, int state_type, boolean use_text, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int /*long*/ layout) {
+public static final native void _gtk_paint_layout(long /*int*/ style, long /*int*/ window, int state_type, boolean use_text, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, long /*int*/ layout);
+public static final void gtk_paint_layout(long /*int*/ style, long /*int*/ window, int state_type, boolean use_text, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, long /*int*/ layout) {
lock.lock();
try {
_gtk_paint_layout(style, window, state_type, use_text, area, widget, detail, x, y, layout);
@@ -8614,8 +8614,8 @@ public static final void gtk_paint_layout(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
-public static final native void _gtk_paint_shadow_gap(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width);
-public static final void gtk_paint_shadow_gap(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width) {
+public static final native void _gtk_paint_shadow_gap(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width);
+public static final void gtk_paint_shadow_gap(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width) {
lock.lock();
try {
_gtk_paint_shadow_gap(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
@@ -8629,8 +8629,8 @@ public static final void gtk_paint_shadow_gap(int /*long*/ style, int /*long*/ w
* @param widget cast=(GtkWidget *)
* @param detail cast=(gchar *)
*/
-public static final native void _gtk_paint_shadow(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
-public static final void gtk_paint_shadow(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
+public static final native void _gtk_paint_shadow(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height);
+public static final void gtk_paint_shadow(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height) {
lock.lock();
try {
_gtk_paint_shadow(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
@@ -8644,8 +8644,8 @@ public static final void gtk_paint_shadow(int /*long*/ style, int /*long*/ windo
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
-public static final native void _gtk_paint_vline(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int y1 , int y2, int x);
-public static final void gtk_paint_vline(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int y1 , int y2, int x) {
+public static final native void _gtk_paint_vline(long /*int*/ style, long /*int*/ window, int state_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int y1 , int y2, int x);
+public static final void gtk_paint_vline(long /*int*/ style, long /*int*/ window, int state_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int y1 , int y2, int x) {
lock.lock();
try {
_gtk_paint_vline(style, window, state_type, area, widget, detail, y1, y2, x);
@@ -8654,8 +8654,8 @@ public static final void gtk_paint_vline(int /*long*/ style, int /*long*/ window
}
}
/** @method flags=dynamic */
-public static final native void _gtk_paper_size_free(int /*long*/ size);
-public static final void gtk_paper_size_free(int /*long*/ size) {
+public static final native void _gtk_paper_size_free(long /*int*/ size);
+public static final void gtk_paper_size_free(long /*int*/ size) {
lock.lock();
try {
_gtk_paper_size_free(size);
@@ -8664,8 +8664,8 @@ public static final void gtk_paper_size_free(int /*long*/ size) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_paper_size_new(byte [] name);
-public static final int /*long*/ gtk_paper_size_new(byte [] name) {
+public static final native long /*int*/ _gtk_paper_size_new(byte [] name);
+public static final long /*int*/ gtk_paper_size_new(byte [] name) {
lock.lock();
try {
return _gtk_paper_size_new(name);
@@ -8674,8 +8674,8 @@ public static final int /*long*/ gtk_paper_size_new(byte [] name) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height);
-public static final int /*long*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height) {
+public static final native long /*int*/ _gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height);
+public static final long /*int*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height) {
lock.lock();
try {
return _gtk_paper_size_new_from_ppd(ppd_name, ppd_display_name, width, height);
@@ -8684,8 +8684,8 @@ public static final int /*long*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, b
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit);
-public static final int /*long*/ gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit) {
+public static final native long /*int*/ _gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit);
+public static final long /*int*/ gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit) {
lock.lock();
try {
return _gtk_paper_size_new_custom(name, display_name, width, height, unit);
@@ -8694,8 +8694,8 @@ public static final int /*long*/ gtk_paper_size_new_custom(byte [] name, byte []
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_paper_size_get_name(int /*long*/ size);
-public static final int /*long*/ gtk_paper_size_get_name(int /*long*/ size) {
+public static final native long /*int*/ _gtk_paper_size_get_name(long /*int*/ size);
+public static final long /*int*/ gtk_paper_size_get_name(long /*int*/ size) {
lock.lock();
try {
return _gtk_paper_size_get_name(size);
@@ -8704,8 +8704,8 @@ public static final int /*long*/ gtk_paper_size_get_name(int /*long*/ size) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_paper_size_get_display_name(int /*long*/ size);
-public static final int /*long*/ gtk_paper_size_get_display_name(int /*long*/ size) {
+public static final native long /*int*/ _gtk_paper_size_get_display_name(long /*int*/ size);
+public static final long /*int*/ gtk_paper_size_get_display_name(long /*int*/ size) {
lock.lock();
try {
return _gtk_paper_size_get_display_name(size);
@@ -8714,8 +8714,8 @@ public static final int /*long*/ gtk_paper_size_get_display_name(int /*long*/ si
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_paper_size_get_ppd_name(int /*long*/ size);
-public static final int /*long*/ gtk_paper_size_get_ppd_name(int /*long*/ size) {
+public static final native long /*int*/ _gtk_paper_size_get_ppd_name(long /*int*/ size);
+public static final long /*int*/ gtk_paper_size_get_ppd_name(long /*int*/ size) {
lock.lock();
try {
return _gtk_paper_size_get_ppd_name(size);
@@ -8724,8 +8724,8 @@ public static final int /*long*/ gtk_paper_size_get_ppd_name(int /*long*/ size)
}
}
/** @method flags=dynamic */
-public static final native double _gtk_paper_size_get_width(int /*long*/ size, int unit);
-public static final double gtk_paper_size_get_width(int /*long*/ size, int unit) {
+public static final native double _gtk_paper_size_get_width(long /*int*/ size, int unit);
+public static final double gtk_paper_size_get_width(long /*int*/ size, int unit) {
lock.lock();
try {
return _gtk_paper_size_get_width(size, unit);
@@ -8734,8 +8734,8 @@ public static final double gtk_paper_size_get_width(int /*long*/ size, int unit)
}
}
/** @method flags=dynamic */
-public static final native double _gtk_paper_size_get_height(int /*long*/ size, int unit);
-public static final double gtk_paper_size_get_height(int /*long*/ size, int unit) {
+public static final native double _gtk_paper_size_get_height(long /*int*/ size, int unit);
+public static final double gtk_paper_size_get_height(long /*int*/ size, int unit) {
lock.lock();
try {
return _gtk_paper_size_get_height(size, unit);
@@ -8744,8 +8744,8 @@ public static final double gtk_paper_size_get_height(int /*long*/ size, int unit
}
}
/** @method flags=dynamic */
-public static final native boolean _gtk_paper_size_is_custom(int /*long*/ size);
-public static final boolean gtk_paper_size_is_custom(int /*long*/ size) {
+public static final native boolean _gtk_paper_size_is_custom(long /*int*/ size);
+public static final boolean gtk_paper_size_is_custom(long /*int*/ size) {
lock.lock();
try {
return _gtk_paper_size_is_custom(size);
@@ -8754,8 +8754,8 @@ public static final boolean gtk_paper_size_is_custom(int /*long*/ size) {
}
}
/** @param plug cast=(GtkPlug *) */
-public static final native int /*long*/ _gtk_plug_get_id(int /*long*/ plug);
-public static final int /*long*/ gtk_plug_get_id(int /*long*/ plug) {
+public static final native long /*int*/ _gtk_plug_get_id(long /*int*/ plug);
+public static final long /*int*/ gtk_plug_get_id(long /*int*/ plug) {
lock.lock();
try {
return _gtk_plug_get_id(plug);
@@ -8763,8 +8763,8 @@ public static final int /*long*/ gtk_plug_get_id(int /*long*/ plug) {
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_plug_new(int /*long*/ socket_id);
-public static final int /*long*/ gtk_plug_new(int /*long*/ socket_id) {
+public static final native long /*int*/ _gtk_plug_new(long /*int*/ socket_id);
+public static final long /*int*/ gtk_plug_new(long /*int*/ socket_id) {
lock.lock();
try {
return _gtk_plug_new(socket_id);
@@ -8773,8 +8773,8 @@ public static final int /*long*/ gtk_plug_new(int /*long*/ socket_id) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_printer_get_backend(int /*long*/ printer);
-public static final int /*long*/ gtk_printer_get_backend(int /*long*/ printer) {
+public static final native long /*int*/ _gtk_printer_get_backend(long /*int*/ printer);
+public static final long /*int*/ gtk_printer_get_backend(long /*int*/ printer) {
lock.lock();
try {
return _gtk_printer_get_backend(printer);
@@ -8783,8 +8783,8 @@ public static final int /*long*/ gtk_printer_get_backend(int /*long*/ printer) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_printer_get_name(int /*long*/ printer);
-public static final int /*long*/ gtk_printer_get_name(int /*long*/ printer) {
+public static final native long /*int*/ _gtk_printer_get_name(long /*int*/ printer);
+public static final long /*int*/ gtk_printer_get_name(long /*int*/ printer) {
lock.lock();
try {
return _gtk_printer_get_name(printer);
@@ -8793,8 +8793,8 @@ public static final int /*long*/ gtk_printer_get_name(int /*long*/ printer) {
}
}
/** @method flags=dynamic */
-public static final native boolean _gtk_printer_is_default(int /*long*/ printer);
-public static final boolean gtk_printer_is_default(int /*long*/ printer) {
+public static final native boolean _gtk_printer_is_default(long /*int*/ printer);
+public static final boolean gtk_printer_is_default(long /*int*/ printer) {
lock.lock();
try {
return _gtk_printer_is_default(printer);
@@ -8808,8 +8808,8 @@ public static final boolean gtk_printer_is_default(int /*long*/ printer) {
* @param destroy cast=(GDestroyNotify)
* @param wait cast=(gboolean)
*/
-public static final native void _gtk_enumerate_printers(int /*long*/ func, int /*long*/data, int /*long*/ destroy, boolean wait);
-public static final void gtk_enumerate_printers(int /*long*/ func, int /*long*/data, int /*long*/ destroy, boolean wait) {
+public static final native void _gtk_enumerate_printers(long /*int*/ func, long /*int*/data, long /*int*/ destroy, boolean wait);
+public static final void gtk_enumerate_printers(long /*int*/ func, long /*int*/data, long /*int*/ destroy, boolean wait) {
lock.lock();
try {
_gtk_enumerate_printers(func, data, destroy, wait);
@@ -8821,8 +8821,8 @@ public static final void gtk_enumerate_printers(int /*long*/ func, int /*long*/d
* @method flags=dynamic
* @param title cast=(const gchar *)
*/
-public static final native int /*long*/ _gtk_print_job_new(byte[] title, int /*long*/ printer, int /*long*/ settings, int /*long*/ page_setup);
-public static final int /*long*/ gtk_print_job_new(byte[] title, int /*long*/ printer, int /*long*/ settings, int /*long*/ page_setup) {
+public static final native long /*int*/ _gtk_print_job_new(byte[] title, long /*int*/ printer, long /*int*/ settings, long /*int*/ page_setup);
+public static final long /*int*/ gtk_print_job_new(byte[] title, long /*int*/ printer, long /*int*/ settings, long /*int*/ page_setup) {
lock.lock();
try {
return _gtk_print_job_new(title, printer, settings, page_setup);
@@ -8834,8 +8834,8 @@ public static final int /*long*/ gtk_print_job_new(byte[] title, int /*long*/ pr
* @method flags=dynamic
* @param error cast=(GError **)
*/
-public static final native int /*long*/ _gtk_print_job_get_surface(int /*long*/ job, int /*long*/ error[]);
-public static final int /*long*/ gtk_print_job_get_surface(int /*long*/ job, int /*long*/ error[]) {
+public static final native long /*int*/ _gtk_print_job_get_surface(long /*int*/ job, long /*int*/ error[]);
+public static final long /*int*/ gtk_print_job_get_surface(long /*int*/ job, long /*int*/ error[]) {
lock.lock();
try {
return _gtk_print_job_get_surface(job, error);
@@ -8848,8 +8848,8 @@ public static final int /*long*/ gtk_print_job_get_surface(int /*long*/ job, int
* @param user_data cast=(gpointer)
* @param dnotify cast=(GDestroyNotify)
*/
-public static final native void _gtk_print_job_send(int /*long*/ job, int /*long*/ callback, int /*long*/ user_data, int /*long*/ dnotify);
-public static final void gtk_print_job_send(int /*long*/ job, int /*long*/ callback, int /*long*/ user_data, int /*long*/ dnotify) {
+public static final native void _gtk_print_job_send(long /*int*/ job, long /*int*/ callback, long /*int*/ user_data, long /*int*/ dnotify);
+public static final void gtk_print_job_send(long /*int*/ job, long /*int*/ callback, long /*int*/ user_data, long /*int*/ dnotify) {
lock.lock();
try {
_gtk_print_job_send(job, callback, user_data, dnotify);
@@ -8858,8 +8858,8 @@ public static final void gtk_print_job_send(int /*long*/ job, int /*long*/ callb
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_print_settings_new();
-public static final int /*long*/ gtk_print_settings_new() {
+public static final native long /*int*/ _gtk_print_settings_new();
+public static final long /*int*/ gtk_print_settings_new() {
lock.lock();
try {
return _gtk_print_settings_new();
@@ -8871,8 +8871,8 @@ public static final int /*long*/ gtk_print_settings_new() {
* @method flags=dynamic
* @param data cast=(gpointer)
*/
-public static final native void _gtk_print_settings_foreach(int /*long*/ settings, int /*long*/ func, int /*long*/ data);
-public static final void gtk_print_settings_foreach(int /*long*/ settings, int /*long*/ func, int /*long*/ data) {
+public static final native void _gtk_print_settings_foreach(long /*int*/ settings, long /*int*/ func, long /*int*/ data);
+public static final void gtk_print_settings_foreach(long /*int*/ settings, long /*int*/ func, long /*int*/ data) {
lock.lock();
try {
_gtk_print_settings_foreach(settings, func, data);
@@ -8884,8 +8884,8 @@ public static final void gtk_print_settings_foreach(int /*long*/ settings, int /
* @method flags=dynamic
* @param key cast=(const gchar *)
*/
-public static final native int /*long*/ _gtk_print_settings_get(int /*long*/ settings, byte [] key);
-public static final int /*long*/ gtk_print_settings_get(int /*long*/ settings, byte [] key) {
+public static final native long /*int*/ _gtk_print_settings_get(long /*int*/ settings, byte [] key);
+public static final long /*int*/ gtk_print_settings_get(long /*int*/ settings, byte [] key) {
lock.lock();
try {
return _gtk_print_settings_get(settings, key);
@@ -8898,8 +8898,8 @@ public static final int /*long*/ gtk_print_settings_get(int /*long*/ settings, b
* @param key cast=(const gchar *)
* @param value cast=(const gchar *)
*/
-public static final native void _gtk_print_settings_set(int /*long*/ settings, byte [] key, byte [] value);
-public static final void gtk_print_settings_set(int /*long*/ settings, byte [] key, byte [] value) {
+public static final native void _gtk_print_settings_set(long /*int*/ settings, byte [] key, byte [] value);
+public static final void gtk_print_settings_set(long /*int*/ settings, byte [] key, byte [] value) {
lock.lock();
try {
_gtk_print_settings_set(settings, key, value);
@@ -8908,8 +8908,8 @@ public static final void gtk_print_settings_set(int /*long*/ settings, byte [] k
}
}
/** @method flags=dynamic */
-public static final native void _gtk_print_settings_set_printer(int /*long*/ settings, byte[] printer);
-public static final void gtk_print_settings_set_printer(int /*long*/ settings, byte[] printer) {
+public static final native void _gtk_print_settings_set_printer(long /*int*/ settings, byte[] printer);
+public static final void gtk_print_settings_set_printer(long /*int*/ settings, byte[] printer) {
lock.lock();
try {
_gtk_print_settings_set_printer(settings, printer);
@@ -8918,8 +8918,8 @@ public static final void gtk_print_settings_set_printer(int /*long*/ settings, b
}
}
/** @method flags=dynamic */
-public static final native void _gtk_print_settings_set_orientation(int /*long*/ settings, int orientation);
-public static final void gtk_print_settings_set_orientation(int /*long*/ settings, int orientation) {
+public static final native void _gtk_print_settings_set_orientation(long /*int*/ settings, int orientation);
+public static final void gtk_print_settings_set_orientation(long /*int*/ settings, int orientation) {
lock.lock();
try {
_gtk_print_settings_set_orientation(settings, orientation);
@@ -8928,8 +8928,8 @@ public static final void gtk_print_settings_set_orientation(int /*long*/ setting
}
}
/** @method flags=dynamic */
-public static final native boolean _gtk_print_settings_get_collate(int /*long*/ settings);
-public static final boolean gtk_print_settings_get_collate(int /*long*/ settings) {
+public static final native boolean _gtk_print_settings_get_collate(long /*int*/ settings);
+public static final boolean gtk_print_settings_get_collate(long /*int*/ settings) {
lock.lock();
try {
return _gtk_print_settings_get_collate(settings);
@@ -8941,8 +8941,8 @@ public static final boolean gtk_print_settings_get_collate(int /*long*/ settings
* @method flags=dynamic
* @param collate cast=(gboolean)
*/
-public static final native void _gtk_print_settings_set_collate(int /*long*/ settings, boolean collate);
-public static final void gtk_print_settings_set_collate(int /*long*/ settings, boolean collate) {
+public static final native void _gtk_print_settings_set_collate(long /*int*/ settings, boolean collate);
+public static final void gtk_print_settings_set_collate(long /*int*/ settings, boolean collate) {
lock.lock();
try {
_gtk_print_settings_set_collate(settings, collate);
@@ -8951,8 +8951,8 @@ public static final void gtk_print_settings_set_collate(int /*long*/ settings, b
}
}
/** @method flags=dynamic */
-public static final native int _gtk_print_settings_get_duplex(int /*long*/ settings);
-public static final int gtk_print_settings_get_duplex(int /*long*/ settings) {
+public static final native int _gtk_print_settings_get_duplex(long /*int*/ settings);
+public static final int gtk_print_settings_get_duplex(long /*int*/ settings) {
lock.lock();
try {
return _gtk_print_settings_get_duplex(settings);
@@ -8961,8 +8961,8 @@ public static final int gtk_print_settings_get_duplex(int /*long*/ settings) {
}
}
/** @method flags=dynamic */
-public static final native void _gtk_print_settings_set_duplex(int /*long*/ settings, int duplex);
-public static final void gtk_print_settings_set_duplex(int /*long*/ settings, int duplex) {
+public static final native void _gtk_print_settings_set_duplex(long /*int*/ settings, int duplex);
+public static final void gtk_print_settings_set_duplex(long /*int*/ settings, int duplex) {
lock.lock();
try {
_gtk_print_settings_set_duplex(settings, duplex);
@@ -8971,8 +8971,8 @@ public static final void gtk_print_settings_set_duplex(int /*long*/ settings, in
}
}
/** @method flags=dynamic */
-public static final native int _gtk_print_settings_get_n_copies(int /*long*/ settings);
-public static final int gtk_print_settings_get_n_copies(int /*long*/ settings) {
+public static final native int _gtk_print_settings_get_n_copies(long /*int*/ settings);
+public static final int gtk_print_settings_get_n_copies(long /*int*/ settings) {
lock.lock();
try {
return _gtk_print_settings_get_n_copies(settings);
@@ -8984,8 +8984,8 @@ public static final int gtk_print_settings_get_n_copies(int /*long*/ settings) {
* @method flags=dynamic
* @param num_copies cast=(gint)
*/
-public static final native void _gtk_print_settings_set_n_copies(int /*long*/ settings, int num_copies);
-public static final void gtk_print_settings_set_n_copies(int /*long*/ settings, int num_copies) {
+public static final native void _gtk_print_settings_set_n_copies(long /*int*/ settings, int num_copies);
+public static final void gtk_print_settings_set_n_copies(long /*int*/ settings, int num_copies) {
lock.lock();
try {
_gtk_print_settings_set_n_copies(settings, num_copies);
@@ -8994,8 +8994,8 @@ public static final void gtk_print_settings_set_n_copies(int /*long*/ settings,
}
}
/** @method flags=dynamic */
-public static final native int _gtk_print_settings_get_print_pages(int /*long*/ settings);
-public static final int gtk_print_settings_get_print_pages(int /*long*/ settings) {
+public static final native int _gtk_print_settings_get_print_pages(long /*int*/ settings);
+public static final int gtk_print_settings_get_print_pages(long /*int*/ settings) {
lock.lock();
try {
return _gtk_print_settings_get_print_pages(settings);
@@ -9004,8 +9004,8 @@ public static final int gtk_print_settings_get_print_pages(int /*long*/ settings
}
}
/** @method flags=dynamic */
-public static final native void _gtk_print_settings_set_print_pages(int /*long*/ settings, int pages);
-public static final void gtk_print_settings_set_print_pages(int /*long*/ settings, int pages) {
+public static final native void _gtk_print_settings_set_print_pages(long /*int*/ settings, int pages);
+public static final void gtk_print_settings_set_print_pages(long /*int*/ settings, int pages) {
lock.lock();
try {
_gtk_print_settings_set_print_pages(settings, pages);
@@ -9017,8 +9017,8 @@ public static final void gtk_print_settings_set_print_pages(int /*long*/ setting
* @method flags=dynamic
* @param num_ranges cast=(gint *)
*/
-public static final native int /*long*/ _gtk_print_settings_get_page_ranges(int /*long*/ settings, int[] num_ranges);
-public static final int /*long*/ gtk_print_settings_get_page_ranges(int /*long*/ settings, int[] num_ranges) {
+public static final native long /*int*/ _gtk_print_settings_get_page_ranges(long /*int*/ settings, int[] num_ranges);
+public static final long /*int*/ gtk_print_settings_get_page_ranges(long /*int*/ settings, int[] num_ranges) {
lock.lock();
try {
return _gtk_print_settings_get_page_ranges(settings, num_ranges);
@@ -9030,8 +9030,8 @@ public static final int /*long*/ gtk_print_settings_get_page_ranges(int /*long*/
* @method flags=dynamic
* @param num_ranges cast=(gint)
*/
-public static final native void _gtk_print_settings_set_page_ranges(int /*long*/ settings, int[] page_ranges, int num_ranges);
-public static final void gtk_print_settings_set_page_ranges(int /*long*/ settings, int[] page_ranges, int num_ranges) {
+public static final native void _gtk_print_settings_set_page_ranges(long /*int*/ settings, int[] page_ranges, int num_ranges);
+public static final void gtk_print_settings_set_page_ranges(long /*int*/ settings, int[] page_ranges, int num_ranges) {
lock.lock();
try {
_gtk_print_settings_set_page_ranges(settings, page_ranges, num_ranges);
@@ -9040,8 +9040,8 @@ public static final void gtk_print_settings_set_page_ranges(int /*long*/ setting
}
}
/** @method flags=dynamic */
-public static final native int _gtk_print_settings_get_resolution(int /*long*/ settings);
-public static final int gtk_print_settings_get_resolution(int /*long*/ settings) {
+public static final native int _gtk_print_settings_get_resolution(long /*int*/ settings);
+public static final int gtk_print_settings_get_resolution(long /*int*/ settings) {
lock.lock();
try {
return _gtk_print_settings_get_resolution(settings);
@@ -9054,8 +9054,8 @@ public static final int gtk_print_settings_get_resolution(int /*long*/ settings)
* @param title cast=(const gchar *)
* @param parent cast=(GtkWindow *)
*/
-public static final native int /*long*/ _gtk_print_unix_dialog_new(byte[] title, int /*long*/ parent);
-public static final int /*long*/ gtk_print_unix_dialog_new(byte[] title, int /*long*/ parent) {
+public static final native long /*int*/ _gtk_print_unix_dialog_new(byte[] title, long /*int*/ parent);
+public static final long /*int*/ gtk_print_unix_dialog_new(byte[] title, long /*int*/ parent) {
lock.lock();
try {
return _gtk_print_unix_dialog_new(title, parent);
@@ -9064,8 +9064,8 @@ public static final int /*long*/ gtk_print_unix_dialog_new(byte[] title, int /*l
}
}
/** @method flags=dynamic */
-public static final native void _gtk_print_unix_dialog_set_embed_page_setup(int /*long*/ dialog, boolean embed);
-public static final void gtk_print_unix_dialog_set_embed_page_setup(int /*long*/ dialog, boolean embed) {
+public static final native void _gtk_print_unix_dialog_set_embed_page_setup(long /*int*/ dialog, boolean embed);
+public static final void gtk_print_unix_dialog_set_embed_page_setup(long /*int*/ dialog, boolean embed) {
lock.lock();
try {
_gtk_print_unix_dialog_set_embed_page_setup(dialog, embed);
@@ -9074,8 +9074,8 @@ public static final void gtk_print_unix_dialog_set_embed_page_setup(int /*long*/
}
}
/** @method flags=dynamic */
-public static final native void _gtk_print_unix_dialog_set_page_setup(int /*long*/ dialog, int /*long*/ page_setup);
-public static final void gtk_print_unix_dialog_set_page_setup(int /*long*/ dialog, int /*long*/ page_setup) {
+public static final native void _gtk_print_unix_dialog_set_page_setup(long /*int*/ dialog, long /*int*/ page_setup);
+public static final void gtk_print_unix_dialog_set_page_setup(long /*int*/ dialog, long /*int*/ page_setup) {
lock.lock();
try {
_gtk_print_unix_dialog_set_page_setup(dialog, page_setup);
@@ -9084,8 +9084,8 @@ public static final void gtk_print_unix_dialog_set_page_setup(int /*long*/ dialo
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_print_unix_dialog_get_page_setup(int /*long*/ dialog);
-public static final int /*long*/ gtk_print_unix_dialog_get_page_setup(int /*long*/ dialog) {
+public static final native long /*int*/ _gtk_print_unix_dialog_get_page_setup(long /*int*/ dialog);
+public static final long /*int*/ gtk_print_unix_dialog_get_page_setup(long /*int*/ dialog) {
lock.lock();
try {
return _gtk_print_unix_dialog_get_page_setup(dialog);
@@ -9097,8 +9097,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_page_setup(int /*long
* @method flags=dynamic
* @param current_page cast=(gint)
*/
-public static final native void _gtk_print_unix_dialog_set_current_page(int /*long*/ dialog, int current_page);
-public static final void gtk_print_unix_dialog_set_current_page(int /*long*/ dialog, int current_page) {
+public static final native void _gtk_print_unix_dialog_set_current_page(long /*int*/ dialog, int current_page);
+public static final void gtk_print_unix_dialog_set_current_page(long /*int*/ dialog, int current_page) {
lock.lock();
try {
_gtk_print_unix_dialog_set_current_page(dialog, current_page);
@@ -9107,8 +9107,8 @@ public static final void gtk_print_unix_dialog_set_current_page(int /*long*/ dia
}
}
/** @method flags=dynamic */
-public static final native int _gtk_print_unix_dialog_get_current_page(int /*long*/ dialog);
-public static final int gtk_print_unix_dialog_get_current_page(int /*long*/ dialog) {
+public static final native int _gtk_print_unix_dialog_get_current_page(long /*int*/ dialog);
+public static final int gtk_print_unix_dialog_get_current_page(long /*int*/ dialog) {
lock.lock();
try {
return _gtk_print_unix_dialog_get_current_page(dialog);
@@ -9117,8 +9117,8 @@ public static final int gtk_print_unix_dialog_get_current_page(int /*long*/ dial
}
}
/** @method flags=dynamic */
-public static final native void _gtk_print_unix_dialog_set_settings(int /*long*/ dialog, int /*long*/ settings);
-public static final void gtk_print_unix_dialog_set_settings(int /*long*/ dialog, int /*long*/ settings) {
+public static final native void _gtk_print_unix_dialog_set_settings(long /*int*/ dialog, long /*int*/ settings);
+public static final void gtk_print_unix_dialog_set_settings(long /*int*/ dialog, long /*int*/ settings) {
lock.lock();
try {
_gtk_print_unix_dialog_set_settings(dialog, settings);
@@ -9127,8 +9127,8 @@ public static final void gtk_print_unix_dialog_set_settings(int /*long*/ dialog,
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_print_unix_dialog_get_settings(int /*long*/ dialog);
-public static final int /*long*/ gtk_print_unix_dialog_get_settings(int /*long*/ dialog) {
+public static final native long /*int*/ _gtk_print_unix_dialog_get_settings(long /*int*/ dialog);
+public static final long /*int*/ gtk_print_unix_dialog_get_settings(long /*int*/ dialog) {
lock.lock();
try {
return _gtk_print_unix_dialog_get_settings(dialog);
@@ -9137,8 +9137,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_settings(int /*long*/
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_print_unix_dialog_get_selected_printer(int /*long*/ dialog);
-public static final int /*long*/ gtk_print_unix_dialog_get_selected_printer(int /*long*/ dialog) {
+public static final native long /*int*/ _gtk_print_unix_dialog_get_selected_printer(long /*int*/ dialog);
+public static final long /*int*/ gtk_print_unix_dialog_get_selected_printer(long /*int*/ dialog) {
lock.lock();
try {
return _gtk_print_unix_dialog_get_selected_printer(dialog);
@@ -9147,8 +9147,8 @@ public static final int /*long*/ gtk_print_unix_dialog_get_selected_printer(int
}
}
/** @method flags=dynamic */
-public static final native void _gtk_print_unix_dialog_set_manual_capabilities(int /*long*/ dialog, int /*long*/ capabilities);
-public static final void gtk_print_unix_dialog_set_manual_capabilities(int /*long*/ dialog, int /*long*/ capabilities) {
+public static final native void _gtk_print_unix_dialog_set_manual_capabilities(long /*int*/ dialog, long /*int*/ capabilities);
+public static final void gtk_print_unix_dialog_set_manual_capabilities(long /*int*/ dialog, long /*int*/ capabilities) {
lock.lock();
try {
_gtk_print_unix_dialog_set_manual_capabilities(dialog, capabilities);
@@ -9156,8 +9156,8 @@ public static final void gtk_print_unix_dialog_set_manual_capabilities(int /*lon
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_progress_bar_new();
-public static final int /*long*/ gtk_progress_bar_new() {
+public static final native long /*int*/ _gtk_progress_bar_new();
+public static final long /*int*/ gtk_progress_bar_new() {
lock.lock();
try {
return _gtk_progress_bar_new();
@@ -9166,8 +9166,8 @@ public static final int /*long*/ gtk_progress_bar_new() {
}
}
/** @param pbar cast=(GtkProgressBar *) */
-public static final native void _gtk_progress_bar_pulse(int /*long*/ pbar);
-public static final void gtk_progress_bar_pulse(int /*long*/ pbar) {
+public static final native void _gtk_progress_bar_pulse(long /*int*/ pbar);
+public static final void gtk_progress_bar_pulse(long /*int*/ pbar) {
lock.lock();
try {
_gtk_progress_bar_pulse(pbar);
@@ -9179,8 +9179,8 @@ public static final void gtk_progress_bar_pulse(int /*long*/ pbar) {
* @param pbar cast=(GtkProgressBar *)
* @param fraction cast=(gdouble)
*/
-public static final native void _gtk_progress_bar_set_fraction(int /*long*/ pbar, double fraction);
-public static final void gtk_progress_bar_set_fraction(int /*long*/ pbar, double fraction) {
+public static final native void _gtk_progress_bar_set_fraction(long /*int*/ pbar, double fraction);
+public static final void gtk_progress_bar_set_fraction(long /*int*/ pbar, double fraction) {
lock.lock();
try {
_gtk_progress_bar_set_fraction(pbar, fraction);
@@ -9192,8 +9192,8 @@ public static final void gtk_progress_bar_set_fraction(int /*long*/ pbar, double
* @param pbar cast=(GtkProgressBar *)
* @param orientation cast=(GtkProgressBarOrientation)
*/
-public static final native void _gtk_progress_bar_set_orientation(int /*long*/ pbar, int orientation);
-public static final void gtk_progress_bar_set_orientation(int /*long*/ pbar, int orientation) {
+public static final native void _gtk_progress_bar_set_orientation(long /*int*/ pbar, int orientation);
+public static final void gtk_progress_bar_set_orientation(long /*int*/ pbar, int orientation) {
lock.lock();
try {
_gtk_progress_bar_set_orientation(pbar, orientation);
@@ -9202,8 +9202,8 @@ public static final void gtk_progress_bar_set_orientation(int /*long*/ pbar, int
}
}
/** @param radio_button cast=(GtkRadioButton *) */
-public static final native int /*long*/ _gtk_radio_button_get_group(int /*long*/ radio_button);
-public static final int /*long*/ gtk_radio_button_get_group(int /*long*/ radio_button) {
+public static final native long /*int*/ _gtk_radio_button_get_group(long /*int*/ radio_button);
+public static final long /*int*/ gtk_radio_button_get_group(long /*int*/ radio_button) {
lock.lock();
try {
return _gtk_radio_button_get_group(radio_button);
@@ -9212,8 +9212,8 @@ public static final int /*long*/ gtk_radio_button_get_group(int /*long*/ radio_b
}
}
/** @param group cast=(GSList *) */
-public static final native int /*long*/ _gtk_radio_button_new(int /*long*/ group);
-public static final int /*long*/ gtk_radio_button_new(int /*long*/ group) {
+public static final native long /*int*/ _gtk_radio_button_new(long /*int*/ group);
+public static final long /*int*/ gtk_radio_button_new(long /*int*/ group) {
lock.lock();
try {
return _gtk_radio_button_new(group);
@@ -9222,8 +9222,8 @@ public static final int /*long*/ gtk_radio_button_new(int /*long*/ group) {
}
}
/** @param radio_menu_item cast=(GtkRadioMenuItem *) */
-public static final native int /*long*/ _gtk_radio_menu_item_get_group(int /*long*/ radio_menu_item);
-public static final int /*long*/ gtk_radio_menu_item_get_group(int /*long*/ radio_menu_item) {
+public static final native long /*int*/ _gtk_radio_menu_item_get_group(long /*int*/ radio_menu_item);
+public static final long /*int*/ gtk_radio_menu_item_get_group(long /*int*/ radio_menu_item) {
lock.lock();
try {
return _gtk_radio_menu_item_get_group(radio_menu_item);
@@ -9232,8 +9232,8 @@ public static final int /*long*/ gtk_radio_menu_item_get_group(int /*long*/ radi
}
}
/** @param group cast=(GSList *) */
-public static final native int /*long*/ _gtk_radio_menu_item_new(int /*long*/ group);
-public static final int /*long*/ gtk_radio_menu_item_new(int /*long*/ group) {
+public static final native long /*int*/ _gtk_radio_menu_item_new(long /*int*/ group);
+public static final long /*int*/ gtk_radio_menu_item_new(long /*int*/ group) {
lock.lock();
try {
return _gtk_radio_menu_item_new(group);
@@ -9245,8 +9245,8 @@ public static final int /*long*/ gtk_radio_menu_item_new(int /*long*/ group) {
* @param group cast=(GSList *)
* @param label cast=(const gchar *)
*/
-public static final native int /*long*/ _gtk_radio_menu_item_new_with_label(int /*long*/ group, byte[] label);
-public static final int /*long*/ gtk_radio_menu_item_new_with_label(int /*long*/ group, byte[] label) {
+public static final native long /*int*/ _gtk_radio_menu_item_new_with_label(long /*int*/ group, byte[] label);
+public static final long /*int*/ gtk_radio_menu_item_new_with_label(long /*int*/ group, byte[] label) {
lock.lock();
try {
return _gtk_radio_menu_item_new_with_label(group, label);
@@ -9255,8 +9255,8 @@ public static final int /*long*/ gtk_radio_menu_item_new_with_label(int /*long*/
}
}
/** @param range cast=(GtkRange *) */
-public static final native int /*long*/ _gtk_range_get_adjustment(int /*long*/ range);
-public static final int /*long*/ gtk_range_get_adjustment(int /*long*/ range) {
+public static final native long /*int*/ _gtk_range_get_adjustment(long /*int*/ range);
+public static final long /*int*/ gtk_range_get_adjustment(long /*int*/ range) {
lock.lock();
try {
return _gtk_range_get_adjustment(range);
@@ -9265,8 +9265,8 @@ public static final int /*long*/ gtk_range_get_adjustment(int /*long*/ range) {
}
}
/** @param range cast=(GtkRange *) */
-public static final native void _gtk_range_set_increments(int /*long*/ range, double step, double page);
-public static final void gtk_range_set_increments(int /*long*/ range, double step, double page) {
+public static final native void _gtk_range_set_increments(long /*int*/ range, double step, double page);
+public static final void gtk_range_set_increments(long /*int*/ range, double step, double page) {
lock.lock();
try {
_gtk_range_set_increments(range, step, page);
@@ -9275,8 +9275,8 @@ public static final void gtk_range_set_increments(int /*long*/ range, double ste
}
}
/** @param range cast=(GtkRange *) */
-public static final native void _gtk_range_set_inverted(int /*long*/ range, boolean setting);
-public static final void gtk_range_set_inverted(int /*long*/ range, boolean setting) {
+public static final native void _gtk_range_set_inverted(long /*int*/ range, boolean setting);
+public static final void gtk_range_set_inverted(long /*int*/ range, boolean setting) {
lock.lock();
try {
_gtk_range_set_inverted(range, setting);
@@ -9285,8 +9285,8 @@ public static final void gtk_range_set_inverted(int /*long*/ range, boolean sett
}
}
/** @param range cast=(GtkRange *) */
-public static final native void _gtk_range_set_range(int /*long*/ range, double min, double max);
-public static final void gtk_range_set_range(int /*long*/ range, double min, double max) {
+public static final native void _gtk_range_set_range(long /*int*/ range, double min, double max);
+public static final void gtk_range_set_range(long /*int*/ range, double min, double max) {
lock.lock();
try {
_gtk_range_set_range(range, min, max);
@@ -9295,8 +9295,8 @@ public static final void gtk_range_set_range(int /*long*/ range, double min, dou
}
}
/** @param range cast=(GtkRange *) */
-public static final native void _gtk_range_set_value(int /*long*/ range, double value);
-public static final void gtk_range_set_value(int /*long*/ range, double value) {
+public static final native void _gtk_range_set_value(long /*int*/ range, double value);
+public static final void gtk_range_set_value(long /*int*/ range, double value) {
lock.lock();
try {
_gtk_range_set_value(range, value);
@@ -9310,8 +9310,8 @@ public static final void gtk_range_set_value(int /*long*/ range, double value) {
* @param slider_start cast=(gint *)
* @param slider_end cast=(gint *)
*/
-public static final native void _gtk_range_get_slider_range(int /*long*/ range, int[] slider_start, int[] slider_end);
-public static final void gtk_range_get_slider_range(int /*long*/ range, int[] slider_start, int[] slider_end) {
+public static final native void _gtk_range_get_slider_range(long /*int*/ range, int[] slider_start, int[] slider_end);
+public static final void gtk_range_get_slider_range(long /*int*/ range, int[] slider_start, int[] slider_end) {
lock.lock();
try {
_gtk_range_get_slider_range(range, slider_start, slider_end);
@@ -9330,8 +9330,8 @@ public static final void gtk_rc_parse_string(byte[] rc_string) {
}
}
/** @param style cast=(GtkRcStyle *) */
-public static final native int /*long*/ _gtk_rc_style_get_bg_pixmap_name(int /*long*/ style, int index);
-public static final int /*long*/ gtk_rc_style_get_bg_pixmap_name(int /*long*/ style, int index) {
+public static final native long /*int*/ _gtk_rc_style_get_bg_pixmap_name(long /*int*/ style, int index);
+public static final long /*int*/ gtk_rc_style_get_bg_pixmap_name(long /*int*/ style, int index) {
lock.lock();
try {
return _gtk_rc_style_get_bg_pixmap_name(style, index);
@@ -9340,8 +9340,8 @@ public static final int /*long*/ gtk_rc_style_get_bg_pixmap_name(int /*long*/ st
}
}
/** @param style cast=(GtkRcStyle *) */
-public static final native int _gtk_rc_style_get_color_flags(int /*long*/ style, int index);
-public static final int gtk_rc_style_get_color_flags(int /*long*/ style, int index) {
+public static final native int _gtk_rc_style_get_color_flags(long /*int*/ style, int index);
+public static final int gtk_rc_style_get_color_flags(long /*int*/ style, int index) {
lock.lock();
try {
return _gtk_rc_style_get_color_flags(style, index);
@@ -9353,8 +9353,8 @@ public static final int gtk_rc_style_get_color_flags(int /*long*/ style, int ind
* @param style cast=(GtkRcStyle *)
* @param color flags=no_out
*/
-public static final native void _gtk_rc_style_set_bg(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_rc_style_set_bg(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_rc_style_set_bg(long /*int*/ style, int index, GdkColor color);
+public static final void gtk_rc_style_set_bg(long /*int*/ style, int index, GdkColor color) {
lock.lock();
try {
_gtk_rc_style_set_bg(style, index, color);
@@ -9366,8 +9366,8 @@ public static final void gtk_rc_style_set_bg(int /*long*/ style, int index, GdkC
* @param style cast=(GtkRcStyle *)
* @param name cast=(char *)
*/
-public static final native void _gtk_rc_style_set_bg_pixmap_name(int /*long*/ style, int index, int /*long*/ name);
-public static final void gtk_rc_style_set_bg_pixmap_name(int /*long*/ style, int index, int /*long*/ name) {
+public static final native void _gtk_rc_style_set_bg_pixmap_name(long /*int*/ style, int index, long /*int*/ name);
+public static final void gtk_rc_style_set_bg_pixmap_name(long /*int*/ style, int index, long /*int*/ name) {
lock.lock();
try {
_gtk_rc_style_set_bg_pixmap_name(style, index, name);
@@ -9376,8 +9376,8 @@ public static final void gtk_rc_style_set_bg_pixmap_name(int /*long*/ style, int
}
}
/** @param style cast=(GtkRcStyle *) */
-public static final native void _gtk_rc_style_set_color_flags(int /*long*/ style, int index, int flag);
-public static final void gtk_rc_style_set_color_flags(int /*long*/ style, int index, int flag) {
+public static final native void _gtk_rc_style_set_color_flags(long /*int*/ style, int index, int flag);
+public static final void gtk_rc_style_set_color_flags(long /*int*/ style, int index, int flag) {
lock.lock();
try {
_gtk_rc_style_set_color_flags(style, index, flag);
@@ -9389,8 +9389,8 @@ public static final void gtk_rc_style_set_color_flags(int /*long*/ style, int in
* @param scale cast=(GtkScale *)
* @param digits cast=(gint)
*/
-public static final native void _gtk_scale_set_digits(int /*long*/ scale, int digits);
-public static final void gtk_scale_set_digits(int /*long*/ scale, int digits) {
+public static final native void _gtk_scale_set_digits(long /*int*/ scale, int digits);
+public static final void gtk_scale_set_digits(long /*int*/ scale, int digits) {
lock.lock();
try {
_gtk_scale_set_digits(scale, digits);
@@ -9402,8 +9402,8 @@ public static final void gtk_scale_set_digits(int /*long*/ scale, int digits) {
* @param scale cast=(GtkScale *)
* @param draw_value cast=(gboolean)
*/
-public static final native void _gtk_scale_set_draw_value(int /*long*/ scale, boolean draw_value);
-public static final void gtk_scale_set_draw_value(int /*long*/ scale, boolean draw_value) {
+public static final native void _gtk_scale_set_draw_value(long /*int*/ scale, boolean draw_value);
+public static final void gtk_scale_set_draw_value(long /*int*/ scale, boolean draw_value) {
lock.lock();
try {
_gtk_scale_set_draw_value(scale, draw_value);
@@ -9415,8 +9415,8 @@ public static final void gtk_scale_set_draw_value(int /*long*/ scale, boolean dr
* @param style cast=(GtkRcStyle *)
* @param color flags=no_out
*/
-public static final native void _gtk_rc_style_set_fg(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_rc_style_set_fg(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_rc_style_set_fg(long /*int*/ style, int index, GdkColor color);
+public static final void gtk_rc_style_set_fg(long /*int*/ style, int index, GdkColor color) {
lock.lock();
try {
_gtk_rc_style_set_fg(style, index, color);
@@ -9428,8 +9428,8 @@ public static final void gtk_rc_style_set_fg(int /*long*/ style, int index, GdkC
* @param style cast=(GtkRcStyle *)
* @param color flags=no_out
*/
-public static final native void _gtk_rc_style_set_text(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_rc_style_set_text(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_rc_style_set_text(long /*int*/ style, int index, GdkColor color);
+public static final void gtk_rc_style_set_text(long /*int*/ style, int index, GdkColor color) {
lock.lock();
try {
_gtk_rc_style_set_text(style, index, color);
@@ -9441,8 +9441,8 @@ public static final void gtk_rc_style_set_text(int /*long*/ style, int index, Gd
* @param scrolled_window cast=(GtkScrolledWindow *)
* @param child cast=(GtkWidget *)
*/
-public static final native void _gtk_scrolled_window_add_with_viewport(int /*long*/ scrolled_window, int /*long*/ child);
-public static final void gtk_scrolled_window_add_with_viewport(int /*long*/ scrolled_window, int /*long*/ child) {
+public static final native void _gtk_scrolled_window_add_with_viewport(long /*int*/ scrolled_window, long /*int*/ child);
+public static final void gtk_scrolled_window_add_with_viewport(long /*int*/ scrolled_window, long /*int*/ child) {
lock.lock();
try {
_gtk_scrolled_window_add_with_viewport(scrolled_window, child);
@@ -9451,8 +9451,8 @@ public static final void gtk_scrolled_window_add_with_viewport(int /*long*/ scro
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
-public static final native int /*long*/ _gtk_scrolled_window_get_hadjustment(int /*long*/ scrolled_window);
-public static final int /*long*/ gtk_scrolled_window_get_hadjustment(int /*long*/ scrolled_window) {
+public static final native long /*int*/ _gtk_scrolled_window_get_hadjustment(long /*int*/ scrolled_window);
+public static final long /*int*/ gtk_scrolled_window_get_hadjustment(long /*int*/ scrolled_window) {
lock.lock();
try {
return _gtk_scrolled_window_get_hadjustment(scrolled_window);
@@ -9464,8 +9464,8 @@ public static final int /*long*/ gtk_scrolled_window_get_hadjustment(int /*long*
* @method flags=dynamic
* @param scrolled_window cast=(GtkScrolledWindow *)
*/
-public static final native int /*long*/ _gtk_scrolled_window_get_hscrollbar(int /*long*/ scrolled_window);
-public static final int /*long*/ gtk_scrolled_window_get_hscrollbar(int /*long*/ scrolled_window) {
+public static final native long /*int*/ _gtk_scrolled_window_get_hscrollbar(long /*int*/ scrolled_window);
+public static final long /*int*/ gtk_scrolled_window_get_hscrollbar(long /*int*/ scrolled_window) {
lock.lock();
try {
return _gtk_scrolled_window_get_hscrollbar(scrolled_window);
@@ -9478,8 +9478,8 @@ public static final int /*long*/ gtk_scrolled_window_get_hscrollbar(int /*long*/
* @param hscrollbar_policy cast=(GtkPolicyType *)
* @param vscrollbar_policy cast=(GtkPolicyType *)
*/
-public static final native void _gtk_scrolled_window_get_policy(int /*long*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy);
-public static final void gtk_scrolled_window_get_policy(int /*long*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy) {
+public static final native void _gtk_scrolled_window_get_policy(long /*int*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy);
+public static final void gtk_scrolled_window_get_policy(long /*int*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy) {
lock.lock();
try {
_gtk_scrolled_window_get_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
@@ -9488,8 +9488,8 @@ public static final void gtk_scrolled_window_get_policy(int /*long*/ scrolled_wi
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
-public static final native int _gtk_scrolled_window_get_shadow_type(int /*long*/ scrolled_window);
-public static final int gtk_scrolled_window_get_shadow_type(int /*long*/ scrolled_window) {
+public static final native int _gtk_scrolled_window_get_shadow_type(long /*int*/ scrolled_window);
+public static final int gtk_scrolled_window_get_shadow_type(long /*int*/ scrolled_window) {
lock.lock();
try {
return _gtk_scrolled_window_get_shadow_type(scrolled_window);
@@ -9498,8 +9498,8 @@ public static final int gtk_scrolled_window_get_shadow_type(int /*long*/ scrolle
}
}
/** @param scrolled_window cast=(GtkScrolledWindow *) */
-public static final native int /*long*/ _gtk_scrolled_window_get_vadjustment(int /*long*/ scrolled_window);
-public static final int /*long*/ gtk_scrolled_window_get_vadjustment(int /*long*/ scrolled_window) {
+public static final native long /*int*/ _gtk_scrolled_window_get_vadjustment(long /*int*/ scrolled_window);
+public static final long /*int*/ gtk_scrolled_window_get_vadjustment(long /*int*/ scrolled_window) {
lock.lock();
try {
return _gtk_scrolled_window_get_vadjustment(scrolled_window);
@@ -9511,8 +9511,8 @@ public static final int /*long*/ gtk_scrolled_window_get_vadjustment(int /*long*
* @method flags=dynamic
* @param scrolled_window cast=(GtkScrolledWindow *)
*/
-public static final native int /*long*/ _gtk_scrolled_window_get_vscrollbar(int /*long*/ scrolled_window);
-public static final int /*long*/ gtk_scrolled_window_get_vscrollbar(int /*long*/ scrolled_window) {
+public static final native long /*int*/ _gtk_scrolled_window_get_vscrollbar(long /*int*/ scrolled_window);
+public static final long /*int*/ gtk_scrolled_window_get_vscrollbar(long /*int*/ scrolled_window) {
lock.lock();
try {
return _gtk_scrolled_window_get_vscrollbar(scrolled_window);
@@ -9524,8 +9524,8 @@ public static final int /*long*/ gtk_scrolled_window_get_vscrollbar(int /*long*/
* @param hadjustment cast=(GtkAdjustment *)
* @param vadjustment cast=(GtkAdjustment *)
*/
-public static final native int /*long*/ _gtk_scrolled_window_new(int /*long*/ hadjustment, int /*long*/ vadjustment);
-public static final int /*long*/ gtk_scrolled_window_new(int /*long*/ hadjustment, int /*long*/ vadjustment) {
+public static final native long /*int*/ _gtk_scrolled_window_new(long /*int*/ hadjustment, long /*int*/ vadjustment);
+public static final long /*int*/ gtk_scrolled_window_new(long /*int*/ hadjustment, long /*int*/ vadjustment) {
lock.lock();
try {
return _gtk_scrolled_window_new(hadjustment, vadjustment);
@@ -9538,8 +9538,8 @@ public static final int /*long*/ gtk_scrolled_window_new(int /*long*/ hadjustmen
* @param hscrollbar_policy cast=(GtkPolicyType)
* @param vscrollbar_policy cast=(GtkPolicyType)
*/
-public static final native void _gtk_scrolled_window_set_policy(int /*long*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy);
-public static final void gtk_scrolled_window_set_policy(int /*long*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy) {
+public static final native void _gtk_scrolled_window_set_policy(long /*int*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy);
+public static final void gtk_scrolled_window_set_policy(long /*int*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy) {
lock.lock();
try {
_gtk_scrolled_window_set_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
@@ -9551,8 +9551,8 @@ public static final void gtk_scrolled_window_set_policy(int /*long*/ scrolled_wi
* @param scrolled_window cast=(GtkScrolledWindow *)
* @param type cast=(GtkShadowType)
*/
-public static final native void _gtk_scrolled_window_set_shadow_type(int /*long*/ scrolled_window, int type);
-public static final void gtk_scrolled_window_set_shadow_type(int /*long*/ scrolled_window, int type) {
+public static final native void _gtk_scrolled_window_set_shadow_type(long /*int*/ scrolled_window, int type);
+public static final void gtk_scrolled_window_set_shadow_type(long /*int*/ scrolled_window, int type) {
lock.lock();
try {
_gtk_scrolled_window_set_shadow_type(scrolled_window, type);
@@ -9560,8 +9560,8 @@ public static final void gtk_scrolled_window_set_shadow_type(int /*long*/ scroll
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_settings_get_default();
-public static final int /*long*/ gtk_settings_get_default() {
+public static final native long /*int*/ _gtk_settings_get_default();
+public static final long /*int*/ gtk_settings_get_default() {
lock.lock();
try {
return _gtk_settings_get_default();
@@ -9575,8 +9575,8 @@ public static final int /*long*/ gtk_settings_get_default() {
* @param v_string cast=(const gchar *)
* @param origin cast=(const gchar *)
*/
-public static final native void _gtk_settings_set_string_property(int /*long*/ settings, byte[] name, byte[] v_string, byte[] origin);
-public static final void gtk_settings_set_string_property(int /*long*/ settings, byte[] name, byte[] v_string, byte[] origin) {
+public static final native void _gtk_settings_set_string_property(long /*int*/ settings, byte[] name, byte[] v_string, byte[] origin);
+public static final void gtk_settings_set_string_property(long /*int*/ settings, byte[] name, byte[] v_string, byte[] origin) {
lock.lock();
try {
_gtk_settings_set_string_property(settings, name, v_string, origin);
@@ -9585,8 +9585,8 @@ public static final void gtk_settings_set_string_property(int /*long*/ settings,
}
}
/** @param selection_data cast=(GtkSelectionData *) */
-public static final native void _gtk_selection_data_free(int /*long*/ selection_data);
-public static final void gtk_selection_data_free(int /*long*/ selection_data) {
+public static final native void _gtk_selection_data_free(long /*int*/ selection_data);
+public static final void gtk_selection_data_free(long /*int*/ selection_data) {
lock.lock();
try {
_gtk_selection_data_free(selection_data);
@@ -9601,8 +9601,8 @@ public static final void gtk_selection_data_free(int /*long*/ selection_data) {
* @param data cast=(const guchar *)
* @param length cast=(gint)
*/
-public static final native void _gtk_selection_data_set(int /*long*/ selection_data, int /*long*/ type, int format, int /*long*/ data, int length);
-public static final void gtk_selection_data_set(int /*long*/ selection_data, int /*long*/ type, int format, int /*long*/ data, int length) {
+public static final native void _gtk_selection_data_set(long /*int*/ selection_data, long /*int*/ type, int format, long /*int*/ data, int length);
+public static final void gtk_selection_data_set(long /*int*/ selection_data, long /*int*/ type, int format, long /*int*/ data, int length) {
lock.lock();
try {
_gtk_selection_data_set(selection_data, type, format, data, length);
@@ -9610,8 +9610,8 @@ public static final void gtk_selection_data_set(int /*long*/ selection_data, int
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_separator_menu_item_new();
-public static final int /*long*/ gtk_separator_menu_item_new() {
+public static final native long /*int*/ _gtk_separator_menu_item_new();
+public static final long /*int*/ gtk_separator_menu_item_new() {
lock.lock();
try {
return _gtk_separator_menu_item_new();
@@ -9619,8 +9619,8 @@ public static final int /*long*/ gtk_separator_menu_item_new() {
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_separator_tool_item_new();
-public static final int /*long*/ gtk_separator_tool_item_new() {
+public static final native long /*int*/ _gtk_separator_tool_item_new();
+public static final long /*int*/ gtk_separator_tool_item_new() {
lock.lock();
try {
return _gtk_separator_tool_item_new();
@@ -9632,8 +9632,8 @@ public static final int /*long*/ gtk_separator_tool_item_new() {
* @param item cast=(GtkSeparatorToolItem *)
* @param draw cast=(gboolean)
*/
-public static final native void _gtk_separator_tool_item_set_draw(int /*long*/ item, boolean draw);
-public static final void gtk_separator_tool_item_set_draw(int /*long*/ item, boolean draw) {
+public static final native void _gtk_separator_tool_item_set_draw(long /*int*/ item, boolean draw);
+public static final void gtk_separator_tool_item_set_draw(long /*int*/ item, boolean draw) {
lock.lock();
try {
_gtk_separator_tool_item_set_draw(item, draw);
@@ -9642,8 +9642,8 @@ public static final void gtk_separator_tool_item_set_draw(int /*long*/ item, boo
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_set_locale();
-public static final int /*long*/ gtk_set_locale() {
+public static final native long /*int*/ _gtk_set_locale();
+public static final long /*int*/ gtk_set_locale() {
lock.lock();
try {
return _gtk_set_locale();
@@ -9652,8 +9652,8 @@ public static final int /*long*/ gtk_set_locale() {
}
}
/** @param socket cast=(GtkSocket *) */
-public static final native int /*long*/ _gtk_socket_get_id(int /*long*/ socket);
-public static final int /*long*/ gtk_socket_get_id(int /*long*/ socket) {
+public static final native long /*int*/ _gtk_socket_get_id(long /*int*/ socket);
+public static final long /*int*/ gtk_socket_get_id(long /*int*/ socket) {
lock.lock();
try {
return _gtk_socket_get_id(socket);
@@ -9661,8 +9661,8 @@ public static final int /*long*/ gtk_socket_get_id(int /*long*/ socket) {
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_socket_new();
-public static final int /*long*/ gtk_socket_new() {
+public static final native long /*int*/ _gtk_socket_new();
+public static final long /*int*/ gtk_socket_new() {
lock.lock();
try {
return _gtk_socket_new();
@@ -9671,8 +9671,8 @@ public static final int /*long*/ gtk_socket_new() {
}
}
/** @param adjustment cast=(GtkAdjustment *) */
-public static final native int /*long*/ _gtk_spin_button_new(int /*long*/ adjustment, double climb_rate, int digits);
-public static final int /*long*/ gtk_spin_button_new(int /*long*/ adjustment, double climb_rate, int digits) {
+public static final native long /*int*/ _gtk_spin_button_new(long /*int*/ adjustment, double climb_rate, int digits);
+public static final long /*int*/ gtk_spin_button_new(long /*int*/ adjustment, double climb_rate, int digits) {
lock.lock();
try {
return _gtk_spin_button_new(adjustment, climb_rate, digits);
@@ -9684,8 +9684,8 @@ public static final int /*long*/ gtk_spin_button_new(int /*long*/ adjustment, do
* @param spin_button cast=(GtkSpinButton*)
* @param adjustment cast=(GtkAdjustment *)
**/
-public static final native void _gtk_spin_button_configure(int /*long*/ spin_button, int /*long*/ adjustment, double climb_rate, int digits);
-public static final void gtk_spin_button_configure(int /*long*/ spin_button, int /*long*/ adjustment, double climb_rate, int digits) {
+public static final native void _gtk_spin_button_configure(long /*int*/ spin_button, long /*int*/ adjustment, double climb_rate, int digits);
+public static final void gtk_spin_button_configure(long /*int*/ spin_button, long /*int*/ adjustment, double climb_rate, int digits) {
lock.lock();
try {
_gtk_spin_button_configure(spin_button, adjustment, climb_rate, digits);
@@ -9694,8 +9694,8 @@ public static final void gtk_spin_button_configure(int /*long*/ spin_button, int
}
}
/** @param spin_button cast=(GtkSpinButton*) */
-public static final native int /*long*/ _gtk_spin_button_get_adjustment(int /*long*/ spin_button);
-public static final int /*long*/ gtk_spin_button_get_adjustment(int /*long*/ spin_button) {
+public static final native long /*int*/ _gtk_spin_button_get_adjustment(long /*int*/ spin_button);
+public static final long /*int*/ gtk_spin_button_get_adjustment(long /*int*/ spin_button) {
lock.lock();
try {
return _gtk_spin_button_get_adjustment(spin_button);
@@ -9705,8 +9705,8 @@ public static final int /*long*/ gtk_spin_button_get_adjustment(int /*long*/ spi
}
/** @param spin_button cast=(GtkSpinButton*) */
-public static final native int _gtk_spin_button_get_digits(int /*long*/ spin_button);
-public static final int gtk_spin_button_get_digits(int /*long*/ spin_button) {
+public static final native int _gtk_spin_button_get_digits(long /*int*/ spin_button);
+public static final int gtk_spin_button_get_digits(long /*int*/ spin_button) {
lock.lock();
try {
return _gtk_spin_button_get_digits(spin_button);
@@ -9715,8 +9715,8 @@ public static final int gtk_spin_button_get_digits(int /*long*/ spin_button) {
}
}
/** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_set_digits(int /*long*/ spin_button, int digits);
-public static final void gtk_spin_button_set_digits(int /*long*/ spin_button, int digits) {
+public static final native void _gtk_spin_button_set_digits(long /*int*/ spin_button, int digits);
+public static final void gtk_spin_button_set_digits(long /*int*/ spin_button, int digits) {
lock.lock();
try {
_gtk_spin_button_set_digits(spin_button, digits);
@@ -9725,8 +9725,8 @@ public static final void gtk_spin_button_set_digits(int /*long*/ spin_button, in
}
}
/** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_set_increments(int /*long*/ spin_button, double step, double page);
-public static final void gtk_spin_button_set_increments(int /*long*/ spin_button, double step, double page) {
+public static final native void _gtk_spin_button_set_increments(long /*int*/ spin_button, double step, double page);
+public static final void gtk_spin_button_set_increments(long /*int*/ spin_button, double step, double page) {
lock.lock();
try {
_gtk_spin_button_set_increments(spin_button, step, page);
@@ -9735,8 +9735,8 @@ public static final void gtk_spin_button_set_increments(int /*long*/ spin_button
}
}
/** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_set_range(int /*long*/ spin_button, double max, double min);
-public static final void gtk_spin_button_set_range(int /*long*/ spin_button, double max, double min) {
+public static final native void _gtk_spin_button_set_range(long /*int*/ spin_button, double max, double min);
+public static final void gtk_spin_button_set_range(long /*int*/ spin_button, double max, double min) {
lock.lock();
try {
_gtk_spin_button_set_range(spin_button, max, min);
@@ -9745,8 +9745,8 @@ public static final void gtk_spin_button_set_range(int /*long*/ spin_button, dou
}
}
/** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_set_value(int /*long*/ spin_button, double value);
-public static final void gtk_spin_button_set_value(int /*long*/ spin_button, double value) {
+public static final native void _gtk_spin_button_set_value(long /*int*/ spin_button, double value);
+public static final void gtk_spin_button_set_value(long /*int*/ spin_button, double value) {
lock.lock();
try {
_gtk_spin_button_set_value(spin_button, value);
@@ -9755,8 +9755,8 @@ public static final void gtk_spin_button_set_value(int /*long*/ spin_button, dou
}
}
/** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_set_wrap(int /*long*/ spin_button, boolean wrap);
-public static final void gtk_spin_button_set_wrap(int /*long*/ spin_button, boolean wrap) {
+public static final native void _gtk_spin_button_set_wrap(long /*int*/ spin_button, boolean wrap);
+public static final void gtk_spin_button_set_wrap(long /*int*/ spin_button, boolean wrap) {
lock.lock();
try {
_gtk_spin_button_set_wrap(spin_button, wrap);
@@ -9765,8 +9765,8 @@ public static final void gtk_spin_button_set_wrap(int /*long*/ spin_button, bool
}
}
/** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_update(int /*long*/ spin_button);
-public static final void gtk_spin_button_update(int /*long*/ spin_button) {
+public static final native void _gtk_spin_button_update(long /*int*/ spin_button);
+public static final void gtk_spin_button_update(long /*int*/ spin_button) {
lock.lock();
try {
_gtk_spin_button_update(spin_button);
@@ -9777,8 +9777,8 @@ public static final void gtk_spin_button_update(int /*long*/ spin_button) {
/**
* @method flags=dynamic
*/
-public static final native boolean _gtk_status_icon_get_geometry(int /*long*/ handle, int /*long*/ screen, GdkRectangle area, int /*long*/ orientation);
-public static final boolean gtk_status_icon_get_geometry(int /*long*/ handle, int /*long*/ screen, GdkRectangle area, int /*long*/ orientation) {
+public static final native boolean _gtk_status_icon_get_geometry(long /*int*/ handle, long /*int*/ screen, GdkRectangle area, long /*int*/ orientation);
+public static final boolean gtk_status_icon_get_geometry(long /*int*/ handle, long /*int*/ screen, GdkRectangle area, long /*int*/ orientation) {
lock.lock();
try {
return _gtk_status_icon_get_geometry(handle, screen, area, orientation);
@@ -9789,8 +9789,8 @@ public static final boolean gtk_status_icon_get_geometry(int /*long*/ handle, in
/**
* @method flags=dynamic
*/
-public static final native boolean _gtk_status_icon_get_visible(int /*long*/ handle);
-public static final boolean gtk_status_icon_get_visible(int /*long*/ handle) {
+public static final native boolean _gtk_status_icon_get_visible(long /*int*/ handle);
+public static final boolean gtk_status_icon_get_visible(long /*int*/ handle) {
lock.lock();
try {
return _gtk_status_icon_get_visible(handle);
@@ -9799,8 +9799,8 @@ public static final boolean gtk_status_icon_get_visible(int /*long*/ handle) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_status_icon_new();
-public static final int /*long*/ gtk_status_icon_new() {
+public static final native long /*int*/ _gtk_status_icon_new();
+public static final long /*int*/ gtk_status_icon_new() {
lock.lock();
try {
return _gtk_status_icon_new();
@@ -9811,8 +9811,8 @@ public static final int /*long*/ gtk_status_icon_new() {
/**
* @method flags=dynamic
*/
-public static final native void _gtk_status_icon_set_from_pixbuf(int /*long*/ handle, int /*long*/ pixbuf);
-public static final void gtk_status_icon_set_from_pixbuf(int /*long*/ handle, int /*long*/ pixbuf) {
+public static final native void _gtk_status_icon_set_from_pixbuf(long /*int*/ handle, long /*int*/ pixbuf);
+public static final void gtk_status_icon_set_from_pixbuf(long /*int*/ handle, long /*int*/ pixbuf) {
lock.lock();
try {
_gtk_status_icon_set_from_pixbuf(handle, pixbuf);
@@ -9823,8 +9823,8 @@ public static final void gtk_status_icon_set_from_pixbuf(int /*long*/ handle, in
/**
* @method flags=dynamic
*/
-public static final native void _gtk_status_icon_set_visible(int /*long*/ handle, boolean visible);
-public static final void gtk_status_icon_set_visible(int /*long*/ handle, boolean visible) {
+public static final native void _gtk_status_icon_set_visible(long /*int*/ handle, boolean visible);
+public static final void gtk_status_icon_set_visible(long /*int*/ handle, boolean visible) {
lock.lock();
try {
_gtk_status_icon_set_visible(handle, visible);
@@ -9835,8 +9835,8 @@ public static final void gtk_status_icon_set_visible(int /*long*/ handle, boolea
/**
* @method flags=dynamic
*/
-public static final native void _gtk_status_icon_set_tooltip(int /*long*/ handle, byte[] tip_text);
-public static final void gtk_status_icon_set_tooltip(int /*long*/ handle, byte[] tip_text) {
+public static final native void _gtk_status_icon_set_tooltip(long /*int*/ handle, byte[] tip_text);
+public static final void gtk_status_icon_set_tooltip(long /*int*/ handle, byte[] tip_text) {
lock.lock();
try {
_gtk_status_icon_set_tooltip(handle, tip_text);
@@ -9848,8 +9848,8 @@ public static final void gtk_status_icon_set_tooltip(int /*long*/ handle, byte[]
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
-public static final native void _gtk_style_get_base(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_style_get_base(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_style_get_base(long /*int*/ style, int index, GdkColor color);
+public static final void gtk_style_get_base(long /*int*/ style, int index, GdkColor color) {
lock.lock();
try {
_gtk_style_get_base(style, index, color);
@@ -9861,8 +9861,8 @@ public static final void gtk_style_get_base(int /*long*/ style, int index, GdkCo
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
-public static final native void _gtk_style_get_black(int /*long*/ style, GdkColor color);
-public static final void gtk_style_get_black(int /*long*/ style, GdkColor color) {
+public static final native void _gtk_style_get_black(long /*int*/ style, GdkColor color);
+public static final void gtk_style_get_black(long /*int*/ style, GdkColor color) {
lock.lock();
try {
_gtk_style_get_black(style, color);
@@ -9874,8 +9874,8 @@ public static final void gtk_style_get_black(int /*long*/ style, GdkColor color)
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
-public static final native void _gtk_style_get_bg(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_style_get_bg(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_style_get_bg(long /*int*/ style, int index, GdkColor color);
+public static final void gtk_style_get_bg(long /*int*/ style, int index, GdkColor color) {
lock.lock();
try {
_gtk_style_get_bg(style, index, color);
@@ -9887,8 +9887,8 @@ public static final void gtk_style_get_bg(int /*long*/ style, int index, GdkColo
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
-public static final native void _gtk_style_get_dark(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_style_get_dark(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_style_get_dark(long /*int*/ style, int index, GdkColor color);
+public static final void gtk_style_get_dark(long /*int*/ style, int index, GdkColor color) {
lock.lock();
try {
_gtk_style_get_dark(style, index, color);
@@ -9900,8 +9900,8 @@ public static final void gtk_style_get_dark(int /*long*/ style, int index, GdkCo
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
-public static final native void _gtk_style_get_fg(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_style_get_fg(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_style_get_fg(long /*int*/ style, int index, GdkColor color);
+public static final void gtk_style_get_fg(long /*int*/ style, int index, GdkColor color) {
lock.lock();
try {
_gtk_style_get_fg(style, index, color);
@@ -9913,8 +9913,8 @@ public static final void gtk_style_get_fg(int /*long*/ style, int index, GdkColo
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **),flags=no_in
*/
-public static final native void _gtk_style_get_fg_gc(int /*long*/ style, int index, int /*long*/[] gc);
-public static final void gtk_style_get_fg_gc(int /*long*/ style, int index, int /*long*/[] gc) {
+public static final native void _gtk_style_get_fg_gc(long /*int*/ style, int index, long /*int*/[] gc);
+public static final void gtk_style_get_fg_gc(long /*int*/ style, int index, long /*int*/[] gc) {
lock.lock();
try {
_gtk_style_get_fg_gc(style, index, gc);
@@ -9926,8 +9926,8 @@ public static final void gtk_style_get_fg_gc(int /*long*/ style, int index, int
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **),flags=no_in
*/
-public static final native void _gtk_style_get_bg_gc(int /*long*/ style, int index, int /*long*/[] gc);
-public static final void gtk_style_get_bg_gc(int /*long*/ style, int index, int /*long*/[] gc) {
+public static final native void _gtk_style_get_bg_gc(long /*int*/ style, int index, long /*int*/[] gc);
+public static final void gtk_style_get_bg_gc(long /*int*/ style, int index, long /*int*/[] gc) {
lock.lock();
try {
_gtk_style_get_bg_gc(style, index, gc);
@@ -9939,8 +9939,8 @@ public static final void gtk_style_get_bg_gc(int /*long*/ style, int index, int
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
-public static final native void _gtk_style_get_light_gc(int /*long*/ style, int index, int /*long*/[] gc);
-public static final void gtk_style_get_light_gc(int /*long*/ style, int index, int /*long*/[] gc) {
+public static final native void _gtk_style_get_light_gc(long /*int*/ style, int index, long /*int*/[] gc);
+public static final void gtk_style_get_light_gc(long /*int*/ style, int index, long /*int*/[] gc) {
lock.lock();
try {
_gtk_style_get_light_gc(style, index, gc);
@@ -9952,8 +9952,8 @@ public static final void gtk_style_get_light_gc(int /*long*/ style, int index, i
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **),flags=no_in
*/
-public static final native void _gtk_style_get_dark_gc(int /*long*/ style, int index, int /*long*/[] gc);
-public static final void gtk_style_get_dark_gc(int /*long*/ style, int index, int /*long*/[] gc) {
+public static final native void _gtk_style_get_dark_gc(long /*int*/ style, int index, long /*int*/[] gc);
+public static final void gtk_style_get_dark_gc(long /*int*/ style, int index, long /*int*/[] gc) {
lock.lock();
try {
_gtk_style_get_dark_gc(style, index, gc);
@@ -9965,8 +9965,8 @@ public static final void gtk_style_get_dark_gc(int /*long*/ style, int index, in
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
-public static final native void _gtk_style_get_mid_gc(int /*long*/ style, int index, int /*long*/[] gc);
-public static final void gtk_style_get_mid_gc(int /*long*/ style, int index, int /*long*/[] gc) {
+public static final native void _gtk_style_get_mid_gc(long /*int*/ style, int index, long /*int*/[] gc);
+public static final void gtk_style_get_mid_gc(long /*int*/ style, int index, long /*int*/[] gc) {
lock.lock();
try {
_gtk_style_get_mid_gc(style, index, gc);
@@ -9978,8 +9978,8 @@ public static final void gtk_style_get_mid_gc(int /*long*/ style, int index, int
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
-public static final native void _gtk_style_get_text_gc(int /*long*/ style, int index, int /*long*/[] gc);
-public static final void gtk_style_get_text_gc(int /*long*/ style, int index, int /*long*/[] gc) {
+public static final native void _gtk_style_get_text_gc(long /*int*/ style, int index, long /*int*/[] gc);
+public static final void gtk_style_get_text_gc(long /*int*/ style, int index, long /*int*/[] gc) {
lock.lock();
try {
_gtk_style_get_text_gc(style, index, gc);
@@ -9991,8 +9991,8 @@ public static final void gtk_style_get_text_gc(int /*long*/ style, int index, in
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
-public static final native void _gtk_style_get_text_aa_gc(int /*long*/ style, int index, int /*long*/[] gc);
-public static final void gtk_style_get_text_aa_gc(int /*long*/ style, int index, int /*long*/[] gc) {
+public static final native void _gtk_style_get_text_aa_gc(long /*int*/ style, int index, long /*int*/[] gc);
+public static final void gtk_style_get_text_aa_gc(long /*int*/ style, int index, long /*int*/[] gc) {
lock.lock();
try {
_gtk_style_get_text_aa_gc(style, index, gc);
@@ -10004,8 +10004,8 @@ public static final void gtk_style_get_text_aa_gc(int /*long*/ style, int index,
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **),flags=no_in
*/
-public static final native void _gtk_style_get_black_gc(int /*long*/ style, int /*long*/[] gc);
-public static final void gtk_style_get_black_gc(int /*long*/ style, int /*long*/[] gc) {
+public static final native void _gtk_style_get_black_gc(long /*int*/ style, long /*int*/[] gc);
+public static final void gtk_style_get_black_gc(long /*int*/ style, long /*int*/[] gc) {
lock.lock();
try {
_gtk_style_get_black_gc(style, gc);
@@ -10017,8 +10017,8 @@ public static final void gtk_style_get_black_gc(int /*long*/ style, int /*long*/
* @param style cast=(GtkStyle *)
* @param gc cast=(GdkGC **)
*/
-public static final native void _gtk_style_get_white_gc(int /*long*/ style, int /*long*/[] gc);
-public static final void gtk_style_get_white_gc(int /*long*/ style, int /*long*/[] gc) {
+public static final native void _gtk_style_get_white_gc(long /*int*/ style, long /*int*/[] gc);
+public static final void gtk_style_get_white_gc(long /*int*/ style, long /*int*/[] gc) {
lock.lock();
try {
_gtk_style_get_white_gc(style, gc);
@@ -10027,8 +10027,8 @@ public static final void gtk_style_get_white_gc(int /*long*/ style, int /*long*/
}
}
/** @param style cast=(GtkStyle *) */
-public static final native int /*long*/ _gtk_style_get_font_desc(int /*long*/ style);
-public static final int /*long*/ gtk_style_get_font_desc(int /*long*/ style) {
+public static final native long /*int*/ _gtk_style_get_font_desc(long /*int*/ style);
+public static final long /*int*/ gtk_style_get_font_desc(long /*int*/ style) {
lock.lock();
try {
return _gtk_style_get_font_desc(style);
@@ -10040,8 +10040,8 @@ public static final int /*long*/ gtk_style_get_font_desc(int /*long*/ style) {
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
-public static final native void _gtk_style_get_light(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_style_get_light(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_style_get_light(long /*int*/ style, int index, GdkColor color);
+public static final void gtk_style_get_light(long /*int*/ style, int index, GdkColor color) {
lock.lock();
try {
_gtk_style_get_light(style, index, color);
@@ -10053,8 +10053,8 @@ public static final void gtk_style_get_light(int /*long*/ style, int index, GdkC
* @param style cast=(GtkStyle *)
* @param color flags=no_in
*/
-public static final native void _gtk_style_get_text(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_style_get_text(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_style_get_text(long /*int*/ style, int index, GdkColor color);
+public static final void gtk_style_get_text(long /*int*/ style, int index, GdkColor color) {
lock.lock();
try {
_gtk_style_get_text(style, index, color);
@@ -10063,8 +10063,8 @@ public static final void gtk_style_get_text(int /*long*/ style, int index, GdkCo
}
}
/** @param style cast=(GtkStyle *) */
-public static final native int _gtk_style_get_xthickness(int /*long*/ style);
-public static final int gtk_style_get_xthickness(int /*long*/ style) {
+public static final native int _gtk_style_get_xthickness(long /*int*/ style);
+public static final int gtk_style_get_xthickness(long /*int*/ style) {
lock.lock();
try {
return _gtk_style_get_xthickness(style);
@@ -10073,8 +10073,8 @@ public static final int gtk_style_get_xthickness(int /*long*/ style) {
}
}
/** @param style cast=(GtkStyle *) */
-public static final native int _gtk_style_get_ythickness(int /*long*/ style);
-public static final int gtk_style_get_ythickness(int /*long*/ style) {
+public static final native int _gtk_style_get_ythickness(long /*int*/ style);
+public static final int gtk_style_get_ythickness(long /*int*/ style) {
lock.lock();
try {
return _gtk_style_get_ythickness(style);
@@ -10088,8 +10088,8 @@ public static final int gtk_style_get_ythickness(int /*long*/ style) {
* @param widget cast=(GtkWidget *)
* @param detail cast=(const gchar *)
*/
-public static final native int /*long*/ _gtk_style_render_icon(int /*long*/ style, int /*long*/ source, int direction, int state, int size, int /*long*/ widget, byte[] detail);
-public static final int /*long*/ gtk_style_render_icon(int /*long*/ style, int /*long*/ source, int direction, int state, int size, int /*long*/ widget, byte[] detail) {
+public static final native long /*int*/ _gtk_style_render_icon(long /*int*/ style, long /*int*/ source, int direction, int state, int size, long /*int*/ widget, byte[] detail);
+public static final long /*int*/ gtk_style_render_icon(long /*int*/ style, long /*int*/ source, int direction, int state, int size, long /*int*/ widget, byte[] detail) {
lock.lock();
try {
return _gtk_style_render_icon(style, source, direction, state, size, widget, detail);
@@ -10101,8 +10101,8 @@ public static final int /*long*/ gtk_style_render_icon(int /*long*/ style, int /
* @param targets cast=(const GtkTargetEntry *)
* @param ntargets cast=(guint)
*/
-public static final native int /*long*/ _gtk_target_list_new(int /*long*/ targets, int ntargets);
-public static final int /*long*/ gtk_target_list_new(int /*long*/ targets, int ntargets) {
+public static final native long /*int*/ _gtk_target_list_new(long /*int*/ targets, int ntargets);
+public static final long /*int*/ gtk_target_list_new(long /*int*/ targets, int ntargets) {
lock.lock();
try {
return _gtk_target_list_new(targets, ntargets);
@@ -10111,8 +10111,8 @@ public static final int /*long*/ gtk_target_list_new(int /*long*/ targets, int n
}
}
/** @param list cast=(GtkTargetList *) */
-public static final native void _gtk_target_list_unref(int /*long*/ list);
-public static final void gtk_target_list_unref(int /*long*/ list) {
+public static final native void _gtk_target_list_unref(long /*int*/ list);
+public static final void gtk_target_list_unref(long /*int*/ list) {
lock.lock();
try {
_gtk_target_list_unref(list);
@@ -10124,8 +10124,8 @@ public static final void gtk_target_list_unref(int /*long*/ list) {
* @param buffer cast=(GtkTextBuffer *)
* @param clipboard cast=(GtkClipboard *)
*/
-public static final native void _gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int /*long*/ clipboard);
-public static final void gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int /*long*/ clipboard) {
+public static final native void _gtk_text_buffer_copy_clipboard(long /*int*/ buffer, long /*int*/ clipboard);
+public static final void gtk_text_buffer_copy_clipboard(long /*int*/ buffer, long /*int*/ clipboard) {
lock.lock();
try {
_gtk_text_buffer_copy_clipboard(buffer, clipboard);
@@ -10138,8 +10138,8 @@ public static final void gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int
* @param clipboard cast=(GtkClipboard *)
* @param default_editable cast=(gboolean)
*/
-public static final native void _gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int /*long*/ clipboard, boolean default_editable);
-public static final void gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int /*long*/ clipboard, boolean default_editable) {
+public static final native void _gtk_text_buffer_cut_clipboard(long /*int*/ buffer, long /*int*/ clipboard, boolean default_editable);
+public static final void gtk_text_buffer_cut_clipboard(long /*int*/ buffer, long /*int*/ clipboard, boolean default_editable) {
lock.lock();
try {
_gtk_text_buffer_cut_clipboard(buffer, clipboard, default_editable);
@@ -10152,8 +10152,8 @@ public static final void gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
-public static final native void _gtk_text_buffer_delete(int /*long*/ buffer, byte[] start, byte[] end);
-public static final void gtk_text_buffer_delete(int /*long*/ buffer, byte[] start, byte[] end) {
+public static final native void _gtk_text_buffer_delete(long /*int*/ buffer, byte[] start, byte[] end);
+public static final void gtk_text_buffer_delete(long /*int*/ buffer, byte[] start, byte[] end) {
lock.lock();
try {
_gtk_text_buffer_delete(buffer, start, end);
@@ -10166,8 +10166,8 @@ public static final void gtk_text_buffer_delete(int /*long*/ buffer, byte[] star
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
-public static final native void _gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[] start, byte[] end);
-public static final void gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[] start, byte[] end) {
+public static final native void _gtk_text_buffer_get_bounds(long /*int*/ buffer, byte[] start, byte[] end);
+public static final void gtk_text_buffer_get_bounds(long /*int*/ buffer, byte[] start, byte[] end) {
lock.lock();
try {
_gtk_text_buffer_get_bounds(buffer, start, end);
@@ -10179,8 +10179,8 @@ public static final void gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[]
* @param buffer cast=(GtkTextBuffer *)
* @param iter cast=(GtkTextIter *)
*/
-public static final native void _gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[] iter);
-public static final void gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[] iter) {
+public static final native void _gtk_text_buffer_get_end_iter(long /*int*/ buffer, byte[] iter);
+public static final void gtk_text_buffer_get_end_iter(long /*int*/ buffer, byte[] iter) {
lock.lock();
try {
_gtk_text_buffer_get_end_iter(buffer, iter);
@@ -10189,8 +10189,8 @@ public static final void gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[
}
}
/** @param buffer cast=(GtkTextBuffer *) */
-public static final native int /*long*/ _gtk_text_buffer_get_insert(int /*long*/ buffer);
-public static final int /*long*/ gtk_text_buffer_get_insert(int /*long*/ buffer) {
+public static final native long /*int*/ _gtk_text_buffer_get_insert(long /*int*/ buffer);
+public static final long /*int*/ gtk_text_buffer_get_insert(long /*int*/ buffer) {
lock.lock();
try {
return _gtk_text_buffer_get_insert(buffer);
@@ -10203,8 +10203,8 @@ public static final int /*long*/ gtk_text_buffer_get_insert(int /*long*/ buffer)
* @param iter cast=(GtkTextIter *)
* @param line_number cast=(gint)
*/
-public static final native void _gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, byte[] iter, int line_number);
-public static final void gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, byte[] iter, int line_number) {
+public static final native void _gtk_text_buffer_get_iter_at_line(long /*int*/ buffer, byte[] iter, int line_number);
+public static final void gtk_text_buffer_get_iter_at_line(long /*int*/ buffer, byte[] iter, int line_number) {
lock.lock();
try {
_gtk_text_buffer_get_iter_at_line(buffer, iter, line_number);
@@ -10217,8 +10217,8 @@ public static final void gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, b
* @param iter cast=(GtkTextIter *)
* @param mark cast=(GtkTextMark *)
*/
-public static final native void _gtk_text_buffer_get_iter_at_mark(int /*long*/ buffer, byte[] iter, int /*long*/ mark);
-public static final void gtk_text_buffer_get_iter_at_mark(int /*long*/ buffer, byte[] iter, int /*long*/ mark) {
+public static final native void _gtk_text_buffer_get_iter_at_mark(long /*int*/ buffer, byte[] iter, long /*int*/ mark);
+public static final void gtk_text_buffer_get_iter_at_mark(long /*int*/ buffer, byte[] iter, long /*int*/ mark) {
lock.lock();
try {
_gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
@@ -10231,8 +10231,8 @@ public static final void gtk_text_buffer_get_iter_at_mark(int /*long*/ buffer, b
* @param iter cast=(GtkTextIter *)
* @param char_offset cast=(gint)
*/
-public static final native void _gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer, byte[] iter, int char_offset);
-public static final void gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer, byte[] iter, int char_offset) {
+public static final native void _gtk_text_buffer_get_iter_at_offset(long /*int*/ buffer, byte[] iter, int char_offset);
+public static final void gtk_text_buffer_get_iter_at_offset(long /*int*/ buffer, byte[] iter, int char_offset) {
lock.lock();
try {
_gtk_text_buffer_get_iter_at_offset(buffer, iter, char_offset);
@@ -10241,8 +10241,8 @@ public static final void gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer,
}
}
/** @param buffer cast=(GtkTextBuffer *) */
-public static final native int _gtk_text_buffer_get_line_count(int /*long*/ buffer);
-public static final int gtk_text_buffer_get_line_count(int /*long*/ buffer) {
+public static final native int _gtk_text_buffer_get_line_count(long /*int*/ buffer);
+public static final int gtk_text_buffer_get_line_count(long /*int*/ buffer) {
lock.lock();
try {
return _gtk_text_buffer_get_line_count(buffer);
@@ -10251,8 +10251,8 @@ public static final int gtk_text_buffer_get_line_count(int /*long*/ buffer) {
}
}
/** @param buffer cast=(GtkTextBuffer *) */
-public static final native int /*long*/ _gtk_text_buffer_get_selection_bound(int /*long*/ buffer);
-public static final int /*long*/ gtk_text_buffer_get_selection_bound(int /*long*/ buffer) {
+public static final native long /*int*/ _gtk_text_buffer_get_selection_bound(long /*int*/ buffer);
+public static final long /*int*/ gtk_text_buffer_get_selection_bound(long /*int*/ buffer) {
lock.lock();
try {
return _gtk_text_buffer_get_selection_bound(buffer);
@@ -10265,8 +10265,8 @@ public static final int /*long*/ gtk_text_buffer_get_selection_bound(int /*long*
* @param start cast=(GtkTextIter *)
* @param end cast=(GtkTextIter *)
*/
-public static final native boolean _gtk_text_buffer_get_selection_bounds(int /*long*/ buffer, byte[] start, byte[] end);
-public static final boolean gtk_text_buffer_get_selection_bounds(int /*long*/ buffer, byte[] start, byte[] end) {
+public static final native boolean _gtk_text_buffer_get_selection_bounds(long /*int*/ buffer, byte[] start, byte[] end);
+public static final boolean gtk_text_buffer_get_selection_bounds(long /*int*/ buffer, byte[] start, byte[] end) {
lock.lock();
try {
return _gtk_text_buffer_get_selection_bounds(buffer, start, end);
@@ -10280,8 +10280,8 @@ public static final boolean gtk_text_buffer_get_selection_bounds(int /*long*/ bu
* @param end cast=(GtkTextIter *)
* @param include_hidden_chars cast=(gboolean)
*/
-public static final native int /*long*/ _gtk_text_buffer_get_text(int /*long*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars);
-public static final int /*long*/ gtk_text_buffer_get_text(int /*long*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars) {
+public static final native long /*int*/ _gtk_text_buffer_get_text(long /*int*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars);
+public static final long /*int*/ gtk_text_buffer_get_text(long /*int*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars) {
lock.lock();
try {
return _gtk_text_buffer_get_text(buffer, start, end, include_hidden_chars);
@@ -10295,8 +10295,8 @@ public static final int /*long*/ gtk_text_buffer_get_text(int /*long*/ buffer, b
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
-public static final native void _gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter, byte[] text, int len);
-public static final void gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter, byte[] text, int len) {
+public static final native void _gtk_text_buffer_insert(long /*int*/ buffer, byte[] iter, byte[] text, int len);
+public static final void gtk_text_buffer_insert(long /*int*/ buffer, byte[] iter, byte[] text, int len) {
lock.lock();
try {
_gtk_text_buffer_insert(buffer, iter, text, len);
@@ -10310,8 +10310,8 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
-public static final native void _gtk_text_buffer_insert(int /*long*/ buffer, int /*long*/ iter, byte[] text, int len);
-public static final void gtk_text_buffer_insert(int /*long*/ buffer, int /*long*/ iter, byte[] text, int len) {
+public static final native void _gtk_text_buffer_insert(long /*int*/ buffer, long /*int*/ iter, byte[] text, int len);
+public static final void gtk_text_buffer_insert(long /*int*/ buffer, long /*int*/ iter, byte[] text, int len) {
lock.lock();
try {
_gtk_text_buffer_insert(buffer, iter, text, len);
@@ -10324,8 +10324,8 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, int /*long*
* @param mark cast=(GtkTextMark *)
* @param where cast=(const GtkTextIter *)
*/
-public static final native void _gtk_text_buffer_move_mark(int /*long*/ buffer, int /*long*/ mark, byte[] where);
-public static final void gtk_text_buffer_move_mark(int /*long*/ buffer, int /*long*/ mark, byte[] where) {
+public static final native void _gtk_text_buffer_move_mark(long /*int*/ buffer, long /*int*/ mark, byte[] where);
+public static final void gtk_text_buffer_move_mark(long /*int*/ buffer, long /*int*/ mark, byte[] where) {
lock.lock();
try {
_gtk_text_buffer_move_mark(buffer, mark, where);
@@ -10339,8 +10339,8 @@ public static final void gtk_text_buffer_move_mark(int /*long*/ buffer, int /*lo
* @param override_location cast=(GtkTextIter *)
* @param default_editable cast=(gboolean)
*/
-public static final native void _gtk_text_buffer_paste_clipboard(int /*long*/ buffer, int /*long*/ clipboard, byte[] override_location, boolean default_editable);
-public static final void gtk_text_buffer_paste_clipboard(int /*long*/ buffer, int /*long*/ clipboard, byte[] override_location, boolean default_editable) {
+public static final native void _gtk_text_buffer_paste_clipboard(long /*int*/ buffer, long /*int*/ clipboard, byte[] override_location, boolean default_editable);
+public static final void gtk_text_buffer_paste_clipboard(long /*int*/ buffer, long /*int*/ clipboard, byte[] override_location, boolean default_editable) {
lock.lock();
try {
_gtk_text_buffer_paste_clipboard(buffer, clipboard, override_location, default_editable);
@@ -10352,8 +10352,8 @@ public static final void gtk_text_buffer_paste_clipboard(int /*long*/ buffer, in
* @param buffer cast=(GtkTextBuffer *)
* @param where cast=(const GtkTextIter *)
*/
-public static final native void _gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[] where);
-public static final void gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[] where) {
+public static final native void _gtk_text_buffer_place_cursor(long /*int*/ buffer, byte[] where);
+public static final void gtk_text_buffer_place_cursor(long /*int*/ buffer, byte[] where) {
lock.lock();
try {
_gtk_text_buffer_place_cursor(buffer, where);
@@ -10366,8 +10366,8 @@ public static final void gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[
* @param text cast=(const gchar *)
* @param len cast=(gint)
*/
-public static final native void _gtk_text_buffer_set_text(int /*long*/ buffer, byte[] text, int len);
-public static final void gtk_text_buffer_set_text(int /*long*/ buffer, byte[] text, int len) {
+public static final native void _gtk_text_buffer_set_text(long /*int*/ buffer, byte[] text, int len);
+public static final void gtk_text_buffer_set_text(long /*int*/ buffer, byte[] text, int len) {
lock.lock();
try {
_gtk_text_buffer_set_text(buffer, text, len);
@@ -10403,8 +10403,8 @@ public static final int gtk_text_iter_get_offset(byte[] iter) {
* @param window_x cast=(gint *)
* @param window_y cast=(gint *)
*/
-public static final native void _gtk_text_view_buffer_to_window_coords(int /*long*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y);
-public static final void gtk_text_view_buffer_to_window_coords(int /*long*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y) {
+public static final native void _gtk_text_view_buffer_to_window_coords(long /*int*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y);
+public static final void gtk_text_view_buffer_to_window_coords(long /*int*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y) {
lock.lock();
try {
_gtk_text_view_buffer_to_window_coords(text_view, win, buffer_x, buffer_y, window_x, window_y);
@@ -10413,8 +10413,8 @@ public static final void gtk_text_view_buffer_to_window_coords(int /*long*/ text
}
}
/** @param text_view cast=(GtkTextView *) */
-public static final native int /*long*/ _gtk_text_view_get_buffer(int /*long*/ text_view);
-public static final int /*long*/ gtk_text_view_get_buffer(int /*long*/ text_view) {
+public static final native long /*int*/ _gtk_text_view_get_buffer(long /*int*/ text_view);
+public static final long /*int*/ gtk_text_view_get_buffer(long /*int*/ text_view) {
lock.lock();
try {
return _gtk_text_view_get_buffer(text_view);
@@ -10423,8 +10423,8 @@ public static final int /*long*/ gtk_text_view_get_buffer(int /*long*/ text_view
}
}
/** @param text_view cast=(GtkTextView *) */
-public static final native boolean _gtk_text_view_get_editable(int /*long*/ text_view);
-public static final boolean gtk_text_view_get_editable(int /*long*/ text_view) {
+public static final native boolean _gtk_text_view_get_editable(long /*int*/ text_view);
+public static final boolean gtk_text_view_get_editable(long /*int*/ text_view) {
lock.lock();
try {
return _gtk_text_view_get_editable(text_view);
@@ -10438,8 +10438,8 @@ public static final boolean gtk_text_view_get_editable(int /*long*/ text_view) {
* @param x cast=(gint)
* @param y cast=(gint)
*/
-public static final native void _gtk_text_view_get_iter_at_location(int /*long*/ text_view, byte[] iter, int x, int y);
-public static final void gtk_text_view_get_iter_at_location(int /*long*/ text_view, byte[] iter, int x, int y) {
+public static final native void _gtk_text_view_get_iter_at_location(long /*int*/ text_view, byte[] iter, int x, int y);
+public static final void gtk_text_view_get_iter_at_location(long /*int*/ text_view, byte[] iter, int x, int y) {
lock.lock();
try {
_gtk_text_view_get_iter_at_location(text_view, iter, x, y);
@@ -10452,8 +10452,8 @@ public static final void gtk_text_view_get_iter_at_location(int /*long*/ text_vi
* @param iter cast=(const GtkTextIter *)
* @param location cast=(GdkRectangle *),flags=no_in
*/
-public static final native void _gtk_text_view_get_iter_location(int /*long*/ text_view, byte[] iter, GdkRectangle location);
-public static final void gtk_text_view_get_iter_location(int /*long*/ text_view, byte[] iter, GdkRectangle location) {
+public static final native void _gtk_text_view_get_iter_location(long /*int*/ text_view, byte[] iter, GdkRectangle location);
+public static final void gtk_text_view_get_iter_location(long /*int*/ text_view, byte[] iter, GdkRectangle location) {
lock.lock();
try {
_gtk_text_view_get_iter_location(text_view, iter, location);
@@ -10467,8 +10467,8 @@ public static final void gtk_text_view_get_iter_location(int /*long*/ text_view,
* @param y cast=(gint)
* @param line_top cast=(gint *)
*/
-public static final native void _gtk_text_view_get_line_at_y(int /*long*/ text_view, byte[] target_iter, int y, int[] line_top);
-public static final void gtk_text_view_get_line_at_y(int /*long*/ text_view, byte[] target_iter, int y, int[] line_top) {
+public static final native void _gtk_text_view_get_line_at_y(long /*int*/ text_view, byte[] target_iter, int y, int[] line_top);
+public static final void gtk_text_view_get_line_at_y(long /*int*/ text_view, byte[] target_iter, int y, int[] line_top) {
lock.lock();
try {
_gtk_text_view_get_line_at_y(text_view, target_iter, y, line_top);
@@ -10480,8 +10480,8 @@ public static final void gtk_text_view_get_line_at_y(int /*long*/ text_view, byt
* @param text_view cast=(GtkTextView *)
* @param visible_rect cast=(GdkRectangle *),flags=no_in
*/
-public static final native void _gtk_text_view_get_visible_rect(int /*long*/ text_view, GdkRectangle visible_rect);
-public static final void gtk_text_view_get_visible_rect(int /*long*/ text_view, GdkRectangle visible_rect) {
+public static final native void _gtk_text_view_get_visible_rect(long /*int*/ text_view, GdkRectangle visible_rect);
+public static final void gtk_text_view_get_visible_rect(long /*int*/ text_view, GdkRectangle visible_rect) {
lock.lock();
try {
_gtk_text_view_get_visible_rect(text_view, visible_rect);
@@ -10493,8 +10493,8 @@ public static final void gtk_text_view_get_visible_rect(int /*long*/ text_view,
* @param text_view cast=(GtkTextView *)
* @param win cast=(GtkTextWindowType)
*/
-public static final native int /*long*/ _gtk_text_view_get_window(int /*long*/ text_view, int win);
-public static final int /*long*/ gtk_text_view_get_window(int /*long*/ text_view, int win) {
+public static final native long /*int*/ _gtk_text_view_get_window(long /*int*/ text_view, int win);
+public static final long /*int*/ gtk_text_view_get_window(long /*int*/ text_view, int win) {
lock.lock();
try {
return _gtk_text_view_get_window(text_view, win);
@@ -10502,8 +10502,8 @@ public static final int /*long*/ gtk_text_view_get_window(int /*long*/ text_view
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_text_view_new();
-public static final int /*long*/ gtk_text_view_new() {
+public static final native long /*int*/ _gtk_text_view_new();
+public static final long /*int*/ gtk_text_view_new() {
lock.lock();
try {
return _gtk_text_view_new();
@@ -10515,8 +10515,8 @@ public static final int /*long*/ gtk_text_view_new() {
* @param text_view cast=(GtkTextView *)
* @param mark cast=(GtkTextMark *)
*/
-public static final native void _gtk_text_view_scroll_mark_onscreen(int /*long*/ text_view, int /*long*/ mark);
-public static final void gtk_text_view_scroll_mark_onscreen(int /*long*/ text_view, int /*long*/ mark) {
+public static final native void _gtk_text_view_scroll_mark_onscreen(long /*int*/ text_view, long /*int*/ mark);
+public static final void gtk_text_view_scroll_mark_onscreen(long /*int*/ text_view, long /*int*/ mark) {
lock.lock();
try {
_gtk_text_view_scroll_mark_onscreen(text_view, mark);
@@ -10532,8 +10532,8 @@ public static final void gtk_text_view_scroll_mark_onscreen(int /*long*/ text_vi
* @param xalign cast=(gdouble)
* @param yalign cast=(gdouble)
*/
-public static final native boolean _gtk_text_view_scroll_to_iter(int /*long*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign);
-public static final boolean gtk_text_view_scroll_to_iter(int /*long*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign) {
+public static final native boolean _gtk_text_view_scroll_to_iter(long /*int*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign);
+public static final boolean gtk_text_view_scroll_to_iter(long /*int*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign) {
lock.lock();
try {
return _gtk_text_view_scroll_to_iter(text_view, iter, within_margin, use_align, xalign, yalign);
@@ -10545,8 +10545,8 @@ public static final boolean gtk_text_view_scroll_to_iter(int /*long*/ text_view,
* @param text_view cast=(GtkTextView *)
* @param setting cast=(gboolean)
*/
-public static final native void _gtk_text_view_set_editable(int /*long*/ text_view, boolean setting);
-public static final void gtk_text_view_set_editable(int /*long*/ text_view, boolean setting) {
+public static final native void _gtk_text_view_set_editable(long /*int*/ text_view, boolean setting);
+public static final void gtk_text_view_set_editable(long /*int*/ text_view, boolean setting) {
lock.lock();
try {
_gtk_text_view_set_editable(text_view, setting);
@@ -10555,8 +10555,8 @@ public static final void gtk_text_view_set_editable(int /*long*/ text_view, bool
}
}
/** @param text_view cast=(GtkTextView *) */
-public static final native void _gtk_text_view_set_justification(int /*long*/ text_view, int justification);
-public static final void gtk_text_view_set_justification(int /*long*/ text_view, int justification) {
+public static final native void _gtk_text_view_set_justification(long /*int*/ text_view, int justification);
+public static final void gtk_text_view_set_justification(long /*int*/ text_view, int justification) {
lock.lock();
try {
_gtk_text_view_set_justification(text_view, justification);
@@ -10568,8 +10568,8 @@ public static final void gtk_text_view_set_justification(int /*long*/ text_view,
* @param text_view cast=(GtkTextView *)
* @param tabs cast=(PangoTabArray *)
*/
-public static final native void _gtk_text_view_set_tabs(int /*long*/ text_view, int /*long*/ tabs);
-public static final void gtk_text_view_set_tabs(int /*long*/ text_view, int /*long*/ tabs) {
+public static final native void _gtk_text_view_set_tabs(long /*int*/ text_view, long /*int*/ tabs);
+public static final void gtk_text_view_set_tabs(long /*int*/ text_view, long /*int*/ tabs) {
lock.lock();
try {
_gtk_text_view_set_tabs(text_view, tabs);
@@ -10578,8 +10578,8 @@ public static final void gtk_text_view_set_tabs(int /*long*/ text_view, int /*lo
}
}
/** @param text_view cast=(GtkTextView *) */
-public static final native void _gtk_text_view_set_wrap_mode(int /*long*/ text_view, int wrap_mode);
-public static final void gtk_text_view_set_wrap_mode(int /*long*/ text_view, int wrap_mode) {
+public static final native void _gtk_text_view_set_wrap_mode(long /*int*/ text_view, int wrap_mode);
+public static final void gtk_text_view_set_wrap_mode(long /*int*/ text_view, int wrap_mode) {
lock.lock();
try {
_gtk_text_view_set_wrap_mode(text_view, wrap_mode);
@@ -10592,8 +10592,8 @@ public static final void gtk_text_view_set_wrap_mode(int /*long*/ text_view, int
* @param function cast=(GSourceFunc)
* @param data cast=(gpointer)
*/
-public static final native int _g_timeout_add(int interval, int /*long*/ function, int /*long*/ data);
-public static final int g_timeout_add(int interval, int /*long*/ function, int /*long*/ data) {
+public static final native int _g_timeout_add(int interval, long /*int*/ function, long /*int*/ data);
+public static final int g_timeout_add(int interval, long /*int*/ function, long /*int*/ data) {
lock.lock();
try {
return _g_timeout_add(interval, function, data);
@@ -10602,8 +10602,8 @@ public static final int g_timeout_add(int interval, int /*long*/ function, int /
}
}
/** @param toggle_button cast=(GtkToggleButton *) */
-public static final native boolean _gtk_toggle_button_get_active(int /*long*/ toggle_button);
-public static final boolean gtk_toggle_button_get_active(int /*long*/ toggle_button) {
+public static final native boolean _gtk_toggle_button_get_active(long /*int*/ toggle_button);
+public static final boolean gtk_toggle_button_get_active(long /*int*/ toggle_button) {
lock.lock();
try {
return _gtk_toggle_button_get_active(toggle_button);
@@ -10611,8 +10611,8 @@ public static final boolean gtk_toggle_button_get_active(int /*long*/ toggle_but
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_toggle_button_new();
-public static final int /*long*/ gtk_toggle_button_new() {
+public static final native long /*int*/ _gtk_toggle_button_new();
+public static final long /*int*/ gtk_toggle_button_new() {
lock.lock();
try {
return _gtk_toggle_button_new();
@@ -10624,8 +10624,8 @@ public static final int /*long*/ gtk_toggle_button_new() {
* @param toggle_button cast=(GtkToggleButton *)
* @param is_active cast=(gboolean)
*/
-public static final native void _gtk_toggle_button_set_active(int /*long*/ toggle_button, boolean is_active);
-public static final void gtk_toggle_button_set_active(int /*long*/ toggle_button, boolean is_active) {
+public static final native void _gtk_toggle_button_set_active(long /*int*/ toggle_button, boolean is_active);
+public static final void gtk_toggle_button_set_active(long /*int*/ toggle_button, boolean is_active) {
lock.lock();
try {
_gtk_toggle_button_set_active(toggle_button, is_active);
@@ -10637,8 +10637,8 @@ public static final void gtk_toggle_button_set_active(int /*long*/ toggle_button
* @param toggle_button cast=(GtkToggleButton *)
* @param setting cast=(gboolean)
*/
-public static final native void _gtk_toggle_button_set_inconsistent(int /*long*/ toggle_button, boolean setting);
-public static final void gtk_toggle_button_set_inconsistent(int /*long*/ toggle_button, boolean setting) {
+public static final native void _gtk_toggle_button_set_inconsistent(long /*int*/ toggle_button, boolean setting);
+public static final void gtk_toggle_button_set_inconsistent(long /*int*/ toggle_button, boolean setting) {
lock.lock();
try {
_gtk_toggle_button_set_inconsistent(toggle_button, setting);
@@ -10650,8 +10650,8 @@ public static final void gtk_toggle_button_set_inconsistent(int /*long*/ toggle_
* @param toggle_button cast=(GtkToggleButton *)
* @param draw_indicator cast=(gboolean)
*/
-public static final native void _gtk_toggle_button_set_mode(int /*long*/ toggle_button, boolean draw_indicator);
-public static final void gtk_toggle_button_set_mode(int /*long*/ toggle_button, boolean draw_indicator) {
+public static final native void _gtk_toggle_button_set_mode(long /*int*/ toggle_button, boolean draw_indicator);
+public static final void gtk_toggle_button_set_mode(long /*int*/ toggle_button, boolean draw_indicator) {
lock.lock();
try {
_gtk_toggle_button_set_mode(toggle_button, draw_indicator);
@@ -10660,8 +10660,8 @@ public static final void gtk_toggle_button_set_mode(int /*long*/ toggle_button,
}
}
/** @param button cast=(GtkToggleToolButton *) */
-public static final native boolean _gtk_toggle_tool_button_get_active(int /*long*/ button);
-public static final boolean gtk_toggle_tool_button_get_active(int /*long*/ button) {
+public static final native boolean _gtk_toggle_tool_button_get_active(long /*int*/ button);
+public static final boolean gtk_toggle_tool_button_get_active(long /*int*/ button) {
lock.lock();
try {
return _gtk_toggle_tool_button_get_active(button);
@@ -10669,8 +10669,8 @@ public static final boolean gtk_toggle_tool_button_get_active(int /*long*/ butto
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_toggle_tool_button_new();
-public static final int /*long*/ gtk_toggle_tool_button_new() {
+public static final native long /*int*/ _gtk_toggle_tool_button_new();
+public static final long /*int*/ gtk_toggle_tool_button_new() {
lock.lock();
try {
return _gtk_toggle_tool_button_new();
@@ -10682,8 +10682,8 @@ public static final int /*long*/ gtk_toggle_tool_button_new() {
* @param item cast=(GtkToggleToolButton *)
* @param selected cast=(gboolean)
*/
-public static final native void _gtk_toggle_tool_button_set_active(int /*long*/ item, boolean selected);
-public static final void gtk_toggle_tool_button_set_active(int /*long*/ item, boolean selected) {
+public static final native void _gtk_toggle_tool_button_set_active(long /*int*/ item, boolean selected);
+public static final void gtk_toggle_tool_button_set_active(long /*int*/ item, boolean selected) {
lock.lock();
try {
_gtk_toggle_tool_button_set_active(item, selected);
@@ -10695,8 +10695,8 @@ public static final void gtk_toggle_tool_button_set_active(int /*long*/ item, bo
* @param icon_widget cast=(GtkWidget *)
* @param label cast=(const gchar *)
*/
-public static final native int /*long*/ _gtk_tool_button_new(int /*long*/ icon_widget, byte[] label);
-public static final int /*long*/ gtk_tool_button_new(int /*long*/ icon_widget, byte[] label) {
+public static final native long /*int*/ _gtk_tool_button_new(long /*int*/ icon_widget, byte[] label);
+public static final long /*int*/ gtk_tool_button_new(long /*int*/ icon_widget, byte[] label) {
lock.lock();
try {
return _gtk_tool_button_new(icon_widget, label);
@@ -10708,8 +10708,8 @@ public static final int /*long*/ gtk_tool_button_new(int /*long*/ icon_widget, b
* @param button cast=(GtkToolButton *)
* @param widget cast=(GtkWidget *)
*/
-public static final native void _gtk_tool_button_set_icon_widget(int /*long*/ button, int /*long*/ widget);
-public static final void gtk_tool_button_set_icon_widget(int /*long*/ button, int /*long*/ widget) {
+public static final native void _gtk_tool_button_set_icon_widget(long /*int*/ button, long /*int*/ widget);
+public static final void gtk_tool_button_set_icon_widget(long /*int*/ button, long /*int*/ widget) {
lock.lock();
try {
_gtk_tool_button_set_icon_widget(button, widget);
@@ -10721,8 +10721,8 @@ public static final void gtk_tool_button_set_icon_widget(int /*long*/ button, in
* @param button cast=(GtkToolButton *)
* @param label cast=(const gchar *)
*/
-public static final native void _gtk_tool_button_set_label(int /*long*/ button, byte[] label);
-public static final void gtk_tool_button_set_label(int /*long*/ button, byte[] label) {
+public static final native void _gtk_tool_button_set_label(long /*int*/ button, byte[] label);
+public static final void gtk_tool_button_set_label(long /*int*/ button, byte[] label) {
lock.lock();
try {
_gtk_tool_button_set_label(button, label);
@@ -10734,8 +10734,8 @@ public static final void gtk_tool_button_set_label(int /*long*/ button, byte[]
* @param button cast=(GtkToolButton *)
* @param widget cast=(GtkWidget *)
*/
-public static final native void _gtk_tool_button_set_label_widget(int /*long*/ button, int /*long*/ widget);
-public static final void gtk_tool_button_set_label_widget(int /*long*/ button, int /*long*/ widget) {
+public static final native void _gtk_tool_button_set_label_widget(long /*int*/ button, long /*int*/ widget);
+public static final void gtk_tool_button_set_label_widget(long /*int*/ button, long /*int*/ widget) {
lock.lock();
try {
_gtk_tool_button_set_label_widget(button, widget);
@@ -10747,8 +10747,8 @@ public static final void gtk_tool_button_set_label_widget(int /*long*/ button,
* @param item cast=(GtkToolButton *)
* @param underline cast=(gboolean)
*/
-public static final native void _gtk_tool_button_set_use_underline(int /*long*/ item, boolean underline);
-public static final void gtk_tool_button_set_use_underline(int /*long*/ item, boolean underline) {
+public static final native void _gtk_tool_button_set_use_underline(long /*int*/ item, boolean underline);
+public static final void gtk_tool_button_set_use_underline(long /*int*/ item, boolean underline) {
lock.lock();
try {
_gtk_tool_button_set_use_underline(item, underline);
@@ -10760,8 +10760,8 @@ public static final void gtk_tool_button_set_use_underline(int /*long*/ item, bo
* @param item cast=(GtkToolItem *)
* @param menu_id cast=(const gchar *)
*/
-public static final native int /*long*/ _gtk_tool_item_get_proxy_menu_item(int /*long*/ item, byte[] menu_id);
-public static final int /*long*/ gtk_tool_item_get_proxy_menu_item(int /*long*/ item, byte[] menu_id) {
+public static final native long /*int*/ _gtk_tool_item_get_proxy_menu_item(long /*int*/ item, byte[] menu_id);
+public static final long /*int*/ gtk_tool_item_get_proxy_menu_item(long /*int*/ item, byte[] menu_id) {
lock.lock();
try {
return _gtk_tool_item_get_proxy_menu_item(item, menu_id);
@@ -10770,8 +10770,8 @@ public static final int /*long*/ gtk_tool_item_get_proxy_menu_item(int /*long*/
}
}
/** @param item cast=(GtkToolItem *) */
-public static final native int /*long*/ _gtk_tool_item_retrieve_proxy_menu_item(int /*long*/ item);
-public static final int /*long*/ gtk_tool_item_retrieve_proxy_menu_item(int /*long*/ item) {
+public static final native long /*int*/ _gtk_tool_item_retrieve_proxy_menu_item(long /*int*/ item);
+public static final long /*int*/ gtk_tool_item_retrieve_proxy_menu_item(long /*int*/ item) {
lock.lock();
try {
return _gtk_tool_item_retrieve_proxy_menu_item(item);
@@ -10783,8 +10783,8 @@ public static final int /*long*/ gtk_tool_item_retrieve_proxy_menu_item(int /*lo
* @param item cast=(GtkToolItem *)
* @param important cast=(gboolean)
*/
-public static final native void _gtk_tool_item_set_is_important(int /*long*/ item, boolean important);
-public static final void gtk_tool_item_set_is_important(int /*long*/ item, boolean important) {
+public static final native void _gtk_tool_item_set_is_important(long /*int*/ item, boolean important);
+public static final void gtk_tool_item_set_is_important(long /*int*/ item, boolean important) {
lock.lock();
try {
_gtk_tool_item_set_is_important(item, important);
@@ -10797,8 +10797,8 @@ public static final void gtk_tool_item_set_is_important(int /*long*/ item, boole
* @param menu_id cast=(const gchar *)
* @param widget cast=(GtkWidget *)
*/
-public static final native void _gtk_tool_item_set_proxy_menu_item(int /*long*/ item, byte[] menu_id, int /*long*/ widget);
-public static final void gtk_tool_item_set_proxy_menu_item(int /*long*/ item, byte[] menu_id, int /*long*/ widget) {
+public static final native void _gtk_tool_item_set_proxy_menu_item(long /*int*/ item, byte[] menu_id, long /*int*/ widget);
+public static final void gtk_tool_item_set_proxy_menu_item(long /*int*/ item, byte[] menu_id, long /*int*/ widget) {
lock.lock();
try {
_gtk_tool_item_set_proxy_menu_item(item, menu_id, widget);
@@ -10810,8 +10810,8 @@ public static final void gtk_tool_item_set_proxy_menu_item(int /*long*/ item, by
* @param toolbar cast=(GtkToolbar *)
* @param item cast=(GtkToolItem *)
*/
-public static final native void _gtk_toolbar_insert(int /*long*/ toolbar, int /*long*/ item, int pos);
-public static final void gtk_toolbar_insert(int /*long*/ toolbar, int /*long*/ item, int pos) {
+public static final native void _gtk_toolbar_insert(long /*int*/ toolbar, long /*int*/ item, int pos);
+public static final void gtk_toolbar_insert(long /*int*/ toolbar, long /*int*/ item, int pos) {
lock.lock();
try {
_gtk_toolbar_insert(toolbar, item, pos);
@@ -10819,8 +10819,8 @@ public static final void gtk_toolbar_insert(int /*long*/ toolbar, int /*long*/ i
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_toolbar_new();
-public static final int /*long*/ gtk_toolbar_new() {
+public static final native long /*int*/ _gtk_toolbar_new();
+public static final long /*int*/ gtk_toolbar_new() {
lock.lock();
try {
return _gtk_toolbar_new();
@@ -10833,8 +10833,8 @@ public static final int /*long*/ gtk_toolbar_new() {
* @param toolbar cast=(GtkToolbar *)
* @param orientation cast=(GtkOrientation)
*/
-public static final native void _gtk_toolbar_set_orientation(int /*long*/ toolbar, int orientation);
-public static final void gtk_toolbar_set_orientation(int /*long*/ toolbar, int orientation) {
+public static final native void _gtk_toolbar_set_orientation(long /*int*/ toolbar, int orientation);
+public static final void gtk_toolbar_set_orientation(long /*int*/ toolbar, int orientation) {
lock.lock();
try {
_gtk_toolbar_set_orientation(toolbar, orientation);
@@ -10846,8 +10846,8 @@ public static final void gtk_toolbar_set_orientation(int /*long*/ toolbar, int o
* @param toolbar cast=(GtkToolbar *)
* @param show_arrow cast=(gboolean)
*/
-public static final native void _gtk_toolbar_set_show_arrow(int /*long*/ toolbar, boolean show_arrow);
-public static final void gtk_toolbar_set_show_arrow(int /*long*/ toolbar, boolean show_arrow) {
+public static final native void _gtk_toolbar_set_show_arrow(long /*int*/ toolbar, boolean show_arrow);
+public static final void gtk_toolbar_set_show_arrow(long /*int*/ toolbar, boolean show_arrow) {
lock.lock();
try {
_gtk_toolbar_set_show_arrow(toolbar, show_arrow);
@@ -10858,8 +10858,8 @@ public static final void gtk_toolbar_set_show_arrow(int /*long*/ toolbar, boolea
/** @param toolbar cast=(GtkToolbar *)
* @param style cast=(GtkToolbarStyle)
*/
-public static final native void _gtk_toolbar_set_style(int /*long*/ toolbar, int style);
-public static final void gtk_toolbar_set_style(int /*long*/ toolbar, int style) {
+public static final native void _gtk_toolbar_set_style(long /*int*/ toolbar, int style);
+public static final void gtk_toolbar_set_style(long /*int*/ toolbar, int style) {
lock.lock();
try {
_gtk_toolbar_set_style(toolbar, style);
@@ -10869,8 +10869,8 @@ public static final void gtk_toolbar_set_style(int /*long*/ toolbar, int style)
}
/** @param toolbar cast=(GtkToolbar *)
*/
-public static final native void _gtk_toolbar_set_icon_size(int /*long*/ toolbar, int size);
-public static final void gtk_toolbar_set_icon_size(int /*long*/ toolbar, int size) {
+public static final native void _gtk_toolbar_set_icon_size(long /*int*/ toolbar, int size);
+public static final void gtk_toolbar_set_icon_size(long /*int*/ toolbar, int size) {
lock.lock();
try {
_gtk_toolbar_set_icon_size(toolbar, size);
@@ -10879,8 +10879,8 @@ public static final void gtk_toolbar_set_icon_size(int /*long*/ toolbar, int siz
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_tooltips_data_get(int /*long*/ widget);
-public static final int /*long*/ gtk_tooltips_data_get(int /*long*/ widget) {
+public static final native long /*int*/ _gtk_tooltips_data_get(long /*int*/ widget);
+public static final long /*int*/ gtk_tooltips_data_get(long /*int*/ widget) {
lock.lock();
try {
return _gtk_tooltips_data_get(widget);
@@ -10889,8 +10889,8 @@ public static final int /*long*/ gtk_tooltips_data_get(int /*long*/ widget) {
}
}
/** @method flags=dynamic */
-public static final native void _gtk_tooltips_disable(int /*long*/ tooltips);
-public static final void gtk_tooltips_disable(int /*long*/ tooltips) {
+public static final native void _gtk_tooltips_disable(long /*int*/ tooltips);
+public static final void gtk_tooltips_disable(long /*int*/ tooltips) {
lock.lock();
try {
_gtk_tooltips_disable(tooltips);
@@ -10899,8 +10899,8 @@ public static final void gtk_tooltips_disable(int /*long*/ tooltips) {
}
}
/** @method flags=dynamic */
-public static final native void _gtk_tooltips_enable(int /*long*/ tooltips);
-public static final void gtk_tooltips_enable(int /*long*/ tooltips) {
+public static final native void _gtk_tooltips_enable(long /*int*/ tooltips);
+public static final void gtk_tooltips_enable(long /*int*/ tooltips) {
lock.lock();
try {
_gtk_tooltips_enable(tooltips);
@@ -10909,8 +10909,8 @@ public static final void gtk_tooltips_enable(int /*long*/ tooltips) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_tooltips_new();
-public static final int /*long*/ gtk_tooltips_new() {
+public static final native long /*int*/ _gtk_tooltips_new();
+public static final long /*int*/ gtk_tooltips_new() {
lock.lock();
try {
return _gtk_tooltips_new();
@@ -10919,8 +10919,8 @@ public static final int /*long*/ gtk_tooltips_new() {
}
}
/** @method flags=dynamic */
-public static final native void _gtk_tooltips_force_window(int /*long*/ tooltips);
-public static final void gtk_tooltips_force_window(int /*long*/ tooltips) {
+public static final native void _gtk_tooltips_force_window(long /*int*/ tooltips);
+public static final void gtk_tooltips_force_window(long /*int*/ tooltips) {
lock.lock();
try {
_gtk_tooltips_force_window(tooltips);
@@ -10931,8 +10931,8 @@ public static final void gtk_tooltips_force_window(int /*long*/ tooltips) {
/**
* @method flags=dynamic
*/
-public static final native void _gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*/ widget, byte[] tip_text, byte[] tip_private);
-public static final void gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*/ widget, byte[] tip_text, byte[] tip_private) {
+public static final native void _gtk_tooltips_set_tip(long /*int*/ tooltips, long /*int*/ widget, byte[] tip_text, byte[] tip_private);
+public static final void gtk_tooltips_set_tip(long /*int*/ tooltips, long /*int*/ widget, byte[] tip_text, byte[] tip_private) {
lock.lock();
try {
_gtk_tooltips_set_tip(tooltips, widget, tip_text, tip_private);
@@ -10944,8 +10944,8 @@ public static final void gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native void _gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, long[] value, int terminator);
-public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, long[] value, int terminator) {
+public static final native void _gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, long[] value, int terminator);
+public static final void gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, long[] value, int terminator) {
lock.lock();
try {
_gtk_tree_model_get(tree_model, iter, column, value, terminator);
@@ -10957,8 +10957,8 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native void _gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, int[] value, int terminator);
-public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, int[] value, int terminator) {
+public static final native void _gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, int[] value, int terminator);
+public static final void gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, int[] value, int terminator) {
lock.lock();
try {
_gtk_tree_model_get(tree_model, iter, column, value, terminator);
@@ -10971,8 +10971,8 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
* @param iter cast=(GtkTreeIter *)
* @param path cast=(GtkTreePath *)
*/
-public static final native boolean _gtk_tree_model_get_iter(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ path);
-public static final boolean gtk_tree_model_get_iter(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ path) {
+public static final native boolean _gtk_tree_model_get_iter(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ path);
+public static final boolean gtk_tree_model_get_iter(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ path) {
lock.lock();
try {
return _gtk_tree_model_get_iter(tree_model, iter, path);
@@ -10984,8 +10984,8 @@ public static final boolean gtk_tree_model_get_iter(int /*long*/ tree_model, int
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native boolean _gtk_tree_model_get_iter_first(int /*long*/ tree_model, int /*long*/ iter);
-public static final boolean gtk_tree_model_get_iter_first(int /*long*/ tree_model, int /*long*/ iter) {
+public static final native boolean _gtk_tree_model_get_iter_first(long /*int*/ tree_model, long /*int*/ iter);
+public static final boolean gtk_tree_model_get_iter_first(long /*int*/ tree_model, long /*int*/ iter) {
lock.lock();
try {
return _gtk_tree_model_get_iter_first(tree_model, iter);
@@ -10994,8 +10994,8 @@ public static final boolean gtk_tree_model_get_iter_first(int /*long*/ tree_mode
}
}
/** @param tree_model cast=(GtkTreeModel *) */
-public static final native int _gtk_tree_model_get_n_columns(int /*long*/ tree_model);
-public static final int gtk_tree_model_get_n_columns(int /*long*/ tree_model) {
+public static final native int _gtk_tree_model_get_n_columns(long /*int*/ tree_model);
+public static final int gtk_tree_model_get_n_columns(long /*int*/ tree_model) {
lock.lock();
try {
return _gtk_tree_model_get_n_columns(tree_model);
@@ -11007,8 +11007,8 @@ public static final int gtk_tree_model_get_n_columns(int /*long*/ tree_model) {
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native int /*long*/ _gtk_tree_model_get_path(int /*long*/ tree_model, int /*long*/ iter);
-public static final int /*long*/ gtk_tree_model_get_path(int /*long*/ tree_model, int /*long*/ iter) {
+public static final native long /*int*/ _gtk_tree_model_get_path(long /*int*/ tree_model, long /*int*/ iter);
+public static final long /*int*/ gtk_tree_model_get_path(long /*int*/ tree_model, long /*int*/ iter) {
lock.lock();
try {
return _gtk_tree_model_get_path(tree_model, iter);
@@ -11016,8 +11016,8 @@ public static final int /*long*/ gtk_tree_model_get_path(int /*long*/ tree_model
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_tree_model_get_type();
-public static final int /*long*/ gtk_tree_model_get_type() {
+public static final native long /*int*/ _gtk_tree_model_get_type();
+public static final long /*int*/ gtk_tree_model_get_type() {
lock.lock();
try {
return _gtk_tree_model_get_type();
@@ -11030,8 +11030,8 @@ public static final int /*long*/ gtk_tree_model_get_type() {
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
-public static final native boolean _gtk_tree_model_iter_children(int /*long*/ model, int /*long*/ iter, int /*long*/ parent);
-public static final boolean gtk_tree_model_iter_children(int /*long*/ model, int /*long*/ iter, int /*long*/ parent) {
+public static final native boolean _gtk_tree_model_iter_children(long /*int*/ model, long /*int*/ iter, long /*int*/ parent);
+public static final boolean gtk_tree_model_iter_children(long /*int*/ model, long /*int*/ iter, long /*int*/ parent) {
lock.lock();
try {
return _gtk_tree_model_iter_children(model, iter, parent);
@@ -11043,8 +11043,8 @@ public static final boolean gtk_tree_model_iter_children(int /*long*/ model, int
* @param model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native int _gtk_tree_model_iter_n_children(int /*long*/ model, int /*long*/ iter);
-public static final int gtk_tree_model_iter_n_children(int /*long*/ model, int /*long*/ iter) {
+public static final native int _gtk_tree_model_iter_n_children(long /*int*/ model, long /*int*/ iter);
+public static final int gtk_tree_model_iter_n_children(long /*int*/ model, long /*int*/ iter) {
lock.lock();
try {
return _gtk_tree_model_iter_n_children(model, iter);
@@ -11056,8 +11056,8 @@ public static final int gtk_tree_model_iter_n_children(int /*long*/ model, int /
* @param model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native boolean _gtk_tree_model_iter_next(int /*long*/ model, int /*long*/ iter);
-public static final boolean gtk_tree_model_iter_next(int /*long*/ model, int /*long*/ iter) {
+public static final native boolean _gtk_tree_model_iter_next(long /*int*/ model, long /*int*/ iter);
+public static final boolean gtk_tree_model_iter_next(long /*int*/ model, long /*int*/ iter) {
lock.lock();
try {
return _gtk_tree_model_iter_next(model, iter);
@@ -11070,8 +11070,8 @@ public static final boolean gtk_tree_model_iter_next(int /*long*/ model, int /*l
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
-public static final native boolean _gtk_tree_model_iter_nth_child(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ parent, int n);
-public static final boolean gtk_tree_model_iter_nth_child(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ parent, int n) {
+public static final native boolean _gtk_tree_model_iter_nth_child(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ parent, int n);
+public static final boolean gtk_tree_model_iter_nth_child(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ parent, int n) {
lock.lock();
try {
return _gtk_tree_model_iter_nth_child(tree_model, iter, parent, n);
@@ -11080,8 +11080,8 @@ public static final boolean gtk_tree_model_iter_nth_child(int /*long*/ tree_mode
}
}
/** @param path cast=(GtkTreePath *) */
-public static final native void _gtk_tree_path_append_index(int /*long*/ path, int index);
-public static final void gtk_tree_path_append_index(int /*long*/ path, int index) {
+public static final native void _gtk_tree_path_append_index(long /*int*/ path, int index);
+public static final void gtk_tree_path_append_index(long /*int*/ path, int index) {
lock.lock();
try {
_gtk_tree_path_append_index(path, index);
@@ -11093,8 +11093,8 @@ public static final void gtk_tree_path_append_index(int /*long*/ path, int index
* @param a cast=(const GtkTreePath *)
* @param b cast=(const GtkTreePath *)
*/
-public static final native int /*long*/ _gtk_tree_path_compare(int /*long*/ a, int /*long*/ b);
-public static final int /*long*/ gtk_tree_path_compare(int /*long*/ a, int /*long*/ b) {
+public static final native long /*int*/ _gtk_tree_path_compare(long /*int*/ a, long /*int*/ b);
+public static final long /*int*/ gtk_tree_path_compare(long /*int*/ a, long /*int*/ b) {
lock.lock();
try {
return _gtk_tree_path_compare(a, b);
@@ -11103,8 +11103,8 @@ public static final int /*long*/ gtk_tree_path_compare(int /*long*/ a, int /*lon
}
}
/** @param path cast=(GtkTreePath *) */
-public static final native void _gtk_tree_path_free(int /*long*/ path);
-public static final void gtk_tree_path_free(int /*long*/ path) {
+public static final native void _gtk_tree_path_free(long /*int*/ path);
+public static final void gtk_tree_path_free(long /*int*/ path) {
lock.lock();
try {
_gtk_tree_path_free(path);
@@ -11113,8 +11113,8 @@ public static final void gtk_tree_path_free(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
-public static final native int _gtk_tree_path_get_depth(int /*long*/ path);
-public static final int gtk_tree_path_get_depth(int /*long*/ path) {
+public static final native int _gtk_tree_path_get_depth(long /*int*/ path);
+public static final int gtk_tree_path_get_depth(long /*int*/ path) {
lock.lock();
try {
return _gtk_tree_path_get_depth(path);
@@ -11123,8 +11123,8 @@ public static final int gtk_tree_path_get_depth(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
-public static final native int /*long*/ _gtk_tree_path_get_indices(int /*long*/ path);
-public static final int /*long*/ gtk_tree_path_get_indices(int /*long*/ path) {
+public static final native long /*int*/ _gtk_tree_path_get_indices(long /*int*/ path);
+public static final long /*int*/ gtk_tree_path_get_indices(long /*int*/ path) {
lock.lock();
try {
return _gtk_tree_path_get_indices(path);
@@ -11132,8 +11132,8 @@ public static final int /*long*/ gtk_tree_path_get_indices(int /*long*/ path) {
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_tree_path_new();
-public static final int /*long*/ gtk_tree_path_new() {
+public static final native long /*int*/ _gtk_tree_path_new();
+public static final long /*int*/ gtk_tree_path_new() {
lock.lock();
try {
return _gtk_tree_path_new();
@@ -11142,8 +11142,8 @@ public static final int /*long*/ gtk_tree_path_new() {
}
}
/** @param path cast=(const gchar *) */
-public static final native int /*long*/ _gtk_tree_path_new_from_string(byte[] path);
-public static final int /*long*/ gtk_tree_path_new_from_string(byte[] path) {
+public static final native long /*int*/ _gtk_tree_path_new_from_string(byte[] path);
+public static final long /*int*/ gtk_tree_path_new_from_string(byte[] path) {
lock.lock();
try {
return _gtk_tree_path_new_from_string(path);
@@ -11152,8 +11152,8 @@ public static final int /*long*/ gtk_tree_path_new_from_string(byte[] path) {
}
}
/** @param path cast=(const gchar *) */
-public static final native int /*long*/ _gtk_tree_path_new_from_string(int /*long*/ path);
-public static final int /*long*/ gtk_tree_path_new_from_string(int /*long*/ path) {
+public static final native long /*int*/ _gtk_tree_path_new_from_string(long /*int*/ path);
+public static final long /*int*/ gtk_tree_path_new_from_string(long /*int*/ path) {
lock.lock();
try {
return _gtk_tree_path_new_from_string(path);
@@ -11162,8 +11162,8 @@ public static final int /*long*/ gtk_tree_path_new_from_string(int /*long*/ path
}
}
/** @param path cast=(GtkTreePath *) */
-public static final native void _gtk_tree_path_next(int /*long*/ path);
-public static final void gtk_tree_path_next(int /*long*/ path) {
+public static final native void _gtk_tree_path_next(long /*int*/ path);
+public static final void gtk_tree_path_next(long /*int*/ path) {
lock.lock();
try {
_gtk_tree_path_next(path);
@@ -11172,8 +11172,8 @@ public static final void gtk_tree_path_next(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
-public static final native boolean _gtk_tree_path_prev(int /*long*/ path);
-public static final boolean gtk_tree_path_prev(int /*long*/ path) {
+public static final native boolean _gtk_tree_path_prev(long /*int*/ path);
+public static final boolean gtk_tree_path_prev(long /*int*/ path) {
lock.lock();
try {
return _gtk_tree_path_prev(path);
@@ -11182,8 +11182,8 @@ public static final boolean gtk_tree_path_prev(int /*long*/ path) {
}
}
/** @param path cast=(GtkTreePath *) */
-public static final native boolean _gtk_tree_path_up(int /*long*/ path);
-public static final boolean gtk_tree_path_up(int /*long*/ path) {
+public static final native boolean _gtk_tree_path_up(long /*int*/ path);
+public static final boolean gtk_tree_path_up(long /*int*/ path) {
lock.lock();
try {
return _gtk_tree_path_up(path);
@@ -11195,8 +11195,8 @@ public static final boolean gtk_tree_path_up(int /*long*/ path) {
* @method flags=dynamic
* @param selection cast=(GtkTreeSelection *)
*/
-public static final native int _gtk_tree_selection_count_selected_rows(int /*long*/ selection);
-public static final int gtk_tree_selection_count_selected_rows(int /*long*/ selection) {
+public static final native int _gtk_tree_selection_count_selected_rows(long /*int*/ selection);
+public static final int gtk_tree_selection_count_selected_rows(long /*int*/ selection) {
lock.lock();
try {
return _gtk_tree_selection_count_selected_rows(selection);
@@ -11209,8 +11209,8 @@ public static final int gtk_tree_selection_count_selected_rows(int /*long*/ sele
* @param selection cast=(GtkTreeSelection *)
* @param model cast=(GtkTreeModel **)
*/
-public static final native int /*long*/ _gtk_tree_selection_get_selected_rows(int /*long*/ selection, int /*long*/[] model);
-public static final int /*long*/ gtk_tree_selection_get_selected_rows(int /*long*/ selection, int /*long*/[] model) {
+public static final native long /*int*/ _gtk_tree_selection_get_selected_rows(long /*int*/ selection, long /*int*/[] model);
+public static final long /*int*/ gtk_tree_selection_get_selected_rows(long /*int*/ selection, long /*int*/[] model) {
lock.lock();
try {
return _gtk_tree_selection_get_selected_rows(selection, model);
@@ -11222,8 +11222,8 @@ public static final int /*long*/ gtk_tree_selection_get_selected_rows(int /*long
* @param selection cast=(GtkTreeSelection *)
* @param path cast=(GtkTreePath *)
*/
-public static final native boolean _gtk_tree_selection_path_is_selected(int /*long*/ selection, int /*long*/ path);
-public static final boolean gtk_tree_selection_path_is_selected(int /*long*/ selection, int /*long*/ path) {
+public static final native boolean _gtk_tree_selection_path_is_selected(long /*int*/ selection, long /*int*/ path);
+public static final boolean gtk_tree_selection_path_is_selected(long /*int*/ selection, long /*int*/ path) {
lock.lock();
try {
return _gtk_tree_selection_path_is_selected(selection, path);
@@ -11232,8 +11232,8 @@ public static final boolean gtk_tree_selection_path_is_selected(int /*long*/ sel
}
}
/** @param selection cast=(GtkTreeSelection *) */
-public static final native void _gtk_tree_selection_select_all(int /*long*/ selection);
-public static final void gtk_tree_selection_select_all(int /*long*/ selection) {
+public static final native void _gtk_tree_selection_select_all(long /*int*/ selection);
+public static final void gtk_tree_selection_select_all(long /*int*/ selection) {
lock.lock();
try {
_gtk_tree_selection_select_all(selection);
@@ -11245,8 +11245,8 @@ public static final void gtk_tree_selection_select_all(int /*long*/ selection) {
* @param selection cast=(GtkTreeSelection *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native void _gtk_tree_selection_select_iter(int /*long*/ selection, int /*long*/ iter);
-public static final void gtk_tree_selection_select_iter(int /*long*/ selection, int /*long*/ iter) {
+public static final native void _gtk_tree_selection_select_iter(long /*int*/ selection, long /*int*/ iter);
+public static final void gtk_tree_selection_select_iter(long /*int*/ selection, long /*int*/ iter) {
lock.lock();
try {
_gtk_tree_selection_select_iter(selection, iter);
@@ -11258,8 +11258,8 @@ public static final void gtk_tree_selection_select_iter(int /*long*/ selection,
* @param selection cast=(GtkTreeSelection *)
* @param mode cast=(GtkSelectionMode)
*/
-public static final native void _gtk_tree_selection_set_mode(int /*long*/ selection, int mode);
-public static final void gtk_tree_selection_set_mode(int /*long*/ selection, int mode) {
+public static final native void _gtk_tree_selection_set_mode(long /*int*/ selection, int mode);
+public static final void gtk_tree_selection_set_mode(long /*int*/ selection, int mode) {
lock.lock();
try {
_gtk_tree_selection_set_mode(selection, mode);
@@ -11268,8 +11268,8 @@ public static final void gtk_tree_selection_set_mode(int /*long*/ selection, int
}
}
/** @param selection cast=(GtkTreeSelection *) */
-public static final native void _gtk_tree_selection_unselect_all(int /*long*/ selection);
-public static final void gtk_tree_selection_unselect_all(int /*long*/ selection) {
+public static final native void _gtk_tree_selection_unselect_all(long /*int*/ selection);
+public static final void gtk_tree_selection_unselect_all(long /*int*/ selection) {
lock.lock();
try {
_gtk_tree_selection_unselect_all(selection);
@@ -11281,8 +11281,8 @@ public static final void gtk_tree_selection_unselect_all(int /*long*/ selection)
* @param selection cast=(GtkTreeSelection *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native void _gtk_tree_selection_unselect_iter(int /*long*/ selection, int /*long*/ iter);
-public static final void gtk_tree_selection_unselect_iter(int /*long*/ selection, int /*long*/ iter) {
+public static final native void _gtk_tree_selection_unselect_iter(long /*int*/ selection, long /*int*/ iter);
+public static final void gtk_tree_selection_unselect_iter(long /*int*/ selection, long /*int*/ iter) {
lock.lock();
try {
_gtk_tree_selection_unselect_iter(selection, iter);
@@ -11295,8 +11295,8 @@ public static final void gtk_tree_selection_unselect_iter(int /*long*/ selection
* @param iter cast=(GtkTreeIter *)
* @param parent cast=(GtkTreeIter *)
*/
-public static final native void _gtk_tree_store_append(int /*long*/ store, int /*long*/ iter, int /*long*/ parent);
-public static final void gtk_tree_store_append(int /*long*/ store, int /*long*/ iter, int /*long*/ parent) {
+public static final native void _gtk_tree_store_append(long /*int*/ store, long /*int*/ iter, long /*int*/ parent);
+public static final void gtk_tree_store_append(long /*int*/ store, long /*int*/ iter, long /*int*/ parent) {
lock.lock();
try {
_gtk_tree_store_append(store, iter, parent);
@@ -11305,8 +11305,8 @@ public static final void gtk_tree_store_append(int /*long*/ store, int /*long*/
}
}
/** @param store cast=(GtkTreeStore *) */
-public static final native void _gtk_tree_store_clear(int /*long*/ store);
-public static final void gtk_tree_store_clear(int /*long*/ store) {
+public static final native void _gtk_tree_store_clear(long /*int*/ store);
+public static final void gtk_tree_store_clear(long /*int*/ store) {
lock.lock();
try {
_gtk_tree_store_clear(store);
@@ -11320,8 +11320,8 @@ public static final void gtk_tree_store_clear(int /*long*/ store) {
* @param parent cast=(GtkTreeIter *)
* @param position cast=(gint)
*/
-public static final native void _gtk_tree_store_insert(int /*long*/ store, int /*long*/ iter, int /*long*/ parent, int position);
-public static final void gtk_tree_store_insert(int /*long*/ store, int /*long*/ iter, int /*long*/ parent, int position) {
+public static final native void _gtk_tree_store_insert(long /*int*/ store, long /*int*/ iter, long /*int*/ parent, int position);
+public static final void gtk_tree_store_insert(long /*int*/ store, long /*int*/ iter, long /*int*/ parent, int position) {
lock.lock();
try {
_gtk_tree_store_insert(store, iter, parent, position);
@@ -11330,8 +11330,8 @@ public static final void gtk_tree_store_insert(int /*long*/ store, int /*long*/
}
}
/** @param types cast=(GType *) */
-public static final native int /*long*/ _gtk_tree_store_newv(int numColumns, int /*long*/[] types);
-public static final int /*long*/ gtk_tree_store_newv(int numColumns, int /*long*/[] types) {
+public static final native long /*int*/ _gtk_tree_store_newv(int numColumns, long /*int*/[] types);
+public static final long /*int*/ gtk_tree_store_newv(int numColumns, long /*int*/[] types) {
lock.lock();
try {
return _gtk_tree_store_newv(numColumns, types);
@@ -11343,8 +11343,8 @@ public static final int /*long*/ gtk_tree_store_newv(int numColumns, int /*long*
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native void _gtk_tree_store_remove(int /*long*/ store, int /*long*/ iter);
-public static final void gtk_tree_store_remove(int /*long*/ store, int /*long*/ iter) {
+public static final native void _gtk_tree_store_remove(long /*int*/ store, long /*int*/ iter);
+public static final void gtk_tree_store_remove(long /*int*/ store, long /*int*/ iter) {
lock.lock();
try {
_gtk_tree_store_remove(store, iter);
@@ -11356,8 +11356,8 @@ public static final void gtk_tree_store_remove(int /*long*/ store, int /*long*/
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int terminator);
-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int terminator) {
+public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, int terminator);
+public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, int terminator) {
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
@@ -11369,8 +11369,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int terminator);
-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int terminator) {
+public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, int terminator);
+public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, int terminator) {
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
@@ -11382,8 +11382,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int terminator);
-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int terminator) {
+public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, int terminator);
+public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, int terminator) {
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
@@ -11396,8 +11396,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param iter cast=(GtkTreeIter *)
* @param value flags=no_out
*/
-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int terminator);
-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int terminator) {
+public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, int terminator);
+public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, int terminator) {
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
@@ -11409,8 +11409,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param store cast=(GtkTreeStore *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int terminator);
-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int terminator) {
+public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, int terminator);
+public static final void gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, int terminator) {
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
@@ -11422,8 +11422,8 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
-public static final native int /*long*/ _gtk_tree_view_create_row_drag_icon(int /*long*/ view, int /*long*/ path);
-public static final int /*long*/ gtk_tree_view_create_row_drag_icon(int /*long*/ view, int /*long*/ path) {
+public static final native long /*int*/ _gtk_tree_view_create_row_drag_icon(long /*int*/ view, long /*int*/ path);
+public static final long /*int*/ gtk_tree_view_create_row_drag_icon(long /*int*/ view, long /*int*/ path) {
lock.lock();
try {
return _gtk_tree_view_create_row_drag_icon(view, path);
@@ -11435,8 +11435,8 @@ public static final int /*long*/ gtk_tree_view_create_row_drag_icon(int /*long*/
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
-public static final native boolean _gtk_tree_view_collapse_row(int /*long*/ view, int /*long*/ path);
-public static final boolean gtk_tree_view_collapse_row(int /*long*/ view, int /*long*/ path) {
+public static final native boolean _gtk_tree_view_collapse_row(long /*int*/ view, long /*int*/ path);
+public static final boolean gtk_tree_view_collapse_row(long /*int*/ view, long /*int*/ path) {
lock.lock();
try {
return _gtk_tree_view_collapse_row(view, path);
@@ -11450,8 +11450,8 @@ public static final boolean gtk_tree_view_collapse_row(int /*long*/ view, int /*
* @param attribute cast=(const gchar *)
* @param column cast=(gint)
*/
-public static final native void _gtk_tree_view_column_add_attribute(int /*long*/ treeColumn, int /*long*/ cellRenderer, byte[] attribute, int column);
-public static final void gtk_tree_view_column_add_attribute(int /*long*/ treeColumn, int /*long*/ cellRenderer, byte[] attribute, int column) {
+public static final native void _gtk_tree_view_column_add_attribute(long /*int*/ treeColumn, long /*int*/ cellRenderer, byte[] attribute, int column);
+public static final void gtk_tree_view_column_add_attribute(long /*int*/ treeColumn, long /*int*/ cellRenderer, byte[] attribute, int column) {
lock.lock();
try {
_gtk_tree_view_column_add_attribute(treeColumn, cellRenderer, attribute, column);
@@ -11466,8 +11466,8 @@ public static final void gtk_tree_view_column_add_attribute(int /*long*/ treeCol
* @param start_pos cast=(gint *)
* @param width cast=(gint *)
*/
-public static final native boolean _gtk_tree_view_column_cell_get_position(int /*long*/ tree_column, int /*long*/ cell_renderer, int[] start_pos, int[] width);
-public static final boolean gtk_tree_view_column_cell_get_position(int /*long*/ tree_column, int /*long*/ cell_renderer, int[] start_pos, int[] width) {
+public static final native boolean _gtk_tree_view_column_cell_get_position(long /*int*/ tree_column, long /*int*/ cell_renderer, int[] start_pos, int[] width);
+public static final boolean gtk_tree_view_column_cell_get_position(long /*int*/ tree_column, long /*int*/ cell_renderer, int[] start_pos, int[] width) {
lock.lock();
try {
return _gtk_tree_view_column_cell_get_position(tree_column, cell_renderer, start_pos, width);
@@ -11483,8 +11483,8 @@ public static final boolean gtk_tree_view_column_cell_get_position(int /*long*/
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
-public static final native void _gtk_tree_view_column_cell_get_size(int /*long*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height);
-public static final void gtk_tree_view_column_cell_get_size(int /*long*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height) {
+public static final native void _gtk_tree_view_column_cell_get_size(long /*int*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height);
+public static final void gtk_tree_view_column_cell_get_size(long /*int*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height) {
lock.lock();
try {
_gtk_tree_view_column_cell_get_size(tree_column, cell_area, x_offset, y_offset, width, height);
@@ -11497,8 +11497,8 @@ public static final void gtk_tree_view_column_cell_get_size(int /*long*/ tree_co
* @param tree_model cast=(GtkTreeModel *)
* @param iter cast=(GtkTreeIter *)
*/
-public static final native void _gtk_tree_view_column_cell_set_cell_data(int /*long*/ tree_column, int /*long*/ tree_model, int /*long*/ iter, boolean is_expander, boolean is_expanded);
-public static final void gtk_tree_view_column_cell_set_cell_data(int /*long*/ tree_column, int /*long*/ tree_model, int /*long*/ iter, boolean is_expander, boolean is_expanded) {
+public static final native void _gtk_tree_view_column_cell_set_cell_data(long /*int*/ tree_column, long /*int*/ tree_model, long /*int*/ iter, boolean is_expander, boolean is_expanded);
+public static final void gtk_tree_view_column_cell_set_cell_data(long /*int*/ tree_column, long /*int*/ tree_model, long /*int*/ iter, boolean is_expander, boolean is_expanded) {
lock.lock();
try {
_gtk_tree_view_column_cell_set_cell_data(tree_column, tree_model, iter, is_expander, is_expanded);
@@ -11507,8 +11507,8 @@ public static final void gtk_tree_view_column_cell_set_cell_data(int /*long*/ tr
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
-public static final native void _gtk_tree_view_column_clear(int /*long*/ tree_column);
-public static final void gtk_tree_view_column_clear(int /*long*/ tree_column) {
+public static final native void _gtk_tree_view_column_clear(long /*int*/ tree_column);
+public static final void gtk_tree_view_column_clear(long /*int*/ tree_column) {
lock.lock();
try {
_gtk_tree_view_column_clear(tree_column);
@@ -11520,8 +11520,8 @@ public static final void gtk_tree_view_column_clear(int /*long*/ tree_column) {
* @method flags=dynamic
* @param tree_column cast=(GtkTreeViewColumn *)
*/
-public static final native int /*long*/ _gtk_tree_view_column_get_cell_renderers(int /*long*/ tree_column);
-public static final int /*long*/ gtk_tree_view_column_get_cell_renderers(int /*long*/ tree_column) {
+public static final native long /*int*/ _gtk_tree_view_column_get_cell_renderers(long /*int*/ tree_column);
+public static final long /*int*/ gtk_tree_view_column_get_cell_renderers(long /*int*/ tree_column) {
lock.lock();
try {
return _gtk_tree_view_column_get_cell_renderers(tree_column);
@@ -11530,8 +11530,8 @@ public static final int /*long*/ gtk_tree_view_column_get_cell_renderers(int /*l
}
}
/** @param column cast=(GtkTreeViewColumn *) */
-public static final native int _gtk_tree_view_column_get_fixed_width(int /*long*/ column);
-public static final int gtk_tree_view_column_get_fixed_width(int /*long*/ column) {
+public static final native int _gtk_tree_view_column_get_fixed_width(long /*int*/ column);
+public static final int gtk_tree_view_column_get_fixed_width(long /*int*/ column) {
lock.lock();
try {
return _gtk_tree_view_column_get_fixed_width(column);
@@ -11540,8 +11540,8 @@ public static final int gtk_tree_view_column_get_fixed_width(int /*long*/ column
}
}
/** @param column cast=(GtkTreeViewColumn *) */
-public static final native boolean _gtk_tree_view_column_get_reorderable(int /*long*/ column);
-public static final boolean gtk_tree_view_column_get_reorderable(int /*long*/ column) {
+public static final native boolean _gtk_tree_view_column_get_reorderable(long /*int*/ column);
+public static final boolean gtk_tree_view_column_get_reorderable(long /*int*/ column) {
lock.lock();
try {
return _gtk_tree_view_column_get_reorderable(column);
@@ -11550,8 +11550,8 @@ public static final boolean gtk_tree_view_column_get_reorderable(int /*long*/ co
}
}
/** @param column cast=(GtkTreeViewColumn *) */
-public static final native boolean _gtk_tree_view_column_get_resizable(int /*long*/ column);
-public static final boolean gtk_tree_view_column_get_resizable(int /*long*/ column) {
+public static final native boolean _gtk_tree_view_column_get_resizable(long /*int*/ column);
+public static final boolean gtk_tree_view_column_get_resizable(long /*int*/ column) {
lock.lock();
try {
return _gtk_tree_view_column_get_resizable(column);
@@ -11560,8 +11560,8 @@ public static final boolean gtk_tree_view_column_get_resizable(int /*long*/ colu
}
}
/** @param column cast=(GtkTreeViewColumn *) */
-public static final native boolean _gtk_tree_view_column_get_visible(int /*long*/ column);
-public static final boolean gtk_tree_view_column_get_visible(int /*long*/ column) {
+public static final native boolean _gtk_tree_view_column_get_visible(long /*int*/ column);
+public static final boolean gtk_tree_view_column_get_visible(long /*int*/ column) {
lock.lock();
try {
return _gtk_tree_view_column_get_visible(column);
@@ -11570,8 +11570,8 @@ public static final boolean gtk_tree_view_column_get_visible(int /*long*/ column
}
}
/** @param column cast=(GtkTreeViewColumn *) */
-public static final native int _gtk_tree_view_column_get_width(int /*long*/ column);
-public static final int gtk_tree_view_column_get_width(int /*long*/ column) {
+public static final native int _gtk_tree_view_column_get_width(long /*int*/ column);
+public static final int gtk_tree_view_column_get_width(long /*int*/ column) {
lock.lock();
try {
return _gtk_tree_view_column_get_width(column);
@@ -11579,8 +11579,8 @@ public static final int gtk_tree_view_column_get_width(int /*long*/ column) {
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_tree_view_column_new();
-public static final int /*long*/ gtk_tree_view_column_new() {
+public static final native long /*int*/ _gtk_tree_view_column_new();
+public static final long /*int*/ gtk_tree_view_column_new() {
lock.lock();
try {
return _gtk_tree_view_column_new();
@@ -11593,8 +11593,8 @@ public static final int /*long*/ gtk_tree_view_column_new() {
* @param cell_renderer cast=(GtkCellRenderer *)
* @param expand cast=(gboolean)
*/
-public static final native void _gtk_tree_view_column_pack_start(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand);
-public static final void gtk_tree_view_column_pack_start(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand) {
+public static final native void _gtk_tree_view_column_pack_start(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand);
+public static final void gtk_tree_view_column_pack_start(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand) {
lock.lock();
try {
_gtk_tree_view_column_pack_start(tree_column, cell_renderer, expand);
@@ -11607,8 +11607,8 @@ public static final void gtk_tree_view_column_pack_start(int /*long*/ tree_colum
* @param cell_renderer cast=(GtkCellRenderer *)
* @param expand cast=(gboolean)
*/
-public static final native void _gtk_tree_view_column_pack_end(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand);
-public static final void gtk_tree_view_column_pack_end(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand) {
+public static final native void _gtk_tree_view_column_pack_end(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand);
+public static final void gtk_tree_view_column_pack_end(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand) {
lock.lock();
try {
_gtk_tree_view_column_pack_end(tree_column, cell_renderer, expand);
@@ -11617,8 +11617,8 @@ public static final void gtk_tree_view_column_pack_end(int /*long*/ tree_column,
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
-public static final native void _gtk_tree_view_column_set_alignment(int /*long*/ tree_column, float xalign);
-public static final void gtk_tree_view_column_set_alignment(int /*long*/ tree_column, float xalign) {
+public static final native void _gtk_tree_view_column_set_alignment(long /*int*/ tree_column, float xalign);
+public static final void gtk_tree_view_column_set_alignment(long /*int*/ tree_column, float xalign) {
lock.lock();
try {
_gtk_tree_view_column_set_alignment(tree_column, xalign);
@@ -11633,8 +11633,8 @@ public static final void gtk_tree_view_column_set_alignment(int /*long*/ tree_co
* @param func_data cast=(gpointer)
* @param destroy cast=(GDestroyNotify)
*/
-public static final native void _gtk_tree_view_column_set_cell_data_func(int /*long*/ tree_column, int /*long*/ cell_renderer, int /*long*/ func, int /*long*/ func_data, int /*long*/ destroy);
-public static final void gtk_tree_view_column_set_cell_data_func(int /*long*/ tree_column, int /*long*/ cell_renderer, int /*long*/ func, int /*long*/ func_data, int /*long*/ destroy) {
+public static final native void _gtk_tree_view_column_set_cell_data_func(long /*int*/ tree_column, long /*int*/ cell_renderer, long /*int*/ func, long /*int*/ func_data, long /*int*/ destroy);
+public static final void gtk_tree_view_column_set_cell_data_func(long /*int*/ tree_column, long /*int*/ cell_renderer, long /*int*/ func, long /*int*/ func_data, long /*int*/ destroy) {
lock.lock();
try {
_gtk_tree_view_column_set_cell_data_func(tree_column, cell_renderer, func, func_data, destroy);
@@ -11646,8 +11646,8 @@ public static final void gtk_tree_view_column_set_cell_data_func(int /*long*/ tr
* @param column cast=(GtkTreeViewColumn *)
* @param clickable cast=(gboolean)
*/
-public static final native void _gtk_tree_view_column_set_clickable(int /*long*/ column, boolean clickable);
-public static final void gtk_tree_view_column_set_clickable(int /*long*/ column, boolean clickable) {
+public static final native void _gtk_tree_view_column_set_clickable(long /*int*/ column, boolean clickable);
+public static final void gtk_tree_view_column_set_clickable(long /*int*/ column, boolean clickable) {
lock.lock();
try {
_gtk_tree_view_column_set_clickable(column, clickable);
@@ -11659,8 +11659,8 @@ public static final void gtk_tree_view_column_set_clickable(int /*long*/ column,
* @param column cast=(GtkTreeViewColumn *)
* @param fixed_width cast=(gint)
*/
-public static final native void _gtk_tree_view_column_set_fixed_width(int /*long*/ column, int fixed_width);
-public static final void gtk_tree_view_column_set_fixed_width(int /*long*/ column, int fixed_width) {
+public static final native void _gtk_tree_view_column_set_fixed_width(long /*int*/ column, int fixed_width);
+public static final void gtk_tree_view_column_set_fixed_width(long /*int*/ column, int fixed_width) {
lock.lock();
try {
_gtk_tree_view_column_set_fixed_width(column, fixed_width);
@@ -11672,8 +11672,8 @@ public static final void gtk_tree_view_column_set_fixed_width(int /*long*/ colum
* @param tree_column cast=(GtkTreeViewColumn *)
* @param min_width cast=(gint)
*/
-public static final native void _gtk_tree_view_column_set_min_width(int /*long*/ tree_column, int min_width);
-public static final void gtk_tree_view_column_set_min_width(int /*long*/ tree_column, int min_width) {
+public static final native void _gtk_tree_view_column_set_min_width(long /*int*/ tree_column, int min_width);
+public static final void gtk_tree_view_column_set_min_width(long /*int*/ tree_column, int min_width) {
lock.lock();
try {
_gtk_tree_view_column_set_min_width(tree_column, min_width);
@@ -11685,8 +11685,8 @@ public static final void gtk_tree_view_column_set_min_width(int /*long*/ tree_co
* @param column cast=(GtkTreeViewColumn *)
* @param reorderable cast=(gboolean)
*/
-public static final native void _gtk_tree_view_column_set_reorderable(int /*long*/ column, boolean reorderable);
-public static final void gtk_tree_view_column_set_reorderable(int /*long*/ column, boolean reorderable) {
+public static final native void _gtk_tree_view_column_set_reorderable(long /*int*/ column, boolean reorderable);
+public static final void gtk_tree_view_column_set_reorderable(long /*int*/ column, boolean reorderable) {
lock.lock();
try {
_gtk_tree_view_column_set_reorderable(column, reorderable);
@@ -11698,8 +11698,8 @@ public static final void gtk_tree_view_column_set_reorderable(int /*long*/ colum
* @param column cast=(GtkTreeViewColumn *)
* @param resizable cast=(gboolean)
*/
-public static final native void _gtk_tree_view_column_set_resizable(int /*long*/ column, boolean resizable);
-public static final void gtk_tree_view_column_set_resizable(int /*long*/ column, boolean resizable) {
+public static final native void _gtk_tree_view_column_set_resizable(long /*int*/ column, boolean resizable);
+public static final void gtk_tree_view_column_set_resizable(long /*int*/ column, boolean resizable) {
lock.lock();
try {
_gtk_tree_view_column_set_resizable(column, resizable);
@@ -11711,8 +11711,8 @@ public static final void gtk_tree_view_column_set_resizable(int /*long*/ column,
* @param column cast=(GtkTreeViewColumn *)
* @param type cast=(GtkTreeViewColumnSizing)
*/
-public static final native void _gtk_tree_view_column_set_sizing(int /*long*/ column, int type);
-public static final void gtk_tree_view_column_set_sizing(int /*long*/ column, int type) {
+public static final native void _gtk_tree_view_column_set_sizing(long /*int*/ column, int type);
+public static final void gtk_tree_view_column_set_sizing(long /*int*/ column, int type) {
lock.lock();
try {
_gtk_tree_view_column_set_sizing(column, type);
@@ -11724,8 +11724,8 @@ public static final void gtk_tree_view_column_set_sizing(int /*long*/ column, in
* @param tree_column cast=(GtkTreeViewColumn *)
* @param setting cast=(gboolean)
*/
-public static final native void _gtk_tree_view_column_set_sort_indicator(int /*long*/ tree_column, boolean setting);
-public static final void gtk_tree_view_column_set_sort_indicator(int /*long*/ tree_column, boolean setting) {
+public static final native void _gtk_tree_view_column_set_sort_indicator(long /*int*/ tree_column, boolean setting);
+public static final void gtk_tree_view_column_set_sort_indicator(long /*int*/ tree_column, boolean setting) {
lock.lock();
try {
_gtk_tree_view_column_set_sort_indicator(tree_column, setting);
@@ -11737,8 +11737,8 @@ public static final void gtk_tree_view_column_set_sort_indicator(int /*long*/ tr
* @param tree_column cast=(GtkTreeViewColumn *)
* @param order cast=(GtkSortType)
*/
-public static final native void _gtk_tree_view_column_set_sort_order(int /*long*/ tree_column, int order);
-public static final void gtk_tree_view_column_set_sort_order(int /*long*/ tree_column, int order) {
+public static final native void _gtk_tree_view_column_set_sort_order(long /*int*/ tree_column, int order);
+public static final void gtk_tree_view_column_set_sort_order(long /*int*/ tree_column, int order) {
lock.lock();
try {
_gtk_tree_view_column_set_sort_order(tree_column, order);
@@ -11747,8 +11747,8 @@ public static final void gtk_tree_view_column_set_sort_order(int /*long*/ tree_c
}
}
/** @param tree_column cast=(GtkTreeViewColumn *) */
-public static final native void _gtk_tree_view_column_set_visible (int /*long*/ tree_column, boolean visible);
-public static final void gtk_tree_view_column_set_visible (int /*long*/ tree_column, boolean visible) {
+public static final native void _gtk_tree_view_column_set_visible (long /*int*/ tree_column, boolean visible);
+public static final void gtk_tree_view_column_set_visible (long /*int*/ tree_column, boolean visible) {
lock.lock();
try {
_gtk_tree_view_column_set_visible(tree_column, visible);
@@ -11760,8 +11760,8 @@ public static final void gtk_tree_view_column_set_visible (int /*long*/ tree_col
* @param tree_column cast=(GtkTreeViewColumn *)
* @param widget cast=(GtkWidget *)
*/
-public static final native void _gtk_tree_view_column_set_widget(int /*long*/ tree_column, int /*long*/ widget);
-public static final void gtk_tree_view_column_set_widget(int /*long*/ tree_column, int /*long*/ widget) {
+public static final native void _gtk_tree_view_column_set_widget(long /*int*/ tree_column, long /*int*/ widget);
+public static final void gtk_tree_view_column_set_widget(long /*int*/ tree_column, long /*int*/ widget) {
lock.lock();
try {
_gtk_tree_view_column_set_widget(tree_column, widget);
@@ -11773,8 +11773,8 @@ public static final void gtk_tree_view_column_set_widget(int /*long*/ tree_colum
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
-public static final native void _gtk_tree_view_set_drag_dest_row(int /*long*/ view, int /*long*/ path, int pos);
-public static final void gtk_tree_view_set_drag_dest_row(int /*long*/ view, int /*long*/ path, int pos) {
+public static final native void _gtk_tree_view_set_drag_dest_row(long /*int*/ view, long /*int*/ path, int pos);
+public static final void gtk_tree_view_set_drag_dest_row(long /*int*/ view, long /*int*/ path, int pos) {
lock.lock();
try {
_gtk_tree_view_set_drag_dest_row(view, path, pos);
@@ -11783,8 +11783,8 @@ public static final void gtk_tree_view_set_drag_dest_row(int /*long*/ view, int
}
}
/** @param view cast=(GtkTreeView *) */
-public static final native void _gtk_tree_view_set_enable_search (int /*long*/ view, boolean enable_search);
-public static final void gtk_tree_view_set_enable_search (int /*long*/ view, boolean enable_search) {
+public static final native void _gtk_tree_view_set_enable_search (long /*int*/ view, boolean enable_search);
+public static final void gtk_tree_view_set_enable_search (long /*int*/ view, boolean enable_search) {
lock.lock();
try {
_gtk_tree_view_set_enable_search(view, enable_search);
@@ -11797,8 +11797,8 @@ public static final void gtk_tree_view_set_enable_search (int /*long*/ view, boo
* @param path cast=(GtkTreePath *)
* @param open_all cast=(gboolean)
*/
-public static final native boolean _gtk_tree_view_expand_row(int /*long*/ view, int /*long*/ path, boolean open_all);
-public static final boolean gtk_tree_view_expand_row(int /*long*/ view, int /*long*/ path, boolean open_all) {
+public static final native boolean _gtk_tree_view_expand_row(long /*int*/ view, long /*int*/ path, boolean open_all);
+public static final boolean gtk_tree_view_expand_row(long /*int*/ view, long /*int*/ path, boolean open_all) {
lock.lock();
try {
return _gtk_tree_view_expand_row(view, path, open_all);
@@ -11812,8 +11812,8 @@ public static final boolean gtk_tree_view_expand_row(int /*long*/ view, int /*lo
* @param column cast=(GtkTreeViewColumn *)
* @param rect cast=(GdkRectangle *)
*/
-public static final native void _gtk_tree_view_get_background_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect);
-public static final void gtk_tree_view_get_background_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect) {
+public static final native void _gtk_tree_view_get_background_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect);
+public static final void gtk_tree_view_get_background_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect) {
lock.lock();
try {
_gtk_tree_view_get_background_area(tree_view, path, column, rect);
@@ -11822,8 +11822,8 @@ public static final void gtk_tree_view_get_background_area(int /*long*/ tree_vie
}
}
/** @param tree_view cast=(GtkTreeView *) */
-public static final native int /*long*/ _gtk_tree_view_get_bin_window(int /*long*/ tree_view);
-public static final int /*long*/ gtk_tree_view_get_bin_window(int /*long*/ tree_view) {
+public static final native long /*int*/ _gtk_tree_view_get_bin_window(long /*int*/ tree_view);
+public static final long /*int*/ gtk_tree_view_get_bin_window(long /*int*/ tree_view) {
lock.lock();
try {
return _gtk_tree_view_get_bin_window(tree_view);
@@ -11837,8 +11837,8 @@ public static final int /*long*/ gtk_tree_view_get_bin_window(int /*long*/ tree_
* @param column cast=(GtkTreeViewColumn *)
* @param rect cast=(GdkRectangle *),flags=no_in
*/
-public static final native void _gtk_tree_view_get_cell_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect);
-public static final void gtk_tree_view_get_cell_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect) {
+public static final native void _gtk_tree_view_get_cell_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect);
+public static final void gtk_tree_view_get_cell_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect) {
lock.lock();
try {
_gtk_tree_view_get_cell_area(tree_view, path, column, rect);
@@ -11847,8 +11847,8 @@ public static final void gtk_tree_view_get_cell_area(int /*long*/ tree_view, int
}
}
/** @param tree_view cast=(GtkTreeView *) */
-public static final native int /*long*/_gtk_tree_view_get_expander_column(int /*long*/ tree_view);
-public static final int /*long*/gtk_tree_view_get_expander_column(int /*long*/ tree_view) {
+public static final native long /*int*/_gtk_tree_view_get_expander_column(long /*int*/ tree_view);
+public static final long /*int*/gtk_tree_view_get_expander_column(long /*int*/ tree_view) {
lock.lock();
try {
return _gtk_tree_view_get_expander_column(tree_view);
@@ -11860,8 +11860,8 @@ public static final int /*long*/gtk_tree_view_get_expander_column(int /*long*/ t
* @param tree_view cast=(GtkTreeView *)
* @param n cast=(gint)
*/
-public static final native int /*long*/ _gtk_tree_view_get_column(int /*long*/ tree_view, int n);
-public static final int /*long*/ gtk_tree_view_get_column(int /*long*/ tree_view, int n) {
+public static final native long /*int*/ _gtk_tree_view_get_column(long /*int*/ tree_view, int n);
+public static final long /*int*/ gtk_tree_view_get_column(long /*int*/ tree_view, int n) {
lock.lock();
try {
return _gtk_tree_view_get_column(tree_view, n);
@@ -11870,8 +11870,8 @@ public static final int /*long*/ gtk_tree_view_get_column(int /*long*/ tree_view
}
}
/** @param tree_view cast=(GtkTreeView *) */
-public static final native int /*long*/ _gtk_tree_view_get_columns(int /*long*/ tree_view);
-public static final int /*long*/ gtk_tree_view_get_columns(int /*long*/ tree_view) {
+public static final native long /*int*/ _gtk_tree_view_get_columns(long /*int*/ tree_view);
+public static final long /*int*/ gtk_tree_view_get_columns(long /*int*/ tree_view) {
lock.lock();
try {
return _gtk_tree_view_get_columns(tree_view);
@@ -11884,8 +11884,8 @@ public static final int /*long*/ gtk_tree_view_get_columns(int /*long*/ tree_vie
* @param path cast=(GtkTreePath **)
* @param focus_column cast=(GtkTreeViewColumn **)
*/
-public static final native void _gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*long*/[] path, int /*long*/[] focus_column);
-public static final void gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*long*/[] path, int /*long*/[] focus_column) {
+public static final native void _gtk_tree_view_get_cursor(long /*int*/ tree_view, long /*int*/[] path, long /*int*/[] focus_column);
+public static final void gtk_tree_view_get_cursor(long /*int*/ tree_view, long /*int*/[] path, long /*int*/[] focus_column) {
lock.lock();
try {
_gtk_tree_view_get_cursor(tree_view, path, focus_column);
@@ -11894,8 +11894,8 @@ public static final void gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*
}
}
/** @param tree_view cast=(GtkTreeView *) */
-public static final native boolean _gtk_tree_view_get_headers_visible(int /*long*/ tree_view);
-public static final boolean gtk_tree_view_get_headers_visible(int /*long*/ tree_view) {
+public static final native boolean _gtk_tree_view_get_headers_visible(long /*int*/ tree_view);
+public static final boolean gtk_tree_view_get_headers_visible(long /*int*/ tree_view) {
lock.lock();
try {
return _gtk_tree_view_get_headers_visible(tree_view);
@@ -11912,8 +11912,8 @@ public static final boolean gtk_tree_view_get_headers_visible(int /*long*/ tree_
* @param cell_x cast=(gint *)
* @param cell_y cast=(gint *)
*/
-public static final native boolean _gtk_tree_view_get_path_at_pos(int /*long*/ tree_view, int x, int y, int /*long*/[] path, int /*long*/[] column, int[] cell_x, int[] cell_y);
-public static final boolean gtk_tree_view_get_path_at_pos(int /*long*/ tree_view, int x, int y, int /*long*/[] path, int /*long*/[] column, int[] cell_x, int[] cell_y) {
+public static final native boolean _gtk_tree_view_get_path_at_pos(long /*int*/ tree_view, int x, int y, long /*int*/[] path, long /*int*/[] column, int[] cell_x, int[] cell_y);
+public static final boolean gtk_tree_view_get_path_at_pos(long /*int*/ tree_view, int x, int y, long /*int*/[] path, long /*int*/[] column, int[] cell_x, int[] cell_y) {
lock.lock();
try {
return _gtk_tree_view_get_path_at_pos(tree_view, x, y, path, column, cell_x, cell_y);
@@ -11922,8 +11922,8 @@ public static final boolean gtk_tree_view_get_path_at_pos(int /*long*/ tree_view
}
}
/** @param tree_view cast=(GtkTreeView *) */
-public static final native boolean _gtk_tree_view_get_rules_hint(int /*long*/ tree_view);
-public static final boolean gtk_tree_view_get_rules_hint(int /*long*/ tree_view) {
+public static final native boolean _gtk_tree_view_get_rules_hint(long /*int*/ tree_view);
+public static final boolean gtk_tree_view_get_rules_hint(long /*int*/ tree_view) {
lock.lock();
try {
return _gtk_tree_view_get_rules_hint(tree_view);
@@ -11932,8 +11932,8 @@ public static final boolean gtk_tree_view_get_rules_hint(int /*long*/ tree_view)
}
}
/** @param tree_view cast=(GtkTreeView *) */
-public static final native int /*long*/ _gtk_tree_view_get_selection(int /*long*/ tree_view);
-public static final int /*long*/ gtk_tree_view_get_selection(int /*long*/ tree_view) {
+public static final native long /*int*/ _gtk_tree_view_get_selection(long /*int*/ tree_view);
+public static final long /*int*/ gtk_tree_view_get_selection(long /*int*/ tree_view) {
lock.lock();
try {
return _gtk_tree_view_get_selection(tree_view);
@@ -11945,8 +11945,8 @@ public static final int /*long*/ gtk_tree_view_get_selection(int /*long*/ tree_v
* @param tree_view cast=(GtkTreeView *)
* @param visible_rect flags=no_in
*/
-public static final native void _gtk_tree_view_get_visible_rect(int /*long*/ tree_view, GdkRectangle visible_rect);
-public static final void gtk_tree_view_get_visible_rect(int /*long*/ tree_view, GdkRectangle visible_rect) {
+public static final native void _gtk_tree_view_get_visible_rect(long /*int*/ tree_view, GdkRectangle visible_rect);
+public static final void gtk_tree_view_get_visible_rect(long /*int*/ tree_view, GdkRectangle visible_rect) {
lock.lock();
try {
_gtk_tree_view_get_visible_rect(tree_view, visible_rect);
@@ -11959,8 +11959,8 @@ public static final void gtk_tree_view_get_visible_rect(int /*long*/ tree_view,
* @param column cast=(GtkTreeViewColumn *)
* @param position cast=(gint)
*/
-public static final native int _gtk_tree_view_insert_column(int /*long*/ tree_view, int /*long*/ column, int position);
-public static final int gtk_tree_view_insert_column(int /*long*/ tree_view, int /*long*/ column, int position) {
+public static final native int _gtk_tree_view_insert_column(long /*int*/ tree_view, long /*int*/ column, int position);
+public static final int gtk_tree_view_insert_column(long /*int*/ tree_view, long /*int*/ column, int position) {
lock.lock();
try {
return _gtk_tree_view_insert_column(tree_view, column, position);
@@ -11973,8 +11973,8 @@ public static final int gtk_tree_view_insert_column(int /*long*/ tree_view, int
* @param column cast=(GtkTreeViewColumn *)
* @param base_column cast=(GtkTreeViewColumn *)
*/
-public static final native void _gtk_tree_view_move_column_after(int /*long*/ tree_view, int /*long*/ column, int /*long*/ base_column);
-public static final void gtk_tree_view_move_column_after(int /*long*/ tree_view, int /*long*/ column, int /*long*/base_column) {
+public static final native void _gtk_tree_view_move_column_after(long /*int*/ tree_view, long /*int*/ column, long /*int*/ base_column);
+public static final void gtk_tree_view_move_column_after(long /*int*/ tree_view, long /*int*/ column, long /*int*/base_column) {
lock.lock();
try {
_gtk_tree_view_move_column_after(tree_view, column, base_column);
@@ -11983,8 +11983,8 @@ public static final void gtk_tree_view_move_column_after(int /*long*/ tree_view,
}
}
/** @param model cast=(GtkTreeModel *) */
-public static final native int /*long*/ _gtk_tree_view_new_with_model(int /*long*/ model);
-public static final int /*long*/ gtk_tree_view_new_with_model(int /*long*/ model) {
+public static final native long /*int*/ _gtk_tree_view_new_with_model(long /*int*/ model);
+public static final long /*int*/ gtk_tree_view_new_with_model(long /*int*/ model) {
lock.lock();
try {
return _gtk_tree_view_new_with_model(model);
@@ -11996,8 +11996,8 @@ public static final int /*long*/ gtk_tree_view_new_with_model(int /*long*/ model
* @param tree_view cast=(GtkTreeView *)
* @param column cast=(GtkTreeViewColumn *)
*/
-public static final native void _gtk_tree_view_remove_column(int /*long*/ tree_view, int /*long*/ column);
-public static final void gtk_tree_view_remove_column(int /*long*/ tree_view, int /*long*/ column) {
+public static final native void _gtk_tree_view_remove_column(long /*int*/ tree_view, long /*int*/ column);
+public static final void gtk_tree_view_remove_column(long /*int*/ tree_view, long /*int*/ column) {
lock.lock();
try {
_gtk_tree_view_remove_column(tree_view, column);
@@ -12009,8 +12009,8 @@ public static final void gtk_tree_view_remove_column(int /*long*/ tree_view, int
* @param view cast=(GtkTreeView *)
* @param path cast=(GtkTreePath *)
*/
-public static final native boolean _gtk_tree_view_row_expanded(int /*long*/ view, int /*long*/ path);
-public static final boolean gtk_tree_view_row_expanded(int /*long*/ view, int /*long*/ path) {
+public static final native boolean _gtk_tree_view_row_expanded(long /*int*/ view, long /*int*/ path);
+public static final boolean gtk_tree_view_row_expanded(long /*int*/ view, long /*int*/ path) {
lock.lock();
try {
return _gtk_tree_view_row_expanded(view, path);
@@ -12026,8 +12026,8 @@ public static final boolean gtk_tree_view_row_expanded(int /*long*/ view, int /*
* @param row_aligh cast=(gfloat)
* @param column_align cast=(gfloat)
*/
-public static final native void _gtk_tree_view_scroll_to_cell(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, boolean use_align, float row_aligh, float column_align);
-public static final void gtk_tree_view_scroll_to_cell(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, boolean use_align, float row_aligh, float column_align) {
+public static final native void _gtk_tree_view_scroll_to_cell(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, boolean use_align, float row_aligh, float column_align);
+public static final void gtk_tree_view_scroll_to_cell(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, boolean use_align, float row_aligh, float column_align) {
lock.lock();
try {
_gtk_tree_view_scroll_to_cell(tree_view, path, column, use_align, row_aligh, column_align);
@@ -12040,8 +12040,8 @@ public static final void gtk_tree_view_scroll_to_cell(int /*long*/ tree_view, in
* @param tree_x cast=(gint)
* @param tree_y cast=(gint)
*/
-public static final native void _gtk_tree_view_scroll_to_point (int /*long*/ tree_view, int tree_x, int tree_y);
-public static final void gtk_tree_view_scroll_to_point (int /*long*/ tree_view, int tree_x, int tree_y) {
+public static final native void _gtk_tree_view_scroll_to_point (long /*int*/ tree_view, int tree_x, int tree_y);
+public static final void gtk_tree_view_scroll_to_point (long /*int*/ tree_view, int tree_x, int tree_y) {
lock.lock();
try {
_gtk_tree_view_scroll_to_point(tree_view, tree_x, tree_y);
@@ -12054,8 +12054,8 @@ public static final void gtk_tree_view_scroll_to_point (int /*long*/ tree_view,
* @param path cast=(GtkTreePath *)
* @param focus_column cast=(GtkTreeViewColumn *)
*/
-public static final native void _gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*long*/ path, int /*long*/ focus_column, boolean start_editing);
-public static final void gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*long*/ path, int /*long*/ focus_column, boolean start_editing) {
+public static final native void _gtk_tree_view_set_cursor(long /*int*/ tree_view, long /*int*/ path, long /*int*/ focus_column, boolean start_editing);
+public static final void gtk_tree_view_set_cursor(long /*int*/ tree_view, long /*int*/ path, long /*int*/ focus_column, boolean start_editing) {
lock.lock();
try {
_gtk_tree_view_set_cursor(tree_view, path, focus_column, start_editing);
@@ -12067,8 +12067,8 @@ public static final void gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*
* @method flags=dynamic
* @param tree_view cast=(GtkTreeView*)
*/
-public static final native void _gtk_tree_view_set_grid_lines(int /*long*/ tree_view, int grid_lines);
-public static final void gtk_tree_view_set_grid_lines(int /*long*/ tree_view, int grid_lines) {
+public static final native void _gtk_tree_view_set_grid_lines(long /*int*/ tree_view, int grid_lines);
+public static final void gtk_tree_view_set_grid_lines(long /*int*/ tree_view, int grid_lines) {
lock.lock();
try {
_gtk_tree_view_set_grid_lines(tree_view, grid_lines);
@@ -12080,8 +12080,8 @@ public static final void gtk_tree_view_set_grid_lines(int /*long*/ tree_view, in
* @param tree_view cast=(GtkTreeView *)
* @param visible cast=(gboolean)
*/
-public static final native void _gtk_tree_view_set_headers_visible(int /*long*/ tree_view, boolean visible);
-public static final void gtk_tree_view_set_headers_visible(int /*long*/ tree_view, boolean visible) {
+public static final native void _gtk_tree_view_set_headers_visible(long /*int*/ tree_view, boolean visible);
+public static final void gtk_tree_view_set_headers_visible(long /*int*/ tree_view, boolean visible) {
lock.lock();
try {
_gtk_tree_view_set_headers_visible(tree_view, visible);
@@ -12093,8 +12093,8 @@ public static final void gtk_tree_view_set_headers_visible(int /*long*/ tree_vie
* @param tree_view cast=(GtkTreeView *)
* @param model cast=(GtkTreeModel *)
*/
-public static final native void _gtk_tree_view_set_model(int /*long*/ tree_view, int /*long*/ model);
-public static final void gtk_tree_view_set_model(int /*long*/ tree_view, int /*long*/ model) {
+public static final native void _gtk_tree_view_set_model(long /*int*/ tree_view, long /*int*/ model);
+public static final void gtk_tree_view_set_model(long /*int*/ tree_view, long /*int*/ model) {
lock.lock();
try {
_gtk_tree_view_set_model(tree_view, model);
@@ -12103,8 +12103,8 @@ public static final void gtk_tree_view_set_model(int /*long*/ tree_view, int /*l
}
}
/** @param tree_view cast=(GtkTreeView *) */
-public static final native void _gtk_tree_view_set_rules_hint(int /*long*/ tree_view, boolean setting);
-public static final void gtk_tree_view_set_rules_hint(int /*long*/ tree_view, boolean setting) {
+public static final native void _gtk_tree_view_set_rules_hint(long /*int*/ tree_view, boolean setting);
+public static final void gtk_tree_view_set_rules_hint(long /*int*/ tree_view, boolean setting) {
lock.lock();
try {
_gtk_tree_view_set_rules_hint(tree_view, setting);
@@ -12116,8 +12116,8 @@ public static final void gtk_tree_view_set_rules_hint(int /*long*/ tree_view, bo
* @param tree_view cast=(GtkTreeView *)
* @param column cast=(gint)
*/
-public static final native void _gtk_tree_view_set_search_column(int /*long*/ tree_view, int column);
-public static final void gtk_tree_view_set_search_column(int /*long*/ tree_view, int column) {
+public static final native void _gtk_tree_view_set_search_column(long /*int*/ tree_view, int column);
+public static final void gtk_tree_view_set_search_column(long /*int*/ tree_view, int column) {
lock.lock();
try {
_gtk_tree_view_set_search_column(tree_view, column);
@@ -12126,8 +12126,8 @@ public static final void gtk_tree_view_set_search_column(int /*long*/ tree_view,
}
}
/** @param tree_view cast=(GtkTreeView *) */
-public static final native void _gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_view);
-public static final void gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_view) {
+public static final native void _gtk_tree_view_unset_rows_drag_dest(long /*int*/ tree_view);
+public static final void gtk_tree_view_unset_rows_drag_dest(long /*int*/ tree_view) {
lock.lock();
try {
_gtk_tree_view_unset_rows_drag_dest(tree_view);
@@ -12139,8 +12139,8 @@ public static final void gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_vi
* @method flags=dynamic
* @param tree_view cast=(GtkTreeView *)
*/
-public static final native void _gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_view, int wx, int wy, int[] tx, int[] ty);
-public static final void gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_view, int wx, int wy, int[] tx, int[] ty) {
+public static final native void _gtk_tree_view_widget_to_tree_coords(long /*int*/ tree_view, int wx, int wy, int[] tx, int[] ty);
+public static final void gtk_tree_view_widget_to_tree_coords(long /*int*/ tree_view, int wx, int wy, int[] tx, int[] ty) {
lock.lock();
try {
_gtk_tree_view_widget_to_tree_coords(tree_view, wx, wy, tx, ty);
@@ -12152,8 +12152,8 @@ public static final void gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_v
* @method flags=dynamic
* @param tree_view cast=(GtkTreeView *)
*/
-public static final native void _gtk_tree_view_convert_widget_to_bin_window_coords(int /*long*/ tree_view, int wx, int wy, int[] tx, int[] ty);
-public static final void gtk_tree_view_convert_widget_to_bin_window_coords(int /*long*/ tree_view, int wx, int wy, int[] tx, int[] ty) {
+public static final native void _gtk_tree_view_convert_widget_to_bin_window_coords(long /*int*/ tree_view, int wx, int wy, int[] tx, int[] ty);
+public static final void gtk_tree_view_convert_widget_to_bin_window_coords(long /*int*/ tree_view, int wx, int wy, int[] tx, int[] ty) {
lock.lock();
try {
_gtk_tree_view_convert_widget_to_bin_window_coords(tree_view, wx, wy, tx, ty);
@@ -12166,8 +12166,8 @@ public static final void gtk_tree_view_convert_widget_to_bin_window_coords(int /
* @param homogeneous cast=(gboolean)
* @param spacing cast=(gint)
*/
-public static final native int /*long*/ _gtk_vbox_new(boolean homogeneous, int spacing);
-public static final int /*long*/ gtk_vbox_new(boolean homogeneous, int spacing) {
+public static final native long /*int*/ _gtk_vbox_new(boolean homogeneous, int spacing);
+public static final long /*int*/ gtk_vbox_new(boolean homogeneous, int spacing) {
lock.lock();
try {
return _gtk_vbox_new(homogeneous, spacing);
@@ -12179,8 +12179,8 @@ public static final int /*long*/ gtk_vbox_new(boolean homogeneous, int spacing)
* @param viewport cast=(GtkViewport *)
* @param type cast=(GtkShadowType)
*/
-public static final native void _gtk_viewport_set_shadow_type(int /*long*/ viewport, int type);
-public static final void gtk_viewport_set_shadow_type(int /*long*/ viewport, int type) {
+public static final native void _gtk_viewport_set_shadow_type(long /*int*/ viewport, int type);
+public static final void gtk_viewport_set_shadow_type(long /*int*/ viewport, int type) {
lock.lock();
try {
_gtk_viewport_set_shadow_type(viewport, type);
@@ -12192,8 +12192,8 @@ public static final void gtk_viewport_set_shadow_type(int /*long*/ viewport, int
* @method flags=dynamic
* @param adjustment cast=(GtkAdjustment *)
*/
-public static final native int /*long*/ _gtk_vscale_new(int /*long*/ adjustment);
-public static final int /*long*/ gtk_vscale_new(int /*long*/ adjustment) {
+public static final native long /*int*/ _gtk_vscale_new(long /*int*/ adjustment);
+public static final long /*int*/ gtk_vscale_new(long /*int*/ adjustment) {
lock.lock();
try {
return _gtk_vscale_new(adjustment);
@@ -12205,8 +12205,8 @@ public static final int /*long*/ gtk_vscale_new(int /*long*/ adjustment) {
* @method flags=dynamic
* @param adjustment cast=(GtkAdjustment *)
*/
-public static final native int /*long*/ _gtk_vscrollbar_new(int /*long*/ adjustment);
-public static final int /*long*/ gtk_vscrollbar_new(int /*long*/ adjustment) {
+public static final native long /*int*/ _gtk_vscrollbar_new(long /*int*/ adjustment);
+public static final long /*int*/ gtk_vscrollbar_new(long /*int*/ adjustment) {
lock.lock();
try {
return _gtk_vscrollbar_new(adjustment);
@@ -12215,8 +12215,8 @@ public static final int /*long*/ gtk_vscrollbar_new(int /*long*/ adjustment) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_vseparator_new();
-public static final int /*long*/ gtk_vseparator_new() {
+public static final native long /*int*/ _gtk_vseparator_new();
+public static final long /*int*/ gtk_vseparator_new() {
lock.lock();
try {
return _gtk_vseparator_new();
@@ -12231,8 +12231,8 @@ public static final int /*long*/ gtk_vseparator_new() {
* @param accel_key cast=(guint)
* @param accel_mods cast=(GdkModifierType)
*/
-public static final native void _gtk_widget_add_accelerator(int /*long*/ widget, byte[] accel_signal, int /*long*/ accel_group, int accel_key, int accel_mods, int accel_flags);
-public static final void gtk_widget_add_accelerator(int /*long*/ widget, byte[] accel_signal, int /*long*/ accel_group, int accel_key, int accel_mods, int accel_flags) {
+public static final native void _gtk_widget_add_accelerator(long /*int*/ widget, byte[] accel_signal, long /*int*/ accel_group, int accel_key, int accel_mods, int accel_flags);
+public static final void gtk_widget_add_accelerator(long /*int*/ widget, byte[] accel_signal, long /*int*/ accel_group, int accel_key, int accel_mods, int accel_flags) {
lock.lock();
try {
_gtk_widget_add_accelerator(widget, accel_signal, accel_group, accel_key, accel_mods, accel_flags);
@@ -12244,8 +12244,8 @@ public static final void gtk_widget_add_accelerator(int /*long*/ widget, byte[]
* @param widget cast=(GtkWidget *)
* @param events cast=(gint)
*/
-public static final native void _gtk_widget_add_events(int /*long*/ widget, int events);
-public static final void gtk_widget_add_events(int /*long*/ widget, int events) {
+public static final native void _gtk_widget_add_events(long /*int*/ widget, int events);
+public static final void gtk_widget_add_events(long /*int*/ widget, int events) {
lock.lock();
try {
_gtk_widget_add_events(widget, events);
@@ -12254,8 +12254,8 @@ public static final void gtk_widget_add_events(int /*long*/ widget, int events)
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native boolean _gtk_widget_child_focus(int /*long*/ widget, int direction);
-public static final boolean gtk_widget_child_focus(int /*long*/ widget, int direction) {
+public static final native boolean _gtk_widget_child_focus(long /*int*/ widget, int direction);
+public static final boolean gtk_widget_child_focus(long /*int*/ widget, int direction) {
lock.lock();
try {
return _gtk_widget_child_focus(widget, direction);
@@ -12267,8 +12267,8 @@ public static final boolean gtk_widget_child_focus(int /*long*/ widget, int dire
* @param widget cast=(GtkWidget *)
* @param text cast=(const gchar *)
*/
-public static final native int /*long*/ _gtk_widget_create_pango_layout(int /*long*/ widget, byte[] text);
-public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ widget, byte[] text) {
+public static final native long /*int*/ _gtk_widget_create_pango_layout(long /*int*/ widget, byte[] text);
+public static final long /*int*/ gtk_widget_create_pango_layout(long /*int*/ widget, byte[] text) {
lock.lock();
try {
return _gtk_widget_create_pango_layout(widget, text);
@@ -12280,8 +12280,8 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
* @param widget cast=(GtkWidget *)
* @param text cast=(const gchar *)
*/
-public static final native int /*long*/ _gtk_widget_create_pango_layout(int /*long*/ widget, int /*long*/ text);
-public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ widget, int /*long*/ text) {
+public static final native long /*int*/ _gtk_widget_create_pango_layout(long /*int*/ widget, long /*int*/ text);
+public static final long /*int*/ gtk_widget_create_pango_layout(long /*int*/ widget, long /*int*/ text) {
lock.lock();
try {
return _gtk_widget_create_pango_layout(widget, text);
@@ -12290,8 +12290,8 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_destroy(int /*long*/ widget);
-public static final void gtk_widget_destroy(int /*long*/ widget) {
+public static final native void _gtk_widget_destroy(long /*int*/ widget);
+public static final void gtk_widget_destroy(long /*int*/ widget) {
lock.lock();
try {
_gtk_widget_destroy(widget);
@@ -12303,8 +12303,8 @@ public static final void gtk_widget_destroy(int /*long*/ widget) {
* @param widget cast=(GtkWidget *)
* @param event cast=(GdkEvent *)
*/
-public static final native boolean _gtk_widget_event(int /*long*/ widget, int /*long*/ event);
-public static final boolean gtk_widget_event(int /*long*/ widget, int /*long*/ event) {
+public static final native boolean _gtk_widget_event(long /*int*/ widget, long /*int*/ event);
+public static final boolean gtk_widget_event(long /*int*/ widget, long /*int*/ event) {
lock.lock();
try {
return _gtk_widget_event(widget, event);
@@ -12313,8 +12313,8 @@ public static final boolean gtk_widget_event(int /*long*/ widget, int /*long*/ e
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native int /*long*/ _gtk_widget_get_accessible (int /*long*/ widget);
-public static final int /*long*/ gtk_widget_get_accessible (int /*long*/ widget) {
+public static final native long /*int*/ _gtk_widget_get_accessible (long /*int*/ widget);
+public static final long /*int*/ gtk_widget_get_accessible (long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_get_accessible(widget);
@@ -12323,8 +12323,8 @@ public static final int /*long*/ gtk_widget_get_accessible (int /*long*/ widget)
}
}
/** @method flags=dynamic */
-public static final native boolean _gtk_widget_get_visible (int /*long*/ widget);
-public static final boolean gtk_widget_get_visible (int /*long*/ widget) {
+public static final native boolean _gtk_widget_get_visible (long /*int*/ widget);
+public static final boolean gtk_widget_get_visible (long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_get_visible(widget);
@@ -12333,8 +12333,8 @@ public static final boolean gtk_widget_get_visible (int /*long*/ widget) {
}
}
/** @method flags=dynamic */
-public static final native boolean _gtk_widget_get_realized (int /*long*/ widget);
-public static final boolean gtk_widget_get_realized (int /*long*/ widget) {
+public static final native boolean _gtk_widget_get_realized (long /*int*/ widget);
+public static final boolean gtk_widget_get_realized (long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_get_realized(widget);
@@ -12343,8 +12343,8 @@ public static final boolean gtk_widget_get_realized (int /*long*/ widget) {
}
}
/** @method flags=dynamic */
-public static final native boolean _gtk_widget_get_has_window (int /*long*/ widget);
-public static final boolean gtk_widget_get_has_window (int /*long*/ widget) {
+public static final native boolean _gtk_widget_get_has_window (long /*int*/ widget);
+public static final boolean gtk_widget_get_has_window (long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_get_has_window(widget);
@@ -12353,8 +12353,8 @@ public static final boolean gtk_widget_get_has_window (int /*long*/ widget) {
}
}
/** @method flags=dynamic */
-public static final native boolean _gtk_widget_get_can_default (int /*long*/ widget);
-public static final boolean gtk_widget_get_can_default (int /*long*/ widget) {
+public static final native boolean _gtk_widget_get_can_default (long /*int*/ widget);
+public static final boolean gtk_widget_get_can_default (long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_get_can_default(widget);
@@ -12363,8 +12363,8 @@ public static final boolean gtk_widget_get_can_default (int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native boolean _gtk_widget_get_child_visible (int /*long*/ widget);
-public static final boolean gtk_widget_get_child_visible (int /*long*/ widget) {
+public static final native boolean _gtk_widget_get_child_visible (long /*int*/ widget);
+public static final boolean gtk_widget_get_child_visible (long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_get_child_visible(widget);
@@ -12372,8 +12372,8 @@ public static final boolean gtk_widget_get_child_visible (int /*long*/ widget) {
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_widget_get_default_style();
-public static final int /*long*/ gtk_widget_get_default_style() {
+public static final native long /*int*/ _gtk_widget_get_default_style();
+public static final long /*int*/ gtk_widget_get_default_style() {
lock.lock();
try {
return _gtk_widget_get_default_style();
@@ -12382,8 +12382,8 @@ public static final int /*long*/ gtk_widget_get_default_style() {
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native int _gtk_widget_get_events(int /*long*/ widget);
-public static final int gtk_widget_get_events(int /*long*/ widget) {
+public static final native int _gtk_widget_get_events(long /*int*/ widget);
+public static final int gtk_widget_get_events(long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_get_events(widget);
@@ -12392,8 +12392,8 @@ public static final int gtk_widget_get_events(int /*long*/ widget) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_widget_get_window (int /*long*/ widget);
-public static final int /*long*/ gtk_widget_get_window (int /*long*/ widget) {
+public static final native long /*int*/ _gtk_widget_get_window (long /*int*/ widget);
+public static final long /*int*/ gtk_widget_get_window (long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_get_window(widget);
@@ -12402,8 +12402,8 @@ public static final int /*long*/ gtk_widget_get_window (int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native int /*long*/ _gtk_widget_get_modifier_style(int /*long*/ widget);
-public static final int /*long*/ gtk_widget_get_modifier_style(int /*long*/ widget) {
+public static final native long /*int*/ _gtk_widget_get_modifier_style(long /*int*/ widget);
+public static final long /*int*/ gtk_widget_get_modifier_style(long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_get_modifier_style(widget);
@@ -12412,8 +12412,8 @@ public static final int /*long*/ gtk_widget_get_modifier_style(int /*long*/ widg
}
}
/** @method flags=dynamic */
-public static final native boolean _gtk_widget_get_mapped(int /*long*/ widget);
-public static final boolean gtk_widget_get_mapped(int /*long*/ widget) {
+public static final native boolean _gtk_widget_get_mapped(long /*int*/ widget);
+public static final boolean gtk_widget_get_mapped(long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_get_mapped(widget);
@@ -12422,8 +12422,8 @@ public static final boolean gtk_widget_get_mapped(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native int /*long*/ _gtk_widget_get_pango_context(int /*long*/ widget);
-public static final int /*long*/ gtk_widget_get_pango_context(int /*long*/ widget) {
+public static final native long /*int*/ _gtk_widget_get_pango_context(long /*int*/ widget);
+public static final long /*int*/ gtk_widget_get_pango_context(long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_get_pango_context(widget);
@@ -12432,8 +12432,8 @@ public static final int /*long*/ gtk_widget_get_pango_context(int /*long*/ widge
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native int /*long*/ _gtk_widget_get_parent(int /*long*/ widget);
-public static final int /*long*/ gtk_widget_get_parent(int /*long*/ widget) {
+public static final native long /*int*/ _gtk_widget_get_parent(long /*int*/ widget);
+public static final long /*int*/ gtk_widget_get_parent(long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_get_parent(widget);
@@ -12442,8 +12442,8 @@ public static final int /*long*/ gtk_widget_get_parent(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native int /*long*/ _gtk_widget_get_parent_window(int /*long*/ widget);
-public static final int /*long*/ gtk_widget_get_parent_window(int /*long*/ widget) {
+public static final native long /*int*/ _gtk_widget_get_parent_window(long /*int*/ widget);
+public static final long /*int*/ gtk_widget_get_parent_window(long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_get_parent_window(widget);
@@ -12456,8 +12456,8 @@ public static final int /*long*/ gtk_widget_get_parent_window(int /*long*/ widge
* @param widget cast=(GtkWidget *)
* @param allocation cast=(GtkAllocation *),flags=no_in
* */
-public static final native void _gtk_widget_get_allocation (int /*long*/ widget, GtkAllocation allocation);
-public static final void gtk_widget_get_allocation (int /*long*/ widget, GtkAllocation allocation) {
+public static final native void _gtk_widget_get_allocation (long /*int*/ widget, GtkAllocation allocation);
+public static final void gtk_widget_get_allocation (long /*int*/ widget, GtkAllocation allocation) {
lock.lock();
try {
_gtk_widget_get_allocation(widget, allocation);
@@ -12466,8 +12466,8 @@ public static final void gtk_widget_get_allocation (int /*long*/ widget, GtkAllo
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native int /*long*/ _gtk_widget_get_style(int /*long*/ widget);
-public static final int /*long*/ gtk_widget_get_style(int /*long*/ widget) {
+public static final native long /*int*/ _gtk_widget_get_style(long /*int*/ widget);
+public static final long /*int*/ gtk_widget_get_style(long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_get_style(widget);
@@ -12480,8 +12480,8 @@ public static final int /*long*/ gtk_widget_get_style(int /*long*/ widget) {
* @param width cast=(gint *)
* @param height cast=(gint *)
*/
-public static final native void _gtk_widget_get_size_request(int /*long*/ widget, int [] width, int [] height);
-public static final void gtk_widget_get_size_request(int /*long*/ widget, int [] width, int [] height) {
+public static final native void _gtk_widget_get_size_request(long /*int*/ widget, int [] width, int [] height);
+public static final void gtk_widget_get_size_request(long /*int*/ widget, int [] width, int [] height) {
lock.lock();
try {
_gtk_widget_get_size_request(widget, width, height);
@@ -12490,8 +12490,8 @@ public static final void gtk_widget_get_size_request(int /*long*/ widget, int []
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native int /*long*/ _gtk_widget_get_toplevel (int /*long*/ widget);
-public static final int /*long*/ gtk_widget_get_toplevel (int /*long*/ widget) {
+public static final native long /*int*/ _gtk_widget_get_toplevel (long /*int*/ widget);
+public static final long /*int*/ gtk_widget_get_toplevel (long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_get_toplevel(widget);
@@ -12500,8 +12500,8 @@ public static final int /*long*/ gtk_widget_get_toplevel (int /*long*/ widget) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _gtk_widget_get_tooltip_text (int /*long*/ widget);
-public static final int /*long*/ gtk_widget_get_tooltip_text (int /*long*/ widget) {
+public static final native long /*int*/ _gtk_widget_get_tooltip_text (long /*int*/ widget);
+public static final long /*int*/ gtk_widget_get_tooltip_text (long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_get_tooltip_text(widget);
@@ -12510,8 +12510,8 @@ public static final int /*long*/ gtk_widget_get_tooltip_text (int /*long*/ widge
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_grab_focus(int /*long*/ widget);
-public static final void gtk_widget_grab_focus(int /*long*/ widget) {
+public static final native void _gtk_widget_grab_focus(long /*int*/ widget);
+public static final void gtk_widget_grab_focus(long /*int*/ widget) {
lock.lock();
try {
_gtk_widget_grab_focus(widget);
@@ -12520,8 +12520,8 @@ public static final void gtk_widget_grab_focus(int /*long*/ widget) {
}
}
/** @method flags=dynamic */
-public static final native boolean _gtk_widget_has_focus(int /*long*/ widget);
-public static final boolean gtk_widget_has_focus(int /*long*/ widget) {
+public static final native boolean _gtk_widget_has_focus(long /*int*/ widget);
+public static final boolean gtk_widget_has_focus(long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_has_focus(widget);
@@ -12530,8 +12530,8 @@ public static final boolean gtk_widget_has_focus(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_hide(int /*long*/ widget);
-public static final void gtk_widget_hide(int /*long*/ widget) {
+public static final native void _gtk_widget_hide(long /*int*/ widget);
+public static final void gtk_widget_hide(long /*int*/ widget) {
lock.lock();
try {
_gtk_widget_hide(widget);
@@ -12543,8 +12543,8 @@ public static final void gtk_widget_hide(int /*long*/ widget) {
* @method flags=dynamic
* @param widget cast=(GtkWidget *)
*/
-public static final native boolean _gtk_widget_is_composited(int /*long*/ widget);
-public static final boolean gtk_widget_is_composited(int /*long*/ widget) {
+public static final native boolean _gtk_widget_is_composited(long /*int*/ widget);
+public static final boolean gtk_widget_is_composited(long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_is_composited(widget);
@@ -12553,8 +12553,8 @@ public static final boolean gtk_widget_is_composited(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native boolean _gtk_widget_is_focus(int /*long*/ widget);
-public static final boolean gtk_widget_is_focus(int /*long*/ widget) {
+public static final native boolean _gtk_widget_is_focus(long /*int*/ widget);
+public static final boolean gtk_widget_is_focus(long /*int*/ widget) {
lock.lock();
try {
return _gtk_widget_is_focus(widget);
@@ -12563,8 +12563,8 @@ public static final boolean gtk_widget_is_focus(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_map(int /*long*/ widget);
-public static final void gtk_widget_map(int /*long*/ widget) {
+public static final native void _gtk_widget_map(long /*int*/ widget);
+public static final void gtk_widget_map(long /*int*/ widget) {
lock.lock();
try {
_gtk_widget_map(widget);
@@ -12576,8 +12576,8 @@ public static final void gtk_widget_map(int /*long*/ widget) {
* @param widget cast=(GtkWidget *)
* @param group_cycling cast=(gboolean)
*/
-public static final native boolean _gtk_widget_mnemonic_activate(int /*long*/ widget, boolean group_cycling);
-public static final boolean gtk_widget_mnemonic_activate(int /*long*/ widget, boolean group_cycling) {
+public static final native boolean _gtk_widget_mnemonic_activate(long /*int*/ widget, boolean group_cycling);
+public static final boolean gtk_widget_mnemonic_activate(long /*int*/ widget, boolean group_cycling) {
lock.lock();
try {
return _gtk_widget_mnemonic_activate(widget, group_cycling);
@@ -12590,8 +12590,8 @@ public static final boolean gtk_widget_mnemonic_activate(int /*long*/ widget, bo
* @param state cast=(GtkStateType)
* @param color cast=(GdkColor *),flags=no_out
*/
-public static final native void _gtk_widget_modify_base(int /*long*/ widget, int state, GdkColor color);
-public static final void gtk_widget_modify_base(int /*long*/ widget, int state, GdkColor color) {
+public static final native void _gtk_widget_modify_base(long /*int*/ widget, int state, GdkColor color);
+public static final void gtk_widget_modify_base(long /*int*/ widget, int state, GdkColor color) {
lock.lock();
try {
_gtk_widget_modify_base(widget, state, color);
@@ -12604,8 +12604,8 @@ public static final void gtk_widget_modify_base(int /*long*/ widget, int state,
* @param state cast=(GtkStateType)
* @param color cast=(GdkColor *),flags=no_out
*/
-public static final native void _gtk_widget_modify_bg(int /*long*/ widget, int state, GdkColor color);
-public static final void gtk_widget_modify_bg(int /*long*/ widget, int state, GdkColor color) {
+public static final native void _gtk_widget_modify_bg(long /*int*/ widget, int state, GdkColor color);
+public static final void gtk_widget_modify_bg(long /*int*/ widget, int state, GdkColor color) {
lock.lock();
try {
_gtk_widget_modify_bg(widget, state, color);
@@ -12617,8 +12617,8 @@ public static final void gtk_widget_modify_bg(int /*long*/ widget, int state, Gd
* @param widget cast=(GtkWidget *)
* @param pango_font_descr cast=(PangoFontDescription *)
*/
-public static final native void _gtk_widget_modify_font(int /*long*/ widget, int /*long*/ pango_font_descr);
-public static final void gtk_widget_modify_font(int /*long*/ widget, int /*long*/ pango_font_descr) {
+public static final native void _gtk_widget_modify_font(long /*int*/ widget, long /*int*/ pango_font_descr);
+public static final void gtk_widget_modify_font(long /*int*/ widget, long /*int*/ pango_font_descr) {
lock.lock();
try {
_gtk_widget_modify_font(widget, pango_font_descr);
@@ -12630,8 +12630,8 @@ public static final void gtk_widget_modify_font(int /*long*/ widget, int /*long*
* @param widget cast=(GtkWidget *)
* @param style cast=(GtkRcStyle *)
*/
-public static final native void _gtk_widget_modify_style(int /*long*/ widget, int /*long*/ style);
-public static final void gtk_widget_modify_style(int /*long*/ widget, int /*long*/ style) {
+public static final native void _gtk_widget_modify_style(long /*int*/ widget, long /*int*/ style);
+public static final void gtk_widget_modify_style(long /*int*/ widget, long /*int*/ style) {
lock.lock();
try {
_gtk_widget_modify_style(widget, style);
@@ -12640,8 +12640,8 @@ public static final void gtk_widget_modify_style(int /*long*/ widget, int /*long
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_queue_resize(int /*long*/ widget);
-public static final void gtk_widget_queue_resize(int /*long*/ widget) {
+public static final native void _gtk_widget_queue_resize(long /*int*/ widget);
+public static final void gtk_widget_queue_resize(long /*int*/ widget) {
lock.lock();
try {
_gtk_widget_queue_resize(widget);
@@ -12650,8 +12650,8 @@ public static final void gtk_widget_queue_resize(int /*long*/ widget) {
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_realize(int /*long*/ widget);
-public static final void gtk_widget_realize(int /*long*/ widget) {
+public static final native void _gtk_widget_realize(long /*int*/ widget);
+public static final void gtk_widget_realize(long /*int*/ widget) {
lock.lock();
try {
_gtk_widget_realize(widget);
@@ -12665,8 +12665,8 @@ public static final void gtk_widget_realize(int /*long*/ widget) {
* @param accel_key cast=(guint)
* @param accel_mods cast=(GdkModifierType)
*/
-public static final native void _gtk_widget_remove_accelerator(int /*long*/ widget, int /*long*/ accel_group, int accel_key, int accel_mods);
-public static final void gtk_widget_remove_accelerator(int /*long*/ widget, int /*long*/ accel_group, int accel_key, int accel_mods) {
+public static final native void _gtk_widget_remove_accelerator(long /*int*/ widget, long /*int*/ accel_group, int accel_key, int accel_mods);
+public static final void gtk_widget_remove_accelerator(long /*int*/ widget, long /*int*/ accel_group, int accel_key, int accel_mods) {
lock.lock();
try {
_gtk_widget_remove_accelerator(widget, accel_group, accel_key, accel_mods);
@@ -12678,8 +12678,8 @@ public static final void gtk_widget_remove_accelerator(int /*long*/ widget, int
* @param widget cast=(GtkWidget *)
* @param new_parent cast=(GtkWidget *)
*/
-public static final native void _gtk_widget_reparent(int /*long*/ widget, int /*long*/ new_parent);
-public static final void gtk_widget_reparent(int /*long*/ widget, int /*long*/ new_parent) {
+public static final native void _gtk_widget_reparent(long /*int*/ widget, long /*int*/ new_parent);
+public static final void gtk_widget_reparent(long /*int*/ widget, long /*int*/ new_parent) {
lock.lock();
try {
_gtk_widget_reparent(widget, new_parent);
@@ -12691,8 +12691,8 @@ public static final void gtk_widget_reparent(int /*long*/ widget, int /*long*/ n
* @param widget cast=(GtkWidget *)
* @param event cast=(GdkEvent *)
*/
-public static final native int _gtk_widget_send_expose(int /*long*/ widget, int /*long*/ event);
-public static final int gtk_widget_send_expose(int /*long*/ widget, int /*long*/ event) {
+public static final native int _gtk_widget_send_expose(long /*int*/ widget, long /*int*/ event);
+public static final int gtk_widget_send_expose(long /*int*/ widget, long /*int*/ event) {
lock.lock();
try {
return _gtk_widget_send_expose(widget, event);
@@ -12701,8 +12701,8 @@ public static final int gtk_widget_send_expose(int /*long*/ widget, int /*long*/
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_set_app_paintable(int /*long*/ widget, boolean app_paintable);
-public static final void gtk_widget_set_app_paintable(int /*long*/ widget, boolean app_paintable) {
+public static final native void _gtk_widget_set_app_paintable(long /*int*/ widget, boolean app_paintable);
+public static final void gtk_widget_set_app_paintable(long /*int*/ widget, boolean app_paintable) {
lock.lock();
try {
_gtk_widget_set_app_paintable(widget, app_paintable);
@@ -12721,8 +12721,8 @@ public static final void gtk_widget_set_default_direction(int dir) {
}
}
/** @method flags=dynamic */
-public static final native void _gtk_widget_set_can_default(int /*long*/ widget, boolean can_default);
-public static final void gtk_widget_set_can_default(int /*long*/ widget, boolean can_default) {
+public static final native void _gtk_widget_set_can_default(long /*int*/ widget, boolean can_default);
+public static final void gtk_widget_set_can_default(long /*int*/ widget, boolean can_default) {
lock.lock();
try {
_gtk_widget_set_can_default(widget,can_default) ;
@@ -12731,8 +12731,8 @@ public static final void gtk_widget_set_can_default(int /*long*/ widget, boolean
}
}
/** @method flags=dynamic */
-public static final native boolean _gtk_widget_set_can_focus(int /*long*/ widget, boolean can_focus);
-public static final boolean gtk_widget_set_can_focus(int /*long*/ widget, boolean can_focus) {
+public static final native boolean _gtk_widget_set_can_focus(long /*int*/ widget, boolean can_focus);
+public static final boolean gtk_widget_set_can_focus(long /*int*/ widget, boolean can_focus) {
lock.lock();
try {
return _gtk_widget_set_can_focus(widget,can_focus);
@@ -12741,8 +12741,8 @@ public static final boolean gtk_widget_set_can_focus(int /*long*/ widget, boolea
}
}
/** @method flags=dynamic */
-public static final native void _gtk_widget_set_mapped(int /*long*/ widget, boolean mapped);
-public static final void gtk_widget_set_mapped(int /*long*/ widget, boolean mapped) {
+public static final native void _gtk_widget_set_mapped(long /*int*/ widget, boolean mapped);
+public static final void gtk_widget_set_mapped(long /*int*/ widget, boolean mapped) {
lock.lock();
try {
_gtk_widget_set_mapped(widget,mapped);
@@ -12751,8 +12751,8 @@ public static final void gtk_widget_set_mapped(int /*long*/ widget, boolean mapp
}
}
/** @method flags=dynamic */
-public static final native void _gtk_widget_set_visible(int /*long*/ widget, boolean visible);
-public static final void gtk_widget_set_visible(int /*long*/ widget, boolean visible) {
+public static final native void _gtk_widget_set_visible(long /*int*/ widget, boolean visible);
+public static final void gtk_widget_set_visible(long /*int*/ widget, boolean visible) {
lock.lock();
try {
_gtk_widget_set_visible(widget, visible);
@@ -12764,8 +12764,8 @@ public static final void gtk_widget_set_visible(int /*long*/ widget, boolean vis
* @param widget cast=(GtkWidget *)
* @param dir cast=(GtkTextDirection)
*/
-public static final native void _gtk_widget_set_direction(int /*long*/ widget, int dir);
-public static final void gtk_widget_set_direction(int /*long*/ widget, int dir) {
+public static final native void _gtk_widget_set_direction(long /*int*/ widget, int dir);
+public static final void gtk_widget_set_direction(long /*int*/ widget, int dir) {
lock.lock();
try {
_gtk_widget_set_direction(widget, dir);
@@ -12774,8 +12774,8 @@ public static final void gtk_widget_set_direction(int /*long*/ widget, int dir)
}
}
/** @method flags=dynamic */
-public static final native void _gtk_widget_set_receives_default(int /*long*/ widget, boolean receives_default);
-public static final void gtk_widget_set_receives_default(int /*long*/ widget, boolean receives_default) {
+public static final native void _gtk_widget_set_receives_default(long /*int*/ widget, boolean receives_default);
+public static final void gtk_widget_set_receives_default(long /*int*/ widget, boolean receives_default) {
lock.lock();
try {
_gtk_widget_set_receives_default(widget, receives_default);
@@ -12787,8 +12787,8 @@ public static final void gtk_widget_set_receives_default(int /*long*/ widget, bo
* @param widget cast=(GtkWidget *)
* @param double_buffered cast=(gboolean)
*/
-public static final native void _gtk_widget_set_double_buffered(int /*long*/ widget, boolean double_buffered);
-public static final void gtk_widget_set_double_buffered(int /*long*/ widget, boolean double_buffered) {
+public static final native void _gtk_widget_set_double_buffered(long /*int*/ widget, boolean double_buffered);
+public static final void gtk_widget_set_double_buffered(long /*int*/ widget, boolean double_buffered) {
lock.lock();
try {
_gtk_widget_set_double_buffered(widget, double_buffered);
@@ -12800,8 +12800,8 @@ public static final void gtk_widget_set_double_buffered(int /*long*/ widget, boo
* @param widget cast=(GtkWidget *)
* @param name cast=(const char *)
*/
-public static final native void _gtk_widget_set_name(int /*long*/ widget, byte[] name);
-public static final void gtk_widget_set_name(int /*long*/ widget, byte[] name) {
+public static final native void _gtk_widget_set_name(long /*int*/ widget, byte[] name);
+public static final void gtk_widget_set_name(long /*int*/ widget, byte[] name) {
lock.lock();
try {
_gtk_widget_set_name(widget, name);
@@ -12813,8 +12813,8 @@ public static final void gtk_widget_set_name(int /*long*/ widget, byte[] name) {
* @param widget cast=(GtkWidget *)
* @param redraw cast=(gboolean)
*/
-public static final native void _gtk_widget_set_redraw_on_allocate(int /*long*/ widget, boolean redraw);
-public static final void gtk_widget_set_redraw_on_allocate(int /*long*/ widget, boolean redraw) {
+public static final native void _gtk_widget_set_redraw_on_allocate(long /*int*/ widget, boolean redraw);
+public static final void gtk_widget_set_redraw_on_allocate(long /*int*/ widget, boolean redraw) {
lock.lock();
try {
_gtk_widget_set_redraw_on_allocate(widget, redraw);
@@ -12826,8 +12826,8 @@ public static final void gtk_widget_set_redraw_on_allocate(int /*long*/ widget,
* @param widget cast=(GtkWidget *)
* @param sensitive cast=(gboolean)
*/
-public static final native void _gtk_widget_set_sensitive(int /*long*/ widget, boolean sensitive);
-public static final void gtk_widget_set_sensitive(int /*long*/ widget, boolean sensitive) {
+public static final native void _gtk_widget_set_sensitive(long /*int*/ widget, boolean sensitive);
+public static final void gtk_widget_set_sensitive(long /*int*/ widget, boolean sensitive) {
lock.lock();
try {
_gtk_widget_set_sensitive(widget, sensitive);
@@ -12840,8 +12840,8 @@ public static final void gtk_widget_set_sensitive(int /*long*/ widget, boolean s
* @param width cast=(gint)
* @param height cast=(gint)
*/
-public static final native void _gtk_widget_set_size_request(int /*long*/ widget, int width, int height);
-public static final void gtk_widget_set_size_request(int /*long*/ widget, int width, int height) {
+public static final native void _gtk_widget_set_size_request(long /*int*/ widget, int width, int height);
+public static final void gtk_widget_set_size_request(long /*int*/ widget, int width, int height) {
lock.lock();
try {
_gtk_widget_set_size_request(widget, width, height);
@@ -12853,8 +12853,8 @@ public static final void gtk_widget_set_size_request(int /*long*/ widget, int wi
* @param widget cast=(GtkWidget *)
* @param state cast=(GtkStateType)
*/
-public static final native void _gtk_widget_set_state(int /*long*/ widget, int state);
-public static final void gtk_widget_set_state(int /*long*/ widget, int state) {
+public static final native void _gtk_widget_set_state(long /*int*/ widget, int state);
+public static final void gtk_widget_set_state(long /*int*/ widget, int state) {
lock.lock();
try {
_gtk_widget_set_state(widget, state);
@@ -12863,8 +12863,8 @@ public static final void gtk_widget_set_state(int /*long*/ widget, int state) {
}
}
/** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_show(int /*long*/ widget);
-public static final void gtk_widget_show(int /*long*/ widget) {
+public static final native void _gtk_widget_show(long /*int*/ widget);
+public static final void gtk_widget_show(long /*int*/ widget) {
lock.lock();
try {
_gtk_widget_show(widget);
@@ -12876,8 +12876,8 @@ public static final void gtk_widget_show(int /*long*/ widget) {
* @param widget cast=(GtkWidget *)
* @param allocation cast=(GtkAllocation *),flags=no_out
*/
-public static final native void _gtk_widget_size_allocate(int /*long*/ widget, GtkAllocation allocation);
-public static final void gtk_widget_size_allocate(int /*long*/ widget, GtkAllocation allocation) {
+public static final native void _gtk_widget_size_allocate(long /*int*/ widget, GtkAllocation allocation);
+public static final void gtk_widget_size_allocate(long /*int*/ widget, GtkAllocation allocation) {
lock.lock();
try {
_gtk_widget_size_allocate(widget, allocation);
@@ -12889,8 +12889,8 @@ public static final void gtk_widget_size_allocate(int /*long*/ widget, GtkAlloca
* @param widget cast=(GtkWidget *)
* @param requisition cast=(GtkRequisition *),flags=no_in
*/
-public static final native void _gtk_widget_size_request(int /*long*/ widget, GtkRequisition requisition);
-public static final void gtk_widget_size_request(int /*long*/ widget, GtkRequisition requisition) {
+public static final native void _gtk_widget_size_request(long /*int*/ widget, GtkRequisition requisition);
+public static final void gtk_widget_size_request(long /*int*/ widget, GtkRequisition requisition) {
lock.lock();
try {
_gtk_widget_size_request(widget, requisition);
@@ -12902,8 +12902,8 @@ public static final void gtk_widget_size_request(int /*long*/ widget, GtkRequisi
* @method flags=dynamic
* @param allocation cast=(GtkAllocation *),flags=no_out
*/
-public static final native void _gtk_widget_set_allocation(int /*long*/ widget, GtkAllocation allocation);
-public static final void gtk_widget_set_allocation(int /*long*/ widget, GtkAllocation allocation) {
+public static final native void _gtk_widget_set_allocation(long /*int*/ widget, GtkAllocation allocation);
+public static final void gtk_widget_set_allocation(long /*int*/ widget, GtkAllocation allocation) {
lock.lock();
try {
_gtk_widget_set_allocation(widget, allocation);
@@ -12916,8 +12916,8 @@ public static final void gtk_widget_set_allocation(int /*long*/ widget, GtkAlloc
* @param property_name cast=(const gchar *)
* @param terminator cast=(const gchar *),flags=sentinel
*/
-public static final native void _gtk_widget_style_get(int /*long*/ widget, byte[] property_name, int[] value, int /*long*/ terminator);
-public static final void gtk_widget_style_get(int /*long*/ widget, byte[] property_name, int[] value, int /*long*/ terminator) {
+public static final native void _gtk_widget_style_get(long /*int*/ widget, byte[] property_name, int[] value, long /*int*/ terminator);
+public static final void gtk_widget_style_get(long /*int*/ widget, byte[] property_name, int[] value, long /*int*/ terminator) {
lock.lock();
try {
_gtk_widget_style_get(widget, property_name, value, terminator);
@@ -12930,8 +12930,8 @@ public static final void gtk_widget_style_get(int /*long*/ widget, byte[] proper
* @param property_name cast=(const gchar *)
* @param terminator cast=(const gchar *),flags=sentinel
*/
-public static final native void _gtk_widget_style_get(int /*long*/ widget, byte[] property_name, long[] value, int /*long*/ terminator);
-public static final void gtk_widget_style_get(int /*long*/ widget, byte[] property_name, long[] value, int /*long*/ terminator) {
+public static final native void _gtk_widget_style_get(long /*int*/ widget, byte[] property_name, long[] value, long /*int*/ terminator);
+public static final void gtk_widget_style_get(long /*int*/ widget, byte[] property_name, long[] value, long /*int*/ terminator) {
lock.lock();
try {
_gtk_widget_style_get(widget, property_name, value, terminator);
@@ -12943,8 +12943,8 @@ public static final void gtk_widget_style_get(int /*long*/ widget, byte[] proper
* @param src_widget cast=(GtkWidget *)
* @param dest_widget cast=(GtkWidget *)
*/
-public static final native boolean _gtk_widget_translate_coordinates(int /*long*/ src_widget, int /*long*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y);
-public static final boolean gtk_widget_translate_coordinates(int /*long*/ src_widget, int /*long*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y) {
+public static final native boolean _gtk_widget_translate_coordinates(long /*int*/ src_widget, long /*int*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y);
+public static final boolean gtk_widget_translate_coordinates(long /*int*/ src_widget, long /*int*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y) {
lock.lock();
try {
return _gtk_widget_translate_coordinates(src_widget, dest_widget, src_x, src_y, dest_x, dest_y);
@@ -12953,8 +12953,8 @@ public static final boolean gtk_widget_translate_coordinates(int /*long*/ src_wi
}
}
/** @param window cast=(GtkWindow *) */
-public static final native boolean _gtk_window_activate_default(int /*long*/ window);
-public static final boolean gtk_window_activate_default(int /*long*/ window) {
+public static final native boolean _gtk_window_activate_default(long /*int*/ window);
+public static final boolean gtk_window_activate_default(long /*int*/ window) {
lock.lock();
try {
return _gtk_window_activate_default(window);
@@ -12966,8 +12966,8 @@ public static final boolean gtk_window_activate_default(int /*long*/ window) {
* @param window cast=(GtkWindow *)
* @param accel_group cast=(GtkAccelGroup *)
*/
-public static final native void _gtk_window_add_accel_group(int /*long*/ window, int /*long*/ accel_group);
-public static final void gtk_window_add_accel_group(int /*long*/ window, int /*long*/ accel_group) {
+public static final native void _gtk_window_add_accel_group(long /*int*/ window, long /*int*/ accel_group);
+public static final void gtk_window_add_accel_group(long /*int*/ window, long /*int*/ accel_group) {
lock.lock();
try {
_gtk_window_add_accel_group(window, accel_group);
@@ -12976,8 +12976,8 @@ public static final void gtk_window_add_accel_group(int /*long*/ window, int /*l
}
}
/** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_deiconify(int /*long*/ handle);
-public static final void gtk_window_deiconify(int /*long*/ handle) {
+public static final native void _gtk_window_deiconify(long /*int*/ handle);
+public static final void gtk_window_deiconify(long /*int*/ handle) {
lock.lock();
try {
_gtk_window_deiconify(handle);
@@ -12986,8 +12986,8 @@ public static final void gtk_window_deiconify(int /*long*/ handle) {
}
}
/** @param window cast=(GtkWindow *) */
-public static final native int /*long*/ _gtk_window_get_focus(int /*long*/ window);
-public static final int /*long*/ gtk_window_get_focus(int /*long*/ window) {
+public static final native long /*int*/ _gtk_window_get_focus(long /*int*/ window);
+public static final long /*int*/ gtk_window_get_focus(long /*int*/ window) {
lock.lock();
try {
return _gtk_window_get_focus(window);
@@ -12999,8 +12999,8 @@ public static final int /*long*/ gtk_window_get_focus(int /*long*/ window) {
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
-public static final native int /*long*/ _gtk_window_get_group(int /*long*/ window);
-public static final int /*long*/ gtk_window_get_group(int /*long*/ window) {
+public static final native long /*int*/ _gtk_window_get_group(long /*int*/ window);
+public static final long /*int*/ gtk_window_get_group(long /*int*/ window) {
lock.lock();
try {
return _gtk_window_get_group(window);
@@ -13009,8 +13009,8 @@ public static final int /*long*/ gtk_window_get_group(int /*long*/ window) {
}
}
/** @param window cast=(GtkWindow *) */
-public static final native int /*long*/ _gtk_window_get_icon_list(int /*long*/ window);
-public static final int /*long*/ gtk_window_get_icon_list(int /*long*/ window) {
+public static final native long /*int*/ _gtk_window_get_icon_list(long /*int*/ window);
+public static final long /*int*/ gtk_window_get_icon_list(long /*int*/ window) {
lock.lock();
try {
return _gtk_window_get_icon_list(window);
@@ -13019,8 +13019,8 @@ public static final int /*long*/ gtk_window_get_icon_list(int /*long*/ window) {
}
}
/** @param window cast=(GtkWindow *) */
-public static final native boolean _gtk_window_get_modal(int /*long*/ window);
-public static final boolean gtk_window_get_modal(int /*long*/ window) {
+public static final native boolean _gtk_window_get_modal(long /*int*/ window);
+public static final boolean gtk_window_get_modal(long /*int*/ window) {
lock.lock();
try {
return _gtk_window_get_modal(window);
@@ -13029,8 +13029,8 @@ public static final boolean gtk_window_get_modal(int /*long*/ window) {
}
}
/** @param window cast=(GtkWindow *) */
-public static final native int _gtk_window_get_mnemonic_modifier(int /*long*/ window);
-public static final int gtk_window_get_mnemonic_modifier(int /*long*/ window) {
+public static final native int _gtk_window_get_mnemonic_modifier(long /*int*/ window);
+public static final int gtk_window_get_mnemonic_modifier(long /*int*/ window) {
lock.lock();
try {
return _gtk_window_get_mnemonic_modifier(window);
@@ -13042,8 +13042,8 @@ public static final int gtk_window_get_mnemonic_modifier(int /*long*/ window) {
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
-public static final native double _gtk_window_get_opacity (int /*long*/ window);
-public static final double gtk_window_get_opacity (int /*long*/ window) {
+public static final native double _gtk_window_get_opacity (long /*int*/ window);
+public static final double gtk_window_get_opacity (long /*int*/ window) {
lock.lock();
try {
return _gtk_window_get_opacity (window);
@@ -13056,8 +13056,8 @@ public static final double gtk_window_get_opacity (int /*long*/ window) {
* @param x cast=(gint *)
* @param y cast=(gint *)
*/
-public static final native void _gtk_window_get_position(int /*long*/ handle, int[] x, int[] y);
-public static final void gtk_window_get_position(int /*long*/ handle, int[] x, int[] y) {
+public static final native void _gtk_window_get_position(long /*int*/ handle, int[] x, int[] y);
+public static final void gtk_window_get_position(long /*int*/ handle, int[] x, int[] y) {
lock.lock();
try {
_gtk_window_get_position(handle, x, y);
@@ -13069,8 +13069,8 @@ public static final void gtk_window_get_position(int /*long*/ handle, int[] x, i
* @param group cast=(GtkWindowGroup*)
* @param window cast=(GtkWindow*)
*/
-public static final native void _gtk_window_group_add_window(int /*long*/ group, int /*long*/ window);
-public static final void gtk_window_group_add_window(int /*long*/ group, int /*long*/ window) {
+public static final native void _gtk_window_group_add_window(long /*int*/ group, long /*int*/ window);
+public static final void gtk_window_group_add_window(long /*int*/ group, long /*int*/ window) {
lock.lock();
try {
_gtk_window_group_add_window(group, window);
@@ -13082,8 +13082,8 @@ public static final void gtk_window_group_add_window(int /*long*/ group, int /*l
* @param group cast=(GtkWindowGroup*)
* @param window cast=(GtkWindow*)
*/
-public static final native void _gtk_window_group_remove_window(int /*long*/ group, int /*long*/ window);
-public static final void gtk_window_group_remove_window(int /*long*/ group, int /*long*/ window) {
+public static final native void _gtk_window_group_remove_window(long /*int*/ group, long /*int*/ window);
+public static final void gtk_window_group_remove_window(long /*int*/ group, long /*int*/ window) {
lock.lock();
try {
_gtk_window_group_remove_window(group, window);
@@ -13091,8 +13091,8 @@ public static final void gtk_window_group_remove_window(int /*long*/ group, int
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_window_group_new();
-public static final int /*long*/ gtk_window_group_new() {
+public static final native long /*int*/ _gtk_window_group_new();
+public static final long /*int*/ gtk_window_group_new() {
lock.lock();
try {
return _gtk_window_group_new();
@@ -13101,8 +13101,8 @@ public static final int /*long*/ gtk_window_group_new() {
}
}
/** @param handle cast=(GtkWindow *) */
-public static final native boolean _gtk_window_is_active(int /*long*/ handle);
-public static final boolean gtk_window_is_active(int /*long*/ handle) {
+public static final native boolean _gtk_window_is_active(long /*int*/ handle);
+public static final boolean gtk_window_is_active(long /*int*/ handle) {
lock.lock();
try {
return _gtk_window_is_active(handle);
@@ -13111,8 +13111,8 @@ public static final boolean gtk_window_is_active(int /*long*/ handle) {
}
}
/** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_iconify(int /*long*/ handle);
-public static final void gtk_window_iconify(int /*long*/ handle) {
+public static final native void _gtk_window_iconify(long /*int*/ handle);
+public static final void gtk_window_iconify(long /*int*/ handle) {
lock.lock();
try {
_gtk_window_iconify(handle);
@@ -13120,8 +13120,8 @@ public static final void gtk_window_iconify(int /*long*/ handle) {
lock.unlock();
}
}
-public static final native int /*long*/ _gtk_window_list_toplevels ();
-public static final int /*long*/ gtk_window_list_toplevels () {
+public static final native long /*int*/ _gtk_window_list_toplevels ();
+public static final long /*int*/ gtk_window_list_toplevels () {
lock.lock();
try {
return _gtk_window_list_toplevels ();
@@ -13130,8 +13130,8 @@ public static final int /*long*/ gtk_window_list_toplevels () {
}
}
/** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_maximize(int /*long*/ handle);
-public static final void gtk_window_maximize(int /*long*/ handle) {
+public static final native void _gtk_window_maximize(long /*int*/ handle);
+public static final void gtk_window_maximize(long /*int*/ handle) {
lock.lock();
try {
_gtk_window_maximize(handle);
@@ -13140,8 +13140,8 @@ public static final void gtk_window_maximize(int /*long*/ handle) {
}
}
/** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_fullscreen(int /*long*/ handle);
-public static final void gtk_window_fullscreen(int /*long*/ handle) {
+public static final native void _gtk_window_fullscreen(long /*int*/ handle);
+public static final void gtk_window_fullscreen(long /*int*/ handle) {
lock.lock();
try {
_gtk_window_fullscreen(handle);
@@ -13150,8 +13150,8 @@ public static final void gtk_window_fullscreen(int /*long*/ handle) {
}
}
/** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_unfullscreen(int /*long*/ handle);
-public static final void gtk_window_unfullscreen(int /*long*/ handle) {
+public static final native void _gtk_window_unfullscreen(long /*int*/ handle);
+public static final void gtk_window_unfullscreen(long /*int*/ handle) {
lock.lock();
try {
_gtk_window_unfullscreen(handle);
@@ -13164,8 +13164,8 @@ public static final void gtk_window_unfullscreen(int /*long*/ handle) {
* @param x cast=(gint)
* @param y cast=(gint)
*/
-public static final native void _gtk_window_move(int /*long*/ handle, int x, int y);
-public static final void gtk_window_move(int /*long*/ handle, int x, int y) {
+public static final native void _gtk_window_move(long /*int*/ handle, int x, int y);
+public static final void gtk_window_move(long /*int*/ handle, int x, int y) {
lock.lock();
try {
_gtk_window_move(handle, x, y);
@@ -13174,8 +13174,8 @@ public static final void gtk_window_move(int /*long*/ handle, int x, int y) {
}
}
/** @param type cast=(GtkWindowType) */
-public static final native int /*long*/ _gtk_window_new(int type);
-public static final int /*long*/ gtk_window_new(int type) {
+public static final native long /*int*/ _gtk_window_new(int type);
+public static final long /*int*/ gtk_window_new(int type) {
lock.lock();
try {
return _gtk_window_new(type);
@@ -13187,8 +13187,8 @@ public static final int /*long*/ gtk_window_new(int type) {
* @param window cast=(GtkWindow *)
* @param accel_group cast=(GtkAccelGroup *)
*/
-public static final native void _gtk_window_remove_accel_group(int /*long*/ window, int /*long*/ accel_group);
-public static final void gtk_window_remove_accel_group(int /*long*/ window, int /*long*/ accel_group) {
+public static final native void _gtk_window_remove_accel_group(long /*int*/ window, long /*int*/ accel_group);
+public static final void gtk_window_remove_accel_group(long /*int*/ window, long /*int*/ accel_group) {
lock.lock();
try {
_gtk_window_remove_accel_group(window, accel_group);
@@ -13201,8 +13201,8 @@ public static final void gtk_window_remove_accel_group(int /*long*/ window, int
* @param x cast=(gint)
* @param y cast=(gint)
*/
-public static final native void _gtk_window_resize(int /*long*/ handle, int x, int y);
-public static final void gtk_window_resize(int /*long*/ handle, int x, int y) {
+public static final native void _gtk_window_resize(long /*int*/ handle, int x, int y);
+public static final void gtk_window_resize(long /*int*/ handle, int x, int y) {
lock.lock();
try {
_gtk_window_resize(handle, x, y);
@@ -13214,8 +13214,8 @@ public static final void gtk_window_resize(int /*long*/ handle, int x, int y) {
* @param window cast=(GtkWindow *)
* @param widget cast=(GtkWidget *)
*/
-public static final native void _gtk_window_set_default(int /*long*/ window, int /*long*/ widget);
-public static final void gtk_window_set_default(int /*long*/ window, int /*long*/ widget) {
+public static final native void _gtk_window_set_default(long /*int*/ window, long /*int*/ widget);
+public static final void gtk_window_set_default(long /*int*/ window, long /*int*/ widget) {
lock.lock();
try {
_gtk_window_set_default(window, widget);
@@ -13227,8 +13227,8 @@ public static final void gtk_window_set_default(int /*long*/ window, int /*long*
* @param window cast=(GtkWindow *)
* @param setting cast=(gboolean)
*/
-public static final native void _gtk_window_set_destroy_with_parent(int /*long*/ window, boolean setting);
-public static final void gtk_window_set_destroy_with_parent(int /*long*/ window, boolean setting) {
+public static final native void _gtk_window_set_destroy_with_parent(long /*int*/ window, boolean setting);
+public static final void gtk_window_set_destroy_with_parent(long /*int*/ window, boolean setting) {
lock.lock();
try {
_gtk_window_set_destroy_with_parent(window, setting);
@@ -13241,8 +13241,8 @@ public static final void gtk_window_set_destroy_with_parent(int /*long*/ window,
* @param geometry_widget cast=(GtkWidget *)
* @param geometry flags=no_out
*/
-public static final native void _gtk_window_set_geometry_hints(int /*long*/ window, int /*long*/ geometry_widget, GdkGeometry geometry, int geom_mask);
-public static final void gtk_window_set_geometry_hints(int /*long*/ window, int /*long*/ geometry_widget, GdkGeometry geometry, int geom_mask) {
+public static final native void _gtk_window_set_geometry_hints(long /*int*/ window, long /*int*/ geometry_widget, GdkGeometry geometry, int geom_mask);
+public static final void gtk_window_set_geometry_hints(long /*int*/ window, long /*int*/ geometry_widget, GdkGeometry geometry, int geom_mask) {
lock.lock();
try {
_gtk_window_set_geometry_hints(window, geometry_widget, geometry, geom_mask);
@@ -13254,8 +13254,8 @@ public static final void gtk_window_set_geometry_hints(int /*long*/ window, int
* @param window cast=(GtkWindow *)
* @param list cast=(GList *)
*/
-public static final native void _gtk_window_set_icon_list(int /*long*/ window, int /*long*/ list);
-public static final void gtk_window_set_icon_list(int /*long*/ window, int /*long*/ list) {
+public static final native void _gtk_window_set_icon_list(long /*int*/ window, long /*int*/ list);
+public static final void gtk_window_set_icon_list(long /*int*/ window, long /*int*/ list) {
lock.lock();
try {
_gtk_window_set_icon_list(window, list);
@@ -13267,8 +13267,8 @@ public static final void gtk_window_set_icon_list(int /*long*/ window, int /*lon
* @param window cast=(GtkWindow *)
* @param modal cast=(gboolean)
*/
-public static final native void _gtk_window_set_modal(int /*long*/ window, boolean modal);
-public static final void gtk_window_set_modal(int /*long*/ window, boolean modal) {
+public static final native void _gtk_window_set_modal(long /*int*/ window, boolean modal);
+public static final void gtk_window_set_modal(long /*int*/ window, boolean modal) {
lock.lock();
try {
_gtk_window_set_modal(window, modal);
@@ -13280,8 +13280,8 @@ public static final void gtk_window_set_modal(int /*long*/ window, boolean modal
* @method flags=dynamic
* @param window cast=(GtkWindow *)
*/
-public static final native void _gtk_window_set_opacity(int /*long*/ window, double opacity);
-public static final void gtk_window_set_opacity(int /*long*/ window, double opacity) {
+public static final native void _gtk_window_set_opacity(long /*int*/ window, double opacity);
+public static final void gtk_window_set_opacity(long /*int*/ window, double opacity) {
lock.lock();
try {
_gtk_window_set_opacity(window, opacity);
@@ -13294,8 +13294,8 @@ public static final void gtk_window_set_opacity(int /*long*/ window, double opac
* @param widget cast=(GtkWidget *)
* @param tip_text cast=(const gchar *)
*/
-public static final native void _gtk_widget_set_tooltip_text(int /*long*/ widget, byte[] tip_text);
-public static final void gtk_widget_set_tooltip_text(int /*long*/ widget, byte[] tip_text) {
+public static final native void _gtk_widget_set_tooltip_text(long /*int*/ widget, byte[] tip_text);
+public static final void gtk_widget_set_tooltip_text(long /*int*/ widget, byte[] tip_text) {
lock.lock();
try {
_gtk_widget_set_tooltip_text(widget, tip_text);
@@ -13307,8 +13307,8 @@ public static final void gtk_widget_set_tooltip_text(int /*long*/ widget, byte[]
* @param widget cast=(GtkWidget *)
* @param parent_window cast=(GdkWindow *)
*/
-public static final native void _gtk_widget_set_parent_window(int /*long*/ widget, int /*long*/ parent_window);
-public static final void gtk_widget_set_parent_window(int /*long*/ widget, int /*long*/ parent_window) {
+public static final native void _gtk_widget_set_parent_window(long /*int*/ widget, long /*int*/ parent_window);
+public static final void gtk_widget_set_parent_window(long /*int*/ widget, long /*int*/ parent_window) {
lock.lock();
try {
_gtk_widget_set_parent_window(widget, parent_window);
@@ -13320,8 +13320,8 @@ public static final void gtk_widget_set_parent_window(int /*long*/ widget, int /
* @param window cast=(GtkWindow *)
* @param resizable cast=(gboolean)
*/
-public static final native void _gtk_window_set_resizable(int /*long*/ window, boolean resizable);
-public static final void gtk_window_set_resizable(int /*long*/ window, boolean resizable) {
+public static final native void _gtk_window_set_resizable(long /*int*/ window, boolean resizable);
+public static final void gtk_window_set_resizable(long /*int*/ window, boolean resizable) {
lock.lock();
try {
_gtk_window_set_resizable(window, resizable);
@@ -13333,8 +13333,8 @@ public static final void gtk_window_set_resizable(int /*long*/ window, boolean r
* @param window cast=(GtkWindow *)
* @param title cast=(const gchar *)
*/
-public static final native void _gtk_window_set_title(int /*long*/ window, byte[] title);
-public static final void gtk_window_set_title(int /*long*/ window, byte[] title) {
+public static final native void _gtk_window_set_title(long /*int*/ window, byte[] title);
+public static final void gtk_window_set_title(long /*int*/ window, byte[] title) {
lock.lock();
try {
_gtk_window_set_title(window, title);
@@ -13347,8 +13347,8 @@ public static final void gtk_window_set_title(int /*long*/ window, byte[] title)
* @param window cast=(GtkWindow *)
* @param skips_taskbar cast=(gboolean)
*/
-public static final native void _gtk_window_set_skip_taskbar_hint(int /*long*/ window, boolean skips_taskbar);
-public static final void gtk_window_set_skip_taskbar_hint(int /*long*/ window, boolean skips_taskbar) {
+public static final native void _gtk_window_set_skip_taskbar_hint(long /*int*/ window, boolean skips_taskbar);
+public static final void gtk_window_set_skip_taskbar_hint(long /*int*/ window, boolean skips_taskbar) {
lock.lock();
try {
_gtk_window_set_skip_taskbar_hint(window, skips_taskbar);
@@ -13357,8 +13357,8 @@ public static final void gtk_window_set_skip_taskbar_hint(int /*long*/ window, b
}
}
/** @param window cast=(GtkWindow *) */
-public static final native void _gtk_window_set_type_hint(int /*long*/ window, int hint);
-public static final void gtk_window_set_type_hint(int /*long*/ window, int hint) {
+public static final native void _gtk_window_set_type_hint(long /*int*/ window, int hint);
+public static final void gtk_window_set_type_hint(long /*int*/ window, int hint) {
lock.lock();
try {
_gtk_window_set_type_hint(window, hint);
@@ -13370,8 +13370,8 @@ public static final void gtk_window_set_type_hint(int /*long*/ window, int hint)
* @param window cast=(GtkWindow *)
* @param parent cast=(GtkWindow *)
*/
-public static final native void _gtk_window_set_transient_for(int /*long*/ window, int /*long*/ parent);
-public static final void gtk_window_set_transient_for(int /*long*/ window, int /*long*/ parent) {
+public static final native void _gtk_window_set_transient_for(long /*int*/ window, long /*int*/ parent);
+public static final void gtk_window_set_transient_for(long /*int*/ window, long /*int*/ parent) {
lock.lock();
try {
_gtk_window_set_transient_for(window, parent);
@@ -13380,8 +13380,8 @@ public static final void gtk_window_set_transient_for(int /*long*/ window, int /
}
}
/** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_unmaximize(int /*long*/ handle);
-public static final void gtk_window_unmaximize(int /*long*/ handle) {
+public static final native void _gtk_window_unmaximize(long /*int*/ handle);
+public static final void gtk_window_unmaximize(long /*int*/ handle) {
lock.lock();
try {
_gtk_window_unmaximize(handle);
@@ -13394,258 +13394,258 @@ public static final void gtk_window_unmaximize(int /*long*/ handle) {
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove(int /*long*/ dest, GInterfaceInfo src, int size);
+public static final native void memmove(long /*int*/ dest, GInterfaceInfo src, int size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *),flags=no_out
*/
-public static final native void memmove(int /*long*/ dest, GObjectClass src);
+public static final native void memmove(long /*int*/ dest, GObjectClass src);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove(int /*long*/ dest, GTypeInfo src, int size);
+public static final native void memmove(long /*int*/ dest, GTypeInfo src, int size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove(int /*long*/ dest, GtkTargetEntry src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, GtkTargetEntry src, long /*int*/ size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out
*/
-public static final native void memmove(int /*long*/ dest, GtkAdjustment src);
+public static final native void memmove(long /*int*/ dest, GtkAdjustment src);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove(int /*long*/ dest, GdkColor src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, GdkColor src, long /*int*/ size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove(int /*long*/ dest, GdkEventButton src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, GdkEventButton src, long /*int*/ size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove(int /*long*/ dest, GdkEventExpose src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, GdkEventExpose src, long /*int*/ size);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove(int /*long*/ dest, GdkEventMotion src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, GdkEventMotion src, long /*int*/ size);
/** @param src flags=no_out */
-public static final native void memmove(int /*long*/ dest, GtkWidgetClass src);
+public static final native void memmove(long /*int*/ dest, GtkWidgetClass src);
/**
* @param dest cast=(void *)
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove(int /*long*/ dest, PangoAttribute src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, PangoAttribute src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
*/
-public static final native void memmove(GObjectClass dest, int /*long*/ src);
+public static final native void memmove(GObjectClass dest, long /*int*/ src);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GTypeQuery dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GTypeQuery dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
*/
-public static final native void memmove(GtkColorSelectionDialog dest, int /*long*/ src);
+public static final native void memmove(GtkColorSelectionDialog dest, long /*int*/ src);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
*/
-public static final native void memmove(GdkEventProperty dest, int /*long*/ src);
+public static final native void memmove(GdkEventProperty dest, long /*int*/ src);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GdkDragContext dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GdkDragContext dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GtkSelectionData dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GtkSelectionData dest, long /*int*/ src, long /*int*/ size);
/** @param dest flags=no_in */
-public static final native void memmove(GtkWidgetClass dest, int /*long*/ src);
+public static final native void memmove(GtkWidgetClass dest, long /*int*/ src);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GtkTargetPair dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GtkTargetPair dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
*/
-public static final native void memmove(GtkAdjustment dest, int /*long*/ src);
+public static final native void memmove(GtkAdjustment dest, long /*int*/ src);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GtkBorder dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GtkBorder dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GdkColor dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GdkColor dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GdkEvent dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GdkEvent dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GdkEventAny dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GdkEventAny dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GdkEventButton dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GdkEventButton dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GdkEventCrossing dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GdkEventCrossing dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GdkEventExpose dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GdkEventExpose dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GdkEventFocus dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GdkEventFocus dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GdkEventKey dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GdkEventKey dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GdkEventMotion dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GdkEventMotion dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GdkEventScroll dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GdkEventScroll dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GdkEventVisibility dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GdkEventVisibility dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GdkEventWindowState dest, int /*long*/ src, int /*long*/ size);
-public static final native void memmove(int /*long*/ dest, GtkCellRendererClass src);
-public static final native void memmove(GtkCellRendererClass dest, int /*long*/ src);
+public static final native void memmove(GdkEventWindowState dest, long /*int*/ src, long /*int*/ size);
+public static final native void memmove(long /*int*/ dest, GtkCellRendererClass src);
+public static final native void memmove(GtkCellRendererClass dest, long /*int*/ src);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
*/
-public static final native void memmove(GtkFixed dest, int /*long*/ src);
+public static final native void memmove(GtkFixed dest, long /*int*/ src);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *),flags=no_out
*/
-public static final native void memmove(int /*long*/ dest, GtkFixed src);
+public static final native void memmove(long /*int*/ dest, GtkFixed src);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
*/
-public static final native void memmove(GdkVisual dest, int /*long*/ src);
+public static final native void memmove(GdkVisual dest, long /*int*/ src);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
*/
-public static final native void memmove(GdkImage dest, int /*long*/ src);
+public static final native void memmove(GdkImage dest, long /*int*/ src);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(GdkRectangle dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GdkRectangle dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(PangoAttribute dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(PangoAttribute dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(PangoAttrColor dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(PangoAttrColor dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(PangoAttrInt dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(PangoAttrInt dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(PangoItem dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(PangoItem dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(PangoLayoutLine dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(PangoLayoutLine dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(PangoLayoutRun dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(PangoLayoutRun dest, long /*int*/ src, long /*int*/ size);
/**
* @param dest cast=(void *),flags=no_in
* @param src cast=(const void *)
* @param size cast=(size_t)
*/
-public static final native void memmove(PangoLogAttr dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(PangoLogAttr dest, long /*int*/ src, long /*int*/ size);
/** @param attribute cast=(const PangoAttribute *) */
-public static final native int /*long*/ _pango_attribute_copy (int /*long*/ attribute);
-public static final int /*long*/ pango_attribute_copy (int /*long*/ attribute) {
+public static final native long /*int*/ _pango_attribute_copy (long /*int*/ attribute);
+public static final long /*int*/ pango_attribute_copy (long /*int*/ attribute) {
lock.lock();
try {
return _pango_attribute_copy(attribute);
@@ -13653,8 +13653,8 @@ public static final int /*long*/ pango_attribute_copy (int /*long*/ attribute) {
lock.unlock();
}
}
-public static final native int /*long*/ _pango_attr_background_new (short red, short green, short blue);
-public static final int /*long*/ pango_attr_background_new (short red, short green, short blue) {
+public static final native long /*int*/ _pango_attr_background_new (short red, short green, short blue);
+public static final long /*int*/ pango_attr_background_new (short red, short green, short blue) {
lock.lock();
try {
return _pango_attr_background_new(red, green, blue);
@@ -13663,8 +13663,8 @@ public static final int /*long*/ pango_attr_background_new (short red, short gre
}
}
/** @param desc cast=(const PangoFontDescription *) */
-public static final native int /*long*/ _pango_attr_font_desc_new(int /*long*/ desc);
-public static final int /*long*/ pango_attr_font_desc_new(int /*long*/ desc) {
+public static final native long /*int*/ _pango_attr_font_desc_new(long /*int*/ desc);
+public static final long /*int*/ pango_attr_font_desc_new(long /*int*/ desc) {
lock.lock();
try {
return _pango_attr_font_desc_new(desc);
@@ -13672,8 +13672,8 @@ public static final int /*long*/ pango_attr_font_desc_new(int /*long*/ desc) {
lock.unlock();
}
}
-public static final native int /*long*/ _pango_attr_foreground_new (short red, short green, short blue);
-public static final int /*long*/ pango_attr_foreground_new (short red, short green, short blue) {
+public static final native long /*int*/ _pango_attr_foreground_new (short red, short green, short blue);
+public static final long /*int*/ pango_attr_foreground_new (short red, short green, short blue) {
lock.lock();
try {
return _pango_attr_foreground_new(red, green, blue);
@@ -13681,8 +13681,8 @@ public static final int /*long*/ pango_attr_foreground_new (short red, short gre
lock.unlock();
}
}
-public static final native int /*long*/ _pango_attr_rise_new(int rise);
-public static final int /*long*/ pango_attr_rise_new(int rise) {
+public static final native long /*int*/ _pango_attr_rise_new(int rise);
+public static final long /*int*/ pango_attr_rise_new(int rise) {
lock.lock();
try {
return _pango_attr_rise_new(rise);
@@ -13694,8 +13694,8 @@ public static final int /*long*/ pango_attr_rise_new(int rise) {
* @param ink_rect flags=no_out
* @param logical_rect flags=no_out
*/
-public static final native int /*long*/ _pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect);
-public static final int /*long*/ pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect) {
+public static final native long /*int*/ _pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect);
+public static final long /*int*/ pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect) {
lock.lock();
try {
return _pango_attr_shape_new(ink_rect, logical_rect);
@@ -13707,8 +13707,8 @@ public static final int /*long*/ pango_attr_shape_new(PangoRectangle ink_rect, P
* @param list cast=(PangoAttrList *)
* @param attr cast=(PangoAttribute *)
*/
-public static final native void _pango_attr_list_insert(int /*long*/ list, int /*long*/ attr);
-public static final void pango_attr_list_insert(int /*long*/ list, int /*long*/ attr) {
+public static final native void _pango_attr_list_insert(long /*int*/ list, long /*int*/ attr);
+public static final void pango_attr_list_insert(long /*int*/ list, long /*int*/ attr) {
lock.lock();
try {
_pango_attr_list_insert(list, attr);
@@ -13720,8 +13720,8 @@ public static final void pango_attr_list_insert(int /*long*/ list, int /*long*/
* @param list cast=(PangoAttrList *)
* @param attr cast=(PangoAttribute *)
*/
-public static final native void _pango_attr_list_change(int /*long*/ list, int /*long*/ attr);
-public static final void pango_attr_list_change(int /*long*/ list, int /*long*/ attr) {
+public static final native void _pango_attr_list_change(long /*int*/ list, long /*int*/ attr);
+public static final void pango_attr_list_change(long /*int*/ list, long /*int*/ attr) {
lock.lock();
try {
_pango_attr_list_change(list, attr);
@@ -13730,8 +13730,8 @@ public static final void pango_attr_list_change(int /*long*/ list, int /*long*/
}
}
/** @param list cast=(PangoAttrList *) */
-public static final native int /*long*/ _pango_attr_list_get_iterator(int /*long*/ list);
-public static final int /*long*/ pango_attr_list_get_iterator(int /*long*/ list) {
+public static final native long /*int*/ _pango_attr_list_get_iterator(long /*int*/ list);
+public static final long /*int*/ pango_attr_list_get_iterator(long /*int*/ list) {
lock.lock();
try {
return _pango_attr_list_get_iterator(list);
@@ -13740,8 +13740,8 @@ public static final int /*long*/ pango_attr_list_get_iterator(int /*long*/ list)
}
}
/** @param iterator cast=(PangoAttrIterator *) */
-public static final native boolean _pango_attr_iterator_next(int /*long*/ iterator);
-public static final boolean pango_attr_iterator_next(int /*long*/ iterator) {
+public static final native boolean _pango_attr_iterator_next(long /*int*/ iterator);
+public static final boolean pango_attr_iterator_next(long /*int*/ iterator) {
lock.lock();
try {
return _pango_attr_iterator_next(iterator);
@@ -13750,8 +13750,8 @@ public static final boolean pango_attr_iterator_next(int /*long*/ iterator) {
}
}
/** @param iterator cast=(PangoAttrIterator *) */
-public static final native void _pango_attr_iterator_range(int /*long*/ iterator, int[] start, int[] end);
-public static final void pango_attr_iterator_range(int /*long*/ iterator, int[] start, int[] end) {
+public static final native void _pango_attr_iterator_range(long /*int*/ iterator, int[] start, int[] end);
+public static final void pango_attr_iterator_range(long /*int*/ iterator, int[] start, int[] end) {
lock.lock();
try {
_pango_attr_iterator_range(iterator, start, end);
@@ -13763,8 +13763,8 @@ public static final void pango_attr_iterator_range(int /*long*/ iterator, int[]
* @param iterator cast=(PangoAttrIterator *)
* @param type cast=(PangoAttrType)
*/
-public static final native int /*long*/ _pango_attr_iterator_get(int /*long*/ iterator, int type);
-public static final int /*long*/ pango_attr_iterator_get(int /*long*/ iterator, int type) {
+public static final native long /*int*/ _pango_attr_iterator_get(long /*int*/ iterator, int type);
+public static final long /*int*/ pango_attr_iterator_get(long /*int*/ iterator, int type) {
lock.lock();
try {
return _pango_attr_iterator_get(iterator, type);
@@ -13773,8 +13773,8 @@ public static final int /*long*/ pango_attr_iterator_get(int /*long*/ iterator,
}
}
/** @param iterator cast=(PangoAttrIterator *) */
-public static final native int /*long*/ _pango_attr_iterator_get_attrs(int /*long*/ iterator);
-public static final int /*long*/ pango_attr_iterator_get_attrs(int /*long*/ iterator) {
+public static final native long /*int*/ _pango_attr_iterator_get_attrs(long /*int*/ iterator);
+public static final long /*int*/ pango_attr_iterator_get_attrs(long /*int*/ iterator) {
lock.lock();
try {
return _pango_attr_iterator_get_attrs(iterator);
@@ -13784,8 +13784,8 @@ public static final int /*long*/ pango_attr_iterator_get_attrs(int /*long*/ iter
}
/** @param iterator cast=(PangoAttrIterator *) */
-public static final native void _pango_attr_iterator_destroy(int /*long*/ iterator);
-public static final void pango_attr_iterator_destroy(int /*long*/ iterator) {
+public static final native void _pango_attr_iterator_destroy(long /*int*/ iterator);
+public static final void pango_attr_iterator_destroy(long /*int*/ iterator) {
lock.lock();
try {
_pango_attr_iterator_destroy(iterator);
@@ -13793,8 +13793,8 @@ public static final void pango_attr_iterator_destroy(int /*long*/ iterator) {
lock.unlock();
}
}
-public static final native int /*long*/ _pango_attr_list_new();
-public static final int /*long*/ pango_attr_list_new() {
+public static final native long /*int*/ _pango_attr_list_new();
+public static final long /*int*/ pango_attr_list_new() {
lock.lock();
try {
return _pango_attr_list_new();
@@ -13803,8 +13803,8 @@ public static final int /*long*/ pango_attr_list_new() {
}
}
/** @param list cast=(PangoAttrList *) */
-public static final native void _pango_attr_list_unref(int /*long*/ list);
-public static final void pango_attr_list_unref(int /*long*/ list) {
+public static final native void _pango_attr_list_unref(long /*int*/ list);
+public static final void pango_attr_list_unref(long /*int*/ list) {
lock.lock();
try {
_pango_attr_list_unref(list);
@@ -13813,8 +13813,8 @@ public static final void pango_attr_list_unref(int /*long*/ list) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _pango_attr_strikethrough_color_new(short red, short green, short blue);
-public static final int /*long*/ pango_attr_strikethrough_color_new(short red, short green, short blue) {
+public static final native long /*int*/ _pango_attr_strikethrough_color_new(short red, short green, short blue);
+public static final long /*int*/ pango_attr_strikethrough_color_new(short red, short green, short blue) {
lock.lock();
try {
return _pango_attr_strikethrough_color_new(red, green, blue);
@@ -13822,8 +13822,8 @@ public static final int /*long*/ pango_attr_strikethrough_color_new(short red, s
lock.unlock();
}
}
-public static final native int /*long*/ _pango_attr_strikethrough_new(boolean strikethrough);
-public static final int /*long*/ pango_attr_strikethrough_new(boolean strikethrough) {
+public static final native long /*int*/ _pango_attr_strikethrough_new(boolean strikethrough);
+public static final long /*int*/ pango_attr_strikethrough_new(boolean strikethrough) {
lock.lock();
try {
return _pango_attr_strikethrough_new(strikethrough);
@@ -13832,8 +13832,8 @@ public static final int /*long*/ pango_attr_strikethrough_new(boolean strikethro
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _pango_attr_underline_color_new(short red, short green, short blue);
-public static final int /*long*/ pango_attr_underline_color_new(short red, short green, short blue) {
+public static final native long /*int*/ _pango_attr_underline_color_new(short red, short green, short blue);
+public static final long /*int*/ pango_attr_underline_color_new(short red, short green, short blue) {
lock.lock();
try {
return _pango_attr_underline_color_new(red, green, blue);
@@ -13841,8 +13841,8 @@ public static final int /*long*/ pango_attr_underline_color_new(short red, short
lock.unlock();
}
}
-public static final native int /*long*/ _pango_attr_underline_new(int underline);
-public static final int /*long*/ pango_attr_underline_new(int underline) {
+public static final native long /*int*/ _pango_attr_underline_new(int underline);
+public static final long /*int*/ pango_attr_underline_new(int underline) {
lock.lock();
try {
return _pango_attr_underline_new(underline);
@@ -13850,8 +13850,8 @@ public static final int /*long*/ pango_attr_underline_new(int underline) {
lock.unlock();
}
}
-public static final native int /*long*/ _pango_attr_weight_new(int weight);
-public static final int /*long*/ pango_attr_weight_new(int weight) {
+public static final native long /*int*/ _pango_attr_weight_new(int weight);
+public static final long /*int*/ pango_attr_weight_new(int weight) {
lock.lock();
try {
return _pango_attr_weight_new(weight);
@@ -13860,8 +13860,8 @@ public static final int /*long*/ pango_attr_weight_new(int weight) {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _pango_cairo_font_map_get_default();
-public static final int /*long*/ pango_cairo_font_map_get_default() {
+public static final native long /*int*/ _pango_cairo_font_map_get_default();
+public static final long /*int*/ pango_cairo_font_map_get_default() {
lock.lock();
try {
return _pango_cairo_font_map_get_default();
@@ -13870,8 +13870,8 @@ public static final int /*long*/ pango_cairo_font_map_get_default() {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _pango_cairo_font_map_new();
-public static final int /*long*/ pango_cairo_font_map_new() {
+public static final native long /*int*/ _pango_cairo_font_map_new();
+public static final long /*int*/ pango_cairo_font_map_new() {
lock.lock();
try {
return _pango_cairo_font_map_new();
@@ -13880,8 +13880,8 @@ public static final int /*long*/ pango_cairo_font_map_new() {
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _pango_cairo_font_map_create_context(int /*long*/ fontmap);
-public static final int /*long*/ pango_cairo_font_map_create_context(int /*long*/ fontmap) {
+public static final native long /*int*/ _pango_cairo_font_map_create_context(long /*int*/ fontmap);
+public static final long /*int*/ pango_cairo_font_map_create_context(long /*int*/ fontmap) {
lock.lock();
try {
return _pango_cairo_font_map_create_context(fontmap);
@@ -13890,8 +13890,8 @@ public static final int /*long*/ pango_cairo_font_map_create_context(int /*long*
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _pango_cairo_create_layout(int /*long*/ cairo);
-public static final int /*long*/ pango_cairo_create_layout(int /*long*/ cairo) {
+public static final native long /*int*/ _pango_cairo_create_layout(long /*int*/ cairo);
+public static final long /*int*/ pango_cairo_create_layout(long /*int*/ cairo) {
lock.lock();
try {
return _pango_cairo_create_layout(cairo);
@@ -13903,8 +13903,8 @@ public static final int /*long*/ pango_cairo_create_layout(int /*long*/ cairo) {
* @method flags=dynamic
* @param context cast=(PangoContext *)
*/
-public static final native int /*long*/ _pango_cairo_context_get_font_options(int /*long*/ context);
-public static final int /*long*/ pango_cairo_context_get_font_options(int /*long*/ context) {
+public static final native long /*int*/ _pango_cairo_context_get_font_options(long /*int*/ context);
+public static final long /*int*/ pango_cairo_context_get_font_options(long /*int*/ context) {
lock.lock();
try {
return _pango_cairo_context_get_font_options(context);
@@ -13916,8 +13916,8 @@ public static final int /*long*/ pango_cairo_context_get_font_options(int /*long
* @method flags=dynamic
* @param context cast=(PangoContext *)
*/
-public static final native void _pango_cairo_context_set_font_options(int /*long*/ context, int /*long*/ options);
-public static final void pango_cairo_context_set_font_options(int /*long*/ context, int /*long*/ options) {
+public static final native void _pango_cairo_context_set_font_options(long /*int*/ context, long /*int*/ options);
+public static final void pango_cairo_context_set_font_options(long /*int*/ context, long /*int*/ options) {
lock.lock();
try {
_pango_cairo_context_set_font_options(context, options);
@@ -13926,8 +13926,8 @@ public static final void pango_cairo_context_set_font_options(int /*long*/ conte
}
}
/** @method flags=dynamic */
-public static final native void _pango_cairo_font_map_set_resolution(int /*long*/ fontmap, double dpi);
-public static final void pango_cairo_font_map_set_resolution(int /*long*/ fontmap, double dpi) {
+public static final native void _pango_cairo_font_map_set_resolution(long /*int*/ fontmap, double dpi);
+public static final void pango_cairo_font_map_set_resolution(long /*int*/ fontmap, double dpi) {
lock.lock();
try {
_pango_cairo_font_map_set_resolution(fontmap, dpi);
@@ -13936,8 +13936,8 @@ public static final void pango_cairo_font_map_set_resolution(int /*long*/ fontma
}
}
/** @method flags=dynamic */
-public static final native void _pango_cairo_layout_path(int /*long*/ cairo, int /*long*/ layout);
-public static final void pango_cairo_layout_path(int /*long*/ cairo, int /*long*/ layout) {
+public static final native void _pango_cairo_layout_path(long /*int*/ cairo, long /*int*/ layout);
+public static final void pango_cairo_layout_path(long /*int*/ cairo, long /*int*/ layout) {
lock.lock();
try {
_pango_cairo_layout_path(cairo, layout);
@@ -13946,8 +13946,8 @@ public static final void pango_cairo_layout_path(int /*long*/ cairo, int /*long*
}
}
/** @method flags=dynamic */
-public static final native void _pango_cairo_show_layout(int /*long*/ cairo, int /*long*/ layout);
-public static final void pango_cairo_show_layout(int /*long*/ cairo, int /*long*/ layout) {
+public static final native void _pango_cairo_show_layout(long /*int*/ cairo, long /*int*/ layout);
+public static final void pango_cairo_show_layout(long /*int*/ cairo, long /*int*/ layout) {
lock.lock();
try {
_pango_cairo_show_layout(cairo, layout);
@@ -13956,8 +13956,8 @@ public static final void pango_cairo_show_layout(int /*long*/ cairo, int /*long*
}
}
/** @param context cast=(PangoContext *) */
-public static final native int _pango_context_get_base_dir(int /*long*/ context);
-public static final int pango_context_get_base_dir(int /*long*/ context) {
+public static final native int _pango_context_get_base_dir(long /*int*/ context);
+public static final int pango_context_get_base_dir(long /*int*/ context) {
lock.lock();
try {
return _pango_context_get_base_dir(context);
@@ -13966,8 +13966,8 @@ public static final int pango_context_get_base_dir(int /*long*/ context) {
}
}
/** @param context cast=(PangoContext *) */
-public static final native int /*long*/ _pango_context_get_language(int /*long*/ context);
-public static final int /*long*/ pango_context_get_language(int /*long*/ context) {
+public static final native long /*int*/ _pango_context_get_language(long /*int*/ context);
+public static final long /*int*/ pango_context_get_language(long /*int*/ context) {
lock.lock();
try {
return _pango_context_get_language(context);
@@ -13980,8 +13980,8 @@ public static final int /*long*/ pango_context_get_language(int /*long*/ context
* @param desc cast=(const PangoFontDescription *)
* @param language cast=(PangoLanguage *)
*/
-public static final native int /*long*/ _pango_context_get_metrics(int /*long*/ context, int /*long*/ desc, int /*long*/ language);
-public static final int /*long*/ pango_context_get_metrics(int /*long*/ context, int /*long*/ desc, int /*long*/ language) {
+public static final native long /*int*/ _pango_context_get_metrics(long /*int*/ context, long /*int*/ desc, long /*int*/ language);
+public static final long /*int*/ pango_context_get_metrics(long /*int*/ context, long /*int*/ desc, long /*int*/ language) {
lock.lock();
try {
return _pango_context_get_metrics(context, desc, language);
@@ -13994,8 +13994,8 @@ public static final int /*long*/ pango_context_get_metrics(int /*long*/ context,
* @param families cast=(PangoFontFamily ***)
* @param n_families cast=(int *)
*/
-public static final native void _pango_context_list_families(int /*long*/ context, int /*long*/[] families, int[] n_families);
-public static final void pango_context_list_families(int /*long*/ context, int /*long*/[] families, int[] n_families) {
+public static final native void _pango_context_list_families(long /*int*/ context, long /*int*/[] families, int[] n_families);
+public static final void pango_context_list_families(long /*int*/ context, long /*int*/[] families, int[] n_families) {
lock.lock();
try {
_pango_context_list_families(context, families, n_families);
@@ -14004,8 +14004,8 @@ public static final void pango_context_list_families(int /*long*/ context, int /
}
}
/** @param context cast=(PangoContext *) */
-public static final native void _pango_context_set_base_dir(int /*long*/ context, int direction);
-public static final void pango_context_set_base_dir(int /*long*/ context, int direction) {
+public static final native void _pango_context_set_base_dir(long /*int*/ context, int direction);
+public static final void pango_context_set_base_dir(long /*int*/ context, int direction) {
lock.lock();
try {
_pango_context_set_base_dir(context, direction);
@@ -14017,8 +14017,8 @@ public static final void pango_context_set_base_dir(int /*long*/ context, int di
* @param context cast=(PangoContext *)
* @param language cast=(PangoLanguage *)
*/
-public static final native void _pango_context_set_language(int /*long*/ context, int /*long*/ language);
-public static final void pango_context_set_language(int /*long*/ context, int /*long*/ language) {
+public static final native void _pango_context_set_language(long /*int*/ context, long /*int*/ language);
+public static final void pango_context_set_language(long /*int*/ context, long /*int*/ language) {
lock.lock();
try {
_pango_context_set_language(context, language);
@@ -14027,8 +14027,8 @@ public static final void pango_context_set_language(int /*long*/ context, int /*
}
}
/** @param desc cast=(PangoFontDescription *) */
-public static final native int /*long*/ _pango_font_description_copy(int /*long*/ desc);
-public static final int /*long*/ pango_font_description_copy(int /*long*/ desc) {
+public static final native long /*int*/ _pango_font_description_copy(long /*int*/ desc);
+public static final long /*int*/ pango_font_description_copy(long /*int*/ desc) {
lock.lock();
try {
return _pango_font_description_copy(desc);
@@ -14037,8 +14037,8 @@ public static final int /*long*/ pango_font_description_copy(int /*long*/ desc)
}
}
/** @param desc cast=(PangoFontDescription *) */
-public static final native void _pango_font_description_free(int /*long*/ desc);
-public static final void pango_font_description_free(int /*long*/ desc) {
+public static final native void _pango_font_description_free(long /*int*/ desc);
+public static final void pango_font_description_free(long /*int*/ desc) {
lock.lock();
try {
_pango_font_description_free(desc);
@@ -14047,8 +14047,8 @@ public static final void pango_font_description_free(int /*long*/ desc) {
}
}
/** @param str cast=(const char *),flags=no_out critical */
-public static final native int /*long*/ _pango_font_description_from_string(byte[] str);
-public static final int /*long*/ pango_font_description_from_string(byte[] str) {
+public static final native long /*int*/ _pango_font_description_from_string(byte[] str);
+public static final long /*int*/ pango_font_description_from_string(byte[] str) {
lock.lock();
try {
return _pango_font_description_from_string(str);
@@ -14057,8 +14057,8 @@ public static final int /*long*/ pango_font_description_from_string(byte[] str)
}
}
/** @param desc cast=(PangoFontDescription *) */
-public static final native int /*long*/ _pango_font_description_get_family(int /*long*/ desc);
-public static final int /*long*/ pango_font_description_get_family(int /*long*/ desc) {
+public static final native long /*int*/ _pango_font_description_get_family(long /*int*/ desc);
+public static final long /*int*/ pango_font_description_get_family(long /*int*/ desc) {
lock.lock();
try {
return _pango_font_description_get_family(desc);
@@ -14067,8 +14067,8 @@ public static final int /*long*/ pango_font_description_get_family(int /*long*/
}
}
/** @param desc cast=(PangoFontDescription *) */
-public static final native int _pango_font_description_get_size(int /*long*/ desc);
-public static final int pango_font_description_get_size(int /*long*/ desc) {
+public static final native int _pango_font_description_get_size(long /*int*/ desc);
+public static final int pango_font_description_get_size(long /*int*/ desc) {
lock.lock();
try {
return _pango_font_description_get_size(desc);
@@ -14077,8 +14077,8 @@ public static final int pango_font_description_get_size(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
-public static final native int _pango_font_description_get_stretch(int /*long*/ desc);
-public static final int pango_font_description_get_stretch(int /*long*/ desc) {
+public static final native int _pango_font_description_get_stretch(long /*int*/ desc);
+public static final int pango_font_description_get_stretch(long /*int*/ desc) {
lock.lock();
try {
return _pango_font_description_get_stretch(desc);
@@ -14087,8 +14087,8 @@ public static final int pango_font_description_get_stretch(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
-public static final native int _pango_font_description_get_variant(int /*long*/ desc);
-public static final int pango_font_description_get_variant(int /*long*/ desc) {
+public static final native int _pango_font_description_get_variant(long /*int*/ desc);
+public static final int pango_font_description_get_variant(long /*int*/ desc) {
lock.lock();
try {
return _pango_font_description_get_variant(desc);
@@ -14097,8 +14097,8 @@ public static final int pango_font_description_get_variant(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
-public static final native int _pango_font_description_get_style(int /*long*/ desc);
-public static final int pango_font_description_get_style(int /*long*/ desc) {
+public static final native int _pango_font_description_get_style(long /*int*/ desc);
+public static final int pango_font_description_get_style(long /*int*/ desc) {
lock.lock();
try {
return _pango_font_description_get_style(desc);
@@ -14107,8 +14107,8 @@ public static final int pango_font_description_get_style(int /*long*/ desc) {
}
}
/** @param desc cast=(PangoFontDescription *) */
-public static final native int _pango_font_description_get_weight(int /*long*/ desc);
-public static final int pango_font_description_get_weight(int /*long*/ desc) {
+public static final native int _pango_font_description_get_weight(long /*int*/ desc);
+public static final int pango_font_description_get_weight(long /*int*/ desc) {
lock.lock();
try {
return _pango_font_description_get_weight(desc);
@@ -14116,8 +14116,8 @@ public static final int pango_font_description_get_weight(int /*long*/ desc) {
lock.unlock();
}
}
-public static final native int /*long*/ _pango_font_description_new();
-public static final int /*long*/ pango_font_description_new() {
+public static final native long /*int*/ _pango_font_description_new();
+public static final long /*int*/ pango_font_description_new() {
lock.lock();
try {
return _pango_font_description_new();
@@ -14129,8 +14129,8 @@ public static final int /*long*/ pango_font_description_new() {
* @param desc cast=(PangoFontDescription *)
* @param family cast=(const char *),flags=no_out critical
*/
-public static final native void _pango_font_description_set_family(int /*long*/ desc, byte[] family);
-public static final void pango_font_description_set_family(int /*long*/ desc, byte[] family) {
+public static final native void _pango_font_description_set_family(long /*int*/ desc, byte[] family);
+public static final void pango_font_description_set_family(long /*int*/ desc, byte[] family) {
lock.lock();
try {
_pango_font_description_set_family(desc, family);
@@ -14142,8 +14142,8 @@ public static final void pango_font_description_set_family(int /*long*/ desc, by
* @param desc cast=(PangoFontDescription *)
* @param size cast=(gint)
*/
-public static final native void _pango_font_description_set_size(int /*long*/ desc, int size);
-public static final void pango_font_description_set_size(int /*long*/ desc, int size) {
+public static final native void _pango_font_description_set_size(long /*int*/ desc, int size);
+public static final void pango_font_description_set_size(long /*int*/ desc, int size) {
lock.lock();
try {
_pango_font_description_set_size(desc, size);
@@ -14155,8 +14155,8 @@ public static final void pango_font_description_set_size(int /*long*/ desc, int
* @param desc cast=(PangoFontDescription *)
* @param stretch cast=(PangoStretch)
*/
-public static final native void _pango_font_description_set_stretch(int /*long*/ desc, int stretch);
-public static final void pango_font_description_set_stretch(int /*long*/ desc, int stretch) {
+public static final native void _pango_font_description_set_stretch(long /*int*/ desc, int stretch);
+public static final void pango_font_description_set_stretch(long /*int*/ desc, int stretch) {
lock.lock();
try {
_pango_font_description_set_stretch(desc, stretch);
@@ -14168,8 +14168,8 @@ public static final void pango_font_description_set_stretch(int /*long*/ desc, i
* @param desc cast=(PangoFontDescription *)
* @param weight cast=(PangoStyle)
*/
-public static final native void _pango_font_description_set_style(int /*long*/ desc, int weight);
-public static final void pango_font_description_set_style(int /*long*/ desc, int weight) {
+public static final native void _pango_font_description_set_style(long /*int*/ desc, int weight);
+public static final void pango_font_description_set_style(long /*int*/ desc, int weight) {
lock.lock();
try {
_pango_font_description_set_style(desc, weight);
@@ -14181,8 +14181,8 @@ public static final void pango_font_description_set_style(int /*long*/ desc, int
* @param desc cast=(PangoFontDescription *)
* @param weight cast=(PangoWeight)
*/
-public static final native void _pango_font_description_set_weight(int /*long*/ desc, int weight);
-public static final void pango_font_description_set_weight(int /*long*/ desc, int weight) {
+public static final native void _pango_font_description_set_weight(long /*int*/ desc, int weight);
+public static final void pango_font_description_set_weight(long /*int*/ desc, int weight) {
lock.lock();
try {
_pango_font_description_set_weight(desc, weight);
@@ -14194,8 +14194,8 @@ public static final void pango_font_description_set_weight(int /*long*/ desc, in
* @param desc cast=(PangoFontDescription *)
* @param variant cast=(PangoVariant)
*/
-public static final native void _pango_font_description_set_variant(int /*long*/ desc, int variant);
-public static final void pango_font_description_set_variant(int /*long*/ desc, int variant) {
+public static final native void _pango_font_description_set_variant(long /*int*/ desc, int variant);
+public static final void pango_font_description_set_variant(long /*int*/ desc, int variant) {
lock.lock();
try {
_pango_font_description_set_variant(desc, variant);
@@ -14204,8 +14204,8 @@ public static final void pango_font_description_set_variant(int /*long*/ desc, i
}
}
/** @param desc cast=(PangoFontDescription *) */
-public static final native int /*long*/ _pango_font_description_to_string(int /*long*/ desc);
-public static final int /*long*/ pango_font_description_to_string(int /*long*/ desc) {
+public static final native long /*int*/ _pango_font_description_to_string(long /*int*/ desc);
+public static final long /*int*/ pango_font_description_to_string(long /*int*/ desc) {
lock.lock();
try {
return _pango_font_description_to_string(desc);
@@ -14214,8 +14214,8 @@ public static final int /*long*/ pango_font_description_to_string(int /*long*/ d
}
}
/** @param face cast=(PangoFontFace *) */
-public static final native int /*long*/ _pango_font_face_describe(int /*long*/ face);
-public static final int /*long*/ pango_font_face_describe(int /*long*/ face) {
+public static final native long /*int*/ _pango_font_face_describe(long /*int*/ face);
+public static final long /*int*/ pango_font_face_describe(long /*int*/ face) {
lock.lock();
try {
return _pango_font_face_describe(face);
@@ -14224,8 +14224,8 @@ public static final int /*long*/ pango_font_face_describe(int /*long*/ face) {
}
}
/** @param family cast=(PangoFontFamily *) */
-public static final native int /*long*/ _pango_font_family_get_name(int /*long*/ family);
-public static final int /*long*/ pango_font_family_get_name(int /*long*/ family) {
+public static final native long /*int*/ _pango_font_family_get_name(long /*int*/ family);
+public static final long /*int*/ pango_font_family_get_name(long /*int*/ family) {
lock.lock();
try {
return _pango_font_family_get_name(family);
@@ -14238,8 +14238,8 @@ public static final int /*long*/ pango_font_family_get_name(int /*long*/ family)
* @param faces cast=(PangoFontFace ***)
* @param n_faces cast=(int *)
*/
-public static final native void _pango_font_family_list_faces(int /*long*/ family, int /*long*/[] faces, int[] n_faces);
-public static final void pango_font_family_list_faces(int /*long*/ family, int /*long*/[] faces, int[] n_faces) {
+public static final native void _pango_font_family_list_faces(long /*int*/ family, long /*int*/[] faces, int[] n_faces);
+public static final void pango_font_family_list_faces(long /*int*/ family, long /*int*/[] faces, int[] n_faces) {
lock.lock();
try {
_pango_font_family_list_faces(family, faces, n_faces);
@@ -14251,8 +14251,8 @@ public static final void pango_font_family_list_faces(int /*long*/ family, int /
* @param font cast=(PangoFont *)
* @param language cast=(PangoLanguage *)
*/
-public static final native int /*long*/ _pango_font_get_metrics(int /*long*/ font, int /*long*/ language);
-public static final int /*long*/ pango_font_get_metrics(int /*long*/ font, int /*long*/ language) {
+public static final native long /*int*/ _pango_font_get_metrics(long /*int*/ font, long /*int*/ language);
+public static final long /*int*/ pango_font_get_metrics(long /*int*/ font, long /*int*/ language) {
lock.lock();
try {
return _pango_font_get_metrics(font, language);
@@ -14261,8 +14261,8 @@ public static final int /*long*/ pango_font_get_metrics(int /*long*/ font, int /
}
}
/** @param metrics cast=(PangoFontMetrics *) */
-public static final native int _pango_font_metrics_get_approximate_char_width(int /*long*/ metrics);
-public static final int pango_font_metrics_get_approximate_char_width(int /*long*/ metrics) {
+public static final native int _pango_font_metrics_get_approximate_char_width(long /*int*/ metrics);
+public static final int pango_font_metrics_get_approximate_char_width(long /*int*/ metrics) {
lock.lock();
try {
return _pango_font_metrics_get_approximate_char_width(metrics);
@@ -14271,8 +14271,8 @@ public static final int pango_font_metrics_get_approximate_char_width(int /*long
}
}
/** @param metrics cast=(PangoFontMetrics *) */
-public static final native int _pango_font_metrics_get_ascent(int /*long*/ metrics);
-public static final int pango_font_metrics_get_ascent(int /*long*/ metrics) {
+public static final native int _pango_font_metrics_get_ascent(long /*int*/ metrics);
+public static final int pango_font_metrics_get_ascent(long /*int*/ metrics) {
lock.lock();
try {
return _pango_font_metrics_get_ascent(metrics);
@@ -14281,8 +14281,8 @@ public static final int pango_font_metrics_get_ascent(int /*long*/ metrics) {
}
}
/** @param metrics cast=(PangoFontMetrics *) */
-public static final native int _pango_font_metrics_get_descent(int /*long*/ metrics);
-public static final int pango_font_metrics_get_descent(int /*long*/ metrics) {
+public static final native int _pango_font_metrics_get_descent(long /*int*/ metrics);
+public static final int pango_font_metrics_get_descent(long /*int*/ metrics) {
lock.lock();
try {
return _pango_font_metrics_get_descent(metrics);
@@ -14291,8 +14291,8 @@ public static final int pango_font_metrics_get_descent(int /*long*/ metrics) {
}
}
/** @method flags=dynamic */
-public static final native int _pango_font_metrics_get_underline_thickness(int /*long*/ metrics);
-public static final int pango_font_metrics_get_underline_thickness(int /*long*/ metrics) {
+public static final native int _pango_font_metrics_get_underline_thickness(long /*int*/ metrics);
+public static final int pango_font_metrics_get_underline_thickness(long /*int*/ metrics) {
lock.lock();
try {
return _pango_font_metrics_get_underline_thickness(metrics);
@@ -14301,8 +14301,8 @@ public static final int pango_font_metrics_get_underline_thickness(int /*long*/
}
}
/** @method flags=dynamic */
-public static final native int _pango_font_metrics_get_underline_position(int /*long*/ metrics);
-public static final int pango_font_metrics_get_underline_position(int /*long*/ metrics) {
+public static final native int _pango_font_metrics_get_underline_position(long /*int*/ metrics);
+public static final int pango_font_metrics_get_underline_position(long /*int*/ metrics) {
lock.lock();
try {
return _pango_font_metrics_get_underline_position(metrics);
@@ -14311,8 +14311,8 @@ public static final int pango_font_metrics_get_underline_position(int /*long*/ m
}
}
/** @method flags=dynamic */
-public static final native int _pango_font_metrics_get_strikethrough_thickness(int /*long*/ metrics);
-public static final int pango_font_metrics_get_strikethrough_thickness(int /*long*/ metrics) {
+public static final native int _pango_font_metrics_get_strikethrough_thickness(long /*int*/ metrics);
+public static final int pango_font_metrics_get_strikethrough_thickness(long /*int*/ metrics) {
lock.lock();
try {
return _pango_font_metrics_get_strikethrough_thickness(metrics);
@@ -14321,8 +14321,8 @@ public static final int pango_font_metrics_get_strikethrough_thickness(int /*lon
}
}
/** @method flags=dynamic */
-public static final native int _pango_font_metrics_get_strikethrough_position(int /*long*/ metrics);
-public static final int pango_font_metrics_get_strikethrough_position(int /*long*/ metrics) {
+public static final native int _pango_font_metrics_get_strikethrough_position(long /*int*/ metrics);
+public static final int pango_font_metrics_get_strikethrough_position(long /*int*/ metrics) {
lock.lock();
try {
return _pango_font_metrics_get_strikethrough_position(metrics);
@@ -14331,8 +14331,8 @@ public static final int pango_font_metrics_get_strikethrough_position(int /*long
}
}
/** @param metrics cast=(PangoFontMetrics *) */
-public static final native void _pango_font_metrics_unref(int /*long*/ metrics);
-public static final void pango_font_metrics_unref(int /*long*/ metrics) {
+public static final native void _pango_font_metrics_unref(long /*int*/ metrics);
+public static final void pango_font_metrics_unref(long /*int*/ metrics) {
lock.lock();
try {
_pango_font_metrics_unref(metrics);
@@ -14341,8 +14341,8 @@ public static final void pango_font_metrics_unref(int /*long*/ metrics) {
}
}
/** @param language cast=(const char *),flags=no_out */
-public static final native int /*long*/ _pango_language_from_string(byte[] language);
-public static final int /*long*/ pango_language_from_string(byte[] language) {
+public static final native long /*int*/ _pango_language_from_string(byte[] language);
+public static final long /*int*/ pango_language_from_string(byte[] language) {
lock.lock();
try {
return _pango_language_from_string(language);
@@ -14351,8 +14351,8 @@ public static final int /*long*/ pango_language_from_string(byte[] language) {
}
}
/** @param layout cast=(PangoLayout *) */
-public static final native void _pango_layout_context_changed(int /*long*/ layout);
-public static final void pango_layout_context_changed(int /*long*/ layout) {
+public static final native void _pango_layout_context_changed(long /*int*/ layout);
+public static final void pango_layout_context_changed(long /*int*/ layout) {
lock.lock();
try {
_pango_layout_context_changed(layout);
@@ -14361,8 +14361,8 @@ public static final void pango_layout_context_changed(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
-public static final native int _pango_layout_get_alignment(int /*long*/ layout);
-public static final int pango_layout_get_alignment(int /*long*/ layout) {
+public static final native int _pango_layout_get_alignment(long /*int*/ layout);
+public static final int pango_layout_get_alignment(long /*int*/ layout) {
lock.lock();
try {
return _pango_layout_get_alignment(layout);
@@ -14371,8 +14371,8 @@ public static final int pango_layout_get_alignment(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
-public static final native int /*long*/ _pango_layout_get_context(int /*long*/ layout);
-public static final int /*long*/ pango_layout_get_context(int /*long*/ layout) {
+public static final native long /*int*/ _pango_layout_get_context(long /*int*/ layout);
+public static final long /*int*/ pango_layout_get_context(long /*int*/ layout) {
lock.lock();
try {
return _pango_layout_get_context(layout);
@@ -14381,8 +14381,8 @@ public static final int /*long*/ pango_layout_get_context(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
-public static final native int /*long*/ _pango_layout_get_attributes(int /*long*/ layout);
-public static final int /*long*/ pango_layout_get_attributes(int /*long*/ layout) {
+public static final native long /*int*/ _pango_layout_get_attributes(long /*int*/ layout);
+public static final long /*int*/ pango_layout_get_attributes(long /*int*/ layout) {
lock.lock();
try {
return _pango_layout_get_attributes(layout);
@@ -14391,8 +14391,8 @@ public static final int /*long*/ pango_layout_get_attributes(int /*long*/ layout
}
}
/** @param layout cast=(PangoLayout*) */
-public static final native int _pango_layout_get_indent(int /*long*/ layout);
-public static final int pango_layout_get_indent(int /*long*/ layout) {
+public static final native int _pango_layout_get_indent(long /*int*/ layout);
+public static final int pango_layout_get_indent(long /*int*/ layout) {
lock.lock();
try {
return _pango_layout_get_indent(layout);
@@ -14401,8 +14401,8 @@ public static final int pango_layout_get_indent(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
-public static final native int /*long*/ _pango_layout_get_iter(int /*long*/ layout);
-public static final int /*long*/ pango_layout_get_iter(int /*long*/ layout) {
+public static final native long /*int*/ _pango_layout_get_iter(long /*int*/ layout);
+public static final long /*int*/ pango_layout_get_iter(long /*int*/ layout) {
lock.lock();
try {
return _pango_layout_get_iter(layout);
@@ -14411,8 +14411,8 @@ public static final int /*long*/ pango_layout_get_iter(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
-public static final native boolean _pango_layout_get_justify(int /*long*/ layout);
-public static final boolean pango_layout_get_justify(int /*long*/ layout) {
+public static final native boolean _pango_layout_get_justify(long /*int*/ layout);
+public static final boolean pango_layout_get_justify(long /*int*/ layout) {
lock.lock();
try {
return _pango_layout_get_justify(layout);
@@ -14421,8 +14421,8 @@ public static final boolean pango_layout_get_justify(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
-public static final native int /*long*/ _pango_layout_get_line(int /*long*/ layout, int line);
-public static final int /*long*/ pango_layout_get_line(int /*long*/ layout, int line) {
+public static final native long /*int*/ _pango_layout_get_line(long /*int*/ layout, int line);
+public static final long /*int*/ pango_layout_get_line(long /*int*/ layout, int line) {
lock.lock();
try {
return _pango_layout_get_line(layout, line);
@@ -14431,8 +14431,8 @@ public static final int /*long*/ pango_layout_get_line(int /*long*/ layout, int
}
}
/** @param layout cast=(PangoLayout*) */
-public static final native int _pango_layout_get_line_count(int /*long*/ layout);
-public static final int pango_layout_get_line_count(int /*long*/ layout) {
+public static final native int _pango_layout_get_line_count(long /*int*/ layout);
+public static final int pango_layout_get_line_count(long /*int*/ layout) {
lock.lock();
try {
return _pango_layout_get_line_count(layout);
@@ -14445,8 +14445,8 @@ public static final int pango_layout_get_line_count(int /*long*/ layout) {
* @param attrs cast=(PangoLogAttr **)
* @param n_attrs cast=(int *)
*/
-public static final native void _pango_layout_get_log_attrs(int /*long*/ layout, int /*long*/[] attrs, int[] n_attrs);
-public static final void pango_layout_get_log_attrs(int /*long*/ layout, int /*long*/[] attrs, int[] n_attrs) {
+public static final native void _pango_layout_get_log_attrs(long /*int*/ layout, long /*int*/[] attrs, int[] n_attrs);
+public static final void pango_layout_get_log_attrs(long /*int*/ layout, long /*int*/[] attrs, int[] n_attrs) {
lock.lock();
try {
_pango_layout_get_log_attrs(layout, attrs, n_attrs);
@@ -14459,8 +14459,8 @@ public static final void pango_layout_get_log_attrs(int /*long*/ layout, int /*l
* @param width cast=(int *)
* @param height cast=(int *)
*/
-public static final native void _pango_layout_get_size(int /*long*/ layout, int[] width, int[] height);
-public static final void pango_layout_get_size(int /*long*/ layout, int[] width, int[] height) {
+public static final native void _pango_layout_get_size(long /*int*/ layout, int[] width, int[] height);
+public static final void pango_layout_get_size(long /*int*/ layout, int[] width, int[] height) {
lock.lock();
try {
_pango_layout_get_size(layout, width, height);
@@ -14469,8 +14469,8 @@ public static final void pango_layout_get_size(int /*long*/ layout, int[] width,
}
}
/** @param layout cast=(PangoLayout*) */
-public static final native int _pango_layout_get_spacing(int /*long*/ layout);
-public static final int pango_layout_get_spacing(int /*long*/ layout) {
+public static final native int _pango_layout_get_spacing(long /*int*/ layout);
+public static final int pango_layout_get_spacing(long /*int*/ layout) {
lock.lock();
try {
return _pango_layout_get_spacing(layout);
@@ -14479,8 +14479,8 @@ public static final int pango_layout_get_spacing(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout*) */
-public static final native int /*long*/ _pango_layout_get_tabs(int /*long*/ layout);
-public static final int /*long*/ pango_layout_get_tabs(int /*long*/ layout) {
+public static final native long /*int*/ _pango_layout_get_tabs(long /*int*/ layout);
+public static final long /*int*/ pango_layout_get_tabs(long /*int*/ layout) {
lock.lock();
try {
return _pango_layout_get_tabs(layout);
@@ -14489,8 +14489,8 @@ public static final int /*long*/ pango_layout_get_tabs(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
-public static final native int /*long*/ _pango_layout_get_text(int /*long*/ layout);
-public static final int /*long*/ pango_layout_get_text(int /*long*/ layout) {
+public static final native long /*int*/ _pango_layout_get_text(long /*int*/ layout);
+public static final long /*int*/ pango_layout_get_text(long /*int*/ layout) {
lock.lock();
try {
return _pango_layout_get_text(layout);
@@ -14499,8 +14499,8 @@ public static final int /*long*/ pango_layout_get_text(int /*long*/ layout) {
}
}
/** @param layout cast=(PangoLayout *) */
-public static final native int _pango_layout_get_width(int /*long*/ layout);
-public static final int pango_layout_get_width(int /*long*/ layout) {
+public static final native int _pango_layout_get_width(long /*int*/ layout);
+public static final int pango_layout_get_width(long /*int*/ layout) {
lock.lock();
try {
return _pango_layout_get_width(layout);
@@ -14512,8 +14512,8 @@ public static final int pango_layout_get_width(int /*long*/ layout) {
* @param layout cast=(PangoLayout*)
* @param pos flags=no_in
*/
-public static final native void _pango_layout_index_to_pos(int /*long*/ layout, int index, PangoRectangle pos);
-public static final void pango_layout_index_to_pos(int /*long*/ layout, int index, PangoRectangle pos) {
+public static final native void _pango_layout_index_to_pos(long /*int*/ layout, int index, PangoRectangle pos);
+public static final void pango_layout_index_to_pos(long /*int*/ layout, int index, PangoRectangle pos) {
lock.lock();
try {
_pango_layout_index_to_pos(layout, index, pos);
@@ -14522,8 +14522,8 @@ public static final void pango_layout_index_to_pos(int /*long*/ layout, int inde
}
}
/** @param iter cast=(PangoLayoutIter*) */
-public static final native void _pango_layout_iter_free(int /*long*/ iter);
-public static final void pango_layout_iter_free(int /*long*/ iter) {
+public static final native void _pango_layout_iter_free(long /*int*/ iter);
+public static final void pango_layout_iter_free(long /*int*/ iter) {
lock.lock();
try {
_pango_layout_iter_free(iter);
@@ -14536,8 +14536,8 @@ public static final void pango_layout_iter_free(int /*long*/ iter) {
* @param ink_rect flags=no_in
* @param logical_rect flags=no_in
*/
-public static final native void _pango_layout_iter_get_line_extents(int /*long*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect);
-public static final void pango_layout_iter_get_line_extents(int /*long*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect) {
+public static final native void _pango_layout_iter_get_line_extents(long /*int*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect);
+public static final void pango_layout_iter_get_line_extents(long /*int*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect) {
lock.lock();
try {
_pango_layout_iter_get_line_extents(iter, ink_rect, logical_rect);
@@ -14546,8 +14546,8 @@ public static final void pango_layout_iter_get_line_extents(int /*long*/ iter, P
}
}
/** @param iter cast=(PangoLayoutIter*) */
-public static final native int _pango_layout_iter_get_index(int /*long*/ iter);
-public static final int pango_layout_iter_get_index(int /*long*/ iter) {
+public static final native int _pango_layout_iter_get_index(long /*int*/ iter);
+public static final int pango_layout_iter_get_index(long /*int*/ iter) {
lock.lock();
try {
return _pango_layout_iter_get_index(iter);
@@ -14556,8 +14556,8 @@ public static final int pango_layout_iter_get_index(int /*long*/ iter) {
}
}
/** @param iter cast=(PangoLayoutIter*) */
-public static final native int /*long*/ _pango_layout_iter_get_run(int /*long*/ iter);
-public static final int /*long*/ pango_layout_iter_get_run(int /*long*/ iter) {
+public static final native long /*int*/ _pango_layout_iter_get_run(long /*int*/ iter);
+public static final long /*int*/ pango_layout_iter_get_run(long /*int*/ iter) {
lock.lock();
try {
return _pango_layout_iter_get_run(iter);
@@ -14566,8 +14566,8 @@ public static final int /*long*/ pango_layout_iter_get_run(int /*long*/ iter) {
}
}
/** @param iter cast=(PangoLayoutIter*) */
-public static final native boolean _pango_layout_iter_next_line(int /*long*/ iter);
-public static final boolean pango_layout_iter_next_line(int /*long*/ iter) {
+public static final native boolean _pango_layout_iter_next_line(long /*int*/ iter);
+public static final boolean pango_layout_iter_next_line(long /*int*/ iter) {
lock.lock();
try {
return _pango_layout_iter_next_line(iter);
@@ -14576,8 +14576,8 @@ public static final boolean pango_layout_iter_next_line(int /*long*/ iter) {
}
}
/** @param iter cast=(PangoLayoutIter*) */
-public static final native boolean _pango_layout_iter_next_run(int /*long*/ iter);
-public static final boolean pango_layout_iter_next_run(int /*long*/ iter) {
+public static final native boolean _pango_layout_iter_next_run(long /*int*/ iter);
+public static final boolean pango_layout_iter_next_run(long /*int*/ iter) {
lock.lock();
try {
return _pango_layout_iter_next_run(iter);
@@ -14590,8 +14590,8 @@ public static final boolean pango_layout_iter_next_run(int /*long*/ iter) {
* @param ink_rect cast=(PangoRectangle *),flags=no_in
* @param logical_rect cast=(PangoRectangle *),flags=no_in
*/
-public static final native void _pango_layout_line_get_extents(int /*long*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect);
-public static final void pango_layout_line_get_extents(int /*long*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect) {
+public static final native void _pango_layout_line_get_extents(long /*int*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect);
+public static final void pango_layout_line_get_extents(long /*int*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect) {
lock.lock();
try {
_pango_layout_line_get_extents(line, ink_rect, logical_rect);
@@ -14604,8 +14604,8 @@ public static final void pango_layout_line_get_extents(int /*long*/ line, PangoR
* @param index_ cast=(int *)
* @param trailing cast=(int *)
*/
-public static final native boolean _pango_layout_line_x_to_index(int /*long*/ line, int x_pos, int[] index_, int[] trailing);
-public static final boolean pango_layout_line_x_to_index(int /*long*/ line, int x_pos, int[] index_, int[] trailing) {
+public static final native boolean _pango_layout_line_x_to_index(long /*int*/ line, int x_pos, int[] index_, int[] trailing);
+public static final boolean pango_layout_line_x_to_index(long /*int*/ line, int x_pos, int[] index_, int[] trailing) {
lock.lock();
try {
return _pango_layout_line_x_to_index(line, x_pos, index_, trailing);
@@ -14614,8 +14614,8 @@ public static final boolean pango_layout_line_x_to_index(int /*long*/ line, int
}
}
/** @param context cast=(PangoContext *) */
-public static final native int /*long*/ _pango_layout_new(int /*long*/ context);
-public static final int /*long*/ pango_layout_new(int /*long*/ context) {
+public static final native long /*int*/ _pango_layout_new(long /*int*/ context);
+public static final long /*int*/ pango_layout_new(long /*int*/ context) {
lock.lock();
try {
return _pango_layout_new(context);
@@ -14624,8 +14624,8 @@ public static final int /*long*/ pango_layout_new(int /*long*/ context) {
}
}
/** @param layout cast=(PangoLayout *) */
-public static final native void _pango_layout_set_alignment (int /*long*/ layout, int alignment);
-public static final void pango_layout_set_alignment (int /*long*/ layout, int alignment) {
+public static final native void _pango_layout_set_alignment (long /*int*/ layout, int alignment);
+public static final void pango_layout_set_alignment (long /*int*/ layout, int alignment) {
lock.lock();
try {
_pango_layout_set_alignment(layout, alignment);
@@ -14637,8 +14637,8 @@ public static final void pango_layout_set_alignment (int /*long*/ layout, int al
* @param layout cast=(PangoLayout *)
* @param attrs cast=(PangoAttrList *)
*/
-public static final native void _pango_layout_set_attributes(int /*long*/ layout, int /*long*/ attrs);
-public static final void pango_layout_set_attributes(int /*long*/ layout, int /*long*/ attrs) {
+public static final native void _pango_layout_set_attributes(long /*int*/ layout, long /*int*/ attrs);
+public static final void pango_layout_set_attributes(long /*int*/ layout, long /*int*/ attrs) {
lock.lock();
try {
_pango_layout_set_attributes(layout, attrs);
@@ -14647,8 +14647,8 @@ public static final void pango_layout_set_attributes(int /*long*/ layout, int /*
}
}
/** @method flags=dynamic */
-public static final native void _pango_layout_set_auto_dir(int /*long*/ layout, boolean auto_dir);
-public static final void pango_layout_set_auto_dir(int /*long*/ layout, boolean auto_dir) {
+public static final native void _pango_layout_set_auto_dir(long /*int*/ layout, boolean auto_dir);
+public static final void pango_layout_set_auto_dir(long /*int*/ layout, boolean auto_dir) {
lock.lock();
try {
_pango_layout_set_auto_dir(layout, auto_dir);
@@ -14660,8 +14660,8 @@ public static final void pango_layout_set_auto_dir(int /*long*/ layout, boolean
* @param context cast=(PangoLayout *)
* @param descr cast=(PangoFontDescription *)
*/
-public static final native void _pango_layout_set_font_description(int /*long*/ context, int /*long*/ descr);
-public static final void pango_layout_set_font_description(int /*long*/ context, int /*long*/ descr) {
+public static final native void _pango_layout_set_font_description(long /*int*/ context, long /*int*/ descr);
+public static final void pango_layout_set_font_description(long /*int*/ context, long /*int*/ descr) {
lock.lock();
try {
_pango_layout_set_font_description(context, descr);
@@ -14670,8 +14670,8 @@ public static final void pango_layout_set_font_description(int /*long*/ context,
}
}
/** @param layout cast=(PangoLayout*) */
-public static final native void _pango_layout_set_indent(int /*long*/ layout, int indent);
-public static final void pango_layout_set_indent(int /*long*/ layout, int indent) {
+public static final native void _pango_layout_set_indent(long /*int*/ layout, int indent);
+public static final void pango_layout_set_indent(long /*int*/ layout, int indent) {
lock.lock();
try {
_pango_layout_set_indent(layout, indent);
@@ -14680,8 +14680,8 @@ public static final void pango_layout_set_indent(int /*long*/ layout, int indent
}
}
/** @param layout cast=(PangoLayout*) */
-public static final native void _pango_layout_set_justify(int /*long*/ layout, boolean justify);
-public static final void pango_layout_set_justify(int /*long*/ layout, boolean justify) {
+public static final native void _pango_layout_set_justify(long /*int*/ layout, boolean justify);
+public static final void pango_layout_set_justify(long /*int*/ layout, boolean justify) {
lock.lock();
try {
_pango_layout_set_justify(layout, justify);
@@ -14693,8 +14693,8 @@ public static final void pango_layout_set_justify(int /*long*/ layout, boolean j
* @param context cast=(PangoLayout *)
* @param setting cast=(gboolean)
*/
-public static final native void _pango_layout_set_single_paragraph_mode(int /*long*/ context, boolean setting);
-public static final void pango_layout_set_single_paragraph_mode(int /*long*/ context, boolean setting) {
+public static final native void _pango_layout_set_single_paragraph_mode(long /*int*/ context, boolean setting);
+public static final void pango_layout_set_single_paragraph_mode(long /*int*/ context, boolean setting) {
lock.lock();
try {
_pango_layout_set_single_paragraph_mode(context, setting);
@@ -14703,8 +14703,8 @@ public static final void pango_layout_set_single_paragraph_mode(int /*long*/ con
}
}
/** @param layout cast=(PangoLayout *) */
-public static final native void _pango_layout_set_spacing(int /*long*/ layout, int spacing);
-public static final void pango_layout_set_spacing(int /*long*/ layout, int spacing) {
+public static final native void _pango_layout_set_spacing(long /*int*/ layout, int spacing);
+public static final void pango_layout_set_spacing(long /*int*/ layout, int spacing) {
lock.lock();
try {
_pango_layout_set_spacing(layout, spacing);
@@ -14716,8 +14716,8 @@ public static final void pango_layout_set_spacing(int /*long*/ layout, int spaci
* @param layout cast=(PangoLayout *)
* @param tabs cast=(PangoTabArray *)
*/
-public static final native void _pango_layout_set_tabs(int /*long*/ layout, int /*long*/ tabs);
-public static final void pango_layout_set_tabs(int /*long*/ layout, int /*long*/ tabs) {
+public static final native void _pango_layout_set_tabs(long /*int*/ layout, long /*int*/ tabs);
+public static final void pango_layout_set_tabs(long /*int*/ layout, long /*int*/ tabs) {
lock.lock();
try {
_pango_layout_set_tabs(layout, tabs);
@@ -14730,8 +14730,8 @@ public static final void pango_layout_set_tabs(int /*long*/ layout, int /*long*/
* @param text cast=(const char *),flags=no_out critical
* @param length cast=(int)
*/
-public static final native void _pango_layout_set_text(int /*long*/ layout, byte[] text, int length);
-public static final void pango_layout_set_text(int /*long*/ layout, byte[] text, int length) {
+public static final native void _pango_layout_set_text(long /*int*/ layout, byte[] text, int length);
+public static final void pango_layout_set_text(long /*int*/ layout, byte[] text, int length) {
lock.lock();
try {
_pango_layout_set_text(layout, text, length);
@@ -14740,8 +14740,8 @@ public static final void pango_layout_set_text(int /*long*/ layout, byte[] text,
}
}
/** @param layout cast=(PangoLayout *) */
-public static final native void _pango_layout_set_width(int /*long*/ layout, int width);
-public static final void pango_layout_set_width(int /*long*/ layout, int width) {
+public static final native void _pango_layout_set_width(long /*int*/ layout, int width);
+public static final void pango_layout_set_width(long /*int*/ layout, int width) {
lock.lock();
try {
_pango_layout_set_width(layout, width);
@@ -14750,8 +14750,8 @@ public static final void pango_layout_set_width(int /*long*/ layout, int width)
}
}
/** @param layout cast=(PangoLayout *) */
-public static final native void _pango_layout_set_wrap (int /*long*/ layout, int wrap);
-public static final void pango_layout_set_wrap (int /*long*/ layout, int wrap) {
+public static final native void _pango_layout_set_wrap (long /*int*/ layout, int wrap);
+public static final void pango_layout_set_wrap (long /*int*/ layout, int wrap) {
lock.lock();
try {
_pango_layout_set_wrap(layout, wrap);
@@ -14764,8 +14764,8 @@ public static final void pango_layout_set_wrap (int /*long*/ layout, int wrap) {
* @param index cast=(int *)
* @param trailing cast=(int *)
*/
-public static final native boolean _pango_layout_xy_to_index(int /*long*/ layout, int x, int y, int[] index, int[] trailing);
-public static final boolean pango_layout_xy_to_index(int /*long*/ layout, int x, int y, int[] index, int[] trailing) {
+public static final native boolean _pango_layout_xy_to_index(long /*int*/ layout, int x, int y, int[] index, int[] trailing);
+public static final boolean pango_layout_xy_to_index(long /*int*/ layout, int x, int y, int[] index, int[] trailing) {
lock.lock();
try {
return _pango_layout_xy_to_index(layout, x, y, index, trailing);
@@ -14774,8 +14774,8 @@ public static final boolean pango_layout_xy_to_index(int /*long*/ layout, int x,
}
}
/** @param tab_array cast=(PangoTabArray *) */
-public static final native int _pango_tab_array_get_size(int /*long*/ tab_array);
-public static final int pango_tab_array_get_size(int /*long*/ tab_array) {
+public static final native int _pango_tab_array_get_size(long /*int*/ tab_array);
+public static final int pango_tab_array_get_size(long /*int*/ tab_array) {
lock.lock();
try {
return _pango_tab_array_get_size(tab_array);
@@ -14788,8 +14788,8 @@ public static final int pango_tab_array_get_size(int /*long*/ tab_array) {
* @param alignments cast=(PangoTabAlign **)
* @param locations cast=(int **)
*/
-public static final native void _pango_tab_array_get_tabs(int /*long*/ tab_array, int /*long*/[] alignments, int /*long*/[] locations);
-public static final void pango_tab_array_get_tabs(int /*long*/ tab_array, int /*long*/[] alignments, int /*long*/[] locations) {
+public static final native void _pango_tab_array_get_tabs(long /*int*/ tab_array, long /*int*/[] alignments, long /*int*/[] locations);
+public static final void pango_tab_array_get_tabs(long /*int*/ tab_array, long /*int*/[] alignments, long /*int*/[] locations) {
lock.lock();
try {
_pango_tab_array_get_tabs(tab_array, alignments, locations);
@@ -14798,8 +14798,8 @@ public static final void pango_tab_array_get_tabs(int /*long*/ tab_array, int /*
}
}
/** @param tab_array cast=(PangoTabArray *) */
-public static final native void _pango_tab_array_free(int /*long*/ tab_array);
-public static final void pango_tab_array_free(int /*long*/ tab_array) {
+public static final native void _pango_tab_array_free(long /*int*/ tab_array);
+public static final void pango_tab_array_free(long /*int*/ tab_array) {
lock.lock();
try {
_pango_tab_array_free(tab_array);
@@ -14811,8 +14811,8 @@ public static final void pango_tab_array_free(int /*long*/ tab_array) {
* @param initial_size cast=(gint)
* @param positions_in_pixels cast=(gboolean)
*/
-public static final native int /*long*/ _pango_tab_array_new(int initial_size, boolean positions_in_pixels);
-public static final int /*long*/ pango_tab_array_new(int initial_size, boolean positions_in_pixels) {
+public static final native long /*int*/ _pango_tab_array_new(int initial_size, boolean positions_in_pixels);
+public static final long /*int*/ pango_tab_array_new(int initial_size, boolean positions_in_pixels) {
lock.lock();
try {
return _pango_tab_array_new(initial_size, positions_in_pixels);
@@ -14826,8 +14826,8 @@ public static final int /*long*/ pango_tab_array_new(int initial_size, boolean p
* @param alignment cast=(PangoTabAlign)
* @param location cast=(gint)
*/
-public static final native void _pango_tab_array_set_tab(int /*long*/ tab_array, int tab_index, int /*long*/ alignment, int location);
-public static final void pango_tab_array_set_tab(int /*long*/ tab_array, int tab_index, int /*long*/ alignment, int location) {
+public static final native void _pango_tab_array_set_tab(long /*int*/ tab_array, int tab_index, long /*int*/ alignment, int location);
+public static final void pango_tab_array_set_tab(long /*int*/ tab_array, int tab_index, long /*int*/ alignment, int location) {
lock.lock();
try {
_pango_tab_array_set_tab(tab_array, tab_index, alignment, location);
@@ -14838,8 +14838,8 @@ public static final void pango_tab_array_set_tab(int /*long*/ tab_array, int tab
/**
* @method flags=dynamic
*/
-public static final native int /*long*/_ubuntu_menu_proxy_get();
-public static final int /*long*/ ubuntu_menu_proxy_get() {
+public static final native long /*int*/_ubuntu_menu_proxy_get();
+public static final long /*int*/ ubuntu_menu_proxy_get() {
lock.lock();
try {
return _ubuntu_menu_proxy_get();
@@ -14853,8 +14853,8 @@ public static final int /*long*/ ubuntu_menu_proxy_get() {
* @param relationship cast=(AtkRelationType)
* @param target cast=(AtkObject *)
*/
-public static final native boolean _atk_object_add_relationship (int /*long*/ object, int relationship, int /*long*/ target);
-public static final boolean atk_object_add_relationship (int /*long*/ object, int relationship, int /*long*/ target) {
+public static final native boolean _atk_object_add_relationship (long /*int*/ object, int relationship, long /*int*/ target);
+public static final boolean atk_object_add_relationship (long /*int*/ object, int relationship, long /*int*/ target) {
lock.lock();
try {
return _atk_object_add_relationship(object, relationship, target);
@@ -14868,8 +14868,8 @@ public static final boolean atk_object_add_relationship (int /*long*/ object, in
* @param relationship cast=(AtkRelationType)
* @param target cast=(AtkObject *)
*/
-public static final native boolean _atk_object_remove_relationship (int /*long*/ object, int relationship, int /*long*/ target);
-public static final boolean atk_object_remove_relationship (int /*long*/ object, int relationship, int /*long*/ target) {
+public static final native boolean _atk_object_remove_relationship (long /*int*/ object, int relationship, long /*int*/ target);
+public static final boolean atk_object_remove_relationship (long /*int*/ object, int relationship, long /*int*/ target) {
lock.lock();
try {
return _atk_object_remove_relationship(object, relationship, target);
@@ -14893,5 +14893,5 @@ public static final int access (byte [] path, int amode) {
* @param s1 cast=(const char*)
* @param s2 cast=(const char*)
*/
-public static final native int strcmp (int /*long*/ s1, byte [] s2);
+public static final native int strcmp (long /*int*/ s1, byte [] s2);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoAttribute.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoAttribute.java
index f218643d8e..e7ffd49ae3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoAttribute.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoAttribute.java
@@ -17,7 +17,7 @@ package org.eclipse.swt.internal.gtk;
public class PangoAttribute {
/** @field cast=(const PangoAttrClass *) */
- public int /*long*/ klass;
+ public long /*int*/ klass;
public int start_index;
public int end_index;
public static final int sizeof = OS.PangoAttribute_sizeof();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoItem.java
index c0f5b01721..2cee5a8593 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoItem.java
@@ -19,16 +19,16 @@ public class PangoItem {
public int length;
public int num_chars;
/** @field accessor=analysis.shape_engine,cast=(PangoEngineShape *) */
- public int /*long*/ analysis_shape_engine;
+ public long /*int*/ analysis_shape_engine;
/** @field accessor=analysis.lang_engine,cast=(PangoEngineLang *) */
- public int /*long*/ analysis_lang_engine;
+ public long /*int*/ analysis_lang_engine;
/** @field accessor=analysis.font,cast=(PangoFont *) */
- public int /*long*/ analysis_font;
+ public long /*int*/ analysis_font;
/** @field accessor=analysis.level */
public byte analysis_level;
/** @field accessor=analysis.language,cast=(PangoLanguage *) */
- public int /*long*/ analysis_language;
+ public long /*int*/ analysis_language;
/** @field accessor=analysis.extra_attrs,cast=(GSList *) */
- public int /*long*/ analysis_extra_attrs;
+ public long /*int*/ analysis_extra_attrs;
public static final int sizeof = OS.PangoItem_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutLine.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutLine.java
index d1517c64bf..b50c9c155d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutLine.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutLine.java
@@ -16,11 +16,11 @@ package org.eclipse.swt.internal.gtk;
public class PangoLayoutLine {
/** @field cast=(PangoLayout *) */
- public int /*long*/ layout;
+ public long /*int*/ layout;
public int start_index;
public int length;
/** @field cast=(GSList *) */
- public int /*long*/ runs;
+ public long /*int*/ runs;
// public boolean is_paragraph_start;
// public byte resolved_dir;
public static final int sizeof = OS.PangoLayoutLine_sizeof();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutRun.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutRun.java
index b032b6a248..121bb50070 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutRun.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutRun.java
@@ -16,8 +16,8 @@ package org.eclipse.swt.internal.gtk;
public class PangoLayoutRun {
/** @field cast=(PangoItem *) */
- public int /*long*/ item;
+ public long /*int*/ item;
/** @field cast=(PangoGlyphString *) */
- public int /*long*/ glyphs;
+ public long /*int*/ glyphs;
public static final int sizeof = OS.PangoLayoutRun_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XAnyEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XAnyEvent.java
index 9fc6482fa2..f13f48695a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XAnyEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XAnyEvent.java
@@ -12,11 +12,11 @@ package org.eclipse.swt.internal.gtk;
public abstract class XAnyEvent extends XEvent {
- public int /*long*/ serial;
+ public long /*int*/ serial;
public int send_event;
/** @field cast=(Display *) */
- public int /*long*/ display;
+ public long /*int*/ display;
/** @field cast=(Window) */
- public int /*long*/ window;
+ public long /*int*/ window;
public static final int sizeof = OS.XAnyEvent_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XClientMessageEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XClientMessageEvent.java
index b1428fd1ae..8983ab42fd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XClientMessageEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XClientMessageEvent.java
@@ -13,16 +13,16 @@ package org.eclipse.swt.internal.gtk;
public class XClientMessageEvent {
public int type;
- public int /*long*/ serial;
+ public long /*int*/ serial;
public boolean send_event;
/** @field cast=(Display *) */
- public int /*long*/ display;
+ public long /*int*/ display;
/** @field cast=(Window) */
- public int /*long*/ window;
+ public long /*int*/ window;
/** @field cast=(Atom) */
- public int /*long*/ message_type;
+ public long /*int*/ message_type;
public int format;
/** @field accessor=data.l,cast=(long *) */
- public int /*long*/[] data = new int /*long*/[5];
+ public long /*int*/[] data = new long /*int*/[5];
public static final int sizeof = OS.XClientMessageEvent_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XCrossingEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XCrossingEvent.java
index b8631b9293..1aded656ad 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XCrossingEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XCrossingEvent.java
@@ -13,9 +13,9 @@ package org.eclipse.swt.internal.gtk;
public class XCrossingEvent extends XAnyEvent {
/** @field cast=(Window) */
- public int /*long*/ root;
+ public long /*int*/ root;
/** @field cast=(Window) */
- public int /*long*/ subwindow;
+ public long /*int*/ subwindow;
/** @field cast=(Time) */
public int time;
public int x;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java
index 95096336bb..62775653ed 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java
@@ -13,17 +13,17 @@ package org.eclipse.swt.internal.gtk;
public class XRenderPictureAttributes {
public boolean repeat;
- public int /*long*/ alpha_map;
+ public long /*int*/ alpha_map;
public int alpha_x_origin;
public int alpha_y_origin;
public int clip_x_origin;
public int clip_y_origin;
- public int /*long*/ clip_mask;
+ public long /*int*/ clip_mask;
public boolean graphics_exposures;
public int subwindow_mode;
public int poly_edge;
public int poly_mode;
- public int /*long*/ dither;
+ public long /*int*/ dither;
public boolean component_alpha;
public static final int sizeof = OS.XRenderPictureAttributes_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XWindowChanges.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XWindowChanges.java
index b748c3494f..df24fb9372 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XWindowChanges.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/XWindowChanges.java
@@ -17,7 +17,7 @@ public class XWindowChanges {
public int width;
public int height;
public int border_width;
- public int /*long*/ sibling;
+ public long /*int*/ sibling;
public int stack_mode;
public static final int sizeof = OS.XWindowChanges_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java
index 8939bbc74a..008dadfbd0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java
@@ -656,8 +656,8 @@ public static final int PictOpOver = 3;
public static final native int XRenderPictureAttributes_sizeof();
/** @method flags=dynamic */
-public static final native boolean _XRenderQueryExtension(int /*long*/ display, int[] event_basep, int[] error_basep);
-public static final boolean XRenderQueryExtension(int /*long*/ display, int[] event_basep, int[] error_basep) {
+public static final native boolean _XRenderQueryExtension(long /*int*/ display, int[] event_basep, int[] error_basep);
+public static final boolean XRenderQueryExtension(long /*int*/ display, int[] event_basep, int[] error_basep) {
lock.lock();
try {
return _XRenderQueryExtension(display, event_basep, error_basep);
@@ -666,8 +666,8 @@ public static final boolean XRenderQueryExtension(int /*long*/ display, int[] ev
}
}
/** @method flags=dynamic */
-public static final native int _XRenderQueryVersion(int /*long*/ display, int[] major_versionp, int[] minor_versionp);
-public static final int XRenderQueryVersion(int /*long*/ display, int[] major_versionp, int[] minor_versionp) {
+public static final native int _XRenderQueryVersion(long /*int*/ display, int[] major_versionp, int[] minor_versionp);
+public static final int XRenderQueryVersion(long /*int*/ display, int[] major_versionp, int[] minor_versionp) {
lock.lock();
try {
return _XRenderQueryVersion(display, major_versionp, minor_versionp);
@@ -676,8 +676,8 @@ public static final int XRenderQueryVersion(int /*long*/ display, int[] major_ve
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _XRenderCreatePicture(int /*long*/ display, int /*long*/ drawable, int /*long*/ format, int /*long*/ valuemask, XRenderPictureAttributes attributes);
-public static final int /*long*/ XRenderCreatePicture(int /*long*/ display, int /*long*/ drawable, int /*long*/ format, int /*long*/ valuemask, XRenderPictureAttributes attributes) {
+public static final native long /*int*/ _XRenderCreatePicture(long /*int*/ display, long /*int*/ drawable, long /*int*/ format, long /*int*/ valuemask, XRenderPictureAttributes attributes);
+public static final long /*int*/ XRenderCreatePicture(long /*int*/ display, long /*int*/ drawable, long /*int*/ format, long /*int*/ valuemask, XRenderPictureAttributes attributes) {
lock.lock();
try {
return _XRenderCreatePicture(display, drawable, format, valuemask, attributes);
@@ -686,8 +686,8 @@ public static final int /*long*/ XRenderCreatePicture(int /*long*/ display, int
}
}
/** @method flags=dynamic */
-public static final native void _XRenderSetPictureClipRegion(int /*long*/ display, int /*long*/ picture, int /*long*/ region);
-public static final void XRenderSetPictureClipRegion(int /*long*/ display, int /*long*/ picture, int /*long*/ region) {
+public static final native void _XRenderSetPictureClipRegion(long /*int*/ display, long /*int*/ picture, long /*int*/ region);
+public static final void XRenderSetPictureClipRegion(long /*int*/ display, long /*int*/ picture, long /*int*/ region) {
lock.lock();
try {
_XRenderSetPictureClipRegion(display, picture, region);
@@ -697,8 +697,8 @@ public static final void XRenderSetPictureClipRegion(int /*long*/ display, int /
}
/** @method flags=dynamic */
-public static final native void _XRenderSetPictureClipRectangles(int /*long*/ display, int /*long*/ picture, int xOrigin, int yOrigin, short[] rects, int count);
-public static final void XRenderSetPictureClipRectangles(int /*long*/ display, int /*long*/ picture, int xOrigin, int yOrigin, short[] rects, int count) {
+public static final native void _XRenderSetPictureClipRectangles(long /*int*/ display, long /*int*/ picture, int xOrigin, int yOrigin, short[] rects, int count);
+public static final void XRenderSetPictureClipRectangles(long /*int*/ display, long /*int*/ picture, int xOrigin, int yOrigin, short[] rects, int count) {
lock.lock();
try {
_XRenderSetPictureClipRectangles(display, picture, xOrigin, yOrigin, rects, count);
@@ -707,8 +707,8 @@ public static final void XRenderSetPictureClipRectangles(int /*long*/ display, i
}
}
/** @method flags=dynamic */
-public static final native void _XRenderSetPictureTransform(int /*long*/ display, int /*long*/ picture, int[] transform);
-public static final void XRenderSetPictureTransform(int /*long*/ display, int /*long*/ picture, int[] transform) {
+public static final native void _XRenderSetPictureTransform(long /*int*/ display, long /*int*/ picture, int[] transform);
+public static final void XRenderSetPictureTransform(long /*int*/ display, long /*int*/ picture, int[] transform) {
lock.lock();
try {
_XRenderSetPictureTransform(display, picture, transform);
@@ -717,8 +717,8 @@ public static final void XRenderSetPictureTransform(int /*long*/ display, int /*
}
}
/** @method flags=dynamic */
-public static final native void _XRenderFreePicture(int /*long*/ display, int /*long*/ picture);
-public static final void XRenderFreePicture(int /*long*/ display, int /*long*/ picture) {
+public static final native void _XRenderFreePicture(long /*int*/ display, long /*int*/ picture);
+public static final void XRenderFreePicture(long /*int*/ display, long /*int*/ picture) {
lock.lock();
try {
_XRenderFreePicture(display, picture);
@@ -727,8 +727,8 @@ public static final void XRenderFreePicture(int /*long*/ display, int /*long*/ p
}
}
/** @method flags=dynamic */
-public static final native void _XRenderComposite(int /*long*/ display, int op, int /*long*/ src, int /*long*/ mask, int /*long*/ dst, int src_x, int src_y, int mask_x, int mask_y, int dst_x, int dst_y, int width, int height);
-public static final void XRenderComposite(int /*long*/ display, int op, int /*long*/ src, int /*long*/ mask, int /*long*/ dst, int src_x, int src_y, int mask_x, int mask_y, int dst_x, int dst_y, int width, int height) {
+public static final native void _XRenderComposite(long /*int*/ display, int op, long /*int*/ src, long /*int*/ mask, long /*int*/ dst, int src_x, int src_y, int mask_x, int mask_y, int dst_x, int dst_y, int width, int height);
+public static final void XRenderComposite(long /*int*/ display, int op, long /*int*/ src, long /*int*/ mask, long /*int*/ dst, int src_x, int src_y, int mask_x, int mask_y, int dst_x, int dst_y, int width, int height) {
lock.lock();
try {
_XRenderComposite(display, op, src, mask, dst, src_x, src_y, mask_x, mask_y, dst_x, dst_y, width, height);
@@ -737,8 +737,8 @@ public static final void XRenderComposite(int /*long*/ display, int op, int /*lo
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _XRenderFindStandardFormat(int /*long*/ display, int format);
-public static final int /*long*/ XRenderFindStandardFormat(int /*long*/ display, int format) {
+public static final native long /*int*/ _XRenderFindStandardFormat(long /*int*/ display, int format);
+public static final long /*int*/ XRenderFindStandardFormat(long /*int*/ display, int format) {
lock.lock();
try {
return _XRenderFindStandardFormat(display, format);
@@ -747,8 +747,8 @@ public static final int /*long*/ XRenderFindStandardFormat(int /*long*/ display,
}
}
/** @method flags=dynamic */
-public static final native int /*long*/ _XRenderFindVisualFormat(int /*long*/ display, int /*long*/ visual);
-public static final int /*long*/ XRenderFindVisualFormat(int /*long*/ display, int /*long*/ visual) {
+public static final native long /*int*/ _XRenderFindVisualFormat(long /*int*/ display, long /*int*/ visual);
+public static final long /*int*/ XRenderFindVisualFormat(long /*int*/ display, long /*int*/ visual) {
lock.lock();
try {
return _XRenderFindVisualFormat(display, visual);
@@ -758,8 +758,8 @@ public static final int /*long*/ XRenderFindVisualFormat(int /*long*/ display, i
}
/** @param handle cast=(void *) */
-public static final native int _dlclose(int /*long*/ handle);
-public static final int dlclose(int /*long*/ handle) {
+public static final native int _dlclose(long /*int*/ handle);
+public static final int dlclose(long /*int*/ handle) {
lock.lock();
try {
return _dlclose(handle);
@@ -768,8 +768,8 @@ public static final int dlclose(int /*long*/ handle) {
}
}
/** @param filename cast=(const char *) */
-public static final native int /*long*/ _dlopen(byte[] filename, int flag);
-public static final int /*long*/ dlopen(byte[] filename, int flag) {
+public static final native long /*int*/ _dlopen(byte[] filename, int flag);
+public static final long /*int*/ dlopen(byte[] filename, int flag) {
lock.lock();
try {
return _dlopen(filename, flag);
@@ -781,8 +781,8 @@ public static final int /*long*/ dlopen(byte[] filename, int flag) {
* @param handle cast=(void *)
* @param symbol cast=(const char *)
*/
-public static final native int /*long*/ _dlsym(int /*long*/ handle, byte[] symbol);
-public static final int /*long*/ dlsym(int /*long*/ handle, byte[] symbol) {
+public static final native long /*int*/ _dlsym(long /*int*/ handle, byte[] symbol);
+public static final long /*int*/ dlsym(long /*int*/ handle, byte[] symbol) {
lock.lock();
try {
return _dlsym(handle, symbol);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XRenderPictureAttributes.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XRenderPictureAttributes.java
index 2faec4b366..025e8d06fe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XRenderPictureAttributes.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XRenderPictureAttributes.java
@@ -13,17 +13,17 @@ package org.eclipse.swt.internal.motif;
public class XRenderPictureAttributes {
public boolean repeat;
- public int /*long*/ alpha_map;
+ public long /*int*/ alpha_map;
public int alpha_x_origin;
public int alpha_y_origin;
public int clip_x_origin;
public int clip_y_origin;
- public int /*long*/ clip_mask;
+ public long /*int*/ clip_mask;
public boolean graphics_exposures;
public int subwindow_mode;
public int poly_edge;
public int poly_mode;
- public int /*long*/ dither;
+ public long /*int*/ dither;
public boolean component_alpha;
public static final int sizeof = OS.XRenderPictureAttributes_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/BitmapData.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/BitmapData.java
index 81ac5eddb6..725cffc81c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/BitmapData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/BitmapData.java
@@ -17,7 +17,7 @@ public class BitmapData {
/** @field cast=(PixelFormat) */
public int PixelFormat;
/** @field cast=(void*) */
- public int /*long*/ Scan0;
+ public long /*int*/ Scan0;
/** @field cast=(UINT_PTR) */
- public int /*long*/ Reserved;
+ public long /*int*/ Reserved;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java
index 1fc79391ce..65edcb603d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/Gdip.java
@@ -148,50 +148,50 @@ public static final native int GdiplusStartupInput_sizeof();
* @param input cast=(const GdiplusStartupInput *)
* @param output cast=(GdiplusStartupOutput *)
*/
-public static final native int GdiplusStartup(int /*long*/[] token, GdiplusStartupInput input, int /*long*/ output);
+public static final native int GdiplusStartup(long /*int*/[] token, GdiplusStartupInput input, long /*int*/ output);
/** @param token cast=(ULONG_PTR) */
-public static final native void GdiplusShutdown(int /*long*/ token);
+public static final native void GdiplusShutdown(long /*int*/ token);
/**
* @method flags=new
* @param hbm cast=(HBITMAP)
* @param hpal cast=(HPALETTE)
*/
-public static final native int /*long*/ Bitmap_new(int /*long*/ hbm, int /*long*/ hpal);
+public static final native long /*int*/ Bitmap_new(long /*int*/ hbm, long /*int*/ hpal);
/**
* @method flags=new
* @param hicon cast=(HICON)
*/
-public static final native int /*long*/ Bitmap_new(int /*long*/ hicon);
+public static final native long /*int*/ Bitmap_new(long /*int*/ hicon);
/**
* @method flags=new
* @param format cast=(PixelFormat)
* @param scan0 cast=(BYTE *)
*/
-public static final native int /*long*/ Bitmap_new(int width, int height, int stride, int format, int /*long*/ scan0);
+public static final native long /*int*/ Bitmap_new(int width, int height, int stride, int format, long /*int*/ scan0);
/**
* @method flags=new
* @param filename cast=(WCHAR*)
*/
-public static final native int /*long*/ Bitmap_new(char[] filename, boolean useIcm);
+public static final native long /*int*/ Bitmap_new(char[] filename, boolean useIcm);
/** @method flags=delete */
-public static final native void Bitmap_delete(int /*long*/ bitmap);
+public static final native void Bitmap_delete(long /*int*/ bitmap);
/**
* @method flags=cpp
* @param bitmap cast=(Bitmap*)
* @param colorBackground cast=(Color*),flags=struct
* @param hbmReturn cast=(HBITMAP*)
*/
-public static final native int Bitmap_GetHBITMAP(int /*long*/ bitmap, int /*long*/ colorBackground, int /*long*/[] hbmReturn);
+public static final native int Bitmap_GetHBITMAP(long /*int*/ bitmap, long /*int*/ colorBackground, long /*int*/[] hbmReturn);
/**
* @method flags=cpp
* @param bitmap cast=(Bitmap*)
* @param hicon cast=(HICON*)
*/
-public static final native int Bitmap_GetHICON(int /*long*/ bitmap, int /*long*/[] hicon);
+public static final native int Bitmap_GetHICON(long /*int*/ bitmap, long /*int*/[] hicon);
/** @method flags=new */
-public static final native int /*long*/ BitmapData_new();
+public static final native long /*int*/ BitmapData_new();
/** @method flags=delete */
-public static final native void BitmapData_delete(int /*long*/ bitmapData);
+public static final native void BitmapData_delete(long /*int*/ bitmapData);
/**
* @method flags=cpp
* @param bitmap cast=(Bitmap*)
@@ -199,46 +199,46 @@ public static final native void BitmapData_delete(int /*long*/ bitmapData);
* @param pixelFormat cast=(PixelFormat)
* @param lockedBitmapData cast=(BitmapData*)
*/
-public static final native int Bitmap_LockBits(int /*long*/ bitmap, int /*long*/ rect, int flags, int pixelFormat, int /*long*/ lockedBitmapData);
+public static final native int Bitmap_LockBits(long /*int*/ bitmap, long /*int*/ rect, int flags, int pixelFormat, long /*int*/ lockedBitmapData);
/**
* @method flags=cpp
* @param bitmap cast=(Bitmap*)
* @param lockedBitmapData cast=(BitmapData*)
*/
-public static final native int Bitmap_UnlockBits(int /*long*/ bitmap, int /*long*/ lockedBitmapData);
+public static final native int Bitmap_UnlockBits(long /*int*/ bitmap, long /*int*/ lockedBitmapData);
/**
* @method flags=cpp
* @param brush cast=(Brush *)
*/
-public static final native int /*long*/ Brush_Clone(int /*long*/ brush);
+public static final native long /*int*/ Brush_Clone(long /*int*/ brush);
/**
* @method flags=cpp
* @param brush cast=(Brush *)
*/
-public static final native int Brush_GetType(int /*long*/ brush);
+public static final native int Brush_GetType(long /*int*/ brush);
/**
* @method flags=new
* @param argb cast=(ARGB)
*/
-public static final native int /*long*/ Color_new(int argb);
+public static final native long /*int*/ Color_new(int argb);
/** @method flags=delete */
-public static final native void Color_delete(int /*long*/ color);
+public static final native void Color_delete(long /*int*/ color);
/** @method flags=new */
-public static final native int /*long*/ PrivateFontCollection_new();
+public static final native long /*int*/ PrivateFontCollection_new();
/** @method flags=delete */
-public static final native void PrivateFontCollection_delete(int /*long*/ collection);
+public static final native void PrivateFontCollection_delete(long /*int*/ collection);
/**
* @method flags=cpp
* @param collection cast=(PrivateFontCollection *)
* @param filename cast=(const WCHAR *)
*/
-public static final native int PrivateFontCollection_AddFontFile(int /*long*/ collection, char[] filename);
+public static final native int PrivateFontCollection_AddFontFile(long /*int*/ collection, char[] filename);
/**
* @method flags=new
* @param hdc cast=(HDC)
* @param hfont cast=(HFONT)
*/
-public static final native int /*long*/ Font_new(int /*long*/ hdc, int /*long*/ hfont);
+public static final native long /*int*/ Font_new(long /*int*/ hdc, long /*int*/ hfont);
/**
* @method flags=new
* @param family cast=(const FontFamily *)
@@ -246,7 +246,7 @@ public static final native int /*long*/ Font_new(int /*long*/ hdc, int /*long*/
* @param style cast=(INT)
* @param unit cast=(Unit)
*/
-public static final native int /*long*/ Font_new(int /*long*/ family, float emSize, int style, int unit);
+public static final native long /*int*/ Font_new(long /*int*/ family, float emSize, int style, int unit);
/**
* @method flags=new
* @param familyName cast=(const WCHAR *)
@@ -255,72 +255,72 @@ public static final native int /*long*/ Font_new(int /*long*/ family, float emSi
* @param unit cast=(Unit)
* @param fontCollection cast=(const FontCollection *)
*/
-public static final native int /*long*/ Font_new(char[] familyName, float emSize, int style, int unit, int /*long*/ fontCollection);
+public static final native long /*int*/ Font_new(char[] familyName, float emSize, int style, int unit, long /*int*/ fontCollection);
/** @method flags=delete */
-public static final native void Font_delete(int /*long*/ font);
+public static final native void Font_delete(long /*int*/ font);
/**
* @method flags=cpp
* @param font cast=(Font *)
* @param family cast=(FontFamily *)
*/
-public static final native int Font_GetFamily(int /*long*/ font, int /*long*/ family);
+public static final native int Font_GetFamily(long /*int*/ font, long /*int*/ family);
/**
* @method flags=cpp
* @param font cast=(Font *)
*/
-public static final native float Font_GetSize(int /*long*/ font);
+public static final native float Font_GetSize(long /*int*/ font);
/**
* @method flags=cpp
* @param font cast=(Font *)
*/
-public static final native int Font_GetStyle(int /*long*/ font);
+public static final native int Font_GetStyle(long /*int*/ font);
/**
* @method flags=cpp
* @param font cast=(Font *)
* @param g cast=(const Graphics *)
* @param logfontW cast=(LOGFONTW *)
*/
-public static final native int Font_GetLogFontW (int /*long*/ font, int /*long*/ g, int /*long*/ logfontW);
+public static final native int Font_GetLogFontW (long /*int*/ font, long /*int*/ g, long /*int*/ logfontW);
/**
* @method flags=cpp
* @param font cast=(Font *)
*/
-public static final native boolean Font_IsAvailable(int /*long*/ font);
+public static final native boolean Font_IsAvailable(long /*int*/ font);
/** @method flags=new */
-public static final native int /*long*/ FontFamily_new();
+public static final native long /*int*/ FontFamily_new();
/**
* @method flags=new
* @param name cast=(const WCHAR *)
* @param fontCollection cast=(const FontCollection *)
*/
-public static final native int /*long*/ FontFamily_new(char[] name, int /*long*/ fontCollection);
+public static final native long /*int*/ FontFamily_new(char[] name, long /*int*/ fontCollection);
/** @method flags=delete */
-public static final native void FontFamily_delete(int /*long*/ family);
+public static final native void FontFamily_delete(long /*int*/ family);
/**
* @method flags=cpp
* @param family cast=(FontFamily *)
* @param name cast=(WCHAR *)
* @param language cast=(WCHAR)
*/
-public static final native int FontFamily_GetFamilyName(int /*long*/ family, char[] name, char language);
+public static final native int FontFamily_GetFamilyName(long /*int*/ family, char[] name, char language);
/**
* @method flags=cpp
* @param family cast=(FontFamily *)
*/
-public static final native boolean FontFamily_IsAvailable(int /*long*/ family);
+public static final native boolean FontFamily_IsAvailable(long /*int*/ family);
/**
* @method flags=new
* @param hdc cast=(HDC)
*/
-public static final native int /*long*/ Graphics_new(int /*long*/ hdc);
+public static final native long /*int*/ Graphics_new(long /*int*/ hdc);
/** @method flags=delete */
-public static final native void Graphics_delete(int /*long*/ graphics);
+public static final native void Graphics_delete(long /*int*/ graphics);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param pen cast=(Pen *)
*/
-public static final native int Graphics_DrawArc(int /*long*/ graphics, int /*long*/ pen, int x, int y, int width, int height, float startAngle, float sweepAngle);
+public static final native int Graphics_DrawArc(long /*int*/ graphics, long /*int*/ pen, int x, int y, int width, int height, float startAngle, float sweepAngle);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
@@ -330,7 +330,7 @@ public static final native int Graphics_DrawArc(int /*long*/ graphics, int /*lon
* @param positions cast=(const PointF *)
* @param matrix cast=(const Matrix *)
*/
-public static final native int Graphics_DrawDriverString(int /*long*/ graphics, int /*long*/ text, int length, int /*long*/ font, int /*long*/ brush, PointF /*long*/ positions, int flags, int /*long*/ matrix);
+public static final native int Graphics_DrawDriverString(long /*int*/ graphics, long /*int*/ text, int length, long /*int*/ font, long /*int*/ brush, PointF /*long*/ positions, int flags, long /*int*/ matrix);
/**
* @method flags=no_gen cpp
* @param graphics cast=(Graphics *)
@@ -340,13 +340,13 @@ public static final native int Graphics_DrawDriverString(int /*long*/ graphics,
* @param positions cast=(const PointF *)
* @param matrix cast=(const Matrix *)
*/
-public static final native int Graphics_DrawDriverString(int /*long*/ graphics, int /*long*/ text, int length, int /*long*/ font, int /*long*/ brush, float[] positions, int flags, int /*long*/ matrix);
+public static final native int Graphics_DrawDriverString(long /*int*/ graphics, long /*int*/ text, int length, long /*int*/ font, long /*int*/ brush, float[] positions, int flags, long /*int*/ matrix);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param pen cast=(Pen *)
*/
-public static final native int Graphics_DrawEllipse(int /*long*/ graphics, int /*long*/ pen, int x, int y, int width, int height);
+public static final native int Graphics_DrawEllipse(long /*int*/ graphics, long /*int*/ pen, int x, int y, int width, int height);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
@@ -354,7 +354,7 @@ public static final native int Graphics_DrawEllipse(int /*long*/ graphics, int /
* @param x cast=(INT)
* @param y cast=(INT)
*/
-public static final native int Graphics_DrawImage(int /*long*/ graphics, int /*long*/ image, int x, int y);
+public static final native int Graphics_DrawImage(long /*int*/ graphics, long /*int*/ image, int x, int y);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
@@ -369,40 +369,40 @@ public static final native int Graphics_DrawImage(int /*long*/ graphics, int /*l
* @param callback cast=(DrawImageAbort)
* @param callbackData cast=(VOID *)
*/
-public static final native int Graphics_DrawImage(int /*long*/ graphics, int /*long*/ image, Rect destRect, int srcx, int srcy, int srcwidth, int srcheight, int srcUnit, int /*long*/ imageAttributes, int /*long*/ callback, int /*long*/ callbackData);
+public static final native int Graphics_DrawImage(long /*int*/ graphics, long /*int*/ image, Rect destRect, int srcx, int srcy, int srcwidth, int srcheight, int srcUnit, long /*int*/ imageAttributes, long /*int*/ callback, long /*int*/ callbackData);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param pen cast=(Pen *)
*/
-public static final native int Graphics_DrawLine(int /*long*/ graphics, int /*long*/ pen, int x1, int y1, int x2, int y2);
+public static final native int Graphics_DrawLine(long /*int*/ graphics, long /*int*/ pen, int x1, int y1, int x2, int y2);
/**
* @method flags=no_gen cpp
* @param graphics cast=(Graphics *)
* @param pen cast=(Pen *)
* @param count cast=(INT)
*/
-public static final native int Graphics_DrawLines(int /*long*/ graphics, int /*long*/ pen, int[] points, int count);
+public static final native int Graphics_DrawLines(long /*int*/ graphics, long /*int*/ pen, int[] points, int count);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param pen cast=(Pen *)
* @param path cast=(GraphicsPath *)
*/
-public static final native int Graphics_DrawPath(int /*long*/ graphics, int /*long*/ pen, int /*long*/ path);
+public static final native int Graphics_DrawPath(long /*int*/ graphics, long /*int*/ pen, long /*int*/ path);
/**
* @method flags=no_gen cpp
* @param graphics cast=(Graphics *)
* @param pen cast=(Pen *)
* @param count cast=(INT)
*/
-public static final native int Graphics_DrawPolygon(int /*long*/ graphics, int /*long*/ pen, int[] points, int count);
+public static final native int Graphics_DrawPolygon(long /*int*/ graphics, long /*int*/ pen, int[] points, int count);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param pen cast=(Pen *)
*/
-public static final native int Graphics_DrawRectangle(int /*long*/ graphics, int /*long*/ pen, int x, int y, int width, int height);
+public static final native int Graphics_DrawRectangle(long /*int*/ graphics, long /*int*/ pen, int x, int y, int width, int height);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
@@ -412,7 +412,7 @@ public static final native int Graphics_DrawRectangle(int /*long*/ graphics, int
* @param origin flags=struct
* @param brush cast=(Brush *)
*/
-public static final native int Graphics_DrawString(int /*long*/ graphics, char[] string, int length, int /*long*/ font, PointF origin, int /*long*/ brush);
+public static final native int Graphics_DrawString(long /*int*/ graphics, char[] string, int length, long /*int*/ font, PointF origin, long /*int*/ brush);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
@@ -423,7 +423,7 @@ public static final native int Graphics_DrawString(int /*long*/ graphics, char[]
* @param format cast=(StringFormat *)
* @param brush cast=(Brush *)
*/
-public static final native int Graphics_DrawString(int /*long*/ graphics, char[] string, int length, int /*long*/ font, PointF origin, int /*long*/ format, int /*long*/ brush);
+public static final native int Graphics_DrawString(long /*int*/ graphics, char[] string, int length, long /*int*/ font, PointF origin, long /*int*/ format, long /*int*/ brush);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
@@ -433,20 +433,20 @@ public static final native int Graphics_DrawString(int /*long*/ graphics, char[]
* @param width cast=(INT)
* @param height cast=(INT)
*/
-public static final native int Graphics_FillEllipse(int /*long*/ graphics, int /*long*/ brush, int x, int y, int width, int height);
+public static final native int Graphics_FillEllipse(long /*int*/ graphics, long /*int*/ brush, int x, int y, int width, int height);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param brush cast=(Brush *)
* @param path cast=(GraphicsPath *)
*/
-public static final native int Graphics_FillPath(int /*long*/ graphics, int /*long*/ brush, int /*long*/ path);
+public static final native int Graphics_FillPath(long /*int*/ graphics, long /*int*/ brush, long /*int*/ path);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param intention cast=(FlushIntention)
*/
-public static final native void Graphics_Flush(int /*long*/ graphics, int intention);
+public static final native void Graphics_Flush(long /*int*/ graphics, int intention);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
@@ -458,7 +458,7 @@ public static final native void Graphics_Flush(int /*long*/ graphics, int intent
* @param startAngle cast=(REAL)
* @param sweepAngle cast=(REAL)
*/
-public static final native int Graphics_FillPie(int /*long*/ graphics, int /*long*/ brush, int x, int y, int width, int height, float startAngle, float sweepAngle);
+public static final native int Graphics_FillPie(long /*int*/ graphics, long /*int*/ brush, int x, int y, int width, int height, float startAngle, float sweepAngle);
/**
* @method flags=no_gen cpp
* @param graphics cast=(Graphics *)
@@ -467,7 +467,7 @@ public static final native int Graphics_FillPie(int /*long*/ graphics, int /*lon
* @param count cast=(INT)
* @param fillMode cast=(FillMode)
*/
-public static final native int Graphics_FillPolygon(int /*long*/ graphics, int /*long*/ brush, int[] points, int count, int fillMode);
+public static final native int Graphics_FillPolygon(long /*int*/ graphics, long /*int*/ brush, int[] points, int count, int fillMode);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
@@ -477,62 +477,62 @@ public static final native int Graphics_FillPolygon(int /*long*/ graphics, int /
* @param width cast=(INT)
* @param height cast=(INT)
*/
-public static final native int Graphics_FillRectangle(int /*long*/ graphics, int /*long*/ brush, int x, int y, int width, int height);
+public static final native int Graphics_FillRectangle(long /*int*/ graphics, long /*int*/ brush, int x, int y, int width, int height);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
*/
-public static final native int Graphics_GetClipBounds(int /*long*/ graphics, RectF rect);
+public static final native int Graphics_GetClipBounds(long /*int*/ graphics, RectF rect);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
*/
-public static final native int Graphics_GetClipBounds(int /*long*/ graphics, Rect rect);
+public static final native int Graphics_GetClipBounds(long /*int*/ graphics, Rect rect);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param region cast=(Region *)
*/
-public static final native int Graphics_GetClip(int /*long*/ graphics, int /*long*/ region);
+public static final native int Graphics_GetClip(long /*int*/ graphics, long /*int*/ region);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
*/
-public static final native int /*long*/ Graphics_GetHDC(int /*long*/ graphics);
+public static final native long /*int*/ Graphics_GetHDC(long /*int*/ graphics);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param hdc cast=(HDC)
*/
-public static final native void Graphics_ReleaseHDC(int /*long*/ graphics, int /*long*/ hdc);
+public static final native void Graphics_ReleaseHDC(long /*int*/ graphics, long /*int*/ hdc);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
*/
-public static final native int Graphics_GetInterpolationMode(int /*long*/ graphics);
+public static final native int Graphics_GetInterpolationMode(long /*int*/ graphics);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
*/
-public static final native int Graphics_GetSmoothingMode(int /*long*/ graphics);
+public static final native int Graphics_GetSmoothingMode(long /*int*/ graphics);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
*/
-public static final native int Graphics_GetTextRenderingHint(int /*long*/ graphics);
+public static final native int Graphics_GetTextRenderingHint(long /*int*/ graphics);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param matrix cast=(Matrix *)
*/
-public static final native int Graphics_GetTransform(int /*long*/ graphics, int /*long*/ matrix);
+public static final native int Graphics_GetTransform(long /*int*/ graphics, long /*int*/ matrix);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
*/
-public static final native int Graphics_GetVisibleClipBounds(int /*long*/ graphics, Rect rect);
+public static final native int Graphics_GetVisibleClipBounds(long /*int*/ graphics, Rect rect);
/** @method flags=no_gen */
-public static final native int Graphics_MeasureDriverString(int /*long*/ graphics, int /*long*/ text, int length, int /*long*/ font, float[] positions, int flags, int /*long*/ matrix, RectF boundingBox);
+public static final native int Graphics_MeasureDriverString(long /*int*/ graphics, long /*int*/ text, int length, long /*int*/ font, float[] positions, int flags, long /*int*/ matrix, RectF boundingBox);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
@@ -542,7 +542,7 @@ public static final native int Graphics_MeasureDriverString(int /*long*/ graphic
* @param origin cast=(const PointF *),flags=struct
* @param boundingBox cast=(RectF *)
*/
-public static final native int Graphics_MeasureString(int /*long*/ graphics, char[] string, int length, int /*long*/ font, PointF origin, RectF boundingBox);
+public static final native int Graphics_MeasureString(long /*int*/ graphics, char[] string, int length, long /*int*/ font, PointF origin, RectF boundingBox);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
@@ -552,116 +552,116 @@ public static final native int Graphics_MeasureString(int /*long*/ graphics, cha
* @param origin cast=(const PointF *),flags=struct
* @param format cast=(StringFormat *)
*/
-public static final native int Graphics_MeasureString(int /*long*/ graphics, char[] string, int length, int /*long*/ font, PointF origin, int /*long*/ format, RectF boundingBox);
+public static final native int Graphics_MeasureString(long /*int*/ graphics, char[] string, int length, long /*int*/ font, PointF origin, long /*int*/ format, RectF boundingBox);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
*/
-public static final native int Graphics_ResetClip(int /*long*/ graphics);
+public static final native int Graphics_ResetClip(long /*int*/ graphics);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param gstate cast=(GraphicsState)
*/
-public static final native int Graphics_Restore(int /*long*/ graphics, int gstate);
+public static final native int Graphics_Restore(long /*int*/ graphics, int gstate);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
*/
-public static final native int Graphics_Save(int /*long*/ graphics);
+public static final native int Graphics_Save(long /*int*/ graphics);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param order cast=(MatrixOrder)
*/
-public static final native int Graphics_ScaleTransform(int /*long*/ graphics, float sx, float sy, int order);
+public static final native int Graphics_ScaleTransform(long /*int*/ graphics, float sx, float sy, int order);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param hrgn cast=(Region *)
* @param combineMode cast=(CombineMode)
*/
-public static final native int Graphics_SetClip(int /*long*/ graphics, int /*long*/ hrgn, int combineMode);
+public static final native int Graphics_SetClip(long /*int*/ graphics, long /*int*/ hrgn, int combineMode);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param rect cast=(Rect *),flags=struct
* @param combineMode cast=(CombineMode)
*/
-public static final native int Graphics_SetClip(int /*long*/ graphics, Rect rect, int combineMode);
+public static final native int Graphics_SetClip(long /*int*/ graphics, Rect rect, int combineMode);
/**
* @method accessor=SetClip,flags=cpp
* @param graphics cast=(Graphics *)
* @param path cast=(GraphicsPath *)
*/
-public static final native int Graphics_SetClipPath(int /*long*/ graphics, int /*long*/ path);
+public static final native int Graphics_SetClipPath(long /*int*/ graphics, long /*int*/ path);
/**
* @method accessor=SetClip,flags=cpp
* @param graphics cast=(Graphics *)
* @param path cast=(GraphicsPath *)
* @param combineMode cast=(CombineMode)
*/
-public static final native int Graphics_SetClipPath(int /*long*/ graphics, int /*long*/ path, int combineMode);
+public static final native int Graphics_SetClipPath(long /*int*/ graphics, long /*int*/ path, int combineMode);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param compositingQuality cast=(CompositingQuality)
*/
-public static final native int Graphics_SetCompositingQuality(int /*long*/ graphics, int compositingQuality);
+public static final native int Graphics_SetCompositingQuality(long /*int*/ graphics, int compositingQuality);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param unit cast=(Unit)
*/
-public static final native int Graphics_SetPageUnit(int /*long*/ graphics, int unit);
+public static final native int Graphics_SetPageUnit(long /*int*/ graphics, int unit);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param pixelOffsetMode cast=(PixelOffsetMode)
*/
-public static final native int Graphics_SetPixelOffsetMode(int /*long*/ graphics, int pixelOffsetMode);
+public static final native int Graphics_SetPixelOffsetMode(long /*int*/ graphics, int pixelOffsetMode);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param smoothingMode cast=(SmoothingMode)
*/
-public static final native int Graphics_SetSmoothingMode(int /*long*/ graphics, int smoothingMode);
+public static final native int Graphics_SetSmoothingMode(long /*int*/ graphics, int smoothingMode);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param matrix cast=(Matrix *)
*/
-public static final native int Graphics_SetTransform(int /*long*/ graphics, int /*long*/ matrix);
+public static final native int Graphics_SetTransform(long /*int*/ graphics, long /*int*/ matrix);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param mode cast=(InterpolationMode)
*/
-public static final native int Graphics_SetInterpolationMode(int /*long*/ graphics, int mode);
+public static final native int Graphics_SetInterpolationMode(long /*int*/ graphics, int mode);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param mode cast=(TextRenderingHint)
*/
-public static final native int Graphics_SetTextRenderingHint(int /*long*/ graphics, int mode);
+public static final native int Graphics_SetTextRenderingHint(long /*int*/ graphics, int mode);
/**
* @method flags=cpp
* @param graphics cast=(Graphics *)
* @param order cast=(MatrixOrder)
*/
-public static final native int Graphics_TranslateTransform(int /*long*/ graphics, float dx, float dy, int order);
+public static final native int Graphics_TranslateTransform(long /*int*/ graphics, float dx, float dy, int order);
/**
* @method flags=new
* @param fillMode cast=(FillMode)
*/
-public static final native int /*long*/ GraphicsPath_new(int fillMode);
+public static final native long /*int*/ GraphicsPath_new(int fillMode);
/**
* @method flags=no_gen new
* @param points cast=(FillMode)
*/
-public static final native int /*long*/ GraphicsPath_new(int[] points, byte[] types, int count, int fillMode);
+public static final native long /*int*/ GraphicsPath_new(int[] points, byte[] types, int count, int fillMode);
/** @method flags=delete */
-public static final native void GraphicsPath_delete(int /*long*/ path);
+public static final native void GraphicsPath_delete(long /*int*/ path);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
@@ -672,7 +672,7 @@ public static final native void GraphicsPath_delete(int /*long*/ path);
* @param startAngle cast=(REAL)
* @param sweepAngle cast=(REAL)
*/
-public static final native int GraphicsPath_AddArc(int /*long*/ path, float x, float y, float width, float height, float startAngle, float sweepAngle);
+public static final native int GraphicsPath_AddArc(long /*int*/ path, float x, float y, float width, float height, float startAngle, float sweepAngle);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
@@ -685,7 +685,7 @@ public static final native int GraphicsPath_AddArc(int /*long*/ path, float x, f
* @param x4 cast=(REAL)
* @param y4 cast=(REAL)
*/
-public static final native int GraphicsPath_AddBezier(int /*long*/ path, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4);
+public static final native int GraphicsPath_AddBezier(long /*int*/ path, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
@@ -694,20 +694,20 @@ public static final native int GraphicsPath_AddBezier(int /*long*/ path, float x
* @param x2 cast=(REAL)
* @param y2 cast=(REAL)
*/
-public static final native int GraphicsPath_AddLine(int /*long*/ path, float x1, float y1, float x2, float y2);
+public static final native int GraphicsPath_AddLine(long /*int*/ path, float x1, float y1, float x2, float y2);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
* @param addingPath cast=(GraphicsPath *)
* @param connect cast=(BOOL)
*/
-public static final native int GraphicsPath_AddPath(int /*long*/ path, int /*long*/ addingPath, boolean connect);
+public static final native int GraphicsPath_AddPath(long /*int*/ path, long /*int*/ addingPath, boolean connect);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
* @param rect flags=struct
*/
-public static final native int GraphicsPath_AddRectangle(int /*long*/ path, RectF rect);
+public static final native int GraphicsPath_AddRectangle(long /*int*/ path, RectF rect);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
@@ -719,131 +719,131 @@ public static final native int GraphicsPath_AddRectangle(int /*long*/ path, Rect
* @param origin cast=(const PointF *),flags=struct
* @param format cast=(const StringFormat *)
*/
-public static final native int GraphicsPath_AddString(int /*long*/ path, char[] string, int length, int /*long*/ family, int style, float emSize, PointF origin, int /*long*/ format);
+public static final native int GraphicsPath_AddString(long /*int*/ path, char[] string, int length, long /*int*/ family, int style, float emSize, PointF origin, long /*int*/ format);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
*/
-public static final native int GraphicsPath_CloseFigure(int /*long*/ path);
+public static final native int GraphicsPath_CloseFigure(long /*int*/ path);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
*/
-public static final native int /*long*/ GraphicsPath_Clone(int /*long*/ path);
+public static final native long /*int*/ GraphicsPath_Clone(long /*int*/ path);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
* @param matrix cast=(Matrix *)
*/
-public static final native int GraphicsPath_Flatten(int /*long*/ path, int /*long*/ matrix, float flatness);
+public static final native int GraphicsPath_Flatten(long /*int*/ path, long /*int*/ matrix, float flatness);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
* @param matrix cast=(Matrix *)
* @param pen cast=(Pen *)
*/
-public static final native int GraphicsPath_GetBounds(int /*long*/ path, RectF bounds, int /*long*/ matrix, int /*long*/ pen);
+public static final native int GraphicsPath_GetBounds(long /*int*/ path, RectF bounds, long /*int*/ matrix, long /*int*/ pen);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
* @param lastPoint cast=(PointF *)
*/
-public static final native int GraphicsPath_GetLastPoint(int /*long*/ path, PointF lastPoint);
+public static final native int GraphicsPath_GetLastPoint(long /*int*/ path, PointF lastPoint);
/**
* @method flags=no_gen cpp
* @param path cast=(GraphicsPath *)
* @param points cast=(PointF *)
*/
-public static final native int GraphicsPath_GetPathPoints(int /*long*/ path, float[] points, int count);
+public static final native int GraphicsPath_GetPathPoints(long /*int*/ path, float[] points, int count);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
* @param types cast=(BYTE *)
*/
-public static final native int GraphicsPath_GetPathTypes(int /*long*/ path, byte[] types, int count);
+public static final native int GraphicsPath_GetPathTypes(long /*int*/ path, byte[] types, int count);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
*/
-public static final native int GraphicsPath_GetPointCount(int /*long*/ path);
+public static final native int GraphicsPath_GetPointCount(long /*int*/ path);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
* @param pen cast=(const Pen *)
* @param g cast=(const Graphics *)
*/
-public static final native boolean GraphicsPath_IsOutlineVisible(int /*long*/ path, float x, float y, int /*long*/ pen, int /*long*/ g);
+public static final native boolean GraphicsPath_IsOutlineVisible(long /*int*/ path, float x, float y, long /*int*/ pen, long /*int*/ g);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
* @param g cast=(const Graphics *)
*/
-public static final native boolean GraphicsPath_IsVisible(int /*long*/ path, float x, float y, int /*long*/ g);
+public static final native boolean GraphicsPath_IsVisible(long /*int*/ path, float x, float y, long /*int*/ g);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
* @param fillmode cast=(FillMode)
*/
-public static final native int GraphicsPath_SetFillMode(int /*long*/ path, int fillmode);
+public static final native int GraphicsPath_SetFillMode(long /*int*/ path, int fillmode);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
*/
-public static final native int GraphicsPath_StartFigure(int /*long*/ path);
+public static final native int GraphicsPath_StartFigure(long /*int*/ path);
/**
* @method flags=cpp
* @param path cast=(GraphicsPath *)
* @param matrix cast=(Matrix *)
*/
-public static final native int GraphicsPath_Transform(int /*long*/ path, int /*long*/ matrix);
+public static final native int GraphicsPath_Transform(long /*int*/ path, long /*int*/ matrix);
/**
* @method flags=new
* @param hatchStyle cast=(HatchStyle)
* @param foreColor cast=(Color *),flags=struct
* @param backColor cast=(Color *),flags=struct
*/
-public static final native int /*long*/ HatchBrush_new(int hatchStyle, int /*long*/ foreColor, int /*long*/ backColor);
+public static final native long /*int*/ HatchBrush_new(int hatchStyle, long /*int*/ foreColor, long /*int*/ backColor);
/**
* @method flags=cpp
* @param image cast=(Image*)
*/
-public static final native int Image_GetLastStatus(int /*long*/ image);
+public static final native int Image_GetLastStatus(long /*int*/ image);
/**
* @method flags=cpp
* @param image cast=(Image*)
*/
-public static final native int Image_GetPixelFormat(int /*long*/ image);
+public static final native int Image_GetPixelFormat(long /*int*/ image);
/**
* @method flags=cpp
* @param image cast=(Image *)
*/
-public static final native int Image_GetWidth(int /*long*/ image);
+public static final native int Image_GetWidth(long /*int*/ image);
/**
* @method flags=cpp
* @param image cast=(Image *)
*/
-public static final native int Image_GetHeight(int /*long*/ image);
+public static final native int Image_GetHeight(long /*int*/ image);
/**
* @method flags=cpp
* @param image cast=(Image*)
* @param palette cast=(ColorPalette*)
*/
-public static final native int Image_GetPalette(int /*long*/ image, int /*long*/ palette, int size);
+public static final native int Image_GetPalette(long /*int*/ image, long /*int*/ palette, int size);
/**
* @method flags=cpp
* @param image cast=(Image*)
*/
-public static final native int Image_GetPaletteSize(int /*long*/ image);
+public static final native int Image_GetPaletteSize(long /*int*/ image);
/** @method flags=new */
-public static final native int /*long*/ ImageAttributes_new();
+public static final native long /*int*/ ImageAttributes_new();
/** @method flags=delete */
-public static final native void ImageAttributes_delete(int /*long*/ attrib);
+public static final native void ImageAttributes_delete(long /*int*/ attrib);
/**
* @method flags=cpp
* @param attrib cast=(ImageAttributes *)
* @param wrap cast=(WrapMode)
*/
-public static final native int ImageAttributes_SetWrapMode(int /*long*/ attrib, int wrap);
+public static final native int ImageAttributes_SetWrapMode(long /*int*/ attrib, int wrap);
/**
* @method flags=cpp
* @param attrib cast=(ImageAttributes *)
@@ -851,9 +851,9 @@ public static final native int ImageAttributes_SetWrapMode(int /*long*/ attrib,
* @param mode cast=(ColorMatrixFlags)
* @param type cast=(ColorAdjustType)
*/
-public static final native int ImageAttributes_SetColorMatrix(int /*long*/ attrib, float[] matrix, int mode, int type);
+public static final native int ImageAttributes_SetColorMatrix(long /*int*/ attrib, float[] matrix, int mode, int type);
/** @method flags=delete */
-public static final native void HatchBrush_delete(int /*long*/ brush);
+public static final native void HatchBrush_delete(long /*int*/ brush);
/**
* @method flags=new
* @param point1 flags=struct
@@ -861,39 +861,39 @@ public static final native void HatchBrush_delete(int /*long*/ brush);
* @param color1 cast=(Color *),flags=struct
* @param color2 cast=(Color *),flags=struct
*/
-public static final native int /*long*/ LinearGradientBrush_new(PointF point1, PointF point2, int /*long*/ color1, int /*long*/ color2);
+public static final native long /*int*/ LinearGradientBrush_new(PointF point1, PointF point2, long /*int*/ color1, long /*int*/ color2);
/** @method flags=delete */
-public static final native void LinearGradientBrush_delete(int /*long*/ brush);
+public static final native void LinearGradientBrush_delete(long /*int*/ brush);
/**
* @method flags=no_gen cpp
* @param brush cast=(LinearGradientBrush *)
* @param presetColors cast=(const Color *)
* @param blendPositions cast=(const REAL *)
*/
-public static final native int LinearGradientBrush_SetInterpolationColors(int /*long*/ brush, int /*long*/[] presetColors, float[] blendPositions, int count);
+public static final native int LinearGradientBrush_SetInterpolationColors(long /*int*/ brush, long /*int*/[] presetColors, float[] blendPositions, int count);
/**
* @method flags=cpp
* @param brush cast=(LinearGradientBrush *)
* @param wrapMode cast=(WrapMode)
*/
-public static final native int LinearGradientBrush_SetWrapMode(int /*long*/ brush, int wrapMode);
+public static final native int LinearGradientBrush_SetWrapMode(long /*int*/ brush, int wrapMode);
/**
* @method flags=cpp
* @param brush cast=(LinearGradientBrush *)
*/
-public static final native int LinearGradientBrush_ResetTransform(int /*long*/ brush);
+public static final native int LinearGradientBrush_ResetTransform(long /*int*/ brush);
/**
* @method flags=cpp
* @param brush cast=(LinearGradientBrush *)
* @param order cast=(MatrixOrder)
*/
-public static final native int LinearGradientBrush_ScaleTransform(int /*long*/ brush, float sx, float sy, int order);
+public static final native int LinearGradientBrush_ScaleTransform(long /*int*/ brush, float sx, float sy, int order);
/**
* @method flags=cpp
* @param brush cast=(LinearGradientBrush *)
* @param order cast=(MatrixOrder)
*/
-public static final native int LinearGradientBrush_TranslateTransform(int /*long*/ brush, float dx, float dy, int order);
+public static final native int LinearGradientBrush_TranslateTransform(long /*int*/ brush, float dx, float dy, int order);
/**
* @method flags=new
* @param m11 cast=(REAL)
@@ -903,39 +903,39 @@ public static final native int LinearGradientBrush_TranslateTransform(int /*long
* @param dx cast=(REAL)
* @param dy cast=(REAL)
*/
-public static final native int /*long*/ Matrix_new(float m11, float m12, float m21, float m22, float dx, float dy);
+public static final native long /*int*/ Matrix_new(float m11, float m12, float m21, float m22, float dx, float dy);
/** @method flags=delete */
-public static final native void Matrix_delete(int /*long*/ matrix);
+public static final native void Matrix_delete(long /*int*/ matrix);
/**
* @method flags=cpp
* @param matrix cast=(Matrix *)
* @param m cast=(REAL *)
*/
-public static final native int Matrix_GetElements(int /*long*/ matrix, float[] m);
+public static final native int Matrix_GetElements(long /*int*/ matrix, float[] m);
/**
* @method flags=cpp
* @param matrix cast=(Matrix *)
*/
-public static final native int Matrix_Invert(int /*long*/ matrix);
+public static final native int Matrix_Invert(long /*int*/ matrix);
/**
* @method flags=cpp
* @param matrix cast=(Matrix *)
*/
-public static final native boolean Matrix_IsIdentity(int /*long*/ matrix);
+public static final native boolean Matrix_IsIdentity(long /*int*/ matrix);
/**
* @method flags=cpp
* @param matrix cast=(Matrix *)
* @param matrix1 cast=(Matrix *)
* @param order cast=(MatrixOrder)
*/
-public static final native int Matrix_Multiply(int /*long*/ matrix, int /*long*/ matrix1, int order);
+public static final native int Matrix_Multiply(long /*int*/ matrix, long /*int*/ matrix1, int order);
/**
* @method flags=cpp
* @param matrix cast=(Matrix *)
* @param angle cast=(REAL)
* @param order cast=(MatrixOrder)
*/
-public static final native int Matrix_Rotate(int /*long*/ matrix, float angle, int order);
+public static final native int Matrix_Rotate(long /*int*/ matrix, float angle, int order);
/**
* @method flags=cpp
* @param matrix cast=(Matrix *)
@@ -943,7 +943,7 @@ public static final native int Matrix_Rotate(int /*long*/ matrix, float angle, i
* @param scaleY cast=(REAL)
* @param order cast=(MatrixOrder)
*/
-public static final native int Matrix_Scale(int /*long*/ matrix, float scaleX, float scaleY, int order);
+public static final native int Matrix_Scale(long /*int*/ matrix, float scaleX, float scaleY, int order);
/**
* @method flags=cpp
* @param matrix cast=(Matrix *)
@@ -951,19 +951,19 @@ public static final native int Matrix_Scale(int /*long*/ matrix, float scaleX, f
* @param shearY cast=(REAL)
* @param order cast=(MatrixOrder)
*/
-public static final native int Matrix_Shear(int /*long*/ matrix, float shearX, float shearY, int order);
+public static final native int Matrix_Shear(long /*int*/ matrix, float shearX, float shearY, int order);
/**
* @method flags=cpp
* @param matrix cast=(Matrix *)
*/
-public static final native int Matrix_TransformPoints(int /*long*/ matrix, PointF pts, int count);
+public static final native int Matrix_TransformPoints(long /*int*/ matrix, PointF pts, int count);
/** @method flags=no_gen */
-public static final native int Matrix_TransformPoints(int /*long*/ matrix, float[] pts, int count);
+public static final native int Matrix_TransformPoints(long /*int*/ matrix, float[] pts, int count);
/**
* @method flags=cpp
* @param matrix cast=(Matrix *)
*/
-public static final native int Matrix_TransformVectors(int /*long*/ matrix, PointF pts, int count);
+public static final native int Matrix_TransformVectors(long /*int*/ matrix, PointF pts, int count);
/**
* @method flags=cpp
* @param matrix cast=(Matrix *)
@@ -971,7 +971,7 @@ public static final native int Matrix_TransformVectors(int /*long*/ matrix, Poin
* @param offsetY cast=(REAL)
* @param order cast=(MatrixOrder)
*/
-public static final native int Matrix_Translate(int /*long*/ matrix, float offsetX, float offsetY, int order);
+public static final native int Matrix_Translate(long /*int*/ matrix, float offsetX, float offsetY, int order);
/**
* @method flags=cpp
* @param matrix cast=(Matrix *)
@@ -982,99 +982,99 @@ public static final native int Matrix_Translate(int /*long*/ matrix, float offse
* @param dx cast=(REAL)
* @param dy cast=(REAL)
*/
-public static final native int Matrix_SetElements(int /*long*/ matrix, float m11, float m12, float m21, float m22, float dx, float dy);
+public static final native int Matrix_SetElements(long /*int*/ matrix, float m11, float m12, float m21, float m22, float dx, float dy);
/**
* @param Destination cast=(PVOID)
* @param SourcePtr cast=(CONST VOID*)
*/
-public static final native void MoveMemory(ColorPalette Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory(ColorPalette Destination, long /*int*/ SourcePtr, int Length);
/**
* @param Destination cast=(PVOID)
* @param SourcePtr cast=(CONST VOID*)
*/
-public static final native void MoveMemory(BitmapData Destination, int /*long*/ SourcePtr);
+public static final native void MoveMemory(BitmapData Destination, long /*int*/ SourcePtr);
/**
* @method flags=new
* @param path cast=(GraphicsPath *)
*/
-public static final native int /*long*/ PathGradientBrush_new(int /*long*/ path);
+public static final native long /*int*/ PathGradientBrush_new(long /*int*/ path);
/** @method flags=delete */
-public static final native void PathGradientBrush_delete(int /*long*/ brush);
+public static final native void PathGradientBrush_delete(long /*int*/ brush);
/**
* @method flags=cpp
* @param brush cast=(PathGradientBrush *)
* @param color cast=(Color *),flags=struct
*/
-public static final native int PathGradientBrush_SetCenterColor(int /*long*/ brush, int /*long*/ color);
+public static final native int PathGradientBrush_SetCenterColor(long /*int*/ brush, long /*int*/ color);
/**
* @method flags=cpp
* @param brush cast=(PathGradientBrush *)
* @param pt flags=struct
*/
-public static final native int PathGradientBrush_SetCenterPoint(int /*long*/ brush, PointF pt);
+public static final native int PathGradientBrush_SetCenterPoint(long /*int*/ brush, PointF pt);
/**
* @method flags=no_gen
* @param brush cast=(PathGradientBrush *)
* @param presetColors cast=(const Color *)
* @param blendPositions cast=(const REAL *)
*/
-public static final native int PathGradientBrush_SetInterpolationColors(int /*long*/ brush, int /*long*/[] presetColors, float[] blendPositions, int count);
+public static final native int PathGradientBrush_SetInterpolationColors(long /*int*/ brush, long /*int*/[] presetColors, float[] blendPositions, int count);
/**
* @method flags=no_gen
* @param brush cast=(PathGradientBrush *)
* @param colors cast=(Color *)
* @param count cast=(INT *)
*/
-public static final native int PathGradientBrush_SetSurroundColors(int /*long*/ brush, int /*long*/[] colors, int[] count);
+public static final native int PathGradientBrush_SetSurroundColors(long /*int*/ brush, long /*int*/[] colors, int[] count);
/**
* @method flags=cpp
* @param brush cast=(PathGradientBrush *)
* @param path cast=(GraphicsPath *)
*/
-public static final native int PathGradientBrush_SetGraphicsPath(int /*long*/ brush, int /*long*/ path);
+public static final native int PathGradientBrush_SetGraphicsPath(long /*int*/ brush, long /*int*/ path);
/**
* @method flags=cpp
* @param brush cast=(PathGradientBrush *)
* @param wrapMode cast=(WrapMode)
*/
-public static final native int PathGradientBrush_SetWrapMode(int /*long*/ brush, int wrapMode);
+public static final native int PathGradientBrush_SetWrapMode(long /*int*/ brush, int wrapMode);
/**
* @method flags=new
* @param brush cast=(Brush *)
* @param width cast=(REAL)
*/
-public static final native int /*long*/ Pen_new(int /*long*/ brush, float width);
+public static final native long /*int*/ Pen_new(long /*int*/ brush, float width);
/** @method flags=delete */
-public static final native void Pen_delete(int /*long*/ pen);
+public static final native void Pen_delete(long /*int*/ pen);
/**
* @method flags=cpp
* @param pen cast=(Pen *)
*/
-public static final native int /*long*/ Pen_GetBrush(int /*long*/ pen);
+public static final native long /*int*/ Pen_GetBrush(long /*int*/ pen);
/**
* @method flags=cpp
* @param pen cast=(Pen *)
* @param brush cast=(Brush *)
*/
-public static final native int Pen_SetBrush(int /*long*/ pen, int /*long*/ brush);
+public static final native int Pen_SetBrush(long /*int*/ pen, long /*int*/ brush);
/**
* @method flags=cpp
* @param pen cast=(Pen *)
*/
-public static final native int Pen_SetDashOffset(int /*long*/ pen, float dashOffset);
+public static final native int Pen_SetDashOffset(long /*int*/ pen, float dashOffset);
/**
* @method flags=cpp
* @param pen cast=(Pen *)
* @param dashArray cast=(REAL *)
* @param count cast=(int)
*/
-public static final native int Pen_SetDashPattern(int /*long*/ pen, float[] dashArray, int count);
+public static final native int Pen_SetDashPattern(long /*int*/ pen, float[] dashArray, int count);
/**
* @method flags=cpp
* @param pen cast=(Pen *)
* @param dashStyle cast=(DashStyle)
*/
-public static final native int Pen_SetDashStyle(int /*long*/ pen, int dashStyle);
+public static final native int Pen_SetDashStyle(long /*int*/ pen, int dashStyle);
/**
* @method flags=cpp
* @param pen cast=(Pen *)
@@ -1082,123 +1082,123 @@ public static final native int Pen_SetDashStyle(int /*long*/ pen, int dashStyle)
* @param endCap cast=(LineCap)
* @param dashCap cast=(DashCap)
*/
-public static final native int Pen_SetLineCap(int /*long*/ pen, int startCap, int endCap, int dashCap);
+public static final native int Pen_SetLineCap(long /*int*/ pen, int startCap, int endCap, int dashCap);
/**
* @method flags=cpp
* @param pen cast=(Pen *)
* @param lineJoin cast=(LineJoin)
*/
-public static final native int Pen_SetLineJoin(int /*long*/ pen, int lineJoin);
+public static final native int Pen_SetLineJoin(long /*int*/ pen, int lineJoin);
/**
* @method flags=cpp
* @param pen cast=(Pen *)
*/
-public static final native int Pen_SetMiterLimit(int /*long*/ pen, float miterLimit);
+public static final native int Pen_SetMiterLimit(long /*int*/ pen, float miterLimit);
/**
* @method flags=cpp
* @param pen cast=(Pen *)
* @param width cast=(REAL)
*/
-public static final native int Pen_SetWidth(int /*long*/ pen, float width);
+public static final native int Pen_SetWidth(long /*int*/ pen, float width);
/** @method flags=new */
-public static final native int /*long*/ Point_new(int x, int y);
+public static final native long /*int*/ Point_new(int x, int y);
/** @method flags=delete */
-public static final native void Point_delete(int /*long*/ point);
+public static final native void Point_delete(long /*int*/ point);
/**
* @method flags=new
* @param hRgn cast=(HRGN)
*/
-public static final native int /*long*/ Region_new(int /*long*/ hRgn);
+public static final native long /*int*/ Region_new(long /*int*/ hRgn);
/**
* @method flags=new
* @param path cast=(GraphicsPath*)
*/
-public static final native int /*long*/ Region_newGraphicsPath(int /*long*/ path);
+public static final native long /*int*/ Region_newGraphicsPath(long /*int*/ path);
/** @method flags=new */
-public static final native int /*long*/ Region_new();
+public static final native long /*int*/ Region_new();
/** @method flags=delete */
-public static final native void Region_delete(int /*long*/ region);
+public static final native void Region_delete(long /*int*/ region);
/**
* @method flags=cpp
* @param region cast=(Region *)
* @param graphics cast=(Graphics *)
*/
-public static final native int /*long*/ Region_GetHRGN(int /*long*/ region, int /*long*/ graphics);
+public static final native long /*int*/ Region_GetHRGN(long /*int*/ region, long /*int*/ graphics);
/**
* @method flags=cpp
* @param region cast=(Region *)
* @param graphics cast=(Graphics *)
*/
-public static final native boolean Region_IsInfinite(int /*long*/ region, int /*long*/ graphics);
+public static final native boolean Region_IsInfinite(long /*int*/ region, long /*int*/ graphics);
/**
* @method flags=new
* @param color cast=(Color *),flags=struct
*/
-public static final native int /*long*/ SolidBrush_new(int /*long*/ color);
+public static final native long /*int*/ SolidBrush_new(long /*int*/ color);
/** @method flags=delete */
-public static final native void SolidBrush_delete(int /*long*/ brush);
+public static final native void SolidBrush_delete(long /*int*/ brush);
/** @method flags=delete */
-public static final native void StringFormat_delete(int /*long*/ format);
+public static final native void StringFormat_delete(long /*int*/ format);
/**
* @method flags=cpp
* @param format cast=(StringFormat *)
*/
-public static final native int /*long*/ StringFormat_Clone(int /*long*/ format);
+public static final native long /*int*/ StringFormat_Clone(long /*int*/ format);
/** @method accessor=StringFormat::GenericDefault */
-public static final native int /*long*/ StringFormat_GenericDefault();
+public static final native long /*int*/ StringFormat_GenericDefault();
/** @method accessor=StringFormat::GenericTypographic */
-public static final native int /*long*/ StringFormat_GenericTypographic();
+public static final native long /*int*/ StringFormat_GenericTypographic();
/**
* @method flags=cpp
* @param format cast=(StringFormat *)
*/
-public static final native int StringFormat_GetFormatFlags(int /*long*/ format);
+public static final native int StringFormat_GetFormatFlags(long /*int*/ format);
/**
* @method flags=cpp
* @param format cast=(StringFormat *)
* @param hotkeyPrefix cast=(HotkeyPrefix)
*/
-public static final native int StringFormat_SetHotkeyPrefix(int /*long*/ format, int hotkeyPrefix);
+public static final native int StringFormat_SetHotkeyPrefix(long /*int*/ format, int hotkeyPrefix);
/**
* @method flags=cpp
* @param format cast=(StringFormat *)
* @param flags cast=(StringFormatFlags)
*/
-public static final native int StringFormat_SetFormatFlags(int /*long*/ format, int flags);
+public static final native int StringFormat_SetFormatFlags(long /*int*/ format, int flags);
/**
* @method flags=cpp
* @param format cast=(StringFormat *)
*/
-public static final native int StringFormat_SetTabStops(int /*long*/ format, float firstTabOffset, int count, float[] tabStops);
+public static final native int StringFormat_SetTabStops(long /*int*/ format, float firstTabOffset, int count, float[] tabStops);
/**
* @method flags=new
* @param image cast=(Image *)
* @param wrapMode cast=(WrapMode)
*/
-public static final native int /*long*/ TextureBrush_new(int /*long*/ image, int wrapMode, float dstX, float dstY, float dstWidth, float dstHeight);
+public static final native long /*int*/ TextureBrush_new(long /*int*/ image, int wrapMode, float dstX, float dstY, float dstWidth, float dstHeight);
/** @method flags=delete */
-public static final native void TextureBrush_delete(int /*long*/ brush);
+public static final native void TextureBrush_delete(long /*int*/ brush);
/**
* @method flags=cpp
* @param brush cast=(TextureBrush *)
* @param matrix cast=(Matrix *)
*/
-public static final native int TextureBrush_SetTransform(int /*long*/ brush, int /*long*/ matrix);
+public static final native int TextureBrush_SetTransform(long /*int*/ brush, long /*int*/ matrix);
/**
* @method flags=cpp
* @param brush cast=(TextureBrush *)
*/
-public static final native int TextureBrush_ResetTransform(int /*long*/ brush);
+public static final native int TextureBrush_ResetTransform(long /*int*/ brush);
/**
* @method flags=cpp
* @param brush cast=(TextureBrush *)
* @param order cast=(MatrixOrder)
*/
-public static final native int TextureBrush_ScaleTransform(int /*long*/ brush, float sx, float sy, int order);
+public static final native int TextureBrush_ScaleTransform(long /*int*/ brush, float sx, float sy, int order);
/**
* @method flags=cpp
* @param brush cast=(TextureBrush *)
* @param order cast=(MatrixOrder)
*/
-public static final native int TextureBrush_TranslateTransform(int /*long*/ brush, float dx, float dy, int order);
+public static final native int TextureBrush_TranslateTransform(long /*int*/ brush, float dx, float dy, int order);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/GdiplusStartupInput.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/GdiplusStartupInput.java
index 32fe332c2a..10d6598475 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/GdiplusStartupInput.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/gdip/GdiplusStartupInput.java
@@ -14,7 +14,7 @@ package org.eclipse.swt.internal.gdip;
public class GdiplusStartupInput {
public int GdiplusVersion;
/** @field cast=(DebugEventProc) */
- public int /*long*/ DebugEventCallback;
+ public long /*int*/ DebugEventCallback;
/** @field cast=(BOOL) */
public boolean SuppressBackgroundThread;
/** @field cast=(BOOL) */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java
index 847a8782fd..a64633265f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java
@@ -13,6 +13,6 @@ package org.eclipse.swt.internal.ole.win32;
public final class CAUUID {
public int cElems;
/** @field cast=(GUID FAR *) */
- public int /*long*/ pElems;
+ public long /*int*/ pElems;
public static final int sizeof = COM.CAUUID_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
index 1a0041c62f..4d8f18dd5b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
@@ -442,25 +442,25 @@ public static final native int CLSIDFromString(char[] lpsz, GUID pclsid);
* @param pUnkOuter cast=(LPUNKNOWN)
* @param ppv cast=(LPVOID *)
*/
-public static final native int CoCreateInstance(GUID rclsid, int /*long*/ pUnkOuter, int dwClsContext, GUID riid, int /*long*/[] ppv);
+public static final native int CoCreateInstance(GUID rclsid, long /*int*/ pUnkOuter, int dwClsContext, GUID riid, long /*int*/[] ppv);
public static final native void CoFreeUnusedLibraries();
/**
* @param pServerInfo cast=(COSERVERINFO *)
* @param ppv cast=(LPVOID *)
*/
-public static final native int CoGetClassObject(GUID rclsid, int dwClsContext, int /*long*/ pServerInfo, GUID riid, int /*long*/[] ppv);
+public static final native int CoGetClassObject(GUID rclsid, int dwClsContext, long /*int*/ pServerInfo, GUID riid, long /*int*/[] ppv);
/**
* @param pUnk cast=(IUnknown *)
* @param fLock cast=(BOOL)
* @param fLastUnlockReleases cast=(BOOL)
*/
-public static final native int CoLockObjectExternal(int /*long*/ pUnk, boolean fLock, boolean fLastUnlockReleases);
+public static final native int CoLockObjectExternal(long /*int*/ pUnk, boolean fLock, boolean fLastUnlockReleases);
/**
* @param pDataObject cast=(IDataObject *)
* @param pDropSource cast=(IDropSource *)
* @param pdwEffect cast=(LPDWORD)
*/
-public static final native int DoDragDrop(int /*long*/ pDataObject, int /*long*/ pDropSource, int dwOKEffect, int[] pdwEffect);
+public static final native int DoDragDrop(long /*int*/ pDataObject, long /*int*/ pDropSource, int dwOKEffect, int[] pdwEffect);
/** @param szFileName cast=(LPCWSTR) */
public static final native int GetClassFile(char[] szFileName, GUID clsid);
/** @param lpsz cast=(LPOLESTR) */
@@ -470,90 +470,90 @@ public static final native boolean IsEqualGUID(GUID rguid1, GUID rguid2);
* @param Destination cast=(PVOID)
* @param Source cast=(CONST VOID *),flags=no_out
*/
-public static final native void MoveMemory(int /*long*/ Destination, FORMATETC Source, int Length);
+public static final native void MoveMemory(long /*int*/ Destination, FORMATETC Source, int Length);
/**
* @param DestinationPtr cast=(PVOID)
* @param Source cast=(CONST VOID *),flags=no_out
*/
-public static final native void MoveMemory(int /*long*/ DestinationPtr, GUID Source, int Length);
+public static final native void MoveMemory(long /*int*/ DestinationPtr, GUID Source, int Length);
/**
* @param DestinationPtr cast=(PVOID)
* @param Source cast=(CONST VOID *),flags=no_out
*/
-public static final native void MoveMemory(int /*long*/ DestinationPtr, OLEINPLACEFRAMEINFO Source, int Length);
+public static final native void MoveMemory(long /*int*/ DestinationPtr, OLEINPLACEFRAMEINFO Source, int Length);
/**
* @param Destination cast=(PVOID)
* @param Source cast=(CONST VOID *),flags=no_out
*/
-public static final native void MoveMemory(int /*long*/ Destination, STATSTG Source, int Length);
+public static final native void MoveMemory(long /*int*/ Destination, STATSTG Source, int Length);
/**
* @param Destination cast=(PVOID)
* @param Source cast=(CONST VOID *),flags=no_out
*/
-public static final native void MoveMemory(int /*long*/ Destination, STGMEDIUM Source, int Length);
+public static final native void MoveMemory(long /*int*/ Destination, STGMEDIUM Source, int Length);
/**
* @param Destination cast=(PVOID),flags=no_in
* @param SourcePtr cast=(CONST VOID *)
*/
-public static final native void MoveMemory(STGMEDIUM Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory(STGMEDIUM Destination, long /*int*/ SourcePtr, int Length);
/**
* @param Destination cast=(PVOID),flags=no_in
* @param SourcePtr cast=(CONST VOID *)
*/
-public static final native void MoveMemory(DISPPARAMS Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory(DISPPARAMS Destination, long /*int*/ SourcePtr, int Length);
/**
* @param Destination cast=(PVOID),flags=no_in
* @param Source cast=(CONST VOID *)
*/
-public static final native void MoveMemory(FORMATETC Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory(FORMATETC Destination, long /*int*/ Source, int Length);
/**
* @param Destination cast=(PVOID),flags=no_in
* @param SourcePtr cast=(CONST VOID *)
*/
-public static final native void MoveMemory(GUID Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory(GUID Destination, long /*int*/ SourcePtr, int Length);
/**
* @param Destination cast=(PVOID),flags=no_in
* @param Source cast=(CONST VOID *)
*/
-public static final native void MoveMemory(STATSTG Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory(STATSTG Destination, long /*int*/ Source, int Length);
/**
* @param Destination cast=(PVOID),flags=no_in
* @param SourcePtr cast=(CONST VOID *)
*/
-public static final native void MoveMemory(TYPEATTR Destination, int /*long*/ SourcePtr, int Length);
+public static final native void MoveMemory(TYPEATTR Destination, long /*int*/ SourcePtr, int Length);
/**
* @param Destination cast=(PVOID),flags=no_in
* @param Source cast=(CONST VOID *)
*/
-public static final native void MoveMemory(RECT Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory(RECT Destination, long /*int*/ Source, int Length);
/**
* @param Destination cast=(PVOID),flags=no_in
* @param Source cast=(CONST VOID *)
*/
-public static final native void MoveMemory(FUNCDESC Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory(FUNCDESC Destination, long /*int*/ Source, int Length);
/**
* @param Destination cast=(PVOID),flags=no_in
* @param Source cast=(CONST VOID *)
*/
-public static final native void MoveMemory(VARDESC Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory(VARDESC Destination, long /*int*/ Source, int Length);
/**
* @param Destination cast=(PVOID),flags=no_in
* @param Source cast=(CONST VOID *)
*/
-public static final native void MoveMemory(VARIANT Destination, int /*long*/ Source, int Length);
+public static final native void MoveMemory(VARIANT Destination, long /*int*/ Source, int Length);
/**
* @param pClientSite cast=(IOleClientSite *)
* @param pStg cast=(IStorage *)
* @param ppvObject cast=(void **)
*/
-public static final native int OleCreate(GUID rclsid, GUID riid, int renderopt, FORMATETC pFormatEtc, int /*long*/ pClientSite, int /*long*/ pStg, int /*long*/[] ppvObject);
+public static final native int OleCreate(GUID rclsid, GUID riid, int renderopt, FORMATETC pFormatEtc, long /*int*/ pClientSite, long /*int*/ pStg, long /*int*/[] ppvObject);
/**
* @param lpszFileName cast=(LPCOLESTR)
* @param pClientSite cast=(LPOLECLIENTSITE)
* @param pStg cast=(LPSTORAGE)
* @param ppvObj cast=(LPVOID *)
*/
-public static final native int OleCreateFromFile(GUID rclsid, char[] lpszFileName, GUID riid, int renderopt, FORMATETC pFormatEtc, int /*long*/ pClientSite, int /*long*/ pStg, int /*long*/[] ppvObj);
+public static final native int OleCreateFromFile(GUID rclsid, char[] lpszFileName, GUID riid, int renderopt, FORMATETC pFormatEtc, long /*int*/ pClientSite, long /*int*/ pStg, long /*int*/[] ppvObj);
/**
* @param hwndOwner cast=(HWND)
* @param lpszCaption cast=(LPCOLESTR)
@@ -562,38 +562,38 @@ public static final native int OleCreateFromFile(GUID rclsid, char[] lpszFileNam
* @param lcid cast=(LCID)
* @param lpvReserved cast=(LPVOID)
*/
-public static final native int OleCreatePropertyFrame(int /*long*/ hwndOwner,int x, int y, char[] lpszCaption, int cObjects, int /*long*/[] lplpUnk, int cPages, int /*long*/ lpPageClsID, int lcid, int dwReserved, int /*long*/ lpvReserved);
+public static final native int OleCreatePropertyFrame(long /*int*/ hwndOwner,int x, int y, char[] lpszCaption, int cObjects, long /*int*/[] lplpUnk, int cPages, long /*int*/ lpPageClsID, int lcid, int dwReserved, long /*int*/ lpvReserved);
/**
* @param pUnk cast=(LPUNKNOWN)
* @param dwAspect cast=(DWORD)
* @param hdcDraw cast=(HDC)
* @param lprcBounds cast=(LPRECT)
*/
-public static final native int OleDraw(int /*long*/ pUnk, int dwAspect, int /*long*/ hdcDraw, int /*long*/ lprcBounds);
+public static final native int OleDraw(long /*int*/ pUnk, int dwAspect, long /*int*/ hdcDraw, long /*int*/ lprcBounds);
public static final native int OleFlushClipboard();
/** @param ppDataObject cast=(IDataObject **) */
-public static final native int OleGetClipboard(int /*long*/[] ppDataObject);
+public static final native int OleGetClipboard(long /*int*/[] ppDataObject);
/** @param pDataObject cast=(IDataObject *) */
-public static final native int OleIsCurrentClipboard(int /*long*/ pDataObject);
+public static final native int OleIsCurrentClipboard(long /*int*/ pDataObject);
/** @param pObject cast=(LPOLEOBJECT) */
-public static final native boolean OleIsRunning(int /*long*/ pObject);
+public static final native boolean OleIsRunning(long /*int*/ pObject);
/**
* @param pStg cast=(IStorage *)
* @param pClientSite cast=(IOleClientSite *)
* @param ppvObj cast=(LPVOID *)
*/
-public static final native int OleLoad(int /*long*/ pStg, GUID riid, int /*long*/ pClientSite, int /*long*/[] ppvObj);
+public static final native int OleLoad(long /*int*/ pStg, GUID riid, long /*int*/ pClientSite, long /*int*/[] ppvObj);
/** @param pUnknown cast=(LPUNKNOWN) */
-public static final native int OleRun(int /*long*/ pUnknown);
+public static final native int OleRun(long /*int*/ pUnknown);
/**
* @param pPS cast=(IPersistStorage *)
* @param pStg cast=(IStorage *)
*/
-public static final native int OleSave(int /*long*/ pPS, int /*long*/ pStg, boolean fSameAsLoad);
+public static final native int OleSave(long /*int*/ pPS, long /*int*/ pStg, boolean fSameAsLoad);
/** @param pDataObject cast=(IDataObject *) */
-public static final native int OleSetClipboard(int /*long*/ pDataObject);
+public static final native int OleSetClipboard(long /*int*/ pDataObject);
/** @param pUnk cast=(LPUNKNOWN) */
-public static final native int OleSetContainedObject(int /*long*/ pUnk, boolean fContained);
+public static final native int OleSetContainedObject(long /*int*/ pUnk, boolean fContained);
/**
* @method flags=trycatch
* @param holemenu cast=(HOLEMENU)
@@ -602,33 +602,33 @@ public static final native int OleSetContainedObject(int /*long*/ pUnk, boolean
* @param lpFrame cast=(LPOLEINPLACEFRAME)
* @param lpActiveObj cast=(LPOLEINPLACEACTIVEOBJECT)
*/
-public static final native int OleSetMenuDescriptor(int /*long*/ holemenu, int /*long*/ hwndFrame, int /*long*/ hwndActiveObject, int /*long*/ lpFrame, int /*long*/ lpActiveObj);
+public static final native int OleSetMenuDescriptor(long /*int*/ holemenu, long /*int*/ hwndFrame, long /*int*/ hwndActiveObject, long /*int*/ lpFrame, long /*int*/ lpActiveObj);
/**
* @param clr cast=(OLE_COLOR)
* @param hpal cast=(HPALETTE)
* @param pcolorref cast=(COLORREF *)
*/
-public static final native int OleTranslateColor(int clr, int /*long*/ hpal, int[] pcolorref);
+public static final native int OleTranslateColor(int clr, long /*int*/ hpal, int[] pcolorref);
/** @param lplpszProgID cast=(LPOLESTR *) */
-public static final native int ProgIDFromCLSID(GUID clsid, int /*long*/[] lplpszProgID);
+public static final native int ProgIDFromCLSID(GUID clsid, long /*int*/[] lplpszProgID);
/**
* @param hwnd cast=(HWND)
* @param pDropTarget cast=(IDropTarget *)
*/
-public static final native int RegisterDragDrop(int /*long*/ hwnd, int /*long*/ pDropTarget);
+public static final native int RegisterDragDrop(long /*int*/ hwnd, long /*int*/ pDropTarget);
/** @param pmedium cast=(STGMEDIUM *) */
-public static final native void ReleaseStgMedium(int /*long*/ pmedium);
+public static final native void ReleaseStgMedium(long /*int*/ pmedium);
/** @param hwnd cast=(HWND) */
-public static final native int RevokeDragDrop(int /*long*/ hwnd);
+public static final native int RevokeDragDrop(long /*int*/ hwnd);
/**
* @param hwnd cast=(HWND)
* @param pDataObject cast=(IDataObject *)
* @param pDropSource cast=(IDropSource *)
* @param pdwEffect cast=(DWORD *)
*/
-public static final native int SHDoDragDrop(int /*long*/ hwnd, int /*long*/ pDataObject, int /*long*/ pDropSource, int dwOKEffect, int[] pdwEffect);
+public static final native int SHDoDragDrop(long /*int*/ hwnd, long /*int*/ pDataObject, long /*int*/ pDropSource, int dwOKEffect, int[] pdwEffect);
/** @param ppstgOpen cast=(IStorage **) */
-public static final native int StgCreateDocfile(char[] pwcsName, int grfMode, int reserved, int /*long*/[] ppstgOpen);
+public static final native int StgCreateDocfile(char[] pwcsName, int grfMode, int reserved, long /*int*/[] ppstgOpen);
/** @param pwcsName cast=(const WCHAR *) */
public static final native int StgIsStorageFile(char[] pwcsName);
/**
@@ -637,144 +637,144 @@ public static final native int StgIsStorageFile(char[] pwcsName);
* @param snbExclude cast=(SNB)
* @param ppstgOpen cast=(IStorage **)
*/
-public static final native int StgOpenStorage(char[] pwcsName, int /*long*/ pstgPriority, int grfMode, int /*long*/ snbExclude, int reserved, int /*long*/[] ppstgOpen);
+public static final native int StgOpenStorage(char[] pwcsName, long /*int*/ pstgPriority, int grfMode, long /*int*/ snbExclude, int reserved, long /*int*/[] ppstgOpen);
/** @param ppsz cast=(LPOLESTR *) */
-public static final native int StringFromCLSID(GUID rclsid, int /*long*/[] ppsz);
+public static final native int StringFromCLSID(GUID rclsid, long /*int*/[] ppsz);
/** @param sz cast=(OLECHAR *) */
-public static final native int /*long*/ SysAllocString(char [] sz);
+public static final native long /*int*/ SysAllocString(char [] sz);
/** @param bstr cast=(BSTR) */
-public static final native void SysFreeString(int /*long*/ bstr);
+public static final native void SysFreeString(long /*int*/ bstr);
/** @param bstr cast=(BSTR) */
-public static final native int SysStringByteLen(int /*long*/ bstr);
+public static final native int SysStringByteLen(long /*int*/ bstr);
/** @param bstr cast=(BSTR) */
-public static final native int SysStringLen(int /*long*/ bstr);
+public static final native int SysStringLen(long /*int*/ bstr);
/**
* @param pvargDest cast=(VARIANTARG FAR* )
* @param pvarSrc cast=(VARIANTARG FAR* )
* @param vt cast=(VARTYPE)
*/
-public static final native int VariantChangeType(int /*long*/ pvargDest, int /*long*/ pvarSrc, short wFlags, short vt);
+public static final native int VariantChangeType(long /*int*/ pvargDest, long /*int*/ pvarSrc, short wFlags, short vt);
/** @param pvarg cast=(VARIANTARG FAR* ) */
-public static final native int VariantClear(int /*long*/ pvarg);
+public static final native int VariantClear(long /*int*/ pvarg);
/** @param pvarg cast=(VARIANTARG FAR* ) */
-public static final native void VariantInit(int /*long*/ pvarg);
+public static final native void VariantInit(long /*int*/ pvarg);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, char[] arg1);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, POINT arg2, int arg3);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, POINT arg2, int arg3);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, POINT arg1, int arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, POINT arg1, long arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, POINT arg0, int arg1);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, SHDRAGIMAGE arg0, int arg1);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, SHDRAGIMAGE arg0, long arg1);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, POINT arg2, int arg3);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, POINT arg2, int arg3);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, POINT arg1, int arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, POINT arg1, long arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, POINT arg0, int arg1);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, SHDRAGIMAGE arg0, int arg1);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, SHDRAGIMAGE arg0, long arg1);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int[] arg4);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, long[] arg4);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, int arg2, int arg3, long[] arg4);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int[] arg4);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, long[] arg4);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1, int arg2, int arg3, long[] arg4);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, int arg2, int arg3, int arg4, long[] arg5);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1, int arg2, int arg3, int arg4, long[] arg5);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long[] arg1);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long[] arg1);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long[] arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long[] arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, int[] arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int[] arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long[] arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long[] arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long[] arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, int[] arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int[] arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, DVTARGETDEVICE arg2, SIZE arg3);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, DVTARGETDEVICE arg2, SIZE arg3);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, GUID arg2, int arg3, int [] arg4);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, GUID arg2, long arg3, long [] arg4);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, GUID arg2, int arg3, int [] arg4);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, GUID arg2, long arg3, long [] arg4);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, FORMATETC arg1, int [] arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, FORMATETC arg1, long[] arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, FORMATETC arg1, int [] arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, FORMATETC arg1, long[] arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, GUID arg1);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, GUID arg1);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, GUID arg1, int arg2, int arg3);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, GUID arg1, long arg2, long arg3);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, GUID arg1, int arg2, int arg3);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, GUID arg1, long arg2, long arg3);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, GUID arg1, int arg2, int arg3, DISPPARAMS arg4, int arg5, EXCEPINFO arg6, int[] arg7);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, GUID arg1, int arg2, int arg3, DISPPARAMS arg4, long arg5, EXCEPINFO arg6, int[] arg7);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, GUID arg1, int arg2, int arg3, DISPPARAMS arg4, int arg5, EXCEPINFO arg6, int[] arg7);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, GUID arg1, int arg2, int arg3, DISPPARAMS arg4, long arg5, EXCEPINFO arg6, int[] arg7);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, STATSTG arg1, int [] arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, STATSTG arg1, long[] arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, STATSTG arg1, int [] arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, STATSTG arg1, long[] arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, MSG arg0);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, MSG arg0);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, MSG arg1, int arg2, int arg3, int arg4, RECT arg5);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, MSG arg1, long arg2, int arg3, long arg4, RECT arg5);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, MSG arg1, int arg2, int arg3, int arg4, RECT arg5);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, MSG arg1, long arg2, int arg3, long arg4, RECT arg5);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, SIZE arg1);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, SIZE arg1);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, boolean arg1);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, boolean arg1);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, boolean arg1);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, boolean arg1);
-public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, boolean arg0);
-public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, boolean arg0, int arg1);
-public static final native int VtblCall (int fnNumber, int /*long*/ ppVtbl, boolean arg0, long arg1);
+public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, boolean arg0);
+public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, boolean arg0, int arg1);
+public static final native int VtblCall (int fnNumber, long /*int*/ ppVtbl, boolean arg0, long arg1);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, CAUUID arg0);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, CONTROLINFO arg0);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, FORMATETC arg0);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, FORMATETC arg0, STGMEDIUM arg1);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, FORMATETC arg0, STGMEDIUM arg1, boolean arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, CAUUID arg0);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, CONTROLINFO arg0);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, FORMATETC arg0);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, FORMATETC arg0, STGMEDIUM arg1);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, FORMATETC arg0, STGMEDIUM arg1, boolean arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, int[] arg1);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, long[] arg1);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, int[] arg1);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, long[] arg1);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, GUID arg1, int[] arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, GUID arg1, long[] arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, GUID arg1, int[] arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, GUID arg1, long[] arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, int arg1, int arg2, int arg3, int[] arg4);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, long arg1, int arg2, int arg3, int[] arg4);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, int arg1, int arg2, int arg3, int[] arg4);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, long arg1, int arg2, int arg3, int[] arg4);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, int arg1, int arg2, int arg3, int arg4);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, int arg1, int arg2, long arg3, long arg4);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, int arg1, int arg2, int arg3, int arg4);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, int arg1, int arg2, long arg3, long arg4);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, GUID arg0, int arg1, OLECMD arg2, OLECMDTEXT arg3);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, GUID arg0, int arg1, OLECMD arg2, OLECMDTEXT arg3);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, LICINFO arg0);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, LICINFO arg0);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0, int arg1, boolean arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0, long arg1, boolean arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0, int arg1, boolean arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0, long arg1, boolean arg2);
/**
* @param arg0 flags=struct
*/
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0, int arg1, int arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0, int arg1, int arg2);
/**
* @param arg0 flags=struct
*/
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0, long arg1, long arg2);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0, long arg1, long arg2);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0, RECT arg1);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, RECT arg0);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0, RECT arg1);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, RECT arg0);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int [] arg1, int [] arg2, int[] arg3, int [] arg4);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long[] arg1, long[] arg2, int[] arg3, long[] arg4);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int [] arg1, int [] arg2, int[] arg3, int [] arg4);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long[] arg1, long[] arg2, int[] arg3, long[] arg4);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int [] arg1, int arg2, int[] arg3);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long[] arg1, int arg2, int[] arg3);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int [] arg1, int arg2, int[] arg3);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long[] arg1, int arg2, int[] arg3);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, DISPPARAMS arg3, int arg4, EXCEPINFO arg5, int arg6);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, DISPPARAMS arg3, long arg4, EXCEPINFO arg5, long arg6);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, DISPPARAMS arg3, int arg4, EXCEPINFO arg5, int arg6);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, DISPPARAMS arg3, long arg4, EXCEPINFO arg5, long arg6);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] pszPropName, int[] pVar, int[] pErrorLog);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] pszPropName, int pVar, int[] pErrorLog);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] pszPropName, int[] pVar, int[] pErrorLog);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] pszPropName, int pVar, int[] pErrorLog);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int type, int listener, boolean useCapture);
-public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long type, long listener, boolean useCapture);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int type, int listener, boolean useCapture);
+public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long type, long listener, boolean useCapture);
/** @param pStg cast=(IStorage *) */
-public static final native int WriteClassStg(int /*long*/ pStg, GUID rclsid);
+public static final native int WriteClassStg(long /*int*/ pStg, GUID rclsid);
/** Accessibility constants */
public static final int CHILDID_SELF = 0;
@@ -950,18 +950,18 @@ public static final int IA2_SCROLL_TYPE_ANYWHERE = 6;
* @param dwObjectID cast=(DWORD)
* @param ppvObject cast=(LPVOID *)
*/
-public static final native int AccessibleObjectFromWindow (int /*long*/ hwnd, int dwObjectID, GUID riid, int /*long*/[] ppvObject);
+public static final native int AccessibleObjectFromWindow (long /*int*/ hwnd, int dwObjectID, GUID riid, long /*int*/[] ppvObject);
/**
* @method flags=dynamic
* @param hwnd cast=(HWND)
* @param ppvObject cast=(LPVOID *)
*/
-public static final native int CreateStdAccessibleObject (int /*long*/ hwnd, int idObject, GUID riidInterface, int /*long*/[] ppvObject);
+public static final native int CreateStdAccessibleObject (long /*int*/ hwnd, int idObject, GUID riidInterface, long /*int*/[] ppvObject);
/**
* @method flags=dynamic
* @param pAcc cast=(LPUNKNOWN)
*/
-public static final native int /*long*/ LresultFromObject (GUID riid, int /*long*/ wParam, int /*long*/ pAcc);
+public static final native long /*int*/ LresultFromObject (GUID riid, long /*int*/ wParam, long /*int*/ pAcc);
/**
* @method flags=dynamic
* @param paccContainer cast=(IAccessible *)
@@ -970,63 +970,63 @@ public static final native int /*long*/ LresultFromObject (GUID riid, int /*long
* @param rgvarChildren cast=(VARIANT *)
* @param pcObtained cast=(LONG *)
*/
-public static final native int AccessibleChildren(int /*long*/ paccContainer, int iChildStart, int cChildren, int /*long*/ rgvarChildren, int [] pcObtained);
+public static final native int AccessibleChildren(long /*int*/ paccContainer, int iChildStart, int cChildren, long /*int*/ rgvarChildren, int [] pcObtained);
-/*USED*/public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3);
-/*USED*/public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);
+/*USED*/public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3);
+/*USED*/public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);
/*USED,NEW*/public static final native int VtblCall(int fnNumber, long ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4);
-/*USED*/public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int /*long*/ arg5);
-/*USED,NEW*/public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, int arg1, int arg2, int arg3, int arg4, int /*long*/ arg5);
-/*USED*/public static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int arg4, int arg5, int arg6, int arg7);
+/*USED*/public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, long /*int*/ arg5);
+/*USED,NEW*/public static final native int VtblCall(int fnNumber, long ppVtbl, long arg0, int arg1, int arg2, int arg3, int arg4, long /*int*/ arg5);
+/*USED*/public static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, int arg4, int arg5, int arg6, int arg7);
/** Custom accessibility natives */
/** @method flags=no_gen */
-public static final native int VtblCall_VARIANT(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0);
+public static final native int VtblCall_VARIANT(int fnNumber, long /*int*/ ppVtbl, long /*int*/ arg0);
/** @method flags=no_gen */
-public static final native int VtblCall_VARIANTP(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1);
+public static final native int VtblCall_VARIANTP(int fnNumber, long /*int*/ ppVtbl, long /*int*/ arg0, long /*int*/ arg1);
/** @method flags=no_gen */
-public static final native int VtblCall_IVARIANT(int fnNumber, int /*long*/ ppVtbl, int arg0, int /*long*/ arg1);
+public static final native int VtblCall_IVARIANT(int fnNumber, long /*int*/ ppVtbl, int arg0, long /*int*/ arg1);
/** @method flags=no_gen */
-public static final native int VtblCall_IVARIANTP(int fnNumber, int /*long*/ ppVtbl, int arg0, int /*long*/ arg1, int /*long*/ arg2);
+public static final native int VtblCall_IVARIANTP(int fnNumber, long /*int*/ ppVtbl, int arg0, long /*int*/ arg1, long /*int*/ arg2);
/** @method flags=no_gen */
-public static final native int VtblCall_PVARIANTP(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2);
+public static final native int VtblCall_PVARIANTP(int fnNumber, long /*int*/ ppVtbl, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2);
/** @method flags=no_gen */
-public static final native int VtblCall_PPPPVARIANT(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4);
+public static final native int VtblCall_PPPPVARIANT(int fnNumber, long /*int*/ ppVtbl, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4);
/** @method flags=no_gen */
-public static final native int /*long*/ get_accChild_CALLBACK(int /*long*/ func);
+public static final native long /*int*/ get_accChild_CALLBACK(long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ get_accName_CALLBACK(int /*long*/ func);
+public static final native long /*int*/ get_accName_CALLBACK(long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ get_accValue_CALLBACK(int /*long*/ func);
+public static final native long /*int*/ get_accValue_CALLBACK(long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ get_accDescription_CALLBACK(int /*long*/ func);
+public static final native long /*int*/ get_accDescription_CALLBACK(long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ get_accRole_CALLBACK(int /*long*/ func);
+public static final native long /*int*/ get_accRole_CALLBACK(long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ get_accState_CALLBACK(int /*long*/ func);
+public static final native long /*int*/ get_accState_CALLBACK(long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ get_accHelp_CALLBACK(int /*long*/ func);
+public static final native long /*int*/ get_accHelp_CALLBACK(long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ get_accHelpTopic_CALLBACK(int /*long*/ func);
+public static final native long /*int*/ get_accHelpTopic_CALLBACK(long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ get_accKeyboardShortcut_CALLBACK(int /*long*/ func);
+public static final native long /*int*/ get_accKeyboardShortcut_CALLBACK(long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ get_accDefaultAction_CALLBACK(int /*long*/ func);
+public static final native long /*int*/ get_accDefaultAction_CALLBACK(long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ accSelect_CALLBACK(int /*long*/ func);
+public static final native long /*int*/ accSelect_CALLBACK(long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ accLocation_CALLBACK(int /*long*/ func);
+public static final native long /*int*/ accLocation_CALLBACK(long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ accNavigate_CALLBACK(int /*long*/ func);
+public static final native long /*int*/ accNavigate_CALLBACK(long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ accDoDefaultAction_CALLBACK(int /*long*/ func);
+public static final native long /*int*/ accDoDefaultAction_CALLBACK(long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ put_accName_CALLBACK(int /*long*/ func);
+public static final native long /*int*/ put_accName_CALLBACK(long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ put_accValue_CALLBACK(int /*long*/ func);
+public static final native long /*int*/ put_accValue_CALLBACK(long /*int*/ func);
/** @method flags=no_gen,callback_types=HRESULT;VARIANT;,callback_flags=none;struct; */
-public static final native int /*long*/ CALLBACK_setCurrentValue(int /*long*/ func);
+public static final native long /*int*/ CALLBACK_setCurrentValue(long /*int*/ func);
/* sizeof's */
public static final native int CAUUID_sizeof();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java
index d95aac5123..5ba2d6f505 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java
@@ -13,7 +13,7 @@ package org.eclipse.swt.internal.ole.win32;
public final class CONTROLINFO {
public int cb;
/** @field cast=(HACCEL) */
- public int /*long*/ hAccel;
+ public long /*int*/ hAccel;
public short cAccel;
public int dwFlags;
public static final int sizeof = COM.CONTROLINFO_sizeof ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java
index 125240cfd9..82d51abf58 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java
@@ -13,9 +13,9 @@ package org.eclipse.swt.internal.ole.win32;
public class COSERVERINFO {
public int dwReserved1;
/** @field cast=(LPWSTR) */
- public int /*long*/ pwszName;
+ public long /*int*/ pwszName;
/** @field cast=(COAUTHINFO *) */
- public int /*long*/ pAuthInfo;
+ public long /*int*/ pAuthInfo;
public int dwReserved2;
public static final int sizeof = COM.COSERVERINFO_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java
index db5c5886ac..014e86ceb0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java
@@ -12,9 +12,9 @@ package org.eclipse.swt.internal.ole.win32;
public final class DISPPARAMS {
/** @field cast=(VARIANTARG FAR *) */
- public int /*long*/ rgvarg;
+ public long /*int*/ rgvarg;
/** @field cast=(DISPID FAR *) */
- public int /*long*/ rgdispidNamedArgs;
+ public long /*int*/ rgdispidNamedArgs;
public int cArgs;
public int cNamedArgs;
public static final int sizeof = COM.DISPPARAMS_sizeof ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java
index 207dea841f..a2e0ebbdab 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java
@@ -14,16 +14,16 @@ public final class EXCEPINFO {
public short wCode;
public short wReserved;
/** @field cast=(BSTR) */
- public int /*long*/ bstrSource;
+ public long /*int*/ bstrSource;
/** @field cast=(BSTR) */
- public int /*long*/ bstrDescription;
+ public long /*int*/ bstrDescription;
/** @field cast=(BSTR) */
- public int /*long*/ bstrHelpFile;
+ public long /*int*/ bstrHelpFile;
public int dwHelpContext;
/** @field cast=(void FAR *) */
- public int /*long*/ pvReserved;
+ public long /*int*/ pvReserved;
/** @field cast=(HRESULT (STDAPICALLTYPE FAR* )(struct tagEXCEPINFO FAR*)) */
- public int /*long*/ pfnDeferredFillIn;
+ public long /*int*/ pfnDeferredFillIn;
public int scode;
public static final int sizeof = COM.EXCEPINFO_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java
index 5bfaf024ce..f5f53878e8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java
@@ -14,7 +14,7 @@ public final class FORMATETC {
/** @field cast=(CLIPFORMAT) */
public int cfFormat;
/** @field cast=(DVTARGETDEVICE *) */
- public int /*long*/ ptd;
+ public long /*int*/ ptd;
public int dwAspect;
public int lindex;
public int tymed;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC.java
index a9e4ab3d4e..be3f07b275 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC.java
@@ -14,9 +14,9 @@ public class FUNCDESC {
/** @field cast=(MEMBERID) */
public int memid;
/** @field cast=(SCODE FAR *) */
- public int /*long*/ lprgscode;
+ public long /*int*/ lprgscode;
/** @field cast=(ELEMDESC FAR *) */
- public int /*long*/ lprgelemdescParam;
+ public long /*int*/ lprgelemdescParam;
/** @field cast=(FUNCKIND) */
public int funckind;
/** @field cast=(INVOKEKIND) */
@@ -30,12 +30,12 @@ public class FUNCDESC {
// ELEMDESC elemdescFunc;
// TYPEDESC elemdescFunc.tdesc
/** @field accessor=elemdescFunc.tdesc.lptdesc,cast=(struct FARSTRUCT tagTYPEDESC FAR* ) */
- public int /*long*/ elemdescFunc_tdesc_union;
+ public long /*int*/ elemdescFunc_tdesc_union;
/** @field accessor=elemdescFunc.tdesc.vt */
public short elemdescFunc_tdesc_vt;
// PARAMDESC elemdescFunc.paramdesc
/** @field accessor=elemdescFunc.paramdesc.pparamdescex,cast=(LPPARAMDESCEX) */
- public int /*long*/ elemdescFunc_paramdesc_pparamdescex;
+ public long /*int*/ elemdescFunc_paramdesc_pparamdescex;
/** @field accessor=elemdescFunc.paramdesc.wParamFlags */
public short elemdescFunc_paramdesc_wParamFlags;
public short wFuncFlags;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java
index 607d4e7e67..2302ae3de1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IAccessible.java
@@ -13,71 +13,71 @@ package org.eclipse.swt.internal.ole.win32;
public class IAccessible extends IDispatch {
-public IAccessible(int /*long*/ address) {
+public IAccessible(long /*int*/ address) {
super(address);
}
-public int get_accParent(int /*long*/ ppdispParent) {
+public int get_accParent(long /*int*/ ppdispParent) {
return COM.VtblCall(7, address, ppdispParent);
}
-public int get_accChildCount(int /*long*/ pcountChildren) {
+public int get_accChildCount(long /*int*/ pcountChildren) {
return COM.VtblCall(8, address, pcountChildren);
}
-public int get_accChild(int /*long*/ variant, int /*long*/ ppdispChild) {
+public int get_accChild(long /*int*/ variant, long /*int*/ ppdispChild) {
return COM.VtblCall_VARIANTP(9, address, variant, ppdispChild);
}
-public int get_accName(int /*long*/ variant, int /*long*/ pszName) {
+public int get_accName(long /*int*/ variant, long /*int*/ pszName) {
return COM.VtblCall_VARIANTP(10, address, variant, pszName);
}
-public int get_accValue(int /*long*/ variant, int /*long*/ pszValue) {
+public int get_accValue(long /*int*/ variant, long /*int*/ pszValue) {
return COM.VtblCall_VARIANTP(11, address, variant, pszValue);
}
-public int get_accDescription(int /*long*/ variant, int /*long*/ pszDescription) {
+public int get_accDescription(long /*int*/ variant, long /*int*/ pszDescription) {
return COM.VtblCall_VARIANTP(12, address, variant, pszDescription);
}
-public int get_accRole(int /*long*/ variant, int /*long*/ pvarRole) {
+public int get_accRole(long /*int*/ variant, long /*int*/ pvarRole) {
return COM.VtblCall_VARIANTP(13, address, variant, pvarRole);
}
-public int get_accState(int /*long*/ variant, int /*long*/ pvarState) {
+public int get_accState(long /*int*/ variant, long /*int*/ pvarState) {
return COM.VtblCall_VARIANTP(14, address, variant, pvarState);
}
-public int get_accHelp(int /*long*/ variant, int /*long*/ pszHelp) {
+public int get_accHelp(long /*int*/ variant, long /*int*/ pszHelp) {
return COM.VtblCall_VARIANTP(15, address, variant, pszHelp);
}
-public int get_accHelpTopic(int /*long*/ pszHelpFile, int /*long*/ variant, int /*long*/ pidTopic) {
+public int get_accHelpTopic(long /*int*/ pszHelpFile, long /*int*/ variant, long /*int*/ pidTopic) {
return COM.VtblCall_PVARIANTP(16, address, pszHelpFile, variant, pidTopic);
}
-public int get_accKeyboardShortcut(int /*long*/ variant, int /*long*/ pszKeyboardShortcut) {
+public int get_accKeyboardShortcut(long /*int*/ variant, long /*int*/ pszKeyboardShortcut) {
return COM.VtblCall_VARIANTP(17, address, variant, pszKeyboardShortcut);
}
-public int get_accFocus(int /*long*/ pvarChild) {
+public int get_accFocus(long /*int*/ pvarChild) {
return COM.VtblCall(18, address, pvarChild);
}
-public int get_accSelection(int /*long*/ pvarChildren) {
+public int get_accSelection(long /*int*/ pvarChildren) {
return COM.VtblCall(19, address, pvarChildren);
}
-public int get_accDefaultAction(int /*long*/ variant, int /*long*/ pszDefaultAction) {
+public int get_accDefaultAction(long /*int*/ variant, long /*int*/ pszDefaultAction) {
return COM.VtblCall_VARIANTP(20, address, variant, pszDefaultAction);
}
-public int accSelect(int flagsSelect, int /*long*/ variant) {
+public int accSelect(int flagsSelect, long /*int*/ variant) {
return COM.VtblCall_IVARIANT(21, address, flagsSelect, variant);
}
-public int accLocation(int /*long*/ pxLeft, int /*long*/ pyTop, int /*long*/ pcxWidth, int /*long*/ pcyHeight, int /*long*/ variant) {
+public int accLocation(long /*int*/ pxLeft, long /*int*/ pyTop, long /*int*/ pcxWidth, long /*int*/ pcyHeight, long /*int*/ variant) {
return COM.VtblCall_PPPPVARIANT(22, address, pxLeft, pyTop, pcxWidth, pcyHeight, variant);
}
-public int accNavigate(int navDir, int /*long*/ variant, int /*long*/ pvarEndUpAt) {
+public int accNavigate(int navDir, long /*int*/ variant, long /*int*/ pvarEndUpAt) {
return COM.VtblCall_IVARIANTP(23, address, navDir, variant, pvarEndUpAt);
}
-public int accHitTest(int xLeft, int yTop, int /*long*/ pvarChild) {
+public int accHitTest(int xLeft, int yTop, long /*int*/ pvarChild) {
return COM.VtblCall(24, address, xLeft, yTop, pvarChild);
}
-public int accDoDefaultAction(int /*long*/ variant) {
+public int accDoDefaultAction(long /*int*/ variant) {
return COM.VtblCall_VARIANT(25, address, variant);
}
-public int put_accName(int /*long*/ variant, int /*long*/ szName) {
+public int put_accName(long /*int*/ variant, long /*int*/ szName) {
return COM.VtblCall_VARIANTP(26, address, variant, szName);
}
-public int put_accValue(int /*long*/ variant, int /*long*/ szValue) {
+public int put_accValue(long /*int*/ variant, long /*int*/ szValue) {
return COM.VtblCall_VARIANTP(27, address, variant, szValue);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java
index c10211c0a0..b910113f88 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java
@@ -12,16 +12,16 @@ package org.eclipse.swt.internal.ole.win32;
public class IClassFactory2 extends IUnknown
{
-public IClassFactory2(int /*long*/ address) {
+public IClassFactory2(long /*int*/ address) {
super(address);
}
-public int CreateInstanceLic(int /*long*/ pUnkOuter, int /*long*/ pUnkReserved, GUID riid, int /*long*/ bstrKey, int /*long*/ ppvObject[]) {
+public int CreateInstanceLic(long /*int*/ pUnkOuter, long /*int*/ pUnkReserved, GUID riid, long /*int*/ bstrKey, long /*int*/ ppvObject[]) {
return COM.VtblCall(7, address, pUnkOuter, pUnkReserved, riid, bstrKey, ppvObject);
}
public int GetLicInfo(LICINFO licInfo) {
return COM.VtblCall(5, address, licInfo);
}
-public int RequestLicKey(int dwReserved, int /*long*/[] pBstrKey) {
+public int RequestLicKey(int dwReserved, long /*int*/[] pBstrKey) {
return COM.VtblCall(6, address, dwReserved, pBstrKey);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java
index 66b4b3599f..afa960f7dd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java
@@ -12,10 +12,10 @@ package org.eclipse.swt.internal.ole.win32;
public class IConnectionPoint extends IUnknown
{
-public IConnectionPoint(int /*long*/ address) {
+public IConnectionPoint(long /*int*/ address) {
super(address);
}
-public int Advise(int /*long*/ pUnk, int[] pdwCookie) {
+public int Advise(long /*int*/ pUnk, int[] pdwCookie) {
return COM.VtblCall(5, address, pUnk, pdwCookie);
}
public int Unadvise(int dwCookie) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java
index 250713aa25..083208b86b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java
@@ -12,10 +12,10 @@ package org.eclipse.swt.internal.ole.win32;
public class IConnectionPointContainer extends IUnknown
{
-public IConnectionPointContainer(int /*long*/ address) {
+public IConnectionPointContainer(long /*int*/ address) {
super(address);
}
-public int FindConnectionPoint(GUID riid, int /*long*/[] ppCP) {
+public int FindConnectionPoint(GUID riid, long /*int*/[] ppCP) {
return COM.VtblCall(4, address, riid, ppCP);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java
index b788e201b0..d183e8906b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java
@@ -11,10 +11,10 @@
package org.eclipse.swt.internal.ole.win32;
public class IDataObject extends IUnknown {
-public IDataObject(int /*long*/ address) {
+public IDataObject(long /*int*/ address) {
super(address);
}
-public int EnumFormatEtc(int dwDirection, int /*long*/[] ppenumFormatetc) {
+public int EnumFormatEtc(int dwDirection, long /*int*/[] ppenumFormatetc) {
return COM.VtblCall(8, address, dwDirection, ppenumFormatetc);
}
public int GetData(FORMATETC pFormatetc, STGMEDIUM pmedium) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java
index 211582bceb..e12faaca8b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java
@@ -14,7 +14,7 @@ import org.eclipse.swt.internal.win32.*;
public class IDispatch extends IUnknown {
-public IDispatch(int /*long*/ address) {
+public IDispatch(long /*int*/ address) {
super(address);
}
public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, int[] rgDispId) {
@@ -23,9 +23,9 @@ public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, in
int size = rgszNames.length;
// create an array to hold the addresses
- int /*long*/ hHeap = OS.GetProcessHeap();
- int /*long*/ ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size * OS.PTR_SIZEOF);
- int /*long*/[] memTracker = new int /*long*/[size];
+ long /*int*/ hHeap = OS.GetProcessHeap();
+ long /*int*/ ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size * OS.PTR_SIZEOF);
+ long /*int*/[] memTracker = new long /*int*/[size];
try {
// add the address of each string to the array
@@ -36,10 +36,10 @@ public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, in
buffer = new char[nameSize +1];
rgszNames[i].getChars(0, nameSize, buffer, 0);
// get the address of the start of the array of char
- int /*long*/ pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2);
+ long /*int*/ pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2);
OS.MoveMemory(pName, buffer, buffer.length * 2);
// copy the address to the array of addresses
- COM.MoveMemory(ppNames + OS.PTR_SIZEOF * i, new int /*long*/[]{pName}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppNames + OS.PTR_SIZEOF * i, new long /*int*/[]{pName}, OS.PTR_SIZEOF);
// keep track of the Global Memory so we can free it
memTracker[i] = pName;
}
@@ -54,13 +54,13 @@ public int GetIDsOfNames(GUID riid, String[] rgszNames, int cNames, int lcid, in
OS.HeapFree(hHeap, 0, ppNames);
}
}
-public int GetTypeInfo(int iTInfo, int lcid, int /*long*/[] ppTInfo ){
+public int GetTypeInfo(int iTInfo, int lcid, long /*int*/[] ppTInfo ){
return COM.VtblCall(4, address, iTInfo, lcid, ppTInfo);
}
public int GetTypeInfoCount(int [] pctinfo ){
return COM.VtblCall(3, address, pctinfo);
}
-public int Invoke(int dispIdMember, GUID riid, int lcid, int dwFlags, DISPPARAMS pDispParams, int /*long*/ pVarResult, EXCEPINFO pExcepInfo, int[] pArgErr) {
+public int Invoke(int dispIdMember, GUID riid, int lcid, int dwFlags, DISPPARAMS pDispParams, long /*int*/ pVarResult, EXCEPINFO pExcepInfo, int[] pArgErr) {
return COM.VtblCall(6, address, dispIdMember, riid, lcid, dwFlags, pDispParams, pVarResult, pExcepInfo, pArgErr);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatchEx.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatchEx.java
index 76e18752b3..6c857d26d9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatchEx.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatchEx.java
@@ -12,19 +12,19 @@ package org.eclipse.swt.internal.ole.win32;
public class IDispatchEx extends IDispatch {
-public IDispatchEx (int /*long*/ address) {
+public IDispatchEx (long /*int*/ address) {
super (address);
}
-public int GetDispID (int /*long*/ bstrName, int grfdex, int[] pid) {
+public int GetDispID (long /*int*/ bstrName, int grfdex, int[] pid) {
return COM.VtblCall (7, address, bstrName, grfdex, pid);
}
-public int InvokeEx (int id, int lcid, int wFlags, DISPPARAMS pdp, int /*long*/ pvarRes, EXCEPINFO pei, int /*long*/ pspCaller) {
+public int InvokeEx (int id, int lcid, int wFlags, DISPPARAMS pdp, long /*int*/ pvarRes, EXCEPINFO pei, long /*int*/ pspCaller) {
return COM.VtblCall (8, address, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller);
}
-public int DeleteMemberByName (int /*long*/ bstrName, int grfdex) {
+public int DeleteMemberByName (long /*int*/ bstrName, int grfdex) {
return COM.VtblCall (9, address, bstrName, grfdex);
}
@@ -36,7 +36,7 @@ public int GetMemberProperties (int id, int grfdexFetch, int[] pgrfdex) {
return COM.VtblCall (11, address, id, grfdexFetch, pgrfdex);
}
-public int GetMemberName (int id, int /*long*/[] pbstrName) {
+public int GetMemberName (int id, long /*int*/[] pbstrName) {
return COM.VtblCall (12, address, id, pbstrName);
}
@@ -44,7 +44,7 @@ public int GetNextDispID (int grfdex, int id, int[] pid) {
return COM.VtblCall (13, address, grfdex, id, pid);
}
-public int GetNameSpaceParent (int /*long*/[] ppunk) {
+public int GetNameSpaceParent (long /*int*/[] ppunk) {
return COM.VtblCall (14, address, ppunk);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper.java
index b739306765..4e2221db84 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper.java
@@ -13,13 +13,13 @@ package org.eclipse.swt.internal.ole.win32;
import org.eclipse.swt.internal.win32.*;
public class IDragSourceHelper extends IUnknown {
-public IDragSourceHelper(int /*long*/ address) {
+public IDragSourceHelper(long /*int*/ address) {
super(address);
}
-public int InitializeFromBitmap(SHDRAGIMAGE pshdi, int /*long*/ pDataObject) {
+public int InitializeFromBitmap(SHDRAGIMAGE pshdi, long /*int*/ pDataObject) {
return COM.VtblCall(3, address, pshdi, pDataObject);
}
-public int InitializeFromWindow(int /*long*/ hwnd, POINT ppt, int /*long*/ pDataObject) {
+public int InitializeFromWindow(long /*int*/ hwnd, POINT ppt, long /*int*/ pDataObject) {
return COM.VtblCall(4, address, hwnd, ppt, pDataObject);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper2.java
index 5a2f611f2f..76621b5fe6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDragSourceHelper2.java
@@ -11,7 +11,7 @@
package org.eclipse.swt.internal.ole.win32;
public class IDragSourceHelper2 extends IDragSourceHelper {
-public IDragSourceHelper2(int /*long*/ address) {
+public IDragSourceHelper2(long /*int*/ address) {
super(address);
}
public int SetFlags(int dwFlags) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDropTargetHelper.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDropTargetHelper.java
index 4c66578475..294b3ad2f4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDropTargetHelper.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDropTargetHelper.java
@@ -13,10 +13,10 @@ package org.eclipse.swt.internal.ole.win32;
import org.eclipse.swt.internal.win32.*;
public class IDropTargetHelper extends IUnknown {
-public IDropTargetHelper(int /*long*/ address) {
+public IDropTargetHelper(long /*int*/ address) {
super(address);
}
-public int DragEnter(int /*long*/ hwndTarget, int /*long*/ pDataObject, POINT ppt, int dwEffect) {
+public int DragEnter(long /*int*/ hwndTarget, long /*int*/ pDataObject, POINT ppt, int dwEffect) {
return COM.VtblCall(3, address, hwndTarget, pDataObject, ppt, dwEffect);
}
public int DragLeave() {
@@ -25,7 +25,7 @@ public int DragLeave() {
public int DragOver(POINT ppt, int dwEffect) {
return COM.VtblCall(5, address, ppt, dwEffect);
}
-public int Drop(int /*long*/ pDataObject, POINT ppt, int dwEffect) {
+public int Drop(long /*int*/ pDataObject, POINT ppt, int dwEffect) {
return COM.VtblCall(6, address, pDataObject, ppt, dwEffect);
}
public int Show(boolean fShow) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java
index e208d9b0c2..0ab50ddd4b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java
@@ -12,13 +12,13 @@ package org.eclipse.swt.internal.ole.win32;
public class IEnum extends IUnknown
{
-public IEnum(int /*long*/ address) {
+public IEnum(long /*int*/ address) {
super(address);
}
-public int Clone( int /*long*/[] ppenum ){
+public int Clone( long /*int*/[] ppenum ){
return COM.VtblCall(6, address, ppenum);
}
-public int Next(int celt, int /*long*/ rgelt, int[] pceltFetched ){
+public int Next(int celt, long /*int*/ rgelt, int[] pceltFetched ){
return COM.VtblCall(3, address, celt, rgelt, pceltFetched);
}
public int Reset() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java
index 44db7e38df..43fe9bf70a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java
@@ -11,7 +11,7 @@
package org.eclipse.swt.internal.ole.win32;
public class IEnumFORMATETC extends IEnum {
-public IEnumFORMATETC(int /*long*/ address) {
+public IEnumFORMATETC(long /*int*/ address) {
super(address);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java
index 7ae5f3c343..4beb656c43 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java
@@ -11,7 +11,7 @@
package org.eclipse.swt.internal.ole.win32;
public class IEnumSTATSTG extends IEnum {
-public IEnumSTATSTG(int /*long*/ address) {
+public IEnumSTATSTG(long /*int*/ address) {
super(address);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumVARIANT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumVARIANT.java
index 478178a8ca..d14e1dff91 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumVARIANT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumVARIANT.java
@@ -11,7 +11,7 @@
package org.eclipse.swt.internal.ole.win32;
public class IEnumVARIANT extends IEnum {
-public IEnumVARIANT(int /*long*/ address) {
+public IEnumVARIANT(long /*int*/ address) {
super(address);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java
index edfdd07b40..291c7c1435 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java
@@ -11,10 +11,10 @@
package org.eclipse.swt.internal.ole.win32;
public class IFont extends IUnknown {
-public IFont(int /*long*/ address) {
+public IFont(long /*int*/ address) {
super(address);
}
-public int get_hFont(int /*long*/[] phfont){
+public int get_hFont(long /*int*/[] phfont){
return COM.VtblCall(3, address, phfont);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java
index 4ef147e8db..4b1f94bbaa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java
@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32;
public class IMoniker extends IPersist
{
-public IMoniker(int /*long*/ address) {
+public IMoniker(long /*int*/ address) {
super(address);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java
index 734cdad81b..b322f2c325 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java
@@ -11,15 +11,15 @@
package org.eclipse.swt.internal.ole.win32;
public class IOleCommandTarget extends IUnknown {
-public IOleCommandTarget(int /*long*/ address) {
+public IOleCommandTarget(long /*int*/ address) {
super(address);
}
public int Exec(
GUID pguidCmdGroup, // Pointer to command group
int nCmdID, // Identifier of command to execute
int nCmdExecOpt, // Options for executing the command
- int /*long*/ pvaIn, // Pointer to input arguments
- int /*long*/ pvaOut // Pointer to command output
+ long /*int*/ pvaIn, // Pointer to input arguments
+ long /*int*/ pvaOut // Pointer to command output
){
return COM.VtblCall(4, address, pguidCmdGroup, nCmdID, nCmdExecOpt, pvaIn, pvaOut);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java
index 5e009c87bb..652de7f79e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java
@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32;
public class IOleControl extends IUnknown
{
-public IOleControl(int /*long*/ address) {
+public IOleControl(long /*int*/ address) {
super(address);
}
public int GetControlInfo(CONTROLINFO pCI) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java
index 434069eacd..cf26cdb1c0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocument.java
@@ -12,10 +12,10 @@ package org.eclipse.swt.internal.ole.win32;
public class IOleDocument extends IUnknown
{
-public IOleDocument(int /*long*/ address) {
+public IOleDocument(long /*int*/ address) {
super(address);
}
-public int CreateView(int /*long*/ pIPSite,int /*long*/ pstm, int dwReserved, int /*long*/[] ppView) {
+public int CreateView(long /*int*/ pIPSite,long /*int*/ pstm, int dwReserved, long /*int*/[] ppView) {
return COM.VtblCall(3, address, pIPSite, pstm, dwReserved, ppView);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java
index a50c10696f..0f2cdef166 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleDocumentView.java
@@ -15,10 +15,10 @@ import org.eclipse.swt.internal.win32.RECT;
public class IOleDocumentView extends IUnknown
{
-public IOleDocumentView(int /*long*/ address) {
+public IOleDocumentView(long /*int*/ address) {
super(address);
}
-public int SetInPlaceSite(int /*long*/ pIPSite) {
+public int SetInPlaceSite(long /*int*/ pIPSite) {
return COM.VtblCall(3, address, pIPSite);
}
public int SetRect(RECT prcView) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java
index 72b0b93229..535bbae931 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java
@@ -14,7 +14,7 @@ import org.eclipse.swt.internal.win32.*;
public class IOleInPlaceActiveObject extends IOleWindow
{
-public IOleInPlaceActiveObject(int /*long*/ address) {
+public IOleInPlaceActiveObject(long /*int*/ address) {
super(address);
}
public int TranslateAccelerator(MSG lpmsg) {
@@ -27,7 +27,7 @@ public void OnFrameWindowActivate(boolean fActivate) {
public void OnDocWindowActivate(boolean fActivate) {
COM.VtblCall(7, getAddress(), fActivate);
}
-public int ResizeBorder(RECT prcBorder, int /*long*/ pUIWindow, boolean fFrameWindow) {
+public int ResizeBorder(RECT prcBorder, long /*int*/ pUIWindow, boolean fFrameWindow) {
return COM.VtblCall(8, address, prcBorder, pUIWindow, fFrameWindow);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java
index 242841610b..3aa49f23d0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java
@@ -14,7 +14,7 @@ import org.eclipse.swt.internal.win32.*;
public class IOleInPlaceObject extends IOleWindow
{
-public IOleInPlaceObject(int /*long*/ address) {
+public IOleInPlaceObject(long /*int*/ address) {
super(address);
}
public int InPlaceDeactivate() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java
index 3075d83f69..849fde78eb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java
@@ -12,13 +12,13 @@ package org.eclipse.swt.internal.ole.win32;
public class IOleLink extends IUnknown
{
-public IOleLink(int /*long*/ address) {
+public IOleLink(long /*int*/ address) {
super(address);
}
public int BindIfRunning() {
return COM.VtblCall(10, address);
}
-public int GetSourceMoniker(int /*long*/[] ppmk) {
+public int GetSourceMoniker(long /*int*/[] ppmk) {
return COM.VtblCall(6, address, ppmk);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java
index 6fea374a0a..9d1eee33ff 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java
@@ -14,25 +14,25 @@ import org.eclipse.swt.internal.win32.*;
public class IOleObject extends IUnknown
{
-public IOleObject(int /*long*/ address) {
+public IOleObject(long /*int*/ address) {
super(address);
}
-public int Advise(int /*long*/ pAdvSink, int[] pdwConnection) {
+public int Advise(long /*int*/ pAdvSink, int[] pdwConnection) {
return COM.VtblCall(19, address, pAdvSink, pdwConnection);
}
public int Close(int dwSaveOption) {
return COM.VtblCall(6, address, dwSaveOption);
}
-public int DoVerb(int iVerb, MSG lpmsg, int /*long*/ pActiveSite, int lindex, int /*long*/ hwndParent, RECT lprcPosRect) {
+public int DoVerb(int iVerb, MSG lpmsg, long /*int*/ pActiveSite, int lindex, long /*int*/ hwndParent, RECT lprcPosRect) {
return COM.VtblCall(11, address, iVerb, lpmsg, pActiveSite, lindex, hwndParent, lprcPosRect);
}
-public int GetClientSite(int /*long*/[] ppvClientSite) {
+public int GetClientSite(long /*int*/[] ppvClientSite) {
return COM.VtblCall(4, address, ppvClientSite);
}
public int GetExtent(int dwDrawAspect, SIZE pSizel) {
return COM.VtblCall(18, address, dwDrawAspect, pSizel);
}
-public int SetClientSite(int /*long*/ pClientSite) {
+public int SetClientSite(long /*int*/ pClientSite) {
return COM.VtblCall(3, address, pClientSite);
}
public int SetExtent(int dwDrawAspect, SIZE pSizel) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java
index 8585eb0d9d..a1eaceef5a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java
@@ -11,10 +11,10 @@
package org.eclipse.swt.internal.ole.win32;
public class IOleWindow extends IUnknown {
-public IOleWindow(int /*long*/ address) {
+public IOleWindow(long /*int*/ address) {
super(address);
}
-public int GetWindow(int /*long*/[] phwnd) {
+public int GetWindow(long /*int*/[] phwnd) {
return COM.VtblCall(3, address, phwnd);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java
index 828ccfd48c..e4e8ad0a04 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java
@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32;
public class IPersist extends IUnknown
{
-public IPersist(int /*long*/ address) {
+public IPersist(long /*int*/ address) {
super(address);
}
public int GetClassID(GUID pClassID) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistFile.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistFile.java
index 39bfccece4..d3e8b9dfc0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistFile.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistFile.java
@@ -12,22 +12,22 @@ package org.eclipse.swt.internal.ole.win32;
public class IPersistFile extends IPersist
{
-public IPersistFile(int /*long*/ address) {
+public IPersistFile(long /*int*/ address) {
super(address);
}
public int IsDirty() {
return COM.VtblCall(4, address);
}
-public int Load(int /*long*/ pszFileName, int dwMode) {
+public int Load(long /*int*/ pszFileName, int dwMode) {
return COM.VtblCall(5, address, pszFileName, dwMode);
}
-public int Save(int /*long*/ pszFileName, boolean fRemember) {
+public int Save(long /*int*/ pszFileName, boolean fRemember) {
return COM.VtblCall(6, address, pszFileName, fRemember);
}
-public int SaveCompleted(int /*long*/ pszFileName) {
+public int SaveCompleted(long /*int*/ pszFileName) {
return COM.VtblCall(7, address, pszFileName);
}
-public int GetCurFile(int /*long*/ [] ppszFileName){
+public int GetCurFile(long /*int*/ [] ppszFileName){
return COM.VtblCall(8, address, ppszFileName);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java
index 34d1af7385..5c89043a4f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java
@@ -12,22 +12,22 @@ package org.eclipse.swt.internal.ole.win32;
public class IPersistStorage extends IPersist
{
-public IPersistStorage(int /*long*/ address) {
+public IPersistStorage(long /*int*/ address) {
super(address);
}
public int IsDirty() {
return COM.VtblCall(4, address);
}
-public int InitNew(int /*long*/ pStg) {
+public int InitNew(long /*int*/ pStg) {
return COM.VtblCall(5, address, pStg);
}
-public int Load(int /*long*/ pStg) {
+public int Load(long /*int*/ pStg) {
return COM.VtblCall(6, address, pStg);
}
-public int Save(int /*long*/ pStgSave, boolean fSameAsLoad) {
+public int Save(long /*int*/ pStgSave, boolean fSameAsLoad) {
return COM.VtblCall(7, address, pStgSave, fSameAsLoad);
}
-public int SaveCompleted(int /*long*/ pStgNew) {
+public int SaveCompleted(long /*int*/ pStgNew) {
return COM.VtblCall(8, address, pStgNew);
}
public int HandsOffStorage(){
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java
index ff12382e12..b186d70c52 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStreamInit.java
@@ -12,11 +12,11 @@ package org.eclipse.swt.internal.ole.win32;
public class IPersistStreamInit extends IPersist
{
-public IPersistStreamInit(int /*long*/ address) {
+public IPersistStreamInit(long /*int*/ address) {
super(address);
}
-public int Load(int /*long*/ pStm) {
+public int Load(long /*int*/ pStm) {
return COM.VtblCall(5, address, pStm);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPropertyBag.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPropertyBag.java
index 98e0b4ea9c..404e6355b6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPropertyBag.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPropertyBag.java
@@ -13,11 +13,11 @@ package org.eclipse.swt.internal.ole.win32;
public class IPropertyBag extends IUnknown {
-public IPropertyBag (int /*long*/ address) {
+public IPropertyBag (long /*int*/ address) {
super (address);
}
-public int Read (int /*long*/ pszPropName, int /*long*/ pVar, int /*long*/[] pErrorLog) {
+public int Read (long /*int*/ pszPropName, long /*int*/ pVar, long /*int*/[] pErrorLog) {
return COM.VtblCall (3, getAddress(), pszPropName, pVar, pErrorLog);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java
index 441cb26392..4a32a67449 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java
@@ -12,10 +12,10 @@ package org.eclipse.swt.internal.ole.win32;
public class IProvideClassInfo extends IUnknown
{
-public IProvideClassInfo(int /*long*/ address) {
+public IProvideClassInfo(long /*int*/ address) {
super(address);
}
-public int GetClassInfo(int /*long*/[] ppTI) {
+public int GetClassInfo(long /*int*/[] ppTI) {
return COM.VtblCall(3, address, ppTI);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java
index 08b95a0212..ba515ee07d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java
@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32;
public class IProvideClassInfo2 extends IProvideClassInfo
{
-public IProvideClassInfo2(int /*long*/ address) {
+public IProvideClassInfo2(long /*int*/ address) {
super(address);
}
public int GetGUID(int dwGuidKind, GUID pGUID) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IServiceProvider.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IServiceProvider.java
index fd073c58ab..edb4e5ebf7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IServiceProvider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IServiceProvider.java
@@ -12,10 +12,10 @@ package org.eclipse.swt.internal.ole.win32;
public class IServiceProvider extends IUnknown
{
-public IServiceProvider(int /*long*/ address) {
+public IServiceProvider(long /*int*/ address) {
super(address);
}
-public int QueryService(GUID iid1, GUID iid2, int /*long*/ ppvObject[]) {
+public int QueryService(GUID iid1, GUID iid2, long /*int*/ ppvObject[]) {
return COM.VtblCall(3, address, iid1, iid2, ppvObject);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java
index 23f6004850..7e9ef557a4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java
@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32;
public class ISpecifyPropertyPages extends IUnknown {
-public ISpecifyPropertyPages(int /*long*/ address) {
+public ISpecifyPropertyPages(long /*int*/ address) {
super(address);
}
public int GetPages(CAUUID pPages){
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java
index e2b85322bb..0db9965c68 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java
@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32;
public class IStorage extends IUnknown
{
-public IStorage(int /*long*/ address) {
+public IStorage(long /*int*/ address) {
super(address);
}
public int Commit(int grfCommitFlag) {
@@ -22,7 +22,7 @@ public int CopyTo(
int ciidExclude, //Number of elements in rgiidExclude
GUID rgiidExclude, //Array of interface identifiers (IIDs)
String[] snbExclude, //Points to a block of stream names in the storage object
- int /*long*/ pstgDest //Points to destination storage object
+ long /*int*/ pstgDest //Points to destination storage object
){
// we only support snbExclude = null
if (snbExclude != null) {
@@ -35,7 +35,7 @@ public int CreateStorage(
int grfMode, //Access mode for the new storage object
int reserved1, //Reserved; must be zero
int reserved2, //Reserved; must be zero
- int /*long*/[] ppStg //Pointer to new storage object
+ long /*int*/[] ppStg //Pointer to new storage object
){
// create a null terminated array of char
@@ -51,7 +51,7 @@ public int CreateStream(
int grfMode, //Access mode for the new stream
int reserved1, //Reserved; must be zero
int reserved2, //Reserved; must be zero
- int /*long*/[] ppStm //Pointer to new stream object
+ long /*int*/[] ppStm //Pointer to new stream object
){
// create a null terminated array of char
@@ -73,9 +73,9 @@ public int DestroyElement(String pwcsName) {
}
public int EnumElements(
int reserved1, //Reserved; must be zero
- int /*long*/ reserved2, //Reserved; must be NULL
+ long /*int*/ reserved2, //Reserved; must be NULL
int reserved3, //Reserved; must be zero
- int /*long*/[] ppenum //Pointer to output variable that
+ long /*int*/[] ppenum //Pointer to output variable that
// receives the IEnumSTATSTG interface
){
return COM.VtblCall(11, address, reserved1, reserved2, reserved3, ppenum);
@@ -83,11 +83,11 @@ public int EnumElements(
public int OpenStorage(
String pwcsName, //Pointer to the name of the
// storage object to open
- int /*long*/ pstgPriority, //Must be NULL.
+ long /*int*/ pstgPriority, //Must be NULL.
int grfMode, //Access mode for the new storage object
String snbExclude[], //Must be NULL.
int reserved, //Reserved; must be zero
- int /*long*/[] ppStg //Pointer to opened storage object
+ long /*int*/[] ppStg //Pointer to opened storage object
){
// create a null terminated array of char
@@ -104,10 +104,10 @@ public int OpenStorage(
}
public int OpenStream(
String pwcsName, //Pointer to name of stream to open
- int /*long*/ reserved1, //Reserved; must be NULL
+ long /*int*/ reserved1, //Reserved; must be NULL
int grfMode, //Access mode for the new stream
int reserved2, //Reserved; must be zero
- int /*long*/[] ppStm //Pointer to output variable
+ long /*int*/[] ppStm //Pointer to output variable
// that receives the IStream interface pointer
) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java
index cf9ebe66a2..c97432e65d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java
@@ -11,11 +11,11 @@
package org.eclipse.swt.internal.ole.win32;
public class IStream extends IUnknown {
-public IStream(int /*long*/ address) {
+public IStream(long /*int*/ address) {
super(address);
}
public int Clone(
- int /*long*/[] ppstm //Pointer to location for pointer to the new stream object
+ long /*int*/[] ppstm //Pointer to location for pointer to the new stream object
){
return COM.VtblCall(13, address, ppstm);
}
@@ -23,13 +23,13 @@ public int Commit( int grfCommitFlags //Specifies how changes are committed
){
return COM.VtblCall(8, address, grfCommitFlags);
}
-public int Read(int /*long*/ pv, int cb, int[] pcbWritten) {
+public int Read(long /*int*/ pv, int cb, int[] pcbWritten) {
return COM.VtblCall(3, address, pv, cb, pcbWritten);
}
public int Revert(){
return COM.VtblCall(9, address);
}
-public int Write(int /*long*/ pv, int cb, int[] pcbWritten) {
+public int Write(long /*int*/ pv, int cb, int[] pcbWritten) {
return COM.VtblCall(4, address, pv, cb, pcbWritten);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java
index 22d2e33f3a..3093b3d5c6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java
@@ -16,16 +16,16 @@ import org.eclipse.swt.internal.win32.OS;
public class ITypeInfo extends IUnknown
{
-public ITypeInfo(int /*long*/ address) {
+public ITypeInfo(long /*int*/ address) {
super(address);
}
public int GetDocumentation(int index, String[] name, String[] docString, int[] pdwHelpContext, String[] helpFile ) {
- int /*long*/[] pBstrName = null;
- if (name != null) pBstrName = new int /*long*/[1];
- int /*long*/[] pBstrDocString = null;
- if (docString != null) pBstrDocString = new int /*long*/[1];
- int /*long*/[] pBstrHelpFile = null;
- if (helpFile != null) pBstrHelpFile = new int /*long*/[1];
+ long /*int*/[] pBstrName = null;
+ if (name != null) pBstrName = new long /*int*/[1];
+ long /*int*/[] pBstrDocString = null;
+ if (docString != null) pBstrDocString = new long /*int*/[1];
+ long /*int*/[] pBstrHelpFile = null;
+ if (helpFile != null) pBstrHelpFile = new long /*int*/[1];
int rc = COM.VtblCall(12, address, index, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile);
if (name != null && pBstrName[0] != 0) {
int size = COM.SysStringByteLen(pBstrName[0]);
@@ -68,7 +68,7 @@ public int GetDocumentation(int index, String[] name, String[] docString, int[]
}
return rc;
}
-public int GetFuncDesc(int index, int /*long*/[] ppFuncDesc) {
+public int GetFuncDesc(int index, long /*int*/[] ppFuncDesc) {
return COM.VtblCall(5, address, index, ppFuncDesc);
}
public int GetIDsOfNames(String[] rgszNames, int cNames, int[] pMemId) {
@@ -77,9 +77,9 @@ public int GetIDsOfNames(String[] rgszNames, int cNames, int[] pMemId) {
int size = rgszNames.length;
// create an array to hold the addresses
- int /*long*/ hHeap = OS.GetProcessHeap();
- int /*long*/ ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size * OS.PTR_SIZEOF);
- int /*long*/[] memTracker = new int /*long*/[size];
+ long /*int*/ hHeap = OS.GetProcessHeap();
+ long /*int*/ ppNames = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, size * OS.PTR_SIZEOF);
+ long /*int*/[] memTracker = new long /*int*/[size];
try {
// add the address of each string to the array
@@ -90,10 +90,10 @@ public int GetIDsOfNames(String[] rgszNames, int cNames, int[] pMemId) {
buffer = new char[nameSize +1];
rgszNames[i].getChars(0, nameSize, buffer, 0);
// get the address of the start of the array of char
- int /*long*/ pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2);
+ long /*int*/ pName = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2);
OS.MoveMemory(pName, buffer, buffer.length * 2);
// copy the address to the array of addresses
- COM.MoveMemory(ppNames + OS.PTR_SIZEOF * i, new int /*long*/[]{pName}, OS.PTR_SIZEOF);
+ COM.MoveMemory(ppNames + OS.PTR_SIZEOF * i, new long /*int*/[]{pName}, OS.PTR_SIZEOF);
// keep track of the Global Memory so we can free it
memTracker[i] = pName;
}
@@ -115,7 +115,7 @@ public int GetImplTypeFlags(int index, int[] pImplTypeFlags) {
public int GetNames(int memid, String[] names, int cMaxNames, int[] pcNames){
int nameSize = names.length;
- int /*long*/[] rgBstrNames = new int /*long*/[nameSize];
+ long /*int*/[] rgBstrNames = new long /*int*/[nameSize];
int rc = COM.VtblCall(7, address, memid, rgBstrNames, nameSize, pcNames);
if (rc == COM.S_OK) {
@@ -136,25 +136,25 @@ public int GetNames(int memid, String[] names, int cMaxNames, int[] pcNames){
return rc;
}
-public int GetRefTypeInfo(int hRefType, int /*long*/[] ppTInfo) {
+public int GetRefTypeInfo(int hRefType, long /*int*/[] ppTInfo) {
return COM.VtblCall(14, address, hRefType, ppTInfo);
}
public int GetRefTypeOfImplType(int index, int[] pRefType) {
return COM.VtblCall(8, address, index, pRefType);
}
-public int GetTypeAttr(int /*long*/[] ppTypeAttr) {
+public int GetTypeAttr(long /*int*/[] ppTypeAttr) {
return COM.VtblCall(3, address, ppTypeAttr);
}
-public int GetVarDesc(int index, int /*long*/[] ppVarDesc ) {
+public int GetVarDesc(int index, long /*int*/[] ppVarDesc ) {
return COM.VtblCall(6, address, index, ppVarDesc);
}
-public int ReleaseFuncDesc(int /*long*/ pFuncDesc ) {
+public int ReleaseFuncDesc(long /*int*/ pFuncDesc ) {
return COM.VtblCall(20, address, pFuncDesc);
}
-public int ReleaseTypeAttr(int /*long*/ pTypeAttr) {
+public int ReleaseTypeAttr(long /*int*/ pTypeAttr) {
return COM.VtblCall(19, address, pTypeAttr);
}
-public int ReleaseVarDesc(int /*long*/ pVarDesc ) {
+public int ReleaseVarDesc(long /*int*/ pVarDesc ) {
return COM.VtblCall(21, address, pVarDesc);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java
index 1327dd8b4a..d88f8345f7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java
@@ -12,17 +12,17 @@ package org.eclipse.swt.internal.ole.win32;
public class IUnknown
{
- int /*long*/ address;
-public IUnknown(int /*long*/ address) {
+ long /*int*/ address;
+public IUnknown(long /*int*/ address) {
this.address = address;
}
public int AddRef() {
return COM.VtblCall(1, address);
}
-public int /*long*/ getAddress() {
+public long /*int*/ getAddress() {
return address;
}
-public int QueryInterface(GUID riid, int /*long*/[] ppvObject) {
+public int QueryInterface(GUID riid, long /*int*/[] ppvObject) {
return COM.VtblCall(0, address, riid, ppvObject);
}
public int Release() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java
index 39438bf560..eaa536ed0a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java
@@ -14,13 +14,13 @@ import org.eclipse.swt.internal.win32.*;
public class IViewObject2 extends IUnknown
{
-public IViewObject2(int /*long*/ address) {
+public IViewObject2(long /*int*/ address) {
super(address);
}
public int GetExtent(int dwAspect, int lindex, DVTARGETDEVICE ptd, SIZE lpsizel) {
return COM.VtblCall(9, address, dwAspect, lindex, ptd, lpsizel);
}
-public int SetAdvise(int dwAspects, int dwAdvf, int /*long*/ pIAdviseSink) {
+public int SetAdvise(int dwAspects, int dwAdvf, long /*int*/ pIAdviseSink) {
return COM.VtblCall(7, address, dwAspects, dwAdvf, pIAdviseSink);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java
index 0b2a9cfb85..ca504aa54d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java
@@ -14,9 +14,9 @@ public final class OLEINPLACEFRAMEINFO {
public int cb;
public int fMDIApp;
/** @field cast=(HWND) */
- public int /*long*/ hwndFrame;
+ public long /*int*/ hwndFrame;
/** @field cast=(HACCEL) */
- public int /*long*/ haccel;
+ public long /*int*/ haccel;
public int cAccelEntries;
public static final int sizeof = COM.OLEINPLACEFRAMEINFO_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java
index 6a0d0ec9df..ee2ac3b739 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java
@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.ole.win32;
public class STATSTG {
/** @field cast=(LPWSTR) */
- public int /*long*/ pwcsName;
+ public long /*int*/ pwcsName;
public int type;
/** @field accessor=cbSize.QuadPart */
public long cbSize;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java
index d5ad8a60ad..4bd70a6b1b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java
@@ -13,8 +13,8 @@ package org.eclipse.swt.internal.ole.win32;
public final class STGMEDIUM {
public int tymed;
/** @field accessor=hGlobal,cast=(HGLOBAL) */
- public int /*long*/ unionField;
+ public long /*int*/ unionField;
/** @field cast=(IUnknown *) */
- public int /*long*/ pUnkForRelease;
+ public long /*int*/ pUnkForRelease;
public static final int sizeof = COM.STGMEDIUM_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java
index 4025c05cd3..81e1bed030 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java
@@ -25,7 +25,7 @@ public final class TYPEATTR {
public int memidConstructor;
public int memidDestructor;
/** @field cast=(OLECHAR FAR *) */
- public int /*long*/ lpstrSchema;
+ public long /*int*/ lpstrSchema;
public int cbSizeInstance;
public int typekind;
public short cFuncs;
@@ -38,7 +38,7 @@ public final class TYPEATTR {
public short wMinorVerNum;
// TYPEDESC tdescAlias
/** @field accessor=tdescAlias.lptdesc,cast=(struct FARSTRUCT tagTYPEDESC FAR *) */
- public int /*long*/ tdescAlias_unionField;
+ public long /*int*/ tdescAlias_unionField;
/** @field accessor=tdescAlias.vt */
public short tdescAlias_vt;
// IDLDESC idldesctype
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java
index ef6d267393..6723649835 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC.java
@@ -13,17 +13,17 @@ package org.eclipse.swt.internal.ole.win32;
public class VARDESC {
public int memid;
/** @field cast=(OLECHAR FAR *) */
- public int /*long*/ lpstrSchema;
+ public long /*int*/ lpstrSchema;
public int oInst;
// ELEMDESC elemdescVar
// TYPEDESC elemdescVar.tdesc
/** @field accessor=elemdescVar.tdesc.lptdesc,cast=(struct FARSTRUCT tagTYPEDESC FAR *) */
- public int /*long*/ elemdescVar_tdesc_union;
+ public long /*int*/ elemdescVar_tdesc_union;
/** @field accessor=elemdescVar.tdesc.vt */
public short elemdescVar_tdesc_vt;
// PARAMDESC elemdescFunc.paramdesc
/** @field accessor=elemdescVar.paramdesc.pparamdescex,cast=(LPPARAMDESCEX) */
- public int /*long*/ elemdescVar_paramdesc_pparamdescex;
+ public long /*int*/ elemdescVar_paramdesc_pparamdescex;
/** @field accessor=elemdescVar.paramdesc.wParamFlags */
public short elemdescVar_paramdesc_wParamFlags;
public short wVarFlags;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACTCTX.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACTCTX.java
index 6b397a9d98..871dfc17dd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACTCTX.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACTCTX.java
@@ -14,16 +14,16 @@ public class ACTCTX {
public int cbSize;
public int dwFlags;
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpSource;
+ public long /*int*/ lpSource;
public short wProcessorArchitecture;
public short wLangId;
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpAssemblyDirectory;
+ public long /*int*/ lpAssemblyDirectory;
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpResourceName;
+ public long /*int*/ lpResourceName;
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpApplicationName;
+ public long /*int*/ lpApplicationName;
/** @field cast=(HMODULE) */
- public int /*long*/ hModule;
+ public long /*int*/ hModule;
public static final int sizeof = OS.ACTCTX_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAP.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAP.java
index 0e32595216..2f9a470b2c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAP.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAP.java
@@ -18,6 +18,6 @@ public class BITMAP {
public short bmPlanes;
public short bmBitsPixel;
/** @field cast=(LPVOID) */
- public int /*long*/ bmBits;
+ public long /*int*/ bmBits;
public static final int sizeof = OS.BITMAP_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BP_PAINTPARAMS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BP_PAINTPARAMS.java
index 4c1f11814e..41faa5b0ca 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BP_PAINTPARAMS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BP_PAINTPARAMS.java
@@ -14,8 +14,8 @@ public class BP_PAINTPARAMS {
public int cbSize;
public int dwFlags;
/** @field cast=(RECT*) */
- public int /*long*/ prcExclude;
+ public long /*int*/ prcExclude;
/** @field cast=(BLENDFUNCTION*) */
- public int /*long*/ pBlendFunction;
+ public long /*int*/ pBlendFunction;
public static final int sizeof = OS.BP_PAINTPARAMS_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java
index a70f8527f0..73e166dcdc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java
@@ -12,17 +12,17 @@ package org.eclipse.swt.internal.win32;
public class BROWSEINFO {
/** @field cast=(HWND) */
- public int /*long*/ hwndOwner;
+ public long /*int*/ hwndOwner;
/** @field cast=(LPCITEMIDLIST) */
- public int /*long*/ pidlRoot;
+ public long /*int*/ pidlRoot;
/** @field cast=(LPTSTR) */
- public int /*long*/ pszDisplayName;
+ public long /*int*/ pszDisplayName;
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpszTitle;
+ public long /*int*/ lpszTitle;
public int ulFlags;
/** @field cast=(BFFCALLBACK) */
- public int /*long*/ lpfn;
- public int /*long*/ lParam;
+ public long /*int*/ lpfn;
+ public long /*int*/ lParam;
public int iImage;
public static final int sizeof = OS.BROWSEINFO_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BUTTON_IMAGELIST.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BUTTON_IMAGELIST.java
index da876cf863..629d296649 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BUTTON_IMAGELIST.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BUTTON_IMAGELIST.java
@@ -12,7 +12,7 @@ package org.eclipse.swt.internal.win32;
public class BUTTON_IMAGELIST {
/** @field cast=(HIMAGELIST) */
- public int /*long*/ himl;
+ public long /*int*/ himl;
/** @field accessor=margin.left,cast=(LONG) */
public int margin_left;
/** @field accessor=margin.top,cast=(LONG) */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_CONTEXT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_CONTEXT.java
index d23ee0e4b2..28445dd628 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_CONTEXT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_CONTEXT.java
@@ -14,12 +14,12 @@ package org.eclipse.swt.internal.win32;
public class CERT_CONTEXT {
public int dwCertEncodingType;
/** @field cast=(BYTE *) */
- public int /*long*/ pbCertEncoded;
+ public long /*int*/ pbCertEncoded;
public int cbCertEncoded;
/** @field cast=(PCERT_INFO) */
- public int /*long*/ pCertInfo;
+ public long /*int*/ pCertInfo;
/** @field cast=(HCERTSTORE) */
- public int /*long*/ hCertStore;
+ public long /*int*/ hCertStore;
public static final int sizeof = OS.CERT_CONTEXT_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_INFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_INFO.java
index 64261e7700..fabecb078f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_INFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_INFO.java
@@ -24,7 +24,7 @@ public class CERT_INFO {
public CRYPT_BIT_BLOB SubjectUniqueId = new CRYPT_BIT_BLOB ();
public int cExtension;
/** @field cast=(PCERT_EXTENSION) */
- public int /*long*/ rgExtension;
+ public long /*int*/ rgExtension;
public static final int sizeof = OS.CERT_INFO_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_NAME_BLOB.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_NAME_BLOB.java
index 351c9d7e6f..de03a74a34 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_NAME_BLOB.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CERT_NAME_BLOB.java
@@ -14,7 +14,7 @@ package org.eclipse.swt.internal.win32;
public class CERT_NAME_BLOB {
public int cbData;
/** @field cast=(BYTE *) */
- public int /*long*/ pbData;
+ public long /*int*/ pbData;
static final public int sizeof = OS.CERT_NAME_BLOB_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSECOLOR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSECOLOR.java
index b378f44726..912c0ed2e6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSECOLOR.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSECOLOR.java
@@ -13,17 +13,17 @@ package org.eclipse.swt.internal.win32;
public class CHOOSECOLOR {
public int lStructSize;
/** @field cast=(HWND) */
- public int /*long*/ hwndOwner;
+ public long /*int*/ hwndOwner;
/** @field cast=(HANDLE) */
- public int /*long*/ hInstance;
+ public long /*int*/ hInstance;
public int rgbResult;
/** @field cast=(COLORREF *) */
- public int /*long*/ lpCustColors;
+ public long /*int*/ lpCustColors;
public int Flags;
- public int /*long*/ lCustData;
+ public long /*int*/ lCustData;
/** @field cast=(LPCCHOOKPROC) */
- public int /*long*/ lpfnHook;
+ public long /*int*/ lpfnHook;
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpTemplateName;
+ public long /*int*/ lpTemplateName;
public static final int sizeof = OS.CHOOSECOLOR_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSEFONT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSEFONT.java
index e8e1e8f944..144b4650ac 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSEFONT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSEFONT.java
@@ -13,23 +13,23 @@ package org.eclipse.swt.internal.win32;
public class CHOOSEFONT {
public int lStructSize;
/** @field cast=(HWND) */
- public int /*long*/ hwndOwner;
+ public long /*int*/ hwndOwner;
/** @field cast=(HDC) */
- public int /*long*/ hDC;
+ public long /*int*/ hDC;
/** @field cast=(LPLOGFONT) */
- public int /*long*/ lpLogFont;
+ public long /*int*/ lpLogFont;
public int iPointSize;
public int Flags;
public int rgbColors;
- public int /*long*/ lCustData;
+ public long /*int*/ lCustData;
/** @field cast=(LPCFHOOKPROC) */
- public int /*long*/ lpfnHook;
+ public long /*int*/ lpfnHook;
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpTemplateName;
+ public long /*int*/ lpTemplateName;
/** @field cast=(HINSTANCE) */
- public int /*long*/ hInstance;
+ public long /*int*/ hInstance;
/** @field cast=(LPTSTR) */
- public int /*long*/ lpszStyle;
+ public long /*int*/ lpszStyle;
public short nFontType;
public int nSizeMin;
public int nSizeMax;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMBOBOXINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMBOBOXINFO.java
index f57ed8097a..f13e9cda6c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMBOBOXINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMBOBOXINFO.java
@@ -30,10 +30,10 @@ public class COMBOBOXINFO {
public int buttonBottom;
public int stateButton;
/** @field cast=(HWND) */
- public int /*long*/ hwndCombo;
+ public long /*int*/ hwndCombo;
/** @field cast=(HWND) */
- public int /*long*/ hwndItem;
+ public long /*int*/ hwndItem;
/** @field cast=(HWND) */
- public int /*long*/ hwndList;
+ public long /*int*/ hwndList;
public static final int sizeof = OS.COMBOBOXINFO_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CREATESTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CREATESTRUCT.java
index 3070d5b662..4fa0180f6f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CREATESTRUCT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CREATESTRUCT.java
@@ -12,22 +12,22 @@ package org.eclipse.swt.internal.win32;
public class CREATESTRUCT {
/** @field cast=(LPVOID) */
- public int /*long*/ lpCreateParams;
+ public long /*int*/ lpCreateParams;
/** @field cast=(HINSTANCE) */
- public int /*long*/ hInstance;
+ public long /*int*/ hInstance;
/** @field cast=(HMENU) */
- public int /*long*/ hMenu;
+ public long /*int*/ hMenu;
/** @field cast=(HWND) */
- public int /*long*/ hwndParent;
+ public long /*int*/ hwndParent;
public int cy;
public int cx;
public int y;
public int x;
public int style;
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpszName;
+ public long /*int*/ lpszName;
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpszClass;
+ public long /*int*/ lpszClass;
public int dwExStyle;
public static final int sizeof = OS.CREATESTRUCT_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_ALGORITHM_IDENTIFIER.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_ALGORITHM_IDENTIFIER.java
index bf948af645..4cfb3ce63c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_ALGORITHM_IDENTIFIER.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_ALGORITHM_IDENTIFIER.java
@@ -13,7 +13,7 @@ package org.eclipse.swt.internal.win32;
public class CRYPT_ALGORITHM_IDENTIFIER {
/** @field cast=(LPSTR) */
- public int /*long*/ pszObjId;
+ public long /*int*/ pszObjId;
public CRYPT_OBJID_BLOB Parameters = new CRYPT_OBJID_BLOB ();
static final public int sizeof = OS.CRYPT_ALGORITHM_IDENTIFIER_sizeof ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_BIT_BLOB.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_BIT_BLOB.java
index 9b83415301..741e933de4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_BIT_BLOB.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_BIT_BLOB.java
@@ -14,7 +14,7 @@ package org.eclipse.swt.internal.win32;
public class CRYPT_BIT_BLOB {
public int cbData;
/** @field cast=(BYTE *) */
- public int /*long*/ pbData;
+ public long /*int*/ pbData;
public int cUnusedBits;
static final public int sizeof = OS.CRYPT_BIT_BLOB_sizeof ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_INTEGER_BLOB.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_INTEGER_BLOB.java
index 9eb3b350d2..785f5e5edb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_INTEGER_BLOB.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_INTEGER_BLOB.java
@@ -14,7 +14,7 @@ package org.eclipse.swt.internal.win32;
public class CRYPT_INTEGER_BLOB {
public int cbData;
/** @field cast=(BYTE *) */
- public int /*long*/ pbData;
+ public long /*int*/ pbData;
static final public int sizeof = OS.CRYPT_INTEGER_BLOB_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_OBJID_BLOB.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_OBJID_BLOB.java
index 23ab023acd..f27e22fcda 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_OBJID_BLOB.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CRYPT_OBJID_BLOB.java
@@ -14,7 +14,7 @@ package org.eclipse.swt.internal.win32;
public class CRYPT_OBJID_BLOB {
public int cbData;
/** @field cast=(BYTE *) */
- public int /*long*/ pbData;
+ public long /*int*/ pbData;
static final public int sizeof = OS.CRYPT_OBJID_BLOB_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DIBSECTION.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DIBSECTION.java
index f6071ec3d6..f4ca317fa6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DIBSECTION.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DIBSECTION.java
@@ -40,7 +40,7 @@ public class DIBSECTION extends BITMAP {
/** @field accessor=dsBitfields[2] */
public int dsBitfields2;
/** @field cast=(HANDLE) */
- public int /*long*/ dshSection;
+ public long /*int*/ dshSection;
public int dsOffset;
public static final int sizeof = OS.DIBSECTION_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCHOSTUIINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCHOSTUIINFO.java
index 918d59eac1..f0ca1a36dd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCHOSTUIINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCHOSTUIINFO.java
@@ -15,8 +15,8 @@ public class DOCHOSTUIINFO {
public int dwFlags;
public int dwDoubleClick;
/** @field cast=(OLECHAR*),flags=no_wince*/
- public int /*long*/ pchHostCss;
+ public long /*int*/ pchHostCss;
/** @field cast=(OLECHAR*),flags=no_wince */
- public int /*long*/ pchHostNS;
+ public long /*int*/ pchHostNS;
public static final int sizeof = OS.DOCHOSTUIINFO_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCINFO.java
index fb17f6cdb2..823559cd79 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCINFO.java
@@ -13,11 +13,11 @@ package org.eclipse.swt.internal.win32;
public class DOCINFO {
public int cbSize;
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpszDocName; // LPCTSTR
+ public long /*int*/ lpszDocName; // LPCTSTR
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpszOutput; // LPCTSTR
+ public long /*int*/ lpszOutput; // LPCTSTR
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpszDatatype;// LPCTSTR
+ public long /*int*/ lpszDatatype;// LPCTSTR
public int fwType; // DWORD
public static final int sizeof = OS.DOCINFO_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DRAWITEMSTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DRAWITEMSTRUCT.java
index c81cef7cdb..683a89bfc3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DRAWITEMSTRUCT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DRAWITEMSTRUCT.java
@@ -17,9 +17,9 @@ public class DRAWITEMSTRUCT {
public int itemAction;
public int itemState;
/** @field cast=(HWND) */
- public int /*long*/ hwndItem;
+ public long /*int*/ hwndItem;
/** @field cast=(HDC) */
- public int /*long*/ hDC;
+ public long /*int*/ hDC;
// RECT rcItem;
/** @field accessor=rcItem.left */
public int left;
@@ -29,6 +29,6 @@ public class DRAWITEMSTRUCT {
public int bottom;
/** @field accessor=rcItem.right */
public int right;
- public int /*long*/ itemData;
+ public long /*int*/ itemData;
public static final int sizeof = OS.DRAWITEMSTRUCT_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DTTOPTS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DTTOPTS.java
index 6d92819471..867e7c58b0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DTTOPTS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DTTOPTS.java
@@ -26,7 +26,7 @@ public class DTTOPTS {
public boolean fApplyOverlay;
public int iGlowSize;
/** @field cast=(DTT_CALLBACK_PROC) */
- public int /*long*/ pfnDrawTextCallback;
- public int /*long*/ lParam;
+ public long /*int*/ pfnDrawTextCallback;
+ public long /*int*/ lParam;
public static final int sizeof = OS.DTTOPTS_sizeof ();
}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DWM_BLURBEHIND.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DWM_BLURBEHIND.java
index 3c4b181446..4825747dbf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DWM_BLURBEHIND.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DWM_BLURBEHIND.java
@@ -14,7 +14,7 @@ public class DWM_BLURBEHIND {
public int dwFlags;
public boolean fEnable;
/** @field cast=(HRGN) */
- public int /*long*/ hRgnBlur;
+ public long /*int*/ hRgnBlur;
public boolean fTransitionOnMaximized;
public static final int sizeof = OS.DWM_BLURBEHIND_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/EXTLOGPEN.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/EXTLOGPEN.java
index d82807029f..49a194c32c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/EXTLOGPEN.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/EXTLOGPEN.java
@@ -15,7 +15,7 @@ public class EXTLOGPEN {
public int elpWidth;
public int elpBrushStyle;
public int elpColor;
- public int /*long*/ elpHatch;
+ public long /*int*/ elpHatch;
public int elpNumEntries;
public int[] elpStyleEntry = new int[1];
public static final int sizeof = OS.EXTLOGPEN_sizeof ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GCP_RESULTS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GCP_RESULTS.java
index 062e5930da..7850412b0d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GCP_RESULTS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GCP_RESULTS.java
@@ -13,17 +13,17 @@ package org.eclipse.swt.internal.win32;
public class GCP_RESULTS {
public int lStructSize;
/** @field cast=(LPTSTR) */
- public int /*long*/ lpOutString;
+ public long /*int*/ lpOutString;
/** @field cast=(UINT *) */
- public int /*long*/ lpOrder;
+ public long /*int*/ lpOrder;
/** @field cast=(int *) */
- public int /*long*/ lpDx;
+ public long /*int*/ lpDx;
/** @field cast=(int *) */
- public int /*long*/ lpCaretPos;
+ public long /*int*/ lpCaretPos;
/** @field cast=(LPSTR) */
- public int /*long*/ lpClass;
+ public long /*int*/ lpClass;
/** @field cast=(LPWSTR) */
- public int /*long*/ lpGlyphs;
+ public long /*int*/ lpGlyphs;
public int nGlyphs;
public int nMaxFit;
public static final int sizeof = OS.GCP_RESULTS_sizeof ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GESTUREINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GESTUREINFO.java
index 6329abac15..6ad08b70a9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GESTUREINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GESTUREINFO.java
@@ -15,7 +15,7 @@ public class GESTUREINFO {
public int dwFlags;
public int dwID;
/** @field cast=(HWND) */
- public int /*long*/ hwndTarget;
+ public long /*int*/ hwndTarget;
// POINTS ptsLocation
/** @field accessor=ptsLocation.x */
public short x;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GUITHREADINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GUITHREADINFO.java
index 6ca9b47aba..bf97b21975 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GUITHREADINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GUITHREADINFO.java
@@ -16,17 +16,17 @@ public class GUITHREADINFO {
/** @field cast=(DWORD) */
public int flags;
/** @field cast=(HWND) */
- public int /*long*/ hwndActive;
+ public long /*int*/ hwndActive;
/** @field cast=(HWND) */
- public int /*long*/ hwndFocus;
+ public long /*int*/ hwndFocus;
/** @field cast=(HWND) */
- public int /*long*/ hwndCapture;
+ public long /*int*/ hwndCapture;
/** @field cast=(HWND) */
- public int /*long*/ hwndMenuOwner;
+ public long /*int*/ hwndMenuOwner;
/** @field cast=(HWND) */
- public int /*long*/ hwndMoveSize;
+ public long /*int*/ hwndMoveSize;
/** @field cast=(HWND) */
- public int /*long*/ hwndCaret;
+ public long /*int*/ hwndCaret;
// RECT rcCaret;
/** @field accessor=rcCaret.left */
public int left;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDITEM.java
index e1acd46381..fb08f1379e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDITEM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDITEM.java
@@ -14,17 +14,17 @@ public class HDITEM {
public int mask;
public int cxy;
/** @field cast=(LPTSTR) */
- public int /*long*/ pszText;
+ public long /*int*/ pszText;
/** @field cast=(HBITMAP) */
- public int /*long*/ hbm;
+ public long /*int*/ hbm;
public int cchTextMax;
public int fmt;
- public int /*long*/ lParam;
+ public long /*int*/ lParam;
public int iImage;
public int iOrder;
/** @field flags=no_wince */
public int type;
/** @field cast=(void *),flags=no_wince */
- public int /*long*/ pvFilter;
+ public long /*int*/ pvFilter;
public static int sizeof = OS.HDITEM_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDLAYOUT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDLAYOUT.java
index f5bc27e545..567d8b071c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDLAYOUT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDLAYOUT.java
@@ -12,8 +12,8 @@ package org.eclipse.swt.internal.win32;
public class HDLAYOUT {
/** @field cast=(RECT *) */
- public int /*long*/ prc;
+ public long /*int*/ prc;
/** @field cast=(WINDOWPOS *) */
- public int /*long*/ pwpos;
+ public long /*int*/ pwpos;
public static final int sizeof = OS.HDLAYOUT_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HELPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HELPINFO.java
index 8e81319243..a7dfef6408 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HELPINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HELPINFO.java
@@ -15,7 +15,7 @@ public class HELPINFO {
public int iContextType;
public int iCtrlId;
/** @field cast=(HANDLE) */
- public int /*long*/ hItemHandle;
+ public long /*int*/ hItemHandle;
public int dwContextId;
// POINT MousePos
/** @field accessor=MousePos.x */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HIGHCONTRAST.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HIGHCONTRAST.java
index 68e35eedc6..52d22d4a7b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HIGHCONTRAST.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HIGHCONTRAST.java
@@ -14,6 +14,6 @@ public class HIGHCONTRAST {
public int cbSize;
public int dwFlags;
/** @field cast=(LPTSTR) */
- public int /*long*/ lpszDefaultScheme;
+ public long /*int*/ lpszDefaultScheme;
public static final int sizeof = OS.HIGHCONTRAST_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ICONINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ICONINFO.java
index f5d79ee186..74b80938a2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ICONINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ICONINFO.java
@@ -15,8 +15,8 @@ public class ICONINFO {
public int xHotspot;
public int yHotspot;
/** @field cast=(HBITMAP) */
- public int /*long*/ hbmMask;
+ public long /*int*/ hbmMask;
/** @field cast=(HBITMAP) */
- public int /*long*/ hbmColor;
+ public long /*int*/ hbmColor;
public static final int sizeof = OS.ICONINFO_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/KEYBDINPUT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/KEYBDINPUT.java
index 96da126a10..aa44ddae0c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/KEYBDINPUT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/KEYBDINPUT.java
@@ -15,6 +15,6 @@ public class KEYBDINPUT {
public short wScan;
public int dwFlags;
public int time;
- public int /*long*/ dwExtraInfo;
+ public long /*int*/ dwExtraInfo;
public static final int sizeof = OS.KEYBDINPUT_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGBRUSH.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGBRUSH.java
index 75fe2fbf4a..0abd4b0ae9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGBRUSH.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGBRUSH.java
@@ -13,6 +13,6 @@ package org.eclipse.swt.internal.win32;
public class LOGBRUSH {
public int lbStyle;
public int lbColor;
- public int /*long*/ lbHatch;
+ public long /*int*/ lbHatch;
public static final int sizeof = OS.LOGBRUSH_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LRESULT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LRESULT.java
index 145e85482a..a1a967e3bf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LRESULT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LRESULT.java
@@ -12,11 +12,11 @@ package org.eclipse.swt.internal.win32;
/** @jniclass flags=no_gen */
public class LRESULT {
- public int /*long*/ value;
+ public long /*int*/ value;
public static final LRESULT ONE = new LRESULT (1);
public static final LRESULT ZERO = new LRESULT (0);
-public LRESULT (int /*long*/ value) {
+public LRESULT (long /*int*/ value) {
this.value = value;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVCOLUMN.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVCOLUMN.java
index f4377e8d31..7f9f787ba7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVCOLUMN.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVCOLUMN.java
@@ -15,7 +15,7 @@ public class LVCOLUMN {
public int fmt;
public int cx;
/** @field cast=(LPTSTR) */
- public int /*long*/ pszText;
+ public long /*int*/ pszText;
public int cchTextMax;
public int iSubItem;
public int iImage;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVITEM.java
index cbe92c93d9..206fcbd8a7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVITEM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVITEM.java
@@ -17,16 +17,16 @@ public class LVITEM {
public int state;
public int stateMask;
/** @field cast=(LPTSTR) */
- public int /*long*/ pszText;
+ public long /*int*/ pszText;
public int cchTextMax;
public int iImage;
- public int /*long*/ lParam;
+ public long /*int*/ lParam;
public int iIndent;
/** @field flags=no_wince */
public int iGroupId;
/** @field flags=no_wince */
public int cColumns;
/** @field cast=(PUINT),flags=no_wince */
- public int /*long*/ puColumns;
+ public long /*int*/ puColumns;
public static final int sizeof = !OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 1) ? OS.LVITEM_sizeof () : 40;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MEASUREITEMSTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MEASUREITEMSTRUCT.java
index aab804a9d4..6d529c5743 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MEASUREITEMSTRUCT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MEASUREITEMSTRUCT.java
@@ -16,6 +16,6 @@ public class MEASUREITEMSTRUCT {
public int itemID;
public int itemWidth;
public int itemHeight;
- public int /*long*/ itemData;
+ public long /*int*/ itemData;
public static final int sizeof = OS.MEASUREITEMSTRUCT_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUBARINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUBARINFO.java
index e705010c71..6b99f9c626 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUBARINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUBARINFO.java
@@ -22,9 +22,9 @@ public class MENUBARINFO {
/** @field accessor=rcBar.bottom */
public int bottom;
/** @field cast=(HMENU) */
- public int /*long*/ hMenu;
+ public long /*int*/ hMenu;
/** @field cast=(HWND) */
- public int /*long*/ hwndMenu;
+ public long /*int*/ hwndMenu;
public boolean fBarFocused;
public boolean fFocused;
public static final int sizeof = OS.MENUBARINFO_sizeof ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUINFO.java
index bd4de15810..93b603e716 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUINFO.java
@@ -16,8 +16,8 @@ public class MENUINFO {
public int dwStyle;
public int cyMax;
/** @field cast=(HBRUSH) */
- public int /*long*/ hbrBack;
+ public long /*int*/ hbrBack;
public int dwContextHelpID;
- public int /*long*/ dwMenuData;
+ public long /*int*/ dwMenuData;
public static final int sizeof = OS.MENUINFO_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUITEMINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUITEMINFO.java
index 8158102915..c268aa808b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUITEMINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUITEMINFO.java
@@ -17,17 +17,17 @@ public class MENUITEMINFO {
public int fState;
public int wID;
/** @field cast=(HMENU) */
- public int /*long*/ hSubMenu;
+ public long /*int*/ hSubMenu;
/** @field cast=(HBITMAP) */
- public int /*long*/ hbmpChecked;
+ public long /*int*/ hbmpChecked;
/** @field cast=(HBITMAP) */
- public int /*long*/ hbmpUnchecked;
- public int /*long*/ dwItemData;
+ public long /*int*/ hbmpUnchecked;
+ public long /*int*/ dwItemData;
/** @field cast=(LPTSTR) */
- public int /*long*/ dwTypeData;
+ public long /*int*/ dwTypeData;
public int cch;
/** @field cast=(HBITMAP),flags=no_wince */
- public int /*long*/ hbmpItem;
+ public long /*int*/ hbmpItem;
/*
* Feature in Windows. The hbmpItem field requires Windows 4.10
* or greater. On Windows NT 4.0, passing in a larger struct size
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MOUSEINPUT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MOUSEINPUT.java
index 7060e56929..47184fead7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MOUSEINPUT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MOUSEINPUT.java
@@ -16,6 +16,6 @@ public class MOUSEINPUT {
public int mouseData;
public int dwFlags;
public int time;
- public int /*long*/ dwExtraInfo;
+ public long /*int*/ dwExtraInfo;
public static final int sizeof = OS.MOUSEINPUT_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MSG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MSG.java
index 0349b680e0..449e798f6b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MSG.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MSG.java
@@ -12,10 +12,10 @@ package org.eclipse.swt.internal.win32;
public class MSG {
/** @field cast=(HWND) */
- public int /*long*/ hwnd;
+ public long /*int*/ hwnd;
public int message;
- public int /*long*/ wParam;
- public int /*long*/ lParam;
+ public long /*int*/ wParam;
+ public long /*int*/ lParam;
public int time;
// POINT pt;
/** @field accessor=pt.x */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMCUSTOMDRAW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMCUSTOMDRAW.java
index c6b6cd6b32..9d0d89f3cd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMCUSTOMDRAW.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMCUSTOMDRAW.java
@@ -13,7 +13,7 @@ package org.eclipse.swt.internal.win32;
public class NMCUSTOMDRAW extends NMHDR {
public int dwDrawStage;
/** @field cast=(HDC) */
- public int /*long*/ hdc;
+ public long /*int*/ hdc;
// RECT rc;
/** @field accessor=rc.left */
public int left;
@@ -23,8 +23,8 @@ public class NMCUSTOMDRAW extends NMHDR {
public int right;
/** @field accessor=rc.bottom */
public int bottom;
- public int /*long*/ dwItemSpec;
+ public long /*int*/ dwItemSpec;
public int uItemState;
- public int /*long*/ lItemlParam;
+ public long /*int*/ lItemlParam;
public static final int sizeof = OS.NMCUSTOMDRAW_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHDR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHDR.java
index aa11e2d46f..2a4dfa5f75 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHDR.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHDR.java
@@ -12,8 +12,8 @@ package org.eclipse.swt.internal.win32;
public class NMHDR {
/** @field cast=(HWND) */
- public int /*long*/ hwndFrom;
- public int /*long*/ idFrom;
+ public long /*int*/ hwndFrom;
+ public long /*int*/ idFrom;
public int code;
public static final int sizeof = OS.NMHDR_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHEADER.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHEADER.java
index e37435deba..6a32eed004 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHEADER.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHEADER.java
@@ -14,6 +14,6 @@ public class NMHEADER extends NMHDR {
public int iItem;
public int iButton;
/** @field cast=(HDITEM FAR *) */
- public int /*long*/ pitem;
+ public long /*int*/ pitem;
public static int sizeof = OS.NMHEADER_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLISTVIEW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLISTVIEW.java
index c49937f77d..bedb009264 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLISTVIEW.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLISTVIEW.java
@@ -21,6 +21,6 @@ public class NMLISTVIEW extends NMHDR {
public int x;
/** @field accessor=ptAction.y */
public int y;
- public int /*long*/ lParam;
+ public long /*int*/ lParam;
public static int sizeof = OS.NMLISTVIEW_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVDISPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVDISPINFO.java
index c4beef56e8..a8ff12e341 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVDISPINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVDISPINFO.java
@@ -23,13 +23,13 @@ public class NMLVDISPINFO extends NMHDR {
/** @field accessor=item.stateMask */
public int stateMask;
/** @field accessor=item.pszText,cast=(LPTSTR) */
- public int /*long*/ pszText;
+ public long /*int*/ pszText;
/** @field accessor=item.cchTextMax */
public int cchTextMax;
/** @field accessor=item.iImage */
public int iImage;
/** @field accessor=item.lParam */
- public int /*long*/ lParam;
+ public long /*int*/ lParam;
/** @field accessor=item.iIndent */
public int iIndent;
/** @field accessor=item.iGroupId,flags=no_wince */
@@ -37,6 +37,6 @@ public class NMLVDISPINFO extends NMHDR {
/** @field accessor=item.cColumns,flags=no_wince */
public int cColumns;
/** @field accessor=item.puColumns,cast=(PUINT),flags=no_wince */
- public int /*long*/ puColumns;
+ public long /*int*/ puColumns;
public static final int sizeof = !OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 1) ? OS.NMLVDISPINFO_sizeof () : 52;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVFINDITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVFINDITEM.java
index 7a28986bad..62f15aefb3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVFINDITEM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLVFINDITEM.java
@@ -16,9 +16,9 @@ public class NMLVFINDITEM extends NMHDR {
/** @field accessor=lvfi.flags */
public int flags;
/** @field accessor=lvfi.psz,cast=(LPCTSTR) */
- public int /*long*/ psz;
+ public long /*int*/ psz;
/** @field accessor=lvfi.lParam */
- public int /*long*/ lParam;
+ public long /*int*/ lParam;
// POINT pt;
/** @field accessor=lvfi.pt.x */
public int x;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMREBARCHEVRON.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMREBARCHEVRON.java
index 968869118b..a65cb16446 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMREBARCHEVRON.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMREBARCHEVRON.java
@@ -13,7 +13,7 @@ package org.eclipse.swt.internal.win32;
public class NMREBARCHEVRON extends NMHDR {
public int uBand;
public int wID;
- public int /*long*/ lParam;
+ public long /*int*/ lParam;
// RECT rc;
/** @field accessor=rc.left */
public int left;
@@ -23,6 +23,6 @@ public class NMREBARCHEVRON extends NMHDR {
public int right;
/** @field accessor=rc.bottom */
public int bottom;
- public int /*long*/ lParamNM;
+ public long /*int*/ lParamNM;
public static int sizeof = OS.NMREBARCHEVRON_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTOOLBAR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTOOLBAR.java
index 9171aff39d..e0673d104f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTOOLBAR.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTOOLBAR.java
@@ -22,12 +22,12 @@ public class NMTOOLBAR extends NMHDR {
/** @field accessor=tbButton.fsStyle */
public byte fsStyle;
/** @field accessor=tbButton.dwData */
- public int /*long*/ dwData;
+ public long /*int*/ dwData;
/** @field accessor=tbButton.iString */
- public int /*long*/ iString;
+ public long /*int*/ iString;
public int cchText;
/** @field cast=(LPTSTR) */
- public int /*long*/ pszText;
+ public long /*int*/ pszText;
// RECT rcButton;
/** @field accessor=rcButton.left,flags=no_wince */
public int left;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFO.java
index 7f1f6bd8f2..2fe333d2e1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFO.java
@@ -12,10 +12,10 @@ package org.eclipse.swt.internal.win32;
public abstract class NMTTDISPINFO extends NMHDR {
/** @field cast=(void *) */
- public int /*long*/ lpszText;
+ public long /*int*/ lpszText;
/** @field cast=(HINSTANCE) */
- public int /*long*/ hinst;
+ public long /*int*/ hinst;
public int uFlags;
- public int /*long*/ lParam;
+ public long /*int*/ lParam;
public static final int sizeof = OS.IsUnicode ? OS.NMTTDISPINFOW_sizeof () : OS.NMTTDISPINFOA_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVDISPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVDISPINFO.java
index 08fab9a064..ab42411ebd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVDISPINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVDISPINFO.java
@@ -15,13 +15,13 @@ public class NMTVDISPINFO extends NMHDR {
/** @field accessor=item.mask */
public int mask;
/** @field accessor=item.hItem,cast=(HTREEITEM) */
- public int /*long*/ hItem;
+ public long /*int*/ hItem;
/** @field accessor=item.state */
public int state;
/** @field accessor=item.stateMask */
public int stateMask;
/** @field accessor=item.pszText,cast=(LPTSTR) */
- public int /*long*/ pszText;
+ public long /*int*/ pszText;
/** @field accessor=item.cchTextMax */
public int cchTextMax;
/** @field accessor=item.iImage */
@@ -31,6 +31,6 @@ public class NMTVDISPINFO extends NMHDR {
/** @field accessor=item.cChildren */
public int cChildren;
/** @field accessor=item.lParam */
- public int /*long*/ lParam;
+ public long /*int*/ lParam;
public static final int sizeof = OS.NMTVDISPINFO_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVITEMCHANGE.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVITEMCHANGE.java
index 701818dc29..46130118c4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVITEMCHANGE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTVITEMCHANGE.java
@@ -13,9 +13,9 @@ package org.eclipse.swt.internal.win32;
public class NMTVITEMCHANGE extends NMHDR {
public int uChanged;
/** @field cast=(HTREEITEM) */
- public int /*long*/ hItem;
+ public long /*int*/ hItem;
public int uStateNew;
public int uStateOld;
- public int /*long*/ lParam;
+ public long /*int*/ lParam;
public static int sizeof = OS.NMTVITEMCHANGE_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATA.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATA.java
index 7b4318622a..2c8b65ec43 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATA.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NOTIFYICONDATA.java
@@ -13,12 +13,12 @@ package org.eclipse.swt.internal.win32;
public abstract class NOTIFYICONDATA {
public int cbSize;
/** @field cast=(HWND) */
- public int /*long*/ hWnd;
+ public long /*int*/ hWnd;
public int uID;
public int uFlags;
public int uCallbackMessage;
/** @field cast=(HICON) */
- public int /*long*/ hIcon;
+ public long /*int*/ hIcon;
/** @field flags=no_wince */
public int dwState;
/** @field flags=no_wince */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OFNOTIFY.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OFNOTIFY.java
index 290db321c7..cd0810dfdd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OFNOTIFY.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OFNOTIFY.java
@@ -12,8 +12,8 @@ package org.eclipse.swt.internal.win32;
public class OFNOTIFY extends NMHDR {
/** @field cast=(LPOPENFILENAME) */
- public int /*long*/ lpOFN;
+ public long /*int*/ lpOFN;
/** @field cast=(LPTSTR) */
- public int /*long*/ pszFile;
+ public long /*int*/ pszFile;
public static int sizeof = OS.OFNOTIFY_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OPENFILENAME.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OPENFILENAME.java
index 4c97a543da..1e6fc63164 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OPENFILENAME.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OPENFILENAME.java
@@ -13,37 +13,37 @@ package org.eclipse.swt.internal.win32;
public class OPENFILENAME {
public int lStructSize;
/** @field cast=(HWND) */
- public int /*long*/ hwndOwner;
+ public long /*int*/ hwndOwner;
/** @field cast=(HINSTANCE) */
- public int /*long*/ hInstance;
+ public long /*int*/ hInstance;
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpstrFilter;
+ public long /*int*/ lpstrFilter;
/** @field cast=(LPTSTR) */
- public int /*long*/ lpstrCustomFilter;
+ public long /*int*/ lpstrCustomFilter;
public int nMaxCustFilter;
public int nFilterIndex;
/** @field cast=(LPTSTR) */
- public int /*long*/ lpstrFile;
+ public long /*int*/ lpstrFile;
public int nMaxFile;
/** @field cast=(LPTSTR) */
- public int /*long*/ lpstrFileTitle;
+ public long /*int*/ lpstrFileTitle;
public int nMaxFileTitle;
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpstrInitialDir;
+ public long /*int*/ lpstrInitialDir;
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpstrTitle;
+ public long /*int*/ lpstrTitle;
public int Flags;
public short nFileOffset;
public short nFileExtension;
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpstrDefExt;
- public int /*long*/ lCustData;
+ public long /*int*/ lpstrDefExt;
+ public long /*int*/ lCustData;
/** @field cast=(LPOFNHOOKPROC) */
- public int /*long*/ lpfnHook;
+ public long /*int*/ lpfnHook;
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpTemplateName;
+ public long /*int*/ lpTemplateName;
/** @field cast=(void *),flags=no_wince */
- public int /*long*/ pvReserved;
+ public long /*int*/ pvReserved;
/** @field flags=no_wince */
public int dwReserved;
/** @field flags=no_wince */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
index 145a849d64..b9512389ae 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
@@ -95,22 +95,22 @@ public class OS extends C {
if (System.getProperty (NO_MANIFEST) == null) {
if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 1)) {
TCHAR buffer = new TCHAR (0, MAX_PATH);
- int /*long*/ hModule = OS.GetLibraryHandle ();
+ long /*int*/ hModule = OS.GetLibraryHandle ();
while (OS.GetModuleFileName (hModule, buffer, buffer.length ()) == buffer.length ()) {
buffer = new TCHAR (0, buffer.length () + MAX_PATH);
}
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
int byteCount = buffer.length () * (OS.IsUnicode ? 2 : 1);
- int /*long*/ pszText = OS.HeapAlloc (hHeap, HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ pszText = OS.HeapAlloc (hHeap, HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (pszText, buffer, byteCount);
ACTCTX pActCtx = new ACTCTX ();
pActCtx.cbSize = ACTCTX.sizeof;
pActCtx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID | ACTCTX_FLAG_SET_PROCESS_DEFAULT;
pActCtx.lpSource = pszText;
pActCtx.lpResourceName = MANIFEST_RESOURCE_ID;
- int /*long*/ hActCtx = OS.CreateActCtx (pActCtx);
+ long /*int*/ hActCtx = OS.CreateActCtx (pActCtx);
if (pszText != 0) OS.HeapFree (hHeap, 0, pszText);
- int /*long*/ [] lpCookie = new int /*long*/ [1];
+ long /*int*/ [] lpCookie = new long /*int*/ [1];
OS.ActivateActCtx (hActCtx, lpCookie);
/*
* NOTE: A single activation context is created and activated
@@ -160,14 +160,14 @@ public class OS extends C {
dvi.dwMajorVersion = 4;
dvi.dwMinorVersion = 0;
TCHAR lpLibFileName = new TCHAR (0, "comctl32.dll", true); //$NON-NLS-1$
- int /*long*/ hModule = OS.LoadLibrary (lpLibFileName);
+ long /*int*/ hModule = OS.LoadLibrary (lpLibFileName);
if (hModule != 0) {
String name = "DllGetVersion\0"; //$NON-NLS-1$
byte [] lpProcName = new byte [name.length ()];
for (int i=0; i= OS.VERSION (5, 1) ? OS.TOOLINFO_sizeof () : 44;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOUCHINPUT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOUCHINPUT.java
index c444ad01fe..b995fff5db 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOUCHINPUT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOUCHINPUT.java
@@ -14,12 +14,12 @@ public class TOUCHINPUT {
public int x;
public int y;
/** @field cast=(HWND) */
- public int /*long*/ hSource;
+ public long /*int*/ hSource;
public int dwID;
public int dwFlags;
public int dwMask;
public int dwTime;
- public int /*long*/ dwExtraInfo;
+ public long /*int*/ dwExtraInfo;
public int cxContact;
public int cyContact;
public static final int sizeof = OS.TOUCHINPUT_sizeof();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRACKMOUSEEVENT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRACKMOUSEEVENT.java
index db2169ef55..0e56e36b28 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRACKMOUSEEVENT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRACKMOUSEEVENT.java
@@ -14,7 +14,7 @@ public class TRACKMOUSEEVENT {
public int cbSize;
public int dwFlags;
/** @field cast=(HWND) */
- public int /*long*/ hwndTrack;
+ public long /*int*/ hwndTrack;
public int dwHoverTime;
public static final int sizeof = OS.TRACKMOUSEEVENT_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVHITTESTINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVHITTESTINFO.java
index 83b2f8107b..acb79c79e8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVHITTESTINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVHITTESTINFO.java
@@ -18,6 +18,6 @@ public class TVHITTESTINFO {
public int y;
public int flags;
/** @field cast=(HTREEITEM) */
- public int /*long*/ hItem;
+ public long /*int*/ hItem;
public static int sizeof = OS.TVHITTESTINFO_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVINSERTSTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVINSERTSTRUCT.java
index 89e2f6f28c..0e392ae83b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVINSERTSTRUCT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVINSERTSTRUCT.java
@@ -12,20 +12,20 @@ package org.eclipse.swt.internal.win32;
public class TVINSERTSTRUCT {
/** @field cast=(HTREEITEM) */
- public int /*long*/ hParent;
+ public long /*int*/ hParent;
/** @field cast=(HTREEITEM) */
- public int /*long*/ hInsertAfter;
+ public long /*int*/ hInsertAfter;
// public TVITEMEX item;
/** @field accessor=item.mask */
public int mask;
/** @field accessor=item.hItem,cast=(HTREEITEM) */
- public int /*long*/ hItem;
+ public long /*int*/ hItem;
/** @field accessor=item.state */
public int state;
/** @field accessor=item.stateMask */
public int stateMask;
/** @field accessor=item.pszText,cast=(LPTSTR) */
- public int /*long*/ pszText;
+ public long /*int*/ pszText;
/** @field accessor=item.cchTextMax */
public int cchTextMax;
/** @field accessor=item.iImage */
@@ -35,7 +35,7 @@ public class TVINSERTSTRUCT {
/** @field accessor=item.cChildren */
public int cChildren;
/** @field accessor=item.lParam */
- public int /*long*/ lParam;
+ public long /*int*/ lParam;
/** @field accessor=itemex.iIntegral,flags=no_wince */
public int iIntegral;
public static final int sizeof = OS.TVINSERTSTRUCT_sizeof ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEM.java
index cd41c7e9d1..7fb9c9b428 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEM.java
@@ -13,15 +13,15 @@ package org.eclipse.swt.internal.win32;
public class TVITEM {
public int mask;
/** @field cast=(HTREEITEM) */
- public int /*long*/ hItem;
+ public long /*int*/ hItem;
public int state;
public int stateMask;
/** @field cast=(LPTSTR) */
- public int /*long*/ pszText;
+ public long /*int*/ pszText;
public int cchTextMax;
public int iImage;
public int iSelectedImage;
public int cChildren;
- public int /*long*/ lParam;
+ public long /*int*/ lParam;
public static final int sizeof = OS.TVITEM_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVSORTCB.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVSORTCB.java
index 6b55788f80..6f87a92196 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVSORTCB.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVSORTCB.java
@@ -12,10 +12,10 @@ package org.eclipse.swt.internal.win32;
public class TVSORTCB {
/** @field cast=(HTREEITEM) */
- public int /*long*/ hParent;
+ public long /*int*/ hParent;
/** @field cast=(PFNTVCOMPARE) */
- public int /*long*/ lpfnCompare;
+ public long /*int*/ lpfnCompare;
/** @field cast=(LPARAM) */
- public int /*long*/ lParam;
+ public long /*int*/ lParam;
public static final int sizeof = OS.TVSORTCB_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPOS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPOS.java
index d6148f71d4..0e8669ecc9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPOS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPOS.java
@@ -12,9 +12,9 @@ package org.eclipse.swt.internal.win32;
public class WINDOWPOS {
/** @field cast=(HWND) */
- public int /*long*/ hwnd;
+ public long /*int*/ hwnd;
/** @field cast=(HWND) */
- public int /*long*/ hwndInsertAfter;
+ public long /*int*/ hwndInsertAfter;
public int x;
public int y;
public int cx;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WNDCLASS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WNDCLASS.java
index e3720d7959..fba12c59a4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WNDCLASS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WNDCLASS.java
@@ -13,20 +13,20 @@ package org.eclipse.swt.internal.win32;
public class WNDCLASS {
public int style;
/** @field cast=(WNDPROC) */
- public int /*long*/ lpfnWndProc;
+ public long /*int*/ lpfnWndProc;
public int cbClsExtra;
public int cbWndExtra;
/** @field cast=(HINSTANCE) */
- public int /*long*/ hInstance;
+ public long /*int*/ hInstance;
/** @field cast=(HICON) */
- public int /*long*/ hIcon;
+ public long /*int*/ hIcon;
/** @field cast=(HCURSOR) */
- public int /*long*/ hCursor;
+ public long /*int*/ hCursor;
/** @field cast=(HBRUSH) */
- public int /*long*/ hbrBackground;
+ public long /*int*/ hbrBackground;
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpszMenuName;
+ public long /*int*/ lpszMenuName;
/** @field cast=(LPCTSTR) */
- public int /*long*/ lpszClassName;
+ public long /*int*/ lpszClassName;
public static final int sizeof = OS.WNDCLASS_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/org/eclipse/swt/internal/win32/PROCESS_INFORMATION.java b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/org/eclipse/swt/internal/win32/PROCESS_INFORMATION.java
index efc7d20be0..cd8859119e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/org/eclipse/swt/internal/win32/PROCESS_INFORMATION.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/org/eclipse/swt/internal/win32/PROCESS_INFORMATION.java
@@ -12,9 +12,9 @@ package org.eclipse.swt.internal.win32;
public class PROCESS_INFORMATION {
/** @field cast=(HANDLE) */
- public int /*long*/ hProcess;
+ public long /*int*/ hProcess;
/** @field cast=(HANDLE) */
- public int /*long*/ hThread;
+ public long /*int*/ hThread;
public int dwProcessId;
public int dwThreadId;
public static int sizeof = Win32.PROCESS_INFORMATION_sizeof ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/org/eclipse/swt/internal/win32/SHELLEXECUTEINFOW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/org/eclipse/swt/internal/win32/SHELLEXECUTEINFOW.java
index a8214aafda..5bc48d712c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/org/eclipse/swt/internal/win32/SHELLEXECUTEINFOW.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/org/eclipse/swt/internal/win32/SHELLEXECUTEINFOW.java
@@ -14,34 +14,34 @@ public class SHELLEXECUTEINFOW {
public int cbSize;
public int fMask;
/** @field cast=(HWND) */
- public int /*long*/ hwnd;
+ public long /*int*/ hwnd;
/** @field cast=(LPWSTR) */
- public int /*long*/ lpVerb;
+ public long /*int*/ lpVerb;
/** @field cast=(LPWSTR) */
public int lpFile;
/** @field cast=(LPWSTR) */
- public int /*long*/ lpParameters;
+ public long /*int*/ lpParameters;
/** @field cast=(LPWSTR) */
- public int /*long*/ lpDirectory;
+ public long /*int*/ lpDirectory;
public int nShow;
/** @field cast=(HINSTANCE) */
- public int /*long*/ hInstApp;
+ public long /*int*/ hInstApp;
// Optional members
/** @field cast=(LPVOID) */
- public int /*long*/ lpIDList;
+ public long /*int*/ lpIDList;
/** @field cast=(LPWSTR) */
- public int /*long*/ lpClass;
+ public long /*int*/ lpClass;
/** @field cast=(HKEY) */
- public int /*long*/ hkeyClass;
+ public long /*int*/ hkeyClass;
public int dwHotKey;
// union {
// HANDLE hIcon;
// HANDLE hMonitor;
// };
/** @field cast=(HANDLE) */
- public int /*long*/ hIcon;
+ public long /*int*/ hIcon;
/** @field cast=(HANDLE) */
- public int /*long*/ hProcess;
+ public long /*int*/ hProcess;
public static final int sizeof = Win32.SHELLEXECUTEINFOW_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/org/eclipse/swt/internal/win32/STARTUPINFOW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/org/eclipse/swt/internal/win32/STARTUPINFOW.java
index 7448750e2d..c94b68e46c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/org/eclipse/swt/internal/win32/STARTUPINFOW.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf_win32/org/eclipse/swt/internal/win32/STARTUPINFOW.java
@@ -13,11 +13,11 @@ package org.eclipse.swt.internal.win32;
public class STARTUPINFOW {
public int cb;
/** @field cast=(LPWSTR) */
- public int /*long*/ lpReserved;
+ public long /*int*/ lpReserved;
/** @field cast=(LPWSTR) */
- public int /*long*/ lpDesktop;
+ public long /*int*/ lpDesktop;
/** @field cast=(LPWSTR) */
- public int /*long*/ lpTitle;
+ public long /*int*/ lpTitle;
public int dwX;
public int dwY;
public int dwXSize;
@@ -29,12 +29,12 @@ public class STARTUPINFOW {
public short wShowWindow;
public short cbReserved2;
/** @field cast=(LPBYTE) */
- public int /*long*/ lpReserved2;
+ public long /*int*/ lpReserved2;
/** @field cast=(HANDLE) */
- public int /*long*/ hStdInput;
+ public long /*int*/ hStdInput;
/** @field cast=(HANDLE) */
- public int /*long*/ hStdOutput;
+ public long /*int*/ hStdOutput;
/** @field cast=(HANDLE) */
- public int /*long*/ hStdError;
+ public long /*int*/ hStdError;
public static int sizeof = Win32.STARTUPINFOW_sizeof ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java
index 4f96ceddd4..6f1c34da71 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java
@@ -155,7 +155,7 @@ public PrinterData open() {
NSPrintPanel panel = NSPrintPanel.printPanel();
NSPrintInfo printInfo = new NSPrintInfo(NSPrintInfo.sharedPrintInfo().copy());
if (printerData.duplex != SWT.DEFAULT) {
- int /*long*/ settings = printInfo.PMPrintSettings();
+ long /*int*/ settings = printInfo.PMPrintSettings();
int duplex = printerData.duplex == PrinterData.DUPLEX_SHORT_EDGE ? OS.kPMDuplexTumble
: printerData.duplex == PrinterData.DUPLEX_LONG_EDGE ? OS.kPMDuplexNoTumble
: OS.kPMDuplexNone;
@@ -191,7 +191,7 @@ public PrinterData open() {
if ((getStyle () & SWT.SHEET) != 0) {
initClasses();
SWTPrintPanelDelegate delegate = (SWTPrintPanelDelegate)new SWTPrintPanelDelegate().alloc().init();
- int /*long*/ jniRef = OS.NewGlobalRef(this);
+ long /*int*/ jniRef = OS.NewGlobalRef(this);
if (jniRef == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.object_setInstanceVariable(delegate.id, SWT_OBJECT, jniRef);
returnCode = -1;
@@ -226,7 +226,7 @@ public PrinterData open() {
data.copyCount = new NSNumber(dict.objectForKey(OS.NSPrintCopies)).intValue();
data.copyCount = 1; //TODO: Only set to 1 if the printer does the copy internally (most printers do)
data.orientation = new NSNumber(dict.objectForKey(OS.NSPrintOrientation)).intValue() == OS.NSLandscapeOrientation ? PrinterData.LANDSCAPE : PrinterData.PORTRAIT;
- int /*long*/ settings = printInfo.PMPrintSettings();
+ long /*int*/ settings = printInfo.PMPrintSettings();
int outDuplexSetting[] = new int[1];
OS.PMGetDuplex(settings, outDuplexSetting);
data.duplex = outDuplexSetting[0] == OS.kPMDuplexTumble ? PrinterData.DUPLEX_SHORT_EDGE
@@ -264,8 +264,8 @@ static boolean getSheetEnabled () {
return !"false".equals(System.getProperty("org.eclipse.swt.sheet"));
}
-static int /*long*/ dialogProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2) {
- int /*long*/ [] jniRef = new int /*long*/ [1];
+static long /*int*/ dialogProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
+ long /*int*/ [] jniRef = new long /*int*/ [1];
OS.object_getInstanceVariable(id, SWT_OBJECT, jniRef);
if (jniRef[0] == 0) return 0;
if (sel == OS.sel_panelDidEnd_returnCode_contextInfo_) {
@@ -281,18 +281,18 @@ void initClasses () {
if (OS.objc_lookUpClass (className) != 0) return;
dialogCallback5 = new Callback(getClass(), "dialogProc", 5);
- int /*long*/ dialogProc5 = dialogCallback5.getAddress();
+ long /*int*/ dialogProc5 = dialogCallback5.getAddress();
if (dialogProc5 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
byte[] types = {'*','\0'};
int size = C.PTR_SIZEOF, align = C.PTR_SIZEOF == 4 ? 2 : 3;
- int /*long*/ cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
+ long /*int*/ cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types);
OS.class_addMethod(cls, OS.sel_panelDidEnd_returnCode_contextInfo_, dialogProc5, "@:@i@");
OS.objc_registerClassPair(cls);
}
-void panelDidEnd_returnCode_contextInfo(int /*long*/ id, int /*long*/ sel, int /*long*/ alert, int /*long*/ returnCode, int /*long*/ contextInfo) {
+void panelDidEnd_returnCode_contextInfo(long /*int*/ id, long /*int*/ sel, long /*int*/ alert, long /*int*/ returnCode, long /*int*/ contextInfo) {
this.returnCode = (int)/*64*/returnCode;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java
index 0abd78e547..ba53c40a01 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java
@@ -212,7 +212,7 @@ protected void create(DeviceData deviceData) {
printInfo.setPrinter(printer);
}
if (data.duplex != SWT.DEFAULT) {
- int /*long*/ settings = printInfo.PMPrintSettings();
+ long /*int*/ settings = printInfo.PMPrintSettings();
int duplex = data.duplex == PrinterData.DUPLEX_SHORT_EDGE ? OS.kPMDuplexTumble
: data.duplex == PrinterData.DUPLEX_LONG_EDGE ? OS.kPMDuplexNoTumble
: OS.kPMDuplexNone;
@@ -241,7 +241,7 @@ protected void create(DeviceData deviceData) {
window.initWithContentRect(rect, OS.NSBorderlessWindowMask, OS.NSBackingStoreBuffered, false);
String className = "SWTPrinterView"; //$NON-NLS-1$
if (OS.objc_lookUpClass(className) == 0) {
- int /*long*/ cls = OS.objc_allocateClassPair(OS.class_NSView, className, 0);
+ long /*int*/ cls = OS.objc_allocateClassPair(OS.class_NSView, className, 0);
OS.class_addMethod(cls, OS.sel_isFlipped, OS.isFlipped_CALLBACK(), "@:");
OS.objc_registerClassPair(cls);
}
@@ -296,7 +296,7 @@ protected void destroy() {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public int /*long*/ internal_new_GC(GCData data) {
+public long /*int*/ internal_new_GC(GCData data) {
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
NSAutoreleasePool pool = null;
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
@@ -347,7 +347,7 @@ protected void init () {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC(int /*long*/ hDC, GCData data) {
+public void internal_dispose_GC(long /*int*/ hDC, GCData data) {
if (data != null) isGCCreated = false;
}
@@ -554,12 +554,12 @@ public Point getDPI() {
NSAutoreleasePool pool = null;
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
- int /*long*/ pmPrintSession = printInfo.PMPrintSession();
- int /*long*/ printer[] = new int /*long*/ [1];
- int /*long*/ err = OS.PMSessionGetCurrentPrinter(pmPrintSession, printer);
+ long /*int*/ pmPrintSession = printInfo.PMPrintSession();
+ long /*int*/ printer[] = new long /*int*/ [1];
+ long /*int*/ err = OS.PMSessionGetCurrentPrinter(pmPrintSession, printer);
if (err == OS.noErr) {
- int /*long*/ printSettings = printInfo.PMPrintSettings();
+ long /*int*/ printSettings = printInfo.PMPrintSettings();
short[] destType = new short[1];
if (OS.PMSessionGetDestinationType(pmPrintSession, printSettings, destType) == OS.noErr) {
if (destType[0] == OS.kPMDestinationPrinter) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/PrintDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/PrintDialog.java
index a317822f15..a6f2acd244 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/PrintDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/PrintDialog.java
@@ -33,7 +33,7 @@ import org.eclipse.swt.widgets.*;
public class PrintDialog extends Dialog {
PrinterData printerData = new PrinterData();
- int /*long*/ handle;
+ long /*int*/ handle;
int index;
byte [] settingsData;
@@ -292,7 +292,7 @@ public PrinterData open() {
return Printer.getDefaultPrinterData();
} else {
byte [] titleBytes = Converter.wcsToMbcs (null, getText(), true);
- int /*long*/ topHandle = getParent().handle;
+ long /*int*/ topHandle = getParent().handle;
while (topHandle != 0 && !OS.GTK_IS_WINDOW(topHandle)) {
topHandle = OS.gtk_widget_get_parent(topHandle);
}
@@ -305,8 +305,8 @@ public PrinterData open() {
OS.GTK_PRINT_CAPABILITY_COLLATE | OS.GTK_PRINT_CAPABILITY_COPIES | OS.GTK_PRINT_CAPABILITY_PAGE_SET);
/* Set state into print dialog settings. */
- int /*long*/ settings = OS.gtk_print_settings_new();
- int /*long*/ page_setup = OS.gtk_page_setup_new();
+ long /*int*/ settings = OS.gtk_print_settings_new();
+ long /*int*/ page_setup = OS.gtk_page_setup_new();
if (printerData.otherData != null) {
Printer.restore(printerData.otherData, settings, page_setup);
@@ -316,7 +316,7 @@ public PrinterData open() {
String printerName = printerData.name;
if (printerName == null && printerData.printToFile) {
/* Find the printer name corresponding to the file backend. */
- int /*long*/ printer = Printer.gtkPrinterFromPrinterData(printerData);
+ long /*int*/ printer = Printer.gtkPrinterFromPrinterData(printerData);
if (printer != 0) {
PrinterData data = Printer.printerDataFromGtkPrinter(printer);
printerName = data.name;
@@ -377,7 +377,7 @@ public PrinterData open() {
}
OS.g_object_unref(settings);
OS.g_object_unref(page_setup);
- int /*long*/ group = OS.gtk_window_get_group(0);
+ long /*int*/ group = OS.gtk_window_get_group(0);
OS.gtk_window_group_add_window (group, handle);
OS.gtk_window_set_modal(handle, true);
PrinterData data = null;
@@ -385,7 +385,7 @@ public PrinterData open() {
Display display = getParent() != null ? getParent().getDisplay (): Display.getCurrent ();
int signalId = 0;
- int /*long*/ hookId = 0;
+ long /*int*/ hookId = 0;
if ((getStyle () & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, ((LONG) display.getData (GET_EMISSION_PROC_KEY)).value, handle, 0);
@@ -411,7 +411,7 @@ public PrinterData open() {
OS.g_signal_remove_emission_hook (signalId, hookId);
}
if (response == OS.GTK_RESPONSE_OK) {
- int /*long*/ printer = OS.gtk_print_unix_dialog_get_selected_printer(handle);
+ long /*int*/ printer = OS.gtk_print_unix_dialog_get_selected_printer(handle);
if (printer != 0) {
/* Get state from print dialog. */
settings = OS.gtk_print_unix_dialog_get_settings(handle); // must unref
@@ -425,7 +425,7 @@ public PrinterData open() {
case OS.GTK_PRINT_PAGES_RANGES:
data.scope = PrinterData.PAGE_RANGE;
int[] num_ranges = new int[1];
- int /*long*/ page_ranges = OS.gtk_print_settings_get_page_ranges(settings, num_ranges);
+ long /*int*/ page_ranges = OS.gtk_print_settings_get_page_ranges(settings, num_ranges);
int [] pageRange = new int[2];
int length = num_ranges[0];
int min = Integer.MAX_VALUE, max = 0;
@@ -447,7 +447,7 @@ public PrinterData open() {
data.printToFile = Printer.GTK_FILE_BACKEND.equals(data.driver); // TODO: GTK_FILE_BACKEND is not GTK API (see gtk bug 345590)
if (data.printToFile) {
- int /*long*/ address = OS.gtk_print_settings_get(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI);
+ long /*int*/ address = OS.gtk_print_settings_get(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI);
int length = OS.strlen (address);
byte [] buffer = new byte [length];
OS.memmove (buffer, address, length);
@@ -464,7 +464,7 @@ public PrinterData open() {
/* Save other print_settings data as key/value pairs in otherData. */
Callback printSettingsCallback = new Callback(this, "GtkPrintSettingsFunc", 3); //$NON-NLS-1$
- int /*long*/ GtkPrintSettingsFunc = printSettingsCallback.getAddress();
+ long /*int*/ GtkPrintSettingsFunc = printSettingsCallback.getAddress();
if (GtkPrintSettingsFunc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
index = 0;
settingsData = new byte[1024];
@@ -480,7 +480,7 @@ public PrinterData open() {
store("bottom_margin", OS.gtk_page_setup_get_bottom_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$
store("left_margin", OS.gtk_page_setup_get_left_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$
store("right_margin", OS.gtk_page_setup_get_right_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$
- int /*long*/ paper_size = OS.gtk_page_setup_get_paper_size(page_setup); //$NON-NLS-1$
+ long /*int*/ paper_size = OS.gtk_page_setup_get_paper_size(page_setup); //$NON-NLS-1$
storeBytes("paper_size_name", OS.gtk_paper_size_get_name(paper_size)); //$NON-NLS-1$
storeBytes("paper_size_display_name", OS.gtk_paper_size_get_display_name(paper_size)); //$NON-NLS-1$
storeBytes("paper_size_ppd_name", OS.gtk_paper_size_get_ppd_name(paper_size)); //$NON-NLS-1$
@@ -498,7 +498,7 @@ public PrinterData open() {
}
}
-int /*long*/ GtkPrintSettingsFunc (int /*long*/ key, int /*long*/ value, int /*long*/ data) {
+long /*int*/ GtkPrintSettingsFunc (long /*int*/ key, long /*int*/ value, long /*int*/ data) {
int length = OS.strlen (key);
byte [] keyBuffer = new byte [length];
OS.memmove (keyBuffer, key, length);
@@ -521,7 +521,7 @@ void store(String key, boolean value) {
store(key, String.valueOf(value));
}
-void storeBytes(String key, int /*long*/ value) {
+void storeBytes(String key, long /*int*/ value) {
int length = OS.strlen (value);
byte [] valueBuffer = new byte [length];
OS.memmove (valueBuffer, value, length);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java
index d1b17cf836..ed98be0c0e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java
@@ -44,16 +44,16 @@ import org.eclipse.swt.printing.PrinterData;
*/
public final class Printer extends Device {
static PrinterData [] printerList;
- static int /*long*/ findPrinter;
+ static long /*int*/ findPrinter;
static PrinterData findData;
PrinterData data;
- int /*long*/ printer;
- int /*long*/ printJob;
- int /*long*/ settings;
- int /*long*/ pageSetup;
- int /*long*/ surface;
- int /*long*/ cairo;
+ long /*int*/ printer;
+ long /*int*/ printJob;
+ long /*int*/ settings;
+ long /*int*/ pageSetup;
+ long /*int*/ surface;
+ long /*int*/ cairo;
/**
* whether or not a GC was created for this printer
@@ -76,7 +76,7 @@ static void gtk_init() {
if (OS.GTK_VERSION < OS.VERSION(2, 24, 0)) {
OS.gtk_set_locale();
}
- if (!OS.gtk_init_check (new int /*long*/ [] {0}, null)) {
+ if (!OS.gtk_init_check (new long /*int*/ [] {0}, null)) {
SWT.error (SWT.ERROR_NO_HANDLES, null, " [gtk_init_check() failed]");
}
}
@@ -95,7 +95,7 @@ public static PrinterData[] getPrinterList() {
}
gtk_init();
Callback printerCallback = new Callback(Printer.class, "GtkPrinterFunc_List", 2); //$NON-NLS-1$
- int /*long*/ GtkPrinterFunc_List = printerCallback.getAddress();
+ long /*int*/ GtkPrinterFunc_List = printerCallback.getAddress();
if (GtkPrinterFunc_List == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
OS.gtk_enumerate_printers(GtkPrinterFunc_List, 0, 0, true);
/*
@@ -109,7 +109,7 @@ public static PrinterData[] getPrinterList() {
return printerList;
}
-static int /*long*/ GtkPrinterFunc_List (int /*long*/ printer, int /*long*/ user_data) {
+static long /*int*/ GtkPrinterFunc_List (long /*int*/ printer, long /*int*/ user_data) {
int length = printerList.length;
PrinterData [] newList = new PrinterData [length + 1];
System.arraycopy (printerList, 0, newList, 0, length);
@@ -143,7 +143,7 @@ public static PrinterData getDefaultPrinterData() {
}
gtk_init();
Callback printerCallback = new Callback(Printer.class, "GtkPrinterFunc_Default", 2); //$NON-NLS-1$
- int /*long*/ GtkPrinterFunc_Default = printerCallback.getAddress();
+ long /*int*/ GtkPrinterFunc_Default = printerCallback.getAddress();
if (GtkPrinterFunc_Default == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
OS.gtk_enumerate_printers(GtkPrinterFunc_Default, 0, 0, true);
/*
@@ -157,7 +157,7 @@ public static PrinterData getDefaultPrinterData() {
return findData;
}
-static int /*long*/ GtkPrinterFunc_Default (int /*long*/ printer, int /*long*/ user_data) {
+static long /*int*/ GtkPrinterFunc_Default (long /*int*/ printer, long /*int*/ user_data) {
if (OS.gtk_printer_is_default(printer)) {
findData = printerDataFromGtkPrinter(printer);
return 1;
@@ -167,10 +167,10 @@ static int /*long*/ GtkPrinterFunc_Default (int /*long*/ printer, int /*long*/ u
return 0;
}
-static int /*long*/ gtkPrinterFromPrinterData(PrinterData data) {
+static long /*int*/ gtkPrinterFromPrinterData(PrinterData data) {
gtk_init();
Callback printerCallback = new Callback(Printer.class, "GtkPrinterFunc_FindNamedPrinter", 2); //$NON-NLS-1$
- int /*long*/ GtkPrinterFunc_FindNamedPrinter = printerCallback.getAddress();
+ long /*int*/ GtkPrinterFunc_FindNamedPrinter = printerCallback.getAddress();
if (GtkPrinterFunc_FindNamedPrinter == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
findPrinter = 0;
findData = data;
@@ -186,7 +186,7 @@ static int /*long*/ gtkPrinterFromPrinterData(PrinterData data) {
return findPrinter;
}
-static int /*long*/ GtkPrinterFunc_FindNamedPrinter (int /*long*/ printer, int /*long*/ user_data) {
+static long /*int*/ GtkPrinterFunc_FindNamedPrinter (long /*int*/ printer, long /*int*/ user_data) {
PrinterData pd = printerDataFromGtkPrinter(printer);
if ((pd.driver.equals(findData.driver) && pd.name.equals(findData.name))
|| (pd.driver.equals(GTK_FILE_BACKEND)) && findData.printToFile && findData.driver == null && findData.name == null) {
@@ -200,9 +200,9 @@ static int /*long*/ GtkPrinterFunc_FindNamedPrinter (int /*long*/ printer, int /
return 0;
}
-static PrinterData printerDataFromGtkPrinter(int /*long*/ printer) {
- int /*long*/ backend = OS.gtk_printer_get_backend(printer);
- int /*long*/ address = OS.G_OBJECT_TYPE_NAME(backend);
+static PrinterData printerDataFromGtkPrinter(long /*int*/ printer) {
+ long /*int*/ backend = OS.gtk_printer_get_backend(printer);
+ long /*int*/ address = OS.G_OBJECT_TYPE_NAME(backend);
int length = OS.strlen (address);
byte [] buffer = new byte [length];
OS.memmove (buffer, address, length);
@@ -220,7 +220,7 @@ static PrinterData printerDataFromGtkPrinter(int /*long*/ printer) {
/*
* Restore printer settings and page_setup data from data.
*/
-static void restore(byte [] data, int /*long*/ settings, int /*long*/ page_setup) {
+static void restore(byte [] data, long /*int*/ settings, long /*int*/ page_setup) {
settingsData = data;
start = end = 0;
while (end < settingsData.length && settingsData[end] != 0) {
@@ -253,7 +253,7 @@ static void restore(byte [] data, int /*long*/ settings, int /*long*/ page_setup
double width = restoreDouble("paper_size_width"); //$NON-NLS-1$
double height = restoreDouble("paper_size_height"); //$NON-NLS-1$
boolean custom = restoreBoolean("paper_size_is_custom"); //$NON-NLS-1$
- int /*long*/ paper_size = 0;
+ long /*int*/ paper_size = 0;
if (custom) {
if (ppd_name.length > 0) {
paper_size = OS.gtk_paper_size_new_from_ppd(ppd_name, display_name, width, height);
@@ -273,13 +273,13 @@ static byte [] uriFromFilename(String filename) {
if (length == 0) return null;
char[] chars = new char[length];
filename.getChars(0, length, chars, 0);
- int /*long*/[] error = new int /*long*/[1];
- int /*long*/ utf8Ptr = OS.g_utf16_to_utf8(chars, chars.length, null, null, error);
+ long /*int*/[] error = new long /*int*/[1];
+ long /*int*/ utf8Ptr = OS.g_utf16_to_utf8(chars, chars.length, null, null, error);
if (error[0] != 0 || utf8Ptr == 0) return null;
- int /*long*/ localePtr = OS.g_filename_from_utf8(utf8Ptr, -1, null, null, error);
+ long /*int*/ localePtr = OS.g_filename_from_utf8(utf8Ptr, -1, null, null, error);
OS.g_free(utf8Ptr);
if (error[0] != 0 || localePtr == 0) return null;
- int /*long*/ uriPtr = OS.g_filename_to_uri(localePtr, 0, error);
+ long /*int*/ uriPtr = OS.g_filename_to_uri(localePtr, 0, error);
OS.g_free(localePtr);
if (error[0] != 0 || uriPtr == 0) return null;
length = OS.strlen(uriPtr);
@@ -294,7 +294,7 @@ static DeviceData checkNull (PrinterData data) {
if (data.driver == null || data.name == null) {
PrinterData defaultData = null;
if (data.printToFile) {
- int /*long*/ filePrinter = gtkPrinterFromPrinterData(data);
+ long /*int*/ filePrinter = gtkPrinterFromPrinterData(data);
if (filePrinter != 0) {
defaultData = printerDataFromGtkPrinter(filePrinter);
OS.g_object_unref(filePrinter);
@@ -410,8 +410,8 @@ static byte [] restoreBytes(String key, boolean nullTerminate) {
public Font getSystemFont () {
checkDevice ();
if (systemFont != null) return systemFont;
- int /*long*/ style = OS.gtk_widget_get_default_style();
- int /*long*/ defaultFont = OS.pango_font_description_copy (OS.gtk_style_get_font_desc (style));
+ long /*int*/ style = OS.gtk_widget_get_default_style();
+ long /*int*/ defaultFont = OS.pango_font_description_copy (OS.gtk_style_get_font_desc (style));
int size = OS.pango_font_description_get_size(defaultFont);
Point dpi = getDPI(), screenDPI = super.getDPI();
OS.pango_font_description_set_size(defaultFont, size * dpi.y / screenDPI.y);
@@ -433,8 +433,8 @@ public Font getSystemFont () {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public int /*long*/ internal_new_GC(GCData data) {
- int /*long*/ gc, drawable = 0;
+public long /*int*/ internal_new_GC(GCData data) {
+ long /*int*/ gc, drawable = 0;
if (OS.USE_CAIRO) {
gc = cairo;
} else {
@@ -488,8 +488,8 @@ public int /*long*/ internal_new_GC(GCData data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC(int /*long*/ hDC, GCData data) {
- int /*long*/ gc = hDC;
+public void internal_dispose_GC(long /*int*/ hDC, GCData data) {
+ long /*int*/ gc = hDC;
if (data != null) isGCCreated = false;
if (OS.USE_CAIRO) return;
OS.g_object_unref (gc);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java
index dfbdfca53b..d996390fc6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java
@@ -287,8 +287,8 @@ public PrinterData open() {
/* Get the owner HWND for the dialog */
Control parent = getParent();
int style = getStyle();
- int /*long*/ hwndOwner = parent.handle;
- int /*long*/ hwndParent = parent.handle;
+ long /*int*/ hwndOwner = parent.handle;
+ long /*int*/ hwndParent = parent.handle;
/*
* Feature in Windows. There is no API to set the BIDI orientation
@@ -342,8 +342,8 @@ public PrinterData open() {
short[] offsets = new short[4]; // DEVNAMES (4 offsets)
int offsetsSize = offsets.length * 2; // 2 bytes each
offsets[1] = (short) offsets.length; // offset 1 points to wDeviceOffset
- int /*long*/ hMem = OS.GlobalAlloc(OS.GMEM_MOVEABLE | OS.GMEM_ZEROINIT, offsetsSize + size);
- int /*long*/ ptr = OS.GlobalLock(hMem);
+ long /*int*/ hMem = OS.GlobalAlloc(OS.GMEM_MOVEABLE | OS.GMEM_ZEROINIT, offsetsSize + size);
+ long /*int*/ ptr = OS.GlobalLock(hMem);
OS.MoveMemory(ptr, offsets, offsetsSize);
OS.MoveMemory(ptr + offsetsSize, buffer, size);
OS.GlobalUnlock(hMem);
@@ -368,8 +368,8 @@ public PrinterData open() {
*/
byte devmodeData [] = printerData.otherData;
if (devmodeData != null && devmodeData.length != 0) {
- int /*long*/ hMem = OS.GlobalAlloc(OS.GMEM_MOVEABLE | OS.GMEM_ZEROINIT, devmodeData.length);
- int /*long*/ ptr = OS.GlobalLock(hMem);
+ long /*int*/ hMem = OS.GlobalAlloc(OS.GMEM_MOVEABLE | OS.GMEM_ZEROINIT, devmodeData.length);
+ long /*int*/ ptr = OS.GlobalLock(hMem);
OS.MoveMemory(ptr, devmodeData, devmodeData.length);
OS.GlobalUnlock(hMem);
if (pd.hDevMode != 0) OS.GlobalFree(pd.hDevMode);
@@ -377,12 +377,12 @@ public PrinterData open() {
}
/* Initialize the DEVMODE struct's fields from the printerData. */
- int /*long*/ hMem = pd.hDevMode;
+ long /*int*/ hMem = pd.hDevMode;
if (hMem == 0) {
hMem = OS.GlobalAlloc(OS.GMEM_MOVEABLE | OS.GMEM_ZEROINIT, DEVMODE.sizeof);
pd.hDevMode = hMem;
}
- int /*long*/ ptr = OS.GlobalLock(hMem);
+ long /*int*/ ptr = OS.GlobalLock(hMem);
DEVMODE devmode = OS.IsUnicode ? (DEVMODE)new DEVMODEW () : new DEVMODEA ();
OS.MoveMemory(devmode, ptr, OS.IsUnicode ? OS.DEVMODEW_sizeof() : OS.DEVMODEA_sizeof());
if (printerData.name != null) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java
index 7acec23a00..7a559db7a3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java
@@ -50,7 +50,7 @@ public final class Printer extends Device {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
/**
* the printer data describing this printer
@@ -214,16 +214,16 @@ protected void create(DeviceData deviceData) {
/* Use the character encoding for the default locale */
TCHAR driver = new TCHAR(0, data.driver, true);
TCHAR device = new TCHAR(0, data.name, true);
- int /*long*/ lpInitData = 0;
+ long /*int*/ lpInitData = 0;
byte devmodeData [] = data.otherData;
- int /*long*/ hHeap = OS.GetProcessHeap();
+ long /*int*/ hHeap = OS.GetProcessHeap();
if (devmodeData != null && devmodeData.length != 0) {
/* If user setup info from a print dialog was specified, restore the DEVMODE struct. */
lpInitData = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, devmodeData.length);
OS.MoveMemory(lpInitData, devmodeData, devmodeData.length);
} else {
if (!OS.IsWinCE) {
- int /*long*/ [] hPrinter = new int /*long*/ [1];
+ long /*int*/ [] hPrinter = new long /*int*/ [1];
OS.OpenPrinter(device, hPrinter, 0);
if (hPrinter[0] != 0) {
int dwNeeded = OS.DocumentProperties(0, hPrinter[0], device, 0, 0, 0);
@@ -284,7 +284,7 @@ protected void create(DeviceData deviceData) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public int /*long*/ internal_new_GC(GCData data) {
+public long /*int*/ internal_new_GC(GCData data) {
if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (data != null) {
if (isGCCreated) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
@@ -316,7 +316,7 @@ public int /*long*/ internal_new_GC(GCData data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC(int /*long*/ hDC, GCData data) {
+public void internal_dispose_GC(long /*int*/ hDC, GCData data) {
if (data != null) isGCCreated = false;
}
@@ -345,8 +345,8 @@ public boolean startJob(String jobName) {
checkDevice();
DOCINFO di = new DOCINFO();
di.cbSize = DOCINFO.sizeof;
- int /*long*/ hHeap = OS.GetProcessHeap();
- int /*long*/ lpszDocName = 0;
+ long /*int*/ hHeap = OS.GetProcessHeap();
+ long /*int*/ lpszDocName = 0;
if (jobName != null && jobName.length() != 0) {
/* Use the character encoding for the default locale */
TCHAR buffer = new TCHAR(0, jobName, true);
@@ -355,7 +355,7 @@ public boolean startJob(String jobName) {
OS.MoveMemory(lpszDocName, buffer, byteCount);
di.lpszDocName = lpszDocName;
}
- int /*long*/ lpszOutput = 0;
+ long /*int*/ lpszOutput = 0;
if (data.printToFile) {
if (data.fileName == null) {
/* Prompt the user for a file name. */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/cde/org/eclipse/swt/internal/cde/CDE.java b/bundles/org.eclipse.swt/Eclipse SWT Program/cde/org/eclipse/swt/internal/cde/CDE.java
index f2ea5b5da1..f1fda5c56d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/cde/org/eclipse/swt/internal/cde/CDE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/cde/org/eclipse/swt/internal/cde/CDE.java
@@ -33,8 +33,8 @@ public class CDE extends Platform {
* @param appName cast=(char *)
* @param appClass cast=(char *)
*/
-public static final native boolean _DtAppInitialize(int /*long*/ appContext, int /*long*/ display, int /*long*/ topWiget, byte[] appName, byte[] appClass);
-public static final boolean DtAppInitialize(int /*long*/ appContext, int /*long*/ display, int /*long*/ topWiget, byte[] appName, byte[] appClass) {
+public static final native boolean _DtAppInitialize(long /*int*/ appContext, long /*int*/ display, long /*int*/ topWiget, byte[] appName, byte[] appClass);
+public static final boolean DtAppInitialize(long /*int*/ appContext, long /*int*/ display, long /*int*/ topWiget, byte[] appName, byte[] appClass) {
lock.lock();
try {
return _DtAppInitialize(appContext, display, topWiget, appName, appClass);
@@ -51,8 +51,8 @@ public static final void DtDbLoad() {
lock.unlock();
}
}
-public static final native int /*long*/ _DtDtsDataTypeNames();
-public static final int /*long*/ DtDtsDataTypeNames() {
+public static final native long /*int*/ _DtDtsDataTypeNames();
+public static final long /*int*/ DtDtsDataTypeNames() {
lock.lock();
try {
return _DtDtsDataTypeNames();
@@ -61,8 +61,8 @@ public static final int /*long*/ DtDtsDataTypeNames() {
}
}
/** @param fileName cast=(char *) */
-public static final native int /*long*/ _DtDtsFileToDataType(byte[] fileName);
-public static final int /*long*/ DtDtsFileToDataType(byte[] fileName) {
+public static final native long /*int*/ _DtDtsFileToDataType(byte[] fileName);
+public static final long /*int*/ DtDtsFileToDataType(byte[] fileName) {
lock.lock();
try {
return _DtDtsFileToDataType(fileName);
@@ -85,8 +85,8 @@ public static final boolean DtDtsDataTypeIsAction(byte[] dataType) {
* @param attrName cast=(char *)
* @param optName cast=(char *)
*/
-public static final native int /*long*/ _DtDtsDataTypeToAttributeValue(byte[] dataType, byte[] attrName, byte[] optName);
-public static final int /*long*/ DtDtsDataTypeToAttributeValue(byte[] dataType, byte[] attrName, byte[] optName) {
+public static final native long /*int*/ _DtDtsDataTypeToAttributeValue(byte[] dataType, byte[] attrName, byte[] optName);
+public static final long /*int*/ DtDtsDataTypeToAttributeValue(byte[] dataType, byte[] attrName, byte[] optName) {
lock.lock();
try {
return _DtDtsDataTypeToAttributeValue(dataType, attrName, optName);
@@ -95,8 +95,8 @@ public static final int /*long*/ DtDtsDataTypeToAttributeValue(byte[] dataType,
}
}
/** @param dataType cast=(char *) */
-public static final native void _DtDtsFreeDataType(int /*long*/ dataType);
-public static final void DtDtsFreeDataType(int /*long*/ dataType) {
+public static final native void _DtDtsFreeDataType(long /*int*/ dataType);
+public static final void DtDtsFreeDataType(long /*int*/ dataType) {
lock.lock();
try {
_DtDtsFreeDataType(dataType);
@@ -105,8 +105,8 @@ public static final void DtDtsFreeDataType(int /*long*/ dataType) {
}
}
/** @param dataTypeList cast=(char **) */
-public static final native void _DtDtsFreeDataTypeNames(int /*long*/ dataTypeList);
-public static final void DtDtsFreeDataTypeNames(int /*long*/ dataTypeList) {
+public static final native void _DtDtsFreeDataTypeNames(long /*int*/ dataTypeList);
+public static final void DtDtsFreeDataTypeNames(long /*int*/ dataTypeList) {
lock.lock();
try {
_DtDtsFreeDataTypeNames(dataTypeList);
@@ -115,8 +115,8 @@ public static final void DtDtsFreeDataTypeNames(int /*long*/ dataTypeList) {
}
}
/** @param attrValue cast=(char *) */
-public static final native void _DtDtsFreeAttributeValue(int /*long*/ attrValue);
-public static final void DtDtsFreeAttributeValue(int /*long*/ attrValue) {
+public static final native void _DtDtsFreeAttributeValue(long /*int*/ attrValue);
+public static final void DtDtsFreeAttributeValue(long /*int*/ attrValue) {
lock.lock();
try {
_DtDtsFreeAttributeValue(attrValue);
@@ -133,8 +133,8 @@ public static final void DtDtsFreeAttributeValue(int /*long*/ attrValue) {
* @param callback cast=(DtActionCallbackProc)
* @param clientData cast=(XtPointer)
*/
-public static final native long _DtActionInvoke(int /*long*/ topWidget, byte[] action, DtActionArg args, int argCount, byte[] termOpts, byte[] execHost, byte[] contextDir, int useIndicator, int /*long*/ callback, int /*long*/ clientData);
-public static final long DtActionInvoke(int /*long*/ topWidget, byte[] action, DtActionArg args, int argCount, byte[] termOpts, byte[] execHost, byte[] contextDir, int useIndicator, int /*long*/ callback, int /*long*/ clientData) {
+public static final native long _DtActionInvoke(long /*int*/ topWidget, byte[] action, DtActionArg args, int argCount, byte[] termOpts, byte[] execHost, byte[] contextDir, int useIndicator, long /*int*/ callback, long /*int*/ clientData);
+public static final long DtActionInvoke(long /*int*/ topWidget, byte[] action, DtActionArg args, int argCount, byte[] termOpts, byte[] execHost, byte[] contextDir, int useIndicator, long /*int*/ callback, long /*int*/ clientData) {
lock.lock();
try {
return _DtActionInvoke(topWidget, action, args, argCount, termOpts, execHost, contextDir, useIndicator, callback, clientData);
@@ -143,8 +143,8 @@ public static final long DtActionInvoke(int /*long*/ topWidget, byte[] action, D
}
}
/** @method flags=const */
-public static final native int /*long*/ _topLevelShellWidgetClass();
-public static final int /*long*/ topLevelShellWidgetClass() {
+public static final native long /*int*/ _topLevelShellWidgetClass();
+public static final long /*int*/ topLevelShellWidgetClass() {
lock.lock();
try {
return _topLevelShellWidgetClass();
@@ -159,8 +159,8 @@ public static final int /*long*/ topLevelShellWidgetClass() {
* @param display cast=(Display *)
* @param argList cast=(ArgList)
*/
-public static final native int /*long*/ _XtAppCreateShell(byte[] appName, byte[] appClass, int /*long*/ widgetClass, int /*long*/ display, int /*long*/ [] argList, int argCount);
-public static final int /*long*/ XtAppCreateShell(byte[] appName, byte[] appClass, int /*long*/ widgetClass, int /*long*/ display, int /*long*/ [] argList, int argCount) {
+public static final native long /*int*/ _XtAppCreateShell(byte[] appName, byte[] appClass, long /*int*/ widgetClass, long /*int*/ display, long /*int*/ [] argList, int argCount);
+public static final long /*int*/ XtAppCreateShell(byte[] appName, byte[] appClass, long /*int*/ widgetClass, long /*int*/ display, long /*int*/ [] argList, int argCount) {
lock.lock();
try {
return _XtAppCreateShell(appName, appClass, widgetClass, display, argList, argCount);
@@ -168,8 +168,8 @@ public static final int /*long*/ XtAppCreateShell(byte[] appName, byte[] appClas
lock.unlock();
}
}
-public static final native int /*long*/ _XtCreateApplicationContext();
-public static final int /*long*/ XtCreateApplicationContext() {
+public static final native long /*int*/ _XtCreateApplicationContext();
+public static final long /*int*/ XtCreateApplicationContext() {
lock.lock();
try {
return _XtCreateApplicationContext();
@@ -187,8 +187,8 @@ public static final int /*long*/ XtCreateApplicationContext() {
* @param argc cast=(int *)
* @param argv cast=(String *)
*/
-public static final native void _XtDisplayInitialize(int /*long*/ app_context, int /*long*/ display, byte[] appName, byte[] appClass, int /*long*/ options, int num_options, int /*long*/ [] argc, int argv);
-public static final void XtDisplayInitialize(int /*long*/ appContext, int /*long*/ display, byte[] appName, byte[] appClass, int /*long*/ options, int num_options, int /*long*/ [] argc, int argv) {
+public static final native void _XtDisplayInitialize(long /*int*/ app_context, long /*int*/ display, byte[] appName, byte[] appClass, long /*int*/ options, int num_options, long /*int*/ [] argc, int argv);
+public static final void XtDisplayInitialize(long /*int*/ appContext, long /*int*/ display, byte[] appName, byte[] appClass, long /*int*/ options, int num_options, long /*int*/ [] argc, int argv) {
lock.lock();
try {
_XtDisplayInitialize(appContext, display, appName, appClass, options, num_options, argc, argv);
@@ -197,8 +197,8 @@ public static final void XtDisplayInitialize(int /*long*/ appContext, int /*long
}
}
/** @param widget cast=(Widget) */
-public static final native void _XtRealizeWidget(int /*long*/ widget);
-public static final void XtRealizeWidget(int /*long*/ widget) {
+public static final native void _XtRealizeWidget(long /*int*/ widget);
+public static final void XtRealizeWidget(long /*int*/ widget) {
lock.lock();
try {
_XtRealizeWidget(widget);
@@ -207,8 +207,8 @@ public static final void XtRealizeWidget(int /*long*/ widget) {
}
}
/** @param widget cast=(Widget) */
-public static final native void _XtResizeWidget(int /*long*/ widget, int width, int height, int borderWidth);
-public static final void XtResizeWidget(int /*long*/ widget, int width, int height, int borderWidth) {
+public static final native void _XtResizeWidget(long /*int*/ widget, int width, int height, int borderWidth);
+public static final void XtResizeWidget(long /*int*/ widget, int width, int height, int borderWidth) {
lock.lock();
try {
_XtResizeWidget(widget, width, height, borderWidth);
@@ -217,8 +217,8 @@ public static final void XtResizeWidget(int /*long*/ widget, int width, int heig
}
}
/** @param widget cast=(Widget) */
-public static final native void _XtSetMappedWhenManaged(int /*long*/ widget, boolean flag);
-public static final void XtSetMappedWhenManaged(int /*long*/ widget, boolean flag) {
+public static final native void _XtSetMappedWhenManaged(long /*int*/ widget, boolean flag);
+public static final void XtSetMappedWhenManaged(long /*int*/ widget, boolean flag) {
lock.lock();
try {
_XtSetMappedWhenManaged(widget, flag);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/cde/org/eclipse/swt/internal/cde/DtActionArg.java b/bundles/org.eclipse.swt/Eclipse SWT Program/cde/org/eclipse/swt/internal/cde/DtActionArg.java
index a9e369830b..552d57c426 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/cde/org/eclipse/swt/internal/cde/DtActionArg.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/cde/org/eclipse/swt/internal/cde/DtActionArg.java
@@ -14,6 +14,6 @@ package org.eclipse.swt.internal.cde;
public class DtActionArg {
public int argClass;
/** @field accessor=u.file.name,cast=(char *) */
- public int /*long*/ name;
+ public long /*int*/ name;
public static final int sizeof = CDE.DtActionArg_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java
index ac206dd8b1..37ce6ef74f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java
@@ -72,7 +72,7 @@ public static Program findProgram (String extension) {
if (ext != null) {
byte[] fsRef = new byte[80];
if (OS.LSGetApplicationForInfo(OS.kLSUnknownType, OS.kLSUnknownCreator, ext.id, OS.kLSRolesAll, fsRef, null) == OS.noErr) {
- int /*long*/ url = OS.CFURLCreateFromFSRef(OS.kCFAllocatorDefault(), fsRef);
+ long /*int*/ url = OS.CFURLCreateFromFSRef(OS.kCFAllocatorDefault(), fsRef);
if (url != 0) {
NSString bundlePath = new NSURL(url).path();
NSBundle bundle = NSBundle.bundleWithPath(bundlePath);
@@ -224,7 +224,7 @@ static NSURL getURL (String fileName) {
if (NSFileManager.defaultManager().fileExistsAtPath(fullPath)) {
fullPath = NSURL.fileURLWithPath(fullPath).absoluteString();
}
- int /*long*/ ptr = OS.CFURLCreateStringByAddingPercentEscapes(0, fullPath.id, unescapedStr.id, 0, OS.kCFStringEncodingUTF8);
+ long /*int*/ ptr = OS.CFURLCreateStringByAddingPercentEscapes(0, fullPath.id, unescapedStr.id, 0, OS.kCFStringEncodingUTF8);
NSString escapedString = new NSString(ptr);
NSURL url = NSURL.URLWithString(escapedString);
OS.CFRelease(ptr);
@@ -232,7 +232,7 @@ static NSURL getURL (String fileName) {
}
static boolean isExecutable (String fileName) {
- int /*long*/ ptr = OS.malloc(1);
+ long /*int*/ ptr = OS.malloc(1);
NSString path = NSString.stringWith(fileName);
boolean result = false;
NSFileManager manager = NSFileManager.defaultManager();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/org/eclipse/swt/internal/gnome/GNOME.java b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/org/eclipse/swt/internal/gnome/GNOME.java
index 80e5449919..a2fe30906e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/org/eclipse/swt/internal/gnome/GNOME.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/org/eclipse/swt/internal/gnome/GNOME.java
@@ -48,8 +48,8 @@ public static final native int GnomeVFSMimeApplication_sizeof();
* @param flags cast=(GnomeIconLookupFlags)
* @param result cast=(GnomeIconLookupResultFlags *)
*/
-public static final native int /*long*/ _gnome_icon_lookup(int /*long*/ icon_theme, int /*long*/ thumbnail_factory, byte[] file_uri, byte[] custom_icon, int /*long*/ file_info, byte[] mime_type, int flags, int[] result);
-public static final int /*long*/ gnome_icon_lookup(int /*long*/ icon_theme, int /*long*/ thumbnail_factory, byte[] file_uri, byte[] custom_icon, int /*long*/ file_info, byte[] mime_type, int flags, int[] result) {
+public static final native long /*int*/ _gnome_icon_lookup(long /*int*/ icon_theme, long /*int*/ thumbnail_factory, byte[] file_uri, byte[] custom_icon, long /*int*/ file_info, byte[] mime_type, int flags, int[] result);
+public static final long /*int*/ gnome_icon_lookup(long /*int*/ icon_theme, long /*int*/ thumbnail_factory, byte[] file_uri, byte[] custom_icon, long /*int*/ file_info, byte[] mime_type, int flags, int[] result) {
lock.lock();
try {
return _gnome_icon_lookup(icon_theme, thumbnail_factory, file_uri, custom_icon, file_info, mime_type, flags, result);
@@ -62,8 +62,8 @@ public static final int /*long*/ gnome_icon_lookup(int /*long*/ icon_theme, int
* @param icon_name cast=(const char *)
* @param icon_data cast=(const GnomeIconData **)
*/
-public static final native int /*long*/ _gnome_icon_theme_lookup_icon(int /*long*/ theme, int /*long*/ icon_name, int size, int /*long*/[] icon_data, int[] base_size);
-public static final int /*long*/ gnome_icon_theme_lookup_icon(int /*long*/ theme, int /*long*/ icon_name, int size, int /*long*/[] icon_data, int[] base_size) {
+public static final native long /*int*/ _gnome_icon_theme_lookup_icon(long /*int*/ theme, long /*int*/ icon_name, int size, long /*int*/[] icon_data, int[] base_size);
+public static final long /*int*/ gnome_icon_theme_lookup_icon(long /*int*/ theme, long /*int*/ icon_name, int size, long /*int*/[] icon_data, int[] base_size) {
lock.lock();
try {
return _gnome_icon_theme_lookup_icon(theme, icon_name, size, icon_data, base_size);
@@ -71,8 +71,8 @@ public static final int /*long*/ gnome_icon_theme_lookup_icon(int /*long*/ theme
lock.unlock();
}
}
-public static final native int /*long*/ _gnome_icon_theme_new();
-public static final int /*long*/ gnome_icon_theme_new() {
+public static final native long /*int*/ _gnome_icon_theme_new();
+public static final long /*int*/ gnome_icon_theme_new() {
lock.lock();
try {
return _gnome_icon_theme_new();
@@ -80,8 +80,8 @@ public static final int /*long*/ gnome_icon_theme_new() {
lock.unlock();
}
}
-public static final native int /*long*/ _gnome_vfs_get_registered_mime_types();
-public static final int /*long*/ gnome_vfs_get_registered_mime_types() {
+public static final native long /*int*/ _gnome_vfs_get_registered_mime_types();
+public static final long /*int*/ gnome_vfs_get_registered_mime_types() {
lock.lock();
try {
return _gnome_vfs_get_registered_mime_types();
@@ -90,8 +90,8 @@ public static final int /*long*/ gnome_vfs_get_registered_mime_types() {
}
}
/** @param uri cast=(const char *) */
-public static final native int /*long*/ _gnome_vfs_get_mime_type(int /*long*/ uri);
-public static final int /*long*/ gnome_vfs_get_mime_type(int /*long*/ uri) {
+public static final native long /*int*/ _gnome_vfs_get_mime_type(long /*int*/ uri);
+public static final long /*int*/ gnome_vfs_get_mime_type(long /*int*/ uri) {
lock.lock();
try {
return _gnome_vfs_get_mime_type(uri);
@@ -110,8 +110,8 @@ public static final boolean gnome_vfs_init() {
}
}
/** @param uri cast=(const char *) */
-public static final native int /*long*/ _gnome_vfs_make_uri_from_input(byte[] uri);
-public static final int /*long*/ gnome_vfs_make_uri_from_input(byte[] uri) {
+public static final native long /*int*/ _gnome_vfs_make_uri_from_input(byte[] uri);
+public static final long /*int*/ gnome_vfs_make_uri_from_input(byte[] uri) {
lock.lock();
try {
return _gnome_vfs_make_uri_from_input(uri);
@@ -123,8 +123,8 @@ public static final int /*long*/ gnome_vfs_make_uri_from_input(byte[] uri) {
* @method flags=dynamic
* @param uri cast=(const char *)
*/
-public static final native int /*long*/ _gnome_vfs_make_uri_from_input_with_dirs(byte[] uri, int dirs);
-public static final int /*long*/ gnome_vfs_make_uri_from_input_with_dirs(byte[] uri, int dirs) {
+public static final native long /*int*/ _gnome_vfs_make_uri_from_input_with_dirs(byte[] uri, int dirs);
+public static final long /*int*/ gnome_vfs_make_uri_from_input_with_dirs(byte[] uri, int dirs) {
lock.lock();
try {
return _gnome_vfs_make_uri_from_input_with_dirs(uri, dirs);
@@ -133,8 +133,8 @@ public static final int /*long*/ gnome_vfs_make_uri_from_input_with_dirs(byte[]
}
}
/** @param application cast=(GnomeVFSMimeApplication *) */
-public static final native void _gnome_vfs_mime_application_free(int /*long*/ application);
-public static final void gnome_vfs_mime_application_free(int /*long*/ application) {
+public static final native void _gnome_vfs_mime_application_free(long /*int*/ application);
+public static final void gnome_vfs_mime_application_free(long /*int*/ application) {
lock.lock();
try {
_gnome_vfs_mime_application_free(application);
@@ -157,8 +157,8 @@ public static final boolean gnome_vfs_is_executable_command_string(byte[] comman
* @param application cast=(GnomeVFSMimeApplication *)
* @param uris cast=(GList *)
*/
-public static final native int _gnome_vfs_mime_application_launch(int /*long*/ application, int /*long*/ uris);
-public static final int gnome_vfs_mime_application_launch(int /*long*/ application, int /*long*/ uris) {
+public static final native int _gnome_vfs_mime_application_launch(long /*int*/ application, long /*int*/ uris);
+public static final int gnome_vfs_mime_application_launch(long /*int*/ application, long /*int*/ uris) {
lock.lock();
try {
return _gnome_vfs_mime_application_launch(application, uris);
@@ -167,8 +167,8 @@ public static final int gnome_vfs_mime_application_launch(int /*long*/ applicati
}
}
/** @param list cast=(GList *) */
-public static final native void _gnome_vfs_mime_extensions_list_free(int /*long*/ list);
-public static final void gnome_vfs_mime_extensions_list_free(int /*long*/ list) {
+public static final native void _gnome_vfs_mime_extensions_list_free(long /*int*/ list);
+public static final void gnome_vfs_mime_extensions_list_free(long /*int*/ list) {
lock.lock();
try {
_gnome_vfs_mime_extensions_list_free(list);
@@ -177,8 +177,8 @@ public static final void gnome_vfs_mime_extensions_list_free(int /*long*/ list)
}
}
/** @param mimeType cast=(const char *) */
-public static final native int /*long*/ _gnome_vfs_mime_get_default_application(byte[] mimeType);
-public static final int /*long*/ gnome_vfs_mime_get_default_application(byte[] mimeType) {
+public static final native long /*int*/ _gnome_vfs_mime_get_default_application(byte[] mimeType);
+public static final long /*int*/ gnome_vfs_mime_get_default_application(byte[] mimeType) {
lock.lock();
try {
return _gnome_vfs_mime_get_default_application(mimeType);
@@ -187,8 +187,8 @@ public static final int /*long*/ gnome_vfs_mime_get_default_application(byte[] m
}
}
/** @param mime_type cast=(const char *) */
-public static final native int /*long*/ _gnome_vfs_mime_get_extensions_list(int /*long*/ mime_type);
-public static final int /*long*/ gnome_vfs_mime_get_extensions_list(int /*long*/ mime_type) {
+public static final native long /*int*/ _gnome_vfs_mime_get_extensions_list(long /*int*/ mime_type);
+public static final long /*int*/ gnome_vfs_mime_get_extensions_list(long /*int*/ mime_type) {
lock.lock();
try {
return _gnome_vfs_mime_get_extensions_list(mime_type);
@@ -197,8 +197,8 @@ public static final int /*long*/ gnome_vfs_mime_get_extensions_list(int /*long*/
}
}
/** @param list cast=(GList *) */
-public static final native void _gnome_vfs_mime_registered_mime_type_list_free(int /*long*/ list);
-public static final void gnome_vfs_mime_registered_mime_type_list_free(int /*long*/ list) {
+public static final native void _gnome_vfs_mime_registered_mime_type_list_free(long /*int*/ list);
+public static final void gnome_vfs_mime_registered_mime_type_list_free(long /*int*/ list) {
lock.lock();
try {
_gnome_vfs_mime_registered_mime_type_list_free(list);
@@ -207,8 +207,8 @@ public static final void gnome_vfs_mime_registered_mime_type_list_free(int /*lon
}
}
/** @param file cast=(const char *) */
-public static final native int /*long*/ _gnome_vfs_mime_type_from_name(byte[] file);
-public static final int /*long*/ gnome_vfs_mime_type_from_name(byte[] file) {
+public static final native long /*int*/ _gnome_vfs_mime_type_from_name(byte[] file);
+public static final long /*int*/ gnome_vfs_mime_type_from_name(byte[] file) {
lock.lock();
try {
return _gnome_vfs_mime_type_from_name(file);
@@ -220,8 +220,8 @@ public static final int /*long*/ gnome_vfs_mime_type_from_name(byte[] file) {
* @param mime_type cast=(const char *)
* @param base_mime_type cast=(const char *)
*/
-public static final native int /*long*/ _gnome_vfs_mime_type_get_equivalence(int /*long*/ mime_type, byte [] base_mime_type);
-public static final int /*long*/ gnome_vfs_mime_type_get_equivalence(int /*long*/ mime_type, byte [] base_mime_type) {
+public static final native long /*int*/ _gnome_vfs_mime_type_get_equivalence(long /*int*/ mime_type, byte [] base_mime_type);
+public static final long /*int*/ gnome_vfs_mime_type_get_equivalence(long /*int*/ mime_type, byte [] base_mime_type) {
lock.lock();
try {
return _gnome_vfs_mime_type_get_equivalence(mime_type, base_mime_type);
@@ -233,8 +233,8 @@ public static final int /*long*/ gnome_vfs_mime_type_get_equivalence(int /*long*
* @method flags=dynamic
* @param url cast=(const char *)
*/
-public static final native int _gnome_vfs_url_show(int /*long*/ url);
-public static final int gnome_vfs_url_show(int /*long*/ url) {
+public static final native int _gnome_vfs_url_show(long /*int*/ url);
+public static final int gnome_vfs_url_show(long /*int*/ url) {
lock.lock();
try {
return _gnome_vfs_url_show(url);
@@ -247,5 +247,5 @@ public static final int gnome_vfs_url_show(int /*long*/ url) {
* @param src cast=(const void *)
* @param count cast=(size_t)
*/
-public static final native void memmove (GnomeVFSMimeApplication dest, int /*long*/ src, int /*long*/ count);
+public static final native void memmove (GnomeVFSMimeApplication dest, long /*int*/ src, long /*int*/ count);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java
index 53ab852b8b..7a9c6982b3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gnome/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java
@@ -17,17 +17,17 @@ package org.eclipse.swt.internal.gnome;
public class GnomeVFSMimeApplication {
/** @field cast=(char *) */
- public int /*long*/ id;
+ public long /*int*/ id;
/** @field cast=(char *) */
- public int /*long*/ name;
+ public long /*int*/ name;
/** @field cast=(char *) */
- public int /*long*/ command;
+ public long /*int*/ command;
/** @field cast=(gboolean) */
public boolean can_open_multiple_files;
/** @field cast=(GnomeVFSMimeApplicationArgumentType) */
public int expects_uris;
/** @field cast=(GList *) */
- public int /*long*/ supported_uri_schemes;
+ public long /*int*/ supported_uri_schemes;
/** @field cast=(gboolean) */
public boolean requires_terminal;
public static final int sizeof = GNOME.GnomeVFSMimeApplication_sizeof();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
index b2e1a21efa..2ceda879fd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
@@ -42,10 +42,10 @@ public final class Program {
*/
boolean gnomeExpectUri;
- static int /*long*/ modTime;
+ static long /*int*/ modTime;
static Hashtable mimeTable;
- static int /*long*/ cdeShell;
+ static long /*int*/ cdeShell;
static final String[] CDE_ICON_EXT = { ".m.pm", ".l.pm", ".s.pm", ".t.pm" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
static final String[] CDE_MASK_EXT = { ".m_m.bm", ".l_m.bm", ".s_m.bm", ".t_m.bm" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
@@ -74,11 +74,11 @@ static int getDesktop(final Display display) {
int desktop = DESKTOP_UNKNOWN;
/* Get the list of properties on the root window. */
- int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
- int /*long*/ rootWindow = OS.XDefaultRootWindow(xDisplay);
+ long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
+ long /*int*/ rootWindow = OS.XDefaultRootWindow(xDisplay);
int[] numProp = new int[1];
- int /*long*/ propList = OS.XListProperties(xDisplay, rootWindow, numProp);
- int /*long*/ [] property = new int /*long*/ [numProp[0]];
+ long /*int*/ propList = OS.XListProperties(xDisplay, rootWindow, numProp);
+ long /*int*/ [] property = new long /*int*/ [numProp[0]];
if (propList != 0) {
OS.memmove(property, propList, (property.length * OS.PTR_SIZEOF));
OS.XFree(propList);
@@ -99,7 +99,7 @@ static int getDesktop(final Display display) {
*/
if (desktop == DESKTOP_UNKNOWN) {
byte[] gnomeName = Converter.wcsToMbcs(null, "_NET_SUPPORTING_WM_CHECK", true);
- int /*long*/ gnome = OS.XInternAtom(xDisplay, gnomeName, true);
+ long /*int*/ gnome = OS.XInternAtom(xDisplay, gnomeName, true);
if (gnome != OS.None) {
/* Check for the existence of libgio libraries first */
byte[] buffer;
@@ -112,10 +112,10 @@ static int getDesktop(final Display display) {
} else {
buffer = Converter.wcsToMbcs(null, "libgio-2.0.so.0", true);
}
- int /*long*/ libgio = OS.dlopen(buffer, flags);
+ long /*int*/ libgio = OS.dlopen(buffer, flags);
if (libgio != 0) {
buffer = Converter.wcsToMbcs(null, "g_app_info_launch_default_for_uri", true);
- int /*long*/ g_app_info_launch_default_for_uri = OS.dlsym(libgio, buffer);
+ long /*int*/ g_app_info_launch_default_for_uri = OS.dlsym(libgio, buffer);
if (g_app_info_launch_default_for_uri != 0) {
desktop = DESKTOP_GIO;
}
@@ -124,7 +124,7 @@ static int getDesktop(final Display display) {
if (desktop == DESKTOP_UNKNOWN && (OS.GTK_VERSION >= OS.VERSION (2, 2, 0)) && gnome_init()) {
desktop = DESKTOP_GNOME;
- int /*long*/ icon_theme = GNOME.gnome_icon_theme_new();
+ long /*int*/ icon_theme = GNOME.gnome_icon_theme_new();
display.setData(ICON_THEME_DATA, new LONG(icon_theme));
display.addListener(SWT.Dispose, new Listener() {
public void handleEvent(Event event) {
@@ -140,10 +140,10 @@ static int getDesktop(final Display display) {
});
/* Check for libgnomevfs-2 version 2.4 */
buffer = Converter.wcsToMbcs(null, "libgnomevfs-2.so.0", true);
- int /*long*/ libgnomevfs = OS.dlopen(buffer, OS.RTLD_LAZY);
+ long /*int*/ libgnomevfs = OS.dlopen(buffer, OS.RTLD_LAZY);
if (libgnomevfs != 0) {
buffer = Converter.wcsToMbcs(null, "gnome_vfs_url_show", true);
- int /*long*/ gnome_vfs_url_show = OS.dlsym(libgnomevfs, buffer);
+ long /*int*/ gnome_vfs_url_show = OS.dlsym(libgnomevfs, buffer);
if (gnome_vfs_url_show != 0) {
desktop = DESKTOP_GNOME_24;
}
@@ -160,7 +160,7 @@ static int getDesktop(final Display display) {
*/
if (desktop == DESKTOP_UNKNOWN) {
byte[] cdeName = Converter.wcsToMbcs(null, "_DT_SM_PREFERENCES", true);
- int /*long*/ cde = OS.XInternAtom(xDisplay, cdeName, true);
+ long /*int*/ cde = OS.XInternAtom(xDisplay, cdeName, true);
for (int index = 0; desktop == DESKTOP_UNKNOWN && index < property.length; index++) {
if (property[index] == OS.None) continue; /* do not match atoms that do not exist */
if (property[index] == cde && cde_init(display)) desktop = DESKTOP_CDE;
@@ -175,7 +175,7 @@ boolean cde_execute(String fileName) {
/* Use the character encoding for the default locale */
byte[] action = Converter.wcsToMbcs(null, command, true);
byte[] fileArg = Converter.wcsToMbcs(null, fileName, true);
- int /*long*/ ptr = OS.g_malloc(fileArg.length);
+ long /*int*/ ptr = OS.g_malloc(fileArg.length);
OS.memmove(ptr, fileArg, fileArg.length);
DtActionArg args = new DtActionArg();
args.argClass = CDE.DtACTION_FILE;
@@ -205,7 +205,7 @@ static String cde_getAttribute(String dataType, String attrName) {
byte[] dataTypeBuf = Converter.wcsToMbcs(null, dataType, true);
byte[] attrNameBuf = Converter.wcsToMbcs(null, attrName, true);
byte[] optNameBuf = null;
- int /*long*/ attrValue = CDE.DtDtsDataTypeToAttributeValue(dataTypeBuf, attrNameBuf, optNameBuf);
+ long /*int*/ attrValue = CDE.DtDtsDataTypeToAttributeValue(dataTypeBuf, attrNameBuf, optNameBuf);
if (attrValue == 0) return null;
int length = OS.strlen(attrValue);
byte[] attrValueBuf = new byte[length];
@@ -218,11 +218,11 @@ static String cde_getAttribute(String dataType, String attrName) {
static Hashtable cde_getDataTypeInfo() {
Hashtable dataTypeInfo = new Hashtable();
int index;
- int /*long*/ dataTypeList = CDE.DtDtsDataTypeNames();
+ long /*int*/ dataTypeList = CDE.DtDtsDataTypeNames();
if (dataTypeList != 0) {
/* For each data type name in the list */
index = 0;
- int /*long*/ [] dataType = new int /*long*/ [1];
+ long /*int*/ [] dataType = new long /*int*/ [1];
OS.memmove(dataType, dataTypeList + (index++ * 4), 4);
while (dataType[0] != 0) {
int length = OS.strlen(dataType[0]);
@@ -309,13 +309,13 @@ static boolean cde_init(Display display) {
/* Use the character encoding for the default locale */
CDE.XtToolkitInitialize();
- int /*long*/ xtContext = CDE.XtCreateApplicationContext ();
- int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
+ long /*int*/ xtContext = CDE.XtCreateApplicationContext ();
+ long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
byte[] appName = Converter.wcsToMbcs(null, "CDE", true);
byte[] appClass = Converter.wcsToMbcs(null, "CDE", true);
- int /*long*/ [] argc = new int /*long*/ [] {0};
+ long /*int*/ [] argc = new long /*int*/ [] {0};
CDE.XtDisplayInitialize(xtContext, xDisplay, appName, appClass, 0, 0, argc, 0);
- int /*long*/ widgetClass = CDE.topLevelShellWidgetClass ();
+ long /*int*/ widgetClass = CDE.topLevelShellWidgetClass ();
cdeShell = CDE.XtAppCreateShell (appName, appClass, widgetClass, xDisplay, null, 0);
CDE.XtSetMappedWhenManaged (cdeShell, false);
CDE.XtResizeWidget (cdeShell, 10, 10, 0);
@@ -381,10 +381,10 @@ static String[] parseCommand(String cmd) {
*/
boolean gnome_24_execute(String fileName) {
byte[] mimeTypeBuffer = Converter.wcsToMbcs(null, name, true);
- int /*long*/ ptr = GNOME.gnome_vfs_mime_get_default_application(mimeTypeBuffer);
+ long /*int*/ ptr = GNOME.gnome_vfs_mime_get_default_application(mimeTypeBuffer);
byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true);
- int /*long*/ uri = GNOME.gnome_vfs_make_uri_from_input_with_dirs(fileNameBuffer, GNOME.GNOME_VFS_MAKE_URI_DIR_CURRENT);
- int /*long*/ list = OS.g_list_append(0, uri);
+ long /*int*/ uri = GNOME.gnome_vfs_make_uri_from_input_with_dirs(fileNameBuffer, GNOME.GNOME_VFS_MAKE_URI_DIR_CURRENT);
+ long /*int*/ list = OS.g_list_append(0, uri);
int result = GNOME.gnome_vfs_mime_application_launch(ptr, list);
GNOME.gnome_vfs_mime_application_free(ptr);
OS.g_free(uri);
@@ -397,7 +397,7 @@ boolean gnome_24_execute(String fileName) {
*/
static boolean gnome_24_launch(String fileName) {
byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true);
- int /*long*/ uri = GNOME.gnome_vfs_make_uri_from_input_with_dirs(fileNameBuffer, GNOME.GNOME_VFS_MAKE_URI_DIR_CURRENT);
+ long /*int*/ uri = GNOME.gnome_vfs_make_uri_from_input_with_dirs(fileNameBuffer, GNOME.GNOME_VFS_MAKE_URI_DIR_CURRENT);
int result = GNOME.gnome_vfs_url_show(uri);
OS.g_free(uri);
return (result == GNOME.GNOME_VFS_OK);
@@ -410,7 +410,7 @@ boolean gnome_execute(String fileName) {
if (gnomeExpectUri) {
/* Convert the given path into a URL */
byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true);
- int /*long*/ uri = GNOME.gnome_vfs_make_uri_from_input(fileNameBuffer);
+ long /*int*/ uri = GNOME.gnome_vfs_make_uri_from_input(fileNameBuffer);
if (uri != 0) {
int length = OS.strlen(uri);
if (length > 0) {
@@ -474,24 +474,24 @@ ImageData gnome_getImageData() {
*/
static Hashtable gnome_getMimeInfo() {
Hashtable mimeInfo = new Hashtable();
- int /*long*/[] mimeData = new int /*long*/[1];
- int /*long*/[] extensionData = new int /*long*/[1];
- int /*long*/ mimeList = GNOME.gnome_vfs_get_registered_mime_types();
- int /*long*/ mimeElement = mimeList;
+ long /*int*/[] mimeData = new long /*int*/[1];
+ long /*int*/[] extensionData = new long /*int*/[1];
+ long /*int*/ mimeList = GNOME.gnome_vfs_get_registered_mime_types();
+ long /*int*/ mimeElement = mimeList;
while (mimeElement != 0) {
OS.memmove (mimeData, mimeElement, OS.PTR_SIZEOF);
- int /*long*/ mimePtr = mimeData[0];
+ long /*int*/ mimePtr = mimeData[0];
int mimeLength = OS.strlen(mimePtr);
byte[] mimeTypeBuffer = new byte[mimeLength];
OS.memmove(mimeTypeBuffer, mimePtr, mimeLength);
String mimeType = new String(Converter.mbcsToWcs(null, mimeTypeBuffer));
- int /*long*/ extensionList = GNOME.gnome_vfs_mime_get_extensions_list(mimePtr);
+ long /*int*/ extensionList = GNOME.gnome_vfs_mime_get_extensions_list(mimePtr);
if (extensionList != 0) {
Vector extensions = new Vector();
- int /*long*/ extensionElement = extensionList;
+ long /*int*/ extensionElement = extensionList;
while (extensionElement != 0) {
OS.memmove(extensionData, extensionElement, OS.PTR_SIZEOF);
- int /*long*/ extensionPtr = extensionData[0];
+ long /*int*/ extensionPtr = extensionData[0];
int extensionLength = OS.strlen(extensionPtr);
byte[] extensionBuffer = new byte[extensionLength];
OS.memmove(extensionBuffer, extensionPtr, extensionLength);
@@ -513,7 +513,7 @@ static String gnome_getMimeType(String extension) {
String mimeType = null;
String fileName = "swt" + extension;
byte[] extensionBuffer = Converter.wcsToMbcs(null, fileName, true);
- int /*long*/ typeName = GNOME.gnome_vfs_mime_type_from_name(extensionBuffer);
+ long /*int*/ typeName = GNOME.gnome_vfs_mime_type_from_name(extensionBuffer);
if (typeName != 0) {
int length = OS.strlen(typeName);
if (length > 0) {
@@ -528,7 +528,7 @@ static String gnome_getMimeType(String extension) {
static Program gnome_getProgram(Display display, String mimeType) {
Program program = null;
byte[] mimeTypeBuffer = Converter.wcsToMbcs(null, mimeType, true);
- int /*long*/ ptr = GNOME.gnome_vfs_mime_get_default_application(mimeTypeBuffer);
+ long /*int*/ ptr = GNOME.gnome_vfs_mime_get_default_application(mimeTypeBuffer);
if (ptr != 0) {
program = new Program();
program.display = display;
@@ -549,9 +549,9 @@ static Program gnome_getProgram(Display display, String mimeType) {
byte[] buffer = new byte[length + 1];
OS.memmove(buffer, application.id, length);
LONG gnomeIconTheme = (LONG)display.getData(ICON_THEME_DATA);
- int /*long*/ icon_name = GNOME.gnome_icon_lookup(gnomeIconTheme.value, 0, null, buffer, 0, mimeTypeBuffer,
+ long /*int*/ icon_name = GNOME.gnome_icon_lookup(gnomeIconTheme.value, 0, null, buffer, 0, mimeTypeBuffer,
GNOME.GNOME_ICON_LOOKUP_FLAGS_NONE, null);
- int /*long*/ path = 0;
+ long /*int*/ path = 0;
if (icon_name != 0) path = GNOME.gnome_icon_theme_lookup_icon(gnomeIconTheme.value, icon_name, PREFERRED_ICON_SIZE, null, null);
if (path != 0) {
length = OS.strlen(path);
@@ -583,8 +583,8 @@ static boolean gnome_isExecutable(String fileName) {
if (!GNOME.gnome_vfs_is_executable_command_string(fileNameBuffer)) return false;
/* check if the mime type is executable */
- int /*long*/ uri = GNOME.gnome_vfs_make_uri_from_input(fileNameBuffer);
- int /*long*/ mimeType = GNOME.gnome_vfs_get_mime_type(uri);
+ long /*int*/ uri = GNOME.gnome_vfs_make_uri_from_input(fileNameBuffer);
+ long /*int*/ mimeType = GNOME.gnome_vfs_get_mime_type(uri);
OS.g_free(uri);
byte[] exeType = Converter.wcsToMbcs (null, "application/x-executable", true); //$NON-NLS-1$
@@ -733,16 +733,16 @@ static Program[] getPrograms(Display display) {
ImageData gio_getImageData() {
if (iconPath == null) return null;
ImageData data = null;
- int /*long*/ icon_theme =OS.gtk_icon_theme_get_default();
+ long /*int*/ icon_theme =OS.gtk_icon_theme_get_default();
byte[] icon = Converter.wcsToMbcs (null, iconPath, true);
- int /*long*/ gicon = OS.g_icon_new_for_string(icon, null);
+ long /*int*/ gicon = OS.g_icon_new_for_string(icon, null);
if (gicon != 0) {
- int /*long*/ gicon_info = OS.gtk_icon_theme_lookup_by_gicon (icon_theme, gicon, 16/*size*/, 0);
+ long /*int*/ gicon_info = OS.gtk_icon_theme_lookup_by_gicon (icon_theme, gicon, 16/*size*/, 0);
if (gicon_info != 0) {
- int /*long*/ pixbuf = OS.gtk_icon_info_load_icon(gicon_info, null);
+ long /*int*/ pixbuf = OS.gtk_icon_info_load_icon(gicon_info, null);
if (pixbuf != 0) {
int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
int height = OS.gdk_pixbuf_get_height(pixbuf);
int width = OS.gdk_pixbuf_get_width(pixbuf);
boolean hasAlpha = OS.gdk_pixbuf_get_has_alpha(pixbuf);
@@ -777,7 +777,7 @@ ImageData gio_getImageData() {
}
static Hashtable gio_getMimeInfo() {
- int /*long*/ mimeDatabase = 0, fileInfo = 0;
+ long /*int*/ mimeDatabase = 0, fileInfo = 0;
/*
* The file 'globs' contain the file extensions
* associated to the mime-types. Each line that has
@@ -787,10 +787,10 @@ static Hashtable gio_getMimeInfo() {
*/
byte[] buffer = Converter.wcsToMbcs (null, "/usr/share/mime/globs", true);
mimeDatabase = OS.g_file_new_for_path (buffer);
- int /*long*/ fileInputStream = OS.g_file_read (mimeDatabase, 0, 0);
+ long /*int*/ fileInputStream = OS.g_file_read (mimeDatabase, 0, 0);
try {
if (fileInputStream != 0) {
- int /*long*/ [] modTimestamp = new int /*long*/ [2];
+ long /*int*/ [] modTimestamp = new long /*int*/ [2];
buffer = Converter.wcsToMbcs (null, "*", true);
fileInfo = OS.g_file_query_info(mimeDatabase, buffer, 0, 0, 0);
OS.g_file_info_get_modification_time(fileInfo, modTimestamp);
@@ -799,11 +799,11 @@ static Hashtable gio_getMimeInfo() {
} else {
mimeTable = new Hashtable();
modTime = modTimestamp[0];
- int /*long*/ reader = OS.g_data_input_stream_new (fileInputStream);
+ long /*int*/ reader = OS.g_data_input_stream_new (fileInputStream);
int[] length = new int[1];
if (reader != 0) {
- int /*long*/ linePtr = OS.g_data_input_stream_read_line (reader, length, 0, 0);
+ long /*int*/ linePtr = OS.g_data_input_stream_read_line (reader, length, 0, 0);
while (linePtr != 0) {
byte[] lineBytes = new byte[length[0]];
OS.memmove(lineBytes, linePtr, length[0]);
@@ -858,19 +858,19 @@ static String gio_getMimeType(String extension) {
static Program gio_getProgram(Display display, String mimeType) {
Program program = null;
byte[] mimeTypeBuffer = Converter.wcsToMbcs (null, mimeType, true);
- int /*long*/ application = OS.g_app_info_get_default_for_type (mimeTypeBuffer, false);
+ long /*int*/ application = OS.g_app_info_get_default_for_type (mimeTypeBuffer, false);
if (application != 0) {
program = gio_getProgram(display, application);
}
return program;
}
-static Program gio_getProgram (Display display, int /*long*/ application) {
+static Program gio_getProgram (Display display, long /*int*/ application) {
Program program = new Program();
program.display = display;
int length;
byte[] buffer;
- int /*long*/ applicationName = OS.g_app_info_get_name (application);
+ long /*int*/ applicationName = OS.g_app_info_get_name (application);
if (applicationName != 0) {
length = OS.strlen (applicationName);
if (length > 0) {
@@ -879,7 +879,7 @@ static Program gio_getProgram (Display display, int /*long*/ application) {
program.name = new String (Converter.mbcsToWcs (null, buffer));
}
}
- int /*long*/ applicationCommand = OS.g_app_info_get_executable (application);
+ long /*int*/ applicationCommand = OS.g_app_info_get_executable (application);
if (applicationCommand != 0) {
length = OS.strlen (applicationCommand);
if (length > 0) {
@@ -889,9 +889,9 @@ static Program gio_getProgram (Display display, int /*long*/ application) {
}
}
program.gnomeExpectUri = OS.g_app_info_supports_uris(application);
- int /*long*/ icon = OS.g_app_info_get_icon(application);
+ long /*int*/ icon = OS.g_app_info_get_icon(application);
if (icon != 0) {
- int /*long*/ icon_name = OS.g_icon_to_string(icon);
+ long /*int*/ icon_name = OS.g_icon_to_string(icon);
if (icon_name != 0) {
length = OS.strlen(icon_name);
if (length > 0) {
@@ -907,12 +907,12 @@ static Program gio_getProgram (Display display, int /*long*/ application) {
}
static Program[] gio_getPrograms(Display display) {
- int /*long*/ applicationList = OS.g_app_info_get_all ();
- int /*long*/ list = applicationList;
+ long /*int*/ applicationList = OS.g_app_info_get_all ();
+ long /*int*/ list = applicationList;
Program program;
Vector programs = new Vector();
while (list != 0) {
- int /*long*/ application = OS.g_list_data(list);
+ long /*int*/ application = OS.g_list_data(list);
if (application != 0) {
//TODO: Should the list be filtered or not?
// if (OS.g_app_info_should_show(application)) {
@@ -934,13 +934,13 @@ static boolean gio_isExecutable(String fileName) {
byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true);
if (OS.g_file_test(fileNameBuffer, OS.G_FILE_TEST_IS_DIR)) return false;
if (!OS.g_file_test(fileNameBuffer, OS.G_FILE_TEST_IS_EXECUTABLE)) return false;
- int /*long*/ file = OS.g_file_new_for_path (fileNameBuffer);
+ long /*int*/ file = OS.g_file_new_for_path (fileNameBuffer);
boolean result = false;
if (file != 0) {
byte[] buffer = Converter.wcsToMbcs (null, "*", true); //$NON-NLS-1$
- int /*long*/ fileInfo = OS.g_file_query_info(file, buffer, 0, 0, 0);
+ long /*int*/ fileInfo = OS.g_file_query_info(file, buffer, 0, 0, 0);
if (fileInfo != 0) {
- int /*long*/ contentType = OS.g_file_info_get_content_type(fileInfo);
+ long /*int*/ contentType = OS.g_file_info_get_content_type(fileInfo);
if (contentType != 0) {
byte[] exeType = Converter.wcsToMbcs (null, "application/x-executable", true); //$NON-NLS-1$
result = OS.g_content_type_is_a(contentType, exeType);
@@ -962,9 +962,9 @@ static boolean gio_isExecutable(String fileName) {
static boolean gio_launch(String fileName) {
boolean result = false;
byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true);
- int /*long*/ file = OS.g_file_new_for_commandline_arg (fileNameBuffer);
+ long /*int*/ file = OS.g_file_new_for_commandline_arg (fileNameBuffer);
if (file != 0) {
- int /*long*/ uri = OS.g_file_get_uri (file);
+ long /*int*/ uri = OS.g_file_get_uri (file);
if (uri != 0) {
result = OS.g_app_info_launch_default_for_uri (uri, 0, 0);
OS.g_free(uri);
@@ -981,11 +981,11 @@ boolean gio_execute(String fileName) {
boolean result = false;
byte[] commandBuffer = Converter.wcsToMbcs (null, command, true);
byte[] nameBuffer = Converter.wcsToMbcs (null, name, true);
- int /*long*/ application = OS.g_app_info_create_from_commandline(commandBuffer, nameBuffer, gnomeExpectUri
+ long /*int*/ application = OS.g_app_info_create_from_commandline(commandBuffer, nameBuffer, gnomeExpectUri
? OS.G_APP_INFO_CREATE_SUPPORTS_URIS : OS.G_APP_INFO_CREATE_NONE, 0);
if (application != 0) {
byte[] fileNameBuffer = Converter.wcsToMbcs (null, fileName, true);
- int /*long*/ file = 0;
+ long /*int*/ file = 0;
if (fileName.length() > 0) {
if (OS.g_app_info_supports_uris (application)) {
file = OS.g_file_new_for_uri (fileNameBuffer);
@@ -993,7 +993,7 @@ boolean gio_execute(String fileName) {
file = OS.g_file_new_for_path (fileNameBuffer);
}
}
- int /*long*/ list = 0;
+ long /*int*/ list = 0;
if (file != 0) list = OS.g_list_append (0, file);
result = OS.g_app_info_launch (application, list, 0, 0);
if (list != 0) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java
index 58a8d97e20..7b8ee9b674 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java
@@ -69,11 +69,11 @@ static int getDesktop(final Display display) {
int desktop = DESKTOP_UNKNOWN;
/* Get the list of properties on the root window. */
- int /*long*/ xDisplay = display.xDisplay;
- int /*long*/ rootWindow = OS.XDefaultRootWindow(xDisplay);
+ long /*int*/ xDisplay = display.xDisplay;
+ long /*int*/ rootWindow = OS.XDefaultRootWindow(xDisplay);
int[] numProp = new int[1];
- int /*long*/ propList = OS.XListProperties(xDisplay, rootWindow, numProp);
- int /*long*/ [] property = new int /*long*/ [numProp[0]];
+ long /*int*/ propList = OS.XListProperties(xDisplay, rootWindow, numProp);
+ long /*int*/ [] property = new long /*int*/ [numProp[0]];
if (propList != 0) {
OS.memmove(property, propList, (property.length * OS.PTR_SIZEOF));
OS.XFree(propList);
@@ -92,10 +92,10 @@ static int getDesktop(final Display display) {
*/
if (desktop == DESKTOP_UNKNOWN) {
byte[] gnomeName = Converter.wcsToMbcs(null, "_NET_SUPPORTING_WM_CHECK", true);
- int /*long*/ gnome = OS.XInternAtom(xDisplay, gnomeName, true);
+ long /*int*/ gnome = OS.XInternAtom(xDisplay, gnomeName, true);
if (gnome != OS.None && gnome_init()) {
desktop = DESKTOP_GNOME;
- int /*long*/ icon_theme = GNOME.gnome_icon_theme_new();
+ long /*int*/ icon_theme = GNOME.gnome_icon_theme_new();
display.setData(ICON_THEME_DATA, new Integer(icon_theme));
display.addListener(SWT.Dispose, new Listener() {
public void handleEvent(Event event) {
@@ -112,10 +112,10 @@ static int getDesktop(final Display display) {
});
/* Check for libgnomevfs-2 version 2.4 */
byte[] buffer = Converter.wcsToMbcs(null, "libgnomevfs-2.so.0", true);
- int /*long*/ libgnomevfs = OS.dlopen(buffer, OS.RTLD_LAZY);
+ long /*int*/ libgnomevfs = OS.dlopen(buffer, OS.RTLD_LAZY);
if (libgnomevfs != 0) {
buffer = Converter.wcsToMbcs(null, "gnome_vfs_url_show", true);
- int /*long*/ gnome_vfs_url_show = OS.dlsym(libgnomevfs, buffer);
+ long /*int*/ gnome_vfs_url_show = OS.dlsym(libgnomevfs, buffer);
if (gnome_vfs_url_show != 0) {
desktop = DESKTOP_GNOME_24;
}
@@ -131,7 +131,7 @@ static int getDesktop(final Display display) {
*/
if (desktop == DESKTOP_UNKNOWN) {
byte[] cdeName = Converter.wcsToMbcs(null, "_DT_SM_PREFERENCES", true);
- int /*long*/ cde = OS.XInternAtom(xDisplay, cdeName, true);
+ long /*int*/ cde = OS.XInternAtom(xDisplay, cdeName, true);
for (int index = 0; desktop == DESKTOP_UNKNOWN && index < property.length; index++) {
if (property[index] == OS.None) continue; /* do not match atoms that do not exist */
if (property[index] == cde && cde_init(display)) desktop = DESKTOP_CDE;
@@ -185,7 +185,7 @@ static String cde_getAttribute(String dataType, String attrName) {
byte[] dataTypeBuf = Converter.wcsToMbcs(null, dataType, true);
byte[] attrNameBuf = Converter.wcsToMbcs(null, attrName, true);
byte[] optNameBuf = null;
- int /*long*/ attrValue = CDE.DtDtsDataTypeToAttributeValue(dataTypeBuf, attrNameBuf, optNameBuf);
+ long /*int*/ attrValue = CDE.DtDtsDataTypeToAttributeValue(dataTypeBuf, attrNameBuf, optNameBuf);
if (attrValue == 0) return null;
int length = OS.strlen(attrValue);
byte[] attrValueBuf = new byte[length];
@@ -198,11 +198,11 @@ static String cde_getAttribute(String dataType, String attrName) {
static Hashtable cde_getDataTypeInfo() {
Hashtable dataTypeInfo = new Hashtable();
int index;
- int /*long*/ dataTypeList = CDE.DtDtsDataTypeNames();
+ long /*int*/ dataTypeList = CDE.DtDtsDataTypeNames();
if (dataTypeList != 0) {
/* For each data type name in the list */
index = 0;
- int /*long*/ [] dataType = new int /*long*/ [1];
+ long /*int*/ [] dataType = new long /*int*/ [1];
OS.memmove(dataType, dataTypeList + (index++ * 4), 4);
while (dataType[0] != 0) {
int length = OS.strlen(dataType[0]);
@@ -382,10 +382,10 @@ static String[] parseCommand(String cmd) {
*/
boolean gnome_24_execute(String fileName) {
byte[] mimeTypeBuffer = Converter.wcsToMbcs(null, name, true);
- int /*long*/ ptr = GNOME.gnome_vfs_mime_get_default_application(mimeTypeBuffer);
+ long /*int*/ ptr = GNOME.gnome_vfs_mime_get_default_application(mimeTypeBuffer);
byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true);
- int /*long*/ uri = GNOME.gnome_vfs_make_uri_from_input_with_dirs(fileNameBuffer, GNOME.GNOME_VFS_MAKE_URI_DIR_CURRENT);
- int /*long*/ list = GNOME.g_list_append(0, uri);
+ long /*int*/ uri = GNOME.gnome_vfs_make_uri_from_input_with_dirs(fileNameBuffer, GNOME.GNOME_VFS_MAKE_URI_DIR_CURRENT);
+ long /*int*/ list = GNOME.g_list_append(0, uri);
int result = GNOME.gnome_vfs_mime_application_launch(ptr, list);
GNOME.gnome_vfs_mime_application_free(ptr);
GNOME.g_free(uri);
@@ -398,7 +398,7 @@ boolean gnome_24_execute(String fileName) {
*/
static boolean gnome_24_launch(String fileName) {
byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true);
- int /*long*/ uri = GNOME.gnome_vfs_make_uri_from_input_with_dirs(fileNameBuffer, GNOME.GNOME_VFS_MAKE_URI_DIR_CURRENT);
+ long /*int*/ uri = GNOME.gnome_vfs_make_uri_from_input_with_dirs(fileNameBuffer, GNOME.GNOME_VFS_MAKE_URI_DIR_CURRENT);
int result = GNOME.gnome_vfs_url_show(uri);
GNOME.g_free(uri);
return (result == GNOME.GNOME_VFS_OK);
@@ -411,7 +411,7 @@ boolean gnome_execute(String fileName) {
if (gnomeExpectUri) {
/* Convert the given path into a URL */
byte[] fileNameBuffer = Converter.wcsToMbcs(null, fileName, true);
- int /*long*/ uri = GNOME.gnome_vfs_make_uri_from_input(fileNameBuffer);
+ long /*int*/ uri = GNOME.gnome_vfs_make_uri_from_input(fileNameBuffer);
if (uri != 0) {
int length = OS.strlen(uri);
if (length > 0) {
@@ -475,24 +475,24 @@ ImageData gnome_getImageData() {
*/
static Hashtable gnome_getMimeInfo() {
Hashtable mimeInfo = new Hashtable();
- int /*long*/[] mimeData = new int /*long*/[1];
- int /*long*/[] extensionData = new int /*long*/[1];
- int /*long*/ mimeList = GNOME.gnome_vfs_get_registered_mime_types();
- int /*long*/ mimeElement = mimeList;
+ long /*int*/[] mimeData = new long /*int*/[1];
+ long /*int*/[] extensionData = new long /*int*/[1];
+ long /*int*/ mimeList = GNOME.gnome_vfs_get_registered_mime_types();
+ long /*int*/ mimeElement = mimeList;
while (mimeElement != 0) {
OS.memmove (mimeData, mimeElement, OS.PTR_SIZEOF);
- int /*long*/ mimePtr = mimeData[0];
+ long /*int*/ mimePtr = mimeData[0];
int mimeLength = OS.strlen(mimePtr);
byte[] mimeTypeBuffer = new byte[mimeLength];
OS.memmove(mimeTypeBuffer, mimePtr, mimeLength);
String mimeType = new String(Converter.mbcsToWcs(null, mimeTypeBuffer));
- int /*long*/ extensionList = GNOME.gnome_vfs_mime_get_extensions_list(mimePtr);
+ long /*int*/ extensionList = GNOME.gnome_vfs_mime_get_extensions_list(mimePtr);
if (extensionList != 0) {
Vector extensions = new Vector();
- int /*long*/ extensionElement = extensionList;
+ long /*int*/ extensionElement = extensionList;
while (extensionElement != 0) {
OS.memmove(extensionData, extensionElement, OS.PTR_SIZEOF);
- int /*long*/ extensionPtr = extensionData[0];
+ long /*int*/ extensionPtr = extensionData[0];
int extensionLength = OS.strlen(extensionPtr);
byte[] extensionBuffer = new byte[extensionLength];
OS.memmove(extensionBuffer, extensionPtr, extensionLength);
@@ -514,7 +514,7 @@ static String gnome_getMimeType(String extension) {
String mimeType = null;
String fileName = "swt" + extension;
byte[] extensionBuffer = Converter.wcsToMbcs(null, fileName, true);
- int /*long*/ typeName = GNOME.gnome_vfs_mime_type_from_name(extensionBuffer);
+ long /*int*/ typeName = GNOME.gnome_vfs_mime_type_from_name(extensionBuffer);
if (typeName != 0) {
int length = OS.strlen(typeName);
if (length > 0) {
@@ -529,7 +529,7 @@ static String gnome_getMimeType(String extension) {
static Program gnome_getProgram(Display display, String mimeType) {
Program program = null;
byte[] mimeTypeBuffer = Converter.wcsToMbcs(null, mimeType, true);
- int /*long*/ ptr = GNOME.gnome_vfs_mime_get_default_application(mimeTypeBuffer);
+ long /*int*/ ptr = GNOME.gnome_vfs_mime_get_default_application(mimeTypeBuffer);
if (ptr != 0) {
program = new Program();
program.display = display;
@@ -547,9 +547,9 @@ static Program gnome_getProgram(Display display, String mimeType) {
OS.memmove(buffer, application.id, length);
Integer gnomeIconTheme = (Integer)display.getData(ICON_THEME_DATA);
int iconThemeValue = gnomeIconTheme.intValue();
- int /*long*/ icon_name = GNOME.gnome_icon_lookup(iconThemeValue, 0, null, buffer, 0, mimeTypeBuffer,
+ long /*int*/ icon_name = GNOME.gnome_icon_lookup(iconThemeValue, 0, null, buffer, 0, mimeTypeBuffer,
GNOME.GNOME_ICON_LOOKUP_FLAGS_NONE, null);
- int /*long*/ path = 0;
+ long /*int*/ path = 0;
if (icon_name != 0) path = GNOME.gnome_icon_theme_lookup_icon(iconThemeValue, icon_name, PREFERRED_ICON_SIZE, null, null);
if (path != 0) {
length = OS.strlen(path);
@@ -580,8 +580,8 @@ static boolean gnome_isExecutable(String fileName) {
if (!GNOME.gnome_vfs_is_executable_command_string(fileNameBuffer)) return false;
/* check if the mime type is executable */
- int /*long*/ uri = GNOME.gnome_vfs_make_uri_from_input(fileNameBuffer);
- int /*long*/ mimeType = GNOME.gnome_vfs_get_mime_type(uri);
+ long /*int*/ uri = GNOME.gnome_vfs_make_uri_from_input(fileNameBuffer);
+ long /*int*/ mimeType = GNOME.gnome_vfs_get_mime_type(uri);
GNOME.g_free(uri);
byte[] exeType = Converter.wcsToMbcs (null, "application/x-executable", true); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java
index 65b7177863..c14870af28 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java
@@ -83,7 +83,7 @@ public static Program findProgram (String extension) {
TCHAR key = new TCHAR (0, extension, true);
Program program = null;
if (OS.IsWinCE) {
- int /*long*/ [] phkResult = new int /*long*/ [1];
+ long /*int*/ [] phkResult = new long /*int*/ [1];
if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) != 0) {
return null;
}
@@ -152,7 +152,7 @@ public static String [] getExtensions () {
static String getKeyValue (String string, boolean expand) {
/* Use the character encoding for the default locale */
TCHAR key = new TCHAR (0, string, true);
- int /*long*/ [] phkResult = new int /*long*/ [1];
+ long /*int*/ [] phkResult = new long /*int*/ [1];
if (OS.RegOpenKeyEx (OS.HKEY_CLASSES_ROOT, key, 0, OS.KEY_READ, phkResult) != 0) {
return null;
}
@@ -289,13 +289,13 @@ public static boolean launch (String fileName, String workingDir) {
if (fileName == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
/* Use the character encoding for the default locale */
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
TCHAR buffer = new TCHAR (0, fileName, true);
int byteCount = buffer.length () * TCHAR.sizeof;
- int /*long*/ lpFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ lpFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (lpFile, buffer, byteCount);
- int /*long*/ lpDirectory = 0;
+ long /*int*/ lpDirectory = 0;
if (workingDir != null && OS.PathIsExe(lpFile)) {
TCHAR buffer1 = new TCHAR (0, workingDir, true);
byteCount = buffer1.length () * TCHAR.sizeof;
@@ -344,11 +344,11 @@ public boolean execute (String fileName) {
}
if (append) fileName = " \"" + fileName + "\"";
String commandLine = prefix + fileName + suffix;
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
/* Use the character encoding for the default locale */
TCHAR buffer = new TCHAR (0, commandLine, true);
int byteCount = buffer.length () * TCHAR.sizeof;
- int /*long*/ lpCommandLine = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ lpCommandLine = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (lpCommandLine, buffer, byteCount);
STARTUPINFO lpStartupInfo = new STARTUPINFO ();
lpStartupInfo.cb = STARTUPINFO.sizeof;
@@ -398,7 +398,7 @@ public ImageData getImageData () {
}
/* Use the character encoding for the default locale */
TCHAR lpszFile = new TCHAR (0, fileName, true);
- int /*long*/ [] phiconSmall = new int /*long*/[1], phiconLarge = null;
+ long /*int*/ [] phiconSmall = new long /*int*/[1], phiconLarge = null;
OS.ExtractIconEx (lpszFile, nIconIndex, phiconLarge, phiconSmall, 1);
if (phiconSmall [0] == 0) return null;
Image image = Image.win32_new (null, SWT.ICON, phiconSmall [0]);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ButtonDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ButtonDrawData.java
index eff7bef8ac..6510a285e8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ButtonDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ButtonDrawData.java
@@ -25,10 +25,10 @@ public ButtonDrawData() {
void draw(Theme theme, GC gc, Rectangle bounds) {
int state = this.state[DrawData.WIDGET_WHOLE];
- int /*long*/ drawable = gc.getGCData().drawable;
+ long /*int*/ drawable = gc.getGCData().drawable;
if ((style & SWT.RADIO) != 0) {
- int /*long*/ radioButtonHandle = theme.radioButtonHandle;
- int /*long*/ gtkStyle = OS.gtk_widget_get_style (radioButtonHandle);
+ long /*int*/ radioButtonHandle = theme.radioButtonHandle;
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (radioButtonHandle);
theme.transferClipping (gc, gtkStyle);
int indicator_size = theme.getWidgetProperty(radioButtonHandle, "indicator-size");
int indicator_spacing = theme.getWidgetProperty(radioButtonHandle, "indicator-spacing");
@@ -74,8 +74,8 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
}
if ((style & SWT.CHECK) != 0) {
- int /*long*/ checkButtonHandle = theme.checkButtonHandle;
- int /*long*/ gtkStyle = OS.gtk_widget_get_style (checkButtonHandle);
+ long /*int*/ checkButtonHandle = theme.checkButtonHandle;
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (checkButtonHandle);
theme.transferClipping (gc, gtkStyle);
int indicator_size = theme.getWidgetProperty(checkButtonHandle, "indicator-size");
int indicator_spacing = theme.getWidgetProperty(checkButtonHandle, "indicator-spacing");
@@ -122,15 +122,15 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
if ((style & SWT.PUSH) != 0) {
- int /*long*/ buttonHandle = theme.buttonHandle;
- int /*long*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle);
+ long /*int*/ buttonHandle = theme.buttonHandle;
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle);
theme.transferClipping (gc, gtkStyle);
int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");
int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding");
int border_width = OS.gtk_container_get_border_width(buttonHandle);
GtkBorder default_border = new GtkBorder();
- int /*long*/ default_border_ptr = theme.getBorderProperty(buttonHandle, "default-border");
+ long /*int*/ default_border_ptr = theme.getBorderProperty(buttonHandle, "default-border");
if (default_border_ptr != 0) {
OS.memmove(default_border, default_border_ptr, GtkBorder.sizeof);
OS.gtk_border_free(default_border_ptr);
@@ -139,7 +139,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
}
GtkBorder default_outside_border = new GtkBorder();
- int /*long*/ default_outside_border_ptr = theme.getBorderProperty(buttonHandle, "default-outside-border");
+ long /*int*/ default_outside_border_ptr = theme.getBorderProperty(buttonHandle, "default-outside-border");
if (default_outside_border_ptr != 0) {
OS.memmove(default_outside_border, default_outside_border_ptr, GtkBorder.sizeof);
OS.gtk_border_free(default_outside_border_ptr);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ComboDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ComboDrawData.java
index dbf3b0d0be..7669e9fa79 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ComboDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ComboDrawData.java
@@ -24,9 +24,9 @@ public ComboDrawData() {
}
void draw(Theme theme, GC gc, Rectangle bounds) {
- int /*long*/ buttonHandle = theme.buttonHandle;
- int /*long*/ gtkStyle = OS.gtk_widget_get_style(buttonHandle);
- int /*long*/ drawable = gc.getGCData().drawable;
+ long /*int*/ buttonHandle = theme.buttonHandle;
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style(buttonHandle);
+ long /*int*/ drawable = gc.getGCData().drawable;
theme.transferClipping(gc, gtkStyle);
int x = bounds.x;
@@ -61,10 +61,10 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
OS.gtk_paint_box(gtkStyle, drawable, state_type, shadow_type, null, buttonHandle, detail, arrow_button_x, y, arrow_button_width, height);
}
byte[] arrow_detail = Converter.wcsToMbcs(null, "arrow", true);
- int /*long*/ arrowHandle = theme.arrowHandle;
+ long /*int*/ arrowHandle = theme.arrowHandle;
OS.gtk_paint_arrow(gtkStyle, drawable, state_type, OS.GTK_SHADOW_OUT, null, arrowHandle, arrow_detail, OS.GTK_ARROW_DOWN, true, arrow_x, arrow_y, arrow_width, arrow_height);
- int /*long*/ entryHandle = theme.entryHandle;
+ long /*int*/ entryHandle = theme.entryHandle;
gtkStyle = OS.gtk_widget_get_style(entryHandle);
theme.transferClipping(gc, gtkStyle);
state_type = getStateType(DrawData.WIDGET_WHOLE);
@@ -100,8 +100,8 @@ int getStateType(int part) {
int hit(Theme theme, Point position, Rectangle bounds) {
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
- int /*long*/ buttonHandle = theme.buttonHandle;
- int /*long*/ gtkStyle = OS.gtk_widget_get_style(buttonHandle);
+ long /*int*/ buttonHandle = theme.buttonHandle;
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style(buttonHandle);
int interior_focus = theme.getWidgetProperty(buttonHandle, "interior-focus");
int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");
int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding");
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/DrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/DrawData.java
index 9785073ac0..f51bdc1c13 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/DrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/DrawData.java
@@ -79,21 +79,21 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
}
void drawImage(Theme theme, Image image, GC gc, Rectangle bounds) {
- int /*long*/ drawable = gc.getGCData().drawable;
+ long /*int*/ drawable = gc.getGCData().drawable;
Rectangle rect = image.getBounds();
int state_type = getStateType(DrawData.WIDGET_WHOLE);
if (state_type == OS.GTK_STATE_NORMAL) {
gc.drawImage(image, 0, 0, rect.width, rect.height, bounds.x, bounds.y, bounds.width, bounds.height);
} else {
- int /*long*/ pixbuf = ImageList.createPixbuf(image);
- int /*long*/ source = OS.gtk_icon_source_new();
+ long /*int*/ pixbuf = ImageList.createPixbuf(image);
+ long /*int*/ source = OS.gtk_icon_source_new();
if (source != 0) {
OS.gtk_icon_source_set_pixbuf(source, pixbuf);
//TODO - always uses buttonHandle
- int /*long*/ buttonHandle = theme.buttonHandle;
- int /*long*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle);
+ long /*int*/ buttonHandle = theme.buttonHandle;
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle);
theme.transferClipping(gc, gtkStyle);
- int /*long*/ rendered = OS.gtk_style_render_icon(gtkStyle, source, OS.GTK_TEXT_DIR_NONE, state_type, -1, buttonHandle, null);
+ long /*int*/ rendered = OS.gtk_style_render_icon(gtkStyle, source, OS.GTK_TEXT_DIR_NONE, state_type, -1, buttonHandle, null);
OS.g_object_unref(pixbuf);
//TODO - stretching
if (rendered != 0) {
@@ -106,12 +106,12 @@ void drawImage(Theme theme, Image image, GC gc, Rectangle bounds) {
}
void drawText(Theme theme, String text, int flags, GC gc, Rectangle bounds) {
- int /*long*/ widget = getTextHandle(theme);
- int /*long*/ gtkStyle = OS.gtk_widget_get_style(widget);
- int /*long*/ drawable = gc.getGCData().drawable;
+ long /*int*/ widget = getTextHandle(theme);
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style(widget);
+ long /*int*/ drawable = gc.getGCData().drawable;
theme.transferClipping (gc, gtkStyle);
byte[] buffer = Converter.wcsToMbcs(null, text, true);
- int /*long*/ layout = OS.gtk_widget_create_pango_layout(widget, buffer);
+ long /*int*/ layout = OS.gtk_widget_create_pango_layout(widget, buffer);
int[] width = new int[1], height = new int[1];
OS.pango_layout_get_size(layout, width, height);
OS.pango_layout_set_width(layout, bounds.width * OS.PANGO_SCALE);
@@ -160,7 +160,7 @@ int getStateType(int part) {
return state_type;
}
-int /*long*/ getTextHandle(Theme theme) {
+long /*int*/ getTextHandle(Theme theme) {
return theme.labelHandle;
}
@@ -169,9 +169,9 @@ int hit(Theme theme, Point position, Rectangle bounds) {
}
Rectangle measureText(Theme theme, String text, int flags, GC gc, Rectangle bounds) {
- int /*long*/ widget = getTextHandle(theme);
+ long /*int*/ widget = getTextHandle(theme);
byte[] buffer = Converter.wcsToMbcs(null, text, true);
- int /*long*/ layout = OS.gtk_widget_create_pango_layout(widget, buffer);
+ long /*int*/ layout = OS.gtk_widget_create_pango_layout(widget, buffer);
if (bounds != null) OS.pango_layout_set_width(layout, bounds.width);
if ((flags & DrawData.DRAW_LEFT) != 0) {
OS.pango_layout_set_alignment(layout, OS.PANGO_ALIGN_LEFT);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ExpanderDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ExpanderDrawData.java
index 755311696f..3f98b5077b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ExpanderDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ExpanderDrawData.java
@@ -22,9 +22,9 @@ public ExpanderDrawData() {
}
void draw(Theme theme, GC gc, Rectangle bounds) {
- int /*long*/ treeHandle = theme.treeHandle;
- int /*long*/ gtkStyle = OS.gtk_widget_get_style (treeHandle);
- int /*long*/ drawable = gc.getGCData().drawable;
+ long /*int*/ treeHandle = theme.treeHandle;
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (treeHandle);
+ long /*int*/ drawable = gc.getGCData().drawable;
theme.transferClipping(gc, gtkStyle);
int state_type = getStateType(DrawData.WIDGET_WHOLE);
int expander_style = OS.GTK_EXPANDER_COLAPSED;
@@ -38,7 +38,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
int hit(Theme theme, Point position, Rectangle bounds) {
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
- int /*long*/ treeHandle = theme.treeHandle;
+ long /*int*/ treeHandle = theme.treeHandle;
int expander_size = theme.getWidgetProperty(treeHandle, "expander-size");
if (new Rectangle(bounds.x, bounds.y, expander_size, expander_size).contains(position)) {
return DrawData.WIDGET_WHOLE;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/GroupDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/GroupDrawData.java
index bd18278d8d..fa3d414884 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/GroupDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/GroupDrawData.java
@@ -29,9 +29,9 @@ public GroupDrawData() {
static final int GROUP_HEADER_X = 9;
static final int GROUP_HEADER_PAD = 2;
void draw(Theme theme, GC gc, Rectangle bounds) {
- int /*long*/ frameHandle = theme.frameHandle;
- int /*long*/ gtkStyle = OS.gtk_widget_get_style (frameHandle);
- int /*long*/ drawable = gc.getGCData().drawable;
+ long /*int*/ frameHandle = theme.frameHandle;
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (frameHandle);
+ long /*int*/ drawable = gc.getGCData().drawable;
theme.transferClipping(gc, gtkStyle);
int xthickness = OS.gtk_style_get_xthickness(gtkStyle);
int ythickness = OS.gtk_style_get_ythickness(gtkStyle);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ProgressBarDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
index 04d3ea9825..e3b843bf25 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
@@ -22,9 +22,9 @@ public ProgressBarDrawData() {
}
void draw(Theme theme, GC gc, Rectangle bounds) {
- int /*long*/ progressHandle = theme.progressHandle;
- int /*long*/ gtkStyle = OS.gtk_widget_get_style (progressHandle);
- int /*long*/ drawable = gc.getGCData().drawable;
+ long /*int*/ progressHandle = theme.progressHandle;
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (progressHandle);
+ long /*int*/ drawable = gc.getGCData().drawable;
theme.transferClipping(gc, gtkStyle);
byte[] detail = Converter.wcsToMbcs(null, "trough", true);
int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/TabFolderDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/TabFolderDrawData.java
index a261ec40f0..84cabdfd04 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/TabFolderDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/TabFolderDrawData.java
@@ -31,9 +31,9 @@ public TabFolderDrawData() {
}
void draw(Theme theme, GC gc, Rectangle bounds) {
- int /*long*/ notebookHandle = theme.notebookHandle;
- int /*long*/ gtkStyle = OS.gtk_widget_get_style (notebookHandle);
- int /*long*/ drawable = gc.getGCData().drawable;
+ long /*int*/ notebookHandle = theme.notebookHandle;
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (notebookHandle);
+ long /*int*/ drawable = gc.getGCData().drawable;
theme.transferClipping(gc, gtkStyle);
int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
height -= tabsHeight;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/TabItemDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/TabItemDrawData.java
index 00b05e2070..b0d74544d9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/TabItemDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/TabItemDrawData.java
@@ -27,8 +27,8 @@ public TabItemDrawData() {
}
Rectangle computeTrim(Theme theme, GC gc) {
- int /*long*/ notebookHandle = theme.notebookHandle;
- int /*long*/ gtkStyle = OS.gtk_widget_get_style(notebookHandle);
+ long /*int*/ notebookHandle = theme.notebookHandle;
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style(notebookHandle);
int hborder, vborder;
if (OS.GTK_VERSION >= OS.VERSION(2, 4, 0)) {
hborder = theme.getWidgetProperty(notebookHandle, "tab-hborder");
@@ -50,9 +50,9 @@ Rectangle computeTrim(Theme theme, GC gc) {
}
void draw(Theme theme, GC gc, Rectangle bounds) {
- int /*long*/ notebookHandle = theme.notebookHandle;
- int /*long*/ gtkStyle = OS.gtk_widget_get_style (notebookHandle);
- int /*long*/ drawable = gc.getGCData().drawable;
+ long /*int*/ notebookHandle = theme.notebookHandle;
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (notebookHandle);
+ long /*int*/ drawable = gc.getGCData().drawable;
theme.transferClipping(gc, gtkStyle);
int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
if ((state[DrawData.WIDGET_WHOLE] & DrawData.SELECTED) == 0) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/Theme.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/Theme.java
index dddb83a991..0d384038be 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/Theme.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/Theme.java
@@ -18,7 +18,7 @@ import org.eclipse.swt.internal.gtk.*;
public class Theme {
Device device;
- int /*long*/ shellHandle, fixedHandle, buttonHandle, arrowHandle,
+ long /*int*/ shellHandle, fixedHandle, buttonHandle, arrowHandle,
frameHandle, entryHandle, checkButtonHandle, radioButtonHandle,
notebookHandle, treeHandle, progressHandle, toolbarHandle,
labelHandle, separatorHandle;
@@ -165,7 +165,7 @@ public Rectangle measureText(GC gc, Rectangle bounds, DrawData data, String text
return data.measureText(this, text, flags, gc, bounds);
}
-int getWidgetProperty(int /*long*/ handle, String name) {
+int getWidgetProperty(long /*int*/ handle, String name) {
byte[] propertyName = Converter.wcsToMbcs(null, name, true);
int[] result = new int[1];
OS.gtk_widget_style_get(handle, propertyName, result, 0);
@@ -173,18 +173,18 @@ int getWidgetProperty(int /*long*/ handle, String name) {
}
-int /*long*/ getBorderProperty(int /*long*/ handle, String name) {
+long /*int*/ getBorderProperty(long /*int*/ handle, String name) {
byte[] propertyName = Converter.wcsToMbcs(null, name, true);
- int /*long*/ [] result = new int /*long*/[1];
+ long /*int*/ [] result = new long /*int*/[1];
OS.gtk_widget_style_get(handle, propertyName, result, 0);
return result[0];
}
-void transferClipping(GC gc, int /*long*/ style) {
+void transferClipping(GC gc, long /*int*/ style) {
GCData data = gc.getGCData();
- int /*long*/ clipRgn = data.clipRgn;
- int /*long*/ damageRgn = data.damageRgn;
- int /*long*/ clipping = clipRgn;
+ long /*int*/ clipRgn = data.clipRgn;
+ long /*int*/ damageRgn = data.damageRgn;
+ long /*int*/ clipping = clipRgn;
if (damageRgn != 0) {
if (clipping != 0) {
clipping = OS.gdk_region_new();
@@ -194,7 +194,7 @@ void transferClipping(GC gc, int /*long*/ style) {
clipping = damageRgn;
}
}
- int /*long*/ [] curGC = new int /*long*/ [1];
+ long /*int*/ [] curGC = new long /*int*/ [1];
for (int i = 0; i < 5; i++) {
OS.gtk_style_get_fg_gc (style, i, curGC);
if (curGC[0] != 0) OS.gdk_gc_set_clip_region (curGC[0], clipping);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ToolBarDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ToolBarDrawData.java
index 4c99b12d7d..584977d6ad 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ToolBarDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ToolBarDrawData.java
@@ -21,9 +21,9 @@ public ToolBarDrawData() {
}
void draw(Theme theme, GC gc, Rectangle bounds) {
- int /*long*/ toolbarHandle = theme.toolbarHandle;
- int /*long*/ gtkStyle = OS.gtk_widget_get_style (toolbarHandle);
- int /*long*/ drawable = gc.getGCData().drawable;
+ long /*int*/ toolbarHandle = theme.toolbarHandle;
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (toolbarHandle);
+ long /*int*/ drawable = gc.getGCData().drawable;
theme.transferClipping(gc, gtkStyle);
int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
byte[] detail = Converter.wcsToMbcs(null, "toolbar", true);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ToolItemDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ToolItemDrawData.java
index 67cc405d4f..40754df70f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ToolItemDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/gtk/org/eclipse/swt/internal/theme/ToolItemDrawData.java
@@ -27,8 +27,8 @@ public ToolItemDrawData() {
}
Rectangle computeTrim(Theme theme, GC gc) {
- int /*long*/ buttonHandle = theme.buttonHandle;
- int /*long*/ gtkStyle = OS.gtk_widget_get_style(buttonHandle);
+ long /*int*/ buttonHandle = theme.buttonHandle;
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style(buttonHandle);
int focus_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");
int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding");
int xthickness = OS.gtk_style_get_xthickness(gtkStyle);
@@ -47,13 +47,13 @@ Rectangle computeTrim(Theme theme, GC gc) {
void draw(Theme theme, GC gc, Rectangle bounds) {
int state = this.state[DrawData.WIDGET_WHOLE];
- int /*long*/ drawable = gc.getGCData().drawable;
+ long /*int*/ drawable = gc.getGCData().drawable;
if ((style & SWT.SEPARATOR) != 0) {
int state_type = getStateType(DrawData.WIDGET_WHOLE);
- int /*long*/ separatorHandle = theme.separatorHandle;
+ long /*int*/ separatorHandle = theme.separatorHandle;
byte[] detail = Converter.wcsToMbcs(null, "vseparator", true);
- int /*long*/ gtkStyle = OS.gtk_widget_get_style (separatorHandle);
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (separatorHandle);
theme.transferClipping(gc, gtkStyle);
if ((parent.style & SWT.VERTICAL) != 0) {
OS.gtk_paint_hline(gtkStyle, drawable, state_type, null, separatorHandle, detail, bounds.x, bounds.x + bounds.width, bounds.y + bounds.height / 2);
@@ -63,8 +63,8 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
return;
}
- int /*long*/ buttonHandle = theme.buttonHandle;
- int /*long*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle);
+ long /*int*/ buttonHandle = theme.buttonHandle;
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle);
theme.transferClipping (gc, gtkStyle);
int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");
int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding");
@@ -83,7 +83,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
}
int[] relief = new int[1];
- int /*long*/ toolbarHandle = theme.toolbarHandle;
+ long /*int*/ toolbarHandle = theme.toolbarHandle;
OS.gtk_widget_style_get(toolbarHandle, OS.button_relief, relief, 0);
int shadow_type = OS.GTK_SHADOW_OUT;
@@ -149,8 +149,8 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
int hit(Theme theme, Point position, Rectangle bounds) {
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
if ((style & SWT.DROP_DOWN) != 0) {
- int /*long*/ buttonHandle = theme.buttonHandle;
- int /*long*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle);
+ long /*int*/ buttonHandle = theme.buttonHandle;
+ long /*int*/ gtkStyle = OS.gtk_widget_get_style (buttonHandle);
int xthickness = OS.gtk_style_get_xthickness(gtkStyle);
int interior_focus = theme.getWidgetProperty(buttonHandle, "interior-focus");
int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java
index 1d813c72db..6e842ff1a0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java
@@ -57,7 +57,7 @@ int[] getPartId(int part) {
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
//TODO - arrow and toggle
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
RECT rect = new RECT ();
rect.left = bounds.x;
rect.right = bounds.x + bounds.width;
@@ -90,7 +90,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
int hit(Theme theme, Point position, Rectangle bounds) {
if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE;
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
RECT rect = new RECT ();
rect.left = bounds.x;
rect.right = bounds.x + bounds.width;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ComboDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ComboDrawData.java
index 49da9f35bd..fdb9ddb39f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ComboDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ComboDrawData.java
@@ -21,7 +21,7 @@ public ComboDrawData() {
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
- int /*long*/ hTheme = OS.OpenThemeData(0, EDIT);
+ long /*int*/ hTheme = OS.OpenThemeData(0, EDIT);
RECT rect = new RECT ();
rect.left = bounds.x;
rect.right = bounds.x + bounds.width;
@@ -81,7 +81,7 @@ int[] getPartId(int part) {
int hit(Theme theme, Point position, Rectangle bounds) {
if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE;
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
- int /*long*/ hTheme = OS.OpenThemeData(0, EDIT);
+ long /*int*/ hTheme = OS.OpenThemeData(0, EDIT);
int[] part = getPartId(DrawData.WIDGET_WHOLE);
int iPartId = part[0];
int iStateId = part[1];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/DrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/DrawData.java
index 4ba89397d9..b021688121 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/DrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/DrawData.java
@@ -89,7 +89,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
void drawImage(Theme theme, Image image, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
-// int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+// long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
// RECT rect = new RECT ();
// rect.left = bounds.x;
// rect.right = bounds.x + bounds.width;
@@ -109,7 +109,7 @@ void drawImage(Theme theme, Image image, GC gc, Rectangle bounds) {
void drawText(Theme theme, String text, int flags, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
char[] chars = new char[text.length()];
text.getChars(0, chars.length, chars, 0);
int textFlags = OS.DT_SINGLELINE;
@@ -150,7 +150,7 @@ int hit(Theme theme, Point position, Rectangle bounds) {
Rectangle measureText(Theme theme, String text, int flags, GC gc, Rectangle bounds) {
if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return new Rectangle(0, 0, 0, 0);
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
char[] chars = new char[text.length()];
text.getChars(0, chars.length, chars, 0);
//TODO - constant for VCENTER and flags
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ExpanderDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ExpanderDrawData.java
index 04bf337c8b..a10c36f975 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ExpanderDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ExpanderDrawData.java
@@ -22,7 +22,7 @@ public ExpanderDrawData() {
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
int iStateId = OS.GLPS_CLOSED;
if ((this.style & SWT.DOWN) != 0) iStateId = OS.GLPS_OPENED;
SIZE size = new SIZE();
@@ -51,7 +51,7 @@ int[] getPartId(int part) {
int hit(Theme theme, Point position, Rectangle bounds) {
if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE;
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
SIZE size = new SIZE();
int[] part = getPartId(DrawData.WIDGET_WHOLE);
OS.GetThemePartSize(hTheme, 0, part[0], part[1], null, OS.TS_TRUE, size);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/GroupDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/GroupDrawData.java
index e02eaede12..088aebccd1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/GroupDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/GroupDrawData.java
@@ -26,7 +26,7 @@ static final int GROUP_HEADER_X = 9;
static final int GROUP_HEADER_PAD = 2;
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
RECT rect = new RECT ();
rect.left = bounds.x;
rect.right = bounds.x + bounds.width;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ProgressBarDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
index 00b72ee031..a96eedac3d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
@@ -22,7 +22,7 @@ public ProgressBarDrawData() {
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
RECT rect = new RECT ();
rect.left = bounds.x;
rect.right = rect.left + bounds.width;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScaleDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScaleDrawData.java
index 5493a67abd..9a8797a787 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScaleDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScaleDrawData.java
@@ -32,7 +32,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
int maximum = this.maximum;
int selection = this.selection;
int pageIncrement = this.pageIncrement;
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
RECT rect = new RECT ();
rect.left = bounds.x;
rect.right = rect.left + bounds.width;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScrollBarDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScrollBarDrawData.java
index d71d9d5eda..bae77f3a40 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScrollBarDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScrollBarDrawData.java
@@ -25,7 +25,7 @@ public ScrollBarDrawData() {
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
RECT rect = new RECT ();
if ((style & SWT.VERTICAL) != 0) {
int width = OS.GetThemeSysSize(hTheme, OS.SM_CXVSCROLL);
@@ -159,7 +159,7 @@ int[] getPartId(int part) {
Rectangle getBounds(int part, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
if ((style & SWT.VERTICAL) != 0) {
int width = OS.GetThemeSysSize(hTheme, OS.SM_CXVSCROLL);
int totalWidth = bounds.height - 2 * width;
@@ -187,7 +187,7 @@ Rectangle getBounds(int part, Rectangle bounds) {
int getSelection(Point position, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
if ((style & SWT.VERTICAL) != 0) {
int width = OS.GetThemeSysSize(hTheme, OS.SM_CXVSCROLL);
int totalWidth = bounds.height - 2 * width;
@@ -205,7 +205,7 @@ int getSelection(Point position, Rectangle bounds) {
int hit(Theme theme, Point position, Rectangle bounds) {
if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return -1;
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
//TODO - should we take a GC?
int hDC = 0;
RECT rect = new RECT ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabFolderDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabFolderDrawData.java
index b2048b308c..5fe58a8194 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabFolderDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabFolderDrawData.java
@@ -31,7 +31,7 @@ public TabFolderDrawData() {
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
RECT rect = new RECT ();
rect.left = bounds.x;
rect.right = bounds.x + bounds.width;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabItemDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabItemDrawData.java
index 6998c22d85..a9ce1d514f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabItemDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabItemDrawData.java
@@ -28,7 +28,7 @@ public TabItemDrawData() {
Rectangle computeTrim(Theme theme, GC gc) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
int x = clientArea.x, y = clientArea.y, width = clientArea.width, height = clientArea.height;
if ((style & SWT.LEFT) != 0) {
x -= TABITEM_INSET;
@@ -56,7 +56,7 @@ Rectangle computeTrim(Theme theme, GC gc) {
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
int state = this.state[DrawData.WIDGET_WHOLE];
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
if ((position & SWT.LEFT) != 0) {
x += TABITEM_INSET;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java
index 516595f9be..6f64e4e293 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java
@@ -26,7 +26,7 @@ public ToolItemDrawData() {
Rectangle computeTrim(Theme theme, GC gc) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
RECT rect = new RECT ();
rect.left = clientArea.x;
rect.right = clientArea.x + clientArea.width;
@@ -54,7 +54,7 @@ Rectangle computeTrim(Theme theme, GC gc) {
void draw(Theme theme, GC gc, Rectangle bounds) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
RECT rect = new RECT ();
rect.left = bounds.x;
rect.right = bounds.x + bounds.width;
@@ -137,7 +137,7 @@ int[] getPartId(int part) {
int hit(Theme theme, Point position, Rectangle bounds) {
if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE;
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
- int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
+ long /*int*/ hTheme = OS.OpenThemeData(0, getClassId());
try {
RECT rect = new RECT ();
rect.left = bounds.x;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/carbon/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/carbon/org/eclipse/swt/browser/WebKit.java
index 1b01974b06..5035107e27 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/carbon/org/eclipse/swt/browser/WebKit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/carbon/org/eclipse/swt/browser/WebKit.java
@@ -1020,7 +1020,7 @@ void createPanelDidEnd(int sheet, int returnCode, int contextInfo) {
Cocoa.objc_msgSend(contextInfo, Cocoa.S_autorelease);
if (returnCode != Cocoa.NSFileHandlingPanelOKButton) return; /* nothing more to do */
- int /*long*/ method = Cocoa.class_getClassMethod(Cocoa.C_NSURLRequest, Cocoa.S_setAllowsAnyHTTPSCertificate);
+ long /*int*/ method = Cocoa.class_getClassMethod(Cocoa.C_NSURLRequest, Cocoa.S_setAllowsAnyHTTPSCertificate);
if (method != 0) {
int host = Cocoa.objc_msgSend(contextInfo, Cocoa.S_host);
int urlString = Cocoa.objc_msgSend(contextInfo, Cocoa.S_absoluteString);
@@ -1621,7 +1621,7 @@ void webViewFocus() {
void webViewUnfocus() {
}
-int callRunBeforeUnloadConfirmPanelWithMessage(int /*long*/ messageID, int /*long*/ arg) {
+int callRunBeforeUnloadConfirmPanelWithMessage(long /*int*/ messageID, long /*int*/ arg) {
int result = runBeforeUnloadConfirmPanelWithMessage (messageID, 0);
return Cocoa.objc_msgSend (Cocoa.C_NSNumber, Cocoa.S_numberWithBool, result);
}
@@ -2165,7 +2165,7 @@ int convertToJS (Object value) {
return 0;
}
-int /*long*/ callJava (int /*long*/ index, int /*long*/ token, int /*long*/ args, int /*long*/ arg1) {
+long /*int*/ callJava (long /*int*/ index, long /*int*/ token, long /*int*/ args, long /*int*/ arg1) {
Object returnValue = null;
if (Cocoa.objc_msgSend (index, Cocoa.S_isKindOfClass, Cocoa.C_NSNumber) != 0) {
int functionIndex = Cocoa.objc_msgSend (index, Cocoa.S_intValue);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java
index 146416bdb4..212cc767ae 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java
@@ -27,7 +27,7 @@ class WebKit extends WebBrowser {
boolean loadingText, untrustedText;
String lastHoveredLinkURL, lastNavigateURL;
String html;
- int /*long*/ identifier;
+ long /*int*/ identifier;
int resourceCount;
String url = ""; //$NON-NLS-1$
Point location;
@@ -37,7 +37,7 @@ class WebKit extends WebBrowser {
//TEMPORARY CODE
// boolean doit;
- static int /*long*/ delegateClass;
+ static long /*int*/ delegateClass;
static boolean Initialized;
// the following Callbacks are never freed
static Callback Callback3, Callback4, Callback5, Callback6, Callback7;
@@ -123,21 +123,21 @@ public void create (Composite parent, int style) {
if (delegateClass == 0) {
Class webKitClass = this.getClass();
Callback3 = new Callback(webKitClass, "browserProc", 3); //$NON-NLS-1$
- int /*long*/ proc3 = Callback3.getAddress();
+ long /*int*/ proc3 = Callback3.getAddress();
if (proc3 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
Callback4 = new Callback(webKitClass, "browserProc", 4); //$NON-NLS-1$
- int /*long*/ proc4 = Callback4.getAddress();
+ long /*int*/ proc4 = Callback4.getAddress();
if (proc4 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
Callback5 = new Callback(webKitClass, "browserProc", 5); //$NON-NLS-1$
- int /*long*/ proc5 = Callback5.getAddress();
+ long /*int*/ proc5 = Callback5.getAddress();
if (proc5 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
Callback6 = new Callback(webKitClass, "browserProc", 6); //$NON-NLS-1$
- int /*long*/ proc6 = Callback6.getAddress();
+ long /*int*/ proc6 = Callback6.getAddress();
if (proc6 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
Callback7 = new Callback(webKitClass, "browserProc", 7); //$NON-NLS-1$
- int /*long*/ proc7 = Callback7.getAddress();
+ long /*int*/ proc7 = Callback7.getAddress();
if (proc7 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
- int /*long*/ setFrameProc = OS.CALLBACK_webView_setFrame_(proc4);
+ long /*int*/ setFrameProc = OS.CALLBACK_webView_setFrame_(proc4);
if (setFrameProc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
String className = "SWTWebViewDelegate"; //$NON-NLS-1$
@@ -188,7 +188,7 @@ public void create (Composite parent, int style) {
OS.class_addMethod(delegateClass, OS.sel_createPanelDidEnd, proc5, "@:@@@"); //$NON-NLS-1$
OS.objc_registerClassPair(delegateClass);
- int /*long*/ metaClass = OS.objc_getMetaClass (className);
+ long /*int*/ metaClass = OS.objc_getMetaClass (className);
OS.class_addMethod(metaClass, OS.sel_isSelectorExcludedFromWebScript_, proc3, "@:@"); //$NON-NLS-1$
OS.class_addMethod(metaClass, OS.sel_webScriptNameForSelector_, proc3, "@:@"); //$NON-NLS-1$
}
@@ -288,7 +288,7 @@ public boolean back() {
return webView.goBack();
}
-static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
if (id == delegateClass) {
if (sel == OS.sel_isSelectorExcludedFromWebScript_) {
return isSelectorExcludedFromWebScript (arg0) ? 1 : 0;
@@ -316,7 +316,7 @@ static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/
return 0;
}
-static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
+static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
Display d = Display.getCurrent();
if (d == null || d.isDisposed()) return 0;
Widget widget = d.findWidget(id);
@@ -360,7 +360,7 @@ static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/
return 0;
}
-static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2) {
+static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
Display d = Display.getCurrent();
if (d == null || d.isDisposed()) return 0;
Widget widget = d.findWidget(id);
@@ -392,7 +392,7 @@ static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/
return 0;
}
-static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3) {
+static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) {
Display d = Display.getCurrent();
if (d == null || d.isDisposed()) return 0;
Widget widget = d.findWidget(id);
@@ -409,7 +409,7 @@ static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/
return 0;
}
-static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4) {
+static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4) {
Display d = Display.getCurrent();
if (d == null || d.isDisposed()) return 0;
Widget widget = d.findWidget(id);
@@ -427,11 +427,11 @@ static int /*long*/ browserProc(int /*long*/ id, int /*long*/ sel, int /*long*/
return 0;
}
-static boolean isSelectorExcludedFromWebScript (int /*long*/ aSelector) {
+static boolean isSelectorExcludedFromWebScript (long /*int*/ aSelector) {
return !(aSelector == OS.sel_callJava || aSelector == OS.sel_callRunBeforeUnloadConfirmPanelWithMessage);
}
-static int /*long*/ webScriptNameForSelector (int /*long*/ aSelector) {
+static long /*int*/ webScriptNameForSelector (long /*int*/ aSelector) {
if (aSelector == OS.sel_callJava) {
return NSString.stringWith ("callJava").id; //$NON-NLS-1$
}
@@ -472,7 +472,7 @@ boolean close (boolean showPrompters) {
public boolean execute (String script) {
WebFrame frame = webView.mainFrame();
- int /*long*/ context = frame.globalContext();
+ long /*int*/ context = frame.globalContext();
byte[] bytes = null;
try {
@@ -480,16 +480,16 @@ public boolean execute (String script) {
} catch (UnsupportedEncodingException e) {
bytes = (script + '\0').getBytes();
}
- int /*long*/ scriptString = OS.JSStringCreateWithUTF8CString(bytes);
+ long /*int*/ scriptString = OS.JSStringCreateWithUTF8CString(bytes);
try {
bytes = (getUrl() + '\0').getBytes("UTF-8"); //$NON-NLS-1$
} catch (UnsupportedEncodingException e) {
bytes = (getUrl() + '\0').getBytes();
}
- int /*long*/ urlString = OS.JSStringCreateWithUTF8CString(bytes);
+ long /*int*/ urlString = OS.JSStringCreateWithUTF8CString(bytes);
- int /*long*/ result = OS.JSEvaluateScript(context, scriptString, 0, urlString, 0, null);
+ long /*int*/ result = OS.JSEvaluateScript(context, scriptString, 0, urlString, 0, null);
OS.JSStringRelease(urlString);
OS.JSStringRelease(scriptString);
return result != 0;
@@ -564,7 +564,7 @@ public boolean setUrl(String url, String postData, String[] headers) {
NSString str = NSString.stringWith(url);
NSString unescapedStr = NSString.stringWith("%#"); //$NON-NLS-1$
- int /*long*/ ptr = OS.CFURLCreateStringByAddingPercentEscapes(0, str.id, unescapedStr.id, 0, OS.kCFStringEncodingUTF8);
+ long /*int*/ ptr = OS.CFURLCreateStringByAddingPercentEscapes(0, str.id, unescapedStr.id, 0, OS.kCFStringEncodingUTF8);
NSString escapedString = new NSString(ptr);
NSURL inURL = NSURL.URLWithString(escapedString);
OS.CFRelease(ptr);
@@ -616,7 +616,7 @@ boolean translateMnemonics() {
/* WebFrameLoadDelegate */
-void webView_didChangeLocationWithinPageForFrame(int /*long*/ sender, int /*long*/ frameID) {
+void webView_didChangeLocationWithinPageForFrame(long /*int*/ sender, long /*int*/ frameID) {
WebFrame frame = new WebFrame(frameID);
WebDataSource dataSource = frame.dataSource();
NSURLRequest request = dataSource.request();
@@ -660,7 +660,7 @@ void webView_didChangeLocationWithinPageForFrame(int /*long*/ sender, int /*long
}
}
-void webView_didFailProvisionalLoadWithError_forFrame(int /*long*/ sender, int /*long*/ error, int /*long*/ frame) {
+void webView_didFailProvisionalLoadWithError_forFrame(long /*int*/ sender, long /*int*/ error, long /*int*/ frame) {
if (frame == webView.mainFrame().id) {
/*
* Feature on WebKit. The identifier is used here as a marker for the events
@@ -679,7 +679,7 @@ void webView_didFailProvisionalLoadWithError_forFrame(int /*long*/ sender, int /
}
NSError nserror = new NSError(error);
- int /*long*/ errorCode = nserror.code();
+ long /*int*/ errorCode = nserror.code();
if (OS.NSURLErrorBadURL < errorCode) return;
NSURL failingURL = null;
@@ -693,9 +693,9 @@ void webView_didFailProvisionalLoadWithError_forFrame(int /*long*/ sender, int /
/* handle invalid certificate error */
id certificates = info.objectForKey(NSString.stringWith("NSErrorPeerCertificateChainKey")); //$NON-NLS-1$
- int /*long*/[] policySearch = new int /*long*/[1];
- int /*long*/[] policyRef = new int /*long*/[1];
- int /*long*/[] trustRef = new int /*long*/[1];
+ long /*int*/[] policySearch = new long /*int*/[1];
+ long /*int*/[] policyRef = new long /*int*/[1];
+ long /*int*/[] trustRef = new long /*int*/[1];
boolean success = false;
int result = OS.SecPolicySearchCreate(OS.CSSM_CERT_X_509v3, 0, 0, policySearch);
if (result == 0 && policySearch[0] != 0) {
@@ -734,19 +734,19 @@ void webView_didFailProvisionalLoadWithError_forFrame(int /*long*/ sender, int /
}
}
-void createPanelDidEnd(int /*long*/ sheet, int /*long*/ returnCode, int /*long*/ contextInfo) {
+void createPanelDidEnd(long /*int*/ sheet, long /*int*/ returnCode, long /*int*/ contextInfo) {
NSURL failingURL = new NSURL(contextInfo);
failingURL.autorelease();
if (returnCode != OS.NSFileHandlingPanelOKButton) return; /* nothing more to do */
- int /*long*/ method = OS.class_getClassMethod(OS.class_NSURLRequest, OS.sel_setAllowsAnyHTTPSCertificate);
+ long /*int*/ method = OS.class_getClassMethod(OS.class_NSURLRequest, OS.sel_setAllowsAnyHTTPSCertificate);
if (method != 0) {
OS.objc_msgSend(OS.class_NSURLRequest, OS.sel_setAllowsAnyHTTPSCertificate, 1, failingURL.host().id);
setUrl(failingURL.absoluteString().getString(), null, null);
}
}
-void webView_didFinishLoadForFrame(int /*long*/ sender, int /*long*/ frameID) {
+void webView_didFinishLoadForFrame(long /*int*/ sender, long /*int*/ frameID) {
if (frameID == webView.mainFrame().id) {
/*
* If html is not null then there is html from a previous setText() call
@@ -828,7 +828,7 @@ void webView_didFinishLoadForFrame(int /*long*/ sender, int /*long*/ frameID) {
}
}
-void hookDOMKeyListeners(int /*long*/ frameID) {
+void hookDOMKeyListeners(long /*int*/ frameID) {
WebFrame frame = new WebFrame(frameID);
DOMDocument document = frame.DOMDocument();
if (document == null) return;
@@ -840,7 +840,7 @@ void hookDOMKeyListeners(int /*long*/ frameID) {
document.addEventListener(type, delegate, false);
}
-void hookDOMMouseListeners(int /*long*/ frameID) {
+void hookDOMMouseListeners(long /*int*/ frameID) {
WebFrame frame = new WebFrame(frameID);
DOMDocument document = frame.DOMDocument();
if (document == null) return;
@@ -858,7 +858,7 @@ void hookDOMMouseListeners(int /*long*/ frameID) {
document.addEventListener(type, delegate, false);
}
-void webView_didReceiveTitle_forFrame(int /*long*/ sender, int /*long*/ titleID, int /*long*/ frameID) {
+void webView_didReceiveTitle_forFrame(long /*int*/ sender, long /*int*/ titleID, long /*int*/ frameID) {
if (frameID == webView.mainFrame().id) {
NSString title = new NSString(titleID);
String newTitle = title.getString();
@@ -872,7 +872,7 @@ void webView_didReceiveTitle_forFrame(int /*long*/ sender, int /*long*/ titleID,
}
}
-void webView_didStartProvisionalLoadForFrame(int /*long*/ sender, int /*long*/ frameID) {
+void webView_didStartProvisionalLoadForFrame(long /*int*/ sender, long /*int*/ frameID) {
/*
* This code is intentionally commented. WebFrameLoadDelegate:didStartProvisionalLoadForFrame is
* called before WebResourceLoadDelegate:willSendRequest and
@@ -885,7 +885,7 @@ void webView_didStartProvisionalLoadForFrame(int /*long*/ sender, int /*long*/ f
// }
}
-void webView_didCommitLoadForFrame(int /*long*/ sender, int /*long*/ frameID) {
+void webView_didCommitLoadForFrame(long /*int*/ sender, long /*int*/ frameID) {
WebFrame frame = new WebFrame(frameID);
WebDataSource dataSource = frame.dataSource();
NSURLRequest request = dataSource.request();
@@ -964,7 +964,7 @@ void webView_didCommitLoadForFrame(int /*long*/ sender, int /*long*/ frameID) {
}
}
-void webView_windowScriptObjectAvailable (int /*long*/ webView, int /*long*/ windowScriptObject) {
+void webView_windowScriptObjectAvailable (long /*int*/ webView, long /*int*/ windowScriptObject) {
NSObject scriptObject = new NSObject (windowScriptObject);
NSString key = NSString.stringWith ("external"); //$NON-NLS-1$
scriptObject.setValue (delegate, key);
@@ -972,7 +972,7 @@ void webView_windowScriptObjectAvailable (int /*long*/ webView, int /*long*/ win
/* WebResourceLoadDelegate */
-void webView_resource_didFinishLoadingFromDataSource(int /*long*/ sender, int /*long*/ identifier, int /*long*/ dataSource) {
+void webView_resource_didFinishLoadingFromDataSource(long /*int*/ sender, long /*int*/ identifier, long /*int*/ dataSource) {
/*
* Feature on WebKit. The identifier is used here as a marker for the events
* related to the top frame and the URL changes related to that top frame as
@@ -990,7 +990,7 @@ void webView_resource_didFinishLoadingFromDataSource(int /*long*/ sender, int /*
//if (this.identifier == identifier) this.identifier = 0;
}
-void webView_resource_didFailLoadingWithError_fromDataSource(int /*long*/ sender, int /*long*/ identifier, int /*long*/ error, int /*long*/ dataSource) {
+void webView_resource_didFailLoadingWithError_fromDataSource(long /*int*/ sender, long /*int*/ identifier, long /*int*/ error, long /*int*/ dataSource) {
/*
* Feature on WebKit. The identifier is used here as a marker for the events
* related to the top frame and the URL changes related to that top frame as
@@ -1008,7 +1008,7 @@ void webView_resource_didFailLoadingWithError_fromDataSource(int /*long*/ sender
//if (this.identifier == identifier) this.identifier = 0;
}
-void webView_resource_didReceiveAuthenticationChallenge_fromDataSource (int /*long*/ sender, int /*long*/ identifier, int /*long*/ challenge, int /*long*/ dataSource) {
+void webView_resource_didReceiveAuthenticationChallenge_fromDataSource (long /*int*/ sender, long /*int*/ identifier, long /*int*/ challenge, long /*int*/ dataSource) {
NSURLAuthenticationChallenge nsChallenge = new NSURLAuthenticationChallenge (challenge);
/*
@@ -1038,11 +1038,11 @@ void webView_resource_didReceiveAuthenticationChallenge_fromDataSource (int /*lo
}
/* no listener handled the challenge, so try to invoke the native panel */
- int /*long*/ cls = OS.class_WebPanelAuthenticationHandler;
+ long /*int*/ cls = OS.class_WebPanelAuthenticationHandler;
if (cls != 0) {
- int /*long*/ method = OS.class_getClassMethod (cls, OS.sel_sharedHandler);
+ long /*int*/ method = OS.class_getClassMethod (cls, OS.sel_sharedHandler);
if (method != 0) {
- int /*long*/ handler = OS.objc_msgSend (cls, OS.sel_sharedHandler);
+ long /*int*/ handler = OS.objc_msgSend (cls, OS.sel_sharedHandler);
if (handler != 0) {
OS.objc_msgSend (handler, OS.sel_startAuthentication, challenge, webView.window ().id);
return;
@@ -1148,7 +1148,7 @@ boolean showAuthenticationDialog (final String[] user, final String[] password,
return result[0];
}
-int /*long*/ webView_identifierForInitialRequest_fromDataSource(int /*long*/ sender, int /*long*/ request, int /*long*/ dataSourceID) {
+long /*int*/ webView_identifierForInitialRequest_fromDataSource(long /*int*/ sender, long /*int*/ request, long /*int*/ dataSourceID) {
ProgressEvent progress = new ProgressEvent(browser);
progress.display = browser.getDisplay();
progress.widget = browser;
@@ -1169,7 +1169,7 @@ int /*long*/ webView_identifierForInitialRequest_fromDataSource(int /*long*/ sen
}
-int /*long*/ webView_resource_willSendRequest_redirectResponse_fromDataSource(int /*long*/ sender, int /*long*/ identifier, int /*long*/ request, int /*long*/ redirectResponse, int /*long*/ dataSource) {
+long /*int*/ webView_resource_willSendRequest_redirectResponse_fromDataSource(long /*int*/ sender, long /*int*/ identifier, long /*int*/ request, long /*int*/ redirectResponse, long /*int*/ dataSource) {
NSURLRequest nsRequest = new NSURLRequest (request);
NSURL url = nsRequest.URL ();
if (url.isFileURL ()) {
@@ -1183,7 +1183,7 @@ int /*long*/ webView_resource_willSendRequest_redirectResponse_fromDataSource(in
/* UIDelegate */
-int /*long*/ webView_createWebViewWithRequest(int /*long*/ sender, int /*long*/ request) {
+long /*int*/ webView_createWebViewWithRequest(long /*int*/ sender, long /*int*/ request) {
WindowEvent newEvent = new WindowEvent(browser);
newEvent.display = browser.getDisplay();
newEvent.widget = browser;
@@ -1208,7 +1208,7 @@ int /*long*/ webView_createWebViewWithRequest(int /*long*/ sender, int /*long*/
return result != null ? result.id : 0;
}
-void webViewShow(int /*long*/ sender) {
+void webViewShow(long /*int*/ sender) {
/*
* Feature on WebKit. WebKit expects the application to
* create a new Window using the Objective C Cocoa API in response
@@ -1248,7 +1248,7 @@ void webViewShow(int /*long*/ sender) {
size = null;
}
-void webView_setFrame(int /*long*/ sender, int /*long*/ frame) {
+void webView_setFrame(long /*int*/ sender, long /*int*/ frame) {
NSRect rect = new NSRect();
OS.memmove(rect, frame, NSRect.sizeof);
/* convert to SWT system coordinates */
@@ -1257,18 +1257,18 @@ void webView_setFrame(int /*long*/ sender, int /*long*/ frame) {
size = new Point((int)rect.width, (int)rect.height);
}
-void webViewFocus(int /*long*/ sender) {
+void webViewFocus(long /*int*/ sender) {
}
-void webViewUnfocus(int /*long*/ sender) {
+void webViewUnfocus(long /*int*/ sender) {
}
-NSNumber callRunBeforeUnloadConfirmPanelWithMessage(int /*long*/ messageID, int /*long*/ arg) {
+NSNumber callRunBeforeUnloadConfirmPanelWithMessage(long /*int*/ messageID, long /*int*/ arg) {
boolean result = webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame (0, messageID, 0);
return NSNumber.numberWithBool (result);
}
-boolean webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame(int /*long*/ sender, int /*long*/ messageID, int /*long*/ frame) {
+boolean webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame(long /*int*/ sender, long /*int*/ messageID, long /*int*/ frame) {
NSString message = new NSString(messageID);
StringBuffer text = new StringBuffer(Compatibility.getMessage("SWT_OnBeforeUnload_Message1")); //$NON-NLS-1$
text.append("\n\n"); //$NON-NLS-1$
@@ -1280,7 +1280,7 @@ boolean webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame(int /*lo
return messageBox.open() == SWT.OK;
}
-void webView_runJavaScriptAlertPanelWithMessage(int /*long*/ sender, int /*long*/ messageID) {
+void webView_runJavaScriptAlertPanelWithMessage(long /*int*/ sender, long /*int*/ messageID) {
NSString message = new NSString(messageID);
String text = message.getString();
@@ -1290,7 +1290,7 @@ void webView_runJavaScriptAlertPanelWithMessage(int /*long*/ sender, int /*long*
messageBox.open();
}
-int webView_runJavaScriptConfirmPanelWithMessage(int /*long*/ sender, int /*long*/ messageID) {
+int webView_runJavaScriptConfirmPanelWithMessage(long /*int*/ sender, long /*int*/ messageID) {
NSString message = new NSString(messageID);
String text = message.getString();
@@ -1300,7 +1300,7 @@ int webView_runJavaScriptConfirmPanelWithMessage(int /*long*/ sender, int /*long
return messageBox.open() == SWT.OK ? 1 : 0;
}
-void webView_runOpenPanelForFileButtonWithResultListener(int /*long*/ sender, int /*long*/ resultListenerID) {
+void webView_runOpenPanelForFileButtonWithResultListener(long /*int*/ sender, long /*int*/ resultListenerID) {
FileDialog dialog = new FileDialog(browser.getShell(), SWT.NONE);
String result = dialog.open();
WebOpenPanelResultListener resultListener = new WebOpenPanelResultListener(resultListenerID);
@@ -1311,7 +1311,7 @@ void webView_runOpenPanelForFileButtonWithResultListener(int /*long*/ sender, in
resultListener.chooseFilename(NSString.stringWith(result));
}
-void webViewClose(int /*long*/ sender) {
+void webViewClose(long /*int*/ sender) {
Shell parent = browser.getShell();
WindowEvent newEvent = new WindowEvent(browser);
newEvent.display = browser.getDisplay();
@@ -1336,7 +1336,7 @@ void webViewClose(int /*long*/ sender) {
parent.setSize(pt.x, pt.y);
}
-int /*long*/ webView_contextMenuItemsForElement_defaultMenuItems(int /*long*/ sender, int /*long*/ element, int /*long*/ defaultMenuItems) {
+long /*int*/ webView_contextMenuItemsForElement_defaultMenuItems(long /*int*/ sender, long /*int*/ element, long /*int*/ defaultMenuItems) {
Point pt = browser.getDisplay().getCursorLocation();
Event event = new Event();
event.x = pt.x;
@@ -1354,12 +1354,12 @@ int /*long*/ webView_contextMenuItemsForElement_defaultMenuItems(int /*long*/ se
return defaultMenuItems;
}
-void webView_setStatusBarVisible(int /*long*/ sender, boolean visible) {
+void webView_setStatusBarVisible(long /*int*/ sender, boolean visible) {
/* Note. Webkit only emits the notification when the status bar should be hidden. */
statusBar = visible;
}
-void webView_setStatusText(int /*long*/ sender, int /*long*/ textID) {
+void webView_setStatusText(long /*int*/ sender, long /*int*/ textID) {
NSString text = new NSString(textID);
int length = (int)/*64*/text.length();
if (length == 0) return;
@@ -1373,15 +1373,15 @@ void webView_setStatusText(int /*long*/ sender, int /*long*/ textID) {
}
}
-void webView_setResizable(int /*long*/ sender, boolean visible) {
+void webView_setResizable(long /*int*/ sender, boolean visible) {
}
-void webView_setToolbarsVisible(int /*long*/ sender, boolean visible) {
+void webView_setToolbarsVisible(long /*int*/ sender, boolean visible) {
/* Note. Webkit only emits the notification when the tool bar should be hidden. */
toolBar = visible;
}
-void webView_mouseDidMoveOverElement_modifierFlags (int /*long*/ sender, int /*long*/ elementInformationID, int /*long*/ modifierFlags) {
+void webView_mouseDidMoveOverElement_modifierFlags (long /*int*/ sender, long /*int*/ elementInformationID, long /*int*/ modifierFlags) {
if (elementInformationID == 0) return;
NSString key = NSString.stringWith(WebElementLinkURLKey);
@@ -1421,7 +1421,7 @@ void webView_mouseDidMoveOverElement_modifierFlags (int /*long*/ sender, int /*l
}
}
-void webView_printFrameView (int /*long*/ sender, int /*long*/ frameViewID) {
+void webView_printFrameView (long /*int*/ sender, long /*int*/ frameViewID) {
WebFrameView view = new WebFrameView(frameViewID);
boolean viewPrint = view.documentViewShouldHandlePrint();
if (viewPrint) {
@@ -1435,7 +1435,7 @@ void webView_printFrameView (int /*long*/ sender, int /*long*/ frameViewID) {
/* PolicyDelegate */
-void webView_decidePolicyForMIMEType_request_frame_decisionListener(int /*long*/ sender, int /*long*/ type, int /*long*/ request, int /*long*/ frame, int /*long*/ listenerID) {
+void webView_decidePolicyForMIMEType_request_frame_decisionListener(long /*int*/ sender, long /*int*/ type, long /*int*/ request, long /*int*/ frame, long /*int*/ listenerID) {
boolean canShow = WebView.canShowMIMEType(new NSString(type));
WebPolicyDecisionListener listener = new WebPolicyDecisionListener(listenerID);
if (canShow) {
@@ -1445,7 +1445,7 @@ void webView_decidePolicyForMIMEType_request_frame_decisionListener(int /*long*/
}
}
-void webView_decidePolicyForNavigationAction_request_frame_decisionListener(int /*long*/ sender, int /*long*/ actionInformation, int /*long*/ request, int /*long*/ frame, int /*long*/ listenerID) {
+void webView_decidePolicyForNavigationAction_request_frame_decisionListener(long /*int*/ sender, long /*int*/ actionInformation, long /*int*/ request, long /*int*/ frame, long /*int*/ listenerID) {
NSURL url = new NSURLRequest(request).URL();
WebPolicyDecisionListener listener = new WebPolicyDecisionListener(listenerID);
@@ -1509,17 +1509,17 @@ void webView_decidePolicyForNavigationAction_request_frame_decisionListener(int
}
}
-void webView_decidePolicyForNewWindowAction_request_newFrameName_decisionListener(int /*long*/ sender, int /*long*/ actionInformation, int /*long*/ request, int /*long*/ frameName, int /*long*/ listenerID) {
+void webView_decidePolicyForNewWindowAction_request_newFrameName_decisionListener(long /*int*/ sender, long /*int*/ actionInformation, long /*int*/ request, long /*int*/ frameName, long /*int*/ listenerID) {
WebPolicyDecisionListener listener = new WebPolicyDecisionListener(listenerID);
listener.use();
}
-void webView_unableToImplementPolicyWithError_frame(int /*long*/ sender, int /*long*/ error, int /*long*/ frame) {
+void webView_unableToImplementPolicyWithError_frame(long /*int*/ sender, long /*int*/ error, long /*int*/ frame) {
}
/* WebDownload */
-void download_decideDestinationWithSuggestedFilename(int /*long*/ downloadId, int /*long*/ filename) {
+void download_decideDestinationWithSuggestedFilename(long /*int*/ downloadId, long /*int*/ filename) {
NSString string = new NSString(filename);
String name = string.getString();
FileDialog dialog = new FileDialog(browser.getShell(), SWT.SAVE);
@@ -1537,7 +1537,7 @@ void download_decideDestinationWithSuggestedFilename(int /*long*/ downloadId, in
/* DOMEventListener */
-void handleEvent(int /*long*/ evtId) {
+void handleEvent(long /*int*/ evtId) {
NSString string = new NSString(OS.objc_msgSend(evtId, OS.sel_type));
String type = string.getString();
@@ -1683,9 +1683,9 @@ void handleEvent(int /*long*/ evtId) {
/* external */
-Object convertToJava (int /*long*/ value) {
+Object convertToJava (long /*int*/ value) {
NSObject object = new NSObject (value);
- int /*long*/ clazz = OS.objc_lookUpClass ("NSString"); //$NON-NLS-1$
+ long /*int*/ clazz = OS.objc_lookUpClass ("NSString"); //$NON-NLS-1$
if (object.isKindOfClass (clazz)) {
NSString string = new NSString (value);
return string.getString ();
@@ -1693,7 +1693,7 @@ Object convertToJava (int /*long*/ value) {
clazz = OS.objc_lookUpClass ("NSNumber"); //$NON-NLS-1$
if (object.isKindOfClass (clazz)) {
NSNumber number = new NSNumber (value);
- int /*long*/ ptr = number.objCType ();
+ long /*int*/ ptr = number.objCType ();
byte[] type = new byte[1];
OS.memmove (type, ptr, 1);
if (type[0] == 'c' || type[0] == 'B') {
@@ -1731,7 +1731,7 @@ Object convertToJava (int /*long*/ value) {
NSObject convertToJS (Object value) {
if (value == null) {
- int /*long*/ result = OS.objc_msgSend (OS.class_NSNull, OS.sel_null);
+ long /*int*/ result = OS.objc_msgSend (OS.class_NSNull, OS.sel_null);
return result != 0 ? new NSObject (result) : null;
}
if (value instanceof String) {
@@ -1757,10 +1757,10 @@ NSObject convertToJS (Object value) {
return null;
}
-NSObject callJava (int /*long*/ index, int /*long*/ token, int /*long*/ args, int /*long*/ arg1) {
+NSObject callJava (long /*int*/ index, long /*int*/ token, long /*int*/ args, long /*int*/ arg1) {
Object returnValue = null;
NSObject object = new NSObject (index);
- int /*long*/ clazz = OS.objc_lookUpClass ("NSNumber"); //$NON-NLS-1$
+ long /*int*/ clazz = OS.objc_lookUpClass ("NSNumber"); //$NON-NLS-1$
if (object.isKindOfClass (clazz)) {
NSNumber number = new NSNumber (index);
Object key = new Integer (number.intValue ());
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
index 0bae6647fb..9652dde95d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
@@ -24,7 +24,7 @@ import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;
class WebKit extends WebBrowser {
- int /*long*/ webView, webViewData, scrolledWindow;
+ long /*int*/ webView, webViewData, scrolledWindow;
int failureCount, lastKeyCode, lastCharCode;
String postData;
String[] headers;
@@ -33,7 +33,7 @@ class WebKit extends WebBrowser {
BrowserFunction eventFunction;
static int DisabledJSCount;
- static int /*long*/ ExternalClass, PostString, WebViewType;
+ static long /*int*/ ExternalClass, PostString, WebViewType;
static boolean IsWebKit14orNewer, LibraryLoaded;
static Hashtable WindowMappings = new Hashtable ();
@@ -125,16 +125,16 @@ class WebKit extends WebBrowser {
NativeClearSessions = new Runnable () {
public void run () {
if (!LibraryLoaded) return;
- int /*long*/ session = WebKitGTK.webkit_get_default_session ();
- int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
- int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
+ long /*int*/ session = WebKitGTK.webkit_get_default_session ();
+ long /*int*/ type = WebKitGTK.soup_cookie_jar_get_type ();
+ long /*int*/ jar = WebKitGTK.soup_session_get_feature (session, type);
if (jar == 0) return;
- int /*long*/ cookies = WebKitGTK.soup_cookie_jar_all_cookies (jar);
+ long /*int*/ cookies = WebKitGTK.soup_cookie_jar_all_cookies (jar);
int length = OS.g_slist_length (cookies);
- int /*long*/ current = cookies;
+ long /*int*/ current = cookies;
for (int i = 0; i < length; i++) {
- int /*long*/ cookie = OS.g_slist_data (current);
- int /*long*/ expires = WebKitGTK.SoupCookie_expires (cookie);
+ long /*int*/ cookie = OS.g_slist_data (current);
+ long /*int*/ expires = WebKitGTK.SoupCookie_expires (cookie);
if (expires == 0) {
/* indicates a session cookie */
WebKitGTK.soup_cookie_jar_delete_cookie (jar, cookie);
@@ -149,14 +149,14 @@ class WebKit extends WebBrowser {
NativeGetCookie = new Runnable () {
public void run () {
if (!LibraryLoaded) return;
- int /*long*/ session = WebKitGTK.webkit_get_default_session ();
- int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
- int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
+ long /*int*/ session = WebKitGTK.webkit_get_default_session ();
+ long /*int*/ type = WebKitGTK.soup_cookie_jar_get_type ();
+ long /*int*/ jar = WebKitGTK.soup_session_get_feature (session, type);
if (jar == 0) return;
byte[] bytes = Converter.wcsToMbcs (null, CookieUrl, true);
- int /*long*/ uri = WebKitGTK.soup_uri_new (bytes);
+ long /*int*/ uri = WebKitGTK.soup_uri_new (bytes);
if (uri == 0) return;
- int /*long*/ cookies = WebKitGTK.soup_cookie_jar_get_cookies (jar, uri, 0);
+ long /*int*/ cookies = WebKitGTK.soup_cookie_jar_get_cookies (jar, uri, 0);
WebKitGTK.soup_uri_free (uri);
if (cookies == 0) return;
int length = OS.strlen (cookies);
@@ -182,9 +182,9 @@ class WebKit extends WebBrowser {
NativeSetCookie = new Runnable () {
public void run () {
if (!LibraryLoaded) return;
- int /*long*/ session = WebKitGTK.webkit_get_default_session ();
- int /*long*/ type = WebKitGTK.soup_cookie_jar_get_type ();
- int /*long*/ jar = WebKitGTK.soup_session_get_feature (session, type);
+ long /*int*/ session = WebKitGTK.webkit_get_default_session ();
+ long /*int*/ type = WebKitGTK.soup_cookie_jar_get_type ();
+ long /*int*/ jar = WebKitGTK.soup_session_get_feature (session, type);
if (jar == 0) {
/* this happens if a navigation has not occurred yet */
WebKitGTK.soup_session_add_feature_by_type (session, type);
@@ -192,10 +192,10 @@ class WebKit extends WebBrowser {
}
if (jar == 0) return;
byte[] bytes = Converter.wcsToMbcs (null, CookieUrl, true);
- int /*long*/ uri = WebKitGTK.soup_uri_new (bytes);
+ long /*int*/ uri = WebKitGTK.soup_uri_new (bytes);
if (uri == 0) return;
bytes = Converter.wcsToMbcs (null, CookieValue, true);
- int /*long*/ cookie = WebKitGTK.soup_cookie_parse (bytes, uri);
+ long /*int*/ cookie = WebKitGTK.soup_cookie_parse (bytes, uri);
if (cookie != 0) {
WebKitGTK.soup_cookie_jar_add_cookie (jar, cookie);
// the following line is intentionally commented
@@ -213,9 +213,9 @@ class WebKit extends WebBrowser {
}
}
-static Browser FindBrowser (int /*long*/ webView) {
+static Browser FindBrowser (long /*int*/ webView) {
if (webView == 0) return null;
- int /*long*/ parent = OS.gtk_widget_get_parent (webView);
+ long /*int*/ parent = OS.gtk_widget_get_parent (webView);
parent = OS.gtk_widget_get_parent (parent);
return (Browser)Display.getCurrent ().findWidget (parent);
}
@@ -236,12 +236,12 @@ static boolean IsInstalled () {
(major == MIN_VERSION[0] && minor == MIN_VERSION[1] && micro >= MIN_VERSION[2]);
}
-static int /*long*/ JSObjectCallAsFunctionProc (int /*long*/ ctx, int /*long*/ function, int /*long*/ thisObject, int /*long*/ argumentCount, int /*long*/ arguments, int /*long*/ exception) {
+static long /*int*/ JSObjectCallAsFunctionProc (long /*int*/ ctx, long /*int*/ function, long /*int*/ thisObject, long /*int*/ argumentCount, long /*int*/ arguments, long /*int*/ exception) {
if (WebKitGTK.JSValueIsObjectOfClass (ctx, thisObject, ExternalClass) == 0) {
return WebKitGTK.JSValueMakeUndefined (ctx);
}
- int /*long*/ ptr = WebKitGTK.JSObjectGetPrivate (thisObject);
- int /*long*/[] handle = new int /*long*/[1];
+ long /*int*/ ptr = WebKitGTK.JSObjectGetPrivate (thisObject);
+ long /*int*/[] handle = new long /*int*/[1];
C.memmove (handle, ptr, C.PTR_SIZEOF);
Browser browser = FindBrowser (handle[0]);
if (browser == null) return 0;
@@ -249,20 +249,20 @@ static int /*long*/ JSObjectCallAsFunctionProc (int /*long*/ ctx, int /*long*/ f
return webkit.callJava (ctx, function, thisObject, argumentCount, arguments, exception);
}
-static int /*long*/ JSObjectGetPropertyProc (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/ exception) {
+static long /*int*/ JSObjectGetPropertyProc (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ exception) {
byte[] bytes = null;
try {
bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes (CHARSET_UTF8); //$NON-NLS-1$
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, FUNCTIONNAME_CALLJAVA, true);
}
- int /*long*/ name = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
- int /*long*/ function = WebKitGTK.JSObjectMakeFunctionWithCallback (ctx, name, JSObjectCallAsFunctionProc.getAddress ());
+ long /*int*/ name = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ function = WebKitGTK.JSObjectMakeFunctionWithCallback (ctx, name, JSObjectCallAsFunctionProc.getAddress ());
WebKitGTK.JSStringRelease (name);
return function;
}
-static int /*long*/ JSObjectHasPropertyProc (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName) {
+static long /*int*/ JSObjectHasPropertyProc (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName) {
byte[] bytes = null;
try {
bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes (CHARSET_UTF8); //$NON-NLS-1$
@@ -272,7 +272,7 @@ static int /*long*/ JSObjectHasPropertyProc (int /*long*/ ctx, int /*long*/ obje
return WebKitGTK.JSStringIsEqualToUTF8CString (propertyName, bytes);
}
-static int /*long*/ JSDOMEventProc (int /*long*/ arg0, int /*long*/ event, int /*long*/ user_data) {
+static long /*int*/ JSDOMEventProc (long /*int*/ arg0, long /*int*/ event, long /*int*/ user_data) {
if (OS.GTK_IS_SCROLLED_WINDOW (arg0)) {
/*
* Stop the propagation of events that are not consumed by WebKit, before
@@ -342,15 +342,15 @@ static int /*long*/ JSDOMEventProc (int /*long*/ arg0, int /*long*/ event, int /
return webkit.handleDOMEvent (event, (int)user_data) ? 0 : STOP_PROPOGATE;
}
-static int /*long*/ Proc (int /*long*/ handle, int /*long*/ user_data) {
+static long /*int*/ Proc (long /*int*/ handle, long /*int*/ user_data) {
Browser browser = FindBrowser (handle);
if (browser == null) return 0;
WebKit webkit = (WebKit)browser.webBrowser;
return webkit.webViewProc (handle, user_data);
}
-static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
- int /*long*/ webView;
+static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
+ long /*int*/ webView;
if (OS.G_TYPE_CHECK_INSTANCE_TYPE (handle, WebKitGTK.webkit_web_frame_get_type ())) {
webView = WebKitGTK.webkit_web_frame_get_web_view (handle);
} else {
@@ -366,15 +366,15 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ u
}
}
-static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ user_data) {
+static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) {
Browser browser = FindBrowser (handle);
if (browser == null) return 0;
WebKit webkit = (WebKit)browser.webBrowser;
return webkit.webViewProc (handle, arg0, arg1, user_data);
}
-static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ user_data) {
- int /*long*/ webView;
+static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) {
+ long /*int*/ webView;
if (OS.G_TYPE_CHECK_INSTANCE_TYPE (handle, WebKitGTK.soup_session_get_type ())) {
webView = user_data;
} else {
@@ -390,14 +390,14 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ a
}
}
-static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ user_data) {
+static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ user_data) {
Browser browser = FindBrowser (handle);
if (browser == null) return 0;
WebKit webkit = (WebKit)browser.webBrowser;
return webkit.webViewProc (handle, arg0, arg1, arg2, arg3, user_data);
}
-int /*long*/ sessionProc (int /*long*/ session, int /*long*/ msg, int /*long*/ auth, int /*long*/ retrying, int /*long*/ user_data) {
+long /*int*/ sessionProc (long /*int*/ session, long /*int*/ msg, long /*int*/ auth, long /*int*/ retrying, long /*int*/ user_data) {
/* authentication challenges are currently the only notification received from the session */
if (retrying == 0) {
failureCount = 0;
@@ -405,8 +405,8 @@ int /*long*/ sessionProc (int /*long*/ session, int /*long*/ msg, int /*long*/ a
if (++failureCount >= 3) return 0;
}
- int /*long*/ uri = WebKitGTK.soup_message_get_uri (msg);
- int /*long*/ uriString = WebKitGTK.soup_uri_to_string (uri, 0);
+ long /*int*/ uri = WebKitGTK.soup_message_get_uri (msg);
+ long /*int*/ uriString = WebKitGTK.soup_uri_to_string (uri, 0);
int length = C.strlen (uriString);
byte[] bytes = new byte[length];
OS.memmove (bytes, uriString, length);
@@ -432,14 +432,14 @@ int /*long*/ sessionProc (int /*long*/ session, int /*long*/ msg, int /*long*/ a
return 0;
}
-int /*long*/ webFrameProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+long /*int*/ webFrameProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case NOTIFY_LOAD_STATUS: return webframe_notify_load_status (handle, arg0);
default: return 0;
}
}
-int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ user_data) {
+long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case CLOSE_WEB_VIEW: return webkit_close_web_view (handle);
case WEB_VIEW_READY: return webkit_web_view_ready (handle);
@@ -447,7 +447,7 @@ int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ user_data) {
}
}
-int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case CREATE_WEB_VIEW: return webkit_create_web_view (handle, arg0);
case DOWNLOAD_REQUESTED: return webkit_download_requested (handle, arg0);
@@ -460,14 +460,14 @@ int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ u
}
}
-int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ user_data) {
+long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case HOVERING_OVER_LINK: return webkit_hovering_over_link (handle, arg0, arg1);
default: return 0;
}
}
-int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ user_data) {
+long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case CONSOLE_MESSAGE: return webkit_console_message (handle, arg0, arg1, arg2);
case WINDOW_OBJECT_CLEARED: return webkit_window_object_cleared (handle, arg0, arg1, arg2);
@@ -475,7 +475,7 @@ int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ a
}
}
-int /*long*/ webViewProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ user_data) {
+long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case MIME_TYPE_POLICY_DECISION_REQUESTED: return webkit_mime_type_policy_decision_requested (handle, arg0, arg1, arg2, arg3);
case NAVIGATION_POLICY_DECISION_REQUESTED: return webkit_navigation_policy_decision_requested (handle, arg0, arg1, arg2, arg3);
@@ -498,7 +498,7 @@ public void create (Composite parent, int style) {
OS.memmove (jsClassDefinition.className, bytes, bytes.length);
jsClassDefinition.hasProperty = JSObjectHasPropertyProc.getAddress ();
jsClassDefinition.getProperty = JSObjectGetPropertyProc.getAddress ();
- int /*long*/ classDefinitionPtr = C.malloc (JSClassDefinition.sizeof);
+ long /*int*/ classDefinitionPtr = C.malloc (JSClassDefinition.sizeof);
WebKitGTK.memmove (classDefinitionPtr, jsClassDefinition, JSClassDefinition.sizeof);
ExternalClass = WebKitGTK.JSClassCreate (classDefinitionPtr);
@@ -511,7 +511,7 @@ public void create (Composite parent, int style) {
OS.gtk_scrolled_window_set_policy (scrolledWindow, OS.GTK_POLICY_AUTOMATIC, OS.GTK_POLICY_AUTOMATIC);
webView = WebKitGTK.webkit_web_view_new ();
webViewData = C.malloc (C.PTR_SIZEOF);
- C.memmove (webViewData, new int /*long*/[] {webView}, C.PTR_SIZEOF);
+ C.memmove (webViewData, new long /*int*/[] {webView}, C.PTR_SIZEOF);
OS.gtk_container_add (scrolledWindow, webView);
OS.gtk_container_add (browser.handle, scrolledWindow);
OS.gtk_widget_show (scrolledWindow);
@@ -553,7 +553,7 @@ public void create (Composite parent, int style) {
OS.g_signal_connect (scrolledWindow, OS.scroll_event, JSDOMEventProc.getAddress (), STOP_PROPOGATE);
OS.g_signal_connect (scrolledWindow, OS.motion_notify_event, JSDOMEventProc.getAddress (), STOP_PROPOGATE);
- int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
+ long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
OS.g_object_set (settings, WebKitGTK.javascript_can_open_windows_automatically, 1, 0);
OS.g_object_set (settings, WebKitGTK.enable_universal_access_from_file_uris, 1, 0);
byte[] bytes = Converter.wcsToMbcs (null, "UTF-8", true); // $NON-NLS-1$
@@ -595,8 +595,8 @@ public void create (Composite parent, int style) {
* queue by removing the default Authenticate listener, adding ours,
* and then re-adding the default listener.
*/
- int /*long*/ session = WebKitGTK.webkit_get_default_session ();
- int /*long*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ());
+ long /*int*/ session = WebKitGTK.webkit_get_default_session ();
+ long /*int*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ());
WebKitGTK.soup_session_feature_detach (originalAuth, session);
OS.g_signal_connect (session, WebKitGTK.authenticate, Proc5.getAddress (), webView);
WebKitGTK.soup_session_feature_attach (originalAuth, session);
@@ -622,7 +622,7 @@ public void create (Composite parent, int style) {
}
proxyHost += ":" + port; //$NON-NLS-1$
bytes = Converter.wcsToMbcs (null, proxyHost, true);
- int /*long*/ uri = WebKitGTK.soup_uri_new (bytes);
+ long /*int*/ uri = WebKitGTK.soup_uri_new (bytes);
if (uri != 0) {
OS.g_object_set (session, WebKitGTK.SOUP_SESSION_PROXY_URI, uri, 0);
WebKitGTK.soup_uri_free (uri);
@@ -646,7 +646,7 @@ public void create (Composite parent, int style) {
browser.setData (KEY_CHECK_SUBWINDOW, Boolean.FALSE);
}
-void addEventHandlers (int /*long*/ web_view, boolean top) {
+void addEventHandlers (long /*int*/ web_view, boolean top) {
/*
* If JS is disabled (causes DOM events to not be delivered) then do not add event
* listeners here, DOM events will be inferred from received GDK events instead.
@@ -654,7 +654,7 @@ void addEventHandlers (int /*long*/ web_view, boolean top) {
if (!jsEnabled) return;
if (top && IsWebKit14orNewer) {
- int /*long*/ domDocument = WebKitGTK.webkit_web_view_get_dom_document (web_view);
+ long /*int*/ domDocument = WebKitGTK.webkit_web_view_get_dom_document (web_view);
if (domDocument != 0) {
WindowMappings.put (new LONG (domDocument), new LONG (web_view));
WebKitGTK.webkit_dom_event_target_add_event_listener (domDocument, WebKitGTK.dragstart, JSDOMEventProc.getAddress (), 0, SWT.DragDetect);
@@ -766,8 +766,8 @@ boolean close (boolean showPrompters) {
}
public boolean execute (String script) {
- int /*long*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView);
- int /*long*/ context = WebKitGTK.webkit_web_frame_get_global_context (frame);
+ long /*int*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView);
+ long /*int*/ context = WebKitGTK.webkit_web_frame_get_global_context (frame);
byte[] bytes = null;
try {
@@ -775,16 +775,16 @@ public boolean execute (String script) {
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, script, true);
}
- int /*long*/ scriptString = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ scriptString = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
try {
bytes = (getUrl () + '\0').getBytes (CHARSET_UTF8); //$NON-NLS-1$
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, getUrl (), true);
}
- int /*long*/ urlString = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ urlString = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
- int /*long*/ result = WebKitGTK.JSEvaluateScript (context, scriptString, 0, urlString, 0, null);
+ long /*int*/ result = WebKitGTK.JSEvaluateScript (context, scriptString, 0, urlString, 0, null);
WebKitGTK.JSStringRelease (urlString);
WebKitGTK.JSStringRelease (scriptString);
return result != 0;
@@ -801,13 +801,13 @@ public String getBrowserType () {
}
public String getText () {
- int /*long*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView);
- int /*long*/ source = WebKitGTK.webkit_web_frame_get_data_source (frame);
+ long /*int*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView);
+ long /*int*/ source = WebKitGTK.webkit_web_frame_get_data_source (frame);
if (source == 0) return ""; //$NON-NLS-1$
- int /*long*/ data = WebKitGTK.webkit_web_data_source_get_data (source);
+ long /*int*/ data = WebKitGTK.webkit_web_data_source_get_data (source);
if (data == 0) return ""; //$NON-NLS-1$
- int /*long*/ encoding = WebKitGTK.webkit_web_data_source_get_encoding (source);
+ long /*int*/ encoding = WebKitGTK.webkit_web_data_source_get_encoding (source);
int length = OS.strlen (encoding);
byte[] bytes = new byte [length];
OS.memmove (bytes, encoding, length);
@@ -815,7 +815,7 @@ public String getText () {
length = OS.GString_len (data);
bytes = new byte[length];
- int /*long*/ string = OS.GString_str (data);
+ long /*int*/ string = OS.GString_str (data);
C.memmove (bytes, string, length);
try {
@@ -826,7 +826,7 @@ public String getText () {
}
public String getUrl () {
- int /*long*/ uri = WebKitGTK.webkit_web_view_get_uri (webView);
+ long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView);
/* WebKit auto-navigates to about:blank at startup */
if (uri == 0) return ABOUT_BLANK;
@@ -851,7 +851,7 @@ public String getUrl () {
return url;
}
-boolean handleDOMEvent (int /*long*/ event, int type) {
+boolean handleDOMEvent (long /*int*/ event, int type) {
/*
* This method handles JS events that are received through the DOM
* listener API that was introduced in WebKitGTK 1.4.
@@ -1206,7 +1206,7 @@ boolean handleMouseEvent (String type, int screenX, int screenY, int detail, int
return true;
}
-int /*long*/ handleLoadCommitted (int /*long*/ uri, boolean top) {
+long /*int*/ handleLoadCommitted (long /*int*/ uri, boolean top) {
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
OS.memmove (bytes, uri, length);
@@ -1244,7 +1244,7 @@ int /*long*/ handleLoadCommitted (int /*long*/ uri, boolean top) {
return 0;
}
-int /*long*/ handleLoadFinished (int /*long*/ uri, boolean top) {
+long /*int*/ handleLoadFinished (long /*int*/ uri, boolean top) {
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
OS.memmove (bytes, uri, length);
@@ -1296,8 +1296,8 @@ int /*long*/ handleLoadFinished (int /*long*/ uri, boolean top) {
* the event here with the page's url as the title.
*/
if (top) {
- int /*long*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView);
- int /*long*/ title = WebKitGTK.webkit_web_frame_get_title (frame);
+ long /*int*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView);
+ long /*int*/ title = WebKitGTK.webkit_web_frame_get_title (frame);
if (title == 0) {
TitleEvent newEvent = new TitleEvent (browser);
newEvent.display = browser.getDisplay ();
@@ -1363,7 +1363,7 @@ void onResize (Event e) {
OS.gtk_widget_set_size_request (scrolledWindow, rect.width, rect.height);
}
-void openDownloadWindow (final int /*long*/ webkitDownload) {
+void openDownloadWindow (final long /*int*/ webkitDownload) {
final Shell shell = new Shell ();
String msg = Compatibility.getMessage ("SWT_FileDownload"); //$NON-NLS-1$
shell.setText (msg);
@@ -1373,12 +1373,12 @@ void openDownloadWindow (final int /*long*/ webkitDownload) {
gridLayout.verticalSpacing = 20;
shell.setLayout (gridLayout);
- int /*long*/ name = WebKitGTK.webkit_download_get_suggested_filename (webkitDownload);
+ long /*int*/ name = WebKitGTK.webkit_download_get_suggested_filename (webkitDownload);
int length = OS.strlen (name);
byte[] bytes = new byte[length];
OS.memmove (bytes, name, length);
String nameString = new String (Converter.mbcsToWcs (null, bytes));
- int /*long*/ url = WebKitGTK.webkit_download_get_uri (webkitDownload);
+ long /*int*/ url = WebKitGTK.webkit_download_get_uri (webkitDownload);
length = OS.strlen (url);
bytes = new byte[length];
OS.memmove (bytes, url, length);
@@ -1510,7 +1510,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
* set the value on the WebView when initiating the load request and then
* remove it afterwards.
*/
- int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
+ long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
if (headers != null) {
for (int i = 0; i < headers.length; i++) {
String current = headers[i];
@@ -1539,11 +1539,11 @@ public void stop () {
WebKitGTK.webkit_web_view_stop_loading (webView);
}
-int /*long*/ webframe_notify_load_status (int /*long*/ web_frame, int /*long*/ pspec) {
+long /*int*/ webframe_notify_load_status (long /*int*/ web_frame, long /*int*/ pspec) {
int status = WebKitGTK.webkit_web_frame_get_load_status (web_frame);
switch (status) {
case WebKitGTK.WEBKIT_LOAD_COMMITTED: {
- int /*long*/ uri = WebKitGTK.webkit_web_frame_get_uri (web_frame);
+ long /*int*/ uri = WebKitGTK.webkit_web_frame_get_uri (web_frame);
return handleLoadCommitted (uri, false);
}
case WebKitGTK.WEBKIT_LOAD_FINISHED: {
@@ -1553,9 +1553,9 @@ int /*long*/ webframe_notify_load_status (int /*long*/ web_frame, int /*long*/ p
* response to navigating to a main document containing frames) then
* treat this as a completed load.
*/
- int /*long*/ parentFrame = WebKitGTK.webkit_web_frame_get_parent (web_frame);
+ long /*int*/ parentFrame = WebKitGTK.webkit_web_frame_get_parent (web_frame);
if (WebKitGTK.webkit_web_frame_get_load_status (parentFrame) == WebKitGTK.WEBKIT_LOAD_FINISHED) {
- int /*long*/ uri = WebKitGTK.webkit_web_frame_get_uri (web_frame);
+ long /*int*/ uri = WebKitGTK.webkit_web_frame_get_uri (web_frame);
return handleLoadFinished (uri, false);
}
}
@@ -1563,7 +1563,7 @@ int /*long*/ webframe_notify_load_status (int /*long*/ web_frame, int /*long*/ p
return 0;
}
-int /*long*/ webkit_close_web_view (int /*long*/ web_view) {
+long /*int*/ webkit_close_web_view (long /*int*/ web_view) {
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
@@ -1574,11 +1574,11 @@ int /*long*/ webkit_close_web_view (int /*long*/ web_view) {
return 0;
}
-int /*long*/ webkit_console_message (int /*long*/ web_view, int /*long*/ message, int /*long*/ line, int /*long*/ source_id) {
+long /*int*/ webkit_console_message (long /*int*/ web_view, long /*int*/ message, long /*int*/ line, long /*int*/ source_id) {
return 1; /* stop the message from being written to stderr */
}
-int /*long*/ webkit_create_web_view (int /*long*/ web_view, int /*long*/ frame) {
+long /*int*/ webkit_create_web_view (long /*int*/ web_view, long /*int*/ frame) {
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
@@ -1598,14 +1598,14 @@ int /*long*/ webkit_create_web_view (int /*long*/ web_view, int /*long*/ frame)
return 0;
}
-int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ download) {
- int /*long*/ name = WebKitGTK.webkit_download_get_suggested_filename (download);
+long /*int*/ webkit_download_requested (long /*int*/ web_view, long /*int*/ download) {
+ long /*int*/ name = WebKitGTK.webkit_download_get_suggested_filename (download);
int length = OS.strlen (name);
byte[] bytes = new byte[length];
OS.memmove (bytes, name, length);
final String nameString = new String (Converter.mbcsToWcs (null, bytes));
- final int /*long*/ request = WebKitGTK.webkit_download_get_network_request (download);
+ final long /*int*/ request = WebKitGTK.webkit_download_get_network_request (download);
OS.g_object_ref (request);
/*
@@ -1622,7 +1622,7 @@ int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ down
String path = dialog.open ();
if (path != null) {
path = URI_FILEROOT + path;
- int /*long*/ newDownload = WebKitGTK.webkit_download_new (request);
+ long /*int*/ newDownload = WebKitGTK.webkit_download_new (request);
byte[] uriBytes = Converter.wcsToMbcs (null, path, true);
WebKitGTK.webkit_download_set_destination_uri (newDownload, uriBytes);
openDownloadWindow (newDownload);
@@ -1637,7 +1637,7 @@ int /*long*/ webkit_download_requested (int /*long*/ web_view, int /*long*/ down
return 1;
}
-int /*long*/ webkit_hovering_over_link (int /*long*/ web_view, int /*long*/ title, int /*long*/ uri) {
+long /*int*/ webkit_hovering_over_link (long /*int*/ web_view, long /*int*/ title, long /*int*/ uri) {
if (uri != 0) {
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
@@ -1654,7 +1654,7 @@ int /*long*/ webkit_hovering_over_link (int /*long*/ web_view, int /*long*/ titl
return 0;
}
-int /*long*/ webkit_mime_type_policy_decision_requested (int /*long*/ web_view, int /*long*/ frame, int /*long*/ request, int /*long*/ mimetype, int /*long*/ policy_decision) {
+long /*int*/ webkit_mime_type_policy_decision_requested (long /*int*/ web_view, long /*int*/ frame, long /*int*/ request, long /*int*/ mimetype, long /*int*/ policy_decision) {
boolean canShow = WebKitGTK.webkit_web_view_can_show_mime_type (webView, mimetype) != 0;
if (!canShow) {
WebKitGTK.webkit_web_policy_decision_download (policy_decision);
@@ -1663,7 +1663,7 @@ int /*long*/ webkit_mime_type_policy_decision_requested (int /*long*/ web_view,
return 0;
}
-int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view, int /*long*/ frame, int /*long*/ request, int /*long*/ navigation_action, int /*long*/ policy_decision) {
+long /*int*/ webkit_navigation_policy_decision_requested (long /*int*/ web_view, long /*int*/ frame, long /*int*/ request, long /*int*/ navigation_action, long /*int*/ policy_decision) {
if (loadingText) {
/*
* WebKit is auto-navigating to about:blank in response to a
@@ -1674,7 +1674,7 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
return 0;
}
- int /*long*/ uri = WebKitGTK.webkit_network_request_get_uri (request);
+ long /*int*/ uri = WebKitGTK.webkit_network_request_get_uri (request);
int length = OS.strlen (uri);
byte[] bytes = new byte[length];
OS.memmove (bytes, uri, length);
@@ -1707,12 +1707,12 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
if (jsEnabled != jsEnabledOnNextPage) {
jsEnabled = jsEnabledOnNextPage;
DisabledJSCount += !jsEnabled ? 1 : -1;
- int /*long*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
+ long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView);
OS.g_object_set (settings, WebKitGTK.enable_scripts, jsEnabled ? 1 : 0, 0);
}
/* hook status change signal if frame is a newly-created sub-frame */
- int /*long*/ mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView);
+ long /*int*/ mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView);
if (frame != mainFrame) {
int id = OS.g_signal_handler_find (frame, OS.G_SIGNAL_MATCH_FUNC | OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, Proc3.getAddress (), NOTIFY_LOAD_STATUS);
if (id == 0) {
@@ -1735,22 +1735,22 @@ int /*long*/ webkit_navigation_policy_decision_requested (int /*long*/ web_view,
return 0;
}
-int /*long*/ webkit_notify_load_status (int /*long*/ web_view, int /*long*/ pspec) {
+long /*int*/ webkit_notify_load_status (long /*int*/ web_view, long /*int*/ pspec) {
int status = WebKitGTK.webkit_web_view_get_load_status (webView);
switch (status) {
case WebKitGTK.WEBKIT_LOAD_COMMITTED: {
- int /*long*/ uri = WebKitGTK.webkit_web_view_get_uri (webView);
+ long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView);
return handleLoadCommitted (uri, true);
}
case WebKitGTK.WEBKIT_LOAD_FINISHED: {
- int /*long*/ uri = WebKitGTK.webkit_web_view_get_uri (webView);
+ long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView);
return handleLoadFinished (uri, true);
}
}
return 0;
}
-int /*long*/ webkit_notify_progress (int /*long*/ web_view, int /*long*/ pspec) {
+long /*int*/ webkit_notify_progress (long /*int*/ web_view, long /*int*/ pspec) {
ProgressEvent event = new ProgressEvent (browser);
event.display = browser.getDisplay ();
event.widget = browser;
@@ -1762,8 +1762,8 @@ int /*long*/ webkit_notify_progress (int /*long*/ web_view, int /*long*/ pspec)
return 0;
}
-int /*long*/ webkit_notify_title (int /*long*/ web_view, int /*long*/ pspec) {
- int /*long*/ title = WebKitGTK.webkit_web_view_get_title (webView);
+long /*int*/ webkit_notify_title (long /*int*/ web_view, long /*int*/ pspec) {
+ long /*int*/ title = WebKitGTK.webkit_web_view_get_title (webView);
String titleString;
if (title == 0) {
titleString = ""; //$NON-NLS-1$
@@ -1783,7 +1783,7 @@ int /*long*/ webkit_notify_title (int /*long*/ web_view, int /*long*/ pspec) {
return 0;
}
-int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_menu) {
+long /*int*/ webkit_populate_popup (long /*int*/ web_view, long /*int*/ webkit_menu) {
Point pt = browser.getDisplay ().getCursorLocation ();
Event event = new Event ();
event.x = pt.x;
@@ -1791,10 +1791,10 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
browser.notifyListeners (SWT.MenuDetect, event);
if (!event.doit) {
/* clear the menu */
- int /*long*/ children = OS.gtk_container_get_children (webkit_menu);
- int /*long*/ current = children;
+ long /*int*/ children = OS.gtk_container_get_children (webkit_menu);
+ long /*int*/ current = children;
while (current != 0) {
- int /*long*/ item = OS.g_list_data (current);
+ long /*int*/ item = OS.g_list_data (current);
OS.gtk_container_remove (webkit_menu, item);
current = OS.g_list_next (current);
}
@@ -1808,10 +1808,10 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
}
menu.setVisible (true);
/* clear the menu */
- int /*long*/ children = OS.gtk_container_get_children (webkit_menu);
- int /*long*/ current = children;
+ long /*int*/ children = OS.gtk_container_get_children (webkit_menu);
+ long /*int*/ current = children;
while (current != 0) {
- int /*long*/ item = OS.g_list_data (current);
+ long /*int*/ item = OS.g_list_data (current);
OS.gtk_container_remove (webkit_menu, item);
current = OS.g_list_next (current);
}
@@ -1820,18 +1820,18 @@ int /*long*/ webkit_populate_popup (int /*long*/ web_view, int /*long*/ webkit_m
return 0;
}
-int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long*/ web_frame, int /*long*/ web_resource, int /*long*/ request, int /*long*/ response) {
+long /*int*/ webkit_resource_request_starting (long /*int*/ web_view, long /*int*/ web_frame, long /*int*/ web_resource, long /*int*/ request, long /*int*/ response) {
if (postData != null || headers != null) {
- int /*long*/ message = WebKitGTK.webkit_network_request_get_message (request);
+ long /*int*/ message = WebKitGTK.webkit_network_request_get_message (request);
if (message == 0) {
headers = null;
postData = null;
} else {
if (postData != null) {
WebKitGTK.SoupMessage_method (message, PostString);
- int /*long*/ body = WebKitGTK.SoupMessage_request_body (message);
+ long /*int*/ body = WebKitGTK.SoupMessage_request_body (message);
byte[] bytes = Converter.wcsToMbcs (null, postData, false);
- int /*long*/ data = C.malloc (bytes.length);
+ long /*int*/ data = C.malloc (bytes.length);
C.memmove (data, bytes, bytes.length);
WebKitGTK.soup_message_body_append (body, WebKitGTK.SOUP_MEMORY_TAKE, data, bytes.length);
WebKitGTK.soup_message_body_flatten (body);
@@ -1858,7 +1858,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long
}
/* headers */
- int /*long*/ requestHeaders = WebKitGTK.SoupMessage_request_headers (message);
+ long /*int*/ requestHeaders = WebKitGTK.SoupMessage_request_headers (message);
for (int i = 0; i < headers.length; i++) {
String current = headers[i];
if (current != null) {
@@ -1881,7 +1881,7 @@ int /*long*/ webkit_resource_request_starting (int /*long*/ web_view, int /*long
return 0;
}
-int /*long*/ webkit_status_bar_text_changed (int /*long*/ web_view, int /*long*/ text) {
+long /*int*/ webkit_status_bar_text_changed (long /*int*/ web_view, long /*int*/ text) {
int length = OS.strlen (text);
byte[] bytes = new byte[length];
OS.memmove (bytes, text, length);
@@ -1895,12 +1895,12 @@ int /*long*/ webkit_status_bar_text_changed (int /*long*/ web_view, int /*long*/
return 0;
}
-int /*long*/ webkit_web_view_ready (int /*long*/ web_view) {
+long /*int*/ webkit_web_view_ready (long /*int*/ web_view) {
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
- int /*long*/ settings = WebKitGTK.webkit_web_view_get_window_features (webView);
+ long /*int*/ settings = WebKitGTK.webkit_web_view_get_window_features (webView);
int[] result = new int[1];
OS.g_object_get (settings, WebKitGTK.locationbar_visible, result, 0);
newEvent.addressBar = result[0] != 0;
@@ -1938,16 +1938,16 @@ int /*long*/ webkit_web_view_ready (int /*long*/ web_view) {
return 0;
}
-int /*long*/ webkit_window_object_cleared (int /*long*/ web_view, int /*long*/ frame, int /*long*/ context, int /*long*/ window_object) {
- int /*long*/ globalObject = WebKitGTK.JSContextGetGlobalObject (context);
- int /*long*/ externalObject = WebKitGTK.JSObjectMake (context, ExternalClass, webViewData);
+long /*int*/ webkit_window_object_cleared (long /*int*/ web_view, long /*int*/ frame, long /*int*/ context, long /*int*/ window_object) {
+ long /*int*/ globalObject = WebKitGTK.JSContextGetGlobalObject (context);
+ long /*int*/ externalObject = WebKitGTK.JSObjectMake (context, ExternalClass, webViewData);
byte[] bytes = null;
try {
bytes = (OBJECTNAME_EXTERNAL + '\0').getBytes (CHARSET_UTF8);
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, OBJECTNAME_EXTERNAL, true);
}
- int /*long*/ name = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ name = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
WebKitGTK.JSObjectSetProperty (context, globalObject, name, externalObject, 0, null);
WebKitGTK.JSStringRelease (name);
Enumeration elements = functions.elements ();
@@ -1955,16 +1955,16 @@ int /*long*/ webkit_window_object_cleared (int /*long*/ web_view, int /*long*/ f
BrowserFunction current = (BrowserFunction)elements.nextElement ();
execute (current.functionString);
}
- int /*long*/ mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView);
+ long /*int*/ mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView);
boolean top = mainFrame == frame;
addEventHandlers (web_view, top);
return 0;
}
-int /*long*/ callJava (int /*long*/ ctx, int /*long*/ func, int /*long*/ thisObject, int /*long*/ argumentCount, int /*long*/ arguments, int /*long*/ exception) {
+long /*int*/ callJava (long /*int*/ ctx, long /*int*/ func, long /*int*/ thisObject, long /*int*/ argumentCount, long /*int*/ arguments, long /*int*/ exception) {
Object returnValue = null;
if (argumentCount == 3) {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
C.memmove (result, arguments, C.PTR_SIZEOF);
int type = WebKitGTK.JSValueGetType (ctx, result[0]);
if (type == WebKitGTK.kJSTypeNumber) {
@@ -2004,7 +2004,7 @@ int /*long*/ callJava (int /*long*/ ctx, int /*long*/ func, int /*long*/ thisObj
return convertToJS (ctx, returnValue);
}
-int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
+long /*int*/ convertToJS (long /*int*/ ctx, Object value) {
if (value == null) {
return WebKitGTK.JSValueMakeUndefined (ctx);
}
@@ -2015,8 +2015,8 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, (String)value, true);
}
- int /*long*/ stringRef = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
- int /*long*/ result = WebKitGTK.JSValueMakeString (ctx, stringRef);
+ long /*int*/ stringRef = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ result = WebKitGTK.JSValueMakeString (ctx, stringRef);
WebKitGTK.JSStringRelease (stringRef);
return result;
}
@@ -2029,10 +2029,10 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
if (value instanceof Object[]) {
Object[] arrayValue = (Object[]) value;
int length = arrayValue.length;
- int /*long*/[] arguments = new int /*long*/[length];
+ long /*int*/[] arguments = new long /*int*/[length];
for (int i = 0; i < length; i++) {
Object javaObject = arrayValue[i];
- int /*long*/ jsObject = convertToJS (ctx, javaObject);
+ long /*int*/ jsObject = convertToJS (ctx, javaObject);
arguments[i] = jsObject;
}
return WebKitGTK.JSObjectMakeArray (ctx, length, arguments, null);
@@ -2041,7 +2041,7 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
return 0;
}
-Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
+Object convertToJava (long /*int*/ ctx, long /*int*/ value) {
int type = WebKitGTK.JSValueGetType (ctx, value);
switch (type) {
case WebKitGTK.kJSTypeBoolean: {
@@ -2053,9 +2053,9 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
return new Double(result);
}
case WebKitGTK.kJSTypeString: {
- int /*long*/ string = WebKitGTK.JSValueToStringCopy (ctx, value, null);
+ long /*int*/ string = WebKitGTK.JSValueToStringCopy (ctx, value, null);
if (string == 0) return ""; //$NON-NLS-1$
- int /*long*/ length = WebKitGTK.JSStringGetMaximumUTF8CStringSize (string);
+ long /*int*/ length = WebKitGTK.JSStringGetMaximumUTF8CStringSize (string);
byte[] bytes = new byte[(int)/*64*/length];
length = WebKitGTK.JSStringGetUTF8CString (string, bytes, length);
WebKitGTK.JSStringRelease (string);
@@ -2076,15 +2076,15 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
} catch (UnsupportedEncodingException e) {
bytes = Converter.wcsToMbcs (null, PROPERTY_LENGTH, true);
}
- int /*long*/ propertyName = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
- int /*long*/ valuePtr = WebKitGTK.JSObjectGetProperty (ctx, value, propertyName, null);
+ long /*int*/ propertyName = WebKitGTK.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ valuePtr = WebKitGTK.JSObjectGetProperty (ctx, value, propertyName, null);
WebKitGTK.JSStringRelease (propertyName);
type = WebKitGTK.JSValueGetType (ctx, valuePtr);
if (type == WebKitGTK.kJSTypeNumber) {
int length = (int)WebKitGTK.JSValueToNumber (ctx, valuePtr, null);
Object[] result = new Object[length];
for (int i = 0; i < length; i++) {
- int /*long*/ current = WebKitGTK.JSObjectGetPropertyAtIndex (ctx, value, i, null);
+ long /*int*/ current = WebKitGTK.JSObjectGetPropertyAtIndex (ctx, value, i, null);
if (current != 0) {
result[i] = convertToJava (ctx, current);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java
index 8c75e6918d..81580451fb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java
@@ -19,35 +19,35 @@ public class JSClassDefinition {
public int version;
public int attributes;
/** @field cast=(const char*) */
- public int /*long*/ className;
+ public long /*int*/ className;
/** @field cast=(void*) */
- public int /*long*/ parentClass;
+ public long /*int*/ parentClass;
/** @field cast=(const void*) */
- public int /*long*/ staticValues;
+ public long /*int*/ staticValues;
/** @field cast=(const void*) */
- public int /*long*/ staticFunctions;
+ public long /*int*/ staticFunctions;
/** @field cast=(void*) */
- public int /*long*/ initialize;
+ public long /*int*/ initialize;
/** @field cast=(void*) */
- public int /*long*/ finalize;
+ public long /*int*/ finalize;
/** @field cast=(void*) */
- public int /*long*/ hasProperty;
+ public long /*int*/ hasProperty;
/** @field cast=(void*) */
- public int /*long*/ getProperty;
+ public long /*int*/ getProperty;
/** @field cast=(void*) */
- public int /*long*/ setProperty;
+ public long /*int*/ setProperty;
/** @field cast=(void*) */
- public int /*long*/ deleteProperty;
+ public long /*int*/ deleteProperty;
/** @field cast=(void*) */
- public int /*long*/ getPropertyNames;
+ public long /*int*/ getPropertyNames;
/** @field cast=(void*) */
- public int /*long*/ callAsFunction;
+ public long /*int*/ callAsFunction;
/** @field cast=(void*) */
- public int /*long*/ callAsConstructor;
+ public long /*int*/ callAsConstructor;
/** @field cast=(void*) */
- public int /*long*/ hasInstance;
+ public long /*int*/ hasInstance;
/** @field cast=(void*) */
- public int /*long*/ convertToType;
+ public long /*int*/ convertToType;
public static final int sizeof = WebKitGTK.JSClassDefinition_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
index f40c98da38..029041b089 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
@@ -90,8 +90,8 @@ protected static byte [] ascii (String name) {
/** @method flags=dynamic */
-public static final native int /*long*/ _JSClassCreate (int /*long*/ definition);
-public static final int /*long*/ JSClassCreate (int /*long*/ definition) {
+public static final native long /*int*/ _JSClassCreate (long /*int*/ definition);
+public static final long /*int*/ JSClassCreate (long /*int*/ definition) {
lock.lock();
try {
return _JSClassCreate (definition);
@@ -101,8 +101,8 @@ public static final int /*long*/ JSClassCreate (int /*long*/ definition) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSContextGetGlobalObject (int /*long*/ ctx);
-public static final int /*long*/ JSContextGetGlobalObject (int /*long*/ ctx) {
+public static final native long /*int*/ _JSContextGetGlobalObject (long /*int*/ ctx);
+public static final long /*int*/ JSContextGetGlobalObject (long /*int*/ ctx) {
lock.lock();
try {
return _JSContextGetGlobalObject (ctx);
@@ -112,8 +112,8 @@ public static final int /*long*/ JSContextGetGlobalObject (int /*long*/ ctx) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSEvaluateScript (int /*long*/ ctx, int /*long*/ script, int /*long*/ thisObject, int /*long*/ sourceURL, int startingLineNumber, int /*long*/[] exception);
-public static final int /*long*/ JSEvaluateScript (int /*long*/ ctx, int /*long*/ script, int /*long*/ thisObject, int /*long*/ sourceURL, int startingLineNumber, int /*long*/[] exception) {
+public static final native long /*int*/ _JSEvaluateScript (long /*int*/ ctx, long /*int*/ script, long /*int*/ thisObject, long /*int*/ sourceURL, int startingLineNumber, long /*int*/[] exception);
+public static final long /*int*/ JSEvaluateScript (long /*int*/ ctx, long /*int*/ script, long /*int*/ thisObject, long /*int*/ sourceURL, int startingLineNumber, long /*int*/[] exception) {
lock.lock();
try {
return _JSEvaluateScript (ctx, script, thisObject, sourceURL, startingLineNumber, exception);
@@ -123,8 +123,8 @@ public static final int /*long*/ JSEvaluateScript (int /*long*/ ctx, int /*long*
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSObjectGetPrivate (int /*long*/ object);
-public static final int /*long*/ JSObjectGetPrivate (int /*long*/ object) {
+public static final native long /*int*/ _JSObjectGetPrivate (long /*int*/ object);
+public static final long /*int*/ JSObjectGetPrivate (long /*int*/ object) {
lock.lock();
try {
return _JSObjectGetPrivate (object);
@@ -134,8 +134,8 @@ public static final int /*long*/ JSObjectGetPrivate (int /*long*/ object) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSObjectGetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/[] exception);
-public static final int /*long*/ JSObjectGetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/[] exception) {
+public static final native long /*int*/ _JSObjectGetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/[] exception);
+public static final long /*int*/ JSObjectGetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/[] exception) {
lock.lock();
try {
return _JSObjectGetProperty (ctx, object, propertyName, exception);
@@ -145,8 +145,8 @@ public static final int /*long*/ JSObjectGetProperty (int /*long*/ ctx, int /*lo
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSObjectGetPropertyAtIndex (int /*long*/ ctx, int /*long*/ object, int propertyIndex, int /*long*/[] exception);
-public static final int /*long*/ JSObjectGetPropertyAtIndex (int /*long*/ ctx, int /*long*/ object, int propertyIndex, int /*long*/[] exception) {
+public static final native long /*int*/ _JSObjectGetPropertyAtIndex (long /*int*/ ctx, long /*int*/ object, int propertyIndex, long /*int*/[] exception);
+public static final long /*int*/ JSObjectGetPropertyAtIndex (long /*int*/ ctx, long /*int*/ object, int propertyIndex, long /*int*/[] exception) {
lock.lock();
try {
return _JSObjectGetPropertyAtIndex (ctx, object, propertyIndex, exception);
@@ -156,8 +156,8 @@ public static final int /*long*/ JSObjectGetPropertyAtIndex (int /*long*/ ctx, i
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSObjectMake (int /*long*/ ctx, int /*long*/ jsClass, int /*long*/ data);
-public static final int /*long*/ JSObjectMake (int /*long*/ ctx, int /*long*/ jsClass, int /*long*/ data) {
+public static final native long /*int*/ _JSObjectMake (long /*int*/ ctx, long /*int*/ jsClass, long /*int*/ data);
+public static final long /*int*/ JSObjectMake (long /*int*/ ctx, long /*int*/ jsClass, long /*int*/ data) {
lock.lock();
try {
return _JSObjectMake (ctx, jsClass, data);
@@ -167,8 +167,8 @@ public static final int /*long*/ JSObjectMake (int /*long*/ ctx, int /*long*/ js
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSObjectMakeArray (int /*long*/ ctx, int /*long*/ argumentCount, int /*long*/[] arguments, int /*long*/[] exception);
-public static final int /*long*/ JSObjectMakeArray (int /*long*/ ctx, int /*long*/ argumentCount, int /*long*/[] arguments, int /*long*/[] exception) {
+public static final native long /*int*/ _JSObjectMakeArray (long /*int*/ ctx, long /*int*/ argumentCount, long /*int*/[] arguments, long /*int*/[] exception);
+public static final long /*int*/ JSObjectMakeArray (long /*int*/ ctx, long /*int*/ argumentCount, long /*int*/[] arguments, long /*int*/[] exception) {
lock.lock();
try {
return _JSObjectMakeArray (ctx, argumentCount, arguments, exception);
@@ -178,8 +178,8 @@ public static final int /*long*/ JSObjectMakeArray (int /*long*/ ctx, int /*long
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSObjectMakeFunctionWithCallback (int /*long*/ ctx, int /*long*/ name, int /*long*/ callAsFunction);
-public static final int /*long*/ JSObjectMakeFunctionWithCallback (int /*long*/ ctx, int /*long*/ name, int /*long*/ callAsFunction) {
+public static final native long /*int*/ _JSObjectMakeFunctionWithCallback (long /*int*/ ctx, long /*int*/ name, long /*int*/ callAsFunction);
+public static final long /*int*/ JSObjectMakeFunctionWithCallback (long /*int*/ ctx, long /*int*/ name, long /*int*/ callAsFunction) {
lock.lock();
try {
return _JSObjectMakeFunctionWithCallback (ctx, name, callAsFunction);
@@ -189,8 +189,8 @@ public static final int /*long*/ JSObjectMakeFunctionWithCallback (int /*long*/
}
/** @method flags=dynamic */
-public static final native void _JSObjectSetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/ value, int attributes, int /*long*/[] exception);
-public static final void JSObjectSetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/ value, int attributes, int /*long*/[] exception) {
+public static final native void _JSObjectSetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ value, int attributes, long /*int*/[] exception);
+public static final void JSObjectSetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ value, int attributes, long /*int*/[] exception) {
lock.lock();
try {
_JSObjectSetProperty (ctx, object, propertyName, value, attributes, exception);
@@ -200,8 +200,8 @@ public static final void JSObjectSetProperty (int /*long*/ ctx, int /*long*/ obj
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSStringCreateWithUTF8CString (byte[] string);
-public static final int /*long*/ JSStringCreateWithUTF8CString (byte[] string) {
+public static final native long /*int*/ _JSStringCreateWithUTF8CString (byte[] string);
+public static final long /*int*/ JSStringCreateWithUTF8CString (byte[] string) {
lock.lock();
try {
return _JSStringCreateWithUTF8CString (string);
@@ -211,8 +211,8 @@ public static final int /*long*/ JSStringCreateWithUTF8CString (byte[] string) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSStringGetLength (int /*long*/ string);
-public static final int /*long*/ JSStringGetLength (int /*long*/ string) {
+public static final native long /*int*/ _JSStringGetLength (long /*int*/ string);
+public static final long /*int*/ JSStringGetLength (long /*int*/ string) {
lock.lock();
try {
return _JSStringGetLength (string);
@@ -222,8 +222,8 @@ public static final int /*long*/ JSStringGetLength (int /*long*/ string) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSStringGetMaximumUTF8CStringSize (int /*long*/ string);
-public static final int /*long*/ JSStringGetMaximumUTF8CStringSize (int /*long*/ string) {
+public static final native long /*int*/ _JSStringGetMaximumUTF8CStringSize (long /*int*/ string);
+public static final long /*int*/ JSStringGetMaximumUTF8CStringSize (long /*int*/ string) {
lock.lock();
try {
return _JSStringGetMaximumUTF8CStringSize (string);
@@ -233,8 +233,8 @@ public static final int /*long*/ JSStringGetMaximumUTF8CStringSize (int /*long*/
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSStringGetUTF8CString (int /*long*/ string, byte[] buffer, int /*long*/ bufferSize);
-public static final int /*long*/ JSStringGetUTF8CString (int /*long*/ string, byte[] buffer, int /*long*/ bufferSize) {
+public static final native long /*int*/ _JSStringGetUTF8CString (long /*int*/ string, byte[] buffer, long /*int*/ bufferSize);
+public static final long /*int*/ JSStringGetUTF8CString (long /*int*/ string, byte[] buffer, long /*int*/ bufferSize) {
lock.lock();
try {
return _JSStringGetUTF8CString (string, buffer, bufferSize);
@@ -244,8 +244,8 @@ public static final int /*long*/ JSStringGetUTF8CString (int /*long*/ string, by
}
/** @method flags=dynamic */
-public static final native int _JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b);
-public static final int JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b) {
+public static final native int _JSStringIsEqualToUTF8CString (long /*int*/ a, byte[] b);
+public static final int JSStringIsEqualToUTF8CString (long /*int*/ a, byte[] b) {
lock.lock();
try {
return _JSStringIsEqualToUTF8CString (a, b);
@@ -255,8 +255,8 @@ public static final int JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b)
}
/** @method flags=dynamic */
-public static final native void _JSStringRelease (int /*long*/ string);
-public static final void JSStringRelease (int /*long*/ string) {
+public static final native void _JSStringRelease (long /*int*/ string);
+public static final void JSStringRelease (long /*int*/ string) {
lock.lock();
try {
_JSStringRelease (string);
@@ -266,8 +266,8 @@ public static final void JSStringRelease (int /*long*/ string) {
}
/** @method flags=dynamic */
-public static final native int _JSValueGetType (int /*long*/ ctx, int /*long*/ value);
-public static final int JSValueGetType (int /*long*/ ctx, int /*long*/ value) {
+public static final native int _JSValueGetType (long /*int*/ ctx, long /*int*/ value);
+public static final int JSValueGetType (long /*int*/ ctx, long /*int*/ value) {
lock.lock();
try {
return _JSValueGetType (ctx, value);
@@ -277,8 +277,8 @@ public static final int JSValueGetType (int /*long*/ ctx, int /*long*/ value) {
}
/** @method flags=dynamic */
-public static final native int _JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ value, int /*long*/ jsClass);
-public static final int JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ value, int /*long*/ jsClass) {
+public static final native int _JSValueIsObjectOfClass (long /*int*/ ctx, long /*int*/ value, long /*int*/ jsClass);
+public static final int JSValueIsObjectOfClass (long /*int*/ ctx, long /*int*/ value, long /*int*/ jsClass) {
lock.lock();
try {
return _JSValueIsObjectOfClass (ctx, value, jsClass);
@@ -288,8 +288,8 @@ public static final int JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ v
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSValueMakeBoolean (int /*long*/ ctx, int bool);
-public static final int /*long*/ JSValueMakeBoolean (int /*long*/ ctx, int bool) {
+public static final native long /*int*/ _JSValueMakeBoolean (long /*int*/ ctx, int bool);
+public static final long /*int*/ JSValueMakeBoolean (long /*int*/ ctx, int bool) {
lock.lock();
try {
return _JSValueMakeBoolean (ctx, bool);
@@ -299,8 +299,8 @@ public static final int /*long*/ JSValueMakeBoolean (int /*long*/ ctx, int bool)
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSValueMakeNumber (int /*long*/ ctx, double number);
-public static final int /*long*/ JSValueMakeNumber (int /*long*/ ctx, double number) {
+public static final native long /*int*/ _JSValueMakeNumber (long /*int*/ ctx, double number);
+public static final long /*int*/ JSValueMakeNumber (long /*int*/ ctx, double number) {
lock.lock();
try {
return _JSValueMakeNumber (ctx, number);
@@ -310,8 +310,8 @@ public static final int /*long*/ JSValueMakeNumber (int /*long*/ ctx, double num
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSValueMakeString (int /*long*/ ctx, int /*long*/ string);
-public static final int /*long*/ JSValueMakeString (int /*long*/ ctx, int /*long*/ string) {
+public static final native long /*int*/ _JSValueMakeString (long /*int*/ ctx, long /*int*/ string);
+public static final long /*int*/ JSValueMakeString (long /*int*/ ctx, long /*int*/ string) {
lock.lock();
try {
return _JSValueMakeString (ctx, string);
@@ -321,8 +321,8 @@ public static final int /*long*/ JSValueMakeString (int /*long*/ ctx, int /*long
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSValueMakeUndefined (int /*long*/ ctx);
-public static final int /*long*/ JSValueMakeUndefined (int /*long*/ ctx) {
+public static final native long /*int*/ _JSValueMakeUndefined (long /*int*/ ctx);
+public static final long /*int*/ JSValueMakeUndefined (long /*int*/ ctx) {
lock.lock();
try {
return _JSValueMakeUndefined (ctx);
@@ -332,8 +332,8 @@ public static final int /*long*/ JSValueMakeUndefined (int /*long*/ ctx) {
}
/** @method flags=dynamic */
-public static final native double _JSValueToNumber (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception);
-public static final double JSValueToNumber (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception) {
+public static final native double _JSValueToNumber (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception);
+public static final double JSValueToNumber (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception) {
lock.lock();
try {
return _JSValueToNumber (ctx, value, exception);
@@ -343,8 +343,8 @@ public static final double JSValueToNumber (int /*long*/ ctx, int /*long*/ value
}
/** @method flags=dynamic */
-public static final native int /*long*/ _JSValueToStringCopy (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception);
-public static final int /*long*/ JSValueToStringCopy (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception) {
+public static final native long /*int*/ _JSValueToStringCopy (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception);
+public static final long /*int*/ JSValueToStringCopy (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception) {
lock.lock();
try {
return _JSValueToStringCopy (ctx, value, exception);
@@ -356,8 +356,8 @@ public static final int /*long*/ JSValueToStringCopy (int /*long*/ ctx, int /*lo
/* --------------------- start libsoup natives --------------------- */
/** @method flags=dynamic */
-public static final native void _soup_auth_authenticate (int /*long*/ auth, byte[] username, byte[] password);
-public static final void soup_auth_authenticate (int /*long*/ auth, byte[] username, byte[] password) {
+public static final native void _soup_auth_authenticate (long /*int*/ auth, byte[] username, byte[] password);
+public static final void soup_auth_authenticate (long /*int*/ auth, byte[] username, byte[] password) {
lock.lock();
try {
_soup_auth_authenticate (auth, username, password);
@@ -367,8 +367,8 @@ public static final void soup_auth_authenticate (int /*long*/ auth, byte[] usern
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_auth_get_host (int /*long*/ auth);
-public static final int /*long*/ soup_auth_get_host (int /*long*/ auth) {
+public static final native long /*int*/ _soup_auth_get_host (long /*int*/ auth);
+public static final long /*int*/ soup_auth_get_host (long /*int*/ auth) {
lock.lock();
try {
return _soup_auth_get_host (auth);
@@ -378,8 +378,8 @@ public static final int /*long*/ soup_auth_get_host (int /*long*/ auth) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_auth_get_scheme_name (int /*long*/ auth);
-public static final int /*long*/ soup_auth_get_scheme_name (int /*long*/ auth) {
+public static final native long /*int*/ _soup_auth_get_scheme_name (long /*int*/ auth);
+public static final long /*int*/ soup_auth_get_scheme_name (long /*int*/ auth) {
lock.lock();
try {
return _soup_auth_get_scheme_name (auth);
@@ -389,8 +389,8 @@ public static final int /*long*/ soup_auth_get_scheme_name (int /*long*/ auth) {
}
/** @method flags=dynamic */
-public static final native void _soup_cookie_free (int /*long*/ cookie);
-public static final void soup_cookie_free (int /*long*/ cookie) {
+public static final native void _soup_cookie_free (long /*int*/ cookie);
+public static final void soup_cookie_free (long /*int*/ cookie) {
lock.lock();
try {
_soup_cookie_free (cookie);
@@ -400,8 +400,8 @@ public static final void soup_cookie_free (int /*long*/ cookie) {
}
/** @method flags=dynamic */
-public static final native void _soup_cookie_jar_add_cookie (int /*long*/ jar, int /*long*/ cookie);
-public static final void soup_cookie_jar_add_cookie (int /*long*/ jar, int /*long*/ cookie) {
+public static final native void _soup_cookie_jar_add_cookie (long /*int*/ jar, long /*int*/ cookie);
+public static final void soup_cookie_jar_add_cookie (long /*int*/ jar, long /*int*/ cookie) {
lock.lock();
try {
_soup_cookie_jar_add_cookie (jar, cookie);
@@ -411,8 +411,8 @@ public static final void soup_cookie_jar_add_cookie (int /*long*/ jar, int /*lon
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_cookie_jar_all_cookies (int /*long*/ jar);
-public static final int /*long*/ soup_cookie_jar_all_cookies (int /*long*/ jar) {
+public static final native long /*int*/ _soup_cookie_jar_all_cookies (long /*int*/ jar);
+public static final long /*int*/ soup_cookie_jar_all_cookies (long /*int*/ jar) {
lock.lock();
try {
return _soup_cookie_jar_all_cookies (jar);
@@ -422,8 +422,8 @@ public static final int /*long*/ soup_cookie_jar_all_cookies (int /*long*/ jar)
}
/** @method flags=dynamic */
-public static final native void _soup_cookie_jar_delete_cookie (int /*long*/ jar, int /*long*/ cookie);
-public static final void soup_cookie_jar_delete_cookie (int /*long*/ jar, int /*long*/ cookie) {
+public static final native void _soup_cookie_jar_delete_cookie (long /*int*/ jar, long /*int*/ cookie);
+public static final void soup_cookie_jar_delete_cookie (long /*int*/ jar, long /*int*/ cookie) {
lock.lock();
try {
_soup_cookie_jar_delete_cookie (jar, cookie);
@@ -433,8 +433,8 @@ public static final void soup_cookie_jar_delete_cookie (int /*long*/ jar, int /*
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_cookie_jar_get_cookies (int /*long*/ jar, int /*long*/ uri, int for_http);
-public static final int /*long*/ soup_cookie_jar_get_cookies (int /*long*/ jar, int /*long*/ uri, int for_http) {
+public static final native long /*int*/ _soup_cookie_jar_get_cookies (long /*int*/ jar, long /*int*/ uri, int for_http);
+public static final long /*int*/ soup_cookie_jar_get_cookies (long /*int*/ jar, long /*int*/ uri, int for_http) {
lock.lock();
try {
return _soup_cookie_jar_get_cookies (jar, uri, for_http);
@@ -444,8 +444,8 @@ public static final int /*long*/ soup_cookie_jar_get_cookies (int /*long*/ jar,
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_cookie_jar_get_type ();
-public static final int /*long*/ soup_cookie_jar_get_type () {
+public static final native long /*int*/ _soup_cookie_jar_get_type ();
+public static final long /*int*/ soup_cookie_jar_get_type () {
lock.lock();
try {
return _soup_cookie_jar_get_type ();
@@ -455,8 +455,8 @@ public static final int /*long*/ soup_cookie_jar_get_type () {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_cookie_parse (byte[] header, int /*long*/ origin);
-public static final int /*long*/ soup_cookie_parse (byte[] header, int /*long*/ origin) {
+public static final native long /*int*/ _soup_cookie_parse (byte[] header, long /*int*/ origin);
+public static final long /*int*/ soup_cookie_parse (byte[] header, long /*int*/ origin) {
lock.lock();
try {
return _soup_cookie_parse (header, origin);
@@ -466,8 +466,8 @@ public static final int /*long*/ soup_cookie_parse (byte[] header, int /*long*/
}
/** @method flags=dynamic */
-public static final native void _soup_message_body_append (int /*long*/ body, int use, int /*long*/ data, int /*long*/ length);
-public static final void soup_message_body_append (int /*long*/ body, int use, int /*long*/ data, int /*long*/ length) {
+public static final native void _soup_message_body_append (long /*int*/ body, int use, long /*int*/ data, long /*int*/ length);
+public static final void soup_message_body_append (long /*int*/ body, int use, long /*int*/ data, long /*int*/ length) {
lock.lock();
try {
_soup_message_body_append (body, use, data, length);
@@ -477,8 +477,8 @@ public static final void soup_message_body_append (int /*long*/ body, int use, i
}
/** @method flags=dynamic */
-public static final native void _soup_message_body_flatten (int /*long*/ body);
-public static final void soup_message_body_flatten (int /*long*/ body) {
+public static final native void _soup_message_body_flatten (long /*int*/ body);
+public static final void soup_message_body_flatten (long /*int*/ body) {
lock.lock();
try {
_soup_message_body_flatten (body);
@@ -488,8 +488,8 @@ public static final void soup_message_body_flatten (int /*long*/ body) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_message_get_uri (int /*long*/ msg);
-public static final int /*long*/ soup_message_get_uri (int /*long*/ msg) {
+public static final native long /*int*/ _soup_message_get_uri (long /*int*/ msg);
+public static final long /*int*/ soup_message_get_uri (long /*int*/ msg) {
lock.lock();
try {
return _soup_message_get_uri (msg);
@@ -499,8 +499,8 @@ public static final int /*long*/ soup_message_get_uri (int /*long*/ msg) {
}
/** @method flags=dynamic */
-public static final native void _soup_message_headers_append (int /*long*/ headers, byte[] name, byte[] value);
-public static final void soup_message_headers_append (int /*long*/ headers, byte[] name, byte[] value) {
+public static final native void _soup_message_headers_append (long /*int*/ headers, byte[] name, byte[] value);
+public static final void soup_message_headers_append (long /*int*/ headers, byte[] name, byte[] value) {
lock.lock();
try {
_soup_message_headers_append (headers, name, value);
@@ -510,8 +510,8 @@ public static final void soup_message_headers_append (int /*long*/ headers, byte
}
/** @method flags=dynamic */
-public static final native void _soup_session_add_feature_by_type (int /*long*/ session, int /*long*/ type);
-public static final void soup_session_add_feature_by_type (int /*long*/ session, int /*long*/ type) {
+public static final native void _soup_session_add_feature_by_type (long /*int*/ session, long /*int*/ type);
+public static final void soup_session_add_feature_by_type (long /*int*/ session, long /*int*/ type) {
lock.lock();
try {
_soup_session_add_feature_by_type (session, type);
@@ -521,8 +521,8 @@ public static final void soup_session_add_feature_by_type (int /*long*/ session,
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_session_get_feature (int /*long*/ session, int /*long*/ feature_type);
-public static final int /*long*/ soup_session_get_feature (int /*long*/ session, int /*long*/ feature_type) {
+public static final native long /*int*/ _soup_session_get_feature (long /*int*/ session, long /*int*/ feature_type);
+public static final long /*int*/ soup_session_get_feature (long /*int*/ session, long /*int*/ feature_type) {
lock.lock();
try {
return _soup_session_get_feature (session, feature_type);
@@ -532,8 +532,8 @@ public static final int /*long*/ soup_session_get_feature (int /*long*/ session,
}
/** @method flags=dynamic */
-public static final native void _soup_session_feature_attach (int /*long*/ feature, int /*long*/ session);
-public static final void soup_session_feature_attach (int /*long*/ feature, int /*long*/ session) {
+public static final native void _soup_session_feature_attach (long /*int*/ feature, long /*int*/ session);
+public static final void soup_session_feature_attach (long /*int*/ feature, long /*int*/ session) {
lock.lock();
try {
_soup_session_feature_attach (feature, session);
@@ -543,8 +543,8 @@ public static final void soup_session_feature_attach (int /*long*/ feature, int
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_session_get_type ();
-public static final int /*long*/ soup_session_get_type () {
+public static final native long /*int*/ _soup_session_get_type ();
+public static final long /*int*/ soup_session_get_type () {
lock.lock();
try {
return _soup_session_get_type ();
@@ -554,8 +554,8 @@ public static final int /*long*/ soup_session_get_type () {
}
/** @method flags=dynamic */
-public static final native void _soup_session_feature_detach (int /*long*/ feature, int /*long*/ session);
-public static final void soup_session_feature_detach (int /*long*/ feature, int /*long*/ session) {
+public static final native void _soup_session_feature_detach (long /*int*/ feature, long /*int*/ session);
+public static final void soup_session_feature_detach (long /*int*/ feature, long /*int*/ session) {
lock.lock();
try {
_soup_session_feature_detach (feature, session);
@@ -565,8 +565,8 @@ public static final void soup_session_feature_detach (int /*long*/ feature, int
}
/** @method flags=dynamic */
-public static final native void _soup_uri_free (int /*long*/ uri);
-public static final void soup_uri_free (int /*long*/ uri) {
+public static final native void _soup_uri_free (long /*int*/ uri);
+public static final void soup_uri_free (long /*int*/ uri) {
lock.lock();
try {
_soup_uri_free (uri);
@@ -576,8 +576,8 @@ public static final void soup_uri_free (int /*long*/ uri) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_uri_new (byte[] uri_string);
-public static final int /*long*/ soup_uri_new (byte[] uri_string) {
+public static final native long /*int*/ _soup_uri_new (byte[] uri_string);
+public static final long /*int*/ soup_uri_new (byte[] uri_string) {
lock.lock();
try {
return _soup_uri_new (uri_string);
@@ -587,8 +587,8 @@ public static final int /*long*/ soup_uri_new (byte[] uri_string) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _soup_uri_to_string (int /*long*/ uri, int just_path_and_query);
-public static final int /*long*/ soup_uri_to_string (int /*long*/ uri, int just_path_and_query) {
+public static final native long /*int*/ _soup_uri_to_string (long /*int*/ uri, int just_path_and_query);
+public static final long /*int*/ soup_uri_to_string (long /*int*/ uri, int just_path_and_query) {
lock.lock();
try {
return _soup_uri_to_string (uri, just_path_and_query);
@@ -600,8 +600,8 @@ public static final int /*long*/ soup_uri_to_string (int /*long*/ uri, int just_
/* --------------------- start WebKitGTK natives --------------------- */
/** @method flags=dynamic */
-public static final native int _webkit_dom_event_target_add_event_listener (int /*long*/ target, byte[] name, int /*long*/ handler, int bubble, int /*long*/ userData);
-public static final int webkit_dom_event_target_add_event_listener (int /*long*/ target, byte[] name, int /*long*/ handler, int bubble, int /*long*/ userData) {
+public static final native int _webkit_dom_event_target_add_event_listener (long /*int*/ target, byte[] name, long /*int*/ handler, int bubble, long /*int*/ userData);
+public static final int webkit_dom_event_target_add_event_listener (long /*int*/ target, byte[] name, long /*int*/ handler, int bubble, long /*int*/ userData) {
lock.lock();
try {
return _webkit_dom_event_target_add_event_listener (target, name, handler, bubble, userData);
@@ -611,8 +611,8 @@ public static final int webkit_dom_event_target_add_event_listener (int /*long*/
}
/** @method flags=dynamic */
-public static final native int _webkit_dom_mouse_event_get_alt_key (int /*long*/ self);
-public static final int webkit_dom_mouse_event_get_alt_key (int /*long*/ self) {
+public static final native int _webkit_dom_mouse_event_get_alt_key (long /*int*/ self);
+public static final int webkit_dom_mouse_event_get_alt_key (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_mouse_event_get_alt_key (self);
@@ -622,8 +622,8 @@ public static final int webkit_dom_mouse_event_get_alt_key (int /*long*/ self) {
}
/** @method flags=dynamic */
-public static final native short _webkit_dom_mouse_event_get_button (int /*long*/ self);
-public static final short webkit_dom_mouse_event_get_button (int /*long*/ self) {
+public static final native short _webkit_dom_mouse_event_get_button (long /*int*/ self);
+public static final short webkit_dom_mouse_event_get_button (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_mouse_event_get_button (self);
@@ -633,8 +633,8 @@ public static final short webkit_dom_mouse_event_get_button (int /*long*/ self)
}
/** @method flags=dynamic */
-public static final native int _webkit_dom_mouse_event_get_ctrl_key (int /*long*/ self);
-public static final int webkit_dom_mouse_event_get_ctrl_key (int /*long*/ self) {
+public static final native int _webkit_dom_mouse_event_get_ctrl_key (long /*int*/ self);
+public static final int webkit_dom_mouse_event_get_ctrl_key (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_mouse_event_get_ctrl_key (self);
@@ -644,8 +644,8 @@ public static final int webkit_dom_mouse_event_get_ctrl_key (int /*long*/ self)
}
/** @method flags=dynamic */
-public static final native int _webkit_dom_mouse_event_get_meta_key (int /*long*/ self);
-public static final int webkit_dom_mouse_event_get_meta_key (int /*long*/ self) {
+public static final native int _webkit_dom_mouse_event_get_meta_key (long /*int*/ self);
+public static final int webkit_dom_mouse_event_get_meta_key (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_mouse_event_get_meta_key (self);
@@ -655,8 +655,8 @@ public static final int webkit_dom_mouse_event_get_meta_key (int /*long*/ self)
}
/** @method flags=dynamic */
-public static final native long _webkit_dom_mouse_event_get_screen_x (int /*long*/ self);
-public static final long webkit_dom_mouse_event_get_screen_x (int /*long*/ self) {
+public static final native long _webkit_dom_mouse_event_get_screen_x (long /*int*/ self);
+public static final long webkit_dom_mouse_event_get_screen_x (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_mouse_event_get_screen_x (self);
@@ -666,8 +666,8 @@ public static final long webkit_dom_mouse_event_get_screen_x (int /*long*/ self)
}
/** @method flags=dynamic */
-public static final native long _webkit_dom_mouse_event_get_screen_y (int /*long*/ self);
-public static final long webkit_dom_mouse_event_get_screen_y (int /*long*/ self) {
+public static final native long _webkit_dom_mouse_event_get_screen_y (long /*int*/ self);
+public static final long webkit_dom_mouse_event_get_screen_y (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_mouse_event_get_screen_y (self);
@@ -677,8 +677,8 @@ public static final long webkit_dom_mouse_event_get_screen_y (int /*long*/ self)
}
/** @method flags=dynamic */
-public static final native int _webkit_dom_mouse_event_get_shift_key (int /*long*/ self);
-public static final int webkit_dom_mouse_event_get_shift_key (int /*long*/ self) {
+public static final native int _webkit_dom_mouse_event_get_shift_key (long /*int*/ self);
+public static final int webkit_dom_mouse_event_get_shift_key (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_mouse_event_get_shift_key (self);
@@ -688,8 +688,8 @@ public static final int webkit_dom_mouse_event_get_shift_key (int /*long*/ self)
}
/** @method flags=dynamic */
-public static final native long _webkit_dom_ui_event_get_char_code (int /*long*/ self);
-public static final long webkit_dom_ui_event_get_char_code (int /*long*/ self) {
+public static final native long _webkit_dom_ui_event_get_char_code (long /*int*/ self);
+public static final long webkit_dom_ui_event_get_char_code (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_ui_event_get_char_code (self);
@@ -699,8 +699,8 @@ public static final long webkit_dom_ui_event_get_char_code (int /*long*/ self) {
}
/** @method flags=dynamic */
-public static final native long _webkit_dom_ui_event_get_detail (int /*long*/ self);
-public static final long webkit_dom_ui_event_get_detail (int /*long*/ self) {
+public static final native long _webkit_dom_ui_event_get_detail (long /*int*/ self);
+public static final long webkit_dom_ui_event_get_detail (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_ui_event_get_detail (self);
@@ -710,8 +710,8 @@ public static final long webkit_dom_ui_event_get_detail (int /*long*/ self) {
}
/** @method flags=dynamic */
-public static final native long _webkit_dom_ui_event_get_key_code (int /*long*/ self);
-public static final long webkit_dom_ui_event_get_key_code (int /*long*/ self) {
+public static final native long _webkit_dom_ui_event_get_key_code (long /*int*/ self);
+public static final long webkit_dom_ui_event_get_key_code (long /*int*/ self) {
lock.lock();
try {
return _webkit_dom_ui_event_get_key_code (self);
@@ -721,8 +721,8 @@ public static final long webkit_dom_ui_event_get_key_code (int /*long*/ self) {
}
/** @method flags=dynamic */
-public static final native void _webkit_download_cancel (int /*long*/ download);
-public static final void webkit_download_cancel (int /*long*/ download) {
+public static final native void _webkit_download_cancel (long /*int*/ download);
+public static final void webkit_download_cancel (long /*int*/ download) {
lock.lock();
try {
_webkit_download_cancel (download);
@@ -732,8 +732,8 @@ public static final void webkit_download_cancel (int /*long*/ download) {
}
/** @method flags=dynamic */
-public static final native long _webkit_download_get_current_size (int /*long*/ download);
-public static final long webkit_download_get_current_size (int /*long*/ download) {
+public static final native long _webkit_download_get_current_size (long /*int*/ download);
+public static final long webkit_download_get_current_size (long /*int*/ download) {
lock.lock();
try {
return _webkit_download_get_current_size (download);
@@ -743,8 +743,8 @@ public static final long webkit_download_get_current_size (int /*long*/ download
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_download_get_network_request (int /*long*/ download);
-public static final int /*long*/ webkit_download_get_network_request (int /*long*/ download) {
+public static final native long /*int*/ _webkit_download_get_network_request (long /*int*/ download);
+public static final long /*int*/ webkit_download_get_network_request (long /*int*/ download) {
lock.lock();
try {
return _webkit_download_get_network_request (download);
@@ -754,8 +754,8 @@ public static final int /*long*/ webkit_download_get_network_request (int /*long
}
/** @method flags=dynamic */
-public static final native int _webkit_download_get_status (int /*long*/ download);
-public static final int webkit_download_get_status (int /*long*/ download) {
+public static final native int _webkit_download_get_status (long /*int*/ download);
+public static final int webkit_download_get_status (long /*int*/ download) {
lock.lock();
try {
return _webkit_download_get_status (download);
@@ -765,8 +765,8 @@ public static final int webkit_download_get_status (int /*long*/ download) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_download_get_suggested_filename (int /*long*/ download);
-public static final int /*long*/ webkit_download_get_suggested_filename (int /*long*/ download) {
+public static final native long /*int*/ _webkit_download_get_suggested_filename (long /*int*/ download);
+public static final long /*int*/ webkit_download_get_suggested_filename (long /*int*/ download) {
lock.lock();
try {
return _webkit_download_get_suggested_filename (download);
@@ -776,8 +776,8 @@ public static final int /*long*/ webkit_download_get_suggested_filename (int /*l
}
/** @method flags=dynamic */
-public static final native long _webkit_download_get_total_size (int /*long*/ download);
-public static final long webkit_download_get_total_size (int /*long*/ download) {
+public static final native long _webkit_download_get_total_size (long /*int*/ download);
+public static final long webkit_download_get_total_size (long /*int*/ download) {
lock.lock();
try {
return _webkit_download_get_total_size (download);
@@ -787,8 +787,8 @@ public static final long webkit_download_get_total_size (int /*long*/ download)
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_download_get_uri (int /*long*/ download);
-public static final int /*long*/ webkit_download_get_uri (int /*long*/ download) {
+public static final native long /*int*/ _webkit_download_get_uri (long /*int*/ download);
+public static final long /*int*/ webkit_download_get_uri (long /*int*/ download) {
lock.lock();
try {
return _webkit_download_get_uri (download);
@@ -798,8 +798,8 @@ public static final int /*long*/ webkit_download_get_uri (int /*long*/ download)
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_download_new (int /*long*/ request);
-public static final int /*long*/ webkit_download_new (int /*long*/ request) {
+public static final native long /*int*/ _webkit_download_new (long /*int*/ request);
+public static final long /*int*/ webkit_download_new (long /*int*/ request) {
lock.lock();
try {
return _webkit_download_new (request);
@@ -809,8 +809,8 @@ public static final int /*long*/ webkit_download_new (int /*long*/ request) {
}
/** @method flags=dynamic */
-public static final native void _webkit_download_set_destination_uri (int /*long*/ download, byte[] destination_uri);
-public static final void webkit_download_set_destination_uri (int /*long*/ download, byte[] destination_uri) {
+public static final native void _webkit_download_set_destination_uri (long /*int*/ download, byte[] destination_uri);
+public static final void webkit_download_set_destination_uri (long /*int*/ download, byte[] destination_uri) {
lock.lock();
try {
_webkit_download_set_destination_uri (download, destination_uri);
@@ -820,8 +820,8 @@ public static final void webkit_download_set_destination_uri (int /*long*/ downl
}
/** @method flags=dynamic */
-public static final native void _webkit_download_start (int /*long*/ download);
-public static final void webkit_download_start (int /*long*/ download) {
+public static final native void _webkit_download_start (long /*int*/ download);
+public static final void webkit_download_start (long /*int*/ download) {
lock.lock();
try {
_webkit_download_start (download);
@@ -831,8 +831,8 @@ public static final void webkit_download_start (int /*long*/ download) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_get_default_session ();
-public static final int /*long*/ webkit_get_default_session () {
+public static final native long /*int*/ _webkit_get_default_session ();
+public static final long /*int*/ webkit_get_default_session () {
lock.lock();
try {
return _webkit_get_default_session ();
@@ -875,8 +875,8 @@ public static final int webkit_minor_version () {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_network_request_get_message (int /*long*/ request);
-public static final int /*long*/ webkit_network_request_get_message (int /*long*/ request) {
+public static final native long /*int*/ _webkit_network_request_get_message (long /*int*/ request);
+public static final long /*int*/ webkit_network_request_get_message (long /*int*/ request) {
lock.lock();
try {
return _webkit_network_request_get_message (request);
@@ -886,8 +886,8 @@ public static final int /*long*/ webkit_network_request_get_message (int /*long*
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_network_request_get_uri (int /*long*/ request);
-public static final int /*long*/ webkit_network_request_get_uri (int /*long*/ request) {
+public static final native long /*int*/ _webkit_network_request_get_uri (long /*int*/ request);
+public static final long /*int*/ webkit_network_request_get_uri (long /*int*/ request) {
lock.lock();
try {
return _webkit_network_request_get_uri (request);
@@ -897,8 +897,8 @@ public static final int /*long*/ webkit_network_request_get_uri (int /*long*/ re
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_network_request_new (byte[] uri);
-public static final int /*long*/ webkit_network_request_new (byte[] uri) {
+public static final native long /*int*/ _webkit_network_request_new (byte[] uri);
+public static final long /*int*/ webkit_network_request_new (byte[] uri) {
lock.lock();
try {
return _webkit_network_request_new (uri);
@@ -908,8 +908,8 @@ public static final int /*long*/ webkit_network_request_new (byte[] uri) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_soup_auth_dialog_get_type ();
-public static final int /*long*/ webkit_soup_auth_dialog_get_type () {
+public static final native long /*int*/ _webkit_soup_auth_dialog_get_type ();
+public static final long /*int*/ webkit_soup_auth_dialog_get_type () {
lock.lock();
try {
return _webkit_soup_auth_dialog_get_type ();
@@ -919,8 +919,8 @@ public static final int /*long*/ webkit_soup_auth_dialog_get_type () {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_data_source_get_data (int /*long*/ data_source);
-public static final int /*long*/ webkit_web_data_source_get_data (int /*long*/ data_source) {
+public static final native long /*int*/ _webkit_web_data_source_get_data (long /*int*/ data_source);
+public static final long /*int*/ webkit_web_data_source_get_data (long /*int*/ data_source) {
lock.lock();
try {
return _webkit_web_data_source_get_data (data_source);
@@ -930,8 +930,8 @@ public static final int /*long*/ webkit_web_data_source_get_data (int /*long*/ d
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_data_source_get_encoding (int /*long*/ data_source);
-public static final int /*long*/ webkit_web_data_source_get_encoding (int /*long*/ data_source) {
+public static final native long /*int*/ _webkit_web_data_source_get_encoding (long /*int*/ data_source);
+public static final long /*int*/ webkit_web_data_source_get_encoding (long /*int*/ data_source) {
lock.lock();
try {
return _webkit_web_data_source_get_encoding (data_source);
@@ -941,8 +941,8 @@ public static final int /*long*/ webkit_web_data_source_get_encoding (int /*long
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_frame_get_data_source (int /*long*/ frame);
-public static final int /*long*/ webkit_web_frame_get_data_source (int /*long*/ frame) {
+public static final native long /*int*/ _webkit_web_frame_get_data_source (long /*int*/ frame);
+public static final long /*int*/ webkit_web_frame_get_data_source (long /*int*/ frame) {
lock.lock();
try {
return _webkit_web_frame_get_data_source (frame);
@@ -952,8 +952,8 @@ public static final int /*long*/ webkit_web_frame_get_data_source (int /*long*/
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_frame_get_global_context (int /*long*/ frame);
-public static final int /*long*/ webkit_web_frame_get_global_context (int /*long*/ frame) {
+public static final native long /*int*/ _webkit_web_frame_get_global_context (long /*int*/ frame);
+public static final long /*int*/ webkit_web_frame_get_global_context (long /*int*/ frame) {
lock.lock();
try {
return _webkit_web_frame_get_global_context (frame);
@@ -963,8 +963,8 @@ public static final int /*long*/ webkit_web_frame_get_global_context (int /*long
}
/** @method flags=dynamic */
-public static final native int _webkit_web_frame_get_load_status (int /*long*/ frame);
-public static final int webkit_web_frame_get_load_status (int /*long*/ frame) {
+public static final native int _webkit_web_frame_get_load_status (long /*int*/ frame);
+public static final int webkit_web_frame_get_load_status (long /*int*/ frame) {
lock.lock();
try {
return _webkit_web_frame_get_load_status (frame);
@@ -974,8 +974,8 @@ public static final int webkit_web_frame_get_load_status (int /*long*/ frame) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_frame_get_parent (int /*long*/ frame);
-public static final int /*long*/ webkit_web_frame_get_parent (int /*long*/ frame) {
+public static final native long /*int*/ _webkit_web_frame_get_parent (long /*int*/ frame);
+public static final long /*int*/ webkit_web_frame_get_parent (long /*int*/ frame) {
lock.lock();
try {
return _webkit_web_frame_get_parent (frame);
@@ -985,8 +985,8 @@ public static final int /*long*/ webkit_web_frame_get_parent (int /*long*/ frame
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_frame_get_title (int /*long*/ frame);
-public static final int /*long*/ webkit_web_frame_get_title (int /*long*/ frame) {
+public static final native long /*int*/ _webkit_web_frame_get_title (long /*int*/ frame);
+public static final long /*int*/ webkit_web_frame_get_title (long /*int*/ frame) {
lock.lock();
try {
return _webkit_web_frame_get_title (frame);
@@ -996,8 +996,8 @@ public static final int /*long*/ webkit_web_frame_get_title (int /*long*/ frame)
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_frame_get_type ();
-public static final int /*long*/ webkit_web_frame_get_type () {
+public static final native long /*int*/ _webkit_web_frame_get_type ();
+public static final long /*int*/ webkit_web_frame_get_type () {
lock.lock();
try {
return _webkit_web_frame_get_type ();
@@ -1007,8 +1007,8 @@ public static final int /*long*/ webkit_web_frame_get_type () {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_frame_get_uri (int /*long*/ frame);
-public static final int /*long*/ webkit_web_frame_get_uri (int /*long*/ frame) {
+public static final native long /*int*/ _webkit_web_frame_get_uri (long /*int*/ frame);
+public static final long /*int*/ webkit_web_frame_get_uri (long /*int*/ frame) {
lock.lock();
try {
return _webkit_web_frame_get_uri (frame);
@@ -1018,8 +1018,8 @@ public static final int /*long*/ webkit_web_frame_get_uri (int /*long*/ frame) {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_frame_get_web_view (int /*long*/ frame);
-public static final int /*long*/ webkit_web_frame_get_web_view (int /*long*/ frame) {
+public static final native long /*int*/ _webkit_web_frame_get_web_view (long /*int*/ frame);
+public static final long /*int*/ webkit_web_frame_get_web_view (long /*int*/ frame) {
lock.lock();
try {
return _webkit_web_frame_get_web_view (frame);
@@ -1029,8 +1029,8 @@ public static final int /*long*/ webkit_web_frame_get_web_view (int /*long*/ fra
}
/** @method flags=dynamic */
-public static final native void _webkit_web_policy_decision_download (int /*long*/ decision);
-public static final void webkit_web_policy_decision_download (int /*long*/ decision) {
+public static final native void _webkit_web_policy_decision_download (long /*int*/ decision);
+public static final void webkit_web_policy_decision_download (long /*int*/ decision) {
lock.lock();
try {
_webkit_web_policy_decision_download (decision);
@@ -1040,8 +1040,8 @@ public static final void webkit_web_policy_decision_download (int /*long*/ decis
}
/** @method flags=dynamic */
-public static final native void _webkit_web_policy_decision_ignore (int /*long*/ decision);
-public static final void webkit_web_policy_decision_ignore (int /*long*/ decision) {
+public static final native void _webkit_web_policy_decision_ignore (long /*int*/ decision);
+public static final void webkit_web_policy_decision_ignore (long /*int*/ decision) {
lock.lock();
try {
_webkit_web_policy_decision_ignore (decision);
@@ -1051,8 +1051,8 @@ public static final void webkit_web_policy_decision_ignore (int /*long*/ decisio
}
/** @method flags=dynamic */
-public static final native int _webkit_web_view_can_go_back (int /*long*/ web_view);
-public static final int webkit_web_view_can_go_back (int /*long*/ web_view) {
+public static final native int _webkit_web_view_can_go_back (long /*int*/ web_view);
+public static final int webkit_web_view_can_go_back (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_can_go_back (web_view);
@@ -1062,8 +1062,8 @@ public static final int webkit_web_view_can_go_back (int /*long*/ web_view) {
}
/** @method flags=dynamic */
-public static final native int _webkit_web_view_can_go_forward (int /*long*/ web_view);
-public static final int webkit_web_view_can_go_forward (int /*long*/ web_view) {
+public static final native int _webkit_web_view_can_go_forward (long /*int*/ web_view);
+public static final int webkit_web_view_can_go_forward (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_can_go_forward (web_view);
@@ -1073,8 +1073,8 @@ public static final int webkit_web_view_can_go_forward (int /*long*/ web_view) {
}
/** @method flags=dynamic */
-public static final native int _webkit_web_view_can_show_mime_type (int /*long*/ web_view, int /*long*/ mime_type);
-public static final int webkit_web_view_can_show_mime_type (int /*long*/ web_view, int /*long*/ mime_type) {
+public static final native int _webkit_web_view_can_show_mime_type (long /*int*/ web_view, long /*int*/ mime_type);
+public static final int webkit_web_view_can_show_mime_type (long /*int*/ web_view, long /*int*/ mime_type) {
lock.lock();
try {
return _webkit_web_view_can_show_mime_type (web_view, mime_type);
@@ -1084,8 +1084,8 @@ public static final int webkit_web_view_can_show_mime_type (int /*long*/ web_vie
}
/** @method flags=dynamic */
-public static final native void _webkit_web_view_execute_script (int /*long*/ web_view, byte[] script);
-public static final void webkit_web_view_execute_script (int /*long*/ web_view, byte[] script) {
+public static final native void _webkit_web_view_execute_script (long /*int*/ web_view, byte[] script);
+public static final void webkit_web_view_execute_script (long /*int*/ web_view, byte[] script) {
lock.lock();
try {
_webkit_web_view_execute_script (web_view, script);
@@ -1095,8 +1095,8 @@ public static final void webkit_web_view_execute_script (int /*long*/ web_view,
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_view_get_dom_document (int /*long*/ web_view);
-public static final int /*long*/ webkit_web_view_get_dom_document (int /*long*/ web_view) {
+public static final native long /*int*/ _webkit_web_view_get_dom_document (long /*int*/ web_view);
+public static final long /*int*/ webkit_web_view_get_dom_document (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_get_dom_document (web_view);
@@ -1106,8 +1106,8 @@ public static final int /*long*/ webkit_web_view_get_dom_document (int /*long*/
}
/** @method flags=dynamic */
-public static final native int _webkit_web_view_get_load_status (int /*long*/ web_view);
-public static final int webkit_web_view_get_load_status (int /*long*/ web_view) {
+public static final native int _webkit_web_view_get_load_status (long /*int*/ web_view);
+public static final int webkit_web_view_get_load_status (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_get_load_status (web_view);
@@ -1117,8 +1117,8 @@ public static final int webkit_web_view_get_load_status (int /*long*/ web_view)
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_view_get_main_frame (int /*long*/ web_view);
-public static final int /*long*/ webkit_web_view_get_main_frame (int /*long*/ web_view) {
+public static final native long /*int*/ _webkit_web_view_get_main_frame (long /*int*/ web_view);
+public static final long /*int*/ webkit_web_view_get_main_frame (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_get_main_frame (web_view);
@@ -1128,8 +1128,8 @@ public static final int /*long*/ webkit_web_view_get_main_frame (int /*long*/ we
}
/** @method flags=dynamic */
-public static final native double _webkit_web_view_get_progress (int /*long*/ web_view);
-public static final double webkit_web_view_get_progress (int /*long*/ web_view) {
+public static final native double _webkit_web_view_get_progress (long /*int*/ web_view);
+public static final double webkit_web_view_get_progress (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_get_progress (web_view);
@@ -1139,8 +1139,8 @@ public static final double webkit_web_view_get_progress (int /*long*/ web_view)
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_view_get_settings (int /*long*/ web_view);
-public static final int /*long*/ webkit_web_view_get_settings (int /*long*/ web_view) {
+public static final native long /*int*/ _webkit_web_view_get_settings (long /*int*/ web_view);
+public static final long /*int*/ webkit_web_view_get_settings (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_get_settings (web_view);
@@ -1150,8 +1150,8 @@ public static final int /*long*/ webkit_web_view_get_settings (int /*long*/ web_
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_view_get_title (int /*long*/ web_view);
-public static final int /*long*/ webkit_web_view_get_title (int /*long*/ web_view) {
+public static final native long /*int*/ _webkit_web_view_get_title (long /*int*/ web_view);
+public static final long /*int*/ webkit_web_view_get_title (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_get_title (web_view);
@@ -1161,8 +1161,8 @@ public static final int /*long*/ webkit_web_view_get_title (int /*long*/ web_vie
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_view_get_type ();
-public static final int /*long*/ webkit_web_view_get_type () {
+public static final native long /*int*/ _webkit_web_view_get_type ();
+public static final long /*int*/ webkit_web_view_get_type () {
lock.lock();
try {
return _webkit_web_view_get_type ();
@@ -1172,8 +1172,8 @@ public static final int /*long*/ webkit_web_view_get_type () {
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_view_get_uri (int /*long*/ web_view);
-public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view) {
+public static final native long /*int*/ _webkit_web_view_get_uri (long /*int*/ web_view);
+public static final long /*int*/ webkit_web_view_get_uri (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_get_uri (web_view);
@@ -1183,8 +1183,8 @@ public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view)
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_view_get_window_features (int /*long*/ web_view);
-public static final int /*long*/ webkit_web_view_get_window_features (int /*long*/ web_view) {
+public static final native long /*int*/ _webkit_web_view_get_window_features (long /*int*/ web_view);
+public static final long /*int*/ webkit_web_view_get_window_features (long /*int*/ web_view) {
lock.lock();
try {
return _webkit_web_view_get_window_features (web_view);
@@ -1194,8 +1194,8 @@ public static final int /*long*/ webkit_web_view_get_window_features (int /*long
}
/** @method flags=dynamic */
-public static final native void _webkit_web_view_go_back (int /*long*/ web_view);
-public static final void webkit_web_view_go_back (int /*long*/ web_view) {
+public static final native void _webkit_web_view_go_back (long /*int*/ web_view);
+public static final void webkit_web_view_go_back (long /*int*/ web_view) {
lock.lock();
try {
_webkit_web_view_go_back (web_view);
@@ -1205,8 +1205,8 @@ public static final void webkit_web_view_go_back (int /*long*/ web_view) {
}
/** @method flags=dynamic */
-public static final native void _webkit_web_view_go_forward (int /*long*/ web_view);
-public static final void webkit_web_view_go_forward (int /*long*/ web_view) {
+public static final native void _webkit_web_view_go_forward (long /*int*/ web_view);
+public static final void webkit_web_view_go_forward (long /*int*/ web_view) {
lock.lock();
try {
_webkit_web_view_go_forward (web_view);
@@ -1216,8 +1216,8 @@ public static final void webkit_web_view_go_forward (int /*long*/ web_view) {
}
/** @method flags=dynamic */
-public static final native void _webkit_web_view_load_string (int /*long*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri);
-public static final void webkit_web_view_load_string (int /*long*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri) {
+public static final native void _webkit_web_view_load_string (long /*int*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri);
+public static final void webkit_web_view_load_string (long /*int*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri) {
lock.lock();
try {
_webkit_web_view_load_string (web_view, content, mime_type, encoding, base_uri);
@@ -1227,8 +1227,8 @@ public static final void webkit_web_view_load_string (int /*long*/ web_view, byt
}
/** @method flags=dynamic */
-public static final native void _webkit_web_view_load_uri (int /*long*/ web_view, byte[] uri);
-public static final void webkit_web_view_load_uri (int /*long*/ web_view, byte[] uri) {
+public static final native void _webkit_web_view_load_uri (long /*int*/ web_view, byte[] uri);
+public static final void webkit_web_view_load_uri (long /*int*/ web_view, byte[] uri) {
lock.lock();
try {
_webkit_web_view_load_uri (web_view, uri);
@@ -1238,8 +1238,8 @@ public static final void webkit_web_view_load_uri (int /*long*/ web_view, byte[]
}
/** @method flags=dynamic */
-public static final native int /*long*/ _webkit_web_view_new ();
-public static final int /*long*/ webkit_web_view_new () {
+public static final native long /*int*/ _webkit_web_view_new ();
+public static final long /*int*/ webkit_web_view_new () {
lock.lock();
try {
return _webkit_web_view_new ();
@@ -1249,8 +1249,8 @@ public static final int /*long*/ webkit_web_view_new () {
}
/** @method flags=dynamic */
-public static final native void _webkit_web_view_reload (int /*long*/ web_view);
-public static final void webkit_web_view_reload (int /*long*/ web_view) {
+public static final native void _webkit_web_view_reload (long /*int*/ web_view);
+public static final void webkit_web_view_reload (long /*int*/ web_view) {
lock.lock();
try {
_webkit_web_view_reload (web_view);
@@ -1260,8 +1260,8 @@ public static final void webkit_web_view_reload (int /*long*/ web_view) {
}
/** @method flags=dynamic */
-public static final native void _webkit_web_view_stop_loading (int /*long*/ web_view);
-public static final void webkit_web_view_stop_loading (int /*long*/ web_view) {
+public static final native void _webkit_web_view_stop_loading (long /*int*/ web_view);
+public static final void webkit_web_view_stop_loading (long /*int*/ web_view) {
lock.lock();
try {
_webkit_web_view_stop_loading (web_view);
@@ -1279,14 +1279,14 @@ public static final native int JSClassDefinition_sizeof ();
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove (int /*long*/ dest, JSClassDefinition src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, JSClassDefinition src, long /*int*/ size);
/**
* @method flags=getter
* @param cookie cast=(SoupCookie *)
*/
-public static final native int /*long*/ _SoupCookie_expires (int /*long*/ cookie);
-public static final int /*long*/ SoupCookie_expires (int /*long*/ cookie) {
+public static final native long /*int*/ _SoupCookie_expires (long /*int*/ cookie);
+public static final long /*int*/ SoupCookie_expires (long /*int*/ cookie) {
lock.lock();
try {
return _SoupCookie_expires (cookie);
@@ -1300,8 +1300,8 @@ public static final int /*long*/ SoupCookie_expires (int /*long*/ cookie) {
* @param message cast=(SoupMessage *)
* @param method cast=(const char *)
*/
-public static final native void _SoupMessage_method (int /*long*/ message, int /*long*/ method);
-public static final void SoupMessage_method (int /*long*/ message, int /*long*/ method) {
+public static final native void _SoupMessage_method (long /*int*/ message, long /*int*/ method);
+public static final void SoupMessage_method (long /*int*/ message, long /*int*/ method) {
lock.lock();
try {
_SoupMessage_method (message, method);
@@ -1314,8 +1314,8 @@ public static final void SoupMessage_method (int /*long*/ message, int /*long*/
* @method flags=getter
* @param message cast=(SoupMessage *)
*/
-public static final native int /*long*/ _SoupMessage_request_body (int /*long*/ message);
-public static final int /*long*/ SoupMessage_request_body (int /*long*/ message) {
+public static final native long /*int*/ _SoupMessage_request_body (long /*int*/ message);
+public static final long /*int*/ SoupMessage_request_body (long /*int*/ message) {
lock.lock();
try {
return _SoupMessage_request_body (message);
@@ -1328,8 +1328,8 @@ public static final int /*long*/ SoupMessage_request_body (int /*long*/ message)
* @method flags=getter
* @param message cast=(SoupMessage *)
*/
-public static final native int /*long*/ _SoupMessage_request_headers (int /*long*/ message);
-public static final int /*long*/ SoupMessage_request_headers (int /*long*/ message) {
+public static final native long /*int*/ _SoupMessage_request_headers (long /*int*/ message);
+public static final long /*int*/ SoupMessage_request_headers (long /*int*/ message) {
lock.lock();
try {
return _SoupMessage_request_headers (message);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java
index 56dba1e3ea..9013a91c7c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebDownloadDelegate.java
@@ -46,25 +46,25 @@ int AddRef () {
void createCOMInterfaces () {
iWebDownloadDelegate = new COMObject (new int[] {2, 0, 0, 2, 2, 2, 2, 2, 2, 2, 3, 3, 4, 1, 1}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return decideDestinationWithSuggestedFilename (args[0], args[1]);}
- public int /*long*/ method4 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method5 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method6 (int /*long*/[] args) {return didFailWithError (args[0], args[1]);}
- public int /*long*/ method7 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method8 (int /*long*/[] args) {return didReceiveDataOfLength (args[0], (int)/*64*/args[1]);}
- public int /*long*/ method9 (int /*long*/[] args) {return didReceiveResponse (args[0], args[1]);}
- public int /*long*/ method10 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method11 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method12 (int /*long*/[] args) {return willSendRequest (args[0], args[1], args[2], args[3]);}
- public int /*long*/ method13 (int /*long*/[] args) {return didBegin (args[0]);}
- public int /*long*/ method14 (int /*long*/[] args) {return didFinish (args[0]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return decideDestinationWithSuggestedFilename (args[0], args[1]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method5 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method6 (long /*int*/[] args) {return didFailWithError (args[0], args[1]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method8 (long /*int*/[] args) {return didReceiveDataOfLength (args[0], (int)/*64*/args[1]);}
+ public long /*int*/ method9 (long /*int*/[] args) {return didReceiveResponse (args[0], args[1]);}
+ public long /*int*/ method10 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method11 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method12 (long /*int*/[] args) {return willSendRequest (args[0], args[1], args[2], args[3]);}
+ public long /*int*/ method13 (long /*int*/[] args) {return didBegin (args[0]);}
+ public long /*int*/ method14 (long /*int*/[] args) {return didFinish (args[0]);}
};
}
-int decideDestinationWithSuggestedFilename (int /*long*/ download, int /*long*/ filename) {
+int decideDestinationWithSuggestedFilename (long /*int*/ download, long /*int*/ filename) {
String name = WebKit.extractBSTR (filename);
FileDialog dialog = new FileDialog (browser.getShell(), SWT.SAVE);
dialog.setText (SWT.getMessage ("SWT_FileDownload")); //$NON-NLS-1$
@@ -90,7 +90,7 @@ int decideDestinationWithSuggestedFilename (int /*long*/ download, int /*long*/
return COM.S_OK;
}
-int didBegin (int /*long*/ download) {
+int didBegin (long /*int*/ download) {
new IWebDownload (download).AddRef ();
status = -1;
size = 0;
@@ -99,30 +99,30 @@ int didBegin (int /*long*/ download) {
return COM.S_OK;
}
-int didFailWithError (int /*long*/ download, int /*long*/ error) {
+int didFailWithError (long /*int*/ download, long /*int*/ error) {
new IWebDownload (download).Release ();
status = DOWNLOAD_ERROR;
return COM.S_OK;
}
-int didFinish (int /*long*/ download) {
+int didFinish (long /*int*/ download) {
new IWebDownload (download).Release ();
status = DOWNLOAD_FINISHED;
return COM.S_OK;
}
-int didReceiveDataOfLength (int /*long*/ download, int length) {
+int didReceiveDataOfLength (long /*int*/ download, int length) {
size += length;
return COM.S_OK;
}
-int didReceiveResponse (int /*long*/ download, int /*long*/ response) {
+int didReceiveResponse (long /*int*/ download, long /*int*/ response) {
if (response != 0) {
IWebURLResponse urlResponse = new IWebURLResponse (response);
long[] size = new long[1];
int hr = urlResponse.expectedContentLength (size);
if (hr == COM.S_OK) totalSize = size[0];
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
hr = urlResponse.URL (result);
if (hr == COM.S_OK && result[0] != 0) {
url = WebKit.extractBSTR (result[0]);
@@ -139,7 +139,7 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return iWebDownloadDelegate.getAddress ();
}
@@ -211,23 +211,23 @@ void openDownloadWindow (final IWebDownload download, String name) {
shell.open ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG;
GUID guid = new GUID ();
COM.MoveMemory (guid, riid, GUID.sizeof);
if (COM.IsEqualGUID (guid, COM.IIDIUnknown)) {
- COM.MoveMemory (ppvObject, new int /*long*/[] {iWebDownloadDelegate.getAddress ()}, OS.PTR_SIZEOF);
+ COM.MoveMemory (ppvObject, new long /*int*/[] {iWebDownloadDelegate.getAddress ()}, OS.PTR_SIZEOF);
new IUnknown (iWebDownloadDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebDownloadDelegate)) {
- COM.MoveMemory (ppvObject, new int /*long*/[] {iWebDownloadDelegate.getAddress ()}, OS.PTR_SIZEOF);
+ COM.MoveMemory (ppvObject, new long /*int*/[] {iWebDownloadDelegate.getAddress ()}, OS.PTR_SIZEOF);
new IUnknown (iWebDownloadDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
- COM.MoveMemory (ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ COM.MoveMemory (ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
@@ -239,10 +239,10 @@ int Release () {
return refCount;
}
-int willSendRequest (int /*long*/ download, int /*long*/ request, int /*long*/ redirectResponse, int /*long*/ finalRequest) {
+int willSendRequest (long /*int*/ download, long /*int*/ request, long /*int*/ redirectResponse, long /*int*/ finalRequest) {
IWebMutableURLRequest req = new IWebMutableURLRequest (request);
req.AddRef ();
- OS.MoveMemory (finalRequest, new int /*long*/[] {request}, C.PTR_SIZEOF);
+ OS.MoveMemory (finalRequest, new long /*int*/[] {request}, C.PTR_SIZEOF);
return COM.S_OK;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java
index 6cd2e56879..ed7127f755 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java
@@ -84,38 +84,38 @@ int AddRef () {
void createCOMInterfaces () {
iWebFrameLoadDelegate = new COMObject (new int[] {2, 0, 0, 2, 2, 3, 2, 3, 3, 2, 3, 2, 5, 2, 2, 3, 4}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return didStartProvisionalLoadForFrame (args[0], args[1]);}
- public int /*long*/ method4 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method5 (int /*long*/[] args) {return didFailProvisionalLoadWithError (args[0], args[1], args[2]);}
- public int /*long*/ method6 (int /*long*/[] args) {return didCommitLoadForFrame (args[0], args[1]);}
- public int /*long*/ method7 (int /*long*/[] args) {return didReceiveTitle (args[0], args[1], args[2]);}
- public int /*long*/ method8 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method9 (int /*long*/[] args) {return didFinishLoadForFrame (args[0], args[1]);}
- public int /*long*/ method10 (int /*long*/[] args){return COM.E_NOTIMPL;}
- public int /*long*/ method11 (int /*long*/[] args){return didChangeLocationWithinPageForFrame (args[0], args[1]);}
- public int /*long*/ method12 (int /*long*/[] args){return COM.S_OK;}
- public int /*long*/ method13 (int /*long*/[] args){return COM.E_NOTIMPL;}
- public int /*long*/ method14 (int /*long*/[] args){return COM.S_OK;}
- public int /*long*/ method15 (int /*long*/[] args){return COM.S_OK;}
- public int /*long*/ method16 (int /*long*/[] args){return didClearWindowObject (args[0], args[1], args[2], args[3]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return didStartProvisionalLoadForFrame (args[0], args[1]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method5 (long /*int*/[] args) {return didFailProvisionalLoadWithError (args[0], args[1], args[2]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return didCommitLoadForFrame (args[0], args[1]);}
+ public long /*int*/ method7 (long /*int*/[] args) {return didReceiveTitle (args[0], args[1], args[2]);}
+ public long /*int*/ method8 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method9 (long /*int*/[] args) {return didFinishLoadForFrame (args[0], args[1]);}
+ public long /*int*/ method10 (long /*int*/[] args){return COM.E_NOTIMPL;}
+ public long /*int*/ method11 (long /*int*/[] args){return didChangeLocationWithinPageForFrame (args[0], args[1]);}
+ public long /*int*/ method12 (long /*int*/[] args){return COM.S_OK;}
+ public long /*int*/ method13 (long /*int*/[] args){return COM.E_NOTIMPL;}
+ public long /*int*/ method14 (long /*int*/[] args){return COM.S_OK;}
+ public long /*int*/ method15 (long /*int*/[] args){return COM.S_OK;}
+ public long /*int*/ method16 (long /*int*/[] args){return didClearWindowObject (args[0], args[1], args[2], args[3]);}
};
/* Callbacks that take double parameters require custom callbacks that instead pass pointers to the doubles. */
- int /*long*/ ppVtable = iWebFrameLoadDelegate.ppVtable;
- int /*long*/[] pVtable = new int /*long*/[1];
+ long /*int*/ ppVtable = iWebFrameLoadDelegate.ppVtable;
+ long /*int*/[] pVtable = new long /*int*/[1];
COM.MoveMemory (pVtable, ppVtable, OS.PTR_SIZEOF);
- int /*long*/[] funcs = new int /*long*/[17];
+ long /*int*/[] funcs = new long /*int*/[17];
COM.MoveMemory (funcs, pVtable[0], OS.PTR_SIZEOF * funcs.length);
funcs[12] = WebKit_win32.willPerformClientRedirectToURL_CALLBACK (funcs[12]);
COM.MoveMemory (pVtable[0], funcs, OS.PTR_SIZEOF * funcs.length);
}
-int didChangeLocationWithinPageForFrame (int /*long*/ webView, int /*long*/ frame) {
+int didChangeLocationWithinPageForFrame (long /*int*/ webView, long /*int*/ frame) {
IWebFrame iwebframe = new IWebFrame (frame);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = iwebframe.dataSource (result);
if (hr != COM.S_OK || result[0] == 0) {
return COM.S_OK;
@@ -181,18 +181,18 @@ int didChangeLocationWithinPageForFrame (int /*long*/ webView, int /*long*/ fram
return COM.S_OK;
}
-int didClearWindowObject (int /*long*/ webView, int /*long*/ context, int /*long*/ windowScriptObject, int /*long*/ frame) {
+int didClearWindowObject (long /*int*/ webView, long /*int*/ context, long /*int*/ windowScriptObject, long /*int*/ frame) {
WebKit_win32.JSGlobalContextRetain (context);
- int /*long*/ globalObject = WebKit_win32.JSContextGetGlobalObject (context);
- int /*long*/ privateData = ((WebKit)browser.webBrowser).webViewData;
- int /*long*/ externalObject = WebKit_win32.JSObjectMake (context, WebKit.ExternalClass, privateData);
+ long /*int*/ globalObject = WebKit_win32.JSContextGetGlobalObject (context);
+ long /*int*/ privateData = ((WebKit)browser.webBrowser).webViewData;
+ long /*int*/ externalObject = WebKit_win32.JSObjectMake (context, WebKit.ExternalClass, privateData);
byte[] bytes = null;
try {
bytes = (OBJECTNAME_EXTERNAL + '\0').getBytes (WebKit.CHARSET_UTF8);
} catch (UnsupportedEncodingException e) {
bytes = (OBJECTNAME_EXTERNAL + '\0').getBytes ();
}
- int /*long*/ name = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ name = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
WebKit_win32.JSObjectSetProperty (context, globalObject, name, externalObject, 0, null);
WebKit_win32.JSStringRelease (name);
@@ -203,7 +203,7 @@ int didClearWindowObject (int /*long*/ webView, int /*long*/ context, int /*long
}
IWebView iwebView = new IWebView (webView);
- int /*long*/[] mainFrame = new int /*long*/[1];
+ long /*int*/[] mainFrame = new long /*int*/[1];
iwebView.mainFrame (mainFrame);
boolean top = mainFrame[0] == frame;
new IWebFrame (mainFrame[0]).Release ();
@@ -211,9 +211,9 @@ int didClearWindowObject (int /*long*/ webView, int /*long*/ context, int /*long
return COM.S_OK;
}
-int didCommitLoadForFrame (int /*long*/ webview, int /*long*/ frame) {
+int didCommitLoadForFrame (long /*int*/ webview, long /*int*/ frame) {
IWebFrame iWebFrame = new IWebFrame (frame);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = iWebFrame.dataSource (result);
if (hr != COM.S_OK || result[0] == 0) {
return COM.S_OK;
@@ -309,14 +309,14 @@ int didCommitLoadForFrame (int /*long*/ webview, int /*long*/ frame) {
return COM.S_OK;
}
-int didFailProvisionalLoadWithError (int /*long*/ webView, int /*long*/ error, int /*long*/ frame) {
+int didFailProvisionalLoadWithError (long /*int*/ webView, long /*int*/ error, long /*int*/ frame) {
IWebError iweberror = new IWebError (error);
int[] errorCode = new int[1];
int hr = iweberror.code (errorCode);
if (WebKit_win32.WebURLErrorBadURL < errorCode[0]) return COM.S_OK;
String failingURLString = null;
- int /*long*/[] failingURL = new int /*long*/[1];
+ long /*int*/[] failingURL = new long /*int*/[1];
hr = iweberror.failingURL (failingURL);
if (hr == COM.S_OK && failingURL[0] != 0) {
failingURLString = WebKit.extractBSTR (failingURL[0]);
@@ -324,7 +324,7 @@ int didFailProvisionalLoadWithError (int /*long*/ webView, int /*long*/ error, i
}
if (failingURLString != null && WebKit_win32.WebURLErrorServerCertificateNotYetValid <= errorCode[0] && errorCode[0] <= WebKit_win32.WebURLErrorSecureConnectionFailed) {
/* handle invalid certificate error */
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
hr = iweberror.localizedDescription (result);
if (hr != COM.S_OK || result[0] == 0) {
return COM.S_OK;
@@ -340,7 +340,7 @@ int didFailProvisionalLoadWithError (int /*long*/ webView, int /*long*/ error, i
IWebErrorPrivate webErrorPrivate = new IWebErrorPrivate (result[0]);
result[0] = 0;
- int /*long*/[] certificate = new int /*long*/[1];
+ long /*int*/[] certificate = new long /*int*/[1];
hr = webErrorPrivate.sslPeerCertificate (certificate);
webErrorPrivate.Release ();
if (hr != COM.S_OK || certificate[0] == 0) {
@@ -364,7 +364,7 @@ int didFailProvisionalLoadWithError (int /*long*/ webView, int /*long*/ error, i
}
/* handle other types of errors */
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
hr = iweberror.localizedDescription (result);
if (hr != COM.S_OK || result[0] == 0) {
return COM.S_OK;
@@ -381,9 +381,9 @@ int didFailProvisionalLoadWithError (int /*long*/ webView, int /*long*/ error, i
return COM.S_OK;
}
-int didFinishLoadForFrame (int /*long*/ webview, int /*long*/ frame) {
+int didFinishLoadForFrame (long /*int*/ webview, long /*int*/ frame) {
IWebView iWebView = new IWebView (webview);
- int /*long*/[] iWebFrame = new int /*long*/[1];
+ long /*int*/[] iWebFrame = new long /*int*/[1];
int hr = iWebView.mainFrame (iWebFrame);
if (hr != COM.S_OK || iWebFrame[0] == 0) {
return COM.S_OK;
@@ -399,8 +399,8 @@ int didFinishLoadForFrame (int /*long*/ webview, int /*long*/ frame) {
if (html != null) {
if (getUrl ().startsWith (WebKit.ABOUT_BLANK)) {
((WebKit)browser.webBrowser).loadingText = true;
- int /*long*/ string = WebKit.createBSTR (html);
- int /*long*/ URLString;
+ long /*int*/ string = WebKit.createBSTR (html);
+ long /*int*/ URLString;
if (((WebKit)browser.webBrowser).untrustedText) {
URLString = WebKit.createBSTR (WebKit.ABOUT_BLANK);
} else {
@@ -428,7 +428,7 @@ int didFinishLoadForFrame (int /*long*/ webview, int /*long*/ frame) {
*/
Display display = browser.getDisplay ();
IWebFrame mainFrame = new IWebFrame (frame);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
hr = mainFrame.dataSource (result);
if (hr != COM.S_OK || result[0] == 0) {
return COM.S_OK;
@@ -472,8 +472,8 @@ int didFinishLoadForFrame (int /*long*/ webview, int /*long*/ frame) {
return COM.S_OK;
}
-int didReceiveTitle (int /*long*/ webView, int /*long*/ title, int /*long*/ frame) {
- int /*long*/[] mainFrame = new int /*long*/[1];
+int didReceiveTitle (long /*int*/ webView, long /*int*/ title, long /*int*/ frame) {
+ long /*int*/[] mainFrame = new long /*int*/[1];
IWebView iWebView = new IWebView (webView);
int hr = iWebView.mainFrame (mainFrame);
if (hr != COM.S_OK || frame == 0) {
@@ -494,7 +494,7 @@ int didReceiveTitle (int /*long*/ webView, int /*long*/ title, int /*long*/ fram
return COM.S_OK;
}
-int didStartProvisionalLoadForFrame (int /*long*/ webView, int /*long*/ frame) {
+int didStartProvisionalLoadForFrame (long /*int*/ webView, long /*int*/ frame) {
return COM.S_OK;
}
@@ -505,7 +505,7 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return iWebFrameLoadDelegate.getAddress ();
}
@@ -515,23 +515,23 @@ String getUrl () {
return url;
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG;
GUID guid = new GUID ();
COM.MoveMemory (guid, riid, GUID.sizeof);
if (COM.IsEqualGUID (guid, COM.IIDIUnknown)) {
- COM.MoveMemory (ppvObject, new int /*long*/[] {iWebFrameLoadDelegate.getAddress ()}, OS.PTR_SIZEOF);
+ COM.MoveMemory (ppvObject, new long /*int*/[] {iWebFrameLoadDelegate.getAddress ()}, OS.PTR_SIZEOF);
new IUnknown (iWebFrameLoadDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebFrameLoadDelegate)) {
- COM.MoveMemory (ppvObject, new int /*long*/[] {iWebFrameLoadDelegate.getAddress ()}, OS.PTR_SIZEOF);
+ COM.MoveMemory (ppvObject, new long /*int*/[] {iWebFrameLoadDelegate.getAddress ()}, OS.PTR_SIZEOF);
new IUnknown (iWebFrameLoadDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
- COM.MoveMemory (ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ COM.MoveMemory (ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
@@ -543,7 +543,7 @@ int Release () {
return refCount;
}
-boolean showCertificateDialog (int /*long*/ webView, final String failingUrlString, final String description, final int /*long*/ certificate) {
+boolean showCertificateDialog (long /*int*/ webView, final String failingUrlString, final String description, final long /*int*/ certificate) {
Shell parent = browser.getShell ();
final Shell shell = new Shell (parent, SWT.APPLICATION_MODAL | SWT.DIALOG_TRIM);
shell.setText (Compatibility.getMessage ("SWT_InvalidCert_Title")); //$NON-NLS-1$
@@ -621,7 +621,7 @@ boolean showCertificateDialog (int /*long*/ webView, final String failingUrlStri
return result[0];
}
-void showCertificate (Shell parent, int /*long*/ certificate) {
+void showCertificate (Shell parent, long /*int*/ certificate) {
CERT_CONTEXT context = new CERT_CONTEXT ();
OS.MoveMemory (context, certificate, CERT_CONTEXT.sizeof);
CERT_INFO info = new CERT_INFO ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java
index 2d78f3ebb8..e15c49ca1f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebKit.java
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.*;
class WebKit extends WebBrowser {
IWebView webView;
- int /*long*/ webViewWindowHandle, webViewData;
+ long /*int*/ webViewWindowHandle, webViewData;
int refCount = 0;
int lastKeyCode, lastCharCode;
@@ -44,7 +44,7 @@ class WebKit extends WebBrowser {
BrowserFunction eventFunction;
static int prefsIdentifier;
- static int /*long*/ ExternalClass;
+ static long /*int*/ ExternalClass;
static boolean LibraryLoaded = false;
static String LibraryLoadError;
static Callback JSObjectHasPropertyProc;
@@ -145,24 +145,24 @@ static {
NativeClearSessions = new Runnable () {
public void run () {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebCookieManager, 0, WebKit_win32.IID_IWebCookieManager, result);
if (hr != COM.S_OK || result[0] == 0) {
return;
}
IWebCookieManager cookieManager = new IWebCookieManager (result[0]);
- int /*long*/[] storage = new int /*long*/[1];
+ long /*int*/[] storage = new long /*int*/[1];
hr = cookieManager.cookieStorage (storage);
cookieManager.Release ();
if (hr != COM.S_OK || storage[0] == 0) {
return;
}
- int /*long*/ cookies = WebKit_win32.CFHTTPCookieStorageCopyCookies (storage[0]);
+ long /*int*/ cookies = WebKit_win32.CFHTTPCookieStorageCopyCookies (storage[0]);
if (cookies != 0) {
int count = WebKit_win32.CFArrayGetCount (cookies);
for (int i = 0; i < count; i++) {
- int /*long*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookies, i);
- int /*long*/ flags = WebKit_win32.CFHTTPCookieGetFlags (cookie);
+ long /*int*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookies, i);
+ long /*int*/ flags = WebKit_win32.CFHTTPCookieGetFlags (cookie);
if ((flags & WebKit_win32.CFHTTPCookieSessionOnlyFlag) != 0) {
WebKit_win32.CFHTTPCookieStorageDeleteCookie (storage[0], cookie);
}
@@ -175,35 +175,35 @@ static {
NativeGetCookie = new Runnable () {
public void run () {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebCookieManager, 0, WebKit_win32.IID_IWebCookieManager, result);
if (hr != COM.S_OK || result[0] == 0) {
return;
}
IWebCookieManager cookieManager = new IWebCookieManager (result[0]);
- int /*long*/[] storage = new int /*long*/[1];
+ long /*int*/[] storage = new long /*int*/[1];
hr = cookieManager.cookieStorage (storage);
cookieManager.Release ();
if (hr != COM.S_OK || storage[0] == 0) {
return;
}
char[] chars = CookieUrl.toCharArray ();
- int /*long*/ string = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length);
+ long /*int*/ string = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length);
if (string != 0) {
- int /*long*/ cfUrl = WebKit_win32.CFURLCreateWithString (0, string, 0);
+ long /*int*/ cfUrl = WebKit_win32.CFURLCreateWithString (0, string, 0);
if (cfUrl != 0) {
boolean secure = CookieUrl.startsWith (PROTOCOL_HTTPS);
- int /*long*/ cookiesArray = WebKit_win32.CFHTTPCookieStorageCopyCookiesForURL (storage[0], cfUrl, secure);
+ long /*int*/ cookiesArray = WebKit_win32.CFHTTPCookieStorageCopyCookiesForURL (storage[0], cfUrl, secure);
if (cookiesArray != 0) {
int count = WebKit_win32.CFArrayGetCount (cookiesArray);
for (int i = 0; i < count; i++) {
- int /*long*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookiesArray, i);
+ long /*int*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookiesArray, i);
if (cookie != 0) {
- int /*long*/ cookieName = WebKit_win32.CFHTTPCookieGetName (cookie);
+ long /*int*/ cookieName = WebKit_win32.CFHTTPCookieGetName (cookie);
if (cookieName != 0) {
String name = stringFromCFString (cookieName);
if (CookieName.equals (name)) {
- int /*long*/ value = WebKit_win32.CFHTTPCookieGetValue (cookie);
+ long /*int*/ value = WebKit_win32.CFHTTPCookieGetValue (cookie);
if (value != 0) CookieValue = stringFromCFString (value);
break;
}
@@ -222,13 +222,13 @@ static {
NativeSetCookie = new Runnable () {
public void run () {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebCookieManager, 0, WebKit_win32.IID_IWebCookieManager, result);
if (hr != COM.S_OK || result[0] == 0) {
return;
}
IWebCookieManager cookieManager = new IWebCookieManager (result[0]);
- int /*long*/[] storage = new int /*long*/[1];
+ long /*int*/[] storage = new long /*int*/[1];
hr = cookieManager.cookieStorage (storage);
cookieManager.Release ();
if (hr != COM.S_OK || storage[0] == 0) {
@@ -236,21 +236,21 @@ static {
}
char[] chars = CookieUrl.toCharArray ();
- int /*long*/ string = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length);
+ long /*int*/ string = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length);
if (string != 0) {
- int /*long*/ cfUrl = WebKit_win32.CFURLCreateWithString (0, string, 0);
+ long /*int*/ cfUrl = WebKit_win32.CFURLCreateWithString (0, string, 0);
if (cfUrl != 0) {
chars = CookieValue.toCharArray ();
- int /*long*/ value = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length);
+ long /*int*/ value = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length);
if (value != 0) {
chars = HEADER_SETCOOKIE.toCharArray ();
- int /*long*/ key = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length);
+ long /*int*/ key = WebKit_win32.CFStringCreateWithCharacters (0, chars, chars.length);
if (key != 0) {
- int /*long*/ headers = WebKit_win32.CFDictionaryCreate (0, new int /*long*/[] {key}, new int /*long*/[] {value}, 1, WebKit_win32.kCFCopyStringDictionaryKeyCallBacks (), WebKit_win32.kCFTypeDictionaryValueCallBacks ());
+ long /*int*/ headers = WebKit_win32.CFDictionaryCreate (0, new long /*int*/[] {key}, new long /*int*/[] {value}, 1, WebKit_win32.kCFCopyStringDictionaryKeyCallBacks (), WebKit_win32.kCFTypeDictionaryValueCallBacks ());
if (headers != 0) {
- int /*long*/ cookies = WebKit_win32.CFHTTPCookieCreateWithResponseHeaderFields (0, headers, cfUrl);
+ long /*int*/ cookies = WebKit_win32.CFHTTPCookieCreateWithResponseHeaderFields (0, headers, cfUrl);
if (cookies != 0) {
- int /*long*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookies, 0);
+ long /*int*/ cookie = WebKit_win32.CFArrayGetValueAtIndex (cookies, 0);
if (cookie != 0) {
WebKit_win32.CFHTTPCookieStorageSetCookie (storage[0], cookie);
CookieResult = true;
@@ -278,7 +278,7 @@ static {
}
}
-static int /*long*/ createBSTR (String string) {
+static long /*int*/ createBSTR (String string) {
char[] data = (string + '\0').toCharArray ();
return COM.SysAllocString (data);
}
@@ -287,7 +287,7 @@ static String error (int code) {
throw new SWTError ("WebKit error " + code); //$NON-NLS-1$
}
-static String extractBSTR (int /*long*/ bstrString) {
+static String extractBSTR (long /*int*/ bstrString) {
int size = COM.SysStringByteLen (bstrString);
if (size == 0) return EMPTY_STRING;
char[] buffer = new char[(size + 1) / 2]; // add one to avoid rounding errors
@@ -295,10 +295,10 @@ static String extractBSTR (int /*long*/ bstrString) {
return new String (buffer);
}
-static Browser findBrowser (int /*long*/ webView) {
+static Browser findBrowser (long /*int*/ webView) {
if (webView == 0) return null;
IWebView iwebView = new IWebView (webView);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = iwebView.hostWindow (result);
if (hr == COM.S_OK && result[0] != 0) {
Widget widget = Display.getCurrent ().findWidget (result[0]);
@@ -307,13 +307,13 @@ static Browser findBrowser (int /*long*/ webView) {
return null;
}
-static int /*long*/ JSObjectCallAsFunctionProc (int /*long*/ ctx, int /*long*/ function, int /*long*/ thisObject, int /*long*/ argumentCount, int /*long*/ arguments, int /*long*/ exception) {
+static long /*int*/ JSObjectCallAsFunctionProc (long /*int*/ ctx, long /*int*/ function, long /*int*/ thisObject, long /*int*/ argumentCount, long /*int*/ arguments, long /*int*/ exception) {
WebKit_win32.JSGlobalContextRetain (ctx);
if (WebKit_win32.JSValueIsObjectOfClass (ctx, thisObject, ExternalClass) == 0) {
return WebKit_win32.JSValueMakeUndefined (ctx);
}
- int /*long*/ ptr = WebKit_win32.JSObjectGetPrivate (thisObject);
- int /*long*/[] handle = new int /*long*/[1];
+ long /*int*/ ptr = WebKit_win32.JSObjectGetPrivate (thisObject);
+ long /*int*/[] handle = new long /*int*/[1];
C.memmove (handle, ptr, C.PTR_SIZEOF);
Browser browser = findBrowser (handle[0]);
if (browser == null) return WebKit_win32.JSValueMakeUndefined (ctx);
@@ -321,21 +321,21 @@ static int /*long*/ JSObjectCallAsFunctionProc (int /*long*/ ctx, int /*long*/ f
return webkit.callJava (ctx, function, thisObject, argumentCount, arguments, exception);
}
-static int /*long*/ JSObjectGetPropertyProc (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/ exception) {
+static long /*int*/ JSObjectGetPropertyProc (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ exception) {
byte[] bytes = null;
try {
bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes (CHARSET_UTF8);
} catch (UnsupportedEncodingException e) {
bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes ();
}
- int /*long*/ name = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
- int /*long*/ addr = WebKit_win32.JSObjectCallAsFunctionProc_CALLBACK (WebKit.JSObjectCallAsFunctionProc.getAddress ());
- int /*long*/ function = WebKit_win32.JSObjectMakeFunctionWithCallback (ctx, name, addr);
+ long /*int*/ name = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ addr = WebKit_win32.JSObjectCallAsFunctionProc_CALLBACK (WebKit.JSObjectCallAsFunctionProc.getAddress ());
+ long /*int*/ function = WebKit_win32.JSObjectMakeFunctionWithCallback (ctx, name, addr);
WebKit_win32.JSStringRelease (name);
return function;
}
-static int /*long*/ JSObjectHasPropertyProc (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName) {
+static long /*int*/ JSObjectHasPropertyProc (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName) {
byte[] bytes = null;
try {
bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes (CHARSET_UTF8);
@@ -346,7 +346,7 @@ static int /*long*/ JSObjectHasPropertyProc (int /*long*/ ctx, int /*long*/ obje
}
static String readInstallDir (String keyString) {
- int /*long*/[] phkResult = new int /*long*/[1];
+ long /*int*/[] phkResult = new long /*int*/[1];
TCHAR key = new TCHAR (0, keyString, true);
if (OS.RegOpenKeyEx (OS.HKEY_LOCAL_MACHINE, key, 0, OS.KEY_READ, phkResult) == 0) {
int[] lpcbData = new int[1];
@@ -365,10 +365,10 @@ static String readInstallDir (String keyString) {
return null;
}
-static String stringFromCFString (int /*long*/ cfString) {
+static String stringFromCFString (long /*int*/ cfString) {
if (cfString == 0) return null;
int length = WebKit_win32.CFStringGetLength (cfString);
- int /*long*/ ptr = WebKit_win32.CFStringGetCharactersPtr (cfString);
+ long /*int*/ ptr = WebKit_win32.CFStringGetCharactersPtr (cfString);
char[] chars = new char[length];
if (ptr != 0) {
OS.MoveMemory (chars, ptr, length);
@@ -380,7 +380,7 @@ static String stringFromCFString (int /*long*/ cfString) {
return new String (chars);
}
-static String stringFromJSString (int /*long*/ jsString) {
+static String stringFromJSString (long /*int*/ jsString) {
if (jsString == 0) return null;
int length = WebKit_win32.JSStringGetLength (jsString);
byte[] bytes = new byte[length + 1];
@@ -394,10 +394,10 @@ public boolean back () {
return result[0] != 0;
}
-int /*long*/ callJava (int /*long*/ ctx, int /*long*/ func, int /*long*/ thisObject, int /*long*/ argumentCount, int /*long*/ arguments, int /*long*/ exception) {
+long /*int*/ callJava (long /*int*/ ctx, long /*int*/ func, long /*int*/ thisObject, long /*int*/ argumentCount, long /*int*/ arguments, long /*int*/ exception) {
Object returnValue = null;
if (argumentCount == 3) {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
C.memmove (result, arguments, C.PTR_SIZEOF);
int type = WebKit_win32.JSValueGetType (ctx, result[0]);
if (type == WebKit_win32.kJSTypeNumber) {
@@ -443,7 +443,7 @@ public boolean close () {
return shouldClose ();
}
-Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
+Object convertToJava (long /*int*/ ctx, long /*int*/ value) {
int type = WebKit_win32.JSValueGetType (ctx, value);
switch (type) {
case WebKit_win32.kJSTypeBoolean: {
@@ -455,9 +455,9 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
return new Double (result);
}
case WebKit_win32.kJSTypeString: {
- int /*long*/ string = WebKit_win32.JSValueToStringCopy (ctx, value, null);
+ long /*int*/ string = WebKit_win32.JSValueToStringCopy (ctx, value, null);
if (string == 0) return ""; //$NON-NLS-1$
- int /*long*/ length = WebKit_win32.JSStringGetMaximumUTF8CStringSize (string);
+ long /*int*/ length = WebKit_win32.JSStringGetMaximumUTF8CStringSize (string);
byte[] bytes = new byte[(int)/*64*/length];
length = WebKit_win32.JSStringGetUTF8CString (string, bytes, length);
WebKit_win32.JSStringRelease (string);
@@ -478,15 +478,15 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
} catch (UnsupportedEncodingException e) {
bytes = (PROPERTY_LENGTH + '\0').getBytes ();
}
- int /*long*/ propertyName = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
- int /*long*/ valuePtr = WebKit_win32.JSObjectGetProperty (ctx, value, propertyName, null);
+ long /*int*/ propertyName = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ valuePtr = WebKit_win32.JSObjectGetProperty (ctx, value, propertyName, null);
WebKit_win32.JSStringRelease (propertyName);
type = WebKit_win32.JSValueGetType (ctx, valuePtr);
if (type == WebKit_win32.kJSTypeNumber) {
int length = (int)WebKit_win32.JSValueToNumber (ctx, valuePtr, null);
Object[] result = new Object[length];
for (int i = 0; i < length; i++) {
- int /*long*/ current = WebKit_win32.JSObjectGetPropertyAtIndex (ctx, value, i, null);
+ long /*int*/ current = WebKit_win32.JSObjectGetPropertyAtIndex (ctx, value, i, null);
if (current != 0) {
result[i] = convertToJava (ctx, current);
}
@@ -499,7 +499,7 @@ Object convertToJava (int /*long*/ ctx, int /*long*/ value) {
return null;
}
-int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
+long /*int*/ convertToJS (long /*int*/ ctx, Object value) {
if (value == null) {
return WebKit_win32.JSValueMakeNull (ctx);
}
@@ -510,8 +510,8 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
} catch (UnsupportedEncodingException e) {
bytes = ((String)value + '\0').getBytes ();
}
- int /*long*/ stringRef = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
- int /*long*/ result = WebKit_win32.JSValueMakeString (ctx, stringRef);
+ long /*int*/ stringRef = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ result = WebKit_win32.JSValueMakeString (ctx, stringRef);
WebKit_win32.JSStringRelease (stringRef);
return result;
}
@@ -524,10 +524,10 @@ int /*long*/ convertToJS (int /*long*/ ctx, Object value) {
if (value instanceof Object[]) {
Object[] arrayValue = (Object[]) value;
int length = arrayValue.length;
- int /*long*/[] arguments = new int /*long*/[length];
+ long /*int*/[] arguments = new long /*int*/[length];
for (int i = 0; i < length; i++) {
Object javaObject = arrayValue[i];
- int /*long*/ jsObject = convertToJS (ctx, javaObject);
+ long /*int*/ jsObject = convertToJS (ctx, javaObject);
arguments[i] = jsObject;
}
return WebKit_win32.JSObjectMakeArray (ctx, length, arguments, null);
@@ -549,18 +549,18 @@ public void create (Composite parent, int style) {
OS.memmove (jsClassDefinition.className, bytes, bytes.length);
/* custom callbacks for hasProperty, getProperty and callAsFunction */
- int /*long*/ addr = WebKit_win32.JSObjectHasPropertyProc_CALLBACK (JSObjectHasPropertyProc.getAddress ());
+ long /*int*/ addr = WebKit_win32.JSObjectHasPropertyProc_CALLBACK (JSObjectHasPropertyProc.getAddress ());
jsClassDefinition.hasProperty = addr;
addr = WebKit_win32.JSObjectGetPropertyProc_CALLBACK (JSObjectGetPropertyProc.getAddress ());
jsClassDefinition.getProperty = addr;
- int /*long*/ classDefinitionPtr = C.malloc (JSClassDefinition.sizeof);
+ long /*int*/ classDefinitionPtr = C.malloc (JSClassDefinition.sizeof);
WebKit_win32.memmove (classDefinitionPtr, jsClassDefinition, JSClassDefinition.sizeof);
ExternalClass = WebKit_win32.JSClassCreate (classDefinitionPtr);
WebKit_win32.JSClassRetain (ExternalClass);
}
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebView, 0, WebKit_win32.IID_IWebView, result);
if (hr != COM.S_OK || result[0] == 0) {
browser.dispose ();
@@ -568,7 +568,7 @@ public void create (Composite parent, int style) {
}
webView = new IWebView (result[0]);
webViewData = C.malloc (C.PTR_SIZEOF);
- C.memmove (webViewData, new int /*long*/[] {webView.getAddress ()}, C.PTR_SIZEOF);
+ C.memmove (webViewData, new long /*int*/[] {webView.getAddress ()}, C.PTR_SIZEOF);
hr = webView.setHostWindow (browser.handle);
if (hr != COM.S_OK) {
browser.dispose ();
@@ -681,13 +681,13 @@ public void create (Composite parent, int style) {
}
public boolean execute (String script) {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = webView.mainFrame (result);
if (hr != COM.S_OK || result[0] == 0) {
return false;
}
IWebFrame frame = new IWebFrame (result[0]);
- int /*long*/ context = frame.globalContext ();
+ long /*int*/ context = frame.globalContext ();
frame.Release ();
if (context == 0) {
return false;
@@ -698,19 +698,19 @@ public boolean execute (String script) {
} catch (UnsupportedEncodingException e) {
bytes = (script + '\0').getBytes ();
}
- int /*long*/ scriptString = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ scriptString = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
if (scriptString == 0) return false;
try {
bytes = (getUrl () + '\0').getBytes ("UTF-8"); //$NON-NLS-1$
} catch (UnsupportedEncodingException e) {
bytes = (getUrl () + '\0').getBytes ();
}
- int /*long*/ urlString = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
+ long /*int*/ urlString = WebKit_win32.JSStringCreateWithUTF8CString (bytes);
if (urlString == 0) {
WebKit_win32.JSStringRelease (scriptString);
return false;
}
- int /*long*/ evalResult = WebKit_win32.JSEvaluateScript (context, scriptString, 0, urlString, 0, null);
+ long /*int*/ evalResult = WebKit_win32.JSEvaluateScript (context, scriptString, 0, urlString, 0, null);
WebKit_win32.JSStringRelease (urlString);
WebKit_win32.JSStringRelease (scriptString);
return evalResult != 0;
@@ -727,7 +727,7 @@ public String getBrowserType () {
}
public String getText () {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = webView.mainFrame (result);
if (hr != COM.S_OK || result[0] == 0) {
return EMPTY_STRING;
@@ -1009,7 +1009,7 @@ boolean handleEvent (Object[] arguments) {
}
public boolean isBackEnabled () {
- int /*long*/[] address = new int /*long*/[1];
+ long /*int*/[] address = new long /*int*/[1];
int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, address);
if (hr != COM.S_OK || address[0] == 0) {
return false;
@@ -1022,12 +1022,12 @@ public boolean isBackEnabled () {
}
public boolean isFocusControl () {
- int /*long*/ hwndFocus = OS.GetFocus ();
+ long /*int*/ hwndFocus = OS.GetFocus ();
return hwndFocus != 0 && hwndFocus == webViewWindowHandle;
}
public boolean isForwardEnabled () {
- int /*long*/[] address = new int /*long*/[1];
+ long /*int*/[] address = new long /*int*/[1];
int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, address);
if (hr != COM.S_OK || address[0] == 0) {
return false;
@@ -1079,7 +1079,7 @@ void onDispose () {
public void refresh () {
webFrameLoadDelegate.html = null;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, result);
if (hr != COM.S_OK || result[0] == 0) {
return;
@@ -1138,7 +1138,7 @@ public boolean setText (String html, boolean trusted) {
untrustedText = !trusted;
if (blankLoading) return true;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = webView.mainFrame (result);
if (hr != COM.S_OK || result[0] == 0) {
return false;
@@ -1153,7 +1153,7 @@ public boolean setText (String html, boolean trusted) {
}
IWebMutableURLRequest request = new IWebMutableURLRequest (result[0]);
- int /*long*/ urlString = createBSTR (ABOUT_BLANK);
+ long /*int*/ urlString = createBSTR (ABOUT_BLANK);
hr = request.setURL (urlString);
COM.SysFreeString (urlString);
@@ -1191,7 +1191,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
}
webFrameLoadDelegate.html = null;
lastNavigateURL = url;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = webView.mainFrame (result);
if (hr != COM.S_OK || result[0] == 0) {
return false;
@@ -1208,7 +1208,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
if (postData != null) { //TODO: POST
// webResourceLoadDelegate.postData = postData;
-// int /*long*/ postString = createBSTR (POST);
+// long /*int*/ postString = createBSTR (POST);
// hr = request.setHTTPMethod (postString);
// COM.SysFreeString (postString);
//
@@ -1218,12 +1218,12 @@ public boolean setUrl (String url, String postData, String[] headers) {
// IWebMutableURLRequestPrivate requestPrivate = new IWebMutableURLRequestPrivate(result[0]);
// int cfRequest = requestPrivate.cfRequest();
// byte[] bytes = postData.getBytes();
-// int /*long*/ data = WebKit_win32.CFDataCreate(0, bytes, bytes.length);
+// long /*int*/ data = WebKit_win32.CFDataCreate(0, bytes, bytes.length);
// if (data != 0)WebKit_win32.CFURLRequestSetHTTPRequestBody(cfRequest, data);
//
-// int /*long*/ dataGet = WebKit_win32.CFURLRequestCopyHTTPRequestBody(cfRequest);
+// long /*int*/ dataGet = WebKit_win32.CFURLRequestCopyHTTPRequestBody(cfRequest);
// int length = WebKit_win32.CFDataGetLength(dataGet);
-// int /*long*/ bytePtr = WebKit_win32.CFDataGetBytePtr(dataGet);
+// long /*int*/ bytePtr = WebKit_win32.CFDataGetBytePtr(dataGet);
// }
}
hr = COM.S_OK; //TODO: once post code is completed, remove this line if not required
@@ -1236,7 +1236,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
String key = current.substring (0, index).trim ();
String value = current.substring (index + 1).trim ();
if (key.length () > 0 && value.length () > 0) {
- int /*long*/ valueString = createBSTR (value);
+ long /*int*/ valueString = createBSTR (value);
if (key.equalsIgnoreCase (USER_AGENT)) {
/*
* Feature of WebKit. The user-agent header value cannot be overridden
@@ -1245,7 +1245,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
*/
hr = webView.setCustomUserAgent (valueString);
} else {
- int /*long*/ keyString = createBSTR (key);
+ long /*int*/ keyString = createBSTR (key);
hr = request.setValue (valueString, keyString);
COM.SysFreeString (keyString);
}
@@ -1256,7 +1256,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
}
}
if (hr == COM.S_OK) {
- int /*long*/ urlString = createBSTR (url);
+ long /*int*/ urlString = createBSTR (url);
hr = request.setURL (urlString);
COM.SysFreeString (urlString);
if (hr == COM.S_OK) {
@@ -1272,7 +1272,7 @@ public boolean setUrl (String url, String postData, String[] headers) {
boolean shouldClose () {
if (!jsEnabled) return true;
- int /*long*/[] address = new int /*long*/[1];
+ long /*int*/[] address = new long /*int*/[1];
int hr = webView.QueryInterface (WebKit_win32.IID_IWebViewPrivate, address);
if (hr != COM.S_OK || address[0] == 0) {
return false;
@@ -1287,7 +1287,7 @@ boolean shouldClose () {
public void stop () {
webFrameLoadDelegate.html = null;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = webView.QueryInterface (WebKit_win32.IID_IWebIBActions, result);
if (hr != COM.S_OK || result[0] == 0) {
return;
@@ -1302,7 +1302,7 @@ void initializeWebViewPreferences () {
* Try to create separate preferences for each webview using different identifier for each webview.
* Otherwise all the webviews use the shared preferences.
*/
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebPreferences, 0, WebKit_win32.IID_IWebPreferences, result);
if (hr == COM.S_OK && result[0] != 0) {
IWebPreferences preferences = new IWebPreferences (result[0]);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java
index 08a1ec413e..16f478b232 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebPolicyDelegate.java
@@ -36,17 +36,17 @@ int AddRef () {
void createCOMInterfaces () {
iWebPolicyDelegate = new COMObject (new int[] {2, 0, 0, 5, 5, 5, 3}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return decidePolicyForNavigationAction (args[0], args[1], args[2], args[3], args[4]);}
- public int /*long*/ method4 (int /*long*/[] args) {return decidePolicyForNewWindowAction (args[0], args[1], args[2], args[3], args[4]);}
- public int /*long*/ method5 (int /*long*/[] args) {return decidePolicyForMIMEType (args[0], args[1], args[2], args[3], args[4]);}
- public int /*long*/ method6 (int /*long*/[] args) {return unableToImplementPolicyWithError (args[0], args[1], args[2]);}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return decidePolicyForNavigationAction (args[0], args[1], args[2], args[3], args[4]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return decidePolicyForNewWindowAction (args[0], args[1], args[2], args[3], args[4]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return decidePolicyForMIMEType (args[0], args[1], args[2], args[3], args[4]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return unableToImplementPolicyWithError (args[0], args[1], args[2]);}
};
}
-int decidePolicyForMIMEType (int /*long*/ webView, int /*long*/ type, int /*long*/ request, int /*long*/ frame, int /*long*/ listener) {
+int decidePolicyForMIMEType (long /*int*/ webView, long /*int*/ type, long /*int*/ request, long /*int*/ frame, long /*int*/ listener) {
IWebView iwebView = new IWebView (webView);
int[] canShow = new int[1];
iwebView.canShowMIMEType (type, canShow);
@@ -59,9 +59,9 @@ int decidePolicyForMIMEType (int /*long*/ webView, int /*long*/ type, int /*long
return COM.S_OK;
}
-int decidePolicyForNavigationAction (int /*long*/ webView, int /*long*/ actionInformation, int /*long*/ request, int /*long*/ frame, int /*long*/ listener) {
+int decidePolicyForNavigationAction (long /*int*/ webView, long /*int*/ actionInformation, long /*int*/ request, long /*int*/ frame, long /*int*/ listener) {
IWebURLRequest iwebUrlRequest = new IWebURLRequest (request);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = iwebUrlRequest.URL (result);
if (hr != COM.S_OK || result[0] == 0) {
return COM.S_OK;
@@ -132,7 +132,7 @@ int decidePolicyForNavigationAction (int /*long*/ webView, int /*long*/ actionIn
return COM.S_OK;
}
-int decidePolicyForNewWindowAction (int /*long*/ webView, int /*long*/ actionInformation, int /*long*/ request, int /*long*/ frameName, int /*long*/ listener) {
+int decidePolicyForNewWindowAction (long /*int*/ webView, long /*int*/ actionInformation, long /*int*/ request, long /*int*/ frameName, long /*int*/ listener) {
IWebPolicyDecisionListener pdListener = new IWebPolicyDecisionListener (listener);
pdListener.use();
return COM.S_OK;
@@ -145,27 +145,27 @@ protected void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return iWebPolicyDelegate.getAddress ();
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG;
GUID guid = new GUID ();
COM.MoveMemory (guid, riid, GUID.sizeof);
if (COM.IsEqualGUID (guid, COM.IIDIUnknown)) {
- COM.MoveMemory (ppvObject, new int /*long*/[] {iWebPolicyDelegate.getAddress ()}, OS.PTR_SIZEOF);
+ COM.MoveMemory (ppvObject, new long /*int*/[] {iWebPolicyDelegate.getAddress ()}, OS.PTR_SIZEOF);
new IUnknown (iWebPolicyDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebPolicyDelegate)) {
- COM.MoveMemory (ppvObject, new int /*long*/[] {iWebPolicyDelegate.getAddress ()}, OS.PTR_SIZEOF);
+ COM.MoveMemory (ppvObject, new long /*int*/[] {iWebPolicyDelegate.getAddress ()}, OS.PTR_SIZEOF);
new IUnknown (iWebPolicyDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
- COM.MoveMemory (ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ COM.MoveMemory (ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
@@ -177,12 +177,12 @@ int Release () {
return refCount;
}
-int unableToImplementPolicyWithError (int /*long*/ webView, int /*long*/ error, int /*long*/ frame) {
+int unableToImplementPolicyWithError (long /*int*/ webView, long /*int*/ error, long /*int*/ frame) {
if (browser.isDisposed ()) return COM.S_OK;
IWebError iweberror = new IWebError (error);
String failingURL = null;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = iweberror.failingURL (result);
if (hr == COM.S_OK && result[0] != 0) {
failingURL = WebKit.extractBSTR (result[0]);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java
index eb4502e51c..f3e9a5785c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebResourceLoadDelegate.java
@@ -39,22 +39,22 @@ int AddRef () {
void createCOMInterfaces () {
iWebResourceLoadDelegate = new COMObject (new int[] {2, 0, 0, 4, 6, 4, 4, 4, 4, 3, 4, 3}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return identifierForInitialRequest (args[0], args[1], args[2], args[3]);}
- public int /*long*/ method4 (int /*long*/[] args) {return willSendRequest (args[0], args[1], args[2], args[3], args[4], args[5]);}
- public int /*long*/ method5 (int /*long*/[] args) {return didReceiveAuthenticationChallenge (args[0], args[1], args[2], args[3]);}
- public int /*long*/ method6 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method7 (int /*long*/[] args) {return COM.S_OK;}
- public int /*long*/ method8 (int /*long*/[] args) {return COM.S_OK;}
- public int /*long*/ method9 (int /*long*/[] args) {return COM.S_OK;}
- public int /*long*/ method10 (int /*long*/[] args) {return COM.S_OK;}
- public int /*long*/ method11 (int /*long*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return identifierForInitialRequest (args[0], args[1], args[2], args[3]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return willSendRequest (args[0], args[1], args[2], args[3], args[4], args[5]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return didReceiveAuthenticationChallenge (args[0], args[1], args[2], args[3]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method7 (long /*int*/[] args) {return COM.S_OK;}
+ public long /*int*/ method8 (long /*int*/[] args) {return COM.S_OK;}
+ public long /*int*/ method9 (long /*int*/[] args) {return COM.S_OK;}
+ public long /*int*/ method10 (long /*int*/[] args) {return COM.S_OK;}
+ public long /*int*/ method11 (long /*int*/[] args) {return COM.E_NOTIMPL;}
};
}
-int didReceiveAuthenticationChallenge (int /*long*/ webView, int /*long*/ identifier, int /*long*/ challenge, int /*long*/ dataSource) {
+int didReceiveAuthenticationChallenge (long /*int*/ webView, long /*int*/ identifier, long /*int*/ challenge, long /*int*/ dataSource) {
IWebURLAuthenticationChallenge authenticationChallenge = new IWebURLAuthenticationChallenge (challenge);
/*
* Do not invoke the listeners if this challenge has been failed too many
@@ -63,7 +63,7 @@ int didReceiveAuthenticationChallenge (int /*long*/ webView, int /*long*/ identi
*/
int[] count = new int[1];
int hr = authenticationChallenge.previousFailureCount (count);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
if (hr == COM.S_OK && count[0] < 3) {
AuthenticationListener[] authenticationListeners = browser.webBrowser.authenticationListeners;
for (int i = 0; i < authenticationListeners.length; i++) {
@@ -89,8 +89,8 @@ int didReceiveAuthenticationChallenge (int /*long*/ webView, int /*long*/ identi
hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebURLCredential, 0, WebKit_win32.IID_IWebURLCredential, result);
if (hr == COM.S_OK && result[0] != 0) {
IWebURLCredential credential = new IWebURLCredential (result[0]);
- int /*long*/ user = WebKit.createBSTR (event.user);
- int /*long*/ password = WebKit.createBSTR (event.password);
+ long /*int*/ user = WebKit.createBSTR (event.user);
+ long /*int*/ password = WebKit.createBSTR (event.password);
credential.initWithUser (user, password, WebKit_win32.WebURLCredentialPersistenceForSession);
challengeSender.useCredential (credential.getAddress (), challenge);
credential.Release ();
@@ -167,8 +167,8 @@ int didReceiveAuthenticationChallenge (int /*long*/ webView, int /*long*/ identi
hr = WebKit_win32.WebKitCreateInstance (WebKit_win32.CLSID_WebURLCredential, 0, WebKit_win32.IID_IWebURLCredential, result);
if (hr == COM.S_OK && result[0] != 0) {
IWebURLCredential credential = new IWebURLCredential (result[0]);
- int /*long*/ user = WebKit.createBSTR (userReturn[0]);
- int /*long*/ password = WebKit.createBSTR (passwordReturn[0]);
+ long /*int*/ user = WebKit.createBSTR (userReturn[0]);
+ long /*int*/ password = WebKit.createBSTR (passwordReturn[0]);
credential.initWithUser (user, password, WebKit_win32.WebURLCredentialPersistenceForSession);
challengeSender.useCredential (credential.getAddress (), challenge);
credential.Release ();
@@ -184,23 +184,23 @@ void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return iWebResourceLoadDelegate.getAddress ();
}
-int identifierForInitialRequest (int /*long*/ webView, int /*long*/ request, int /*long*/ dataSource, int /*long*/ identifier) {
+int identifierForInitialRequest (long /*int*/ webView, long /*int*/ request, long /*int*/ dataSource, long /*int*/ identifier) {
if (browser.isDisposed ()) return COM.S_OK;
/* send progress event iff request is for top-level frame */
IWebDataSource source = new IWebDataSource (dataSource);
- int /*long*/[] frame = new int /*long*/[1];
+ long /*int*/[] frame = new long /*int*/[1];
int hr = source.webFrame (frame);
if (hr != COM.S_OK || frame[0] == 0) {
return COM.S_OK;
}
new IWebFrame (frame[0]).Release ();
- int /*long*/[] mainFrame = new int /*long*/[1];
+ long /*int*/[] mainFrame = new long /*int*/[1];
IWebView iWebView = new IWebView (webView);
hr = iWebView.mainFrame (mainFrame);
if (hr != COM.S_OK || mainFrame[0] == 0) {
@@ -208,7 +208,7 @@ int identifierForInitialRequest (int /*long*/ webView, int /*long*/ request, int
}
new IWebFrame (mainFrame[0]).Release ();
if (frame[0] == mainFrame[0]) {
- int /*long*/ ptr = OS.malloc (8);
+ long /*int*/ ptr = OS.malloc (8);
iWebView.estimatedProgress (ptr);
double[] estimate = new double[1];
OS.MoveMemory (estimate, ptr, 8);
@@ -228,23 +228,23 @@ int identifierForInitialRequest (int /*long*/ webView, int /*long*/ request, int
return COM.S_OK;
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG;
GUID guid = new GUID ();
COM.MoveMemory (guid, riid, GUID.sizeof);
if (COM.IsEqualGUID (guid, COM.IIDIUnknown)) {
- COM.MoveMemory (ppvObject, new int /*long*/[] {iWebResourceLoadDelegate.getAddress ()}, OS.PTR_SIZEOF);
+ COM.MoveMemory (ppvObject, new long /*int*/[] {iWebResourceLoadDelegate.getAddress ()}, OS.PTR_SIZEOF);
new IUnknown (iWebResourceLoadDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebResourceLoadDelegate)) {
- COM.MoveMemory (ppvObject, new int /*long*/[] {iWebResourceLoadDelegate.getAddress ()}, OS.PTR_SIZEOF);
+ COM.MoveMemory (ppvObject, new long /*int*/[] {iWebResourceLoadDelegate.getAddress ()}, OS.PTR_SIZEOF);
new IUnknown (iWebResourceLoadDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
- COM.MoveMemory (ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ COM.MoveMemory (ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
@@ -335,9 +335,9 @@ boolean showAuthenticationDialog (final String[] user, final String[] password,
return result[0];
}
-int willSendRequest (int /*long*/ webView, int /*long*/ identifier, int /*long*/ request, int /*long*/ redirectResponse, int /*long*/ dataSource, int /*long*/ newRequest) {
+int willSendRequest (long /*int*/ webView, long /*int*/ identifier, long /*int*/ request, long /*int*/ redirectResponse, long /*int*/ dataSource, long /*int*/ newRequest) {
IWebURLRequest req = new IWebURLRequest (request);
- int /*long*/[] result = new int /*long*/ [1];
+ long /*int*/[] result = new long /*int*/ [1];
int hr = req.URL (result);
if (hr == COM.S_OK && result[0] != 0) {
String url = WebKit.extractBSTR (result[0]);
@@ -354,15 +354,15 @@ int willSendRequest (int /*long*/ webView, int /*long*/ identifier, int /*long*/
hr = req.mutableCopy (result);
if (hr == COM.S_OK && result[0] != 0) {
IWebMutableURLRequest mReq = new IWebMutableURLRequest (result[0]);
- int /*long*/ urlString = WebKit.createBSTR (url);
+ long /*int*/ urlString = WebKit.createBSTR (url);
mReq.setURL (urlString);
- OS.MoveMemory (newRequest, new int /*long*/[] {mReq.getAddress ()}, C.PTR_SIZEOF);
+ OS.MoveMemory (newRequest, new long /*int*/[] {mReq.getAddress ()}, C.PTR_SIZEOF);
return COM.S_OK;
}
}
}
req.AddRef ();
- OS.MoveMemory (newRequest, new int /*long*/[] {request}, C.PTR_SIZEOF);
+ OS.MoveMemory (newRequest, new long /*int*/[] {request}, C.PTR_SIZEOF);
return COM.S_OK;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java
index 7f9ee9c497..5a1de8b0d1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebUIDelegate.java
@@ -42,12 +42,12 @@ int AddRef () {
return refCount;
}
-int canTakeFocus (int /*long*/ sender, int forward, int /*long*/ result) {
+int canTakeFocus (long /*int*/ sender, int forward, long /*int*/ result) {
OS.MoveMemory (result, new int[] {1}, 4); /* BOOL */
return COM.S_OK;
}
-int contextMenuItemsForElement (int /*long*/ sender, int /*long*/ element, int /*long*/ defaultItemsHMenu, int /*long*/ resultHMenu) {
+int contextMenuItemsForElement (long /*int*/ sender, long /*int*/ element, long /*int*/ defaultItemsHMenu, long /*int*/ resultHMenu) {
Point pt = browser.getDisplay ().getCursorLocation ();
Event event = new Event ();
event.x = pt.x;
@@ -61,86 +61,86 @@ int contextMenuItemsForElement (int /*long*/ sender, int /*long*/ element, int /
}
menu.setVisible (true);
} else {
- OS.MoveMemory (resultHMenu, new int /*long*/[] {defaultItemsHMenu}, C.PTR_SIZEOF);
+ OS.MoveMemory (resultHMenu, new long /*int*/[] {defaultItemsHMenu}, C.PTR_SIZEOF);
return COM.S_OK;
}
}
- OS.MoveMemory (resultHMenu, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ OS.MoveMemory (resultHMenu, new long /*int*/[] {0}, C.PTR_SIZEOF);
return COM.S_OK;
}
void createCOMInterfaces () {
iWebUIDelegate = new COMObject (new int[] {2, 0, 0, 3, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 4, 4, 2, 3, 4, 4, 3, 3, 3, 3, 5, 3, 1, 3, 2, 2, 2, 2, 3, 2, 3, 1, 1, 0, 0, 1, 1, 2, 2, 2, 2, 3, 5, 2, 2, 3, 1, 2, 2, 4, 10, 3}) {
- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
- public int /*long*/ method3 (int /*long*/[] args) {return createWebViewWithRequest (args[0], args[1], args[2]);}
- public int /*long*/ method4 (int /*long*/[] args) {return webViewShow (args[0]);}
- public int /*long*/ method5 (int /*long*/[] args) {return webViewClose (args[0]);}
- public int /*long*/ method6 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method7 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method8 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method9 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method10 (int /*long*/[] args) {return setStatusText (args[0], args[1]);}
- public int /*long*/ method11 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method12 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method13 (int /*long*/[] args) {return setToolbarsVisible (args[0], (int)/*64*/args[1]);}
- public int /*long*/ method14 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method15 (int /*long*/[] args) {return setStatusBarVisible (args[0], (int)/*64*/args[1]);}
- public int /*long*/ method16 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method17 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method18 (int /*long*/[] args) {return setFrame (args[0], args[1]);}
- public int /*long*/ method19 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method20 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method21 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method22 (int /*long*/[] args) {return runJavaScriptAlertPanelWithMessage (args[0], args[1]);}
- public int /*long*/ method23 (int /*long*/[] args) {return runJavaScriptConfirmPanelWithMessage (args[0], args[1], args[2]);}
- public int /*long*/ method24 (int /*long*/[] args) {return runJavaScriptTextInputPanelWithPrompt (args[0], args[1], args[2], args[3]);}
- public int /*long*/ method25 (int /*long*/[] args) {return runBeforeUnloadConfirmPanelWithMessage (args[0], args[1], args[2], args[3]);}
- public int /*long*/ method26 (int /*long*/[] args) {return runOpenPanelForFileButtonWithResultListener (args[0], args[1]);}
- public int /*long*/ method27 (int /*long*/[] args) {return mouseDidMoveOverElement (args[0], args[1], (int)/*64*/args[2]);}
- public int /*long*/ method28 (int /*long*/[] args) {return contextMenuItemsForElement (args[0], args[1], args[2], args[3]);}
- public int /*long*/ method29 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method30 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method31 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method32 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method33 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method34 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method35 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method36 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method37 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method38 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method39 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method40 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method41 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method42 (int /*long*/[] args) {return canTakeFocus (args[0], (int)/*64*/args[1], args[2]);}
- public int /*long*/ method43 (int /*long*/[] args) {return takeFocus (args[0], (int)/*64*/args[1]);}
- public int /*long*/ method44 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method45 (int /*long*/[] args) {return COM.S_OK;}
- public int /*long*/ method46 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method47 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method48 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method49 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method50 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method51 (int /*long*/[] args) {return printFrame (args[0], args[1]);}
- public int /*long*/ method52 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method53 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method54 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method55 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method56 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method57 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method58 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method59 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method60 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method61 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method62 (int /*long*/[] args) {return setMenuBarVisible (args[0], (int)/*64*/args[1]);}
- public int /*long*/ method63 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method64 (int /*long*/[] args) {return COM.E_NOTIMPL;}
- public int /*long*/ method65 (int /*long*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
+ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return createWebViewWithRequest (args[0], args[1], args[2]);}
+ public long /*int*/ method4 (long /*int*/[] args) {return webViewShow (args[0]);}
+ public long /*int*/ method5 (long /*int*/[] args) {return webViewClose (args[0]);}
+ public long /*int*/ method6 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method7 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method8 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method9 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method10 (long /*int*/[] args) {return setStatusText (args[0], args[1]);}
+ public long /*int*/ method11 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method12 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method13 (long /*int*/[] args) {return setToolbarsVisible (args[0], (int)/*64*/args[1]);}
+ public long /*int*/ method14 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method15 (long /*int*/[] args) {return setStatusBarVisible (args[0], (int)/*64*/args[1]);}
+ public long /*int*/ method16 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method17 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method18 (long /*int*/[] args) {return setFrame (args[0], args[1]);}
+ public long /*int*/ method19 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method20 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method21 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method22 (long /*int*/[] args) {return runJavaScriptAlertPanelWithMessage (args[0], args[1]);}
+ public long /*int*/ method23 (long /*int*/[] args) {return runJavaScriptConfirmPanelWithMessage (args[0], args[1], args[2]);}
+ public long /*int*/ method24 (long /*int*/[] args) {return runJavaScriptTextInputPanelWithPrompt (args[0], args[1], args[2], args[3]);}
+ public long /*int*/ method25 (long /*int*/[] args) {return runBeforeUnloadConfirmPanelWithMessage (args[0], args[1], args[2], args[3]);}
+ public long /*int*/ method26 (long /*int*/[] args) {return runOpenPanelForFileButtonWithResultListener (args[0], args[1]);}
+ public long /*int*/ method27 (long /*int*/[] args) {return mouseDidMoveOverElement (args[0], args[1], (int)/*64*/args[2]);}
+ public long /*int*/ method28 (long /*int*/[] args) {return contextMenuItemsForElement (args[0], args[1], args[2], args[3]);}
+ public long /*int*/ method29 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method30 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method31 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method32 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method33 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method34 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method35 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method36 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method37 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method38 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method39 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method40 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method41 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method42 (long /*int*/[] args) {return canTakeFocus (args[0], (int)/*64*/args[1], args[2]);}
+ public long /*int*/ method43 (long /*int*/[] args) {return takeFocus (args[0], (int)/*64*/args[1]);}
+ public long /*int*/ method44 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method45 (long /*int*/[] args) {return COM.S_OK;}
+ public long /*int*/ method46 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method47 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method48 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method49 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method50 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method51 (long /*int*/[] args) {return printFrame (args[0], args[1]);}
+ public long /*int*/ method52 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method53 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method54 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method55 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method56 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method57 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method58 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method59 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method60 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method61 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method62 (long /*int*/[] args) {return setMenuBarVisible (args[0], (int)/*64*/args[1]);}
+ public long /*int*/ method63 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method64 (long /*int*/[] args) {return COM.E_NOTIMPL;}
+ public long /*int*/ method65 (long /*int*/[] args) {return COM.E_NOTIMPL;}
};
}
-int createWebViewWithRequest (int /*long*/ sender, int /*long*/ request, int /*long*/ webView) {
+int createWebViewWithRequest (long /*int*/ sender, long /*int*/ request, long /*int*/ webView) {
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
@@ -156,10 +156,10 @@ int createWebViewWithRequest (int /*long*/ sender, int /*long*/ request, int /*l
}
if (browser != null && !browser.isDisposed ()) {
iwebview = ((WebKit)browser.webBrowser).webView;
- OS.MoveMemory (webView, new int /*long*/[] {iwebview.getAddress ()}, OS.PTR_SIZEOF);
+ OS.MoveMemory (webView, new long /*int*/[] {iwebview.getAddress ()}, OS.PTR_SIZEOF);
if (request != 0) {
IWebURLRequest req = new IWebURLRequest (request);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = req.URL (result);
if (hr != COM.S_OK || result[0] == 0) {
return COM.S_OK;
@@ -189,17 +189,17 @@ protected void disposeCOMInterfaces () {
}
}
-int /*long*/ getAddress () {
+long /*int*/ getAddress () {
return iWebUIDelegate.getAddress ();
}
-int mouseDidMoveOverElement (int /*long*/ sender, int /*long*/ elementInformation, int modifierFlags) {
+int mouseDidMoveOverElement (long /*int*/ sender, long /*int*/ elementInformation, int modifierFlags) {
if (elementInformation == 0) return COM.S_OK;
IPropertyBag info = new IPropertyBag (elementInformation);
- int /*long*/ key = WebKit.createBSTR ("WebElementLinkURLKey"); //$NON-NLS-N$
- int /*long*/ hHeap = OS.GetProcessHeap ();
- int /*long*/ resultPtr = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, VARIANT.sizeof);
+ long /*int*/ key = WebKit.createBSTR ("WebElementLinkURLKey"); //$NON-NLS-N$
+ long /*int*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ resultPtr = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, VARIANT.sizeof);
int hr = info.Read (key, resultPtr, null);
if (hr != COM.S_OK || resultPtr == 0) {
return COM.S_OK;
@@ -235,15 +235,15 @@ int mouseDidMoveOverElement (int /*long*/ sender, int /*long*/ elementInformatio
return COM.S_OK;
}
-int printFrame (int /*long*/ webView, int /*long*/ frame) {
+int printFrame (long /*int*/ webView, long /*int*/ frame) {
IWebFrame iwebFrame = new IWebFrame (frame);
PRINTDLG pd = new PRINTDLG ();
pd.lStructSize = PRINTDLG.sizeof;
pd.Flags = OS.PD_RETURNDC;
if (!OS.PrintDlg (pd)) return COM.S_OK;
- int /*long*/ printDC = pd.hDC;
+ long /*int*/ printDC = pd.hDC;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int hr = iwebFrame.QueryInterface (WebKit_win32.IID_IWebFramePrivate, result);
if (hr != COM.S_OK || result[0] == 0) {
return COM.S_OK;
@@ -272,8 +272,8 @@ int printFrame (int /*long*/ webView, int /*long*/ frame) {
}
DOCINFO di = new DOCINFO ();
di.cbSize = DOCINFO.sizeof;
- int /*long*/ hHeap = OS.GetProcessHeap ();
- int /*long*/ lpszDocName = 0;
+ long /*int*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ lpszDocName = 0;
if (jobName != null && jobName.length () != 0) {
/* Use the character encoding for the default locale */
TCHAR buffer = new TCHAR (0, jobName, true);
@@ -297,23 +297,23 @@ int printFrame (int /*long*/ webView, int /*long*/ frame) {
return COM.S_OK;
}
-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
if (riid == 0 || ppvObject == 0) return COM.E_INVALIDARG;
GUID guid = new GUID ();
COM.MoveMemory (guid, riid, GUID.sizeof);
if (COM.IsEqualGUID (guid, COM.IIDIUnknown)) {
- COM.MoveMemory (ppvObject, new int /*long*/[] {iWebUIDelegate.getAddress ()}, OS.PTR_SIZEOF);
+ COM.MoveMemory (ppvObject, new long /*int*/[] {iWebUIDelegate.getAddress ()}, OS.PTR_SIZEOF);
new IUnknown (iWebUIDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
if (COM.IsEqualGUID (guid, WebKit_win32.IID_IWebUIDelegate)) {
- COM.MoveMemory (ppvObject, new int /*long*/[] {iWebUIDelegate.getAddress ()}, OS.PTR_SIZEOF);
+ COM.MoveMemory (ppvObject, new long /*int*/[] {iWebUIDelegate.getAddress ()}, OS.PTR_SIZEOF);
new IUnknown (iWebUIDelegate.getAddress ()).AddRef ();
return COM.S_OK;
}
- COM.MoveMemory (ppvObject, new int /*long*/[] {0}, OS.PTR_SIZEOF);
+ COM.MoveMemory (ppvObject, new long /*int*/[] {0}, OS.PTR_SIZEOF);
return COM.E_NOINTERFACE;
}
@@ -325,7 +325,7 @@ int Release () {
return refCount;
}
-int runBeforeUnloadConfirmPanelWithMessage (int /*long*/ sender, int /*long*/ message, int /*long*/ initiatedByFrame, int /*long*/ result) {
+int runBeforeUnloadConfirmPanelWithMessage (long /*int*/ sender, long /*int*/ message, long /*int*/ initiatedByFrame, long /*int*/ result) {
if (!prompt) return COM.S_OK;
Shell parent = browser.getShell ();
@@ -343,13 +343,13 @@ int runBeforeUnloadConfirmPanelWithMessage (int /*long*/ sender, int /*long*/ me
return COM.S_OK;
}
-int runJavaScriptAlertPanelWithMessage (int /*long*/ sender, int /*long*/ message) {
+int runJavaScriptAlertPanelWithMessage (long /*int*/ sender, long /*int*/ message) {
String messageString = WebKit.extractBSTR (message);
showAlertMessage ("Javascript", messageString); //$NON-NLS-1$
return COM.S_OK;
}
-int runJavaScriptConfirmPanelWithMessage (int /*long*/ sender, int /*long*/ message, int /*long*/ result) {
+int runJavaScriptConfirmPanelWithMessage (long /*int*/ sender, long /*int*/ message, long /*int*/ result) {
String messageString = WebKit.extractBSTR (message);
int[] response = new int[1];
response[0] = showConfirmPanel ("Javascript", messageString) == SWT.OK ? 1 : 0; //$NON-NLS-1$
@@ -357,11 +357,11 @@ int runJavaScriptConfirmPanelWithMessage (int /*long*/ sender, int /*long*/ mess
return COM.S_OK;
}
-int runJavaScriptTextInputPanelWithPrompt (int /*long*/ sender, int /*long*/ message, int /*long*/ defaultText, int /*long*/ result) {
+int runJavaScriptTextInputPanelWithPrompt (long /*int*/ sender, long /*int*/ message, long /*int*/ defaultText, long /*int*/ result) {
String messageString = WebKit.extractBSTR (message);
String defaultTextString = WebKit.extractBSTR (defaultText);
String resultString = showTextPrompter ("Javascript", messageString, defaultTextString); //$NON-NLS-1$
- int /*long*/[] response = new int /*long*/[1];
+ long /*int*/[] response = new long /*int*/[1];
if (resultString != null) {
response[0] = WebKit.createBSTR (resultString);
}
@@ -369,7 +369,7 @@ int runJavaScriptTextInputPanelWithPrompt (int /*long*/ sender, int /*long*/ mes
return COM.S_OK;
}
-int runOpenPanelForFileButtonWithResultListener (int /*long*/ sender, int /*long*/ resultListener) {
+int runOpenPanelForFileButtonWithResultListener (long /*int*/ sender, long /*int*/ resultListener) {
Shell parent = browser.getShell ();
FileDialog dialog = new FileDialog (parent, SWT.NONE);
String result = dialog.open ();
@@ -382,7 +382,7 @@ int runOpenPanelForFileButtonWithResultListener (int /*long*/ sender, int /*long
return COM.S_OK;
}
-int setFrame (int /*long*/ sender, int /*long*/ frame) {
+int setFrame (long /*int*/ sender, long /*int*/ frame) {
RECT rect = new RECT ();
COM.MoveMemory (rect, frame, RECT.sizeof);
/* convert to SWT system coordinates */
@@ -394,19 +394,19 @@ int setFrame (int /*long*/ sender, int /*long*/ frame) {
return COM.S_OK;
}
-int setMenuBarVisible (int /*long*/ sender, int visible) {
+int setMenuBarVisible (long /*int*/ sender, int visible) {
/* Note. Webkit only emits the notification when the status bar should be hidden. */
menuBar = visible == 1;
return COM.S_OK;
}
-int setStatusBarVisible (int /*long*/ sender, int visible) {
+int setStatusBarVisible (long /*int*/ sender, int visible) {
/* Note. Webkit only emits the notification when the status bar should be hidden. */
statusBar = visible == 1;
return COM.S_OK;
}
-int setStatusText (int /*long*/ sender, int /*long*/ text) {
+int setStatusText (long /*int*/ sender, long /*int*/ text) {
String statusText = WebKit.extractBSTR (text);
if (statusText.length () == 0) return COM.S_OK;
StatusTextEvent statusTextEvent = new StatusTextEvent (browser);
@@ -420,7 +420,7 @@ int setStatusText (int /*long*/ sender, int /*long*/ text) {
return COM.S_OK;
}
-int setToolbarsVisible (int /*long*/ sender, int visible) {
+int setToolbarsVisible (long /*int*/ sender, int visible) {
/* Note. Webkit only emits the notification when the status bar should be hidden. */
toolBar = visible == 1;
return COM.S_OK;
@@ -604,14 +604,14 @@ String showTextPrompter (String title, String message, String defaultText) {
return result[0];
}
-int takeFocus (int /*long*/ sender, int forward) {
+int takeFocus (long /*int*/ sender, int forward) {
int traveralCode = forward == 0 ? SWT.TRAVERSE_TAB_PREVIOUS : SWT.TRAVERSE_TAB_NEXT;
((WebKit)browser.webBrowser).traverseOut = true;
browser.traverse (traveralCode);
return COM.S_OK;
}
-int webViewClose (int /*long*/ sender) {
+int webViewClose (long /*int*/ sender) {
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
@@ -623,13 +623,13 @@ int webViewClose (int /*long*/ sender) {
return COM.S_OK;
}
-int webViewFrame (int /*long*/ sender, int /*long*/ frame) {
+int webViewFrame (long /*int*/ sender, long /*int*/ frame) {
RECT rect = new RECT ();
OS.MoveMemory (frame, rect, RECT.sizeof);
return COM.S_OK;
}
-int webViewShow (int /*long*/ sender) {
+int webViewShow (long /*int*/ sender) {
WindowEvent newEvent = new WindowEvent (browser);
newEvent.display = browser.getDisplay ();
newEvent.widget = browser;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java
index d4397ab865..1ef7c4e79e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java
@@ -15,11 +15,11 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebCookieManager extends IUnknown {
-public IWebCookieManager (int /*long*/ address) {
+public IWebCookieManager (long /*int*/ address) {
super (address);
}
-public int cookieStorage (int /*long*/[] storage) {
+public int cookieStorage (long /*int*/[] storage) {
return COM.VtblCall (3, getAddress (), storage);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java
index 800f44fb4c..5ea4d166ce 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java
@@ -15,23 +15,23 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebDataSource extends IUnknown {
-public IWebDataSource (int /*long*/ address) {
+public IWebDataSource (long /*int*/ address) {
super (address);
}
-public int representation (int /*long*/[] rep) {
+public int representation (long /*int*/[] rep) {
return COM.VtblCall (5, getAddress (), rep);
}
-public int webFrame (int /*long*/[] frame) {
+public int webFrame (long /*int*/[] frame) {
return COM.VtblCall (6, getAddress (), frame);
}
-public int request (int /*long*/[] request) {
+public int request (long /*int*/[] request) {
return COM.VtblCall (8, getAddress (), request);
}
-public int pageTitle (int /*long*/[] title) {
+public int pageTitle (long /*int*/[] title) {
return COM.VtblCall (12, getAddress (), title);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java
index f8c2518b65..2b6317c749 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java
@@ -15,11 +15,11 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebDocumentRepresentation extends IUnknown {
-public IWebDocumentRepresentation (int /*long*/ address) {
+public IWebDocumentRepresentation (long /*int*/ address) {
super (address);
}
-public int documentSource (int /*long*/[] source) {
+public int documentSource (long /*int*/[] source) {
return COM.VtblCall (8, getAddress (), source);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java
index 6465774ec8..e2e3f9e52a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java
@@ -15,7 +15,7 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebDownload extends IUnknown {
-public IWebDownload (int /*long*/ address) {
+public IWebDownload (long /*int*/ address) {
super (address);
}
@@ -27,7 +27,7 @@ public int setDeletesFileUponFailure (int deletesFileUponFailure) {
return COM.VtblCall (12, getAddress (), deletesFileUponFailure);
}
-public int setDestination (int /*long*/ path, int allowOverwrite) {
+public int setDestination (long /*int*/ path, int allowOverwrite) {
return COM.VtblCall (13, getAddress(), path, allowOverwrite);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java
index 3b48b5b3bc..41d2c934cc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java
@@ -15,7 +15,7 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebError extends IUnknown {
-public IWebError (int /*long*/ address) {
+public IWebError (long /*int*/ address) {
super (address);
}
@@ -23,23 +23,23 @@ public int code (int[] result) {
return COM.VtblCall (4, getAddress (), result);
}
-//public int domain (int /*long*/[] result) {
+//public int domain (long /*int*/[] result) {
// return COM.VtblCall (5, getAddress (), result);
//}
-public int localizedDescription (int /*long*/[] result) {
+public int localizedDescription (long /*int*/[] result) {
return COM.VtblCall (6, getAddress (), result);
}
-//public int localizedFailureReason (int /*long*/[] result) {
+//public int localizedFailureReason (long /*int*/[] result) {
// return COM.VtblCall (7, getAddress (), result);
//}
-//public int userInfo (int /*long*/[] result) {
+//public int userInfo (long /*int*/[] result) {
//return COM.VtblCall (11, getAddress (), result);
//}
-public int failingURL (int /*long*/[] result) {
+public int failingURL (long /*int*/[] result) {
return COM.VtblCall (12, getAddress (), result);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java
index cd69d6826f..caaedc1de6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java
@@ -15,11 +15,11 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebErrorPrivate extends IUnknown {
-public IWebErrorPrivate (int /*long*/ address) {
+public IWebErrorPrivate (long /*int*/ address) {
super (address);
}
-public int sslPeerCertificate (int /*long*/[] result) {
+public int sslPeerCertificate (long /*int*/[] result) {
return COM.VtblCall (3, getAddress (), result);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java
index eeb23725fa..88d36b0598 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java
@@ -15,23 +15,23 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebFrame extends IUnknown {
-public IWebFrame (int /*long*/ address) {
+public IWebFrame (long /*int*/ address) {
super (address);
}
-public int loadRequest (int /*long*/ request) {
+public int loadRequest (long /*int*/ request) {
return COM.VtblCall (8, getAddress (), request);
}
-public int loadHTMLString (int /*long*/ string, int /*long*/ baseURL) {
+public int loadHTMLString (long /*int*/ string, long /*int*/ baseURL) {
return COM.VtblCall (10, getAddress (), string, baseURL);
}
-public int dataSource (int /*long*/[] source) {
+public int dataSource (long /*int*/[] source) {
return COM.VtblCall (13, getAddress (), source);
}
-public int /*long*/ globalContext () {
+public long /*int*/ globalContext () {
return COM.VtblCall (23, getAddress ());
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java
index f349a53d51..a41bcbc38f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java
@@ -15,19 +15,19 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebFramePrivate extends IUnknown {
-public IWebFramePrivate (int /*long*/ address) {
+public IWebFramePrivate (long /*int*/ address) {
super (address);
}
-public int setInPrintingMode (int value, int /*long*/ printDC) {
+public int setInPrintingMode (int value, long /*int*/ printDC) {
return COM.VtblCall (8, getAddress (), value, printDC);
}
-public int getPrintedPageCount (int /*long*/ printDC, int[] pageCount) {
+public int getPrintedPageCount (long /*int*/ printDC, int[] pageCount) {
return COM.VtblCall (9, getAddress (), printDC, pageCount);
}
-public int spoolPages (int /*long*/ printDC, int startPage, int endPage, int /*long*/[] ctx) {
+public int spoolPages (long /*int*/ printDC, int startPage, int endPage, long /*int*/[] ctx) {
return COM.VtblCall (10, getAddress (), printDC, startPage, endPage, ctx);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java
index 5d74cc3132..b90419f4ca 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java
@@ -15,23 +15,23 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebIBActions extends IUnknown {
-public IWebIBActions (int /*long*/ address) {
+public IWebIBActions (long /*int*/ address) {
super (address);
}
-public int stopLoading (int /*long*/ sender) {
+public int stopLoading (long /*int*/ sender) {
return COM.VtblCall (4, getAddress (), sender);
}
-public int reload (int /*long*/ sender) {
+public int reload (long /*int*/ sender) {
return COM.VtblCall (5, getAddress (), sender);
}
-public int canGoBack (int /*long*/ sender, int[] result) {
+public int canGoBack (long /*int*/ sender, int[] result) {
return COM.VtblCall (6, getAddress (), sender, result);
}
-public int canGoForward (int /*long*/ sender, int[] result) {
+public int canGoForward (long /*int*/ sender, int[] result) {
return COM.VtblCall (8, getAddress (), sender, result);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java
index 6fb7512916..6961d82c5b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java
@@ -15,15 +15,15 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebMutableURLRequest extends IWebURLRequest {
-public IWebMutableURLRequest (int /*long*/ address) {
+public IWebMutableURLRequest (long /*int*/ address) {
super (address);
}
-//public int setHTTPBody (int /*long*/ data) {
+//public int setHTTPBody (long /*int*/ data) {
// return COM.VtblCall (21, getAddress (), data);
//}
-//public int setHTTPBodyStream (int /*long*/ data) {
+//public int setHTTPBodyStream (long /*int*/ data) {
// return COM.VtblCall (22, getAddress (), data);
//}
@@ -31,11 +31,11 @@ public int setHTTPMethod (int post) {
return COM.VtblCall (23, getAddress (), post);
}
-public int setURL (int /*long*/ theUrl) {
+public int setURL (long /*int*/ theUrl) {
return COM.VtblCall (27, getAddress (), theUrl);
}
-public int setValue (int /*long*/ value, int /*long*/ field) {
+public int setValue (long /*int*/ value, long /*int*/ field) {
return COM.VtblCall (28, getAddress (), value, field);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java
index 802f713f96..92a1ec92f5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java
@@ -15,11 +15,11 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebMutableURLRequestPrivate extends IUnknown {
-public IWebMutableURLRequestPrivate (int /*long*/ address) {
+public IWebMutableURLRequestPrivate (long /*int*/ address) {
super (address);
}
-//public int setClientCertificate (int /*long*/ cert) {
+//public int setClientCertificate (long /*int*/ cert) {
//return COM.VtblCall (3, getAddress (), cert);
//}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java
index 9a36db3b00..261296426e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java
@@ -14,11 +14,11 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebOpenPanelResultListener extends IUnknown {
-public IWebOpenPanelResultListener (int /*long*/ address) {
+public IWebOpenPanelResultListener (long /*int*/ address) {
super (address);
}
-public int chooseFilename (int /*long*/ fileName) {
+public int chooseFilename (long /*int*/ fileName) {
return COM.VtblCall (3, getAddress (), fileName);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java
index e7e2116778..c1019a71d5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java
@@ -15,7 +15,7 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebPolicyDecisionListener extends IUnknown{
-public IWebPolicyDecisionListener (int /*long*/ address) {
+public IWebPolicyDecisionListener (long /*int*/ address) {
super (address);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java
index ad45d3cf6e..c8b72a9dd0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java
@@ -15,11 +15,11 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebPreferences extends IUnknown {
-public IWebPreferences (int /*long*/ address) {
+public IWebPreferences (long /*int*/ address) {
super (address);
}
-public int initWithIdentifier (int /*long*/ identifier, int /*long*/[] preferences) {
+public int initWithIdentifier (long /*int*/ identifier, long /*int*/[] preferences) {
return COM.VtblCall (4, getAddress (), identifier, preferences);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java
index 0108468d45..69045ded2d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java
@@ -15,7 +15,7 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebURLAuthenticationChallenge extends IUnknown {
-public IWebURLAuthenticationChallenge (int /*long*/ address) {
+public IWebURLAuthenticationChallenge (long /*int*/ address) {
super (address);
}
@@ -23,15 +23,15 @@ public int previousFailureCount (int[] result) {
return COM.VtblCall (7, getAddress (), result);
}
-public int proposedCredential (int /*long*/[] result) {
+public int proposedCredential (long /*int*/[] result) {
return COM.VtblCall (8, getAddress (), result);
}
-public int protectionSpace (int /*long*/[] result) {
+public int protectionSpace (long /*int*/[] result) {
return COM.VtblCall (9, getAddress (), result);
}
-public int sender (int /*long*/[] sender) {
+public int sender (long /*int*/[] sender) {
return COM.VtblCall (10, getAddress (), sender);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java
index c5185b57f0..69339424db 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java
@@ -15,15 +15,15 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebURLAuthenticationChallengeSender extends IUnknown {
-public IWebURLAuthenticationChallengeSender (int /*long*/ address) {
+public IWebURLAuthenticationChallengeSender (long /*int*/ address) {
super (address);
}
-public int cancelAuthenticationChallenge (int /*long*/ challenge) {
+public int cancelAuthenticationChallenge (long /*int*/ challenge) {
return COM.VtblCall (3, getAddress (), challenge);
}
-public int useCredential (int /*long*/ credential, int /*long*/ challenge) {
+public int useCredential (long /*int*/ credential, long /*int*/ challenge) {
return COM.VtblCall (5, getAddress (), credential, challenge);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java
index d2979c50e7..cfb5a2fbf2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java
@@ -15,7 +15,7 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebURLCredential extends IUnknown {
-public IWebURLCredential (int /*long*/ address) {
+public IWebURLCredential (long /*int*/ address) {
super (address);
}
@@ -23,15 +23,15 @@ public int hasPassword (int[] result) {
return COM.VtblCall (3, getAddress (), result);
}
-public int initWithUser (int /*long*/ user, int /*long*/ password, int /*long*/ persistence) {
+public int initWithUser (long /*int*/ user, long /*int*/ password, long /*int*/ persistence) {
return COM.VtblCall (4, getAddress (), user, password, persistence);
}
-public int password (int /*long*/[] password) {
+public int password (long /*int*/[] password) {
return COM.VtblCall (5, getAddress (), password);
}
-public int user (int /*long*/[] result) {
+public int user (long /*int*/[] result) {
return COM.VtblCall (7, getAddress (), result);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java
index c802d16e9f..297a53fee3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java
@@ -15,11 +15,11 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebURLProtectionSpace extends IUnknown {
-public IWebURLProtectionSpace(int /*long*/ address) {
+public IWebURLProtectionSpace(long /*int*/ address) {
super(address);
}
-public int host (int /*long*/[] result) {
+public int host (long /*int*/[] result) {
return COM.VtblCall (4, getAddress (), result);
}
@@ -27,7 +27,7 @@ public int port (int[] result) {
return COM.VtblCall (8, getAddress (), result);
}
-public int realm (int /*long*/[] result) {
+public int realm (long /*int*/[] result) {
return COM.VtblCall (11, getAddress (), result);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java
index 11eee695ea..6e14ff0bcc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java
@@ -15,23 +15,23 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebURLRequest extends IUnknown {
-public IWebURLRequest (int /*long*/ address) {
+public IWebURLRequest (long /*int*/ address) {
super (address);
}
-//public int HTTPBody (int /*long*/[] result) {
+//public int HTTPBody (long /*int*/[] result) {
// return COM.VtblCall (6, getAddress (), result);
//}
-public int HTTPMethod (int /*long*/[] result) {
+public int HTTPMethod (long /*int*/[] result) {
return COM.VtblCall (8, getAddress (), result);
}
-public int URL (int /*long*/[] result) {
+public int URL (long /*int*/[] result) {
return COM.VtblCall (13, getAddress (), result);
}
-public int mutableCopy (int /*long*/[] result) {
+public int mutableCopy (long /*int*/[] result) {
return COM.VtblCall (16, getAddress (), result);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java
index 85650589df..f0a9e84608 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java
@@ -15,7 +15,7 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebURLResponse extends IUnknown {
-public IWebURLResponse (int /*long*/ address) {
+public IWebURLResponse (long /*int*/ address) {
super (address);
}
@@ -23,7 +23,7 @@ public int expectedContentLength (long[] result) {
return COM.VtblCall (3, getAddress (), result);
}
-public int URL (int /*long*/[] result) {
+public int URL (long /*int*/[] result) {
return COM.VtblCall (8, getAddress (), result);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java
index efbc5d3a65..70d9d44d7a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java
@@ -16,39 +16,39 @@ import org.eclipse.swt.internal.win32.*;
public class IWebView extends IUnknown {
-public IWebView (int /*long*/ address) {
+public IWebView (long /*int*/ address) {
super (address);
}
-public int canShowMIMEType (int /*long*/ mimeType, int[] canShow) {
+public int canShowMIMEType (long /*int*/ mimeType, int[] canShow) {
return COM.VtblCall (3, getAddress (), mimeType, canShow);
}
-public int initWithFrame (RECT frame, int /*long*/ frameName, int /*long*/ groupName) {
+public int initWithFrame (RECT frame, long /*int*/ frameName, long /*int*/ groupName) {
return COM.VtblCall (9, getAddress(), frame, frameName, groupName);
}
-public int setUIDelegate (int /*long*/ delegate) {
+public int setUIDelegate (long /*int*/ delegate) {
return COM.VtblCall (10, getAddress (), delegate);
}
-public int setResourceLoadDelegate (int /*long*/ delegate) {
+public int setResourceLoadDelegate (long /*int*/ delegate) {
return COM.VtblCall (12, getAddress (), delegate);
}
-public int setDownloadDelegate (int /*long*/ delegate) {
+public int setDownloadDelegate (long /*int*/ delegate) {
return COM.VtblCall (14, getAddress (), delegate);
}
-public int setFrameLoadDelegate (int /*long*/ delegate) {
+public int setFrameLoadDelegate (long /*int*/ delegate) {
return COM.VtblCall (16, getAddress (), delegate);
}
-public int setPolicyDelegate (int /*long*/ delegate) {
+public int setPolicyDelegate (long /*int*/ delegate) {
return COM.VtblCall (18, getAddress (), delegate);
}
-public int mainFrame (int /*long*/[] frame) {
+public int mainFrame (long /*int*/[] frame) {
return COM.VtblCall (20, getAddress (), frame);
}
@@ -60,27 +60,27 @@ public int goForward (int[] succeeded) {
return COM.VtblCall (25, getAddress(), succeeded);
}
-public int setCustomUserAgent (int /*long*/ valueString) {
+public int setCustomUserAgent (long /*int*/ valueString) {
return COM.VtblCall (31, getAddress (), valueString);
}
-public int setPreferences (int /*long*/ prefs) {
+public int setPreferences (long /*int*/ prefs) {
return COM.VtblCall (41, getAddress (), prefs);
}
-public int preferences (int /*long*/[] prefs) {
+public int preferences (long /*int*/[] prefs) {
return COM.VtblCall (42, getAddress (), prefs);
}
-public int setHostWindow (int /*long*/ window) {
+public int setHostWindow (long /*int*/ window) {
return COM.VtblCall (45, getAddress (), window);
}
-public int hostWindow (int /*long*/[] window) {
+public int hostWindow (long /*int*/[] window) {
return COM.VtblCall (46, getAddress (), window);
}
-public int estimatedProgress (int /*long*/ estimatedProgress) {
+public int estimatedProgress (long /*int*/ estimatedProgress) {
return COM.VtblCall (51, getAddress (), estimatedProgress);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java
index 3fe02eae3b..506f495209 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java
@@ -15,11 +15,11 @@ import org.eclipse.swt.internal.ole.win32.*;
public class IWebViewPrivate extends IUnknown {
-public IWebViewPrivate (int /*long*/ address) {
+public IWebViewPrivate (long /*int*/ address) {
super (address);
}
-public int viewWindow (int /*long*/[] window) {
+public int viewWindow (long /*int*/[] window) {
return COM.VtblCall (5, getAddress (), window);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/JSClassDefinition.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/JSClassDefinition.java
index 86b3f63277..c1cba5e12f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/JSClassDefinition.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/JSClassDefinition.java
@@ -17,35 +17,35 @@ public class JSClassDefinition {
/** @field cast=(JSClassAttributes) */
public int attributes;
/** @field cast=(const char*) */
- public int /*long*/ className;
+ public long /*int*/ className;
/** @field cast=(JSClassRef) */
- public int /*long*/ parentClass;
+ public long /*int*/ parentClass;
/** @field cast=(const JSStaticValue*) */
- public int /*long*/ staticValues;
+ public long /*int*/ staticValues;
/** @field cast=(const JSStaticFunction*) */
- public int /*long*/ staticFunctions;
+ public long /*int*/ staticFunctions;
/** @field cast=(JSObjectInitializeCallback) */
- public int /*long*/ initialize;
+ public long /*int*/ initialize;
/** @field cast=(JSObjectFinalizeCallback) */
- public int /*long*/ finalize;
+ public long /*int*/ finalize;
/** @field cast=(JSObjectHasPropertyCallback) */
- public int /*long*/ hasProperty;
+ public long /*int*/ hasProperty;
/** @field cast=(JSObjectGetPropertyCallback) */
- public int /*long*/ getProperty;
+ public long /*int*/ getProperty;
/** @field cast=(JSObjectSetPropertyCallback) */
- public int /*long*/ setProperty;
+ public long /*int*/ setProperty;
/** @field cast=(JSObjectDeletePropertyCallback) */
- public int /*long*/ deleteProperty;
+ public long /*int*/ deleteProperty;
/** @field cast=(JSObjectGetPropertyNamesCallback) */
- public int /*long*/ getPropertyNames;
+ public long /*int*/ getPropertyNames;
/** @field cast=(JSObjectCallAsFunctionCallback) */
- public int /*long*/ callAsFunction;
+ public long /*int*/ callAsFunction;
/** @field cast=(JSObjectCallAsConstructorCallback) */
- public int /*long*/ callAsConstructor;
+ public long /*int*/ callAsConstructor;
/** @field cast=(JSObjectHasInstanceCallback) */
- public int /*long*/ hasInstance;
+ public long /*int*/ hasInstance;
/** @field cast=(JSObjectConvertToTypeCallback) */
- public int /*long*/ convertToType;
+ public long /*int*/ convertToType;
public static final int sizeof = WebKit_win32.JSClassDefinition_sizeof();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/WebKit_win32.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/WebKit_win32.java
index f9e9011187..fd42ae0ef4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/WebKit_win32.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/WebKit_win32.java
@@ -68,26 +68,26 @@ static GUID IIDFromString (String lpsz) {
/**
* @param theArray cast=(CFArrayRef)
*/
-public static final native int CFArrayGetCount (int /*long*/ theArray);
+public static final native int CFArrayGetCount (long /*int*/ theArray);
/**
* @param theArray cast=(CFArrayRef)
* @param idx cast=(CFIndex)
*/
-public static final native int /*long*/ CFArrayGetValueAtIndex (int /*long*/ theArray, int idx);
+public static final native long /*int*/ CFArrayGetValueAtIndex (long /*int*/ theArray, int idx);
/**
* @param allocator cast=(CFAllocatorRef)
* @param bytes cast=(const UInt8 *)
* @param length cast=(CFIndex)
*/
-public static final native int /*long*/ CFDataCreate (int /*long*/ allocator, byte [] bytes, int length);
+public static final native long /*int*/ CFDataCreate (long /*int*/ allocator, byte [] bytes, int length);
/**
* @param theData cast=(CFDataRef)
*/
-public static final native int /*long*/ CFDataGetBytePtr (int /*long*/ theData);
+public static final native long /*int*/ CFDataGetBytePtr (long /*int*/ theData);
/**
* @param theData cast=(CFDataRef)
*/
-public static final native int CFDataGetLength (int /*long*/ theData);
+public static final native int CFDataGetLength (long /*int*/ theData);
/**
* @param allocator cast=(CFAllocatorRef)
* @param keys cast=(const void **)
@@ -96,106 +96,106 @@ public static final native int CFDataGetLength (int /*long*/ theData);
* @param keyCallBacks cast=(const CFDictionaryKeyCallBacks *)
* @param valueCallBacks cast=(const CFDictionaryValueCallBacks *)
*/
-public static final native int /*long*/ CFDictionaryCreate (int /*long*/ allocator, int /*long*/[] keys, int /*long*/[] values, int numValues, int /*long*/ keyCallBacks, int /*long*/ valueCallBacks);
+public static final native long /*int*/ CFDictionaryCreate (long /*int*/ allocator, long /*int*/[] keys, long /*int*/[] values, int numValues, long /*int*/ keyCallBacks, long /*int*/ valueCallBacks);
/**
* @param inAllocator cast=(CFAllocatorRef)
* @param headerFields cast=(CFDictionaryRef)
* @param inURL cast=(CFURLRef)
*/
-public static final native int /*long*/ CFHTTPCookieCreateWithResponseHeaderFields (int /*long*/ inAllocator, int /*long*/ headerFields, int /*long*/ inURL);
+public static final native long /*int*/ CFHTTPCookieCreateWithResponseHeaderFields (long /*int*/ inAllocator, long /*int*/ headerFields, long /*int*/ inURL);
/**
* @param inCookie cast=(CFHTTPCookieRef)
*/
-public static final native int CFHTTPCookieGetFlags (int /*long*/ inCookie);
+public static final native int CFHTTPCookieGetFlags (long /*int*/ inCookie);
/**
* @param inCookie cast=(CFHTTPCookieRef)
*/
-public static final native int /*long*/ CFHTTPCookieGetName (int /*long*/ inCookie);
+public static final native long /*int*/ CFHTTPCookieGetName (long /*int*/ inCookie);
/**
* @param inCookie cast=(CFHTTPCookieRef)
*/
-public static final native int /*long*/ CFHTTPCookieGetValue (int /*long*/ inCookie);
+public static final native long /*int*/ CFHTTPCookieGetValue (long /*int*/ inCookie);
/**
* @param inCookieStorage cast=(CFHTTPCookieStorageRef)
*/
-public static final native int /*long*/ CFHTTPCookieStorageCopyCookies (int /*long*/ inCookieStorage);
+public static final native long /*int*/ CFHTTPCookieStorageCopyCookies (long /*int*/ inCookieStorage);
/**
* @param inCookieStorage cast=(CFHTTPCookieStorageRef)
* @param inURL cast=(CFURLRef)
* @param sendSecureCookies cast=(Boolean)
*/
-public static final native int /*long*/ CFHTTPCookieStorageCopyCookiesForURL (int /*long*/ inCookieStorage, int /*long*/ inURL, boolean sendSecureCookies);
+public static final native long /*int*/ CFHTTPCookieStorageCopyCookiesForURL (long /*int*/ inCookieStorage, long /*int*/ inURL, boolean sendSecureCookies);
/**
* @param inCookieStorage cast=(CFHTTPCookieStorageRef)
* @param inCookie cast=(CFHTTPCookieRef)
*/
-public static final native void CFHTTPCookieStorageDeleteCookie (int /*long*/ inCookieStorage, int /*long*/ inCookie);
+public static final native void CFHTTPCookieStorageDeleteCookie (long /*int*/ inCookieStorage, long /*int*/ inCookie);
/**
* @param inCookieStorage cast=(CFHTTPCookieStorageRef)
* @param inCookie cast=(CFHTTPCookieRef)
*/
-public static final native void CFHTTPCookieStorageSetCookie (int /*long*/ inCookieStorage, int /*long*/ inCookie);
+public static final native void CFHTTPCookieStorageSetCookie (long /*int*/ inCookieStorage, long /*int*/ inCookie);
/**
* @param cf cast=(CFTypeRef)
*/
-public static final native void CFRelease (int /*long*/ cf);
+public static final native void CFRelease (long /*int*/ cf);
/**
* @param alloc cast=(CFAllocatorRef)
* @param chars cast=(const UniChar *)
* @param numChars cast=(CFIndex)
*/
-public static final native int CFStringCreateWithCharacters (int /*long*/ alloc, char[] chars, int numChars);
+public static final native int CFStringCreateWithCharacters (long /*int*/ alloc, char[] chars, int numChars);
/**
* @param theString cast=(CFStringRef)
* @param idx cast=(CFIndex)
*/
-public static final native char CFStringGetCharacterAtIndex (int /*long*/ theString, int idx);
+public static final native char CFStringGetCharacterAtIndex (long /*int*/ theString, int idx);
/**
* @param theString cast=(CFStringRef)
*/
-public static final native int /*long*/ CFStringGetCharactersPtr (int /*long*/ theString);
+public static final native long /*int*/ CFStringGetCharactersPtr (long /*int*/ theString);
/**
* @param theString cast=(CFStringRef)
*/
-public static final native int CFStringGetLength (int /*long*/ theString);
+public static final native int CFStringGetLength (long /*int*/ theString);
/**
* @param allocator cast=(CFAllocatorRef)
* @param URLString cast=(CFStringRef)
* @param baseURL cast=(CFURLRef)
*/
-public static final native int /*long*/ CFURLCreateWithString (int /*long*/ allocator, int /*long*/ URLString, int /*long*/ baseURL);
+public static final native long /*int*/ CFURLCreateWithString (long /*int*/ allocator, long /*int*/ URLString, long /*int*/ baseURL);
/**
* @param alloc cast=(CFAllocatorRef)
* @param origRequest cast=(CFURLRequestRef)
*/
-public static final native int /*long*/ CFURLRequestCreateMutableCopy (int /*long*/ alloc, int /*long*/ origRequest);
+public static final native long /*int*/ CFURLRequestCreateMutableCopy (long /*int*/ alloc, long /*int*/ origRequest);
/**
* @param request cast=(CFURLRequestRef)
*/
-public static final native int /*long*/ CFURLRequestCopyHTTPRequestBody (int /*long*/ request);
+public static final native long /*int*/ CFURLRequestCopyHTTPRequestBody (long /*int*/ request);
/**
* @param mutableHTTPRequest cast=(CFMutableURLRequestRef)
* @param httpBody cast=(CFDataRef)
*/
-public static final native void CFURLRequestSetHTTPRequestBody (int /*long*/ mutableHTTPRequest, int /*long*/ httpBody);
+public static final native void CFURLRequestSetHTTPRequestBody (long /*int*/ mutableHTTPRequest, long /*int*/ httpBody);
/**
* @param mutableRequest cast=(CFMutableURLRequestRef)
* @param url cast=(CFURLRef)
*/
-public static final native void CFURLRequestSetURL (int /*long*/ mutableRequest, int /*long*/ url);
+public static final native void CFURLRequestSetURL (long /*int*/ mutableRequest, long /*int*/ url);
/**
* @param definition cast=(const JSClassDefinition*)
*/
-public static final native int /*long*/ JSClassCreate (int /*long*/ definition);
+public static final native long /*int*/ JSClassCreate (long /*int*/ definition);
/**
* @param jsClass cast=(JSClassRef)
*/
-public static final native int /*long*/ JSClassRetain (int /*long*/ jsClass);
+public static final native long /*int*/ JSClassRetain (long /*int*/ jsClass);
/**
* @param ctx cast=(JSContextRef)
*/
-public static final native int /*long*/ JSContextGetGlobalObject (int /*long*/ ctx);
+public static final native long /*int*/ JSContextGetGlobalObject (long /*int*/ ctx);
/**
* @param ctx cast=(JSContextRef)
* @param script cast=(JSStringRef)
@@ -203,48 +203,48 @@ public static final native int /*long*/ JSContextGetGlobalObject (int /*long*/ c
* @param sourceURL cast=(JSStringRef)
* @param exception cast=(JSValueRef *)
*/
-public static final native int /*long*/ JSEvaluateScript (int /*long*/ ctx, int /*long*/ script, int /*long*/ thisObject, int /*long*/ sourceURL, int startingLineNumber, int /*long*/[] exception);
+public static final native long /*int*/ JSEvaluateScript (long /*int*/ ctx, long /*int*/ script, long /*int*/ thisObject, long /*int*/ sourceURL, int startingLineNumber, long /*int*/[] exception);
/**
* @param ctx cast=(JSGlobalContextRef)
*/
-public static final native int JSGlobalContextRetain (int /*long*/ ctx);
+public static final native int JSGlobalContextRetain (long /*int*/ ctx);
/**
* @param object cast=(JSObjectRef)
*/
-public static final native int /*long*/ JSObjectGetPrivate (int /*long*/ object);
+public static final native long /*int*/ JSObjectGetPrivate (long /*int*/ object);
/**
* @param ctx cast=(JSContextRef)
* @param object cast=(JSObjectRef)
* @param propertyName cast=(JSStringRef)
* @param exception cast=(JSValueRef*)
*/
-public static final native int /*long*/ JSObjectGetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/[] exception);
+public static final native long /*int*/ JSObjectGetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/[] exception);
/**
* @param ctx cast=(JSContextRef)
* @param object cast=(JSObjectRef)
* @param propertyIndex cast=(unsigned)
* @param exception cast=(JSValueRef*)
*/
-public static final native int /*long*/ JSObjectGetPropertyAtIndex (int /*long*/ ctx, int /*long*/ object, int propertyIndex, int /*long*/[] exception);
+public static final native long /*int*/ JSObjectGetPropertyAtIndex (long /*int*/ ctx, long /*int*/ object, int propertyIndex, long /*int*/[] exception);
/**
* @param ctx cast=(JSContextRef)
* @param jsClass cast=(JSClassRef)
* @param data cast=(void *)
*/
-public static final native int JSObjectMake (int /*long*/ ctx, int /*long*/ jsClass, int /*long*/ data);
+public static final native int JSObjectMake (long /*int*/ ctx, long /*int*/ jsClass, long /*int*/ data);
/**
* @param ctx cast=(JSContextRef)
* @param argumentCount cast=(size_t)
* @param arguments cast=(const struct OpaqueJSValue * const*)
* @param exception cast=(JSValueRef*)
*/
-public static final native int /*long*/ JSObjectMakeArray (int /*long*/ ctx, int /*long*/ argumentCount, int /*long*/[] arguments, int /*long*/[] exception);
+public static final native long /*int*/ JSObjectMakeArray (long /*int*/ ctx, long /*int*/ argumentCount, long /*int*/[] arguments, long /*int*/[] exception);
/**
* @param ctx cast=(JSContextRef)
* @param name cast=(JSStringRef)
* @param callAsFunction cast=(JSObjectCallAsFunctionCallback)
*/
-public static final native int JSObjectMakeFunctionWithCallback (int /*long*/ ctx, int /*long*/ name, int /*long*/ callAsFunction);
+public static final native int JSObjectMakeFunctionWithCallback (long /*int*/ ctx, long /*int*/ name, long /*int*/ callAsFunction);
/**
* @param ctx cast=(JSContextRef)
* @param object cast=(JSObjectRef)
@@ -253,84 +253,84 @@ public static final native int JSObjectMakeFunctionWithCallback (int /*long*/ ct
* @param attributes cast=(JSPropertyAttributes)
* @param exception cast=(JSValueRef *)
*/
-public static final native void JSObjectSetProperty (int /*long*/ ctx, int /*long*/ object, int /*long*/ propertyName, int /*long*/ value, int /*long*/ attributes, int /*long*/[] exception);
+public static final native void JSObjectSetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ value, long /*int*/ attributes, long /*int*/[] exception);
/**
* @param string cast=(const char*)
*/
-public static final native int /*long*/ JSStringCreateWithUTF8CString (byte[] string);
+public static final native long /*int*/ JSStringCreateWithUTF8CString (byte[] string);
/**
* @param string cast=(JSStringRef)
*/
-public static final native int JSStringGetLength (int /*long*/ string);
+public static final native int JSStringGetLength (long /*int*/ string);
/**
* @param string cast=(JSStringRef)
*/
-public static final native int /*long*/ JSStringGetMaximumUTF8CStringSize (int /*long*/ string);
+public static final native long /*int*/ JSStringGetMaximumUTF8CStringSize (long /*int*/ string);
/**
* @param string cast=(JSStringRef)
* @param buffer cast=(char *)
* @param bufferSize cast=(size_t)
*/
-public static final native int JSStringGetUTF8CString (int /*long*/ string, byte[] buffer, int /*long*/ bufferSize);
+public static final native int JSStringGetUTF8CString (long /*int*/ string, byte[] buffer, long /*int*/ bufferSize);
/**
* @param a cast=(JSStringRef)
* @param b cast=(const char *)
*/
-public static final native int JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b);
+public static final native int JSStringIsEqualToUTF8CString (long /*int*/ a, byte[] b);
/**
* @param string cast=(JSStringRef)
*/
-public static final native void JSStringRelease (int /*long*/ string);
+public static final native void JSStringRelease (long /*int*/ string);
/**
* @param ctx cast=(JSContextRef)
* @param value cast=(JSValueRef)
*/
-public static final native int JSValueGetType (int /*long*/ ctx, int /*long*/ value);
+public static final native int JSValueGetType (long /*int*/ ctx, long /*int*/ value);
/**
* @param ctx cast=(JSContextRef)
* @param value cast=(JSValueRef)
* @param jsClass cast=(JSClassRef)
*/
-public static final native int JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ value, int /*long*/ jsClass);
+public static final native int JSValueIsObjectOfClass (long /*int*/ ctx, long /*int*/ value, long /*int*/ jsClass);
/**
* @param ctx cast=(JSContextRef)
* @param b cast=(bool)
*/
-public static final native int /*long*/ JSValueMakeBoolean (int /*long*/ ctx, int /*long*/ b);
+public static final native long /*int*/ JSValueMakeBoolean (long /*int*/ ctx, long /*int*/ b);
/**
* @param ctx cast=(JSContextRef)
*/
-public static final native int /*long*/ JSValueMakeNull (int /*long*/ ctx);
+public static final native long /*int*/ JSValueMakeNull (long /*int*/ ctx);
/**
* @param ctx cast=(JSContextRef)
* @param number cast=(double)
*/
-public static final native int /*long*/ JSValueMakeNumber (int /*long*/ ctx, double number);
+public static final native long /*int*/ JSValueMakeNumber (long /*int*/ ctx, double number);
/**
* @param ctx cast=(JSContextRef)
* @param string cast=(JSStringRef)
*/
-public static final native int /*long*/ JSValueMakeString (int /*long*/ ctx, int /*long*/ string);
+public static final native long /*int*/ JSValueMakeString (long /*int*/ ctx, long /*int*/ string);
/**
* @param ctx cast=(JSContextRef)
*/
-public static final native int /*long*/ JSValueMakeUndefined (int /*long*/ ctx);
+public static final native long /*int*/ JSValueMakeUndefined (long /*int*/ ctx);
/**
* @param ctx cast=(JSContextRef)
* @param value cast=(JSValueRef)
* @param exception cast=(JSValueRef*)
*/
-public static final native double JSValueToNumber (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception);
+public static final native double JSValueToNumber (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception);
/**
* @param ctx cast=(JSContextRef)
* @param value cast=(JSValueRef)
* @param exception cast=(JSValueRef*)
*/
-public static final native int /*long*/ JSValueToStringCopy (int /*long*/ ctx, int /*long*/ value, int /*long*/[] exception);
+public static final native long /*int*/ JSValueToStringCopy (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception);
/** @method flags=const address*/
-public static final native int /*long*/ kCFCopyStringDictionaryKeyCallBacks ();
+public static final native long /*int*/ kCFCopyStringDictionaryKeyCallBacks ();
/** @method flags=const address*/
-public static final native int /*long*/ kCFTypeDictionaryValueCallBacks ();
+public static final native long /*int*/ kCFTypeDictionaryValueCallBacks ();
public static final native int JSClassDefinition_sizeof ();
/**
@@ -338,10 +338,10 @@ public static final native int JSClassDefinition_sizeof ();
* @param src cast=(const void *),flags=no_out
* @param size cast=(size_t)
*/
-public static final native void memmove (int /*long*/ dest, JSClassDefinition src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, JSClassDefinition src, long /*int*/ size);
/** @method flags=no_gen */
-public static final native int WebKitCreateInstance (byte[] rclsid, int /*long*/ pUnkOuter, byte[] refiid, int /*long*/[] ppvObject);
-public static final int WebKitCreateInstance (GUID clsid, int /*long*/ pUnkOuter, GUID iid, int /*long*/[] ppvObject) {
+public static final native int WebKitCreateInstance (byte[] rclsid, long /*int*/ pUnkOuter, byte[] refiid, long /*int*/[] ppvObject);
+public static final int WebKitCreateInstance (GUID clsid, long /*int*/ pUnkOuter, GUID iid, long /*int*/[] ppvObject) {
byte[] rclsid = new byte[GUID.sizeof];
OS.IIDFromString ((clsid.toString () + '\0').toCharArray (), rclsid);
byte[] refiid = new byte[GUID.sizeof];
@@ -350,12 +350,12 @@ public static final int WebKitCreateInstance (GUID clsid, int /*long*/ pUnkOuter
}
/** @method flags=no_gen */
-public static final native int /*long*/ JSObjectCallAsFunctionProc_CALLBACK (int /*long*/ func);
+public static final native long /*int*/ JSObjectCallAsFunctionProc_CALLBACK (long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ JSObjectGetPropertyProc_CALLBACK (int /*long*/ func);
+public static final native long /*int*/ JSObjectGetPropertyProc_CALLBACK (long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ JSObjectHasPropertyProc_CALLBACK (int /*long*/ func);
+public static final native long /*int*/ JSObjectHasPropertyProc_CALLBACK (long /*int*/ func);
/** @method flags=no_gen */
-public static final native int /*long*/ willPerformClientRedirectToURL_CALLBACK (int /*long*/ func);
+public static final native long /*int*/ willPerformClientRedirectToURL_CALLBACK (long /*int*/ func);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Path.java b/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Path.java
index 4a2cb56ccf..97402ebade 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Path.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Path.java
@@ -49,7 +49,7 @@ public class Path extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
boolean moved, closed = true;
@@ -78,7 +78,7 @@ public class Path extends Resource {
public Path (Device device) {
super(device);
this.device.checkCairo();
- int /*long*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1);
+ long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1);
if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
handle = Cairo.cairo_create(surface);
Cairo.cairo_surface_destroy(surface);
@@ -121,12 +121,12 @@ public Path (Device device, Path path, float flatness) {
super(device);
if (path == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (path.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
- int /*long*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1);
+ long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1);
if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
handle = Cairo.cairo_create(surface);
Cairo.cairo_surface_destroy(surface);
if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ copy;
+ long /*int*/ copy;
flatness = Math.max(0, flatness);
if (flatness == 0) {
copy = Cairo.cairo_copy_path(path.handle);
@@ -251,7 +251,7 @@ public void addPath(Path path) {
if (path == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (path.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
moved = false;
- int /*long*/ copy = Cairo.cairo_copy_path(path.handle);
+ long /*int*/ copy = Cairo.cairo_copy_path(path.handle);
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(handle, copy);
Cairo.cairo_path_destroy(copy);
@@ -350,8 +350,8 @@ public boolean contains(float x, float y, GC gc, boolean outline) {
gc.initCairo();
gc.checkGC(GC.LINE_CAP | GC.LINE_JOIN | GC.LINE_STYLE | GC.LINE_WIDTH);
boolean result = false;
- int /*long*/ cairo = gc.data.cairo;
- int /*long*/ copy = Cairo.cairo_copy_path(handle);
+ long /*int*/ cairo = gc.data.cairo;
+ long /*int*/ copy = Cairo.cairo_copy_path(handle);
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
@@ -409,7 +409,7 @@ public void getBounds(float[] bounds) {
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (bounds == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (bounds.length < 4) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
- int /*long*/ copy = Cairo.cairo_copy_path(handle);
+ long /*int*/ copy = Cairo.cairo_copy_path(handle);
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
cairo_path_t path = new cairo_path_t();
Cairo.memmove(path, copy, cairo_path_t.sizeof);
@@ -421,7 +421,7 @@ public void getBounds(float[] bounds) {
double[] points = new double[6];
cairo_path_data_t data = new cairo_path_data_t();
while (i < path.num_data) {
- int /*long*/ offset = path.data + i * cairo_path_data_t.sizeof;
+ long /*int*/ offset = path.data + i * cairo_path_data_t.sizeof;
Cairo.memmove(data, offset, cairo_path_data_t.sizeof);
switch (data.type) {
case Cairo.CAIRO_PATH_MOVE_TO:
@@ -502,7 +502,7 @@ public void getCurrentPoint(float[] point) {
*/
public PathData getPathData() {
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
- int /*long*/ copy = Cairo.cairo_copy_path(handle);
+ long /*int*/ copy = Cairo.cairo_copy_path(handle);
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
cairo_path_t path = new cairo_path_t();
Cairo.memmove(path, copy, cairo_path_t.sizeof);
@@ -514,7 +514,7 @@ public PathData getPathData() {
double[] points = new double[6];
cairo_path_data_t data = new cairo_path_data_t();
while (i < path.num_data) {
- int /*long*/ offset = path.data + i * cairo_path_data_t.sizeof;
+ long /*int*/ offset = path.data + i * cairo_path_data_t.sizeof;
Cairo.memmove(data, offset, cairo_path_data_t.sizeof);
switch (data.type) {
case Cairo.CAIRO_PATH_MOVE_TO:
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Pattern.java b/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Pattern.java
index 9e94116ef0..848ea49ae6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Pattern.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cairo/org/eclipse/swt/graphics/Pattern.java
@@ -46,9 +46,9 @@ public class Pattern extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
- int /*long*/ surface;
+ long /*int*/ surface;
/**
* Constructs a new Pattern given an image. Drawing with the resulting
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 8e156278e6..fce4b2d67c 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
@@ -451,8 +451,8 @@ public void copyArea(Image image, int x, int y) {
for (int i = 0; i < count[0]; i++) {
int display = displays[i];
OS.CGDisplayBounds(display, rect);
- int /*long*/ srcImage = 0;
- int /*long*/ address = OS.VERSION >= 0x1070 ? 0 : OS.CGDisplayBaseAddress(display);
+ long /*int*/ srcImage = 0;
+ long /*int*/ address = OS.VERSION >= 0x1070 ? 0 : OS.CGDisplayBaseAddress(display);
if (address != 0) {
int width = OS.CGDisplayPixelsWide(display);
int height = OS.CGDisplayPixelsHigh(display);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java
index f4d1cb61a0..2a7b660ecf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java
@@ -43,7 +43,7 @@ public final class Color extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public float /*double*/ [] handle;
+ public double /*float*/ [] handle;
Color(Device device) {
super(device);
@@ -126,7 +126,7 @@ public boolean equals(Object object) {
if (object == this) return true;
if (!(object instanceof Color)) return false;
Color color = (Color)object;
- float /*double*/ [] rgbColor = color.handle;
+ double /*float*/ [] rgbColor = color.handle;
if (handle == rgbColor) return true;
return device == color.device &&
(int)(handle[0] * 255) == (int)(rgbColor[0] * 255) &&
@@ -220,8 +220,8 @@ public RGB getRGB () {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public static Color cocoa_new(Device device, float /*double*/ [] handle) {
- float /*double*/ [] rgbColor = handle;
+public static Color cocoa_new(Device device, double /*float*/ [] handle) {
+ double /*float*/ [] rgbColor = handle;
Color color = new Color(device);
color.handle = rgbColor;
return color;
@@ -233,7 +233,7 @@ void init(int red, int green, int blue) {
(blue > 255) || (blue < 0)) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
- float /*double*/ [] rgbColor = new float /*double*/ [4];
+ double /*float*/ [] rgbColor = new double /*float*/ [4];
rgbColor[0] = red / 255f;
rgbColor[1] = green / 255f;
rgbColor[2] = blue / 255f;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java
index 43dff75607..986ef93fbf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java
@@ -243,7 +243,7 @@ public Rectangle getBounds () {
checkDevice ();
NSScreen screen = getPrimaryScreen();
NSRect frame = screen.frame();
- float /*double*/ scaleFactor = screen.userSpaceScaleFactor();
+ double /*float*/ scaleFactor = screen.userSpaceScaleFactor();
frame.x /= scaleFactor;
frame.y /= scaleFactor;
frame.width /= scaleFactor;
@@ -368,7 +368,7 @@ public FontData[] getFontList (String faceName, boolean scalable) {
NSArray families = NSFontManager.sharedFontManager().availableFontFamilies();
FontData[] fds = new FontData[100];
if (families != null) {
- int /*long*/ familyCount = families.count();
+ long /*int*/ familyCount = families.count();
for (int i = 0; i < familyCount; i++) {
NSString nsFamily = new NSString(families.objectAtIndex(i));
String name = nsFamily.getString();
@@ -379,8 +379,8 @@ public FontData[] getFontList (String faceName, boolean scalable) {
for (int j = 0; j < fontCount; j++) {
NSArray fontDetails = new NSArray(fonts.objectAtIndex(j));
String nsName = new NSString(fontDetails.objectAtIndex(0)).getString();
- int /*long*/ weight = new NSNumber(fontDetails.objectAtIndex(2)).integerValue();
- int /*long*/ traits = new NSNumber(fontDetails.objectAtIndex(3)).integerValue();
+ long /*int*/ weight = new NSNumber(fontDetails.objectAtIndex(2)).integerValue();
+ long /*int*/ traits = new NSNumber(fontDetails.objectAtIndex(3)).integerValue();
int style = SWT.NORMAL;
if ((traits & OS.NSItalicFontMask) != 0) style |= SWT.ITALIC;
if (weight == 9) style |= SWT.BOLD;
@@ -533,7 +533,7 @@ protected void init () {
/* Initialize the system font slot */
boolean smallFonts = System.getProperty("org.eclipse.swt.internal.carbon.smallFonts") != null;
- float /*double*/ systemFontSize = smallFonts ? NSFont.smallSystemFontSize() : NSFont.systemFontSize();
+ double /*float*/ systemFontSize = smallFonts ? NSFont.smallSystemFontSize() : NSFont.systemFontSize();
Point dpi = this.dpi = getDPI(), screenDPI = getScreenDPI();
NSFont font = NSFont.systemFontOfSize(systemFontSize * dpi.y / screenDPI.y);
font.retain();
@@ -555,7 +555,7 @@ protected void init () {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public abstract int /*long*/ internal_new_GC (GCData data);
+public abstract long /*int*/ internal_new_GC (GCData data);
/**
* Invokes platform specific functionality to dispose a GC handle.
@@ -572,7 +572,7 @@ public abstract int /*long*/ internal_new_GC (GCData data);
*
* @noreference This method is not intended to be referenced by clients.
*/
-public abstract void internal_dispose_GC (int /*long*/ hDC, GCData data);
+public abstract void internal_dispose_GC (long /*int*/ hDC, GCData data);
/**
* Returns true if the device has been disposed,
@@ -611,7 +611,7 @@ public boolean loadFont (String path) {
if (path == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
boolean result = false;
NSString nsPath = NSString.stringWith(path);
- int /*long*/ fsRepresentation = nsPath.fileSystemRepresentation();
+ long /*int*/ fsRepresentation = nsPath.fileSystemRepresentation();
if (fsRepresentation != 0) {
byte [] fsRef = new byte [80];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java
index 05b54f215f..45862474fd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java
@@ -248,7 +248,7 @@ public FontData[] getFontData() {
NSString str = handle.fontName();
String nsName = str.getString();
NSFontManager manager = NSFontManager.sharedFontManager();
- int /*long*/ traits = manager.traitsOfFont(handle);
+ long /*int*/ traits = manager.traitsOfFont(handle);
int style = SWT.NORMAL;
if ((traits & OS.NSItalicFontMask) != 0) style |= SWT.ITALIC;
if ((traits & OS.NSBoldFontMask) != 0) style |= SWT.BOLD;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
index 451e4074c3..00c8c62d65 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
@@ -75,8 +75,8 @@ public final class GC extends Resource {
CGPathElement element;
int count, typeCount;
byte[] types;
- float /*double*/[] points;
- float /*double*/ [] point;
+ double /*float*/[] points;
+ double /*float*/ [] point;
static final int TAB_COUNT = 32;
@@ -168,7 +168,7 @@ public GC(Drawable drawable, int style) {
try {
GCData data = new GCData();
data.style = checkStyle(style);
- int /*long*/ contextId = drawable.internal_new_GC(data);
+ long /*int*/ contextId = drawable.internal_new_GC(data);
Device device = data.device;
if (device == null) device = Device.getDevice();
if (device == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
@@ -204,13 +204,13 @@ static int checkStyle (int style) {
*/
public static GC cocoa_new(Drawable drawable, GCData data) {
GC gc = new GC();
- int /*long*/ context = drawable.internal_new_GC(data);
+ long /*int*/ context = drawable.internal_new_GC(data);
gc.device = data.device;
gc.init(drawable, data, context);
return gc;
}
-int /*long*/ applierFunc(int /*long*/ info, int /*long*/ elementPtr) {
+long /*int*/ applierFunc(long /*int*/ info, long /*int*/ elementPtr) {
OS.memmove(element, elementPtr, CGPathElement.sizeof);
int type = 0, length = 1;
switch (element.type) {
@@ -252,7 +252,7 @@ NSAutoreleasePool checkGC (int mask) {
NSRect rect = view.convertRect_toView_(view.bounds(), null);
if (data.paintRect == null) {
transform.translateXBy(rect.x, rect.y + rect.height);
- float /*double*/ userSpaceScaleFactor = view.window().userSpaceScaleFactor();
+ double /*float*/ userSpaceScaleFactor = view.window().userSpaceScaleFactor();
transform.scaleXBy(userSpaceScaleFactor, userSpaceScaleFactor);
} else {
transform.translateXBy(0, rect.height);
@@ -288,7 +288,7 @@ NSAutoreleasePool checkGC (int mask) {
if (pattern != null) {
if (pattern.color != null) pattern.color.setStroke();
} else {
- float /*double*/ [] color = data.foreground;
+ double /*float*/ [] color = data.foreground;
if (data.fg != null) data.fg.release();
NSColor fg = data.fg = NSColor.colorWithDeviceRed(color[0], color[1], color[2], data.alpha / 255f);
fg.retain();
@@ -300,7 +300,7 @@ NSAutoreleasePool checkGC (int mask) {
if (pattern != null) {
if (pattern.color != null) pattern.color.setFill();
} else {
- float /*double*/ [] color = data.foreground;
+ double /*float*/ [] color = data.foreground;
if (data.fg != null) data.fg.release();
NSColor fg = data.fg = NSColor.colorWithDeviceRed(color[0], color[1], color[2], data.alpha / 255f);
fg.retain();
@@ -313,7 +313,7 @@ NSAutoreleasePool checkGC (int mask) {
if (pattern != null) {
if (pattern.color != null) pattern.color.setFill();
} else {
- float /*double*/ [] color = data.background;
+ double /*float*/ [] color = data.background;
if (data.bg != null) data.bg.release();
NSColor bg = data.bg = NSColor.colorWithDeviceRed(color[0], color[1], color[2], data.alpha / 255f);
bg.retain();
@@ -344,7 +344,7 @@ NSAutoreleasePool checkGC (int mask) {
case SWT.LINE_CUSTOM: dashes = data.lineDashes; break;
}
if (dashes != null) {
- float /*double*/[] lengths = new float /*double*/[dashes.length];
+ double /*float*/[] lengths = new double /*float*/[dashes.length];
for (int i = 0; i < lengths.length; i++) {
lengths[i] = width == 0 || data.lineStyle == SWT.LINE_CUSTOM ? dashes[i] : dashes[i] * width;
}
@@ -381,9 +381,9 @@ NSAutoreleasePool checkGC (int mask) {
if (data.transform != null) {
size = data.transform.transformSize(size);
}
- float /*double*/ scaling = size.width;
+ double /*float*/ scaling = size.width;
if (scaling < 0) scaling = -scaling;
- float /*double*/ strokeWidth = data.lineWidth * scaling;
+ double /*float*/ strokeWidth = data.lineWidth * scaling;
if (strokeWidth == 0 || ((int)strokeWidth % 2) == 1) {
data.drawXOffset = 0.5f / scaling;
}
@@ -467,7 +467,7 @@ public void copyArea(Image image, int x, int y) {
NSGraphicsContext context = NSGraphicsContext.graphicsContextWithBitmapImageRep(imageRep);
NSGraphicsContext.static_saveGraphicsState();
NSGraphicsContext.setCurrentContext(context);
- int /*long*/ contextID = OS.objc_msgSend(NSApplication.sharedApplication().id, OS.sel_contextID);
+ long /*int*/ contextID = OS.objc_msgSend(NSApplication.sharedApplication().id, OS.sel_contextID);
OS.CGContextCopyWindowContentsToRect(context.graphicsPort(), destRect, contextID, window.windowNumber(), srcRect);
NSGraphicsContext.static_restoreGraphicsState();
return;
@@ -481,35 +481,35 @@ public void copyArea(Image image, int x, int y) {
rect.size.width = size.width;
rect.size.height = size.height;
int displayCount = 16;
- int /*long*/ displays = OS.malloc(4 * displayCount), countPtr = OS.malloc(4);
+ long /*int*/ displays = OS.malloc(4 * displayCount), countPtr = OS.malloc(4);
if (OS.CGGetDisplaysWithRect(rect, displayCount, displays, countPtr) != 0) return;
int[] count = new int[1], display = new int[1];
OS.memmove(count, countPtr, OS.PTR_SIZEOF);
for (int i = 0; i < count[0]; i++) {
OS.memmove(display, displays + (i * 4), 4);
OS.CGDisplayBounds(display[0], rect);
- int /*long*/ srcImage = 0;
- int /*long*/ address = OS.VERSION >= 0x1070 ? 0 : OS.CGDisplayBaseAddress(display[0]);
+ long /*int*/ srcImage = 0;
+ long /*int*/ address = OS.VERSION >= 0x1070 ? 0 : OS.CGDisplayBaseAddress(display[0]);
if (address != 0) {
- int /*long*/ width = OS.CGDisplayPixelsWide(display[0]);
- int /*long*/ height = OS.CGDisplayPixelsHigh(display[0]);
- int /*long*/ bpr = OS.CGDisplayBytesPerRow(display[0]);
- int /*long*/ bpp = OS.CGDisplayBitsPerPixel(display[0]);
- int /*long*/ bps = OS.CGDisplayBitsPerSample(display[0]);
+ long /*int*/ width = OS.CGDisplayPixelsWide(display[0]);
+ long /*int*/ height = OS.CGDisplayPixelsHigh(display[0]);
+ long /*int*/ bpr = OS.CGDisplayBytesPerRow(display[0]);
+ long /*int*/ bpp = OS.CGDisplayBitsPerPixel(display[0]);
+ long /*int*/ bps = OS.CGDisplayBitsPerSample(display[0]);
int bitmapInfo = OS.kCGImageAlphaNoneSkipFirst;
switch ((int)/*63*/bpp) {
case 16: bitmapInfo |= OS.kCGBitmapByteOrder16Host; break;
case 32: bitmapInfo |= OS.kCGBitmapByteOrder32Host; break;
}
if (OS.__BIG_ENDIAN__() && OS.VERSION >= 0x1040) {
- int /*long*/ colorspace = OS.CGColorSpaceCreateDeviceRGB();
- int /*long*/ context = OS.CGBitmapContextCreate(address, width, height, bps, bpr, colorspace, bitmapInfo);
+ long /*int*/ colorspace = OS.CGColorSpaceCreateDeviceRGB();
+ long /*int*/ context = OS.CGBitmapContextCreate(address, width, height, bps, bpr, colorspace, bitmapInfo);
OS.CGColorSpaceRelease(colorspace);
srcImage = OS.CGBitmapContextCreateImage(context);
OS.CGContextRelease(context);
} else {
- int /*long*/ provider = OS.CGDataProviderCreateWithData(0, address, bpr * height, 0);
- int /*long*/ colorspace = OS.CGColorSpaceCreateDeviceRGB();
+ long /*int*/ provider = OS.CGDataProviderCreateWithData(0, address, bpr * height, 0);
+ long /*int*/ colorspace = OS.CGColorSpaceCreateDeviceRGB();
srcImage = OS.CGImageCreate(width, height, bps, bpp, bpr, colorspace, bitmapInfo, provider, 0, true, 0);
OS.CGColorSpaceRelease(colorspace);
OS.CGDataProviderRelease(provider);
@@ -530,23 +530,23 @@ public void copyArea(Image image, int x, int y) {
}
}
-void copyArea (Image image, int x, int y, int /*long*/ srcImage) {
+void copyArea (Image image, int x, int y, long /*int*/ srcImage) {
if (srcImage == 0) return;
NSBitmapImageRep rep = image.getRepresentation();
- int /*long*/ bpc = rep.bitsPerSample();
- int /*long*/ width = rep.pixelsWide();
- int /*long*/ height = rep.pixelsHigh();
- int /*long*/ bpr = rep.bytesPerRow();
- int /*long*/ data = rep.bitmapData();
- int /*long*/ format = rep.bitmapFormat();
+ long /*int*/ bpc = rep.bitsPerSample();
+ long /*int*/ width = rep.pixelsWide();
+ long /*int*/ height = rep.pixelsHigh();
+ long /*int*/ bpr = rep.bytesPerRow();
+ long /*int*/ data = rep.bitmapData();
+ long /*int*/ format = rep.bitmapFormat();
int alphaInfo;
if (rep.hasAlpha()) {
alphaInfo = (format & OS.NSAlphaFirstBitmapFormat) != 0 ? OS.kCGImageAlphaFirst : OS.kCGImageAlphaLast;
} else {
alphaInfo = (format & OS.NSAlphaFirstBitmapFormat) != 0 ? OS.kCGImageAlphaNoneSkipFirst : OS.kCGImageAlphaNoneSkipLast;
}
- int /*long*/ colorspace = OS.CGColorSpaceCreateDeviceRGB();
- int /*long*/ context = OS.CGBitmapContextCreate(data, width, height, bpc, bpr, colorspace, alphaInfo);
+ long /*int*/ colorspace = OS.CGColorSpaceCreateDeviceRGB();
+ long /*int*/ context = OS.CGBitmapContextCreate(data, width, height, bpc, bpr, colorspace, alphaInfo);
OS.CGColorSpaceRelease(colorspace);
if (context != 0) {
CGRect rect = new CGRect();
@@ -712,14 +712,14 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d
}
}
-static int /*long*/ createCGPathRef(NSBezierPath nsPath) {
- int /*long*/ count = nsPath.elementCount();
+static long /*int*/ createCGPathRef(NSBezierPath nsPath) {
+ long /*int*/ count = nsPath.elementCount();
if (count > 0) {
- int /*long*/ cgPath = OS.CGPathCreateMutable();
+ long /*int*/ cgPath = OS.CGPathCreateMutable();
if (cgPath == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ points = OS.malloc(NSPoint.sizeof * 3);
+ long /*int*/ points = OS.malloc(NSPoint.sizeof * 3);
if (points == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- float /*double*/ [] pt = new float /*double*/ [6];
+ double /*float*/ [] pt = new double /*float*/ [6];
for (int i = 0; i < count; i++) {
int element = (int)/*64*/nsPath.elementAtIndex(i, points);
switch (element) {
@@ -777,7 +777,7 @@ NSAttributedString createString(String string, int flags, boolean draw) {
} else {
NSColor fg = data.fg;
if (fg == null) {
- float /*double*/ [] color = data.foreground;
+ double /*float*/ [] color = data.foreground;
fg = data.fg = NSColor.colorWithDeviceRed(color[0], color[1], color[2], data.alpha / 255f);
fg.retain();
}
@@ -822,16 +822,16 @@ NSAttributedString createString(String string, int flags, boolean draw) {
return attribStr;
}
-NSBezierPath createNSBezierPath (int /*long*/ cgPath) {
+NSBezierPath createNSBezierPath (long /*int*/ cgPath) {
Callback callback = new Callback(this, "applierFunc", 2);
- int /*long*/ proc = callback.getAddress();
+ long /*int*/ proc = callback.getAddress();
if (proc == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS);
count = typeCount = 0;
element = new CGPathElement();
OS.CGPathApply(cgPath, 0, proc);
types = new byte[typeCount];
- points = new float /*double*/ [count];
- point = new float /*double*/ [6];
+ points = new double /*float*/ [count];
+ point = new double /*float*/ [6];
count = typeCount = 0;
OS.CGPathApply(cgPath, 0, proc);
callback.dispose();
@@ -860,18 +860,18 @@ NSBezierPath createNSBezierPath (int /*long*/ cgPath) {
bezierPath.curveToPoint(nsPoint, nsPoint2, nsPoint3);
break;
case SWT.PATH_QUAD_TO:
- float /*double*/ currentX = nsPoint.x;
- float /*double*/ currentY = nsPoint.y;
+ double /*float*/ currentX = nsPoint.x;
+ double /*float*/ currentY = nsPoint.y;
nsPoint2.x = points[j++];
nsPoint2.y = points[j++];
nsPoint.x = points[j++];
nsPoint.y = points[j++];
- float /*double*/ x0 = currentX;
- float /*double*/ y0 = currentY;
- float /*double*/ cx1 = x0 + 2 * (nsPoint2.x - x0) / 3;
- float /*double*/ cy1 = y0 + 2 * (nsPoint2.y - y0) / 3;
- float /*double*/ cx2 = cx1 + (nsPoint.x - x0) / 3;
- float /*double*/ cy2 = cy1 + (nsPoint.y - y0) / 3;
+ double /*float*/ x0 = currentX;
+ double /*float*/ y0 = currentY;
+ double /*float*/ cx1 = x0 + 2 * (nsPoint2.x - x0) / 3;
+ double /*float*/ cy1 = y0 + 2 * (nsPoint2.y - y0) / 3;
+ double /*float*/ cx2 = cx1 + (nsPoint.x - x0) / 3;
+ double /*float*/ cy2 = cy1 + (nsPoint.y - y0) / 3;
nsPoint2.x = cx1;
nsPoint2.y = cy1;
nsPoint3.x = cx2;
@@ -970,7 +970,7 @@ public void drawArc(int x, int y, int width, int height, int startAngle, int arc
try {
handle.saveGraphicsState();
NSAffineTransform transform = NSAffineTransform.transform();
- float /*double*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset;
+ double /*float*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset;
transform.translateXBy(x + xOffset + width / 2f, y + yOffset + height / 2f);
transform.scaleXBy(width / 2f, height / 2f);
NSBezierPath path = data.path;
@@ -1341,7 +1341,7 @@ public void drawPolygon(int[] pointArray) {
if (pointArray.length < 4) return;
NSAutoreleasePool pool = checkGC(DRAW);
try {
- float /*double*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset;
+ double /*float*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset;
NSBezierPath path = data.path;
NSPoint pt = new NSPoint();
pt.x = pointArray[0] + xOffset;
@@ -1390,7 +1390,7 @@ public void drawPolyline(int[] pointArray) {
if (pointArray.length < 4) return;
NSAutoreleasePool pool = checkGC(DRAW);
try {
- float /*double*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset;
+ double /*float*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset;
NSBezierPath path = data.path;
NSPoint pt = new NSPoint();
pt.x = pointArray[0] + xOffset;
@@ -1699,7 +1699,7 @@ public void drawText (String string, int x, int y, int flags) {
} else {
NSColor bg = data.bg;
if (bg == null) {
- float /*double*/ [] color = data.background;
+ double /*float*/ [] color = data.background;
bg = data.bg = NSColor.colorWithDeviceRed(color[0], color[1], color[2], data.alpha / 255f);
bg.retain();
}
@@ -1777,7 +1777,7 @@ public void fillArc(int x, int y, int width, int height, int startAngle, int arc
try {
handle.saveGraphicsState();
NSAffineTransform transform = NSAffineTransform.transform();
- float /*double*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset;
+ double /*float*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset;
transform.translateXBy(x + xOffset + width / 2f, y + yOffset + height / 2f);
transform.scaleXBy(width / 2f, height / 2f);
NSBezierPath path = data.path;
@@ -1924,16 +1924,16 @@ void fillPattern(NSBezierPath path, Pattern pattern) {
NSPoint end = new NSPoint();
end.x = pattern.pt2.x;
end.y = pattern.pt2.y;
- float /*double*/ difx = end.x - start.x;
- float /*double*/ dify = end.y - start.y;
+ double /*float*/ difx = end.x - start.x;
+ double /*float*/ dify = end.y - start.y;
if (difx == 0 && dify == 0) {
- float /*double*/ [] color = pattern.color1;
+ double /*float*/ [] color = pattern.color1;
NSColor.colorWithDeviceRed(color[0], color[1], color[2], data.alpha / 255f).setFill();
path.fill();
handle.restoreGraphicsState();
return;
}
- float /*double*/ startx, starty, endx, endy;
+ double /*float*/ startx, starty, endx, endy;
if (difx == 0 || dify == 0) {
startx = bounds.x;
starty = bounds.y;
@@ -1946,13 +1946,13 @@ void fillPattern(NSBezierPath path, Pattern pattern) {
endy = bounds.y;
}
} else {
- float /*double*/ m = (end.y-start.y)/(end.x - start.x);
- float /*double*/ b = end.y - (m * end.x);
- float /*double*/ m2 = -1/m; //perpendicular slope
- float /*double*/ b2 = bounds.y - (m2 * bounds.x);
+ double /*float*/ m = (end.y-start.y)/(end.x - start.x);
+ double /*float*/ b = end.y - (m * end.x);
+ double /*float*/ m2 = -1/m; //perpendicular slope
+ double /*float*/ b2 = bounds.y - (m2 * bounds.x);
startx = endx = (b - b2) / (m2 - m);
b2 = (bounds.y + bounds.height) - (m2 * bounds.x);
- float /*double*/ x2 = (b - b2) / (m2 - m);
+ double /*float*/ x2 = (b - b2) / (m2 - m);
startx = difx > 0 ? Math.min(startx, x2) : Math.max(startx, x2);
endx = difx < 0 ? Math.min(endx, x2) : Math.max(endx, x2);
b2 = bounds.y - (m2 * (bounds.x + bounds.width));
@@ -2202,8 +2202,8 @@ public void fillRoundRectangle(int x, int y, int width, int height, int arcWidth
void strokePattern(NSBezierPath path, Pattern pattern) {
handle.saveGraphicsState();
- int /*long*/ cgPath = createCGPathRef(path);
- int /*long*/ cgContext = handle.graphicsPort();
+ long /*int*/ cgPath = createCGPathRef(path);
+ long /*int*/ cgContext = handle.graphicsPort();
OS.CGContextSaveGState(cgContext);
initCGContext(cgContext);
OS.CGContextAddPath(cgContext, cgPath);
@@ -2476,7 +2476,7 @@ public void getClipping(Region region) {
int pointCount = 0;
Region clipRgn = new Region(device);
int[] pointArray = new int[count * 2];
- int /*long*/ points = OS.malloc(NSPoint.sizeof);
+ long /*int*/ points = OS.malloc(NSPoint.sizeof);
if (points == 0) SWT.error(SWT.ERROR_NO_HANDLES);
NSPoint pt = new NSPoint();
for (int i = 0; i < count; i++) {
@@ -2898,7 +2898,7 @@ public int hashCode() {
return handle != null ? (int)/*64*/handle.id : 0;
}
-void init(Drawable drawable, GCData data, int /*long*/ context) {
+void init(Drawable drawable, GCData data, long /*int*/ context) {
if (data.foreground != null) data.state &= ~(FOREGROUND | FOREGROUND_FILL);
if (data.background != null) data.state &= ~BACKGROUND;
if (data.font != null) data.state &= ~FONT;
@@ -2916,7 +2916,7 @@ void init(Drawable drawable, GCData data, int /*long*/ context) {
data.path.retain();
}
-void initCGContext(int /*long*/ cgContext) {
+void initCGContext(long /*int*/ cgContext) {
int state = data.state;
if ((state & LINE_WIDTH) != 0) {
OS.CGContextSetLineWidth(cgContext, data.lineWidth == 0 ? 1 : data.lineWidth);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java
index feed56809a..6ebc657bbc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java
@@ -29,8 +29,8 @@ import org.eclipse.swt.internal.cocoa.*;
public final class GCData {
public Device device;
public int style, state = -1;
- public float /*double*/ [] foreground;
- public float /*double*/ [] background;
+ public double /*float*/ [] foreground;
+ public double /*float*/ [] background;
public Pattern foregroundPattern;
public Pattern backgroundPattern;
public Font font;
@@ -52,12 +52,12 @@ public final class GCData {
public NSLayoutManager layoutManager;
public NSTextContainer textContainer;
public NSColor fg, bg;
- public float /*double*/ drawXOffset, drawYOffset;
+ public double /*float*/ drawXOffset, drawYOffset;
public NSRect paintRect;
public NSBezierPath path;
public NSAffineTransform transform, inverseTransform;
public NSBezierPath clipPath, visiblePath;
- public int /*long*/ visibleRgn;
+ public long /*int*/ visibleRgn;
public NSView view;
public NSSize size;
public Thread thread;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java
index 2b66916a15..874af76699 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java
@@ -230,7 +230,7 @@ public Image(Device device, Image srcImage, int flag) {
int width = (int)size.width;
int height = (int)size.height;
NSBitmapImageRep srcRep = srcImage.getRepresentation();
- int /*long*/ bpr = srcRep.bytesPerRow();
+ long /*int*/ bpr = srcRep.bytesPerRow();
/* Copy transparent pixel and alpha data when necessary */
transparentPixel = srcImage.transparentPixel;
@@ -240,9 +240,9 @@ public Image(Device device, Image srcImage, int flag) {
System.arraycopy(srcImage.alphaData, 0, alphaData, 0, alphaData.length);
}
- int /*long*/ srcData = srcRep.bitmapData();
- int /*long*/ format = srcRep.bitmapFormat();
- int /*long*/ bpp = srcRep.bitsPerPixel();
+ long /*int*/ srcData = srcRep.bitmapData();
+ long /*int*/ format = srcRep.bitmapFormat();
+ long /*int*/ bpp = srcRep.bitsPerPixel();
/* Create the image */
handle = (NSImage)new NSImage().alloc();
@@ -253,7 +253,7 @@ public Image(Device device, Image srcImage, int flag) {
rep.release();
handle.setCacheMode(OS.NSImageCacheNever);
- int /*long*/ data = rep.bitmapData();
+ long /*int*/ data = rep.bitmapData();
OS.memmove(data, srcData, width * height * 4);
if (flag != SWT.IMAGE_COPY) {
final int redOffset, greenOffset, blueOffset;
@@ -553,11 +553,11 @@ void createAlpha () {
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
NSBitmapImageRep imageRep = getRepresentation();
- int /*long*/ height = imageRep.pixelsHigh();
- int /*long*/ bpr = imageRep.bytesPerRow();
- int /*long*/ bitmapData = imageRep.bitmapData();
- int /*long*/ format = imageRep.bitmapFormat();
- int /*long*/ dataSize = height * bpr;
+ long /*int*/ height = imageRep.pixelsHigh();
+ long /*int*/ bpr = imageRep.bytesPerRow();
+ long /*int*/ bitmapData = imageRep.bitmapData();
+ long /*int*/ format = imageRep.bitmapFormat();
+ long /*int*/ dataSize = height * bpr;
byte[] srcData = new byte[(int)/*64*/dataSize];
OS.memmove(srcData, bitmapData, dataSize);
if (transparentPixel != -1) {
@@ -578,7 +578,7 @@ void createAlpha () {
srcData[i] = a;
}
} else {
- int /*long*/ width = imageRep.pixelsWide();
+ long /*int*/ width = imageRep.pixelsWide();
int offset = 0, alphaOffset = (format & OS.NSAlphaFirstBitmapFormat) != 0 ? 0 : 3;
for (int y = 0; y> 16) & 0xFF;
int green = (transparentPixel >> 8) & 0xFF;
int blue = (transparentPixel >> 0) & 0xFF;
- return Color.cocoa_new(device, new float /*double*/ []{red / 255f, green / 255f, blue / 255f, 1});
+ return Color.cocoa_new(device, new double /*float*/ []{red / 255f, green / 255f, blue / 255f, 1});
}
/**
@@ -697,13 +697,13 @@ public ImageData getImageData() {
if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
try {
NSBitmapImageRep imageRep = getRepresentation();
- int /*long*/ width = imageRep.pixelsWide();
- int /*long*/ height = imageRep.pixelsHigh();
- int /*long*/ bpr = imageRep.bytesPerRow();
- int /*long*/ bpp = imageRep.bitsPerPixel();
- int /*long*/ bitmapData = imageRep.bitmapData();
- int /*long*/ bitmapFormat = imageRep.bitmapFormat();
- int /*long*/ dataSize = height * bpr;
+ long /*int*/ width = imageRep.pixelsWide();
+ long /*int*/ height = imageRep.pixelsHigh();
+ long /*int*/ bpr = imageRep.bytesPerRow();
+ long /*int*/ bpp = imageRep.bitsPerPixel();
+ long /*int*/ bitmapData = imageRep.bitmapData();
+ long /*int*/ bitmapFormat = imageRep.bitmapFormat();
+ long /*int*/ dataSize = height * bpr;
byte[] srcData = new byte[(int)/*64*/dataSize];
OS.memmove(srcData, bitmapData, dataSize);
@@ -727,7 +727,7 @@ public ImageData getImageData() {
if (transparentPixel == -1 && type == SWT.ICON) {
/* Get the icon mask data */
int maskPad = 2;
- int /*long*/ maskBpl = (((width + 7) / 8) + (maskPad - 1)) / maskPad * maskPad;
+ long /*int*/ maskBpl = (((width + 7) / 8) + (maskPad - 1)) / maskPad * maskPad;
byte[] maskData = new byte[(int)/*64*/(height * maskBpl)];
int offset = 0, maskOffset = 0;
for (int y = 0; y 0) {
range.location = 0;
range.length = numberOfGlyphs;
@@ -457,8 +457,8 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
if (hasSelection) {
range.location = translateOffset(selectionStart);
range.length = translateOffset(selectionEnd - selectionStart + 1);
- int /*long*/ [] rectCount = new int /*long*/ [1];
- int /*long*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, textContainer, rectCount);
+ long /*int*/ [] rectCount = new long /*int*/ [1];
+ long /*int*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, textContainer, rectCount);
for (int k = 0; k < rectCount[0]; k++, pArray += NSRect.sizeof) {
OS.memmove(rect, pArray, NSRect.sizeof);
fixRect(rect);
@@ -483,7 +483,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
if (numberOfGlyphs > 0) {
range.location = 0;
range.length = numberOfGlyphs;
- float /*double*/ [] fg = gc.data.foreground;
+ double /*float*/ [] fg = gc.data.foreground;
boolean defaultFg = fg[0] == 0 && fg[1] == 0 && fg[2] == 0 && fg[3] == 1 && gc.data.alpha == 255;
if (!defaultFg) {
for (int i = 0; i < stylesCount - 1; i++) {
@@ -527,12 +527,12 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
range.location = Math.max(lineStart, start);
range.length = Math.min(lineEnd, end) + 1 - range.location;
if (range.length > 0) {
- int /*long*/ [] rectCount = new int /*long*/ [1];
- int /*long*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, textContainer, rectCount);
+ long /*int*/ [] rectCount = new long /*int*/ [1];
+ long /*int*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, textContainer, rectCount);
NSRect rect = new NSRect();
gc.handle.saveGraphicsState();
- float /*double*/ baseline = layoutManager.typesetter().baselineOffsetInLayoutManager(layoutManager, lineStart);
- float /*double*/ [] color = null;
+ double /*float*/ baseline = layoutManager.typesetter().baselineOffsetInLayoutManager(layoutManager, lineStart);
+ double /*float*/ [] color = null;
if (style.underlineColor != null) color = style.underlineColor.handle;
if (color == null && style.foreground != null) color = style.foreground.handle;
if (color != null) {
@@ -541,15 +541,15 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
for (int k = 0; k < rectCount[0]; k++, pArray += NSRect.sizeof) {
OS.memmove(rect, pArray, NSRect.sizeof);
fixRect(rect);
- float /*double*/ underlineX = pt.x + rect.x;
- float /*double*/ underlineY = pt.y + rect.y + rect.height - baseline + 1;
+ double /*float*/ underlineX = pt.x + rect.x;
+ double /*float*/ underlineY = pt.y + rect.y + rect.height - baseline + 1;
NSBezierPath path = NSBezierPath.bezierPath();
switch (style.underlineStyle) {
case SWT.UNDERLINE_ERROR: {
path.setLineWidth(2f);
path.setLineCapStyle(OS.NSRoundLineCapStyle);
path.setLineJoinStyle(OS.NSRoundLineJoinStyle);
- path.setLineDash(new float /*double*/ []{1, 3f}, 2, 0);
+ path.setLineDash(new double /*float*/ []{1, 3f}, 2, 0);
point.x = underlineX;
point.y = underlineY + 0.5f;
path.moveToPoint(point);
@@ -563,10 +563,10 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
path.setLineWidth(1.0f);
path.setLineCapStyle(OS.NSButtLineCapStyle);
path.setLineJoinStyle(OS.NSMiterLineJoinStyle);
- float /*double*/ lineBottom = pt.y + rect.y + rect.height;
+ double /*float*/ lineBottom = pt.y + rect.y + rect.height;
float squigglyThickness = 1;
float squigglyHeight = 2 * squigglyThickness;
- float /*double*/ squigglyY = Math.min(underlineY - squigglyHeight / 2, lineBottom - squigglyHeight - 1);
+ double /*float*/ squigglyY = Math.min(underlineY - squigglyHeight / 2, lineBottom - squigglyHeight - 1);
float[] points = computePolyline((int)underlineX, (int)squigglyY, (int)(underlineX + rect.width), (int)(squigglyY + squigglyHeight));
point.x = points[0] + 0.5f;
point.y = points[1] + 0.5f;
@@ -595,11 +595,11 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
range.location = Math.max(lineStart, start);
range.length = Math.min(lineEnd, end) + 1 - range.location;
if (range.length > 0) {
- int /*long*/ [] rectCount = new int /*long*/ [1];
- int /*long*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, textContainer, rectCount);
+ long /*int*/ [] rectCount = new long /*int*/ [1];
+ long /*int*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, textContainer, rectCount);
NSRect rect = new NSRect();
gc.handle.saveGraphicsState();
- float /*double*/ [] color = null;
+ double /*float*/ [] color = null;
if (style.borderColor != null) color = style.borderColor.handle;
if (color == null && style.foreground != null) color = style.foreground.handle;
if (color != null) {
@@ -612,9 +612,9 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
case SWT.BORDER_DASH: dashes = width != 0 ? GC.LINE_DASH : GC.LINE_DASH_ZERO; break;
case SWT.BORDER_DOT: dashes = width != 0 ? GC.LINE_DOT : GC.LINE_DOT_ZERO; break;
}
- float /*double*/ [] lengths = null;
+ double /*float*/ [] lengths = null;
if (dashes != null) {
- lengths = new float /*double*/[dashes.length];
+ lengths = new double /*float*/[dashes.length];
for (int k = 0; k < lengths.length; k++) {
lengths[k] = width == 0 ? dashes[k] : dashes[k] * width;
}
@@ -645,7 +645,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
}
void fixRect(NSRect rect) {
- float /*double*/ right = -1;
+ double /*float*/ right = -1;
for (int j = 0; j < lineBounds.length; j++) {
NSRect line = lineBounds[j];
if (rect.y <= line.y && line.y <= rect.y + rect.height) {
@@ -771,8 +771,8 @@ public Rectangle getBounds(int start, int end) {
NSRange range = new NSRange();
range.location = start;
range.length = end - start + 1;
- int /*long*/ [] rectCount = new int /*long*/ [1];
- int /*long*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, textContainer, rectCount);
+ long /*int*/ [] rectCount = new long /*int*/ [1];
+ long /*int*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, textContainer, rectCount);
NSRect rect = new NSRect();
int left = 0x7FFFFFFF, right = 0;
int top = 0x7FFFFFFF, bottom = 0;
@@ -879,7 +879,7 @@ public int getLevel(int offset) {
int length = text.length();
if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE);
offset = translateOffset(offset);
- int /*long*/ glyphOffset = layoutManager.glyphIndexForCharacterAtIndex(offset);
+ long /*int*/ glyphOffset = layoutManager.glyphIndexForCharacterAtIndex(offset);
NSRange range = new NSRange();
range.location = glyphOffset;
range.length = 1;
@@ -1070,7 +1070,7 @@ public Point getLocation(int offset, boolean trailing) {
return new Point((int)(rect.x + rect.width), (int)rect.y);
} else {
offset = translateOffset(offset);
- int /*long*/ glyphIndex = layoutManager.glyphIndexForCharacterAtIndex(offset);
+ long /*int*/ glyphIndex = layoutManager.glyphIndexForCharacterAtIndex(offset);
NSRect rect = layoutManager.lineFragmentUsedRectForGlyphAtIndex(glyphIndex, 0);
NSPoint point = layoutManager.locationForGlyphAtIndex(glyphIndex);
boolean rtl = false;
@@ -1078,13 +1078,13 @@ public Point getLocation(int offset, boolean trailing) {
range.location = glyphIndex;
range.length = 1;
byte[] bidiLevels = new byte[1];
- int /*long*/ result = layoutManager.getGlyphsInRange(range, 0, 0, 0, 0, bidiLevels);
+ long /*int*/ result = layoutManager.getGlyphsInRange(range, 0, 0, 0, 0, bidiLevels);
if (result > 0) {
rtl = (bidiLevels[0] & 1) != 0;
}
if (trailing != rtl) {
- int /*long*/ [] rectCount = new int /*long*/ [1];
- int /*long*/ pArray = layoutManager.rectArrayForGlyphRange(range, range, textContainer, rectCount);
+ long /*int*/ [] rectCount = new long /*int*/ [1];
+ long /*int*/ pArray = layoutManager.rectArrayForGlyphRange(range, range, textContainer, rectCount);
if (rectCount[0] > 0) {
NSRect bounds = new NSRect();
OS.memmove(bounds, pArray, NSRect.sizeof);
@@ -1261,8 +1261,8 @@ public int getOffset(int x, int y, int[] trailing) {
NSPoint pt = new NSPoint();
pt.x = x;
pt.y = y;
- float /*double*/[] partialFraction = new float /*double*/[1];
- int /*long*/ glyphIndex = layoutManager.glyphIndexForPoint(pt, textContainer, partialFraction);
+ double /*float*/[] partialFraction = new double /*float*/[1];
+ long /*int*/ glyphIndex = layoutManager.glyphIndexForPoint(pt, textContainer, partialFraction);
int offset = (int)/*64*/layoutManager.characterIndexForGlyphAtIndex(glyphIndex);
offset = Math.min(untranslateOffset(offset), length - 1);
if (trailing != null) {
@@ -1557,14 +1557,14 @@ void initClasses () {
if (OS.objc_lookUpClass(className) != 0) return;
textLayoutCallback2 = new Callback(getClass(), "textLayoutProc", 2);
- int /*long*/ proc2 = textLayoutCallback2.getAddress();
+ long /*int*/ proc2 = textLayoutCallback2.getAddress();
if (proc2 == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS);
- int /*long*/ cellBaselineOffsetProc = OS.CALLBACK_cellBaselineOffset(proc2);
- int /*long*/ cellSizeProc = OS.CALLBACK_NSTextAttachmentCell_cellSize(proc2);
+ long /*int*/ cellBaselineOffsetProc = OS.CALLBACK_cellBaselineOffset(proc2);
+ long /*int*/ cellSizeProc = OS.CALLBACK_NSTextAttachmentCell_cellSize(proc2);
byte[] types = {'*','\0'};
int size = C.PTR_SIZEOF, align = C.PTR_SIZEOF == 4 ? 2 : 3;
- int /*long*/ cls = OS.objc_allocateClassPair(OS.class_NSCell, className, 0);
+ long /*int*/ cls = OS.objc_allocateClassPair(OS.class_NSCell, className, 0);
OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types);
OS.class_addProtocol(cls, OS.protocol_NSTextAttachmentCell);
OS.class_addMethod(cls, OS.sel_cellSize, cellSizeProc, "@:");
@@ -2159,8 +2159,8 @@ public String toString () {
return "TextLayout {" + text + "}";
}
-static int /*long*/ textLayoutProc(int /*long*/ id, int /*long*/ sel) {
- int /*long*/ [] jniRef = new int /*long*/ [1];
+static long /*int*/ textLayoutProc(long /*int*/ id, long /*int*/ sel) {
+ long /*int*/ [] jniRef = new long /*int*/ [1];
OS.object_getInstanceVariable(id, SWT_OBJECT, jniRef);
if (jniRef[0] == 0) return 0;
StyleItem run = (StyleItem) OS.JNIGetObject(jniRef[0]);
@@ -2174,14 +2174,14 @@ static int /*long*/ textLayoutProc(int /*long*/ id, int /*long*/ sel) {
size.width = metrics.width;
size.height = metrics.ascent + metrics.descent;
/* NOTE that this is freed in C */
- int /*long*/ result = OS.malloc(NSSize.sizeof);
+ long /*int*/ result = OS.malloc(NSSize.sizeof);
OS.memmove(result, size, NSSize.sizeof);
return result;
} else if (sel == OS.sel_cellBaselineOffset) {
NSPoint point = new NSPoint();
point.y = -metrics.descent;
/* NOTE that this is freed in C */
- int /*long*/ result = OS.malloc(NSPoint.sizeof);
+ long /*int*/ result = OS.malloc(NSPoint.sizeof);
OS.memmove(result, point, NSPoint.sizeof);
return result;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java
index c03fa48bcc..5a4010bc88 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java
@@ -135,7 +135,7 @@ public void addSelectionListener(SelectionListener listener) {
addListener(SWT.DefaultSelection,typedListener);
}
-NSSize cellSizeForBounds (int /*long*/ id, int /*long*/ sel, NSRect cellFrame) {
+NSSize cellSizeForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
NSSize size = super.cellSizeForBounds(id, sel, cellFrame);
if (image != null && ((style & (SWT.CHECK|SWT.RADIO)) !=0)) {
NSSize imageSize = image.handle.size();
@@ -161,7 +161,7 @@ NSSize cellSizeForBounds (int /*long*/ id, int /*long*/ sel, NSRect cellFrame) {
NSAttributedString attribStr = createString(text, null, foreground, style, true, true, true);
NSRect rect = attribStr.boundingRectWithSize(wrapSize, OS.NSStringDrawingUsesLineFragmentOrigin);
attribStr.release();
- float /*double*/ trimHeight = size.height - titleRect.height;
+ double /*float*/ trimHeight = size.height - titleRect.height;
size.height = rect.height;
if (image != null && ((style & (SWT.CHECK|SWT.RADIO)) !=0)) {
NSSize imageSize = image.handle.size();
@@ -294,7 +294,7 @@ boolean dragDetect(int x, int y, boolean filter, boolean[] consume) {
return dragging;
}
-void drawImageWithFrameInView (int /*long*/ id, int /*long*/ sel, int /*long*/ image, NSRect rect, int /*long*/ view) {
+void drawImageWithFrameInView (long /*int*/ id, long /*int*/ sel, long /*int*/ image, NSRect rect, long /*int*/ view) {
/*
* Feature in Cocoa. Images touch the edge of rounded buttons
* when set to small size. The fix to subclass the button cell
@@ -310,7 +310,7 @@ void drawImageWithFrameInView (int /*long*/ id, int /*long*/ sel, int /*long*/ i
super.drawImageWithFrameInView(id, sel, image, rect, view);
}
-void drawInteriorWithFrame_inView (int /*long*/ id, int /*long*/ sel, NSRect cellRect, int /*long*/ viewid) {
+void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellRect, long /*int*/ viewid) {
if ((style & (SWT.CHECK|SWT.RADIO)) != 0 && backgroundImage != null) {
fillBackground (new NSView(viewid), NSGraphicsContext.currentContext(), cellRect, -1);
}
@@ -318,8 +318,8 @@ void drawInteriorWithFrame_inView (int /*long*/ id, int /*long*/ sel, NSRect cel
if (image != null && ((style & (SWT.CHECK|SWT.RADIO)) !=0)) {
NSSize imageSize = image.handle.size();
NSCell nsCell = new NSCell(id);
- float /*double*/ x = 0;
- float /*double*/ y = (imageSize.height - cellRect.height)/2f;
+ double /*float*/ x = 0;
+ double /*float*/ y = (imageSize.height - cellRect.height)/2f;
NSRect imageRect = nsCell.imageRectForBounds(cellRect);
NSSize stringSize = ((NSButton)view).attributedTitle().size();
switch (style & (SWT.LEFT|SWT.RIGHT|SWT.CENTER)) {
@@ -349,7 +349,7 @@ void drawInteriorWithFrame_inView (int /*long*/ id, int /*long*/ sel, NSRect cel
}
-NSRect drawTitleWithFrameInView (int /*long*/ id, int /*long*/ sel, int /*long*/ title, NSRect titleRect, int /*long*/ view) {
+NSRect drawTitleWithFrameInView (long /*int*/ id, long /*int*/ sel, long /*int*/ title, NSRect titleRect, long /*int*/ view) {
boolean wrap = (style & SWT.WRAP) != 0 && text.length() != 0;
if (wrap) {
NSSize wrapSize = new NSSize();
@@ -380,7 +380,7 @@ boolean drawsBackground() {
return background != null || backgroundImage != null;
}
-void drawWidget (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
+void drawWidget (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
if ((style & SWT.ARROW) != 0) {
NSRect frame = view.frame();
int arrowSize = Math.min((int)frame.height, (int)frame.width) / 2;
@@ -541,7 +541,7 @@ boolean isDescribedByLabel () {
* This will cause the on state to momentarily appear while clicking on the checkbox. To avoid this, we override [NSCell nextState]
* to go directly to the desired state if we have a grayed checkbox.
*/
-int /*long*/ nextState(int /*long*/ id, int /*long*/ sel) {
+long /*int*/ nextState(long /*int*/ id, long /*int*/ sel) {
if ((style & SWT.CHECK) != 0 && grayed) {
return ((NSButton)view).state() == OS.NSMixedState ? OS.NSOffState : OS.NSMixedState;
}
@@ -706,7 +706,7 @@ void setFont (NSFont font) {
}
}
-void setForeground (float /*double*/ [] color) {
+void setForeground (double /*float*/ [] color) {
((NSButton)view).setAttributedTitle(createString());
}
@@ -872,7 +872,7 @@ public void setText (String string) {
updateAlignment ();
}
-NSRect titleRectForBounds (int /*long*/ id, int /*long*/ sel, NSRect cellFrame) {
+NSRect titleRectForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
NSRect rect = super.titleRectForBounds(id, sel, cellFrame);
if (image != null && ((style & (SWT.CHECK|SWT.RADIO)) !=0)) {
NSSize imageSize = image.handle.size();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java
index b2b5edd798..707e765b30 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java
@@ -58,7 +58,7 @@ Canvas () {
/* Do nothing */
}
-int /*long*/ attributedSubstringFromRange (int /*long*/ id, int /*long*/ sel, int /*long*/ range) {
+long /*int*/ attributedSubstringFromRange (long /*int*/ id, long /*int*/ sel, long /*int*/ range) {
if (ime != null) return ime.attributedSubstringFromRange (id, sel, range);
return super.attributedSubstringFromRange(id, sel, range);
}
@@ -106,7 +106,7 @@ public Canvas (Composite parent, int style) {
super (parent, style);
}
-int /*long*/ characterIndexForPoint (int /*long*/ id, int /*long*/ sel, int /*long*/ point) {
+long /*int*/ characterIndexForPoint (long /*int*/ id, long /*int*/ sel, long /*int*/ point) {
if (ime != null) return ime.characterIndexForPoint (id, sel, point);
return super.characterIndexForPoint (id, sel, point);
}
@@ -136,7 +136,7 @@ public void drawBackground (GC gc, int x, int y, int width, int height) {
drawBackground(gc, x, y, width, height, 0, 0);
}
-void drawBackground (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
super.drawBackground(id, context, rect);
if (glcontext != null) {
if (isObscured()) {
@@ -144,7 +144,7 @@ void drawBackground (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
context.saveGraphicsState();
context.setCompositingOperation(OS.NSCompositeClear);
if (visiblePath == null) {
- int /*long*/ visibleRegion = getVisibleRegion();
+ long /*int*/ visibleRegion = getVisibleRegion();
visiblePath = getPath(visibleRegion);
OS.DisposeRgn(visibleRegion);
}
@@ -157,17 +157,17 @@ void drawBackground (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
}
}
-void drawRect (int /*long*/ id, int /*long*/ sel, NSRect rect) {
+void drawRect (long /*int*/ id, long /*int*/ sel, NSRect rect) {
if (glcontext != null && glcontext.view() == null) glcontext.setView(view);
super.drawRect(id, sel, rect);
}
-void drawWidget (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
+void drawWidget (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
if (id != view.id) return;
super.drawWidget (id, context, rect);
if (caret == null) return;
if (caret.isShowing) {
- int /*long*/ ctx = context.graphicsPort();
+ long /*int*/ ctx = context.graphicsPort();
OS.CGContextSaveGState (ctx);
OS.CGContextSetBlendMode (ctx, OS.kCGBlendModeDifference);
Image image = caret.image;
@@ -182,18 +182,18 @@ void drawWidget (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
NSSize size = imageHandle.size();
destRect.size.width = size.width;
destRect.size.height = size.height;
- int /*long*/ data = rep.bitmapData();
- int /*long*/ format = rep.bitmapFormat();
- int /*long*/ bpr = rep.bytesPerRow();
+ long /*int*/ data = rep.bitmapData();
+ long /*int*/ format = rep.bitmapFormat();
+ long /*int*/ bpr = rep.bytesPerRow();
int alphaInfo;
if (rep.hasAlpha()) {
alphaInfo = (format & OS.NSAlphaFirstBitmapFormat) != 0 ? OS.kCGImageAlphaFirst : OS.kCGImageAlphaLast;
} else {
alphaInfo = (format & OS.NSAlphaFirstBitmapFormat) != 0 ? OS.kCGImageAlphaNoneSkipFirst : OS.kCGImageAlphaNoneSkipLast;
}
- int /*long*/ provider = OS.CGDataProviderCreateWithData(0, data, bpr * (int)size.height, 0);
- int /*long*/ colorspace = OS.CGColorSpaceCreateDeviceRGB();
- int /*long*/ cgImage = OS.CGImageCreate((int)size.width, (int)size.height, rep.bitsPerSample(), rep.bitsPerPixel(), bpr, colorspace, alphaInfo, provider, 0, true, 0);
+ long /*int*/ provider = OS.CGDataProviderCreateWithData(0, data, bpr * (int)size.height, 0);
+ long /*int*/ colorspace = OS.CGColorSpaceCreateDeviceRGB();
+ long /*int*/ cgImage = OS.CGImageCreate((int)size.width, (int)size.height, rep.bitsPerSample(), rep.bitsPerPixel(), bpr, colorspace, alphaInfo, provider, 0, true, 0);
OS.CGColorSpaceRelease(colorspace);
OS.CGDataProviderRelease(provider);
OS.CGContextScaleCTM (ctx, 1, -1);
@@ -207,17 +207,17 @@ void drawWidget (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
drawRect.origin.y = caret.y;
drawRect.size.width = caret.width != 0 ? caret.width : Caret.DEFAULT_WIDTH;
drawRect.size.height = caret.height;
- int /*long*/ colorspace = OS.CGColorSpaceCreateDeviceRGB();
+ long /*int*/ colorspace = OS.CGColorSpaceCreateDeviceRGB();
OS.CGContextSetFillColorSpace(ctx, colorspace);
OS.CGColorSpaceRelease(colorspace);
- OS.CGContextSetFillColor(ctx, new float /*double*/ [] {1, 1, 1, 1});
+ OS.CGContextSetFillColor(ctx, new double /*float*/ [] {1, 1, 1, 1});
OS.CGContextFillRect(ctx, drawRect);
}
OS.CGContextRestoreGState(ctx);
}
}
-NSRect firstRectForCharacterRange (int /*long*/ id, int /*long*/ sel, int /*long*/ range) {
+NSRect firstRectForCharacterRange (long /*int*/ id, long /*int*/ sel, long /*int*/ range) {
if (ime != null) return ime.firstRectForCharacterRange (id, sel, range);
return super.firstRectForCharacterRange (id, sel, range);
}
@@ -262,7 +262,7 @@ public IME getIME () {
return ime;
}
-boolean hasMarkedText (int /*long*/ id, int /*long*/ sel) {
+boolean hasMarkedText (long /*int*/ id, long /*int*/ sel) {
if (ime != null) return ime.hasMarkedText (id, sel);
return super.hasMarkedText (id, sel);
}
@@ -271,30 +271,30 @@ boolean imeInComposition () {
return ime != null && ime.isInlineEnabled () && ime.startOffset != -1;
}
-boolean insertText (int /*long*/ id, int /*long*/ sel, int /*long*/ string) {
+boolean insertText (long /*int*/ id, long /*int*/ sel, long /*int*/ string) {
if (ime != null) {
if (!ime.insertText (id, sel, string)) return false;
}
return super.insertText (id, sel, string);
}
-boolean isOpaque (int /*long*/ id, int /*long*/ sel) {
+boolean isOpaque (long /*int*/ id, long /*int*/ sel) {
if (glcontext != null) return true;
return super.isOpaque(id, sel);
}
-NSRange markedRange (int /*long*/ id, int /*long*/ sel) {
+NSRange markedRange (long /*int*/ id, long /*int*/ sel) {
if (ime != null) return ime.markedRange (id, sel);
return super.markedRange (id, sel);
}
-boolean readSelectionFromPasteboard(int /*long*/ id, int /*long*/ sel, int /*long*/ pasteboard) {
+boolean readSelectionFromPasteboard(long /*int*/ id, long /*int*/ sel, long /*int*/ pasteboard) {
boolean result = false;
NSPasteboard pboard = new NSPasteboard(pasteboard);
NSArray availableTypes = pboard.types();
NSString type;
- for (int /*long*/ i = 0; i < supportedPboardTypes.count(); i++) {
+ for (long /*int*/ i = 0; i < supportedPboardTypes.count(); i++) {
if (result) break;
type = new NSString(supportedPboardTypes.objectAtIndex(i));
if (availableTypes.containsObject(type)) {
@@ -487,7 +487,7 @@ public void scroll (int destX, int destY, int x, int y, int width, int height, b
if (isFocus) caret.setFocus ();
}
-NSRange selectedRange (int /*long*/ id, int /*long*/ sel) {
+NSRange selectedRange (long /*int*/ id, long /*int*/ sel) {
if (ime != null) return ime.selectedRange (id, sel);
return super.selectedRange (id, sel);
}
@@ -569,19 +569,19 @@ public void setIME (IME ime) {
this.ime = ime;
}
-boolean setMarkedText_selectedRange (int /*long*/ id, int /*long*/ sel, int /*long*/ string, int /*long*/ range) {
+boolean setMarkedText_selectedRange (long /*int*/ id, long /*int*/ sel, long /*int*/ string, long /*int*/ range) {
if (ime != null) {
if (!ime.setMarkedText_selectedRange (id, sel, string, range)) return false;
}
return super.setMarkedText_selectedRange (id, sel, string, range);
}
-int /*long*/ validAttributesForMarkedText (int /*long*/ id, int /*long*/ sel) {
+long /*int*/ validAttributesForMarkedText (long /*int*/ id, long /*int*/ sel) {
if (ime != null) return ime.validAttributesForMarkedText (id, sel);
return super.validAttributesForMarkedText(id, sel);
}
-int /*long*/ validRequestorForSendType(int /*long*/ id, int /*long*/ sel, int /*long*/ sendType, int /*long*/ returnType) {
+long /*int*/ validRequestorForSendType(long /*int*/ id, long /*int*/ sel, long /*int*/ sendType, long /*int*/ returnType) {
if (id == view.id) {
Accessible acc = getAccessible();
if (acc != null) {
@@ -607,11 +607,11 @@ int /*long*/ validRequestorForSendType(int /*long*/ id, int /*long*/ sel, int /*
return super.validRequestorForSendType(id, sel, sendType, returnType);
}
-void updateOpenGLContext(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void updateOpenGLContext(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
if (glcontext != null) ((NSOpenGLContext)glcontext).update();
}
-void viewWillMoveToWindow(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+void viewWillMoveToWindow(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
super.viewWillMoveToWindow(id, sel, arg0);
if (glcontext != null && id == view.id && arg0 != 0) {
Widget newShell = display.getWidget(new NSWindow(arg0).contentView());
@@ -625,21 +625,21 @@ void viewWillMoveToWindow(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0)
}
}
-boolean writeSelectionToPasteboard(int /*long*/ id, int /*long*/ sel, int /*long*/ pasteboardObj, int /*long*/ typesObj) {
+boolean writeSelectionToPasteboard(long /*int*/ id, long /*int*/ sel, long /*int*/ pasteboardObj, long /*int*/ typesObj) {
boolean result = false;
NSPasteboard pboard = new NSPasteboard(pasteboardObj);
NSArray types = new NSArray(typesObj);
NSMutableArray typesToDeclare = NSMutableArray.arrayWithCapacity(2);
NSString type;
- for (int /*long*/ i = 0; i < supportedPboardTypes.count(); i++) {
+ for (long /*int*/ i = 0; i < supportedPboardTypes.count(); i++) {
type = new NSString(supportedPboardTypes.objectAtIndex(i));
if (types.containsObject(type)) typesToDeclare.addObject(type);
}
if (typesToDeclare.count() > 0) {
pboard.declareTypes(typesToDeclare, view);
- for (int /*long*/ i = 0; i < typesToDeclare.count(); i++) {
+ for (long /*int*/ i = 0; i < typesToDeclare.count(); i++) {
type = new NSString(typesToDeclare.objectAtIndex(i));
if (writeSelectionToPasteboard(pboard, type)) result = true;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ColorDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ColorDialog.java
index 7482cecba3..d67506821d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ColorDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ColorDialog.java
@@ -91,7 +91,7 @@ public ColorDialog(Shell parent, int style) {
checkSubclass ();
}
-void changeColor(int /*long*/ id, int /*long*/ sel, int /*long*/ sender) {
+void changeColor(long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
selected = true;
}
@@ -167,7 +167,7 @@ public RGB open() {
}
}
SWTPanelDelegate delegate = (SWTPanelDelegate)new SWTPanelDelegate().alloc().init();
- int /*long*/ jniRef = OS.NewGlobalRef(this);
+ long /*int*/ jniRef = OS.NewGlobalRef(this);
if (jniRef == 0) error(SWT.ERROR_NO_HANDLES);
OS.object_setInstanceVariable(delegate.id, Display.SWT_OBJECT, jniRef);
panel.setDelegate(delegate);
@@ -183,7 +183,7 @@ public RGB open() {
if (selected) {
NSColor color = panel.color();
if (color != null) {
- float /*double*/ [] handle = display.getNSColorRGB(color);
+ double /*float*/ [] handle = display.getNSColorRGB(color);
rgb = new RGB((int)(handle[0] * 255), (int)(handle[1] * 255), (int)(handle[2] * 255));
}
}
@@ -192,7 +192,7 @@ public RGB open() {
rgbs = new RGB[length];
for (int i=0; i= selectedRange.location && charPosition < (selectedRange.location + selectedRange.length)) {
if (super.dragDetect(x, y, filter, consume)) {
if (consume != null) consume[0] = true;
@@ -646,8 +646,8 @@ public Point getCaretLocation() {
NSLayoutManager layoutManager = widget.layoutManager();
NSTextContainer container = widget.textContainer();
NSRange range = widget.selectedRange();
- int /*long*/ [] rectCount = new int /*long*/ [1];
- int /*long*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, container, rectCount);
+ long /*int*/ [] rectCount = new long /*int*/ [1];
+ long /*int*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, container, rectCount);
NSRect rect = new NSRect();
if (rectCount[0] > 0) OS.memmove(rect, pArray, NSRect.sizeof);
NSPoint pt = new NSPoint();
@@ -888,7 +888,7 @@ char [] getText (int start, int end) {
NSRange range = new NSRange ();
range.location = start;
if (end == -1) {
- int /*long*/ length = str.length();
+ long /*int*/ length = str.length();
range.length = length - start;
} else {
range.length = end - start;
@@ -1018,19 +1018,19 @@ public int indexOf (String string, int start) {
return -1;
}
-boolean isEventView (int /*long*/ id) {
+boolean isEventView (long /*int*/ id) {
return true;
}
-void menuWillOpen(int /*long*/ id, int /*long*/ sel, int /*long*/ menu) {
+void menuWillOpen(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
listVisible = true;
}
-void menuDidClose(int /*long*/ id, int /*long*/ sel, int /*long*/ menu) {
+void menuDidClose(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
listVisible = false;
}
-void mouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
// If this is a combo box with an editor field and the control is disposed
// while the view's cell editor is open we crash while tearing down the
// popup window. Fix is to retain the view before letting Cocoa track
@@ -1311,7 +1311,7 @@ boolean sendKeyEvent (NSEvent nsEvent, int type) {
boolean result = super.sendKeyEvent (nsEvent, type);
if (!result) return result;
int stateMask = 0;
- int /*long*/ modifierFlags = nsEvent.modifierFlags();
+ long /*int*/ modifierFlags = nsEvent.modifierFlags();
if ((modifierFlags & OS.NSAlternateKeyMask) != 0) stateMask |= SWT.ALT;
if ((modifierFlags & OS.NSShiftKeyMask) != 0) stateMask |= SWT.SHIFT;
if ((modifierFlags & OS.NSControlKeyMask) != 0) stateMask |= SWT.CONTROL;
@@ -1377,7 +1377,7 @@ void setFont (NSFont font) {
updateItems();
}
-void setForeground (float /*double*/ [] color) {
+void setForeground (double /*float*/ [] color) {
super.setForeground(color);
updateItems();
if ((style & SWT.READ_ONLY) == 0) {
@@ -1664,14 +1664,14 @@ public void setVisibleItemCount (int count) {
}
}
-boolean shouldChangeTextInRange_replacementString(int /*long*/ id, int /*long*/ sel, int /*long*/ affectedCharRange, int /*long*/ replacementString) {
+boolean shouldChangeTextInRange_replacementString(long /*int*/ id, long /*int*/ sel, long /*int*/ affectedCharRange, long /*int*/ replacementString) {
NSRange range = new NSRange();
OS.memmove(range, affectedCharRange, NSRange.sizeof);
boolean result = callSuperBoolean(id, sel, range, replacementString);
if (hooks (SWT.Verify)) {
String string = new NSString(replacementString).getString();
NSEvent currentEvent = display.application.currentEvent();
- int /*long*/ type = currentEvent.type();
+ long /*int*/ type = currentEvent.type();
if (type != OS.NSKeyDown && type != OS.NSKeyUp) currentEvent = null;
String newText = verifyText(string, (int)/*64*/range.location, (int)/*64*/(range.location+range.length), currentEvent);
if (newText == null) return false;
@@ -1705,18 +1705,18 @@ boolean shouldChangeTextInRange_replacementString(int /*long*/ id, int /*long*/
return result;
}
-void textViewDidChangeSelection(int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void textViewDidChangeSelection(long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
NSNotification notification = new NSNotification(aNotification);
NSText editor = new NSText(notification.object().id);
selectionRange = editor.selectedRange();
}
-void textDidChange (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void textDidChange (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
super.textDidChange (id, sel, aNotification);
postEvent (SWT.Modify);
}
-NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange(int /*long*/ id, int /*long*/ sel, int /*long*/ aTextView, int /*long*/ oldSelectedCharRange, int /*long*/ newSelectedCharRange) {
+NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange(long /*int*/ id, long /*int*/ sel, long /*int*/ aTextView, long /*int*/ oldSelectedCharRange, long /*int*/ newSelectedCharRange) {
/*
* If the selection is changing as a result of the receiver getting focus
* then return the receiver's last selection range, otherwise the full
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java
index e2622c6878..f9c3e8e9a0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java
@@ -127,14 +127,14 @@ Control [] _getTabList () {
return tabList;
}
-boolean acceptsFirstMouse (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+boolean acceptsFirstMouse (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if ((state & CANVAS) != 0) {
return true;
}
return super.acceptsFirstMouse (id, sel, theEvent);
}
-boolean acceptsFirstResponder (int /*long*/ id, int /*long*/ sel) {
+boolean acceptsFirstResponder (long /*int*/ id, long /*int*/ sel) {
if ((state & CANVAS) != 0) {
if ((style & SWT.NO_FOCUS) == 0 && hooksKeys ()) {
if (contentView().subviews().count() == 0) return true;
@@ -144,9 +144,9 @@ boolean acceptsFirstResponder (int /*long*/ id, int /*long*/ sel) {
return super.acceptsFirstResponder (id, sel);
}
-int /*long*/ accessibilityAttributeValue (int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+long /*int*/ accessibilityAttributeValue (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
NSString nsAttributeName = new NSString(arg0);
- int /*long*/ superValue = super.accessibilityAttributeValue(id, sel, arg0);
+ long /*int*/ superValue = super.accessibilityAttributeValue(id, sel, arg0);
if ((state & CANVAS) != 0) {
// If this Composite has an Accessible that defined a role, return that, unless the
@@ -177,7 +177,7 @@ int /*long*/ accessibilityAttributeValue (int /*long*/ id, int /*long*/ sel, int
}
-boolean accessibilityIsIgnored(int /*long*/ id, int /*long*/ sel) {
+boolean accessibilityIsIgnored(long /*int*/ id, long /*int*/ sel) {
if (id == accessibleHandle()) {
// If a Composite or subclass has an Accessible it should not be ignored.
if (accessible != null) return accessible.internal_accessibilityIsIgnored(ACC.CHILDID_SELF);
@@ -357,7 +357,7 @@ public void drawBackground(GC gc, int x, int y, int width, int height, int offse
}
}
-void drawBackground (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
if (id != view.id) return;
if ((state & CANVAS) != 0) {
if ((style & SWT.NO_BACKGROUND) == 0) {
@@ -570,7 +570,7 @@ public boolean isLayoutDeferred () {
return findDeferredControl () != null;
}
-boolean isOpaque (int /*long*/ id, int /*long*/ sel) {
+boolean isOpaque (long /*int*/ id, long /*int*/ sel) {
if ((state & CANVAS) != 0) {
if (id == view.id) {
return region == null && background != null && background[3] == 1 && !isObscured ();
@@ -584,7 +584,7 @@ boolean isTabGroup () {
return super.isTabGroup ();
}
-void keyDown (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void keyDown (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (hasFocus()) {
if ((state & CANVAS) != 0) {
Shell s = this.getShell();
@@ -882,22 +882,22 @@ Point minimumSize (int wHint, int Hint, boolean changed) {
return new Point (width, height);
}
-boolean mouseEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent, int type) {
+boolean mouseEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent, int type) {
boolean result = super.mouseEvent (id, sel, theEvent, type);
return (state & CANVAS) == 0 ? result : new NSEvent (theEvent).type () != OS.NSLeftMouseDown;
}
-void pageDown(int /*long*/ id, int /*long*/ sel, int /*long*/ sender) {
+void pageDown(long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
if ((state & CANVAS) != 0) return;
super.pageDown(id, sel, sender);
}
-void pageUp(int /*long*/ id, int /*long*/ sel, int /*long*/ sender) {
+void pageUp(long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
if ((state & CANVAS) != 0) return;
super.pageUp(id, sel, sender);
}
-void reflectScrolledClipView (int /*long*/ id, int /*long*/ sel, int /*long*/ aClipView) {
+void reflectScrolledClipView (long /*int*/ id, long /*int*/ sel, long /*int*/ aClipView) {
if ((state & CANVAS) != 0) return;
super.reflectScrolledClipView (id, sel, aClipView);
}
@@ -941,15 +941,15 @@ void resized () {
}
}
-void scrollWheel (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void scrollWheel (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if ((state & CANVAS) != 0) {
NSView view = scrollView != null ? scrollView : this.view;
if (id == view.id) {
getShell().deferFlushing();
NSEvent nsEvent = new NSEvent(theEvent);
boolean handled = false;
- float /*double*/ deltaY = nsEvent.deltaY();
- float /*double*/ deltaX = nsEvent.deltaX ();
+ double /*float*/ deltaY = nsEvent.deltaY();
+ double /*float*/ deltaX = nsEvent.deltaX ();
if ((hooks(SWT.Gesture) || filters (SWT.Gesture))) {
if (deltaX != 0 || deltaY != 0) {
if (!gestureEvent(id, theEvent, SWT.GESTURE_PAN)) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
index c5f471ed11..dded880d88 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
@@ -60,13 +60,13 @@ public abstract class Control extends Widget implements Drawable {
Object layoutData;
int drawCount;
Menu menu;
- float /*double*/ [] foreground, background;
+ double /*float*/ [] foreground, background;
Image backgroundImage;
Font font;
Cursor cursor;
Region region;
NSBezierPath regionPath;
- int /*long*/ visibleRgn;
+ long /*int*/ visibleRgn;
Accessible accessible;
boolean touchEnabled;
@@ -118,14 +118,14 @@ public Control (Composite parent, int style) {
createWidget ();
}
-boolean acceptsFirstMouse (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+boolean acceptsFirstMouse (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
Shell shell = getShell ();
if ((shell.style & SWT.ON_TOP) != 0) return true;
return super.acceptsFirstMouse (id, sel, theEvent);
}
-int /*long*/ accessibleHandle() {
- int /*long*/ returnValue = view.id;
+long /*int*/ accessibleHandle() {
+ long /*int*/ returnValue = view.id;
if (view instanceof NSControl) {
if (((NSControl) view).cell() != null) {
@@ -136,7 +136,7 @@ int /*long*/ accessibleHandle() {
return returnValue;
}
-int /*long*/ accessibilityActionDescription(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+long /*int*/ accessibilityActionDescription(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
if (id == accessibleHandle() && accessible != null) {
NSString actionName = new NSString(arg0);
id returnValue = accessible.internal_accessibilityActionDescription(actionName, ACC.CHILDID_SELF);
@@ -145,8 +145,8 @@ int /*long*/ accessibilityActionDescription(int /*long*/ id, int /*long*/ sel, i
return super.accessibilityActionDescription(id, sel, arg0);
}
-int /*long*/ accessibilityActionNames(int /*long*/ id, int /*long*/ sel) {
- int /*long*/ returnValue = super.accessibilityActionNames(id, sel);
+long /*int*/ accessibilityActionNames(long /*int*/ id, long /*int*/ sel) {
+ long /*int*/ returnValue = super.accessibilityActionNames(id, sel);
if (handleIsAccessible(id)) {
if (accessible != null) {
NSArray baseArray = accessible.internal_accessibilityActionNames(ACC.CHILDID_SELF);
@@ -163,9 +163,9 @@ int /*long*/ accessibilityActionNames(int /*long*/ id, int /*long*/ sel) {
return returnValue;
}
-int /*long*/ accessibilityAttributeNames(int /*long*/ id, int /*long*/ sel) {
+long /*int*/ accessibilityAttributeNames(long /*int*/ id, long /*int*/ sel) {
- int /*long*/ returnValue = 0;
+ long /*int*/ returnValue = 0;
if (handleIsAccessible(id) && accessible != null) {
// See if the accessible is defining the attribute set for the control.
@@ -191,11 +191,11 @@ int /*long*/ accessibilityAttributeNames(int /*long*/ id, int /*long*/ sel) {
* or overridden by the SWT Accessible. false if the Cocoa defaults for the control should
* be used.
*/
-boolean handleIsAccessible(int /*long*/ id) {
+boolean handleIsAccessible(long /*int*/ id) {
return id == accessibleHandle();
}
-int /*long*/ accessibilityParameterizedAttributeNames(int /*long*/ id, int /*long*/ sel) {
+long /*int*/ accessibilityParameterizedAttributeNames(long /*int*/ id, long /*int*/ sel) {
if (handleIsAccessible(id) && accessible != null) {
NSArray returnValue = accessible.internal_accessibilityParameterizedAttributeNames(ACC.CHILDID_SELF);
@@ -205,7 +205,7 @@ int /*long*/ accessibilityParameterizedAttributeNames(int /*long*/ id, int /*lon
return super.accessibilityParameterizedAttributeNames(id, sel);
}
-void accessibilityPerformAction(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+void accessibilityPerformAction(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
if (handleIsAccessible(id) && accessible != null) {
NSString action = new NSString(arg0);
if (accessible.internal_accessibilityPerformAction(action, ACC.CHILDID_SELF)) return;
@@ -213,7 +213,7 @@ void accessibilityPerformAction(int /*long*/ id, int /*long*/ sel, int /*long*/
super.accessibilityPerformAction(id, sel, arg0);
}
-int /*long*/ accessibilityFocusedUIElement(int /*long*/ id, int /*long*/ sel) {
+long /*int*/ accessibilityFocusedUIElement(long /*int*/ id, long /*int*/ sel) {
id returnValue = null;
if (handleIsAccessible(id) && accessible != null) {
@@ -228,7 +228,7 @@ int /*long*/ accessibilityFocusedUIElement(int /*long*/ id, int /*long*/ sel) {
return returnValue.id;
}
-int /*long*/ accessibilityHitTest(int /*long*/ id, int /*long*/ sel, NSPoint point) {
+long /*int*/ accessibilityHitTest(long /*int*/ id, long /*int*/ sel, NSPoint point) {
id returnValue = null;
if (handleIsAccessible(id) && accessible != null) {
@@ -243,9 +243,9 @@ int /*long*/ accessibilityHitTest(int /*long*/ id, int /*long*/ sel, NSPoint poi
return returnValue.id;
}
-int /*long*/ accessibilityAttributeValue(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+long /*int*/ accessibilityAttributeValue(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
NSString attribute = new NSString(arg0);
- int /*long*/ returnValue = 0;
+ long /*int*/ returnValue = 0;
id returnObject = null;
if (handleIsAccessible(id) && accessible != null) {
@@ -272,7 +272,7 @@ int /*long*/ accessibilityAttributeValue(int /*long*/ id, int /*long*/ sel, int
return returnValue;
}
-int /*long*/ accessibilityAttributeValue_forParameter(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
+long /*int*/ accessibilityAttributeValue_forParameter(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
NSString attribute = new NSString(arg0);
id returnValue = null;
@@ -290,7 +290,7 @@ int /*long*/ accessibilityAttributeValue_forParameter(int /*long*/ id, int /*lon
return returnValue.id;
}
-boolean accessibilityIsAttributeSettable(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+boolean accessibilityIsAttributeSettable(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
boolean returnValue = false;
if (handleIsAccessible(id) && accessible != null) {
NSString attribute = new NSString (arg0);
@@ -302,7 +302,7 @@ boolean accessibilityIsAttributeSettable(int /*long*/ id, int /*long*/ sel, int
return returnValue;
}
-void accessibilitySetValue_forAttribute(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
+void accessibilitySetValue_forAttribute(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
if (handleIsAccessible(id) && accessible != null) {
id value = new id(arg0);
NSString attribute = new NSString(arg1);
@@ -732,25 +732,25 @@ public void addTraverseListener (TraverseListener listener) {
addListener (SWT.Traverse,typedListener);
}
-boolean becomeFirstResponder (int /*long*/ id, int /*long*/ sel) {
+boolean becomeFirstResponder (long /*int*/ id, long /*int*/ sel) {
if ((state & DISABLED) != 0) return false;
return super.becomeFirstResponder (id, sel);
}
-void beginGestureWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void beginGestureWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
if (!gestureEvent(id, event, SWT.GESTURE_BEGIN)) return;
super.beginGestureWithEvent(id, sel, event);
}
-void endGestureWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void endGestureWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
if (!gestureEvent(id, event, SWT.GESTURE_END)) return;
super.endGestureWithEvent(id, sel, event);
}
-void calculateVisibleRegion (NSView view, int /*long*/ visibleRgn, boolean clipChildren) {
- int /*long*/ tempRgn = OS.NewRgn ();
+void calculateVisibleRegion (NSView view, long /*int*/ visibleRgn, boolean clipChildren) {
+ long /*int*/ tempRgn = OS.NewRgn ();
if (!view.isHiddenOrHasHiddenAncestor() && isDrawing()) {
- int /*long*/ childRgn = OS.NewRgn ();
+ long /*int*/ childRgn = OS.NewRgn ();
NSWindow window = view.window ();
NSView contentView = window.contentView();
NSView frameView = contentView.superview();
@@ -769,7 +769,7 @@ void calculateVisibleRegion (NSView view, int /*long*/ visibleRgn, boolean clipC
if (OS.EmptyRgn (visibleRgn)) break;
if (clipChildren || tempView.id != view.id) {
NSArray subviews = tempView.subviews();
- int /*long*/ count = subviews.count();
+ long /*int*/ count = subviews.count();
for (int i = 0; i < count; i++) {
NSView child = new NSView (subviews.objectAtIndex(count - i - 1));
if (lastControl != null && child.id == lastControl.id) break;
@@ -792,7 +792,7 @@ void calculateVisibleRegion (NSView view, int /*long*/ visibleRgn, boolean clipC
OS.DisposeRgn (tempRgn);
}
-void cancelOperation(int /*long*/ id, int /*long*/ sel, int /*long*/ sender) {
+void cancelOperation(long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
// Cmd-. and escape arrive here. Forward the current event as a key event.
if (hasKeyboardFocus(id)) {
NSEvent nsEvent = NSApplication.sharedApplication().currentEvent();
@@ -952,7 +952,7 @@ NSView contentView () {
return view;
}
-NSAttributedString createString (String string, Font font, float /*double*/ [] foreground, int alignment, boolean wrap, boolean enabled, boolean mnemonics) {
+NSAttributedString createString (String string, Font font, double /*float*/ [] foreground, int alignment, boolean wrap, boolean enabled, boolean mnemonics) {
NSMutableDictionary dict = ((NSMutableDictionary)new NSMutableDictionary().alloc()).initWithCapacity(5);
if (font == null) font = this.font != null ? this.font : defaultFont();
dict.setObject (font.handle, OS.NSFontAttributeName);
@@ -1037,7 +1037,7 @@ void destroyWidget () {
releaseHandle ();
}
-void doCommandBySelector (int /*long*/ id, int /*long*/ sel, int /*long*/ selector) {
+void doCommandBySelector (long /*int*/ id, long /*int*/ sel, long /*int*/ selector) {
if (hasKeyboardFocus(id)) {
if (imeInComposition ()) return;
Shell s = this.getShell();
@@ -1051,7 +1051,7 @@ void doCommandBySelector (int /*long*/ id, int /*long*/ sel, int /*long*/ select
* during this keystroke. This rule does not apply if the command key
* is down, because we likely triggered the current key sequence via flagsChanged.
*/
- int /*long*/ modifiers = nsEvent.modifierFlags();
+ long /*int*/ modifiers = nsEvent.modifierFlags();
if (s.keyInputHappened == false || (modifiers & OS.NSCommandKeyMask) != 0) {
s.keyInputHappened = true;
boolean [] consume = new boolean [1];
@@ -1165,9 +1165,9 @@ boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
*/
NSApplication application = NSApplication.sharedApplication();
boolean dragging = false;
- int /*long*/ eventType = OS.NSLeftMouseDown;
- float /*double*/ dragX = x;
- float /*double*/ dragY = y;
+ long /*int*/ eventType = OS.NSLeftMouseDown;
+ double /*float*/ dragX = x;
+ double /*float*/ dragY = y;
/**
* To check for an actual drag we need to pull off mouse moved and mouse up events
@@ -1227,7 +1227,7 @@ boolean drawsBackground() {
return true;
}
-void drawWidget (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
+void drawWidget (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
if (id != paintView().id) return;
if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return;
@@ -1253,7 +1253,7 @@ void enableWidget (boolean enabled) {
updateCursorRects (isEnabled ());
}
-boolean equals(float /*double*/ [] color1, float /*double*/ [] color2) {
+boolean equals(double /*float*/ [] color1, double /*float*/ [] color2) {
if (color1 == color2) return true;
if (color1 == null) return color2 == null;
if (color2 == null) return color1 == null;
@@ -1305,8 +1305,8 @@ void fillBackground (NSView view, NSGraphicsContext context, NSRect rect, int im
return;
}
- float /*double*/ [] background = control.background;
- float /*double*/ alpha;
+ double /*float*/ [] background = control.background;
+ double /*float*/ alpha;
if (background == null) {
if (isTransparent()) return;
background = control.defaultBackground ().handle;
@@ -1358,14 +1358,14 @@ void fixFocus (Control focusControl) {
}
}
-void flagsChanged (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void flagsChanged (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (hasKeyboardFocus(id)) {
if ((state & WEBKIT_EVENTS_FIX) == 0) {
Shell s = this.getShell();
s.keyInputHappened = false;
int mask = 0;
NSEvent nsEvent = new NSEvent (theEvent);
- int /*long*/ modifiers = nsEvent.modifierFlags ();
+ long /*int*/ modifiers = nsEvent.modifierFlags ();
int keyCode = Display.translateKey (nsEvent.keyCode ());
switch (keyCode) {
case SWT.ALT: mask = OS.NSAlternateKeyMask; break;
@@ -1445,7 +1445,7 @@ boolean forceFocus (NSView focusView) {
return window.makeFirstResponder (focusView);
}
-boolean gestureEvent(int /*long*/ id, int /*long*/ eventPtr, int detail) {
+boolean gestureEvent(long /*int*/ id, long /*int*/ eventPtr, int detail) {
if (!display.sendEvent) return true;
display.sendEvent = false;
// For cross-platform compatibility, touch events and gestures are mutually exclusive.
@@ -1864,7 +1864,7 @@ NSBezierPath getPath(Region region) {
return getPath(region.handle);
}
-NSBezierPath getPath(int /*long*/ region) {
+NSBezierPath getPath(long /*int*/ region) {
Callback callback = new Callback(this, "regionToRects", 4);
if (callback.getAddress() == 0) error(SWT.ERROR_NO_MORE_CALLBACKS);
NSBezierPath path = NSBezierPath.bezierPath();
@@ -1999,12 +1999,12 @@ public boolean getVisible () {
return (state & HIDDEN) == 0;
}
-int /*long*/ getVisibleRegion () {
+long /*int*/ getVisibleRegion () {
if (visibleRgn == 0) {
visibleRgn = OS.NewRgn ();
calculateVisibleRegion (view, visibleRgn, true);
}
- int /*long*/ result = OS.NewRgn ();
+ long /*int*/ result = OS.NewRgn ();
OS.CopyRgn (visibleRgn, result);
return result;
}
@@ -2021,7 +2021,7 @@ boolean hasRegion () {
return region != null || parent.hasRegion ();
}
-int /*long*/ hitTest (int /*long*/ id, int /*long*/ sel, NSPoint point) {
+long /*int*/ hitTest (long /*int*/ id, long /*int*/ sel, NSPoint point) {
if ((state & DISABLED) != 0) return 0;
if (!isActive ()) return 0;
if (regionPath != null) {
@@ -2037,7 +2037,7 @@ boolean imeInComposition () {
return false;
}
-boolean insertText (int /*long*/ id, int /*long*/ sel, int /*long*/ string) {
+boolean insertText (long /*int*/ id, long /*int*/ sel, long /*int*/ string) {
// sendKeyEvent may do something to run the event loop. That would cause
// 'string' to be released before any superclass could use it, so save it
// until this method finishes.
@@ -2048,7 +2048,7 @@ boolean insertText (int /*long*/ id, int /*long*/ sel, int /*long*/ string) {
Shell s = this.getShell();
NSEvent nsEvent = NSApplication.sharedApplication ().currentEvent ();
if (nsEvent != null) {
- int /*long*/ type = nsEvent.type ();
+ long /*int*/ type = nsEvent.type ();
if (type == OS.NSKeyDown || type == OS.NSSystemDefined) {
NSString str = new NSString (string);
if (str.isKindOfClass (OS.class_NSAttributedString)) {
@@ -2090,10 +2090,10 @@ boolean insertText (int /*long*/ id, int /*long*/ sel, int /*long*/ string) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public int /*long*/ internal_new_GC (GCData data) {
+public long /*int*/ internal_new_GC (GCData data) {
checkWidget();
NSView view = paintView();
- int /*long*/ context = 0;
+ long /*int*/ context = 0;
if (data != null && data.paintRect != null) {
NSGraphicsContext graphicsContext = NSGraphicsContext.currentContext();
context = graphicsContext.id;
@@ -2105,7 +2105,7 @@ public int /*long*/ internal_new_GC (GCData data) {
* to create a GC on a deferred NSWindow.
*/
if (window.windowNumber() <= 0) {
- float /*double*/ alpha = window.alphaValue();
+ double /*float*/ alpha = window.alphaValue();
window.setAlphaValue(0);
window.orderBack(null);
window.orderOut(null);
@@ -2156,9 +2156,9 @@ public int /*long*/ internal_new_GC (GCData data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
+public void internal_dispose_GC (long /*int*/ hDC, GCData data) {
checkWidget ();
- int /*long*/ context = hDC;
+ long /*int*/ context = hDC;
NSGraphicsContext graphicsContext = new NSGraphicsContext (context);
display.removeContext (data);
if (data != null) {
@@ -2257,7 +2257,7 @@ public boolean isFocusControl () {
}
boolean isObscured () {
- int /*long*/ visibleRgn = getVisibleRegion(), boundsRgn = OS.NewRgn();
+ long /*int*/ visibleRgn = getVisibleRegion(), boundsRgn = OS.NewRgn();
short[] rect = new short[4];
NSRect bounds = view.visibleRect();
OS.SetRect(rect, (short)bounds.x, (short)bounds.y, (short)(bounds.x + bounds.width), (short)(bounds.y + bounds.height));
@@ -2357,7 +2357,7 @@ public boolean isVisible () {
return getVisible () && parent.isVisible ();
}
-void keyDown (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void keyDown (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (hasKeyboardFocus(id)) {
Shell s = this.getShell();
s.keyInputHappened = false;
@@ -2391,11 +2391,11 @@ void keyDown (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
super.keyDown (id, sel, theEvent);
}
-boolean hasKeyboardFocus(int /*long*/ inId) {
+boolean hasKeyboardFocus(long /*int*/ inId) {
return view.window().firstResponder().id == inId;
}
-void keyUp (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void keyUp (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (hasKeyboardFocus(id)) {
NSEvent nsEvent = new NSEvent (theEvent);
if (!sendKeyEvent (nsEvent, SWT.KeyUp)) return;
@@ -2403,7 +2403,7 @@ void keyUp (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
super.keyUp (id, sel, theEvent);
}
-void magnifyWithEvent(int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void magnifyWithEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
if (!gestureEvent(id, event, SWT.GESTURE_MAGNIFY)) return;
super.magnifyWithEvent(id, sel, event);
}
@@ -2412,7 +2412,7 @@ void markLayout (boolean changed, boolean all) {
/* Do nothing */
}
-int /*long*/ menuForEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+long /*int*/ menuForEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!isEnabled ()) return 0;
NSPoint pt = NSEvent.mouseLocation();
@@ -2443,7 +2443,7 @@ Decorations menuShell () {
return parent.menuShell ();
}
-void scrollWheel (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void scrollWheel (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
boolean handled = false;
if (id == view.id) {
NSEvent nsEvent = new NSEvent(theEvent);
@@ -2474,11 +2474,11 @@ void scrollWheel (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
if (!handled) super.scrollWheel(id, sel, theEvent);
}
-boolean isEventView (int /*long*/ id) {
+boolean isEventView (long /*int*/ id) {
return true;
}
-boolean mouseEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent, int type) {
+boolean mouseEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent, int type) {
if (!display.sendEvent) return true;
display.sendEvent = false;
if (!isEventView (id)) return true;
@@ -2530,7 +2530,7 @@ boolean mouseEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent, in
return true;
}
-void mouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!mouseEvent(id, sel, theEvent, SWT.MouseDown)) return;
boolean tracking = isEventView (id);
Display display = this.display;
@@ -2539,42 +2539,42 @@ void mouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
if (tracking) display.trackingControl = null;
}
-void mouseUp(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!mouseEvent(id, sel, theEvent, SWT.MouseUp)) return;
super.mouseUp(id, sel, theEvent);
}
-void mouseDragged(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!mouseEvent(id, sel, theEvent, SWT.MouseMove)) return;
super.mouseDragged(id, sel, theEvent);
}
-void rightMouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void rightMouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!mouseEvent(id, sel, theEvent, SWT.MouseDown)) return;
super.rightMouseDown(id, sel, theEvent);
}
-void rightMouseUp(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void rightMouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!mouseEvent(id, sel, theEvent, SWT.MouseUp)) return;
super.rightMouseUp(id, sel, theEvent);
}
-void rightMouseDragged(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void rightMouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!mouseEvent(id, sel, theEvent, SWT.MouseMove)) return;
super.rightMouseDragged(id, sel, theEvent);
}
-void otherMouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void otherMouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!mouseEvent(id, sel, theEvent, SWT.MouseDown)) return;
super.otherMouseDown(id, sel, theEvent);
}
-void otherMouseUp(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void otherMouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!mouseEvent(id, sel, theEvent, SWT.MouseUp)) return;
super.otherMouseUp(id, sel, theEvent);
}
-void otherMouseDragged(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void otherMouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!mouseEvent(id, sel, theEvent, SWT.MouseMove)) return;
super.otherMouseDragged(id, sel, theEvent);
}
@@ -2794,7 +2794,7 @@ public void redraw (int x, int y, int width, int height, boolean all) {
view.setNeedsDisplayInRect(rect);
}
-int /*long*/ regionToRects(int /*long*/ message, int /*long*/ rgn, int /*long*/ r, int /*long*/ path) {
+long /*int*/ regionToRects(long /*int*/ message, long /*int*/ rgn, long /*int*/ r, long /*int*/ path) {
NSPoint pt = new NSPoint();
short[] rect = new short[4];
if (message == OS.kQDRegionToRectsMsgParse) {
@@ -3252,7 +3252,7 @@ void resetVisibleRegion () {
}
GCData[] gcs = display.contexts;
if (gcs != null) {
- int /*long*/ visibleRgn = 0;
+ long /*int*/ visibleRgn = 0;
for (int i=0; i 0 ? Math.max (1, (int)delta) : Math.min (-1, (int)delta);
break;
}
case SWT.MouseHorizontalWheel: {
- float /*double*/ delta = nsEvent.deltaX();
+ double /*float*/ delta = nsEvent.deltaX();
event.count = delta > 0 ? Math.max (1, (int)delta) : Math.min (-1, (int)delta);
break;
}
@@ -3376,7 +3376,7 @@ boolean sendMouseEvent (NSEvent nsEvent, int type, boolean send) {
Touch touchStateFromNSTouch(NSTouch touch) {
TouchSource source = display.findTouchSource(touch);
- int /*long*/ osPhase = touch.phase();
+ long /*int*/ osPhase = touch.phase();
long identity = OS.objc_msgSend(touch.id, OS.sel_identity);
int state = 0;
@@ -3408,8 +3408,8 @@ Touch touchStateFromNSTouch(NSTouch touch) {
}
NSTouch findTouchWithId(NSArray touches, NSObject identity) {
- int /*long*/ count = touches.count();
- for (int /*long*/ i = 0; i < count; i++) {
+ long /*int*/ count = touches.count();
+ for (long /*int*/ i = 0; i < count; i++) {
NSTouch aTouch = new NSTouch(touches.objectAtIndex(i).id);
NSObject currIdentity = new NSObject(OS.objc_msgSend(aTouch.id, OS.sel_identity));
if (currIdentity.isEqual(identity)) return aTouch;
@@ -3424,7 +3424,7 @@ void setBackground () {
if (control.backgroundImage != null) {
setBackgroundImage (control.backgroundImage.handle);
} else {
- float /*double*/ [] color = control.background != null ? control.background : control.defaultBackground().handle;
+ double /*float*/ [] color = control.background != null ? control.background : control.defaultBackground().handle;
NSColor nsColor = NSColor.colorWithDeviceRed(color[0], color[1], color[2], color[3]);
setBackgroundColor (nsColor);
}
@@ -3453,7 +3453,7 @@ public void setBackground (Color color) {
if (color != null) {
if (color.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
}
- float /*double*/ [] background = color != null ? color.handle : null;
+ double /*float*/ [] background = color != null ? color.handle : null;
if (equals (background, this.background)) return;
this.background = background;
updateBackgroundColor ();
@@ -3766,17 +3766,17 @@ public void setForeground (Color color) {
if (color != null) {
if (color.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
}
- float /*double*/ [] foreground = color != null ? color.handle : null;
+ double /*float*/ [] foreground = color != null ? color.handle : null;
if (equals (foreground, this.foreground)) return;
this.foreground = foreground;
setForeground (foreground);
redrawWidget (view, false);
}
-void setForeground (float /*double*/ [] color) {
+void setForeground (double /*float*/ [] color) {
}
-void setFrameOrigin (int /*long*/ id, int /*long*/ sel, NSPoint point) {
+void setFrameOrigin (long /*int*/ id, long /*int*/ sel, NSPoint point) {
NSView topView = topView ();
if (topView.id != id) {
super.setFrameOrigin(id, sel, point);
@@ -3790,7 +3790,7 @@ void setFrameOrigin (int /*long*/ id, int /*long*/ sel, NSPoint point) {
}
}
-void setFrameSize (int /*long*/ id, int /*long*/ sel, NSSize size) {
+void setFrameSize (long /*int*/ id, long /*int*/ sel, NSSize size) {
NSView topView = topView ();
if (topView.id != id) {
super.setFrameSize(id, sel, size);
@@ -4219,7 +4219,7 @@ void setZOrder () {
parent.contentView().addSubview(topView, OS.NSWindowBelow, null);
}
-boolean shouldDelayWindowOrderingForEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+boolean shouldDelayWindowOrderingForEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
Shell shell = getShell ();
if ((shell.style & SWT.ON_TOP) != 0) return false;
return super.shouldDelayWindowOrderingForEvent (id, sel, theEvent);
@@ -4312,7 +4312,7 @@ void sort (int [] items) {
}
}
-void swipeWithEvent(int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void swipeWithEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
if (!gestureEvent(id, event, SWT.GESTURE_SWIPE)) return;
super.swipeWithEvent(id, sel, event);
}
@@ -4418,7 +4418,7 @@ NSView topView () {
return view;
}
-boolean touchEvent(int /*long*/ id, int /*long*/ sel, int /*long*/ eventPtr) {
+boolean touchEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ eventPtr) {
if (!display.sendEvent) return true;
display.sendEvent = false;
if (!(hooks(SWT.Touch) || filters(SWT.Touch))) return true;
@@ -4435,7 +4435,7 @@ boolean touchEvent(int /*long*/ id, int /*long*/ sel, int /*long*/ eventPtr) {
event.y = (int) location.y;
setInputState (event, nsEvent, SWT.Touch);
NSSet allTouchesSet = nsEvent.touchesMatchingPhase(OS.NSTouchPhaseAny, null);
- int /*long*/ touchCount = allTouchesSet.count();
+ long /*int*/ touchCount = allTouchesSet.count();
Touch touches[] = new Touch[(int)/*64*/touchCount];
int currTouchIndex = 0;
@@ -4469,7 +4469,7 @@ boolean touchEvent(int /*long*/ id, int /*long*/ sel, int /*long*/ eventPtr) {
* if a 4-finger gesture occurs and the application switcher appears. Workaround is to generate a TOUCHSTATE_UP for the
* orphaned touch.
*/
- for (int /*long*/ j = currentTouches.count() - 1; j >= 0 ; j--) {
+ for (long /*int*/ j = currentTouches.count() - 1; j >= 0 ; j--) {
NSTouch touch = new NSTouch(currentTouches.objectAtIndex(j).id);
NSObject identity = new NSObject(OS.objc_msgSend(touch.id, OS.sel_identity));
NSTouch activeTouch = findTouchWithId(activeTouches, identity);
@@ -4494,22 +4494,22 @@ boolean touchEvent(int /*long*/ id, int /*long*/ sel, int /*long*/ eventPtr) {
return true;
}
-void touchesBeganWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void touchesBeganWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
if (!touchEvent(id, sel, event)) return;
super.touchesBeganWithEvent(id, sel, event);
}
-void touchesCancelledWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void touchesCancelledWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
if (!touchEvent(id, sel, event)) return;
super.touchesCancelledWithEvent(id, sel, event);
}
-void touchesEndedWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void touchesEndedWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
if (!touchEvent(id, sel, event)) return;
super.touchesEndedWithEvent(id, sel, event);
}
-void touchesMovedWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void touchesMovedWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
if (!touchEvent(id, sel, event)) return;
super.touchesMovedWithEvent(id, sel, event);
}
@@ -4531,7 +4531,7 @@ boolean translateTraversal (int key, NSEvent theEvent, boolean [] consume) {
break;
}
case 48: /* Tab */ {
- int /*long*/ modifiers = theEvent.modifierFlags ();
+ long /*int*/ modifiers = theEvent.modifierFlags ();
boolean next = (modifiers & OS.NSShiftKeyMask) == 0;
detail = next ? SWT.TRAVERSE_TAB_NEXT : SWT.TRAVERSE_TAB_PREVIOUS;
break;
@@ -4547,7 +4547,7 @@ boolean translateTraversal (int key, NSEvent theEvent, boolean [] consume) {
case 116: /* Page up */
case 121: /* Page down */ {
all = true;
- int /*long*/ modifiers = theEvent.modifierFlags ();
+ long /*int*/ modifiers = theEvent.modifierFlags ();
if ((modifiers & OS.NSControlKeyMask) == 0) return false;
detail = key == 121 /* Page down */ ? SWT.TRAVERSE_PAGE_NEXT : SWT.TRAVERSE_PAGE_PREVIOUS;
break;
@@ -4913,7 +4913,7 @@ void update (boolean all) {
void updateBackgroundColor () {
Control control = findBackgroundControl ();
if (control == null) control = this;
- float /*double*/ [] color = control.background != null ? control.background : control.defaultBackground().handle;
+ double /*float*/ [] color = control.background != null ? control.background : control.defaultBackground().handle;
NSColor nsColor = NSColor.colorWithDeviceRed(color[0], color[1], color[2], color[3]);
setBackgroundColor (nsColor);
}
@@ -4932,11 +4932,11 @@ void updateBackgroundMode () {
}
}
-void resetCursorRects (int /*long*/ id, int /*long*/ sel) {
+void resetCursorRects (long /*int*/ id, long /*int*/ sel) {
if (isEnabled ()) callSuper (id, sel);
}
-void updateTrackingAreas (int /*long*/ id, int /*long*/ sel) {
+void updateTrackingAreas (long /*int*/ id, long /*int*/ sel) {
if (isEnabled ()) callSuper (id, sel);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java
index 7f2801f906..61076d20d7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java
@@ -279,7 +279,7 @@ void disposePopupShell() {
popupCalendar = null;
}
-void drawBackground (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
if (id != view.id) return;
fillBackground (view, context, rect, -1);
}
@@ -457,16 +457,16 @@ boolean isDropped () {
return popupShell.getVisible ();
}
-boolean isEventView (int /*long*/ id) {
+boolean isEventView (long /*int*/ id) {
return true;
}
-boolean isFlipped (int /*long*/ id, int /*long*/ sel) {
+boolean isFlipped (long /*int*/ id, long /*int*/ sel) {
if ((style & SWT.CALENDAR) != 0) return super.isFlipped (id, sel);
return true;
}
-void keyDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void keyDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if ((style & SWT.DROP_DOWN) != 0) {
NSEvent nsEvent = new NSEvent (theEvent);
int keyCode = Display.translateKey (nsEvent.keyCode ());
@@ -651,7 +651,7 @@ public void setDay (int day) {
}
}
-void setForeground (float /*double*/ [] color) {
+void setForeground (double /*float*/ [] color) {
NSColor nsColor;
if (color == null) {
if ((style & SWT.CALENDAR) != 0) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DirectoryDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DirectoryDialog.java
index edeaa3d34e..5a044d5ce3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DirectoryDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DirectoryDialog.java
@@ -138,7 +138,7 @@ public String open () {
}
display.setModalDialog(this);
NSString dir = (filterPath != null && filterPath.length() > 0) ? NSString.stringWith(filterPath) : null;
- int /*long*/ response = panel.runModalForDirectory(dir, null);
+ long /*int*/ response = panel.runModalForDirectory(dir, null);
if (parent != null && (style & SWT.SHEET) != 0) {
application.endSheet(panel, 0);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
index cdc8ba5b94..428e197c7d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
@@ -151,7 +151,7 @@ public class Display extends Device {
Menu[] menus, popups;
NSApplication application;
- int /*long*/ applicationClass;
+ long /*int*/ applicationClass;
NSImage dockImage;
boolean isEmbedded;
static boolean launched = false;
@@ -169,11 +169,11 @@ public class Display extends Device {
int[] screenID = new int[32];
NSPoint[] screenCascade = new NSPoint[32];
- int /*long*/ runLoopObserver;
+ long /*int*/ runLoopObserver;
Callback observerCallback;
boolean lockCursor = true;
- int /*long*/ oldCursorSetProc;
+ long /*int*/ oldCursorSetProc;
Callback cursorSetCallback;
boolean comboPoppedUp = false;
@@ -208,9 +208,9 @@ public class Display extends Device {
Cursor [] cursors = new Cursor [SWT.CURSOR_HAND + 1];
/* System Colors */
- float /*double*/ [][] colors;
- float /*double*/ [] alternateSelectedControlTextColor, selectedControlTextColor;
- float /*double*/ [] alternateSelectedControlColor, secondarySelectedControlColor;
+ double /*float*/ [][] colors;
+ double /*float*/ [] alternateSelectedControlTextColor, selectedControlTextColor;
+ double /*float*/ [] alternateSelectedControlColor, secondarySelectedControlColor;
/* Key Mappings. */
static int [] [] KeyTable = {
@@ -547,7 +547,7 @@ void addSkinnableWidget (Widget widget) {
void addWidget (NSObject view, Widget widget) {
if (view == null) return;
- int /*long*/ ivar = OS.object_setInstanceVariable (view.id, SWT_OBJECT, widget.jniRef);
+ long /*int*/ ivar = OS.object_setInstanceVariable (view.id, SWT_OBJECT, widget.jniRef);
if (ivar == 0) {
if (dynamicObjectMap == null) {
@@ -716,7 +716,7 @@ static void checkDisplay (Thread thread, boolean multiple) {
}
static NSRect convertRect(NSScreen screen, NSRect frame) {
- float /*double*/ scaleFactor = screen.userSpaceScaleFactor();
+ double /*float*/ scaleFactor = screen.userSpaceScaleFactor();
frame.x /= scaleFactor;
frame.y /= scaleFactor;
frame.width /= scaleFactor;
@@ -854,7 +854,7 @@ void createDisplay (DeviceData data) {
int [] psn = new int [2];
if (OS.GetCurrentProcess (psn) == OS.noErr) {
int pid = OS.getpid ();
- int /*long*/ ptr = getApplicationName().UTF8String();
+ long /*int*/ ptr = getApplicationName().UTF8String();
if (ptr != 0) OS.CPSSetProcessName (psn, ptr);
if (!isBundled ()) {
OS.TransformProcessType (psn, OS.kProcessTransformToForegroundApplication);
@@ -871,20 +871,20 @@ void createDisplay (DeviceData data) {
}
String className = "SWTApplication";
- int /*long*/ cls;
+ long /*int*/ cls;
if ((cls = OS.objc_lookUpClass (className)) == 0) {
Class clazz = getClass();
applicationCallback2 = new Callback(clazz, "applicationProc", 2);
- int /*long*/ proc2 = applicationCallback2.getAddress();
+ long /*int*/ proc2 = applicationCallback2.getAddress();
if (proc2 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
applicationCallback3 = new Callback(clazz, "applicationProc", 3);
- int /*long*/ proc3 = applicationCallback3.getAddress();
+ long /*int*/ proc3 = applicationCallback3.getAddress();
if (proc3 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
applicationCallback4 = new Callback(clazz, "applicationProc", 4);
- int /*long*/ proc4 = applicationCallback4.getAddress();
+ long /*int*/ proc4 = applicationCallback4.getAddress();
if (proc4 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
applicationCallback6 = new Callback(clazz, "applicationProc", 6);
- int /*long*/ proc6 = applicationCallback6.getAddress();
+ long /*int*/ proc6 = applicationCallback6.getAddress();
if (proc6 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
cls = OS.objc_allocateClassPair(OS.object_getClass(application.id), className, 0);
OS.class_addMethod(cls, OS.sel_sendEvent_, proc3, "@:@");
@@ -897,10 +897,10 @@ void createDisplay (DeviceData data) {
className = "SWTApplicationDelegate";
if (OS.objc_lookUpClass (className) == 0) {
- int /*long*/ appProc3 = applicationCallback3.getAddress();
+ long /*int*/ appProc3 = applicationCallback3.getAddress();
if (appProc3 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
- int /*long*/ appProc4 = applicationCallback4.getAddress();
+ long /*int*/ appProc4 = applicationCallback4.getAddress();
if (appProc4 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
OS.class_addMethod(cls, OS.sel_applicationWillFinishLaunching_, appProc3, "@:@");
@@ -1002,7 +1002,7 @@ NSMutableArray currentTouches() {
return currentTouches;
}
-int /*long*/ cursorSetProc (int /*long*/ id, int /*long*/ sel) {
+long /*int*/ cursorSetProc (long /*int*/ id, long /*int*/ sel) {
if (lockCursor) {
if (currentControl != null) {
Cursor cursor = currentControl.findCursor ();
@@ -1103,7 +1103,7 @@ boolean filters (int eventType) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public Widget findWidget (int /*long*/ handle) {
+public Widget findWidget (long /*int*/ handle) {
checkDevice ();
return getWidget (handle);
}
@@ -1132,7 +1132,7 @@ public Widget findWidget (int /*long*/ handle) {
*
* @since 3.1
*/
-public Widget findWidget (int /*long*/ handle, int id) {
+public Widget findWidget (long /*int*/ handle, int id) {
checkDevice ();
return getWidget (handle);
}
@@ -1267,14 +1267,14 @@ public Rectangle getBounds () {
Rectangle getBounds (NSArray screens) {
NSScreen screen = new NSScreen(screens.objectAtIndex(0));
NSRect primaryFrame = convertRect(screen, screen.frame());
- float /*double*/ minX = Float.MAX_VALUE, maxX = Float.MIN_VALUE;
- float /*double*/ minY = Float.MAX_VALUE, maxY = Float.MIN_VALUE;
- int /*long*/ count = screens.count();
+ double /*float*/ minX = Float.MAX_VALUE, maxX = Float.MIN_VALUE;
+ double /*float*/ minY = Float.MAX_VALUE, maxY = Float.MIN_VALUE;
+ long /*int*/ count = screens.count();
for (int i = 0; i < count; i++) {
screen = new NSScreen(screens.objectAtIndex(i));
NSRect frame = convertRect(screen, screen.frame());
- float /*double*/ x1 = frame.x, x2 = frame.x + frame.width;
- float /*double*/ y1 = primaryFrame.height - frame.y, y2 = primaryFrame.height - (frame.y + frame.height);
+ double /*float*/ x1 = frame.x, x2 = frame.x + frame.width;
+ double /*float*/ y1 = primaryFrame.height - frame.y, y2 = primaryFrame.height - (frame.y + frame.height);
if (x1 < minX) minX = x1;
if (x2 < minX) minX = x2;
if (x1 > maxX) maxX = x1;
@@ -1323,7 +1323,7 @@ public Rectangle getClientArea () {
NSScreen screen = new NSScreen(screens.objectAtIndex(0));
NSRect frame = convertRect(screen, screen.frame());;
NSRect visibleFrame = convertRect(screen, screen.visibleFrame());
- float /*double*/ y = frame.height - (visibleFrame.y + visibleFrame.height);
+ double /*float*/ y = frame.height - (visibleFrame.y + visibleFrame.height);
return new Rectangle((int)visibleFrame.x, (int)y, (int)visibleFrame.width, (int)visibleFrame.height);
}
@@ -1802,11 +1802,11 @@ Color getWidgetColor (int id) {
return null;
}
-float /*double*/ [] getWidgetColorRGB (int id) {
+double /*float*/ [] getWidgetColorRGB (int id) {
NSColor color = null;
switch (id) {
case SWT.COLOR_INFO_FOREGROUND: color = NSColor.blackColor (); break;
- case SWT.COLOR_INFO_BACKGROUND: return new float /*double*/ [] {.984f, .988f, 0.773f, 1};
+ case SWT.COLOR_INFO_BACKGROUND: return new double /*float*/ [] {.984f, .988f, 0.773f, 1};
case SWT.COLOR_TITLE_FOREGROUND: color = NSColor.windowFrameTextColor(); break;
case SWT.COLOR_TITLE_BACKGROUND: color = NSColor.alternateSelectedControlColor(); break;
case SWT.COLOR_TITLE_BACKGROUND_GRADIENT: color = NSColor.selectedControlColor(); break;
@@ -1828,16 +1828,16 @@ float /*double*/ [] getWidgetColorRGB (int id) {
return getNSColorRGB (color);
}
-float /*double*/ [] getNSColorRGB (NSColor color) {
+double /*float*/ [] getNSColorRGB (NSColor color) {
if (color == null) return null;
NSColorSpace colorSpace = color.colorSpace();
if (colorSpace == null || colorSpace.colorSpaceModel() != OS.NSRGBColorSpaceModel) {
color = color.colorUsingColorSpaceName(OS.NSDeviceRGBColorSpace);
}
if (color == null) return null;
- float /*double*/[] components = new float /*double*/[(int)/*64*/color.numberOfComponents()];
+ double /*float*/[] components = new double /*float*/[(int)/*64*/color.numberOfComponents()];
color.getComponents(components);
- return new float /*double*/ []{components[0], components[1], components[2], components[3]};
+ return new double /*float*/ []{components[0], components[1], components[2], components[3]};
}
/**
@@ -1892,7 +1892,7 @@ public Cursor getSystemCursor (int id) {
}
NSImage getSystemImageForID(int osType) {
- int /*long*/ iconRef[] = new int /*long*/ [1];
+ long /*int*/ iconRef[] = new long /*int*/ [1];
OS.GetIconRefFromTypeInfo(OS.kSystemIconsCreator, osType, 0, 0, 0, iconRef);
NSImage nsImage = (NSImage)new NSImage().alloc();
nsImage = nsImage.initWithIconRef(iconRef[0]);
@@ -1998,7 +1998,7 @@ public Menu getSystemMenu () {
appMenu = new Menu(this, nsAppMenu);
// Create menu items that correspond to the NSMenuItems.
- int /*long*/ nsCount = nsAppMenu.numberOfItems();
+ long /*int*/ nsCount = nsAppMenu.numberOfItems();
for (int j = 0; j < nsCount; j++) {
NSMenuItem currMenuItem = nsAppMenu.itemAtIndex(j);
new MenuItem(appMenu, currMenuItem);
@@ -2085,14 +2085,14 @@ int getToolTipTime () {
return 560;
}
-Widget getWidget (int /*long*/ id) {
+Widget getWidget (long /*int*/ id) {
return GetWidget (id);
}
-static Widget GetWidget (int /*long*/ id) {
+static Widget GetWidget (long /*int*/ id) {
if (id == 0) return null;
- int /*long*/ [] jniRef = new int /*long*/ [1];
- int /*long*/ iVar = OS.object_getInstanceVariable(id, SWT_OBJECT, jniRef);
+ long /*int*/ [] jniRef = new long /*int*/ [1];
+ long /*int*/ iVar = OS.object_getInstanceVariable(id, SWT_OBJECT, jniRef);
if (iVar == 0) {
if (dynamicObjectMap != null) {
NSObject key = new NSObject(id);
@@ -2112,7 +2112,7 @@ Widget getWidget (NSView view) {
boolean hasDefaultButton () {
NSArray windows = application.windows();
- int /*long*/ count = windows.count();
+ long /*int*/ count = windows.count();
for (int i = 0; i < count; i++) {
NSWindow window = new NSWindow(windows.objectAtIndex(i));
if (window.defaultButtonCell() != null) {
@@ -2146,7 +2146,7 @@ protected void init () {
if (currAppDelegate == null) {
if (OS.class_JRSAppKitAWT != 0) {
- int /*long*/ currDelegatePtr = OS.objc_msgSend(OS.class_JRSAppKitAWT, OS.sel_awtAppDelegate);
+ long /*int*/ currDelegatePtr = OS.objc_msgSend(OS.class_JRSAppKitAWT, OS.sel_awtAppDelegate);
if (currDelegatePtr != 0) {
currAppDelegate = new NSObject(currDelegatePtr);
currAppDelegate.retain();
@@ -2190,7 +2190,7 @@ protected void init () {
if (prefsItem != null) prefsItem.setTag(SWT.ID_PREFERENCES);
observerCallback = new Callback (this, "observerProc", 3); //$NON-NLS-1$
- int /*long*/ observerProc = observerCallback.getAddress ();
+ long /*int*/ observerProc = observerCallback.getAddress ();
if (observerProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
int activities = OS.kCFRunLoopBeforeWaiting;
runLoopObserver = OS.CFRunLoopObserverCreate (0, activities, true, 0, observerProc, 0);
@@ -2198,18 +2198,18 @@ protected void init () {
OS.CFRunLoopAddObserver (OS.CFRunLoopGetCurrent (), runLoopObserver, OS.kCFRunLoopCommonModes ());
// Add AWT Runloop mode for SWT/AWT.
- int /*long*/ cls = OS.objc_lookUpClass("JNFRunLoop"); //$NON-NLS-1$
+ long /*int*/ cls = OS.objc_lookUpClass("JNFRunLoop"); //$NON-NLS-1$
if (cls != 0) {
- int /*long*/ mode = OS.objc_msgSend(cls, OS.sel_javaRunLoopMode);
+ long /*int*/ mode = OS.objc_msgSend(cls, OS.sel_javaRunLoopMode);
if (mode != 0) {
OS.CFRunLoopAddObserver (OS.CFRunLoopGetCurrent (), runLoopObserver, mode);
}
}
cursorSetCallback = new Callback(this, "cursorSetProc", 2);
- int /*long*/ cursorSetProc = cursorSetCallback.getAddress();
+ long /*int*/ cursorSetProc = cursorSetCallback.getAddress();
if (cursorSetProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
- int /*long*/ method = OS.class_getInstanceMethod(OS.class_NSCursor, OS.sel_set);
+ long /*int*/ method = OS.class_getInstanceMethod(OS.class_NSCursor, OS.sel_set);
if (method != 0) oldCursorSetProc = OS.method_setImplementation(method, cursorSetProc);
timerDelegate = (SWTWindowDelegate)new SWTWindowDelegate().alloc().init();
@@ -2233,7 +2233,7 @@ protected void init () {
isPainting = isPainting.initWithCapacity(12);
}
-void addEventMethods (int /*long*/ cls, int /*long*/ proc2, int /*long*/ proc3, int /*long*/ drawRectProc, int /*long*/ hitTestProc, int /*long*/ needsDisplayInRectProc) {
+void addEventMethods (long /*int*/ cls, long /*int*/ proc2, long /*int*/ proc3, long /*int*/ drawRectProc, long /*int*/ hitTestProc, long /*int*/ needsDisplayInRectProc) {
if (proc3 != 0) {
OS.class_addMethod(cls, OS.sel_mouseDown_, proc3, "@:@");
OS.class_addMethod(cls, OS.sel_mouseUp_, proc3, "@:@");
@@ -2288,12 +2288,12 @@ void addEventMethods (int /*long*/ cls, int /*long*/ proc2, int /*long*/ proc3,
}
}
-void addFrameMethods(int /*long*/ cls, int /*long*/ setFrameOriginProc, int /*long*/ setFrameSizeProc) {
+void addFrameMethods(long /*int*/ cls, long /*int*/ setFrameOriginProc, long /*int*/ setFrameSizeProc) {
OS.class_addMethod(cls, OS.sel_setFrameOrigin_, setFrameOriginProc, "@:{NSPoint}");
OS.class_addMethod(cls, OS.sel_setFrameSize_, setFrameSizeProc, "@:{NSSize}");
}
-void addAccessibilityMethods(int /*long*/ cls, int /*long*/ proc2, int /*long*/ proc3, int /*long*/ proc4, int /*long*/ accessibilityHitTestProc) {
+void addAccessibilityMethods(long /*int*/ cls, long /*int*/ proc2, long /*int*/ proc3, long /*int*/ proc4, long /*int*/ accessibilityHitTestProc) {
OS.class_addMethod(cls, OS.sel_accessibilityActionNames, proc2, "@:");
OS.class_addMethod(cls, OS.sel_accessibilityAttributeNames, proc2, "@:");
OS.class_addMethod(cls, OS.sel_accessibilityParameterizedAttributeNames, proc2, "@:");
@@ -2309,24 +2309,24 @@ void addAccessibilityMethods(int /*long*/ cls, int /*long*/ proc2, int /*long*/
OS.class_addMethod(cls, OS.sel_accessibleHandle, proc2, "@:");
}
-int /*long*/ registerCellSubclass(int /*long*/ cellClass, int size, int align, byte[] types) {
+long /*int*/ registerCellSubclass(long /*int*/ cellClass, int size, int align, byte[] types) {
String cellClassName = OS.class_getName(cellClass);
- int /*long*/ cls = OS.objc_allocateClassPair(cellClass, "SWTAccessible" + cellClassName, 0);
+ long /*int*/ cls = OS.objc_allocateClassPair(cellClass, "SWTAccessible" + cellClassName, 0);
OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types);
OS.objc_registerClassPair(cls);
return cls;
}
-int /*long*/ createWindowSubclass(int /*long*/ baseClass, String newClass, boolean isDynamic) {
- int /*long*/ cls = OS.objc_lookUpClass(newClass);
+long /*int*/ createWindowSubclass(long /*int*/ baseClass, String newClass, boolean isDynamic) {
+ long /*int*/ cls = OS.objc_lookUpClass(newClass);
if (cls != 0) return cls;
cls = OS.objc_allocateClassPair(baseClass, newClass, 0);
- int /*long*/ proc3 = windowCallback3.getAddress();
- int /*long*/ proc2 = windowCallback2.getAddress();
- int /*long*/ proc4 = windowCallback4.getAddress();
- int /*long*/ proc6 = windowCallback6.getAddress();
- int /*long*/ view_stringForToolTip_point_userDataProc = OS.CALLBACK_view_stringForToolTip_point_userData_(proc6);
- int /*long*/ accessibilityHitTestProc = OS.CALLBACK_accessibilityHitTest_(proc3);
+ long /*int*/ proc3 = windowCallback3.getAddress();
+ long /*int*/ proc2 = windowCallback2.getAddress();
+ long /*int*/ proc4 = windowCallback4.getAddress();
+ long /*int*/ proc6 = windowCallback6.getAddress();
+ long /*int*/ view_stringForToolTip_point_userDataProc = OS.CALLBACK_view_stringForToolTip_point_userData_(proc6);
+ long /*int*/ accessibilityHitTestProc = OS.CALLBACK_accessibilityHitTest_(proc3);
if (!isDynamic) OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types);
OS.class_addMethod(cls, OS.sel_sendEvent_, proc3, "@:@");
@@ -2341,12 +2341,12 @@ int /*long*/ createWindowSubclass(int /*long*/ baseClass, String newClass, boole
return cls;
}
-int /*long*/ createMenuSubclass(int /*long*/ baseClass, String newClass, boolean isDynamic) {
- int /*long*/ cls = OS.objc_lookUpClass(newClass);
+long /*int*/ createMenuSubclass(long /*int*/ baseClass, String newClass, boolean isDynamic) {
+ long /*int*/ cls = OS.objc_lookUpClass(newClass);
if (cls != 0) return cls;
cls = OS.objc_allocateClassPair(baseClass, newClass, 0);
- int /*long*/ proc3 = windowCallback3.getAddress();
- int /*long*/ proc4 = windowCallback4.getAddress();
+ long /*int*/ proc3 = windowCallback3.getAddress();
+ long /*int*/ proc4 = windowCallback4.getAddress();
OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types);
OS.class_addMethod(cls, OS.sel_menuWillOpen_, proc3, "@:@");
OS.class_addMethod(cls, OS.sel_menuDidClose_, proc3, "@:@");
@@ -2356,11 +2356,11 @@ int /*long*/ createMenuSubclass(int /*long*/ baseClass, String newClass, boolean
return cls;
}
-int /*long*/ createMenuItemSubclass(int /*long*/ baseClass, String newClass, boolean isDynamic) {
- int /*long*/ cls = OS.objc_lookUpClass(newClass);
+long /*int*/ createMenuItemSubclass(long /*int*/ baseClass, String newClass, boolean isDynamic) {
+ long /*int*/ cls = OS.objc_lookUpClass(newClass);
if (cls != 0) return cls;
cls = OS.objc_allocateClassPair(baseClass, newClass, 0);
- int /*long*/ proc2 = windowCallback2.getAddress();
+ long /*int*/ proc2 = windowCallback2.getAddress();
if (!isDynamic) OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types);
OS.class_addMethod(cls, OS.sel_sendSelection, proc2, "@:");
OS.objc_registerClassPair(cls);
@@ -2372,68 +2372,68 @@ void initClasses () {
Class clazz = getClass ();
dialogCallback3 = new Callback(clazz, "dialogProc", 3);
- int /*long*/ dialogProc3 = dialogCallback3.getAddress();
+ long /*int*/ dialogProc3 = dialogCallback3.getAddress();
if (dialogProc3 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
dialogCallback4 = new Callback(clazz, "dialogProc", 4);
- int /*long*/ dialogProc4 = dialogCallback4.getAddress();
+ long /*int*/ dialogProc4 = dialogCallback4.getAddress();
if (dialogProc4 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
dialogCallback5 = new Callback(clazz, "dialogProc", 5);
- int /*long*/ dialogProc5 = dialogCallback5.getAddress();
+ long /*int*/ dialogProc5 = dialogCallback5.getAddress();
if (dialogProc5 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
windowCallback3 = new Callback(clazz, "windowProc", 3);
- int /*long*/ proc3 = windowCallback3.getAddress();
+ long /*int*/ proc3 = windowCallback3.getAddress();
if (proc3 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
windowCallback2 = new Callback(clazz, "windowProc", 2);
- int /*long*/ proc2 = windowCallback2.getAddress();
+ long /*int*/ proc2 = windowCallback2.getAddress();
if (proc2 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
windowCallback4 = new Callback(clazz, "windowProc", 4);
- int /*long*/ proc4 = windowCallback4.getAddress();
+ long /*int*/ proc4 = windowCallback4.getAddress();
if (proc4 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
windowCallback5 = new Callback(clazz, "windowProc", 5);
- int /*long*/ proc5 = windowCallback5.getAddress();
+ long /*int*/ proc5 = windowCallback5.getAddress();
if (proc5 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
windowCallback6 = new Callback(clazz, "windowProc", 6);
- int /*long*/ proc6 = windowCallback6.getAddress();
+ long /*int*/ proc6 = windowCallback6.getAddress();
if (proc6 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
- int /*long*/ isFlippedProc = OS.isFlipped_CALLBACK();
- int /*long*/ drawRectProc = OS.CALLBACK_drawRect_(proc3);
- int /*long*/ drawInteriorWithFrameInViewProc = OS.CALLBACK_drawInteriorWithFrame_inView_ (proc4);
- int /*long*/ drawWithExpansionFrameProc = OS.CALLBACK_drawWithExpansionFrame_inView_ (proc4);
- int /*long*/ imageRectForBoundsProc = OS.CALLBACK_imageRectForBounds_ (proc3);
- int /*long*/ titleRectForBoundsProc = OS.CALLBACK_titleRectForBounds_ (proc3);
- int /*long*/ cellSizeForBoundsProc = OS.CALLBACK_cellSizeForBounds_ (proc3);
- int /*long*/ hitTestForEvent_inRect_ofViewProc = OS.CALLBACK_hitTestForEvent_inRect_ofView_ (proc5);
- int /*long*/ cellSizeProc = OS.CALLBACK_cellSize (proc2);
- int /*long*/ drawImageWithFrameInViewProc = OS.CALLBACK_drawImage_withFrame_inView_ (proc5);
- int /*long*/ drawTitleWithFrameInViewProc = OS.CALLBACK_drawTitle_withFrame_inView_ (proc5);
- int /*long*/ setFrameOriginProc = OS.CALLBACK_setFrameOrigin_(proc3);
- int /*long*/ setFrameSizeProc = OS.CALLBACK_setFrameSize_(proc3);
- int /*long*/ hitTestProc = OS.CALLBACK_hitTest_(proc3);
- int /*long*/ markedRangeProc = OS.CALLBACK_markedRange (proc2);
- int /*long*/ selectedRangeProc = OS.CALLBACK_selectedRange (proc2);
- int /*long*/ highlightSelectionInClipRectProc = OS.CALLBACK_highlightSelectionInClipRect_ (proc3);
- int /*long*/ setMarkedText_selectedRangeProc = OS.CALLBACK_setMarkedText_selectedRange_(proc4);
- int /*long*/ attributedSubstringFromRangeProc = OS.CALLBACK_attributedSubstringFromRange_(proc3);
- int /*long*/ characterIndexForPointProc = OS.CALLBACK_characterIndexForPoint_(proc3);
- int /*long*/ firstRectForCharacterRangeProc = OS.CALLBACK_firstRectForCharacterRange_(proc3);
- int /*long*/ textWillChangeSelectionProc = OS.CALLBACK_textView_willChangeSelectionFromCharacterRange_toCharacterRange_(proc5);
- int /*long*/ accessibilityHitTestProc = OS.CALLBACK_accessibilityHitTest_(proc3);
- int /*long*/ shouldChangeTextInRange_replacementString_Proc = OS.CALLBACK_shouldChangeTextInRange_replacementString_(proc4);
- int /*long*/ view_stringForToolTip_point_userDataProc = OS.CALLBACK_view_stringForToolTip_point_userData_(proc6);
- int /*long*/ canDragRowsWithIndexes_atPoint_Proc = OS.CALLBACK_canDragRowsWithIndexes_atPoint_(proc4);
- int /*long*/ setNeedsDisplayInRectProc = OS.CALLBACK_setNeedsDisplayInRect_(proc3);
- int /*long*/ expansionFrameWithFrameProc = OS.CALLBACK_expansionFrameWithFrame_inView_ (proc4);
- int /*long*/ sizeOfLabelProc = OS.CALLBACK_sizeOfLabel_ (proc3);
- int /*long*/ drawLabelInRectProc = OS.CALLBACK_drawLabel_inRect_ (proc4);
- int /*long*/ drawViewBackgroundInRectProc = OS.CALLBACK_drawViewBackgroundInRect_(proc3);
- int /*long*/ drawBackgroundInClipRectProc = OS.CALLBACK_drawBackgroundInClipRect_(proc3);
- int /*long*/ scrollClipView_ToPointProc = OS.CALLBACK_scrollClipView_toPoint_(proc4);
- int /*long*/ headerRectOfColumnProc = OS.CALLBACK_headerRectOfColumn_(proc3);
- int /*long*/ columnAtPointProc = OS.CALLBACK_columnAtPoint_(proc3);
+ long /*int*/ isFlippedProc = OS.isFlipped_CALLBACK();
+ long /*int*/ drawRectProc = OS.CALLBACK_drawRect_(proc3);
+ long /*int*/ drawInteriorWithFrameInViewProc = OS.CALLBACK_drawInteriorWithFrame_inView_ (proc4);
+ long /*int*/ drawWithExpansionFrameProc = OS.CALLBACK_drawWithExpansionFrame_inView_ (proc4);
+ long /*int*/ imageRectForBoundsProc = OS.CALLBACK_imageRectForBounds_ (proc3);
+ long /*int*/ titleRectForBoundsProc = OS.CALLBACK_titleRectForBounds_ (proc3);
+ long /*int*/ cellSizeForBoundsProc = OS.CALLBACK_cellSizeForBounds_ (proc3);
+ long /*int*/ hitTestForEvent_inRect_ofViewProc = OS.CALLBACK_hitTestForEvent_inRect_ofView_ (proc5);
+ long /*int*/ cellSizeProc = OS.CALLBACK_cellSize (proc2);
+ long /*int*/ drawImageWithFrameInViewProc = OS.CALLBACK_drawImage_withFrame_inView_ (proc5);
+ long /*int*/ drawTitleWithFrameInViewProc = OS.CALLBACK_drawTitle_withFrame_inView_ (proc5);
+ long /*int*/ setFrameOriginProc = OS.CALLBACK_setFrameOrigin_(proc3);
+ long /*int*/ setFrameSizeProc = OS.CALLBACK_setFrameSize_(proc3);
+ long /*int*/ hitTestProc = OS.CALLBACK_hitTest_(proc3);
+ long /*int*/ markedRangeProc = OS.CALLBACK_markedRange (proc2);
+ long /*int*/ selectedRangeProc = OS.CALLBACK_selectedRange (proc2);
+ long /*int*/ highlightSelectionInClipRectProc = OS.CALLBACK_highlightSelectionInClipRect_ (proc3);
+ long /*int*/ setMarkedText_selectedRangeProc = OS.CALLBACK_setMarkedText_selectedRange_(proc4);
+ long /*int*/ attributedSubstringFromRangeProc = OS.CALLBACK_attributedSubstringFromRange_(proc3);
+ long /*int*/ characterIndexForPointProc = OS.CALLBACK_characterIndexForPoint_(proc3);
+ long /*int*/ firstRectForCharacterRangeProc = OS.CALLBACK_firstRectForCharacterRange_(proc3);
+ long /*int*/ textWillChangeSelectionProc = OS.CALLBACK_textView_willChangeSelectionFromCharacterRange_toCharacterRange_(proc5);
+ long /*int*/ accessibilityHitTestProc = OS.CALLBACK_accessibilityHitTest_(proc3);
+ long /*int*/ shouldChangeTextInRange_replacementString_Proc = OS.CALLBACK_shouldChangeTextInRange_replacementString_(proc4);
+ long /*int*/ view_stringForToolTip_point_userDataProc = OS.CALLBACK_view_stringForToolTip_point_userData_(proc6);
+ long /*int*/ canDragRowsWithIndexes_atPoint_Proc = OS.CALLBACK_canDragRowsWithIndexes_atPoint_(proc4);
+ long /*int*/ setNeedsDisplayInRectProc = OS.CALLBACK_setNeedsDisplayInRect_(proc3);
+ long /*int*/ expansionFrameWithFrameProc = OS.CALLBACK_expansionFrameWithFrame_inView_ (proc4);
+ long /*int*/ sizeOfLabelProc = OS.CALLBACK_sizeOfLabel_ (proc3);
+ long /*int*/ drawLabelInRectProc = OS.CALLBACK_drawLabel_inRect_ (proc4);
+ long /*int*/ drawViewBackgroundInRectProc = OS.CALLBACK_drawViewBackgroundInRect_(proc3);
+ long /*int*/ drawBackgroundInClipRectProc = OS.CALLBACK_drawBackgroundInClipRect_(proc3);
+ long /*int*/ scrollClipView_ToPointProc = OS.CALLBACK_scrollClipView_toPoint_(proc4);
+ long /*int*/ headerRectOfColumnProc = OS.CALLBACK_headerRectOfColumn_(proc3);
+ long /*int*/ columnAtPointProc = OS.CALLBACK_columnAtPoint_(proc3);
String className;
- int /*long*/ cls;
+ long /*int*/ cls;
className = "SWTBox";
cls = OS.objc_allocateClassPair(OS.class_NSBox, className, 0);
@@ -2657,7 +2657,7 @@ void initClasses () {
OS.objc_registerClassPair(cls);
if (OS.VERSION >= 0x1070) {
/* Note that isFlippedProc is used for performance and convenience */
- int /*long*/ metaClass = OS.objc_getMetaClass(className);
+ long /*int*/ metaClass = OS.objc_getMetaClass(className);
OS.class_addMethod(metaClass, OS.sel_isCompatibleWithOverlayScrollers, isFlippedProc, "@:");
}
@@ -2704,7 +2704,7 @@ void initClasses () {
OS.class_addMethod(cls, OS.sel_textView_willChangeSelectionFromCharacterRange_toCharacterRange_, textWillChangeSelectionProc, "@:@{NSRange}{NSRange}");
OS.objc_registerClassPair(cls);
- int /*long*/ nsSecureTextViewClass = OS.objc_lookUpClass("NSSecureTextView");
+ long /*int*/ nsSecureTextViewClass = OS.objc_lookUpClass("NSSecureTextView");
if (nsSecureTextViewClass != 0) {
className = "SWTSecureEditorView";
cls = OS.objc_allocateClassPair(nsSecureTextViewClass, className, 0);
@@ -2910,9 +2910,9 @@ void initClasses () {
OS.objc_registerClassPair(cls);
}
-NSFont getFont (int /*long*/ cls, int /*long*/ sel) {
- int /*long*/ widget = OS.objc_msgSend (OS.objc_msgSend (cls, OS.sel_alloc), OS.sel_initWithFrame_, new NSRect());
- int /*long*/ font = 0;
+NSFont getFont (long /*int*/ cls, long /*int*/ sel) {
+ long /*int*/ widget = OS.objc_msgSend (OS.objc_msgSend (cls, OS.sel_alloc), OS.sel_initWithFrame_, new NSRect());
+ long /*int*/ font = 0;
if (OS.objc_msgSend_bool (widget, OS.sel_respondsToSelector_, sel)) {
font = OS.objc_msgSend (widget, sel);
}
@@ -2928,7 +2928,7 @@ NSFont getFont (int /*long*/ cls, int /*long*/ sel) {
}
void initColors () {
- colors = new float /*double*/ [SWT.COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT + 1][];
+ colors = new double /*float*/ [SWT.COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT + 1][];
colors[SWT.COLOR_INFO_FOREGROUND] = getWidgetColorRGB(SWT.COLOR_INFO_FOREGROUND);
colors[SWT.COLOR_INFO_BACKGROUND] = getWidgetColorRGB(SWT.COLOR_INFO_BACKGROUND);
colors[SWT.COLOR_TITLE_FOREGROUND] = getWidgetColorRGB(SWT.COLOR_TITLE_FOREGROUND);
@@ -2996,7 +2996,7 @@ void initFonts () {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public int /*long*/ internal_new_GC (GCData data) {
+public long /*int*/ internal_new_GC (GCData data) {
if (isDisposed()) error(SWT.ERROR_DEVICE_DISPOSED);
if (screenWindow == null) {
NSWindow window = (NSWindow) new NSWindow ().alloc ();
@@ -3039,7 +3039,7 @@ public int /*long*/ internal_new_GC (GCData data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
+public void internal_dispose_GC (long /*int*/ hDC, GCData data) {
if (isDisposed()) error(SWT.ERROR_DEVICE_DISPOSED);
}
@@ -3128,8 +3128,8 @@ public boolean post(Event event) {
synchronized (Device.class) {
if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
if (event == null) error (SWT.ERROR_NULL_ARGUMENT);
- int /*long*/ eventRef = 0;
- int /*long*/ eventSource = OS.CGEventSourceCreate(OS.kCGEventSourceStateHIDSystemState);
+ long /*int*/ eventRef = 0;
+ long /*int*/ eventSource = OS.CGEventSourceCreate(OS.kCGEventSourceStateHIDSystemState);
if (eventSource == 0) return false;
boolean returnValue = false;
int deadKeyState[] = new int[1];
@@ -3139,9 +3139,9 @@ public boolean post(Event event) {
case SWT.KeyUp: {
short vKey = (short)Display.untranslateKey (event.keyCode);
if (vKey == 0) {
- int /*long*/ uchrPtr = 0;
- int /*long*/ currentKbd = OS.TISCopyCurrentKeyboardInputSource();
- int /*long*/ uchrCFData = OS.TISGetInputSourceProperty(currentKbd, OS.kTISPropertyUnicodeKeyLayoutData());
+ long /*int*/ uchrPtr = 0;
+ long /*int*/ currentKbd = OS.TISCopyCurrentKeyboardInputSource();
+ long /*int*/ uchrCFData = OS.TISGetInputSourceProperty(currentKbd, OS.kTISPropertyUnicodeKeyLayoutData());
if (uchrCFData == 0) return false;
uchrPtr = OS.CFDataGetBytePtr(uchrCFData);
@@ -3385,13 +3385,13 @@ public Point map (Control from, Control to, int x, int y) {
pt = view.convertPoint_toView_(pt, null);
pt = fromWindow.convertBaseToScreen(pt);
pt.y = primaryFrame.height - pt.y;
- float /*double*/ scaleFactor = fromWindow.userSpaceScaleFactor();
+ double /*float*/ scaleFactor = fromWindow.userSpaceScaleFactor();
pt.x /= scaleFactor;
pt.y /= scaleFactor;
}
if (to != null) {
NSView view = to.eventView ();
- float /*double*/ scaleFactor = toWindow.userSpaceScaleFactor();
+ double /*float*/ scaleFactor = toWindow.userSpaceScaleFactor();
pt.x *= scaleFactor;
pt.y = primaryFrame.height - (pt.y * scaleFactor);
pt = toWindow.convertScreenToBase(pt);
@@ -3515,13 +3515,13 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
pt = view.convertPoint_toView_(pt, null);
pt = fromWindow.convertBaseToScreen(pt);
pt.y = primaryFrame.height - pt.y;
- float /*double*/ scaleFactor = fromWindow.userSpaceScaleFactor();
+ double /*float*/ scaleFactor = fromWindow.userSpaceScaleFactor();
pt.x /= scaleFactor;
pt.y /= scaleFactor;
}
if (to != null) {
NSView view = to.eventView ();
- float /*double*/ scaleFactor = toWindow.userSpaceScaleFactor();
+ double /*float*/ scaleFactor = toWindow.userSpaceScaleFactor();
pt.x *= scaleFactor;
pt.y = primaryFrame.height - (pt.y * scaleFactor);
pt = toWindow.convertScreenToBase(pt);
@@ -3536,7 +3536,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
return rectangle;
}
-int /*long*/ observerProc (int /*long*/ observer, int /*long*/ activity, int /*long*/ info) {
+long /*int*/ observerProc (long /*int*/ observer, long /*int*/ activity, long /*int*/ info) {
switch ((int)/*64*/activity) {
case OS.kCFRunLoopBeforeWaiting:
if (runAsyncMessages) {
@@ -3551,8 +3551,8 @@ boolean performKeyEquivalent(NSWindow window, NSEvent nsEvent) {
if (modalDialog == null) return false;
if (nsEvent.type() != OS.NSKeyDown) return false;
int stateMask = 0;
- int /*long*/ selector = 0;
- int /*long*/ modifierFlags = nsEvent.modifierFlags();
+ long /*int*/ selector = 0;
+ long /*int*/ modifierFlags = nsEvent.modifierFlags();
if ((modifierFlags & OS.NSAlternateKeyMask) != 0) stateMask |= SWT.ALT;
if ((modifierFlags & OS.NSShiftKeyMask) != 0) stateMask |= SWT.SHIFT;
if ((modifierFlags & OS.NSControlKeyMask) != 0) stateMask |= SWT.CONTROL;
@@ -3780,7 +3780,7 @@ void releaseDisplay () {
markedAttributes = null;
if (oldCursorSetProc != 0) {
- int /*long*/ method = OS.class_getInstanceMethod(OS.class_NSCursor, OS.sel_set);
+ long /*int*/ method = OS.class_getInstanceMethod(OS.class_NSCursor, OS.sel_set);
OS.method_setImplementation(method, oldCursorSetProc);
}
if (cursorSetCallback != null) cursorSetCallback.dispose();
@@ -3796,7 +3796,7 @@ void releaseDisplay () {
if (!isEmbedded) {
//remove all existing menu items except the application menu
NSMenu menubar = application.mainMenu();
- int /*long*/ count = menubar.numberOfItems();
+ long /*int*/ count = menubar.numberOfItems();
while (count > 1) {
menubar.removeItemAtIndex(count - 1);
count--;
@@ -3902,8 +3902,8 @@ public void removeListener (int eventType, Listener listener) {
Widget removeWidget (NSObject view) {
if (view == null) return null;
- int /*long*/ [] jniRef = new int /*long*/ [1];
- int /*long*/ iVar = OS.object_getInstanceVariable(view.id, SWT_OBJECT, jniRef);
+ long /*int*/ [] jniRef = new long /*int*/ [1];
+ long /*int*/ iVar = OS.object_getInstanceVariable(view.id, SWT_OBJECT, jniRef);
if (iVar == 0) {
if (dynamicObjectMap != null) {
@@ -4034,7 +4034,7 @@ NSArray runLoopModes() {
boolean runPaint () {
if (needsDisplay == null && needsDisplayInRect == null) return false;
if (needsDisplay != null) {
- int /*long*/ count = needsDisplay.count();
+ long /*int*/ count = needsDisplay.count();
for (int i = 0; i < count; i++) {
OS.objc_msgSend(needsDisplay.objectAtIndex(i).id, OS.sel_setNeedsDisplay_, true);
}
@@ -4042,7 +4042,7 @@ boolean runPaint () {
needsDisplay = null;
}
if (needsDisplayInRect != null) {
- int /*long*/ count = needsDisplayInRect.count();
+ long /*int*/ count = needsDisplayInRect.count();
for (int i = 0; i < count; i+=2) {
NSValue value = new NSValue(needsDisplayInRect.objectAtIndex(i+1));
OS.objc_msgSend(needsDisplayInRect.objectAtIndex(i).id, OS.sel_setNeedsDisplayInRect_, value.rectValue());
@@ -4150,7 +4150,7 @@ void sendEvent (EventTable table, Event event) {
static NSString getApplicationName() {
NSString name = null;
int pid = OS.getpid ();
- int /*long*/ ptr = OS.getenv (ascii ("APP_NAME_" + pid));
+ long /*int*/ ptr = OS.getenv (ascii ("APP_NAME_" + pid));
if (ptr != 0) name = NSString.stringWithUTF8String(ptr);
if (name == null && APP_NAME != null) name = NSString.stringWith(APP_NAME);
if (name == null) {
@@ -4446,7 +4446,7 @@ void setMenuBar (Menu menu) {
*/
// menubar.cancelTracking();
OS.CancelMenuTracking (OS.AcquireRootMenu (), true, 0);
- int /*long*/ count = menubar.numberOfItems();
+ long /*int*/ count = menubar.numberOfItems();
while (count > 1) {
menubar.removeItemAtIndex(count - 1);
count--;
@@ -4693,7 +4693,7 @@ public void timerExec (int milliseconds, Runnable runnable) {
}
}
-int /*long*/ timerProc (int /*long*/ id, int /*long*/ sel, int /*long*/ timerID) {
+long /*int*/ timerProc (long /*int*/ id, long /*int*/ sel, long /*int*/ timerID) {
NSTimer timer = new NSTimer (timerID);
try {
NSNumber number = new NSNumber(timer.userInfo());
@@ -4761,7 +4761,7 @@ void updateQuitMenu () {
NSMenu sm = appitem.submenu();
// Normally this would be sel_terminate_ but we changed it so terminate: doesn't kill the app.
- int /*long*/ quitIndex = sm.indexOfItemWithTarget(applicationDelegate, OS.sel_applicationShouldTerminate_);
+ long /*int*/ quitIndex = sm.indexOfItemWithTarget(applicationDelegate, OS.sel_applicationShouldTerminate_);
if (quitIndex != -1) {
NSMenuItem quitItem = sm.itemAtIndex(quitIndex);
@@ -4803,12 +4803,12 @@ Control findControl (boolean checkTrim) {
Control findControl (boolean checkTrim, NSView[] hitView) {
NSView view = null;
NSPoint screenLocation = NSEvent.mouseLocation();
- int /*long*/ hitWindowNumber = 0;
+ long /*int*/ hitWindowNumber = 0;
if (OS.VERSION >= 0x1060) {
hitWindowNumber = NSWindow.windowNumberAtPoint(screenLocation, 0);
} else {
- int /*long*/ outWindow[] = new int /*long*/ [1];
- OS.FindWindow ((int /*long*/)screenLocation.x, (int /*long*/)(getPrimaryFrame().height - screenLocation.y), outWindow);
+ long /*int*/ outWindow[] = new long /*int*/ [1];
+ OS.FindWindow ((long /*int*/)screenLocation.x, (long /*int*/)(getPrimaryFrame().height - screenLocation.y), outWindow);
if (outWindow[0] != 0) {
hitWindowNumber = OS.HIWindowGetCGWindowID(outWindow[0]);
@@ -4846,7 +4846,7 @@ Control findControl (boolean checkTrim, NSView[] hitView) {
return control;
}
-void finishLaunching (int /*long*/ id, int /*long*/ sel) {
+void finishLaunching (long /*int*/ id, long /*int*/ sel) {
/*
* [NSApplication finishLaunching] cannot run multiple times otherwise
* multiple main menus are added.
@@ -4859,7 +4859,7 @@ void finishLaunching (int /*long*/ id, int /*long*/ sel) {
OS.objc_msgSendSuper(super_struct, sel);
}
-void applicationDidBecomeActive (int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void applicationDidBecomeActive (long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
NSWindow keyWindow = application.keyWindow();
if (keyWindow != null) {
keyWindow.orderFrontRegardless();
@@ -4870,17 +4870,17 @@ void applicationDidBecomeActive (int /*long*/ id, int /*long*/ sel, int /*long*/
checkEnterExit(findControl(true), null, false);
}
-void applicationDidResignActive (int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void applicationDidResignActive (long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
checkFocus();
checkEnterExit(null, null, false);
}
-int /*long*/ applicationNextEventMatchingMask (int /*long*/ id, int /*long*/ sel, int /*long*/ mask, int /*long*/ expiration, int /*long*/ mode, int /*long*/ dequeue) {
+long /*int*/ applicationNextEventMatchingMask (long /*int*/ id, long /*int*/ sel, long /*int*/ mask, long /*int*/ expiration, long /*int*/ mode, long /*int*/ dequeue) {
if (dequeue != 0 && trackingControl != null && !trackingControl.isDisposed()) runDeferredEvents();
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
- int /*long*/ result = OS.objc_msgSendSuper(super_struct, sel, mask, expiration, mode, dequeue != 0);
+ long /*int*/ result = OS.objc_msgSendSuper(super_struct, sel, mask, expiration, mode, dequeue != 0);
if (result != 0) {
/*
* Feature of Cocoa. When an NSComboBox's items list is visible it runs an event
@@ -4944,7 +4944,7 @@ void applicationSendTrackingEvent (NSEvent nsEvent, Control trackingControl) {
}
}
-void applicationSendEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void applicationSendEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
NSEvent nsEvent = new NSEvent(event);
NSWindow window = nsEvent.window ();
@@ -5014,7 +5014,7 @@ void applicationSendEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event
if (type != OS.NSAppKitDefined) sendEvent = false;
}
-void applicationWillFinishLaunching (int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void applicationWillFinishLaunching (long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
boolean loaded = false;
/*
@@ -5027,7 +5027,7 @@ void applicationWillFinishLaunching (int /*long*/ id, int /*long*/ sel, int /*lo
* return a non-zero value indicating failure, which we ignore.
*/
if (isEmbedded) {
- int /*long*/ outMenu [] = new int /*long*/ [1];
+ long /*int*/ outMenu [] = new long /*int*/ [1];
short outIndex[] = new short[1];
int status = OS.GetIndMenuItemWithCommandID(0, OS.kHICommandHide, 1, outMenu, outIndex);
if (status == 0) OS.DeleteMenuItem(outMenu[0], outIndex[0]);
@@ -5090,7 +5090,7 @@ void applicationWillFinishLaunching (int /*long*/ id, int /*long*/ sel, int /*lo
NSMenuItem ni = new NSMenuItem(ia.objectAtIndex(i));
NSString title = ni.title().stringByReplacingOccurrencesOfString(match, name);
ni.setTitle(title);
- int /*long*/ newTag = 0;
+ long /*int*/ newTag = 0;
switch(i) {
case 0:
newTag = SWT.ID_ABOUT;
@@ -5114,7 +5114,7 @@ void applicationWillFinishLaunching (int /*long*/ id, int /*long*/ sel, int /*lo
if (newTag != 0) ni.setTag(newTag);
}
- int /*long*/ quitIndex = sm.indexOfItemWithTarget(applicationDelegate, OS.sel_terminate_);
+ long /*int*/ quitIndex = sm.indexOfItemWithTarget(applicationDelegate, OS.sel_terminate_);
if (quitIndex != -1) {
NSMenuItem quitItem = sm.itemAtIndex(quitIndex);
@@ -5123,7 +5123,7 @@ void applicationWillFinishLaunching (int /*long*/ id, int /*long*/ sel, int /*lo
}
}
-static int /*long*/ applicationProc(int /*long*/ id, int /*long*/ sel) {
+static long /*int*/ applicationProc(long /*int*/ id, long /*int*/ sel) {
//TODO optimize getting the display
Display display = getCurrent ();
if (display == null) {
@@ -5142,7 +5142,7 @@ static int /*long*/ applicationProc(int /*long*/ id, int /*long*/ sel) {
return 0;
}
-static int /*long*/ applicationProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+static long /*int*/ applicationProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
//TODO optimize getting the display
Display display = getCurrent ();
if (display == null && id != applicationDelegate.id) {
@@ -5199,7 +5199,7 @@ static int /*long*/ applicationProc(int /*long*/ id, int /*long*/ sel, int /*lon
return 0;
}
-static int /*long*/ applicationProc(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
+static long /*int*/ applicationProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
Display display = getCurrent();
if (display == null && id != applicationDelegate.id) {
@@ -5222,7 +5222,7 @@ static int /*long*/ applicationProc(int /*long*/ id, int /*long*/ sel, int /*lon
return 1;
} else if (sel == OS.sel_application_openFiles_) {
NSArray files = new NSArray(arg1);
- int /*long*/ count = files.count();
+ long /*int*/ count = files.count();
for (int i=0; i 0) ? NSString.stringWith(filterPath) : null;
NSString file = (fileName != null && fileName.length() > 0) ? NSString.stringWith(fileName) : null;
- int /*long*/ response = panel.runModalForDirectory(dir, file);
+ long /*int*/ response = panel.runModalForDirectory(dir, file);
if (parent != null && (style & SWT.SHEET) != 0) {
application.endSheet(panel, 0);
}
@@ -339,15 +339,15 @@ public String open () {
return fullPath;
}
-int /*long*/ _overwriteExistingFileCheck (int /*long*/ id, int /*long*/ sel, int /*long*/ str) {
+long /*int*/ _overwriteExistingFileCheck (long /*int*/ id, long /*int*/ sel, long /*int*/ str) {
return 1;
}
-int /*long*/ panel_shouldShowFilename (int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
+long /*int*/ panel_shouldShowFilename (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
NSString path = new NSString(arg1);
if (filterExtensions != null && filterExtensions.length != 0) {
NSFileManager manager = NSFileManager.defaultManager();
- int /*long*/ ptr = OS.malloc(1);
+ long /*int*/ ptr = OS.malloc(1);
boolean found = manager.fileExistsAtPath(path, ptr);
byte[] isDirectory = new byte[1];
OS.memmove(isDirectory, ptr, 1);
@@ -376,7 +376,7 @@ int /*long*/ panel_shouldShowFilename (int /*long*/ id, int /*long*/ sel, int /*
return 1;
}
-void sendSelection (int /*long*/ id, int /*long*/ sel, int /*long*/ arg) {
+void sendSelection (long /*int*/ id, long /*int*/ sel, long /*int*/ arg) {
panel.validateVisibleColumns();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java
index b1ec63df48..b180df08d3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java
@@ -85,7 +85,7 @@ public FontDialog (Shell parent, int style) {
checkSubclass ();
}
-void changeFont(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+void changeFont(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
selected = true;
}
@@ -165,7 +165,7 @@ public FontData open () {
Font font = create ? new Font(display, fontData) : display.getSystemFont();
panel.setPanelFont(font.handle, false);
SWTPanelDelegate delegate = (SWTPanelDelegate)new SWTPanelDelegate().alloc().init();
- int /*long*/ jniRef = OS.NewGlobalRef(this);
+ long /*int*/ jniRef = OS.NewGlobalRef(this);
if (jniRef == 0) error(SWT.ERROR_NO_HANDLES);
OS.object_setInstanceVariable(delegate.id, Display.SWT_OBJECT, jniRef);
panel.setDelegate(delegate);
@@ -188,12 +188,12 @@ public FontData open () {
return fontData;
}
-void setColor_forAttribute(int /*long*/ id, int /*long*/ sel, int /*long*/ colorArg, int /*long*/ attribute) {
+void setColor_forAttribute(long /*int*/ id, long /*int*/ sel, long /*int*/ colorArg, long /*int*/ attribute) {
if (attribute != 0 && NSString.stringWith("NSColor").isEqualToString(new NSString(attribute))) { //$NON-NLS-1$
if (colorArg != 0) {
NSColor color = new NSColor(colorArg);
Display display = parent != null ? parent.getDisplay() : Display.getCurrent();
- float /*double*/ [] handle = display.getNSColorRGB(color);
+ double /*float*/ [] handle = display.getNSColorRGB(color);
rgb = new RGB((int)(handle[0] * 255), (int)(handle[1] * 255), (int)(handle[2] * 255));
} else {
rgb = null;
@@ -264,11 +264,11 @@ public void setRGB (RGB rgb) {
this.rgb = rgb;
}
-int validModesForFontPanel(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+int validModesForFontPanel(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
return effectsVisible ? OS.NSFontPanelAllModesMask : OS.NSFontPanelAllModesMask & ~OS.NSFontPanelAllEffectsModeMask;
}
-void windowWillClose(int /*long*/ id, int /*long*/ sel, int /*long*/ sender) {
+void windowWillClose(long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
NSApplication.sharedApplication().stop(null);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java
index 9e21ba4c92..02f2a8b812 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java
@@ -151,7 +151,7 @@ void deregister () {
display.removeWidget (box.titleCell());
}
-void drawBackground (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
if (id != view.id) return;
fillBackground (view, context, rect, -1);
}
@@ -217,7 +217,7 @@ void setFont(NSFont font) {
((NSBox) view).setTitleFont(font);
}
-void setForeground (float /*double*/ [] color) {
+void setForeground (double /*float*/ [] color) {
NSColor nsColor;
if (color == null) {
nsColor = NSColor.textColor ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/IME.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/IME.java
index 2a8d81d805..6e04f8b9d0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/IME.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/IME.java
@@ -85,7 +85,7 @@ public IME (Canvas parent, int style) {
createWidget ();
}
-int /*long*/ attributedSubstringFromRange (int /*long*/ id, int /*long*/ sel, int /*long*/ rangePtr) {
+long /*int*/ attributedSubstringFromRange (long /*int*/ id, long /*int*/ sel, long /*int*/ rangePtr) {
Event event = new Event ();
event.detail = SWT.COMPOSITION_SELECTION;
sendEvent (SWT.ImeComposition, event);
@@ -104,7 +104,7 @@ int /*long*/ attributedSubstringFromRange (int /*long*/ id, int /*long*/ sel, in
return 0;
}
-int /*long*/ characterIndexForPoint (int /*long*/ id, int /*long*/ sel, int /*long*/ point) {
+long /*int*/ characterIndexForPoint (long /*int*/ id, long /*int*/ sel, long /*int*/ point) {
if (!isInlineEnabled ()) return OS.NSNotFound;
NSPoint pt = new NSPoint ();
OS.memmove (pt, point, NSPoint.sizeof);
@@ -128,7 +128,7 @@ void createWidget () {
}
}
-NSRect firstRectForCharacterRange(int /*long*/ id, int /*long*/ sel, int /*long*/ range) {
+NSRect firstRectForCharacterRange(long /*int*/ id, long /*int*/ sel, long /*int*/ range) {
NSRect rect = new NSRect ();
Caret caret = parent.caret;
if (caret != null) {
@@ -256,7 +256,7 @@ public TextStyle [] getStyles () {
TextStyle getStyle (NSDictionary attribs) {
NSArray keys = attribs.allKeys ();
- int /*long*/ count = keys.count ();
+ long /*int*/ count = keys.count ();
TextStyle style = new TextStyle ();
for (int j = 0; j < count; j++) {
NSString key = new NSString (keys.objectAtIndex (j));
@@ -330,11 +330,11 @@ public boolean getWideCaret() {
return false;
}
-boolean hasMarkedText (int /*long*/ id, int /*long*/ sel) {
+boolean hasMarkedText (long /*int*/ id, long /*int*/ sel) {
return text.length () != 0;
}
-boolean insertText (int /*long*/ id, int /*long*/ sel, int /*long*/ string) {
+boolean insertText (long /*int*/ id, long /*int*/ sel, long /*int*/ string) {
if (startOffset == -1) return true;
NSString str = new NSString (string);
if (str.isKindOfClass (OS.class_NSAttributedString)) {
@@ -360,7 +360,7 @@ boolean isInlineEnabled () {
return hooks (SWT.ImeComposition);
}
-NSRange markedRange (int /*long*/ id, int /*long*/ sel) {
+NSRange markedRange (long /*int*/ id, long /*int*/ sel) {
NSRange range = new NSRange ();
if (startOffset != -1) {
range.location = startOffset;
@@ -395,7 +395,7 @@ void releaseWidget () {
resetStyles ();
}
-NSRange selectedRange (int /*long*/ id, int /*long*/ sel) {
+NSRange selectedRange (long /*int*/ id, long /*int*/ sel) {
Event event = new Event ();
event.detail = SWT.COMPOSITION_SELECTION;
sendEvent (SWT.ImeComposition, event);
@@ -429,7 +429,7 @@ public void setCompositionOffset (int offset) {
}
}
-boolean setMarkedText_selectedRange (int /*long*/ id, int /*long*/ sel, int /*long*/ string, int /*long*/ selRange) {
+boolean setMarkedText_selectedRange (long /*int*/ id, long /*int*/ sel, long /*int*/ string, long /*int*/ selRange) {
if (!isInlineEnabled ()) return true;
resetStyles ();
caretOffset = commitCount = 0;
@@ -451,7 +451,7 @@ boolean setMarkedText_selectedRange (int /*long*/ id, int /*long*/ sel, int /*lo
NSRange rangeLimit = new NSRange (), effectiveRange = new NSRange ();
rangeLimit.length = length;
int rangeCount = 0;
- int /*long*/ ptr = OS.malloc (NSRange.sizeof);
+ long /*int*/ ptr = OS.malloc (NSRange.sizeof);
for (int i = 0; i < length;) {
NSDictionary attribs = attribStr.attributesAtIndex(i, ptr, rangeLimit);
OS.memmove (effectiveRange, ptr, NSRange.sizeof);
@@ -494,7 +494,7 @@ boolean setMarkedText_selectedRange (int /*long*/ id, int /*long*/ sel, int /*lo
return true;
}
-int /*long*/ validAttributesForMarkedText (int /*long*/ id, int /*long*/ sel) {
+long /*int*/ validAttributesForMarkedText (long /*int*/ id, long /*int*/ sel) {
NSMutableArray attribs = NSMutableArray.arrayWithCapacity (6);
attribs.addObject (new NSString (OS.NSForegroundColorAttributeName ()));
attribs.addObject (new NSString (OS.NSBackgroundColorAttributeName ()));
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java
index db3b4b135b..81ee8adb89 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java
@@ -95,11 +95,11 @@ public Label (Composite parent, int style) {
super (parent, checkStyle (style));
}
-int /*long*/ accessibleHandle() {
+long /*int*/ accessibleHandle() {
return eventView().id;
}
-boolean accessibilityIsIgnored(int /*long*/ id, int /*long*/ sel) {
+boolean accessibilityIsIgnored(long /*int*/ id, long /*int*/ sel) {
if (id == view.id) return true;
return super.accessibilityIsIgnored(id, sel);
}
@@ -135,7 +135,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
int width = DEFAULT_WIDTH;
int height = DEFAULT_HEIGHT;
if ((style & SWT.SEPARATOR) != 0) {
- float /*double*/ lineWidth = ((NSBox)view).borderWidth ();
+ double /*float*/ lineWidth = ((NSBox)view).borderWidth ();
if ((style & SWT.HORIZONTAL) != 0) {
height = (int)Math.ceil (lineWidth * 2);
} else {
@@ -197,7 +197,7 @@ void createHandle () {
widget.setBoxType (OS.NSBoxCustom);
widget.setContentViewMargins (new NSSize());
- float /*double*/ lineWidth = widget.borderWidth ();
+ double /*float*/ lineWidth = widget.borderWidth ();
if ((style & SWT.HORIZONTAL) != 0) {
rect.height = (int)Math.ceil (lineWidth * 2);
rect.y = (DEFAULT_HEIGHT / 2) - (rect.height / 2);
@@ -281,12 +281,12 @@ void deregister () {
if (separator != null) display.removeWidget(separator);
}
-void drawBackground (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
if (id != view.id) return;
fillBackground(view, context, rect, -1);
}
-int /*long*/ imageView() {
+long /*int*/ imageView() {
return imageView.id;
};
@@ -436,7 +436,7 @@ void setFont(NSFont font) {
}
}
-void setForeground (float /*double*/ [] color) {
+void setForeground (double /*float*/ [] color) {
if ((style & SWT.SEPARATOR) != 0) return;
NSCell cell = new NSCell(textView.cell());
cell.setAttributedStringValue(createString());
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java
index 8b875fa648..3ae4bdac22 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java
@@ -110,7 +110,7 @@ public void addSelectionListener (SelectionListener listener) {
addListener (SWT.DefaultSelection, typedListener);
}
-boolean textView_clickOnLink_atIndex(int /*long*/ id, int /*long*/ sel, int /*long*/ textView, int /*long*/ link, int /*long*/ charIndex) {
+boolean textView_clickOnLink_atIndex(long /*int*/ id, long /*int*/ sel, long /*int*/ textView, long /*int*/ link, long /*int*/ charIndex) {
NSString str = new NSString (link);
Event event = new Event ();
event.text = str.getString();
@@ -237,7 +237,7 @@ void deregister () {
if (scrollView != null) display.removeWidget (scrollView);
}
-void drawBackground (int /*long*/ id, NSGraphicsContext context, NSRect rectangle) {
+void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rectangle) {
fillBackground (view, context, rectangle, -1);
if (!hasFocus() || focusIndex == -1) return;
int [] outMetric = new int [1];
@@ -308,13 +308,13 @@ NSRect[] getRectangles(int linkIndex) {
range.length = offsets[linkIndex].y - offsets[linkIndex].x + 1;
NSRange glyphRange = layoutManager.glyphRangeForCharacterRange(range, 0);
- int /*long*/ rangePtr = OS.malloc(NSRange.sizeof);
+ long /*int*/ rangePtr = OS.malloc(NSRange.sizeof);
NSRange lineRange = new NSRange();
/* compute number of lines in the link */
int numberOfLines = 0;
- int /*long*/ index = glyphRange.location;
- int /*long*/ glyphEndIndex = glyphRange.location + glyphRange.length;
+ long /*int*/ index = glyphRange.location;
+ long /*int*/ glyphEndIndex = glyphRange.location + glyphRange.length;
while (index < glyphEndIndex) {
numberOfLines++;
layoutManager.lineFragmentUsedRectForGlyphAtIndex(index, rangePtr, true);
@@ -364,7 +364,7 @@ public String getText () {
return text;
}
-void mouseUp(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
/*
* Feature in Cocoa: Link click notices are sent on mouseDown, but for some reason, Cocoa
* re-sends the mouseUp that follows the click on a link. Fix is to ignore the next mouseUp
@@ -377,7 +377,7 @@ void mouseUp(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
super.mouseUp(id, sel, theEvent);
}
-boolean shouldDrawInsertionPoint(int /*long*/ id, int /*long*/ sel) {
+boolean shouldDrawInsertionPoint(long /*int*/ id, long /*int*/ sel) {
return false;
}
@@ -638,7 +638,7 @@ void setFont(NSFont font) {
((NSTextView) view).setFont(font);
}
-void setForeground (float /*double*/ [] color) {
+void setForeground (double /*float*/ [] color) {
if (!getEnabled ()) return;
NSColor nsColor;
if (color == null) {
@@ -724,7 +724,7 @@ int traversalCode (int key, NSEvent theEvent) {
if (offsets.length == 0) return 0;
int bits = super.traversalCode (key, theEvent);
if (key == 48 /* Tab */ && theEvent != null) {
- int /*long*/ modifierFlags = theEvent.modifierFlags();
+ long /*int*/ modifierFlags = theEvent.modifierFlags();
boolean next = (modifierFlags & OS.NSShiftKeyMask) == 0;
if (next && focusIndex < offsets.length - 1) {
return bits & ~ SWT.TRAVERSE_TAB_NEXT;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java
index 72cd7a9bd4..dffd19de3b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java
@@ -81,7 +81,7 @@ public List (Composite parent, int style) {
super (parent, checkStyle (style));
}
-int /*long*/ accessibilityAttributeValue (int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+long /*int*/ accessibilityAttributeValue (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
// if (attributeName.isEqualToString(OS.NSAccessibilityHeaderAttribute)) {
// /*
// * Bug in the Macintosh. Even when the header is not visible,
@@ -96,7 +96,7 @@ int /*long*/ accessibilityAttributeValue (int /*long*/ id, int /*long*/ sel, int
return super.accessibilityAttributeValue(id, sel, arg0);
}
-boolean acceptsFirstResponder (int /*long*/ id, int /*long*/ sel) {
+boolean acceptsFirstResponder (long /*int*/ id, long /*int*/ sel) {
return true;
}
@@ -387,7 +387,7 @@ boolean dragDetect(int x, int y, boolean filter, boolean[] consume) {
NSPoint pt = new NSPoint();
pt.x = x;
pt.y = y;
- int /*long*/ row = widget.rowAtPoint(pt);
+ long /*int*/ row = widget.rowAtPoint(pt);
if (row == -1) return false;
boolean dragging = super.dragDetect(x, y, filter, consume);
if (dragging) {
@@ -403,7 +403,7 @@ boolean dragDetect(int x, int y, boolean filter, boolean[] consume) {
return dragging;
}
-void drawBackgroundInClipRect(int /*long*/ id, int /*long*/ sel, NSRect rect) {
+void drawBackgroundInClipRect(long /*int*/ id, long /*int*/ sel, NSRect rect) {
super.drawViewBackgroundInRect(id, sel, rect);
if (id != view.id) return;
fillBackground (view, NSGraphicsContext.currentContext(), rect, -1);
@@ -544,7 +544,7 @@ public String [] getSelection () {
}
NSIndexSet selection = widget.selectedRowIndexes();
int count = (int)/*64*/selection.count();
- int /*long*/ [] indexBuffer = new int /*long*/ [count];
+ long /*int*/ [] indexBuffer = new long /*int*/ [count];
selection.getIndexes(indexBuffer, count, 0);
String [] result = new String [count];
for (int i=0; i= 0) showIndex (index);
}
-void tableViewSelectionDidChange (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void tableViewSelectionDidChange (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
if (didSelect) return;
sendSelection();
}
-void tableViewSelectionIsChanging (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void tableViewSelectionIsChanging (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
didSelect = true;
sendSelection();
}
-int /*long*/ tableView_objectValueForTableColumn_row(int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ aTableColumn, int /*long*/ rowIndex) {
- float /*double*/ [] fg = ((NSTableView)view).isRowSelected(rowIndex) ? null : foreground;
+long /*int*/ tableView_objectValueForTableColumn_row(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ aTableColumn, long /*int*/ rowIndex) {
+ double /*float*/ [] fg = ((NSTableView)view).isRowSelected(rowIndex) ? null : foreground;
NSAttributedString attribStr = createString(items[(int)/*64*/rowIndex], null, fg, SWT.LEFT, false, getEnabled(), false);
attribStr.autorelease();
return attribStr.id;
}
-int /*long*/ tableView_selectionIndexesForProposedSelection (int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ indexSet) {
+long /*int*/ tableView_selectionIndexesForProposedSelection (long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ indexSet) {
if ((style & SWT.SINGLE) != 0) {
/*
* Feature in Cocoa. Calling setAllowsEmptySelection will automatically select the first row of the list.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java
index d82395f36f..f06d34199e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java
@@ -264,7 +264,7 @@ void _setVisible (boolean visible) {
NSView topView = window.contentView();
Point shellCoord = display.map(null, shell, new Point(x,y));
location = new NSPoint ();
- float /*double*/ scaleFactor = window.userSpaceScaleFactor();
+ double /*float*/ scaleFactor = window.userSpaceScaleFactor();
location.x = shellCoord.x * scaleFactor;
location.y = (topView.frame().height - shellCoord.y) * scaleFactor;
} else {
@@ -345,8 +345,8 @@ void createHandle () {
nsMenu = widget;
} else {
nsMenu.retain();
- int /*long*/ cls = OS.object_getClass(nsMenu.id);
- int /*long*/ dynNSMenu_class = display.createMenuSubclass(cls, "SWTSystemMenu", true);
+ long /*int*/ cls = OS.object_getClass(nsMenu.id);
+ long /*int*/ dynNSMenu_class = display.createMenuSubclass(cls, "SWTSystemMenu", true);
if (cls != dynNSMenu_class) {
OS.object_setClass(nsMenu.id, dynNSMenu_class);
}
@@ -371,8 +371,8 @@ void createItem (MenuItem item, int index) {
}
item.nsItem = nsItem;
} else {
- int /*long*/ cls = OS.object_getClass(nsItem.id);
- int /*long*/ dynNSMenuItem_class = display.createMenuItemSubclass(cls, "SWTSystemMenuItem", true);
+ long /*int*/ cls = OS.object_getClass(nsItem.id);
+ long /*int*/ dynNSMenuItem_class = display.createMenuItemSubclass(cls, "SWTSystemMenuItem", true);
if (cls != dynNSMenuItem_class) {
OS.object_setClass(nsItem.id, dynNSMenuItem_class);
}
@@ -394,9 +394,9 @@ void createItem (MenuItem item, int index) {
// Sync native key equivalent to MenuItem's accelerator.
// The system menu on OS X only uses command and option, so it's
// safe to just check for those two key masks.
- int /*long*/ keyMask = nsItem.keyEquivalentModifierMask();
+ long /*int*/ keyMask = nsItem.keyEquivalentModifierMask();
NSString keyEquivString = nsItem.keyEquivalent();
- int /*long*/ keyEquiv = 0;
+ long /*int*/ keyEquiv = 0;
if (keyEquivString != null) {
keyEquiv = keyEquivString.characterAtIndex(0);
if ((keyMask & OS.NSCommandKeyMask) != 0) keyEquiv |= SWT.COMMAND;
@@ -788,7 +788,7 @@ public boolean isVisible () {
return getVisible ();
}
-void menu_willHighlightItem(int /*long*/ id, int /*long*/ sel, int /*long*/ menu, int /*long*/ itemID) {
+void menu_willHighlightItem(long /*int*/ id, long /*int*/ sel, long /*int*/ menu, long /*int*/ itemID) {
Widget widget = display.getWidget(itemID);
if (widget instanceof MenuItem) {
MenuItem item = (MenuItem)widget;
@@ -796,23 +796,23 @@ void menu_willHighlightItem(int /*long*/ id, int /*long*/ sel, int /*long*/ menu
}
}
-void menuNeedsUpdate(int /*long*/ id, int /*long*/ sel, int /*long*/ menu) {
+void menuNeedsUpdate(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
//This code is intentionally commented
//sendEvent (SWT.Show);
}
-void menuWillOpen(int /*long*/ id, int /*long*/ sel, int /*long*/ menu) {
+void menuWillOpen(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
visible = true;
sendEvent (SWT.Show);
if (isDisposed()) return;
- float /*double*/ width = 0;
+ double /*float*/ width = 0;
NSAttributedString[] strs = new NSAttributedString[itemCount];
for (int i=0; i 1) {
NSMenuItem nsItem = item.nsItem;
NSImage nsImage = nsItem.image();
- float /*double*/ tab = width;
+ double /*float*/ tab = width;
if (nsImage != null) {
tab -= (nsImage.size().width + GAP);
}
@@ -868,7 +868,7 @@ void menuWillOpen(int /*long*/ id, int /*long*/ sel, int /*long*/ menu) {
}
}
-void menuDidClose(int /*long*/ id, int /*long*/ sel, int /*long*/ menu) {
+void menuDidClose(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
sendEvent (SWT.Hide);
if (isDisposed()) return;
visible = false;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java
index ce62d49578..cebf941129 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java
@@ -40,7 +40,7 @@ public class MenuItem extends Item {
NSMenuItem nsItem;
Menu parent, menu;
int accelerator;
- int /*long*/ nsItemAction;
+ long /*int*/ nsItemAction;
id nsItemTarget;
/**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MessageBox.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MessageBox.java
index 2707036037..8212b725dc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MessageBox.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MessageBox.java
@@ -206,7 +206,7 @@ public int open () {
NSString message = NSString.stringWith(this.message != null ? this.message : "");
alert.setMessageText(message);
int response = 0;
- int /*long*/ jniRef = 0;
+ long /*int*/ jniRef = 0;
SWTPanelDelegate delegate = null;
Display display = parent != null ? parent.getDisplay() : Display.getCurrent();
if ((style & SWT.SHEET) != 0) {
@@ -307,7 +307,7 @@ public int open () {
return SWT.CANCEL;
}
-void panelDidEnd_returnCode_contextInfo(int /*long*/ id, int /*long*/ sel, int /*long*/ alert, int /*long*/ returnCode, int /*long*/ contextInfo) {
+void panelDidEnd_returnCode_contextInfo(long /*int*/ id, long /*int*/ sel, long /*int*/ alert, long /*int*/ returnCode, long /*int*/ contextInfo) {
this.returnCode = (int)/*64*/returnCode;
NSApplication application = NSApplication.sharedApplication();
application.endSheet(new NSAlert(alert).window(), returnCode);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ProgressBar.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ProgressBar.java
index 68acfb6dfd..af3f758116 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ProgressBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ProgressBar.java
@@ -110,7 +110,7 @@ NSFont defaultNSFont () {
return display.progressIndicatorFont;
}
-void _drawThemeProgressArea (int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+void _drawThemeProgressArea (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
/*
* Bug in Cocoa. When the threaded animation is turned off by calling
* setUsesThreadedAnimation(), _drawThemeProgressArea() attempts to
@@ -128,7 +128,7 @@ void _drawThemeProgressArea (int /*long*/ id, int /*long*/ sel, int /*long*/ arg
* region of the progress bar before calling super.
*/
if (visiblePath == null) {
- int /*long*/ visibleRegion = getVisibleRegion();
+ long /*int*/ visibleRegion = getVisibleRegion();
visiblePath = getPath(visibleRegion);
OS.DisposeRgn(visibleRegion);
}
@@ -319,7 +319,7 @@ void resetVisibleRegion () {
visiblePath = null;
}
-void viewDidMoveToWindow(int /*long*/ id, int /*long*/ sel) {
+void viewDidMoveToWindow(long /*int*/ id, long /*int*/ sel) {
/*
* Bug in Cocoa. An indeterminate progress indicator doesn't start animating until it is in
* a visible window. Workaround is to catch when the bar has been added to a window and start
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java
index b9eb76f0a4..68a37e41f6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java
@@ -81,7 +81,7 @@ public Sash (Composite parent, int style) {
sizeCursor = new Cursor (display, cursorStyle);
}
-int /*long*/ accessibilityAttributeNames(int /*long*/ id, int /*long*/ sel) {
+long /*int*/ accessibilityAttributeNames(long /*int*/ id, long /*int*/ sel) {
if (accessibilityAttributes == null) {
NSMutableArray ourAttributes = NSMutableArray.arrayWithCapacity(10);
ourAttributes.addObject(OS.NSAccessibilityRoleAttribute);
@@ -124,8 +124,8 @@ int /*long*/ accessibilityAttributeNames(int /*long*/ id, int /*long*/ sel) {
return accessibilityAttributes.id;
}
-int /*long*/ accessibilityAttributeValue(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
- int /*long*/ returnValue = 0;
+long /*int*/ accessibilityAttributeValue(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+ long /*int*/ returnValue = 0;
NSString attributeName = new NSString(arg0);
if (accessible != null) {
@@ -155,7 +155,7 @@ int /*long*/ accessibilityAttributeValue(int /*long*/ id, int /*long*/ sel, int
return NSNumber.numberWithInt(value).id;
} else if (attributeName.isEqualToString (OS.NSAccessibilityMaxValueAttribute)) {
NSRect parentFrame = parent.topView().frame();
- float /*double*/ maxValue = (style & SWT.VERTICAL) != 0 ?
+ double /*float*/ maxValue = (style & SWT.VERTICAL) != 0 ?
parentFrame.width :
parentFrame.height;
return NSNumber.numberWithDouble(maxValue).id;
@@ -198,7 +198,7 @@ int /*long*/ accessibilityAttributeValue(int /*long*/ id, int /*long*/ sel, int
return super.accessibilityAttributeValue(id, sel, arg0);
}
-boolean accessibilityIsIgnored(int /*long*/ id, int /*long*/ sel) {
+boolean accessibilityIsIgnored(long /*int*/ id, long /*int*/ sel) {
return false;
}
@@ -243,7 +243,7 @@ static int checkStyle (int style) {
return checkBits (style, SWT.HORIZONTAL, SWT.VERTICAL, 0, 0, 0, 0);
}
-boolean becomeFirstResponder (int /*long*/ id, int /*long*/ sel) {
+boolean becomeFirstResponder (long /*int*/ id, long /*int*/ sel) {
boolean result = super.becomeFirstResponder(id, sel);
NSRect frame = view.frame();
lastX = (int)frame.x;
@@ -271,7 +271,7 @@ void createHandle () {
view = widget;
}
-void drawBackground (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
if (id != view.id) return;
fillBackground (view, context, rect, -1);
}
@@ -296,7 +296,7 @@ boolean sendKeyEvent(NSEvent nsEvent, int type) {
case 124: /* Right arrow */ {
int xChange = 0, yChange = 0;
int stepSize = PAGE_INCREMENT;
- int /*long*/ modifiers = nsEvent.modifierFlags();
+ long /*int*/ modifiers = nsEvent.modifierFlags();
if ((modifiers & OS.NSControlKeyMask) != 0) stepSize = INCREMENT;
if ((style & SWT.VERTICAL) != 0) {
if (keyCode == 126 || keyCode == 125) break;
@@ -346,7 +346,7 @@ boolean sendKeyEvent(NSEvent nsEvent, int type) {
return true;
}
-void mouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
//TODO use sendMouseEvent
super.mouseDown(id, sel, theEvent);
if (isDisposed()) return;
@@ -372,12 +372,12 @@ void mouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
}
}
-boolean mouseEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent, int type) {
+boolean mouseEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent, int type) {
super.mouseEvent (id, sel, theEvent, type);
return new NSEvent (theEvent).type () != OS.NSLeftMouseDown;
}
-void mouseDragged(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
//TODO use sendMouseEvent
super.mouseDragged(id, sel, theEvent);
if (isDisposed()) return;
@@ -408,7 +408,7 @@ void mouseDragged(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
}
}
-void mouseUp(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
//TODO use sendMouseEvent
super.mouseUp(id, sel, theEvent);
if (isDisposed()) return;
@@ -464,10 +464,10 @@ public void removeSelectionListener(SelectionListener listener) {
eventTable.unhook(SWT.DefaultSelection,listener);
}
-void superKeyDown (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void superKeyDown (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
}
-void superKeyUp (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void superKeyUp (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
}
int traversalCode (int key, NSEvent theEvent) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java
index 1f382541d6..830d3c23ec 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java
@@ -114,7 +114,7 @@ static int checkStyle (int style) {
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget();
NSSlider widget = (NSSlider)view;
- float /*double*/ thickness = widget.knobThickness();
+ double /*float*/ thickness = widget.knobThickness();
int width = DEFAULT_WIDTH, height = DEFAULT_HEIGHT;
if ((style & SWT.HORIZONTAL) != 0) {
height = (int)Math.ceil(thickness);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java
index 615e6b72f6..97b812f494 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java
@@ -89,7 +89,7 @@ public class ScrollBar extends Widget {
int increment = 1;
int pageIncrement = 10;
id target;
- int /*long*/ actionSelector;
+ long /*int*/ actionSelector;
ScrollBar () {
/* Do nothing */
@@ -730,7 +730,7 @@ void updateBar (int selection, int minimum, int maximum, int thumb) {
float fraction = range <= 0 ? 1 : (float) (selection - minimum) / range;
float knob = range <= 0 ? 1 : (float) thumb / (maximum - minimum);
double oldFraction = widget.doubleValue();
- float /*double*/ oldKnob = widget.knobProportion();
+ double /*float*/ oldKnob = widget.knobProportion();
widget.setDoubleValue(fraction);
widget.setKnobProportion(knob);
widget.setEnabled (range > 0);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java
index 321b05ce86..b9a772f9dc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java
@@ -134,7 +134,7 @@ ScrollBar createScrollBar (int style) {
bar.style = style;
bar.display = display;
NSScroller scroller;
- int /*long*/ actionSelector;
+ long /*int*/ actionSelector;
NSRect rect = new NSRect();
if ((style & SWT.H_SCROLL) != 0) {
rect.width = 1;
@@ -271,7 +271,7 @@ boolean hooksKeys () {
return hooks (SWT.KeyDown) || hooks (SWT.KeyUp) || hooks (SWT.Traverse);
}
-boolean isEventView (int /*long*/ id) {
+boolean isEventView (long /*int*/ id) {
return id == eventView ().id;
}
@@ -331,7 +331,7 @@ void reskinChildren (int flags) {
super.reskinChildren (flags);
}
-void scrollClipViewToPoint (int /*long*/ id, int /*long*/ sel, int /*long*/ clipView, NSPoint point) {
+void scrollClipViewToPoint (long /*int*/ id, long /*int*/ sel, long /*int*/ clipView, NSPoint point) {
if ((state & CANVAS) == 0 && scrollView != null) {
NSClipView clip = new NSClipView (clipView);
boolean oldCopies = clip.copiesOnScroll (), copies = oldCopies;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java
index ef4b26e7cb..b89d822113 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java
@@ -120,9 +120,9 @@ import org.eclipse.swt.internal.cocoa.*;
public class Shell extends Decorations {
NSWindow window;
SWTWindowDelegate windowDelegate;
- int /*long*/ hostWindowClass;
+ long /*int*/ hostWindowClass;
NSWindow hostWindow;
- int /*long*/ tooltipOwner, tooltipTag, tooltipUserData;
+ long /*int*/ tooltipOwner, tooltipTag, tooltipUserData;
int glContextCount;
boolean opened, moved, resized, fullScreen, center, deferFlushing, scrolling, isPopup;
Control lastActive;
@@ -264,7 +264,7 @@ public Shell (Display display, int style) {
this (display, null, style, 0, false);
}
-Shell (Display display, Shell parent, int style, int /*long*/handle, boolean embedded) {
+Shell (Display display, Shell parent, int style, long /*int*/handle, boolean embedded) {
super ();
checkSubclass ();
if (display == null) display = Display.getCurrent ();
@@ -390,7 +390,7 @@ public Shell (Shell parent, int style) {
*
* @since 3.3
*/
-public static Shell internal_new (Display display, int /*long*/ handle) {
+public static Shell internal_new (Display display, long /*int*/ handle) {
return new Shell (display, null, SWT.NO_TRIM, handle, false);
}
@@ -414,7 +414,7 @@ public static Shell internal_new (Display display, int /*long*/ handle) {
*
* @since 3.5
*/
-public static Shell cocoa_new (Display display, int /*long*/ handle) {
+public static Shell cocoa_new (Display display, long /*int*/ handle) {
return new Shell (display, null, SWT.NO_TRIM, handle, true);
}
@@ -444,7 +444,7 @@ static int checkStyle (Shell parent, int style) {
return bits;
}
-boolean accessibilityIsIgnored(int /*long*/ id, int /*long*/ sel) {
+boolean accessibilityIsIgnored(long /*int*/ id, long /*int*/ sel) {
// The content view of a shell is always ignored.
if (id == view.id) return true;
return super.accessibilityIsIgnored(id, sel);
@@ -482,12 +482,12 @@ public void addShellListener(ShellListener listener) {
void attachObserversToWindow(NSWindow newWindow) {
if (newWindow == null || newWindow.id == 0) return;
- int /*long*/ newHostWindowClass = OS.object_getClass(newWindow.id);
- int /*long*/ sendEventImpl = OS.class_getMethodImplementation(newHostWindowClass, OS.sel_sendEvent_);
+ long /*int*/ newHostWindowClass = OS.object_getClass(newWindow.id);
+ long /*int*/ sendEventImpl = OS.class_getMethodImplementation(newHostWindowClass, OS.sel_sendEvent_);
if (sendEventImpl == Display.windowCallback3.getAddress()) return;
hostWindow = newWindow;
hostWindow.retain();
- int /*long*/ embeddedSubclass = display.createWindowSubclass(newHostWindowClass, "SWTAWTWindow", true);
+ long /*int*/ embeddedSubclass = display.createWindowSubclass(newHostWindowClass, "SWTAWTWindow", true);
OS.object_setClass(hostWindow.id, embeddedSubclass);
display.addWidget (hostWindow, this);
hostWindowClass = newHostWindowClass;
@@ -512,7 +512,7 @@ void attachObserversToWindow(NSWindow newWindow) {
defaultCenter.addObserver(windowDelegate, OS.sel_windowWillClose_, OS.NSWindowWillCloseNotification, hostWindow);
}
-void becomeKeyWindow (int /*long*/ id, int /*long*/ sel) {
+void becomeKeyWindow (long /*int*/ id, long /*int*/ sel) {
Shell modal = getModalShell();
if (modal != null && modal.window != null) {
modal.window.makeKeyAndOrderFront(null);
@@ -534,7 +534,7 @@ void bringToTop (boolean force) {
}
}
-boolean canBecomeKeyWindow (int /*long*/ id, int /*long*/ sel) {
+boolean canBecomeKeyWindow (long /*int*/ id, long /*int*/ sel) {
if (isPopup) return false;
// Only answer if SWT created the window.
if (window != null) {
@@ -548,7 +548,7 @@ boolean canBecomeKeyWindow (int /*long*/ id, int /*long*/ sel) {
}
}
}
- int /*long*/ styleMask = window.styleMask();
+ long /*int*/ styleMask = window.styleMask();
if (styleMask == OS.NSBorderlessWindowMask || (styleMask & (OS.NSNonactivatingPanelMask | OS.NSDocModalWindowMask | OS.NSResizableWindowMask)) != 0) return true;
}
return super.canBecomeKeyWindow (id, sel);
@@ -578,7 +578,7 @@ void center () {
setLocation (x, y);
}
-void clearDeferFlushing (int /*long*/ id, int /*long*/ sel) {
+void clearDeferFlushing (long /*int*/ id, long /*int*/ sel) {
deferFlushing = false;
scrolling = false;
if (window != null) window.flushWindowIfNeeded();
@@ -632,7 +632,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
rect.height = trim.height;
if (window != null) {
if (!_getFullScreen() && !fixResize()) {
- float /*double*/ h = rect.height;
+ double /*float*/ h = rect.height;
rect = window.frameRectForContentRect(rect);
rect.y += h-rect.height;
}
@@ -692,7 +692,7 @@ void createHandle () {
}
display.cascadeWindow(window, screen);
NSRect screenFrame = screen.frame();
- float /*double*/ width = screenFrame.width * 5 / 8, height = screenFrame.height * 5 / 8;;
+ double /*float*/ width = screenFrame.width * 5 / 8, height = screenFrame.height * 5 / 8;;
NSRect frame = window.frame();
NSRect primaryFrame = primaryScreen.frame();
frame.y = primaryFrame.height - ((primaryFrame.height - (frame.y + frame.height)) + height);
@@ -806,7 +806,7 @@ void destroyWidget () {
}
}
-void drawBackground (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
if (id != view.id) return;
if (regionPath != null && background == null) {
context.saveGraphicsState();
@@ -905,9 +905,9 @@ public Rectangle getBounds () {
checkWidget();
if (window != null) {
NSRect frame = window.frame();
- float /*double*/ y = display.getPrimaryFrame().height - (int)(frame.y + frame.height);
+ double /*float*/ y = display.getPrimaryFrame().height - (int)(frame.y + frame.height);
Rectangle rectangle = new Rectangle ((int)frame.x, (int)y, (int)frame.width, (int)frame.height);
- float /*double*/ scaleFactor = view.window().userSpaceScaleFactor();
+ double /*float*/ scaleFactor = view.window().userSpaceScaleFactor();
rectangle.x /= scaleFactor;
rectangle.y /= scaleFactor;
rectangle.width /= scaleFactor;
@@ -935,7 +935,7 @@ public Rectangle getClientArea () {
if (!fixResize ()) {
rect = window.contentView().frame();
} else {
- float /*double*/ scaleFactor = window.userSpaceScaleFactor();
+ double /*float*/ scaleFactor = window.userSpaceScaleFactor();
rect = window.frame();
rect.width /= scaleFactor;
rect.height /= scaleFactor;
@@ -1008,9 +1008,9 @@ public Point getLocation () {
if (window != null) {
NSRect frame = window.frame();
- float /*double*/ y = display.getPrimaryFrame().height - (int)(frame.y + frame.height);
+ double /*float*/ y = display.getPrimaryFrame().height - (int)(frame.y + frame.height);
Point point = new Point ((int)frame.x, (int)y);
- float /*double*/ scaleFactor = view.window().userSpaceScaleFactor();
+ double /*float*/ scaleFactor = view.window().userSpaceScaleFactor();
point.x /= scaleFactor;
point.y /= scaleFactor;
return point;
@@ -1024,7 +1024,7 @@ public Point getLocation () {
pt = view.convertPoint_toView_(pt, null);
pt = view.window().convertBaseToScreen(pt);
pt.y = primaryFrame.height - pt.y;
- float /*double*/ scaleFactor = view.window().userSpaceScaleFactor();
+ double /*float*/ scaleFactor = view.window().userSpaceScaleFactor();
pt.x /= scaleFactor;
pt.y /= scaleFactor;
return new Point((int)pt.x, (int)pt.y);
@@ -1176,7 +1176,7 @@ public Point getSize () {
checkWidget();
NSRect frame = (window != null ? window.frame() : view.frame());
Point point = new Point ((int) frame.width, (int) frame.height);
- float /*double*/ scaleFactor = view.window().userSpaceScaleFactor();
+ double /*float*/ scaleFactor = view.window().userSpaceScaleFactor();
point.x /= scaleFactor;
point.y /= scaleFactor;
return point;
@@ -1218,7 +1218,7 @@ boolean hasRegion () {
return region != null;
}
-void helpRequested(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void helpRequested(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
Control control = display.getFocusControl();
while (control != null) {
if (control.hooks (SWT.Help)) {
@@ -1261,7 +1261,7 @@ public boolean isVisible () {
return getVisible ();
}
-boolean makeFirstResponder (int /*long*/ id, int /*long*/ sel, int /*long*/ responder) {
+boolean makeFirstResponder (long /*int*/ id, long /*int*/ sel, long /*int*/ responder) {
Display display = this.display;
boolean result = super.makeFirstResponder(id, sel, responder);
if (!display.isDisposed()) display.checkFocus();
@@ -1285,7 +1285,7 @@ void makeKeyAndOrderFront() {
window.makeKeyAndOrderFront (null);
}
-void mouseMoved(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseMoved(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
super.mouseMoved(id, sel, theEvent);
/**
@@ -1300,7 +1300,7 @@ void mouseMoved(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
}
}
-void noResponderFor(int /*long*/ id, int /*long*/ sel, int /*long*/ selector) {
+void noResponderFor(long /*int*/ id, long /*int*/ sel, long /*int*/ selector) {
/**
* Feature in Cocoa. If the selector is keyDown and nothing has handled the event
* a system beep is generated. There's no need to beep, as many keystrokes in the SWT
@@ -1490,7 +1490,7 @@ void sendToolTipEvent (boolean enter) {
if (userInfo != null) {
tooltipUserData = userInfo.id;
} else {
- int /*long*/ [] value = new int /*long*/ [1];
+ long /*int*/ [] value = new long /*int*/ [1];
OS.object_getInstanceVariable(tooltipTag, new byte[]{'_','u', 's', 'e', 'r', 'I', 'n', 'f', 'o'}, value);
tooltipUserData = value[0];
}
@@ -1607,7 +1607,7 @@ void setBounds (int x, int y, int width, int height, boolean move, boolean resiz
boolean sheet = window.isSheet();
if (sheet && move && !resize) return;
int screenHeight = (int) display.getPrimaryFrame().height;
- float /*double*/ scaleFactor = window.userSpaceScaleFactor();
+ double /*float*/ scaleFactor = window.userSpaceScaleFactor();
x *= scaleFactor;
y *= scaleFactor;
width *= scaleFactor;
@@ -1709,7 +1709,7 @@ public void setFullScreen (boolean fullScreen) {
fullScreenFrame = NSScreen.mainScreen().frame();
if (getMonitor().equals(display.getPrimaryMonitor ())) {
if (menuBar != null) {
- float /*double*/ menuBarHt = NSStatusBar.systemStatusBar().thickness();
+ double /*float*/ menuBarHt = NSStatusBar.systemStatusBar().thickness();
fullScreenFrame.height -= menuBarHt;
OS.SetSystemUIMode(OS.kUIModeContentHidden, 0);
}
@@ -2023,7 +2023,7 @@ void setZOrder () {
if (fixResize ()) {
NSRect rect = window.frame();
rect.x = rect.y = 0;
- float /*double*/ scaleFactor = window.userSpaceScaleFactor();
+ double /*float*/ scaleFactor = window.userSpaceScaleFactor();
rect.width /= scaleFactor;
rect.height /= scaleFactor;
window.contentView().setFrame(rect);
@@ -2112,7 +2112,7 @@ void updateSystemUIMode () {
if (fullScreen) window.setFrame(fullScreenFrame, true);
}
-int /*long*/ view_stringForToolTip_point_userData (int /*long*/ id, int /*long*/ sel, int /*long*/ view, int /*long*/ tag, int /*long*/ point, int /*long*/ userData) {
+long /*int*/ view_stringForToolTip_point_userData (long /*int*/ id, long /*int*/ sel, long /*int*/ view, long /*int*/ tag, long /*int*/ point, long /*int*/ userData) {
NSPoint pt = new NSPoint();
OS.memmove (pt, point, NSPoint.sizeof);
Control control = display.findControl (false);
@@ -2126,9 +2126,9 @@ int /*long*/ view_stringForToolTip_point_userData (int /*long*/ id, int /*long*/
return NSString.stringWithCharacters (chars, length).id;
}
-void viewWillMoveToWindow(int /*long*/ id, int /*long*/ sel, int /*long*/ newWindow) {
+void viewWillMoveToWindow(long /*int*/ id, long /*int*/ sel, long /*int*/ newWindow) {
if (window == null) {
- int /*long*/ currentWindow = hostWindow != null ? hostWindow.id : 0;
+ long /*int*/ currentWindow = hostWindow != null ? hostWindow.id : 0;
if (currentWindow != 0) {
removeObserversFromWindow();
}
@@ -2138,7 +2138,7 @@ void viewWillMoveToWindow(int /*long*/ id, int /*long*/ sel, int /*long*/ newWin
}
}
-void windowDidBecomeKey(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void windowDidBecomeKey(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
if (window != null) {
Display display = this.display;
display.setMenuBar (menuBar);
@@ -2163,22 +2163,22 @@ void windowDidBecomeKey(int /*long*/ id, int /*long*/ sel, int /*long*/ notifica
}
}
-void windowDidDeminiturize(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void windowDidDeminiturize(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
minimized = false;
sendEvent(SWT.Deiconify);
}
-void windowDidMiniturize(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void windowDidMiniturize(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
minimized = true;
sendEvent(SWT.Iconify);
}
-void windowDidMove(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void windowDidMove(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
moved = true;
sendEvent(SWT.Move);
}
-void windowDidResize(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void windowDidResize(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
if (((window.collectionBehavior() & OS.NSWindowCollectionBehaviorFullScreenPrimary) == 0) && fullScreen) {
window.setFrame(fullScreenFrame, true);
NSRect contentViewFrame = new NSRect();
@@ -2189,7 +2189,7 @@ void windowDidResize(int /*long*/ id, int /*long*/ sel, int /*long*/ notificatio
if (fixResize ()) {
NSRect rect = window.frame ();
rect.x = rect.y = 0;
- float /*double*/ scaleFactor = window.userSpaceScaleFactor();
+ double /*float*/ scaleFactor = window.userSpaceScaleFactor();
rect.width /= scaleFactor;
rect.height /= scaleFactor;
window.contentView ().setFrame (rect);
@@ -2203,7 +2203,7 @@ void windowDidResize(int /*long*/ id, int /*long*/ sel, int /*long*/ notificatio
}
}
-void windowDidResignKey(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void windowDidResignKey(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
if (display.isDisposed()) return;
sendEvent (SWT.Deactivate);
if (isDisposed ()) return;
@@ -2212,7 +2212,7 @@ void windowDidResignKey(int /*long*/ id, int /*long*/ sel, int /*long*/ notifica
saveFocus();
}
-void windowSendEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void windowSendEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
NSEvent nsEvent = new NSEvent (event);
int type = (int)/*64*/nsEvent.type ();
switch (type) {
@@ -2307,12 +2307,12 @@ void windowSendEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
super.windowSendEvent (id, sel, event);
}
-boolean windowShouldClose(int /*long*/ id, int /*long*/ sel, int /*long*/ window) {
+boolean windowShouldClose(long /*int*/ id, long /*int*/ sel, long /*int*/ window) {
if (isEnabled()) closeWidget (false);
return false;
}
-void windowWillClose(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void windowWillClose(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
closeWidget(true);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java
index 260b8dcb90..e2c0710c72 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java
@@ -99,12 +99,12 @@ public Spinner (Composite parent, int style) {
super (parent, checkStyle (style));
}
-boolean acceptsFirstResponder(int /*long*/ id, int /*long*/ sel) {
+boolean acceptsFirstResponder(long /*int*/ id, long /*int*/ sel) {
if (id == view.id) return false;
return super.acceptsFirstResponder (id, sel);
}
-boolean accessibilityIsIgnored(int /*long*/ id, int /*long*/ sel) {
+boolean accessibilityIsIgnored(long /*int*/ id, long /*int*/ sel) {
if (id == view.id) return true;
return super.accessibilityIsIgnored(id, sel);
}
@@ -210,7 +210,7 @@ protected void checkSubclass () {
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
- float /*double*/ width = 0, height = 0;
+ double /*float*/ width = 0, height = 0;
String string = Double.toString (buttonView.maxValue ());
Font font = Font.cocoa_new(display, textView.font ());
NSAttributedString str = parent.createString(string, font, null, 0, false, true, false);
@@ -335,7 +335,7 @@ void deregister () {
}
}
-void drawBackground (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
if (backgroundImage == null) return;
if (new NSView(id).isKindOfClass(OS.class_NSText)) {
NSText text = new NSText(id);
@@ -538,13 +538,13 @@ public int getTextLimit () {
return textLimit;
}
-boolean handleIsAccessible(int /*long*/ id) {
+boolean handleIsAccessible(long /*int*/ id) {
// All subviews of a Spinner can have their accessible properties overridden.
// The top-level NSView is already ignored, so we don't need to test for that.
return true;
}
-boolean isEventView (int /*long*/ id) {
+boolean isEventView (long /*int*/ id) {
return true;
}
@@ -784,7 +784,7 @@ void setFont(NSFont font) {
textView.setFont(font);
}
-void setForeground (float /*double*/ [] color) {
+void setForeground (double /*float*/ [] color) {
NSColor nsColor;
if (color == null) {
nsColor = NSColor.textColor ();
@@ -1010,14 +1010,14 @@ public void setValues (int selection, int minimum, int maximum, int digits, int
setSelection (selection, true, true, false);
}
-boolean shouldChangeTextInRange_replacementString(int /*long*/ id, int /*long*/ sel, int /*long*/ affectedCharRange, int /*long*/ replacementString) {
+boolean shouldChangeTextInRange_replacementString(long /*int*/ id, long /*int*/ sel, long /*int*/ affectedCharRange, long /*int*/ replacementString) {
NSRange range = new NSRange();
OS.memmove(range, affectedCharRange, NSRange.sizeof);
boolean result = callSuperBoolean(id, sel, range, replacementString);
if (hooks (SWT.Verify)) {
String text = new NSString(replacementString).getString();
NSEvent currentEvent = display.application.currentEvent();
- int /*long*/ type = currentEvent.type();
+ long /*int*/ type = currentEvent.type();
if (type != OS.NSKeyDown && type != OS.NSKeyUp) currentEvent = null;
String newText = verifyText(text, (int)/*64*/range.location, (int)/*64*/(range.location+range.length), currentEvent);
if (newText == null) return false;
@@ -1027,7 +1027,7 @@ boolean shouldChangeTextInRange_replacementString(int /*long*/ id, int /*long*/
if (fieldEditor != null) {
NSRange selectedRange = fieldEditor.selectedRange();
if (textLimit != LIMIT) {
- int /*long*/ charCount = fieldEditor.string().length();
+ long /*int*/ charCount = fieldEditor.string().length();
if (charCount - selectedRange.length + length > textLimit) {
length = (int)/*64*/(textLimit - charCount + selectedRange.length);
}
@@ -1044,7 +1044,7 @@ boolean shouldChangeTextInRange_replacementString(int /*long*/ id, int /*long*/
return result;
}
-void textDidChange (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void textDidChange (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
super.textDidChange (id, sel, aNotification);
boolean [] parseFail = new boolean [1];
int value = getSelectionText (parseFail);
@@ -1057,14 +1057,14 @@ void textDidChange (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotificatio
postEvent (SWT.Modify);
}
-NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange (int /*long*/ id, int /*long*/ sel, int /*long*/ aTextView, int /*long*/ oldSelectedCharRange, int /*long*/ newSelectedCharRange) {
+NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange (long /*int*/ id, long /*int*/ sel, long /*int*/ aTextView, long /*int*/ oldSelectedCharRange, long /*int*/ newSelectedCharRange) {
/* allow the selection change to proceed */
NSRange result = new NSRange ();
OS.memmove(result, newSelectedCharRange, NSRange.sizeof);
return result;
}
-void textDidEndEditing(int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void textDidEndEditing(long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
boolean [] parseFail = new boolean [1];
int value = getSelectionText (parseFail);
if (parseFail [0]) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java
index a8f0efd89b..e32466a985 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java
@@ -211,7 +211,7 @@ void destroyItem (TabItem item) {
((NSTabView)view).removeTabViewItem(item.nsItem);
}
-void drawBackground (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
if (id != view.id) return;
fillBackground (view, context, rect, -1);
}
@@ -502,7 +502,7 @@ void setFont (NSFont font) {
}
}
-void setForeground (float /*double*/ [] color) {
+void setForeground (double /*float*/ [] color) {
super.setForeground(color);
int index = getSelectionIndex();
for (int i = 0; i < itemCount; i++) {
@@ -632,7 +632,7 @@ boolean traversePage (boolean next) {
return index == getSelectionIndex ();
}
-void tabView_willSelectTabViewItem(int /*long*/ id, int /*long*/ sel, int /*long*/ tabView, int /*long*/ tabViewItem) {
+void tabView_willSelectTabViewItem(long /*int*/ id, long /*int*/ sel, long /*int*/ tabView, long /*int*/ tabViewItem) {
if (tabViewItem == 0) return;
for (int i = 0; i < itemCount; i++) {
TabItem item = items [i];
@@ -658,7 +658,7 @@ void tabView_willSelectTabViewItem(int /*long*/ id, int /*long*/ sel, int /*long
}
}
-void tabView_didSelectTabViewItem(int /*long*/ id, int /*long*/ sel, int /*long*/ tabView, int /*long*/ tabViewItem) {
+void tabView_didSelectTabViewItem(long /*int*/ id, long /*int*/ sel, long /*int*/ tabView, long /*int*/ tabViewItem) {
if (tabViewItem == 0) return;
for (int i = 0; i < itemCount; i++) {
TabItem item = items [i];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java
index 50ede9aa3c..eecc929492 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java
@@ -114,7 +114,7 @@ public TabItem (TabFolder parent, int style, int index) {
parent.createItem (this, index);
}
-int /*long*/ accessibilityAttributeValue (int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+long /*int*/ accessibilityAttributeValue (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
if (id == nsItem.id) {
NSString nsAttributeName = new NSString(arg0);
@@ -147,7 +147,7 @@ void destroyWidget () {
releaseHandle ();
}
-void drawLabelInRect(int /*long*/ id, int /*long*/ sel, boolean shouldTruncateLabel, NSRect rect) {
+void drawLabelInRect(long /*int*/ id, long /*int*/ sel, boolean shouldTruncateLabel, NSRect rect) {
if (image != null && !image.isDisposed()) {
NSSize imageSize = image.handle.size();
NSRect destRect = new NSRect();
@@ -188,8 +188,8 @@ public Rectangle getBounds() {
checkWidget();
Rectangle result = new Rectangle (0, 0, 0, 0);
if (nsItem.respondsToSelector (OS.sel_accessibilityAttributeValue_)) {
- int /*long*/ posValue = OS.objc_msgSend (nsItem.id, OS.sel_accessibilityAttributeValue_, OS.NSAccessibilityPositionAttribute ());
- int /*long*/ sizeValue = OS.objc_msgSend (nsItem.id, OS.sel_accessibilityAttributeValue_, OS.NSAccessibilitySizeAttribute ());
+ long /*int*/ posValue = OS.objc_msgSend (nsItem.id, OS.sel_accessibilityAttributeValue_, OS.NSAccessibilityPositionAttribute ());
+ long /*int*/ sizeValue = OS.objc_msgSend (nsItem.id, OS.sel_accessibilityAttributeValue_, OS.NSAccessibilitySizeAttribute ());
NSValue val = new NSValue (posValue);
NSPoint pt = val.pointValue ();
NSWindow window = parent.view.window ();
@@ -416,7 +416,7 @@ public void setToolTipText (String string) {
parent.checkToolTip (this);
}
-NSSize sizeOfLabel(int /*long*/ id, int /*long*/ sel, boolean shouldTruncateLabel) {
+NSSize sizeOfLabel(long /*int*/ id, long /*int*/ sel, boolean shouldTruncateLabel) {
NSSize size = super.sizeOfLabel(id, sel, shouldTruncateLabel);
if (image != null && !image.isDisposed()) {
NSSize imageSize = image.handle.size();
@@ -442,7 +442,7 @@ void updateText (boolean selected) {
if (attriStr != null) {
attriStr.release();
}
- float /*double*/ [] foreground = parent.foreground;
+ double /*float*/ [] foreground = parent.foreground;
if (foreground == null && selected && OS.VERSION >= 0x1070) {
foreground = display.getNSColorRGB(NSColor.alternateSelectedControlTextColor());
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java
index 8b9832b9c9..7c4fc136c6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java
@@ -126,19 +126,19 @@ public Table (Composite parent, int style) {
super (parent, checkStyle (style));
}
-boolean acceptsFirstResponder (int /*long*/ id, int /*long*/ sel) {
+boolean acceptsFirstResponder (long /*int*/ id, long /*int*/ sel) {
return true;
}
-int /*long*/ accessibilityAttributeValue(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
- int /*long*/ returnValue = 0;
+long /*int*/ accessibilityAttributeValue(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+ long /*int*/ returnValue = 0;
NSString attributeName = new NSString(arg0);
// If the check column is visible, don't report it back as a column for accessibility purposes.
// The check column is meant to appear as a part of the first column.
if (attributeName.isEqualToString (OS.NSAccessibilityColumnsAttribute) || attributeName.isEqualToString(OS.NSAccessibilityVisibleColumnsAttribute)) {
if ((style & SWT.CHECK) != 0) {
- int /*long*/ superValue = super.accessibilityAttributeValue(id, sel, arg0);
+ long /*int*/ superValue = super.accessibilityAttributeValue(id, sel, arg0);
if (superValue != 0) {
NSArray columns = new NSArray(superValue);
NSMutableArray columnsWithoutCheck = NSMutableArray.arrayWithCapacity(columns.count() - 1);
@@ -213,18 +213,18 @@ int calculateWidth (TableItem[] items, int index, GC gc) {
return width;
}
-NSSize cellSize (int /*long*/ id, int /*long*/ sel) {
+NSSize cellSize (long /*int*/ id, long /*int*/ sel) {
NSSize size = super.cellSize(id, sel);
NSCell cell = new NSCell(id);
NSImage image = cell.image();
if (image != null) size.width += imageBounds.width + IMAGE_GAP;
if (hooks(SWT.MeasureItem)) {
- int /*long*/ [] outValue = new int /*long*/ [1];
+ long /*int*/ [] outValue = new long /*int*/ [1];
OS.object_getInstanceVariable(id, Display.SWT_ROW, outValue);
- int /*long*/ rowIndex = outValue [0];
+ long /*int*/ rowIndex = outValue [0];
TableItem item = _getItem((int)/*64*/rowIndex);
OS.object_getInstanceVariable(id, Display.SWT_COLUMN, outValue);
- int /*long*/ tableColumn = outValue[0];
+ long /*int*/ tableColumn = outValue[0];
int columnIndex = 0;
for (int i=0; i 0 && ((NSTableView)view).headerView() != null) {
@@ -2533,7 +2533,7 @@ public void setHeaderVisible (boolean show) {
scrollView.tile();
}
-void setImage (int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+void setImage (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
OS.object_setInstanceVariable(id, Display.SWT_IMAGE, arg0);
}
@@ -2591,8 +2591,8 @@ public void setItemCount (int count) {
void setItemHeight (Image image, NSFont font, boolean set) {
if (font == null) font = getFont ().handle;
- float /*double*/ ascent = font.ascender ();
- float /*double*/ descent = -font.descender () + font.leading ();
+ double /*float*/ ascent = font.ascender ();
+ double /*float*/ descent = -font.descender () + font.leading ();
int height = (int)Math.ceil (ascent + descent) + 1;
Rectangle bounds = image != null ? image.getBounds () : imageBounds;
if (bounds != null) {
@@ -2859,7 +2859,7 @@ public void setSelection (TableItem [] items) {
}
}
-void setShouldScrollClipView(int /*long*/ id, int /*long*/ sel, boolean shouldScroll) {
+void setShouldScrollClipView(long /*int*/ id, long /*int*/ sel, boolean shouldScroll) {
this.shouldScroll = shouldScroll;
}
@@ -3035,7 +3035,7 @@ public void showSelection () {
}
}
-void selectRowIndexes_byExtendingSelection (int /*long*/ id, int /*long*/ sel, int /*long*/ indexes, boolean extend) {
+void selectRowIndexes_byExtendingSelection (long /*int*/ id, long /*int*/ sel, long /*int*/ indexes, boolean extend) {
if (preventSelect && !ignoreSelect) return;
if ((style & SWT.SINGLE) != 0 && !ignoreSelect) {
NSIndexSet set = new NSIndexSet(indexes);
@@ -3113,7 +3113,7 @@ void sendMeasureItem (TableItem item, int columnIndex, NSSize size, boolean isSe
}
}
-void tableViewColumnDidMove (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void tableViewColumnDidMove (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
NSNotification notification = new NSNotification (aNotification);
NSDictionary userInfo = notification.userInfo ();
NSString nsstring = (NSString) new NSString().alloc();
@@ -3141,7 +3141,7 @@ void tableViewColumnDidMove (int /*long*/ id, int /*long*/ sel, int /*long*/ aNo
headerView.setNeedsDisplay(true);
}
-void tableViewColumnDidResize (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void tableViewColumnDidResize (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
NSNotification notification = new NSNotification (aNotification);
NSDictionary userInfo = notification.userInfo ();
NSString nsstring = (NSString) new NSString().alloc();
@@ -3185,23 +3185,23 @@ void sendSelection () {
}
}
-void tableViewSelectionDidChange (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void tableViewSelectionDidChange (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
if (didSelect) return;
sendSelection();
}
-void tableViewSelectionIsChanging (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void tableViewSelectionIsChanging (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
didSelect = true;
sendSelection();
}
-void tableView_didClickTableColumn (int /*long*/ id, int /*long*/ sel, int /*long*/ tableView, int /*long*/ tableColumn) {
+void tableView_didClickTableColumn (long /*int*/ id, long /*int*/ sel, long /*int*/ tableView, long /*int*/ tableColumn) {
TableColumn column = getColumn (new id (tableColumn));
if (column == null) return; /* either CHECK column or firstColumn in 0-column Table */
column.sendSelectionEvent (SWT.Selection);
}
-int /*long*/ tableView_objectValueForTableColumn_row (int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ aTableColumn, int /*long*/ rowIndex) {
+long /*int*/ tableView_objectValueForTableColumn_row (long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ aTableColumn, long /*int*/ rowIndex) {
int index = (int)/*64*/rowIndex;
TableItem item = _getItem (index);
checkData (item, index);
@@ -3222,7 +3222,7 @@ int /*long*/ tableView_objectValueForTableColumn_row (int /*long*/ id, int /*lon
return item.createString (0).id;
}
-boolean tableView_shouldReorderColumn_toColumn(int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ currentColIndex, int /*long*/ newColIndex) {
+boolean tableView_shouldReorderColumn_toColumn(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ currentColIndex, long /*int*/ newColIndex) {
// Check column should never move and no column can be dragged to the left of it, if present.
if ((style & SWT.CHECK) != 0) {
if (currentColIndex == 0) return false;
@@ -3240,7 +3240,7 @@ boolean tableView_shouldReorderColumn_toColumn(int /*long*/ id, int /*long*/ sel
return true;
}
-boolean tableView_shouldTrackCell_forTableColumn_row(int /*long*/ id, int /*long*/ sel, int /*long*/ table, int /*long*/ cell, /*long*/ int /*long*/ tableColumn, int /*long*/ rowIndex) {
+boolean tableView_shouldTrackCell_forTableColumn_row(long /*int*/ id, long /*int*/ sel, long /*int*/ table, long /*int*/ cell, /*long*/ long /*int*/ tableColumn, long /*int*/ rowIndex) {
if ((style & SWT.CHECK) != 0) {
if (new NSCell(cell).isKindOfClass(OS.class_NSButtonCell)) return true;
}
@@ -3248,7 +3248,7 @@ boolean tableView_shouldTrackCell_forTableColumn_row(int /*long*/ id, int /*long
return widget.isRowSelected(rowIndex);
}
-void tableView_setObjectValue_forTableColumn_row (int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ anObject, int /*long*/ aTableColumn, int /*long*/ rowIndex) {
+void tableView_setObjectValue_forTableColumn_row (long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ anObject, long /*int*/ aTableColumn, long /*int*/ rowIndex) {
if (checkColumn != null && aTableColumn == checkColumn.id) {
TableItem item = items [(int)/*64*/rowIndex];
item.checked = !item.checked;
@@ -3261,7 +3261,7 @@ void tableView_setObjectValue_forTableColumn_row (int /*long*/ id, int /*long*/
}
}
-void tableView_willDisplayCell_forTableColumn_row (int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ cell, int /*long*/ tableColumn, int /*long*/ rowIndex) {
+void tableView_willDisplayCell_forTableColumn_row (long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ cell, long /*int*/ tableColumn, long /*int*/ rowIndex) {
if (checkColumn != null && tableColumn == checkColumn.id) return;
TableItem item = items [(int)/*64*/rowIndex];
int index = 0;
@@ -3326,7 +3326,7 @@ void tableView_willDisplayCell_forTableColumn_row (int /*long*/ id, int /*long*/
}
}
-boolean tableView_writeRowsWithIndexes_toPasteboard(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2) {
+boolean tableView_writeRowsWithIndexes_toPasteboard(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
return sendMouseEvent(NSApplication.sharedApplication().currentEvent(), SWT.DragDetect, true);
}
@@ -3338,7 +3338,7 @@ boolean sendMouseEvent(NSEvent nsEvent, int type, boolean send) {
NSTableView widget = (NSTableView)view;
NSIndexSet selectedRows = widget.selectedRowIndexes ();
int count = (int)/*64*/selectedRows.count();
- int /*long*/ [] indexBuffer = new int /*long*/ [count];
+ long /*int*/ [] indexBuffer = new long /*int*/ [count];
selectedRows.getIndexes(indexBuffer, count, 0);
for (int i = 0; i < count; i++) {
if (indexBuffer[i] == selectedRowIndex) continue;
@@ -3358,7 +3358,7 @@ boolean sendMouseEvent(NSEvent nsEvent, int type, boolean send) {
return super.sendMouseEvent (nsEvent, type, send);
}
-NSRect titleRectForBounds (int /*long*/ id, int /*long*/ sel, NSRect cellFrame) {
+NSRect titleRectForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
NSImage image = new NSCell(id).image();
if (image != null) {
int imageWidth = imageBounds.width + IMAGE_GAP;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java
index a4332b1964..118528dc6f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java
@@ -201,7 +201,7 @@ void destroyWidget () {
releaseHandle ();
}
-void drawInteriorWithFrame_inView (int /*long*/ id, int /*long*/ sel, NSRect cellRect, int /*long*/ view) {
+void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellRect, long /*int*/ view) {
/*
* Feature in Cocoa. When the last column in a table does not reach the
* rightmost edge of the table view, the cell that draws the rightmost-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java
index ad5506dd13..41bf9eea28 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java
@@ -61,7 +61,7 @@ public class Text extends Scrollable {
String message;
NSRange selectionRange;
id targetSearch, targetCancel;
- int /*long*/ actionSearch, actionCancel;
+ long /*int*/ actionSearch, actionCancel;
/**
* The maximum number of characters that can be entered
@@ -337,7 +337,7 @@ public void append (String string) {
if (string.length () != 0) sendEvent (SWT.Modify);
}
-boolean becomeFirstResponder (int /*long*/ id, int /*long*/ sel) {
+boolean becomeFirstResponder (long /*int*/ id, long /*int*/ sel) {
receivingFocus = true;
boolean result = super.becomeFirstResponder (id, sel);
receivingFocus = false;
@@ -575,9 +575,9 @@ void createWidget () {
super.createWidget ();
if ((style & SWT.PASSWORD) != 0) {
NSText fieldEditor = view.window().fieldEditor(true, view);
- int /*long*/ nsSecureTextViewClass = OS.objc_lookUpClass("NSSecureTextView");
+ long /*int*/ nsSecureTextViewClass = OS.objc_lookUpClass("NSSecureTextView");
if (fieldEditor != null && nsSecureTextViewClass != 0 && fieldEditor.isKindOfClass(nsSecureTextViewClass)) {
- int /*long*/ editorClass = OS.objc_getClass("SWTSecureEditorView");
+ long /*int*/ editorClass = OS.objc_getClass("SWTSecureEditorView");
OS.object_setClass(fieldEditor.id, editorClass);
}
}
@@ -657,7 +657,7 @@ void deregister() {
}
}
-void drawBackground (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
if ((style & SWT.SINGLE) != 0) {
if (backgroundImage == null) return;
if (new NSView(id).isKindOfClass(OS.class_NSText)) {
@@ -684,7 +684,7 @@ void drawInteriorWithFrame_inView(int id, int sel, NSRect cellFrame, int viewid)
boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
Point selection = getSelection ();
if (selection.x != selection.y) {
- int /*long*/ position = getPosition (x, y);
+ long /*int*/ position = getPosition (x, y);
if (selection.x <= position && position < selection.y) {
if (super.dragDetect (x, y, filter, consume)) {
if (consume != null) consume [0] = true;
@@ -727,7 +727,7 @@ public int getCaretLineNumber () {
return (getTopPixel () + getCaretLocation ().y) / getLineHeight ();
}
-boolean acceptsFirstResponder(int /*long*/ id, int /*long*/ sel) {
+boolean acceptsFirstResponder(long /*int*/ id, long /*int*/ sel) {
if ((style & SWT.READ_ONLY) != 0) return true;
return super.acceptsFirstResponder(id, sel);
}
@@ -757,8 +757,8 @@ public Point getCaretLocation () {
NSLayoutManager layoutManager = widget.layoutManager();
NSTextContainer container = widget.textContainer();
NSRange range = widget.selectedRange();
- int /*long*/ [] rectCount = new int /*long*/ [1];
- int /*long*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, container, rectCount);
+ long /*int*/ [] rectCount = new long /*int*/ [1];
+ long /*int*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, container, rectCount);
NSRect rect = new NSRect();
if (rectCount[0] > 0) OS.memmove(rect, pArray, NSRect.sizeof);
return new Point((int)rect.x, (int)rect.y);
@@ -939,7 +939,7 @@ public int getLineCount () {
NSTextStorage storage = ((NSTextView) view).textStorage ();
int count = (int)/*64*/storage.paragraphs ().count ();
NSString string = storage.string();
- int /*long*/ length = string.length(), c;
+ long /*int*/ length = string.length(), c;
if (length == 0 || (c = string.characterAtIndex(length - 1)) == '\n' || c == '\r') {
count++;
}
@@ -1028,7 +1028,7 @@ public String getMessage () {
return message;
}
-int /*long*/ getPosition (int /*long*/ x, int /*long*/ y) {
+long /*int*/ getPosition (long /*int*/ x, long /*int*/ y) {
// checkWidget ();
if ((style & SWT.MULTI) != 0) {
NSTextView widget = (NSTextView) view;
@@ -1374,7 +1374,7 @@ void insertEditText (String string) {
}
}
-boolean isEventView (int /*long*/ id) {
+boolean isEventView (long /*int*/ id) {
if ((style & SWT.MULTI) != 0) return super.isEventView (id);
return true;
}
@@ -1595,7 +1595,7 @@ boolean sendKeyEvent (NSEvent nsEvent, int type) {
boolean result = super.sendKeyEvent (nsEvent, type);
if (!result) return result;
if (type != SWT.KeyDown) return result;
- int /*long*/ modifierFlags = nsEvent.modifierFlags();
+ long /*int*/ modifierFlags = nsEvent.modifierFlags();
if ((modifierFlags & OS.NSCommandKeyMask) != 0) {
short keyCode = nsEvent.keyCode ();
switch (keyCode) {
@@ -1792,7 +1792,7 @@ void setEditText (char[] text) {
selectionRange = null;
}
-void setFrameSize(int /*long*/ id, int /*long*/ sel, NSSize size) {
+void setFrameSize(long /*int*/ id, long /*int*/ sel, NSSize size) {
super.setFrameSize (id, sel, size);
/*
* Bug in Cocoa. When a search field is resized while having
@@ -1820,13 +1820,13 @@ void setFont(NSFont font) {
super.setFont (font);
}
-void setForeground (float /*double*/ [] color) {
+void setForeground (double /*float*/ [] color) {
NSColor nsColor;
if (color == null) {
nsColor = NSColor.textColor ();
if ((style & SWT.MULTI) != 0 && !isEnabled()) nsColor = NSColor.disabledControlTextColor();
} else {
- float /*double*/ alpha = 1;
+ double /*float*/ alpha = 1;
if ((style & SWT.MULTI) != 0 && !isEnabled()) alpha = 0.5f;
nsColor = NSColor.colorWithDeviceRed (color [0], color [1], color [2], alpha);
}
@@ -2036,7 +2036,7 @@ public void setTabs (int tabs) {
if (this.tabs == tabs) return;
this.tabs = tabs;
if ((style & SWT.SINGLE) != 0) return;
- float /*double*/ size = textExtent("s").width * tabs;
+ double /*float*/ size = textExtent("s").width * tabs;
NSTextView widget = (NSTextView)view;
NSParagraphStyle defaultStyle = widget.defaultParagraphStyle();
NSMutableParagraphStyle paragraphStyle = new NSMutableParagraphStyle(defaultStyle.mutableCopy());
@@ -2189,7 +2189,7 @@ public void setTopIndex (int index) {
view.scrollPoint(pt);
}
-boolean shouldChangeTextInRange_replacementString(int /*long*/ id, int /*long*/ sel, int /*long*/ affectedCharRange, int /*long*/ replacementString) {
+boolean shouldChangeTextInRange_replacementString(long /*int*/ id, long /*int*/ sel, long /*int*/ affectedCharRange, long /*int*/ replacementString) {
NSRange range = new NSRange();
OS.memmove(range, affectedCharRange, NSRange.sizeof);
boolean result = callSuperBoolean(id, sel, range, replacementString);
@@ -2204,7 +2204,7 @@ boolean shouldChangeTextInRange_replacementString(int /*long*/ id, int /*long*/
String newText = text;
if (hooks (SWT.Verify)) {
NSEvent currentEvent = display.application.currentEvent();
- int /*long*/ type = currentEvent.type();
+ long /*int*/ type = currentEvent.type();
if (type != OS.NSKeyDown && type != OS.NSKeyUp) currentEvent = null;
newText = verifyText(text, (int)/*64*/range.location, (int)/*64*/(range.location+range.length), currentEvent);
}
@@ -2256,18 +2256,18 @@ public void showSelection () {
}
}
-void textViewDidChangeSelection(int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void textViewDidChangeSelection(long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
NSNotification notification = new NSNotification (aNotification);
NSText editor = new NSText (notification.object ().id);
selectionRange = editor.selectedRange ();
}
-void textDidChange (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void textDidChange (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
if ((style & SWT.SINGLE) != 0) super.textDidChange (id, sel, aNotification);
postEvent (SWT.Modify);
}
-NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange (int /*long*/ id, int /*long*/ sel, int /*long*/ aTextView, int /*long*/ oldSelectedCharRange, int /*long*/ newSelectedCharRange) {
+NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange (long /*int*/ id, long /*int*/ sel, long /*int*/ aTextView, long /*int*/ oldSelectedCharRange, long /*int*/ newSelectedCharRange) {
/*
* If the selection is changing as a result of the receiver getting focus
* then return the receiver's last selection range, otherwise the full
@@ -2287,7 +2287,7 @@ int traversalCode (int key, NSEvent theEvent) {
if ((style & SWT.MULTI) != 0) {
bits &= ~SWT.TRAVERSE_RETURN;
if (key == 48 /* Tab */ && theEvent != null) {
- int /*long*/ modifiers = theEvent.modifierFlags ();
+ long /*int*/ modifiers = theEvent.modifierFlags ();
boolean next = (modifiers & OS.NSShiftKeyMask) == 0;
if (next && (modifiers & OS.NSControlKeyMask) == 0) {
bits &= ~(SWT.TRAVERSE_TAB_NEXT | SWT.TRAVERSE_TAB_PREVIOUS);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java
index 4de8091353..f8c9306125 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java
@@ -107,7 +107,7 @@ ToolBar(Composite parent, int style, boolean internal) {
}
}
-int /*long*/ accessibilityAttributeValue (int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+long /*int*/ accessibilityAttributeValue (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
NSString nsAttributeName = new NSString(arg0);
if (id == accessibleHandle() && accessible != null) {
@@ -121,7 +121,7 @@ int /*long*/ accessibilityAttributeValue (int /*long*/ id, int /*long*/ sel, int
if (nsAttributeName.isEqualToString (OS.NSAccessibilityRoleAttribute))
return role.id;
else {
- int /*long*/ roleDescription = OS.NSAccessibilityRoleDescription(role.id, 0);
+ long /*int*/ roleDescription = OS.NSAccessibilityRoleDescription(role.id, 0);
return roleDescription;
}
} else if (nsAttributeName.isEqualToString(OS.NSAccessibilityChildrenAttribute)) {
@@ -141,7 +141,7 @@ int /*long*/ accessibilityAttributeValue (int /*long*/ id, int /*long*/ sel, int
return super.accessibilityAttributeValue(id, sel, arg0);
}
-boolean accessibilityIsIgnored(int /*long*/ id, int /*long*/ sel) {
+boolean accessibilityIsIgnored(long /*int*/ id, long /*int*/ sel) {
// Toolbars aren't ignored.
if (id == view.id) return false;
return super.accessibilityIsIgnored(id, sel);
@@ -313,7 +313,7 @@ void destroyItem (ToolItem item) {
relayout ();
}
-void drawBackground (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
if (id != view.id) return;
if (background != null) {
fillBackground (view, context, rect, -1);
@@ -742,7 +742,7 @@ public void setVisible(boolean visible) {
super.setVisible(visible);
}
-int /*long*/ toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar(int /*long*/ id, int /*long*/ sel, int /*long*/ toolbar, int /*long*/ itemIdentifier, boolean flag) {
+long /*int*/ toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar(long /*int*/ id, long /*int*/ sel, long /*int*/ toolbar, long /*int*/ itemIdentifier, boolean flag) {
NSString itemID = new NSString(itemIdentifier);
for (int j = 0; j < itemCount; j++) {
ToolItem item = items[j];
@@ -757,7 +757,7 @@ int /*long*/ toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar(int /*long*
* Returns an array of all toolbar item IDs allowed to be in the toolbar. Since the ToolBar created all of the ToolItems
* return all of the item IDs.
*/
-int /*long*/ toolbarAllowedItemIdentifiers(int /*long*/ id, int /*long*/ sel, int /*long*/ toolbar) {
+long /*int*/ toolbarAllowedItemIdentifiers(long /*int*/ id, long /*int*/ sel, long /*int*/ toolbar) {
NSMutableArray array = NSMutableArray.arrayWithCapacity(itemCount);
for (int i = 0; i < itemCount; i++) {
array.addObject(items[i].nsItem.itemIdentifier());
@@ -768,7 +768,7 @@ int /*long*/ toolbarAllowedItemIdentifiers(int /*long*/ id, int /*long*/ sel, in
/*
* This delegate method isn't really needed because ToolBars aren't customizable, but it's required according to the documentation.
*/
-int /*long*/ toolbarDefaultItemIdentifiers(int /*long*/ id, int /*long*/ sel, int /*long*/ toolbar) {
+long /*int*/ toolbarDefaultItemIdentifiers(long /*int*/ id, long /*int*/ sel, long /*int*/ toolbar) {
return toolbarAllowedItemIdentifiers(id, sel, toolbar);
}
@@ -776,7 +776,7 @@ int /*long*/ toolbarDefaultItemIdentifiers(int /*long*/ id, int /*long*/ sel, in
* toolbarSelectableItemIdentifiers returns an array of all items that can be the selected item, as determined
* by setSelectedItemIdentifier.
*/
-int /*long*/ toolbarSelectableItemIdentifiers(int /*long*/ id, int /*long*/ sel, int /*long*/ toolbar) {
+long /*int*/ toolbarSelectableItemIdentifiers(long /*int*/ id, long /*int*/ sel, long /*int*/ toolbar) {
NSMutableArray array = NSMutableArray.arrayWithCapacity(itemCount);
for (int i = 0; i < itemCount; i++) {
if ((items[i].style & SWT.RADIO) != 0) array.addObject(items[i].nsItem.itemIdentifier());
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java
index ad7d0f29ea..03ece4e218 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java
@@ -137,15 +137,15 @@ public ToolItem (ToolBar parent, int style, int index) {
parent.createItem (this, index);
}
-int /*long*/ accessibleHandle() {
+long /*int*/ accessibleHandle() {
if (button != null && button.cell() != null) return button.cell().id;
if (view != null) return view.id;
return 0;
}
-int /*long*/ accessibilityActionNames(int /*long*/ id, int /*long*/ sel) {
+long /*int*/ accessibilityActionNames(long /*int*/ id, long /*int*/ sel) {
- int /*long*/ returnValue = super.accessibilityActionNames(id, sel);
+ long /*int*/ returnValue = super.accessibilityActionNames(id, sel);
if (id == accessibleHandle()) {
if ((style & SWT.DROP_DOWN) != 0) {
@@ -161,9 +161,9 @@ int /*long*/ accessibilityActionNames(int /*long*/ id, int /*long*/ sel) {
return returnValue;
}
-int /*long*/ accessibilityAttributeNames(int /*long*/ id, int /*long*/ sel) {
+long /*int*/ accessibilityAttributeNames(long /*int*/ id, long /*int*/ sel) {
- int /*long*/ returnValue = super.accessibilityAttributeNames(id, sel);
+ long /*int*/ returnValue = super.accessibilityAttributeNames(id, sel);
if (id == accessibleHandle()) {
if ((style & (SWT.CHECK|SWT.RADIO)) !=0) {
@@ -185,7 +185,7 @@ int /*long*/ accessibilityAttributeNames(int /*long*/ id, int /*long*/ sel) {
return returnValue;
}
-int /*long*/ accessibilityAttributeValue(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+long /*int*/ accessibilityAttributeValue(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
NSString nsAttributeName = new NSString(arg0);
if (nsAttributeName.isEqualToString (OS.NSAccessibilityRoleAttribute) || nsAttributeName.isEqualToString (OS.NSAccessibilityRoleDescriptionAttribute)) {
@@ -198,7 +198,7 @@ int /*long*/ accessibilityAttributeValue(int /*long*/ id, int /*long*/ sel, int
if (nsAttributeName.isEqualToString (OS.NSAccessibilityRoleAttribute)) {
return roleText.id;
} else { // NSAccessibilityRoleDescriptionAttribute
- int /*long*/ description = OS.NSAccessibilityRoleDescription (roleText.id, 0);
+ long /*int*/ description = OS.NSAccessibilityRoleDescription (roleText.id, 0);
return description;
}
}
@@ -234,7 +234,7 @@ int /*long*/ accessibilityAttributeValue(int /*long*/ id, int /*long*/ sel, int
return super.accessibilityAttributeValue(id, sel, arg0);
}
-boolean accessibilityIsIgnored(int /*long*/ id, int /*long*/ sel) {
+boolean accessibilityIsIgnored(long /*int*/ id, long /*int*/ sel) {
// The interesting part of a ToolItem is its button, if it has one.
if (id == accessibleHandle()) return false;
return super.accessibilityIsIgnored(id, sel);
@@ -412,7 +412,7 @@ void destroyWidget() {
super.destroyWidget();
}
-void drawImageWithFrameInView (int /*long*/ id, int /*long*/ sel, int /*long*/ image, NSRect rect, int /*long*/ view) {
+void drawImageWithFrameInView (long /*int*/ id, long /*int*/ sel, long /*int*/ image, NSRect rect, long /*int*/ view) {
if (text.length () > 0) {
if ((parent.style & SWT.RIGHT) != 0) {
rect.x += 3;
@@ -420,7 +420,7 @@ void drawImageWithFrameInView (int /*long*/ id, int /*long*/ sel, int /*long*/ i
rect.y += 3;
}
}
- int /*long*/ cgContext = NSGraphicsContext.currentContext().graphicsPort();
+ long /*int*/ cgContext = NSGraphicsContext.currentContext().graphicsPort();
NSCell cell = new NSCell(id);
boolean drawSelected = (parent.nsToolbar != null) && getSelection() && ((style & SWT.CHECK) != 0) && !cell.isHighlighted();
@@ -444,7 +444,7 @@ void drawImageWithFrameInView (int /*long*/ id, int /*long*/ sel, int /*long*/ i
}
}
-NSRect drawTitleWithFrameInView (int /*long*/ id, int /*long*/ sel, int /*long*/ title, NSRect titleRect, int /*long*/ view) {
+NSRect drawTitleWithFrameInView (long /*int*/ id, long /*int*/ sel, long /*int*/ title, NSRect titleRect, long /*int*/ view) {
boolean hiliteShadow = new NSButtonCell(id).isHighlighted() && text.length() > 0 && image == null;
// An unbordered cell doesn't draw any highlighting when pushed or selected, so we have to do it here.
@@ -462,7 +462,7 @@ NSRect drawTitleWithFrameInView (int /*long*/ id, int /*long*/ sel, int /*long*/
return super.drawTitleWithFrameInView(id, sel, title, titleRect, view);
}
-void drawWidget (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
+void drawWidget (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
if (id == view.id) {
boolean drawSelected = getSelection() && (parent.nsToolbar == null);
if (drawSelected) {
@@ -732,11 +732,11 @@ boolean isDrawing () {
return getDrawing() && parent.isDrawing ();
}
-int /*long*/ menuForEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+long /*int*/ menuForEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
return parent.menuForEvent (id, sel, theEvent);
}
-void mouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseDown)) return;
Display display = this.display;
display.trackingControl = parent;
@@ -752,47 +752,47 @@ void mouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
}
}
-boolean mouseDownCanMoveWindow(int /*long*/ id, int /*long*/ sel) {
+boolean mouseDownCanMoveWindow(long /*int*/ id, long /*int*/ sel) {
if (id == view.id) return false;
return super.mouseDownCanMoveWindow(id, sel);
}
-void mouseUp(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseUp)) return;
super.mouseUp(id, sel, theEvent);
}
-void mouseDragged(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseMove)) return;
super.mouseDragged(id, sel, theEvent);
}
-void rightMouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void rightMouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseDown)) return;
super.rightMouseDown(id, sel, theEvent);
}
-void rightMouseUp(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void rightMouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseUp)) return;
super.rightMouseUp(id, sel, theEvent);
}
-void rightMouseDragged(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void rightMouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseMove)) return;
super.rightMouseDragged(id, sel, theEvent);
}
-void otherMouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void otherMouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseDown)) return;
super.otherMouseDown(id, sel, theEvent);
}
-void otherMouseUp(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void otherMouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseUp)) return;
super.otherMouseUp(id, sel, theEvent);
}
-void otherMouseDragged(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void otherMouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseMove)) return;
super.otherMouseDragged(id, sel, theEvent);
}
@@ -1263,7 +1263,7 @@ void updateImage (boolean layout) {
parent.relayout();
}
-boolean validateMenuItem(int /*long*/ id, int /*long*/ sel, int /*long*/ menuItem) {
+boolean validateMenuItem(long /*int*/ id, long /*int*/ sel, long /*int*/ menuItem) {
return isEnabled();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java
index 6a2d14c908..127ce11cf0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java
@@ -365,7 +365,7 @@ void drawRectangles (NSWindow window, Rectangle [] rects, boolean erase) {
context.setCompositingOperation(erase ? OS.NSCompositeClear : OS.NSCompositeSourceOver);
NSRect rectFrame = new NSRect();
NSPoint globalPoint = new NSPoint();
- float /*double*/ screenHeight = display.getPrimaryFrame().height;
+ double /*float*/ screenHeight = display.getPrimaryFrame().height;
for (int i=0; i maxX) maxX = x1;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java
index 78f7dff12a..5193ef1026 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java
@@ -513,7 +513,7 @@ boolean shouldShowMenu (NSEvent event) {
return false;
}
-void mouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
NSEvent nsEvent = new NSEvent(theEvent);
highlight = true;
updateImage();
@@ -524,7 +524,7 @@ void mouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
}
}
-void mouseDragged(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
NSEvent nsEvent = new NSEvent(theEvent);
NSRect frame = view.frame();
boolean oldHighlight = highlight;
@@ -539,7 +539,7 @@ void mouseDragged(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
}
}
-void mouseUp(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
if (highlight) {
NSEvent nsEvent = new NSEvent(theEvent);
if (nsEvent.type() == OS.NSLeftMouseUp) {
@@ -551,25 +551,25 @@ void mouseUp(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
view.setNeedsDisplay(true);
}
-void rightMouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void rightMouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
mouseDown(id, sel, theEvent);
}
-void rightMouseUp(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void rightMouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
mouseUp(id, sel, theEvent);
}
-void rightMouseDragged(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void rightMouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
mouseDragged(id, sel, theEvent);
}
-void drawRect(int /*long*/ id, int /*long*/ sel, NSRect rect) {
+void drawRect(long /*int*/ id, long /*int*/ sel, NSRect rect) {
item.drawStatusBarBackgroundInRect(rect, highlight);
super.drawRect(id, sel, rect);
}
void updateImage () {
- float /*double*/ width = 0;
+ double /*float*/ width = 0;
Image image = this.image;
if (highlight && highlightImage != null) image = highlightImage;
if (image == null) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java
index ccfa08c883..871d7c2716 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java
@@ -159,19 +159,19 @@ TreeItem _getItem (TreeItem parentItem, int index, boolean create) {
return item;
}
-boolean acceptsFirstResponder (int /*long*/ id, int /*long*/ sel) {
+boolean acceptsFirstResponder (long /*int*/ id, long /*int*/ sel) {
return true;
}
-int /*long*/ accessibilityAttributeValue(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
- int /*long*/ returnValue = 0;
+long /*int*/ accessibilityAttributeValue(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+ long /*int*/ returnValue = 0;
NSString attributeName = new NSString(arg0);
// If the check column is visible, don't report it back as a column for accessibility purposes.
// The check column is meant to appear as a part of the first column.
if (attributeName.isEqualToString (OS.NSAccessibilityColumnsAttribute) || attributeName.isEqualToString(OS.NSAccessibilityVisibleColumnsAttribute)) {
if ((style & SWT.CHECK) != 0) {
- int /*long*/ superValue = super.accessibilityAttributeValue(id, sel, arg0);
+ long /*int*/ superValue = super.accessibilityAttributeValue(id, sel, arg0);
if (superValue != 0) {
NSArray columns = new NSArray(superValue);
NSMutableArray columnsWithoutCheck = NSMutableArray.arrayWithCapacity(columns.count() - 1);
@@ -267,17 +267,17 @@ int calculateWidth (TreeItem[] items, int index, GC gc, boolean recurse) {
return width;
}
-NSSize cellSize (int /*long*/ id, int /*long*/ sel) {
+NSSize cellSize (long /*int*/ id, long /*int*/ sel) {
NSSize size = super.cellSize(id, sel);
NSCell cell = new NSCell(id);
NSImage image = cell.image();
if (image != null) size.width += imageBounds.width + IMAGE_GAP;
if (hooks(SWT.MeasureItem)) {
- int /*long*/ [] outValue = new int /*long*/ [1];
+ long /*int*/ [] outValue = new long /*int*/ [1];
OS.object_getInstanceVariable(id, Display.SWT_ROW, outValue);
TreeItem item = (TreeItem) display.getWidget (outValue [0]);
OS.object_getInstanceVariable(id, Display.SWT_COLUMN, outValue);
- int /*long*/ tableColumn = outValue[0];
+ long /*int*/ tableColumn = outValue[0];
int columnIndex = 0;
for (int i=0; i 0 && ((NSOutlineView) view).headerView () != null) {
@@ -2296,17 +2296,17 @@ void sendSelection () {
}
}
-void outlineViewSelectionDidChange (int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void outlineViewSelectionDidChange (long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
if (didSelect) return;
sendSelection ();
}
-void outlineViewSelectionIsChanging (int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void outlineViewSelectionIsChanging (long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
didSelect = true;
sendSelection ();
}
-void outlineView_setObjectValue_forTableColumn_byItem (int /*long*/ id, int /*long*/ sel, int /*long*/ outlineView, int /*long*/ object, int /*long*/ tableColumn, int /*long*/ itemID) {
+void outlineView_setObjectValue_forTableColumn_byItem (long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ object, long /*int*/ tableColumn, long /*int*/ itemID) {
if (checkColumn != null && tableColumn == checkColumn.id) {
TreeItem item = (TreeItem) display.getWidget (itemID);
item.checked = !item.checked;
@@ -2318,7 +2318,7 @@ void outlineView_setObjectValue_forTableColumn_byItem (int /*long*/ id, int /*lo
}
}
-boolean outlineView_writeItems_toPasteboard(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2) {
+boolean outlineView_writeItems_toPasteboard(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
return sendMouseEvent(NSApplication.sharedApplication().currentEvent(), SWT.DragDetect, true);
}
@@ -2463,7 +2463,7 @@ void reskinChildren (int flags) {
super.reskinChildren (flags);
}
-void setImage (int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+void setImage (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
OS.object_setInstanceVariable(id, Display.SWT_IMAGE, arg0);
}
@@ -2539,7 +2539,7 @@ public void select (TreeItem item) {
checkItems ();
showItem (item);
NSOutlineView outlineView = (NSOutlineView) view;
- int /*long*/ row = outlineView.rowForItem (item.handle);
+ long /*int*/ row = outlineView.rowForItem (item.handle);
NSIndexSet set = (NSIndexSet)new NSIndexSet().alloc();
set = set.initWithIndex(row);
ignoreSelect = true;
@@ -2548,7 +2548,7 @@ public void select (TreeItem item) {
set.release();
}
-void selectRowIndexes_byExtendingSelection (int /*long*/ id, int /*long*/ sel, int /*long*/ indexes, boolean extend) {
+void selectRowIndexes_byExtendingSelection (long /*int*/ id, long /*int*/ sel, long /*int*/ indexes, boolean extend) {
if (preventSelect && !ignoreSelect) return;
if ((style & SWT.SINGLE) != 0 && !ignoreSelect) {
NSIndexSet set = new NSIndexSet(indexes);
@@ -2636,7 +2636,7 @@ boolean sendMouseEvent(NSEvent nsEvent, int type, boolean send) {
NSTableView widget = (NSTableView)view;
NSIndexSet selectedRows = widget.selectedRowIndexes ();
int count = (int)/*64*/selectedRows.count();
- int /*long*/ [] indexBuffer = new int /*long*/ [count];
+ long /*int*/ [] indexBuffer = new long /*int*/ [count];
selectedRows.getIndexes(indexBuffer, count, 0);
for (int i = 0; i < count; i++) {
if (indexBuffer[i] == selectedRowIndex) continue;
@@ -2677,7 +2677,7 @@ void selectItems (TreeItem[] items, boolean ignoreDisposed) {
set.release();
}
-NSRect titleRectForBounds (int /*long*/ id, int /*long*/ sel, NSRect cellFrame) {
+NSRect titleRectForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
NSImage image = new NSCell(id).image();
if (image != null) {
int imageWidth = imageBounds.width + IMAGE_GAP;
@@ -2892,8 +2892,8 @@ void setItemCount (TreeItem parentItem, int count) {
void setItemHeight (Image image, NSFont font, boolean set) {
if (font == null) font = getFont ().handle;
- float /*double*/ ascent = font.ascender ();
- float /*double*/ descent = -font.descender () + font.leading ();
+ double /*float*/ ascent = font.ascender ();
+ double /*float*/ descent = -font.descender () + font.leading ();
int height = (int)Math.ceil (ascent + descent) + 1;
Rectangle bounds = image != null ? image.getBounds () : imageBounds;
if (bounds != null) {
@@ -2977,11 +2977,11 @@ boolean setScrollWidth (TreeItem item) {
return false;
}
-void setShouldExpandItem (int /*long*/ id, int /*long*/ sel, boolean shouldExpand) {
+void setShouldExpandItem (long /*int*/ id, long /*int*/ sel, boolean shouldExpand) {
this.shouldExpand = shouldExpand;
}
-void setShouldScrollClipView (int /*long*/ id, int /*long*/ sel, boolean shouldScroll) {
+void setShouldScrollClipView (long /*int*/ id, long /*int*/ sel, boolean shouldScroll) {
this.shouldScroll = shouldScroll;
}
@@ -3143,7 +3143,7 @@ public void setTopItem (TreeItem item) {
checkItems ();
showItem (item, false);
NSOutlineView widget = (NSOutlineView) view;
- int /*long*/ row = widget.rowForItem (item.handle);
+ long /*int*/ row = widget.rowForItem (item.handle);
if (row == -1) return;
NSPoint pt = new NSPoint();
pt.x = scrollView.contentView().bounds().x;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java
index 0a0f469257..28e09a02e5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java
@@ -203,7 +203,7 @@ void destroyWidget () {
releaseHandle ();
}
-void drawInteriorWithFrame_inView (int /*long*/ id, int /*long*/ sel, NSRect cellRect, int /*long*/ view) {
+void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellRect, long /*int*/ view) {
/*
* Feature in Cocoa. When the last column in a tree does not reach the
* rightmost edge of the tree view, the cell that draws the rightmost-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java
index d3f6668a63..5a24c9a716 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java
@@ -48,7 +48,7 @@ public abstract class Widget {
EventTable eventTable;
Object data;
- int /*long*/ jniRef;
+ long /*int*/ jniRef;
/* Global state flags */
static final int DISPOSED = 1 << 0;
@@ -135,61 +135,61 @@ public Widget (Widget parent, int style) {
reskinWidget ();
}
-int /*long*/ accessibleHandle() {
+long /*int*/ accessibleHandle() {
return 0;
}
-int /*long*/ accessibilityActionDescription(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+long /*int*/ accessibilityActionDescription(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
return callSuperObject(id, sel, arg0);
}
-int /*long*/ accessibilityActionNames(int /*long*/ id, int /*long*/ sel) {
+long /*int*/ accessibilityActionNames(long /*int*/ id, long /*int*/ sel) {
return callSuperObject(id, sel);
}
-int /*long*/ accessibilityAttributeNames(int /*long*/ id, int /*long*/ sel) {
+long /*int*/ accessibilityAttributeNames(long /*int*/ id, long /*int*/ sel) {
return callSuperObject(id, sel);
}
-int /*long*/ accessibilityAttributeValue(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+long /*int*/ accessibilityAttributeValue(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
return callSuperObject(id, sel, arg0);
}
-int /*long*/ accessibilityAttributeValue_forParameter(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
+long /*int*/ accessibilityAttributeValue_forParameter(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
return OS.objc_msgSendSuper(super_struct, sel, arg0, arg1);
}
-int /*long*/ accessibilityFocusedUIElement(int /*long*/ id, int /*long*/ sel) {
+long /*int*/ accessibilityFocusedUIElement(long /*int*/ id, long /*int*/ sel) {
return callSuperObject(id, sel);
}
-int /*long*/ accessibilityHitTest(int /*long*/ id, int /*long*/ sel, NSPoint point) {
+long /*int*/ accessibilityHitTest(long /*int*/ id, long /*int*/ sel, NSPoint point) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
return OS.objc_msgSendSuper(super_struct, sel, point);
}
-boolean accessibilityIsAttributeSettable(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+boolean accessibilityIsAttributeSettable(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
return callSuperBoolean(id, sel, arg0);
}
-boolean accessibilityIsIgnored(int /*long*/ id, int /*long*/ sel) {
+boolean accessibilityIsIgnored(long /*int*/ id, long /*int*/ sel) {
return callSuperBoolean(id, sel);
}
-int /*long*/ accessibilityParameterizedAttributeNames(int /*long*/ id, int /*long*/ sel) {
+long /*int*/ accessibilityParameterizedAttributeNames(long /*int*/ id, long /*int*/ sel) {
return callSuperObject(id, sel);
}
-void accessibilityPerformAction(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+void accessibilityPerformAction(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
callSuper(id, sel, arg0);
}
-void accessibilitySetValue_forAttribute(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
+void accessibilitySetValue_forAttribute(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
callSuper(id, sel, arg0, arg1);
}
@@ -203,71 +203,71 @@ String getClipboardText () {
void setClipRegion (NSView view) {
}
-int /*long*/ attributedSubstringFromRange (int /*long*/ id, int /*long*/ sel, int /*long*/ range) {
+long /*int*/ attributedSubstringFromRange (long /*int*/ id, long /*int*/ sel, long /*int*/ range) {
return 0;
}
-void callSuper(int /*long*/ id, int /*long*/ sel) {
+void callSuper(long /*int*/ id, long /*int*/ sel) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
OS.objc_msgSendSuper(super_struct, sel);
}
-void callSuper(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+void callSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
OS.objc_msgSendSuper(super_struct, sel, arg0);
}
-void callSuper(int /*long*/ id, int /*long*/ sel, NSRect arg0) {
+void callSuper(long /*int*/ id, long /*int*/ sel, NSRect arg0) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
OS.objc_msgSendSuper(super_struct, sel, arg0);
}
-void callSuper(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
+void callSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
OS.objc_msgSendSuper(super_struct, sel, arg0, arg1);
}
-void callSuper(int /*long*/ id, int /*long*/ sel, NSRect arg0, int /*long*/ arg1) {
+void callSuper(long /*int*/ id, long /*int*/ sel, NSRect arg0, long /*int*/ arg1) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
OS.objc_msgSendSuper(super_struct, sel, arg0, arg1);
}
-int /*long*/ callSuper(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, NSRect arg1, int /*long*/ arg2) {
+long /*int*/ callSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSRect arg1, long /*int*/ arg2) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
return OS.objc_msgSendSuper(super_struct, sel, arg0, arg1, arg2);
}
-boolean callSuperBoolean(int /*long*/ id, int /*long*/ sel) {
+boolean callSuperBoolean(long /*int*/ id, long /*int*/ sel) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
return OS.objc_msgSendSuper(super_struct, sel) != 0;
}
-boolean canBecomeKeyWindow (int /*long*/ id, int /*long*/ sel) {
+boolean canBecomeKeyWindow (long /*int*/ id, long /*int*/ sel) {
return callSuperBoolean (id, sel);
}
-boolean needsPanelToBecomeKey (int /*long*/ id, int /*long*/ sel) {
+boolean needsPanelToBecomeKey (long /*int*/ id, long /*int*/ sel) {
return callSuperBoolean (id, sel);
}
-void cancelOperation(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+void cancelOperation(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
}
-NSSize cellSize (int /*long*/ id, int /*long*/ sel) {
+NSSize cellSize (long /*int*/ id, long /*int*/ sel) {
NSSize result = new NSSize();
objc_super super_struct = new objc_super();
super_struct.receiver = id;
@@ -276,7 +276,7 @@ NSSize cellSize (int /*long*/ id, int /*long*/ sel) {
return result;
}
-NSSize cellSizeForBounds (int /*long*/ id, int /*long*/ sel, NSRect cellFrame) {
+NSSize cellSizeForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -285,42 +285,42 @@ NSSize cellSizeForBounds (int /*long*/ id, int /*long*/ sel, NSRect cellFrame) {
return result;
}
-boolean callSuperBoolean(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+boolean callSuperBoolean(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
return OS.objc_msgSendSuper(super_struct, sel, arg0) != 0;
}
-boolean callSuperBoolean(int /*long*/ id, int /*long*/ sel, NSRange range, int /*long*/ arg1) {
+boolean callSuperBoolean(long /*int*/ id, long /*int*/ sel, NSRange range, long /*int*/ arg1) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
return OS.objc_msgSendSuper_bool(super_struct, sel, range, arg1);
}
-int /*long*/ callSuperObject(int /*long*/ id, int /*long*/ sel) {
+long /*int*/ callSuperObject(long /*int*/ id, long /*int*/ sel) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
return OS.objc_msgSendSuper(super_struct, sel);
}
-int /*long*/ callSuperObject(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+long /*int*/ callSuperObject(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
return OS.objc_msgSendSuper(super_struct, sel, arg0);
}
-int /*long*/ callSuperObject(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
+long /*int*/ callSuperObject(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
return OS.objc_msgSendSuper(super_struct, sel, arg0, arg1);
}
-NSRect callSuperRect(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+NSRect callSuperRect(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -329,40 +329,40 @@ NSRect callSuperRect(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
return result;
}
-boolean canDragRowsWithIndexes_atPoint(int /*long*/ id, int /*long*/ sel, int /*long*/ rowIndexes, NSPoint mouseDownPoint) {
+boolean canDragRowsWithIndexes_atPoint(long /*int*/ id, long /*int*/ sel, long /*int*/ rowIndexes, NSPoint mouseDownPoint) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
return OS.objc_msgSendSuper_bool(super_struct, sel, rowIndexes, mouseDownPoint);
}
-int /*long*/ characterIndexForPoint (int /*long*/ id, int /*long*/ sel, int /*long*/ point) {
+long /*int*/ characterIndexForPoint (long /*int*/ id, long /*int*/ sel, long /*int*/ point) {
return OS.NSNotFound;
}
-int /*long*/ columnAtPoint(int /*long*/ id, int /*long*/ sel, NSPoint point) {
+long /*int*/ columnAtPoint(long /*int*/ id, long /*int*/ sel, NSPoint point) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
return OS.objc_msgSendSuper(super_struct, sel, point);
}
-boolean acceptsFirstMouse (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+boolean acceptsFirstMouse (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
return OS.objc_msgSendSuper(super_struct, sel, theEvent) != 0;
}
-boolean acceptsFirstResponder (int /*long*/ id, int /*long*/ sel) {
+boolean acceptsFirstResponder (long /*int*/ id, long /*int*/ sel) {
return callSuperBoolean(id, sel);
}
-boolean becomeFirstResponder (int /*long*/ id, int /*long*/ sel) {
+boolean becomeFirstResponder (long /*int*/ id, long /*int*/ sel) {
return callSuperBoolean(id, sel);
}
-void becomeKeyWindow (int /*long*/ id, int /*long*/ sel) {
+void becomeKeyWindow (long /*int*/ id, long /*int*/ sel) {
callSuper(id, sel);
}
@@ -410,7 +410,7 @@ void reskinWidget() {
}
}
-boolean resignFirstResponder (int /*long*/ id, int /*long*/ sel) {
+boolean resignFirstResponder (long /*int*/ id, long /*int*/ sel) {
return callSuperBoolean(id, sel);
}
@@ -475,7 +475,7 @@ public void addDisposeListener (DisposeListener listener) {
addListener (SWT.Dispose, typedListener);
}
-boolean canBecomeKeyView(int /*long*/ id, int /*long*/ sel) {
+boolean canBecomeKeyView(long /*int*/ id, long /*int*/ sel) {
return true;
}
@@ -575,14 +575,14 @@ protected void checkWidget () {
if ((state & DISPOSED) != 0) error (SWT.ERROR_WIDGET_DISPOSED);
}
-void clearDeferFlushing (int /*long*/ id, int /*long*/ sel) {
+void clearDeferFlushing (long /*int*/ id, long /*int*/ sel) {
}
-boolean textView_clickOnLink_atIndex(int /*long*/ id, int /*long*/ sel, int /*long*/ textView, int /*long*/ link, int /*long*/ charIndex) {
+boolean textView_clickOnLink_atIndex(long /*int*/ id, long /*int*/ sel, long /*int*/ textView, long /*int*/ link, long /*int*/ charIndex) {
return true;
}
-void collapseItem_collapseChildren (int /*long*/ id, int /*long*/ sel, int /*long*/ item, boolean children) {
+void collapseItem_collapseChildren (long /*int*/ id, long /*int*/ sel, long /*int*/ item, boolean children) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -612,13 +612,13 @@ void createWidget () {
register ();
}
-void comboBoxSelectionDidChange(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void comboBoxSelectionDidChange(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
}
-void comboBoxWillDismiss(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void comboBoxWillDismiss(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
}
-void comboBoxWillPopUp(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void comboBoxWillPopUp(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
}
void deregister () {
@@ -667,35 +667,35 @@ public void dispose () {
release (true);
}
-void deselectAll(int /*long*/ id, int /*long*/ sel, int /*long*/ sender) {
+void deselectAll(long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
callSuper(id, sel, sender);
}
-void deselectRow(int /*long*/ id, int /*long*/ sel, int /*long*/ index) {
+void deselectRow(long /*int*/ id, long /*int*/ sel, long /*int*/ index) {
callSuper(id, sel, index);
}
-void doCommandBySelector (int /*long*/ id, int /*long*/ sel, int /*long*/ aSelector) {
+void doCommandBySelector (long /*int*/ id, long /*int*/ sel, long /*int*/ aSelector) {
callSuper (id, sel, aSelector);
}
-boolean dragSelectionWithEvent(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2) {
+boolean dragSelectionWithEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
return false;
}
-void drawBackground (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
/* Do nothing */
}
-void drawBackgroundInClipRect(int /*long*/ id, int /*long*/ sel, NSRect rect) {
+void drawBackgroundInClipRect(long /*int*/ id, long /*int*/ sel, NSRect rect) {
callSuper(id, sel, rect);
}
-void drawImageWithFrameInView (int /*long*/ id, int /*long*/ sel, int /*long*/ image, NSRect rect, int /*long*/ view) {
+void drawImageWithFrameInView (long /*int*/ id, long /*int*/ sel, long /*int*/ image, NSRect rect, long /*int*/ view) {
callSuper(id, sel, image, rect, view);
}
-NSRect drawTitleWithFrameInView (int /*long*/ id, int /*long*/ sel, int /*long*/ title, NSRect rect, int /*long*/ view) {
+NSRect drawTitleWithFrameInView (long /*int*/ id, long /*int*/ sel, long /*int*/ title, NSRect rect, long /*int*/ view) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -704,26 +704,26 @@ NSRect drawTitleWithFrameInView (int /*long*/ id, int /*long*/ sel, int /*long*/
return result;
}
-void drawInteriorWithFrame_inView (int /*long*/ id, int /*long*/ sel, NSRect cellFrame, int /*long*/ view) {
+void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellFrame, long /*int*/ view) {
callSuper(id, sel, cellFrame, view);
}
-void drawLabelInRect(int /*long*/ id, int /*long*/ sel, boolean shouldTruncateLabel, NSRect rect) {
+void drawLabelInRect(long /*int*/ id, long /*int*/ sel, boolean shouldTruncateLabel, NSRect rect) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
OS.objc_msgSendSuper(super_struct, sel, shouldTruncateLabel, rect);
}
-void drawViewBackgroundInRect(int /*long*/ id, int /*long*/ sel, NSRect rect) {
+void drawViewBackgroundInRect(long /*int*/ id, long /*int*/ sel, NSRect rect) {
callSuper(id, sel, rect);
}
-void drawWithExpansionFrame_inView (int /*long*/ id, int /*long*/ sel, NSRect cellFrame, int /*long*/ view) {
+void drawWithExpansionFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellFrame, long /*int*/ view) {
callSuper(id, sel, cellFrame, view);
}
-void drawRect (int /*long*/ id, int /*long*/ sel, NSRect rect) {
+void drawRect (long /*int*/ id, long /*int*/ sel, NSRect rect) {
if (!isDrawing()) return;
Display display = this.display;
NSView view = new NSView(id);
@@ -748,17 +748,17 @@ void drawRect (int /*long*/ id, int /*long*/ sel, NSRect rect) {
display.isPainting.removeObjectIdenticalTo(view);
}
-void _drawThemeProgressArea (int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+void _drawThemeProgressArea (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
OS.objc_msgSendSuper(super_struct, sel, arg0);
}
-void drawWidget (int /*long*/ id, NSGraphicsContext context, NSRect rect) {
+void drawWidget (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
}
-int /*long*/ imageView () {
+long /*int*/ imageView () {
return 0;
}
@@ -766,7 +766,7 @@ void redrawWidget (NSView view, boolean children) {
view.setNeedsDisplay(true);
}
-void redrawWidget (NSView view, int /*long*/ x, int /*long*/ y, int /*long*/ width, int /*long*/ height, boolean children) {
+void redrawWidget (NSView view, long /*int*/ x, long /*int*/ y, long /*int*/ width, long /*int*/ height, boolean children) {
NSRect rect = new NSRect();
rect.x = x;
rect.y = y;
@@ -779,14 +779,14 @@ void error (int code) {
SWT.error(code);
}
-void expandItem_expandChildren (int /*long*/ id, int /*long*/ sel, int /*long*/ item, boolean children) {
+void expandItem_expandChildren (long /*int*/ id, long /*int*/ sel, long /*int*/ item, boolean children) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
OS.objc_msgSendSuper(super_struct, sel, item, children);
}
-NSRect expansionFrameWithFrame_inView(int /*long*/ id, int /*long*/ sel, NSRect cellRect, int /*long*/ view) {
+NSRect expansionFrameWithFrame_inView(long /*int*/ id, long /*int*/ sel, NSRect cellRect, long /*int*/ view) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -799,7 +799,7 @@ boolean filters (int eventType) {
return display.filters (eventType);
}
-NSRect firstRectForCharacterRange(int /*long*/ id, int /*long*/ sel, int /*long*/ range) {
+NSRect firstRectForCharacterRange(long /*int*/ id, long /*int*/ sel, long /*int*/ range) {
return new NSRect ();
}
@@ -967,28 +967,28 @@ public int getStyle () {
return style;
}
-boolean hasMarkedText (int /*long*/ id, int /*long*/ sel) {
+boolean hasMarkedText (long /*int*/ id, long /*int*/ sel) {
return false;
}
-NSRect headerRectOfColumn (int /*long*/ id, int /*long*/ sel, int /*long*/ column) {
+NSRect headerRectOfColumn (long /*int*/ id, long /*int*/ sel, long /*int*/ column) {
return callSuperRect(id, sel, column);
}
-void helpRequested(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void helpRequested(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
}
-void highlightSelectionInClipRect(int /*long*/ id, int /*long*/ sel, int /*long*/ rect) {
+void highlightSelectionInClipRect(long /*int*/ id, long /*int*/ sel, long /*int*/ rect) {
}
-int /*long*/ hitTest (int /*long*/ id, int /*long*/ sel, NSPoint point) {
+long /*int*/ hitTest (long /*int*/ id, long /*int*/ sel, NSPoint point) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
return OS.objc_msgSendSuper(super_struct, sel, point);
}
-int /*long*/ hitTestForEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event, NSRect rect, int /*long*/ controlView) {
+long /*int*/ hitTestForEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event, NSRect rect, long /*int*/ controlView) {
return 0;
}
@@ -997,15 +997,15 @@ boolean hooks (int eventType) {
return eventTable.hooks (eventType);
}
-int /*long*/ image (int /*long*/ id, int /*long*/ sel) {
+long /*int*/ image (long /*int*/ id, long /*int*/ sel) {
return 0;
}
-NSRect imageRectForBounds (int /*long*/ id, int /*long*/ sel, NSRect cellFrame) {
+NSRect imageRectForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
return new NSRect();
}
-boolean insertText (int /*long*/ id, int /*long*/ sel, int /*long*/ string) {
+boolean insertText (long /*int*/ id, long /*int*/ sel, long /*int*/ string) {
callSuper (id, sel, string);
return true;
}
@@ -1033,7 +1033,7 @@ boolean isDrawing () {
return true;
}
-boolean isFlipped(int /*long*/ id, int /*long*/ sel) {
+boolean isFlipped(long /*int*/ id, long /*int*/ sel) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -1061,7 +1061,7 @@ public boolean isListening (int eventType) {
return hooks (eventType);
}
-boolean isOpaque(int /*long*/ id, int /*long*/ sel) {
+boolean isOpaque(long /*int*/ id, long /*int*/ sel) {
return false;
}
@@ -1073,178 +1073,178 @@ boolean isValidThread () {
return getDisplay ().isValidThread ();
}
-void flagsChanged (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void flagsChanged (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
callSuper (id, sel, theEvent);
}
-void keyDown (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void keyDown (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
superKeyDown(id, sel, theEvent);
}
-void keyUp (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void keyUp (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
superKeyUp(id, sel, theEvent);
}
-void mouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
mouseDownSuper(id, sel, theEvent);
}
-boolean mouseDownCanMoveWindow(int /*long*/ id, int /*long*/ sel) {
+boolean mouseDownCanMoveWindow(long /*int*/ id, long /*int*/ sel) {
return callSuperBoolean(id, sel);
}
-void mouseDownSuper(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseDownSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
callSuper(id, sel, theEvent);
}
-void mouseUp(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
callSuper(id, sel, theEvent);
}
-void mouseMoved(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseMoved(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
callSuper(id, sel, theEvent);
}
-void mouseDragged(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
callSuper(id, sel, theEvent);
}
-void mouseEntered(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseEntered(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
callSuper(id, sel, theEvent);
}
-void mouseExited(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void mouseExited(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
callSuper(id, sel, theEvent);
}
-void cursorUpdate(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void cursorUpdate(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
callSuper(id, sel, theEvent);
}
-void rightMouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void rightMouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
callSuper(id, sel, theEvent);
}
-void rightMouseUp(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void rightMouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
callSuper(id, sel, theEvent);
}
-void rightMouseDragged(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void rightMouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
callSuper(id, sel, theEvent);
}
-void otherMouseDown(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void otherMouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
callSuper(id, sel, theEvent);
}
-void otherMouseUp(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void otherMouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
callSuper(id, sel, theEvent);
}
-void otherMouseDragged(int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void otherMouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
callSuper(id, sel, theEvent);
}
-boolean shouldDelayWindowOrderingForEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+boolean shouldDelayWindowOrderingForEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
return OS.objc_msgSendSuper(super_struct, sel, theEvent) != 0;
}
-boolean menuHasKeyEquivalent_forEvent_target_action(int /*long*/ id, int /*long*/ sel, int /*long*/ menu, int /*long*/ event, int /*long*/ target, int /*long*/ action) {
+boolean menuHasKeyEquivalent_forEvent_target_action(long /*int*/ id, long /*int*/ sel, long /*int*/ menu, long /*int*/ event, long /*int*/ target, long /*int*/ action) {
return true;
}
-int /*long*/ menuForEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+long /*int*/ menuForEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
return OS.objc_msgSendSuper(super_struct, sel, theEvent);
}
-void menuNeedsUpdate(int /*long*/ id, int /*long*/ sel, int /*long*/ menu) {
+void menuNeedsUpdate(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
}
-boolean makeFirstResponder(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+boolean makeFirstResponder(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
return callSuperBoolean(id, sel, notification);
}
-NSRange markedRange (int /*long*/ id, int /*long*/ sel) {
+NSRange markedRange (long /*int*/ id, long /*int*/ sel) {
return new NSRange ();
}
-void menu_willHighlightItem(int /*long*/ id, int /*long*/ sel, int /*long*/ menu, int /*long*/ item) {
+void menu_willHighlightItem(long /*int*/ id, long /*int*/ sel, long /*int*/ menu, long /*int*/ item) {
}
-void menuDidClose(int /*long*/ id, int /*long*/ sel, int /*long*/ menu) {
+void menuDidClose(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
}
-void menuWillOpen(int /*long*/ id, int /*long*/ sel, int /*long*/ menu) {
+void menuWillOpen(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
}
-void noResponderFor(int /*long*/ id, int /*long*/ sel, int /*long*/ selector) {
+void noResponderFor(long /*int*/ id, long /*int*/ sel, long /*int*/ selector) {
callSuper(id, sel, selector);
}
-int /*long*/ numberOfRowsInTableView(int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView) {
+long /*int*/ numberOfRowsInTableView(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView) {
return 0;
}
-int /*long*/ outlineView_child_ofItem(int /*long*/ id, int /*long*/ sel, int /*long*/ outlineView, int /*long*/ index, int /*long*/ item) {
+long /*int*/ outlineView_child_ofItem(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ index, long /*int*/ item) {
return 0;
}
-void outlineView_didClickTableColumn(int /*long*/ id, int /*long*/ sel, int /*long*/ outlineView, int /*long*/ tableColumn) {
+void outlineView_didClickTableColumn(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ tableColumn) {
}
-int /*long*/ outlineView_objectValueForTableColumn_byItem(int /*long*/ id, int /*long*/ sel, int /*long*/ outlineView, int /*long*/ tableColumn, int /*long*/ item) {
+long /*int*/ outlineView_objectValueForTableColumn_byItem(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ tableColumn, long /*int*/ item) {
return 0;
}
-boolean outlineView_isItemExpandable(int /*long*/ id, int /*long*/ sel, int /*long*/ outlineView, int /*long*/ item) {
+boolean outlineView_isItemExpandable(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ item) {
return false;
}
-int /*long*/ outlineView_numberOfChildrenOfItem(int /*long*/ id, int /*long*/ sel, int /*long*/ outlineView, int /*long*/ item) {
+long /*int*/ outlineView_numberOfChildrenOfItem(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ item) {
return 0;
}
-boolean outlineView_shouldExpandItem_item(int /*long*/ id, int /*long*/ sel, int /*long*/ outlineView, int /*long*/ item) {
+boolean outlineView_shouldExpandItem_item(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ item) {
return true;
}
-boolean outlineView_shouldReorderColumn_toColumn(int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ columnIndex, int /*long*/ newColumnIndex) {
+boolean outlineView_shouldReorderColumn_toColumn(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ columnIndex, long /*int*/ newColumnIndex) {
return true;
}
-boolean outlineView_shouldEditTableColumn_row(int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ aTableColumn, int /*long*/ item) {
+boolean outlineView_shouldEditTableColumn_row(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ aTableColumn, long /*int*/ item) {
return false;
}
-boolean outlineView_shouldTrackCell_forTableColumn_item(int /*long*/ id, int /*long*/ sel, int /*long*/ table, int /*long*/ cell, int /*long*/ tableColumn, int /*long*/ item) {
+boolean outlineView_shouldTrackCell_forTableColumn_item(long /*int*/ id, long /*int*/ sel, long /*int*/ table, long /*int*/ cell, long /*int*/ tableColumn, long /*int*/ item) {
return true;
}
-void outlineView_willDisplayCell_forTableColumn_item(int /*long*/ id, int /*long*/ sel, int /*long*/ outlineView, int /*long*/ cell, int /*long*/ tableColumn, int /*long*/ item) {
+void outlineView_willDisplayCell_forTableColumn_item(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ cell, long /*int*/ tableColumn, long /*int*/ item) {
}
-void outlineViewColumnDidMove (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void outlineViewColumnDidMove (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
}
-void outlineViewColumnDidResize (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void outlineViewColumnDidResize (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
}
-void outlineViewSelectionDidChange(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void outlineViewSelectionDidChange(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
}
-void outlineViewSelectionIsChanging(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void outlineViewSelectionIsChanging(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
}
-void outlineView_setObjectValue_forTableColumn_byItem(int /*long*/ id, int /*long*/ sel, int /*long*/ outlineView, int /*long*/ object, int /*long*/ tableColumn, int /*long*/ item) {
+void outlineView_setObjectValue_forTableColumn_byItem(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ object, long /*int*/ tableColumn, long /*int*/ item) {
}
-boolean outlineView_writeItems_toPasteboard(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2) {
+boolean outlineView_writeItems_toPasteboard(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
return false;
}
@@ -1275,11 +1275,11 @@ public void notifyListeners (int eventType, Event event) {
sendEvent (eventType, event);
}
-void pageDown (int /*long*/ id, int /*long*/ sel, int /*long*/ sender) {
+void pageDown (long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
callSuper(id, sel, sender);
}
-void pageUp (int /*long*/ id, int /*long*/ sel, int /*long*/ sender) {
+void pageUp (long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
callSuper(id, sel, sender);
}
@@ -1291,7 +1291,7 @@ void postEvent (int eventType, Event event) {
sendEvent (eventType, event, false);
}
-void reflectScrolledClipView (int /*long*/ id, int /*long*/ sel, int /*long*/ aClipView) {
+void reflectScrolledClipView (long /*int*/ id, long /*int*/ sel, long /*int*/ aClipView) {
callSuper (id, sel, aClipView);
}
@@ -1425,33 +1425,33 @@ public void removeDisposeListener (DisposeListener listener) {
eventTable.unhook (SWT.Dispose, listener);
}
-void scrollClipViewToPoint (int /*long*/ id, int /*long*/ sel, int /*long*/ clipView, NSPoint point) {
+void scrollClipViewToPoint (long /*int*/ id, long /*int*/ sel, long /*int*/ clipView, NSPoint point) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
OS.objc_msgSendSuper(super_struct, sel, clipView, point);
}
-void selectRowIndexes_byExtendingSelection (int /*long*/ id, int /*long*/ sel, int /*long*/ indexes, boolean extend) {
+void selectRowIndexes_byExtendingSelection (long /*int*/ id, long /*int*/ sel, long /*int*/ indexes, boolean extend) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
OS.objc_msgSendSuper(super_struct, sel, indexes, extend);
}
-void scrollWheel (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void scrollWheel (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
callSuper(id, sel, theEvent);
}
-NSRange selectedRange (int /*long*/ id, int /*long*/ sel) {
+NSRange selectedRange (long /*int*/ id, long /*int*/ sel) {
return new NSRange ();
}
-int /*long*/ nextValidKeyView (int /*long*/ id, int /*long*/ sel) {
+long /*int*/ nextValidKeyView (long /*int*/ id, long /*int*/ sel) {
return callSuperObject(id, sel);
}
-int /*long*/ previousValidKeyView (int /*long*/ id, int /*long*/ sel) {
+long /*int*/ previousValidKeyView (long /*int*/ id, long /*int*/ sel) {
return callSuperObject(id, sel);
}
@@ -1653,21 +1653,21 @@ void setOpenGLContext(Object value) {
void setOrientation () {
}
-void setFrameOrigin (int /*long*/ id, int /*long*/ sel, NSPoint point) {
+void setFrameOrigin (long /*int*/ id, long /*int*/ sel, NSPoint point) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
OS.objc_msgSendSuper(super_struct, sel, point);
}
-void setFrameSize (int /*long*/ id, int /*long*/ sel, NSSize size) {
+void setFrameSize (long /*int*/ id, long /*int*/ sel, NSSize size) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
OS.objc_msgSendSuper(super_struct, sel, size);
}
-void setImage (int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+void setImage (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
}
boolean setInputState (Event event, NSEvent nsEvent, int type) {
@@ -1675,7 +1675,7 @@ boolean setInputState (Event event, NSEvent nsEvent, int type) {
nsEvent = NSApplication.sharedApplication().currentEvent();
if (nsEvent == null) return true;
}
- int /*long*/ modifierFlags = nsEvent.modifierFlags();
+ long /*int*/ modifierFlags = nsEvent.modifierFlags();
if ((modifierFlags & OS.NSAlternateKeyMask) != 0) event.stateMask |= SWT.ALT;
if ((modifierFlags & OS.NSShiftKeyMask) != 0) event.stateMask |= SWT.SHIFT;
if ((modifierFlags & OS.NSControlKeyMask) != 0) event.stateMask |= SWT.CONTROL;
@@ -1748,15 +1748,15 @@ boolean setKeyState (Event event, int type, NSEvent nsEvent) {
if (chars != null && chars.length() > 0) event.character = (char)chars.characterAtIndex (0);
}
if (event.keyCode == 0) {
- int /*long*/ uchrPtr = 0;
- int /*long*/ currentKbd = OS.TISCopyCurrentKeyboardInputSource();
- int /*long*/ uchrCFData = OS.TISGetInputSourceProperty(currentKbd, OS.kTISPropertyUnicodeKeyLayoutData());
+ long /*int*/ uchrPtr = 0;
+ long /*int*/ currentKbd = OS.TISCopyCurrentKeyboardInputSource();
+ long /*int*/ uchrCFData = OS.TISGetInputSourceProperty(currentKbd, OS.kTISPropertyUnicodeKeyLayoutData());
if (uchrCFData != 0) {
uchrPtr = OS.CFDataGetBytePtr(uchrCFData);
if (uchrPtr != 0 && OS.CFDataGetLength(uchrCFData) > 0) {
- int /*long*/ cgEvent = nsEvent.CGEvent();
+ long /*int*/ cgEvent = nsEvent.CGEvent();
long keyboardType = OS.CGEventGetIntegerValueField(cgEvent, OS.kCGKeyboardEventKeyboardType);
int maxStringLength = 256;
@@ -1825,11 +1825,11 @@ void setLocationMask (Event event, NSEvent nsEvent) {
}
}
-boolean setMarkedText_selectedRange (int /*long*/ id, int /*long*/ sel, int /*long*/ string, int /*long*/ range) {
+boolean setMarkedText_selectedRange (long /*int*/ id, long /*int*/ sel, long /*int*/ string, long /*int*/ range) {
return true;
}
-void setNeedsDisplay (int /*long*/ id, int /*long*/ sel, boolean flag) {
+void setNeedsDisplay (long /*int*/ id, long /*int*/ sel, boolean flag) {
if (flag && !isDrawing()) return;
NSView view = new NSView(id);
if (flag && display.isPainting.containsObject(view)) {
@@ -1847,7 +1847,7 @@ void setNeedsDisplay (int /*long*/ id, int /*long*/ sel, boolean flag) {
OS.objc_msgSendSuper(super_struct, sel, flag);
}
-void setNeedsDisplayInRect (int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+void setNeedsDisplayInRect (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
if (!isDrawing()) return;
NSRect rect = new NSRect();
OS.memmove(rect, arg0, NSRect.sizeof);
@@ -1868,14 +1868,14 @@ void setNeedsDisplayInRect (int /*long*/ id, int /*long*/ sel, int /*long*/ arg0
OS.objc_msgSendSuper(super_struct, sel, rect);
}
-void setObjectValue(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+void setObjectValue(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
callSuper(id, sel, arg0);
}
-void setShouldExpandItem(int /*long*/ id, int /*long*/ sel, boolean shouldExpand) {
+void setShouldExpandItem(long /*int*/ id, long /*int*/ sel, boolean shouldExpand) {
}
-void setShouldScrollClipView(int /*long*/ id, int /*long*/ sel, boolean shouldScroll) {
+void setShouldScrollClipView(long /*int*/ id, long /*int*/ sel, boolean shouldScroll) {
}
boolean setTabGroupFocus () {
@@ -1886,11 +1886,11 @@ boolean setTabItemFocus () {
return false;
}
-boolean shouldChangeTextInRange_replacementString(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1) {
+boolean shouldChangeTextInRange_replacementString(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
return true;
}
-NSSize sizeOfLabel(int /*long*/ id, int /*long*/ sel, boolean shouldTruncateLabel) {
+NSSize sizeOfLabel(long /*int*/ id, long /*int*/ sel, boolean shouldTruncateLabel) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -1899,71 +1899,71 @@ NSSize sizeOfLabel(int /*long*/ id, int /*long*/ sel, boolean shouldTruncateLabe
return result;
}
-void superKeyDown (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void superKeyDown (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
callSuper (id, sel, theEvent);
}
-void superKeyUp (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent) {
+void superKeyUp (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
callSuper (id, sel, theEvent);
}
-void tableViewColumnDidMove (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void tableViewColumnDidMove (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
}
-void tableViewColumnDidResize (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void tableViewColumnDidResize (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
}
-void tableViewSelectionDidChange (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void tableViewSelectionDidChange (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
}
-void tableViewSelectionIsChanging (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void tableViewSelectionIsChanging (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
}
-void tableView_didClickTableColumn(int /*long*/ id, int /*long*/ sel, int /*long*/ tableView, int /*long*/ tableColumn) {
+void tableView_didClickTableColumn(long /*int*/ id, long /*int*/ sel, long /*int*/ tableView, long /*int*/ tableColumn) {
}
-int /*long*/ tableView_objectValueForTableColumn_row(int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ aTableColumn, int /*long*/ rowIndex) {
+long /*int*/ tableView_objectValueForTableColumn_row(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ aTableColumn, long /*int*/ rowIndex) {
return 0;
}
-boolean tableView_shouldSelectRow(int /*long*/ id, int /*long*/ sel, int /*long*/ tableView, int /*long*/ index) {
+boolean tableView_shouldSelectRow(long /*int*/ id, long /*int*/ sel, long /*int*/ tableView, long /*int*/ index) {
return true;
}
-void tableView_setObjectValue_forTableColumn_row(int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ anObject, int /*long*/ aTableColumn, int /*long*/ rowIndex) {
+void tableView_setObjectValue_forTableColumn_row(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ anObject, long /*int*/ aTableColumn, long /*int*/ rowIndex) {
}
-boolean tableView_shouldReorderColumn_toColumn(int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ columnIndex, int /*long*/ newColumnIndex) {
+boolean tableView_shouldReorderColumn_toColumn(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ columnIndex, long /*int*/ newColumnIndex) {
return true;
}
-boolean tableView_shouldEditTableColumn_row(int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ aTableColumn, int /*long*/ rowIndex) {
+boolean tableView_shouldEditTableColumn_row(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ aTableColumn, long /*int*/ rowIndex) {
return false;
}
-boolean tableView_shouldTrackCell_forTableColumn_row(int /*long*/ id, int /*long*/ sel, int /*long*/ table, int /*long*/ cell, /*long*/ int /*long*/ tableColumn, int /*long*/ rowIndex) {
+boolean tableView_shouldTrackCell_forTableColumn_row(long /*int*/ id, long /*int*/ sel, long /*int*/ table, long /*int*/ cell, /*long*/ long /*int*/ tableColumn, long /*int*/ rowIndex) {
return true;
}
-void tableView_willDisplayCell_forTableColumn_row(int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ aCell, int /*long*/ aTableColumn, int /*long*/ rowIndex) {
+void tableView_willDisplayCell_forTableColumn_row(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ aCell, long /*int*/ aTableColumn, long /*int*/ rowIndex) {
}
-void textViewDidChangeSelection(int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void textViewDidChangeSelection(long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
}
-void textDidChange(int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void textDidChange(long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
callSuper (id, sel, aNotification);
}
-void textDidEndEditing(int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
+void textDidEndEditing(long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
callSuper(id, sel, aNotification);
}
-NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange(int /*long*/ id, int /*long*/ sel, int /*long*/ aTextView, int /*long*/ oldSelectedCharRange, int /*long*/ newSelectedCharRange) {
+NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange(long /*int*/ id, long /*int*/ sel, long /*int*/ aTextView, long /*int*/ oldSelectedCharRange, long /*int*/ newSelectedCharRange) {
return new NSRange();
}
-NSRect titleRectForBounds (int /*long*/ id, int /*long*/ sel, NSRect cellFrame) {
+NSRect titleRectForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
objc_super super_struct = new objc_super();
super_struct.receiver = id;
super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -1972,19 +1972,19 @@ NSRect titleRectForBounds (int /*long*/ id, int /*long*/ sel, NSRect cellFrame)
return result;
}
-int /*long*/ toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar(int /*long*/ id, int /*long*/ sel, int /*long*/ toolbar, int /*long*/ itemID, boolean flag) {
+long /*int*/ toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar(long /*int*/ id, long /*int*/ sel, long /*int*/ toolbar, long /*int*/ itemID, boolean flag) {
return 0;
}
-int /*long*/ toolbarAllowedItemIdentifiers(int /*long*/ id, int /*long*/ sel, int /*long*/ toolbar) {
+long /*int*/ toolbarAllowedItemIdentifiers(long /*int*/ id, long /*int*/ sel, long /*int*/ toolbar) {
return 0;
}
-int /*long*/ toolbarDefaultItemIdentifiers(int /*long*/ id, int /*long*/ sel, int /*long*/ toolbar) {
+long /*int*/ toolbarDefaultItemIdentifiers(long /*int*/ id, long /*int*/ sel, long /*int*/ toolbar) {
return 0;
}
-int /*long*/ toolbarSelectableItemIdentifiers(int /*long*/ id, int /*long*/ sel, int /*long*/ toolbar) {
+long /*int*/ toolbarSelectableItemIdentifiers(long /*int*/ id, long /*int*/ sel, long /*int*/ toolbar) {
return 0;
}
String tooltipText () {
@@ -2006,127 +2006,127 @@ public String toString () {
return getName () + " {" + string + "}";
}
-void touchesBeganWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void touchesBeganWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
callSuper(id, sel, event);
}
-void touchesCancelledWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void touchesCancelledWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
callSuper(id, sel, event);
}
-void touchesEndedWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void touchesEndedWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
callSuper(id, sel, event);
}
-void touchesMovedWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void touchesMovedWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
callSuper(id, sel, event);
}
-void beginGestureWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void beginGestureWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
callSuper(id, sel, event);
}
-void endGestureWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void endGestureWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
callSuper(id, sel, event);
}
-void magnifyWithEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void magnifyWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
callSuper(id, sel, event);
}
-void rotateWithEvent(int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void rotateWithEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
callSuper(id, sel, event);
}
-void swipeWithEvent(int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void swipeWithEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
callSuper(id, sel, event);
}
-void resetCursorRects (int /*long*/ id, int /*long*/ sel) {
+void resetCursorRects (long /*int*/ id, long /*int*/ sel) {
callSuper (id, sel);
}
-void updateTrackingAreas (int /*long*/ id, int /*long*/ sel) {
+void updateTrackingAreas (long /*int*/ id, long /*int*/ sel) {
callSuper (id, sel);
}
-int /*long*/ validAttributesForMarkedText (int /*long*/ id, int /*long*/ sel) {
+long /*int*/ validAttributesForMarkedText (long /*int*/ id, long /*int*/ sel) {
return 0;
}
-void tabView_didSelectTabViewItem(int /*long*/ id, int /*long*/ sel, int /*long*/ tabView, int /*long*/ tabViewItem) {
+void tabView_didSelectTabViewItem(long /*int*/ id, long /*int*/ sel, long /*int*/ tabView, long /*int*/ tabViewItem) {
}
-void tabView_willSelectTabViewItem(int /*long*/ id, int /*long*/ sel, int /*long*/ tabView, int /*long*/ tabViewItem) {
+void tabView_willSelectTabViewItem(long /*int*/ id, long /*int*/ sel, long /*int*/ tabView, long /*int*/ tabViewItem) {
}
-boolean tableView_writeRowsWithIndexes_toPasteboard(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2) {
+boolean tableView_writeRowsWithIndexes_toPasteboard(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
return false;
}
-boolean validateMenuItem(int /*long*/ id, int /*long*/ sel, int /*long*/ menuItem) {
+boolean validateMenuItem(long /*int*/ id, long /*int*/ sel, long /*int*/ menuItem) {
return true;
}
-int /*long*/ view_stringForToolTip_point_userData (int /*long*/ id, int /*long*/ sel, int /*long*/ view, int /*long*/ tag, int /*long*/ point, int /*long*/ userData) {
+long /*int*/ view_stringForToolTip_point_userData (long /*int*/ id, long /*int*/ sel, long /*int*/ view, long /*int*/ tag, long /*int*/ point, long /*int*/ userData) {
return 0;
}
-void viewDidMoveToWindow(int /*long*/ id, int /*long*/ sel) {
+void viewDidMoveToWindow(long /*int*/ id, long /*int*/ sel) {
}
-void viewWillMoveToWindow(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+void viewWillMoveToWindow(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
}
-void windowDidMove(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void windowDidMove(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
}
-void windowDidResize(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void windowDidResize(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
}
-void windowDidResignKey(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void windowDidResignKey(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
}
-void windowDidBecomeKey(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void windowDidBecomeKey(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
}
-void windowDidMiniturize(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void windowDidMiniturize(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
}
-void windowDidDeminiturize(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void windowDidDeminiturize(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
}
-void windowSendEvent(int /*long*/ id, int /*long*/ sel, int /*long*/ event) {
+void windowSendEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
callSuper(id, sel, event);
}
-boolean windowShouldClose(int /*long*/ id, int /*long*/ sel, int /*long*/ window) {
+boolean windowShouldClose(long /*int*/ id, long /*int*/ sel, long /*int*/ window) {
return false;
}
-void windowWillClose(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void windowWillClose(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
}
-int /*long*/ nextState(int /*long*/ id, int /*long*/ sel) {
+long /*int*/ nextState(long /*int*/ id, long /*int*/ sel) {
return callSuperObject(id, sel);
}
-void updateOpenGLContext(int /*long*/ id, int /*long*/ sel, int /*long*/ notification) {
+void updateOpenGLContext(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
}
-boolean shouldDrawInsertionPoint(int /*long*/ id, int /*long*/ sel) {
+boolean shouldDrawInsertionPoint(long /*int*/ id, long /*int*/ sel) {
return callSuperBoolean(id, sel);
}
-boolean readSelectionFromPasteboard(int /*long*/ id, int /*long*/ sel, int /*long*/ pasteboard) {
+boolean readSelectionFromPasteboard(long /*int*/ id, long /*int*/ sel, long /*int*/ pasteboard) {
return false;
}
-int /*long*/ validRequestorForSendType(int /*long*/ id, int /*long*/ sel, int /*long*/ sendType, int /*long*/ returnType) {
+long /*int*/ validRequestorForSendType(long /*int*/ id, long /*int*/ sel, long /*int*/ sendType, long /*int*/ returnType) {
return callSuperObject(id, sel, sendType, returnType);
}
-boolean writeSelectionToPasteboard(int /*long*/ id, int /*long*/ sel, int /*long*/ pasteboard, int /*long*/ types) {
+boolean writeSelectionToPasteboard(long /*int*/ id, long /*int*/ sel, long /*int*/ pasteboard, long /*int*/ types) {
return false;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Drawable.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Drawable.java
index 141268b017..3bb7650ffa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Drawable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Drawable.java
@@ -45,7 +45,7 @@ public interface Drawable {
* @noreference This method is not intended to be referenced by clients.
*/
-public int /*long*/ internal_new_GC (GCData data);
+public long /*int*/ internal_new_GC (GCData data);
/**
* Invokes platform specific functionality to dispose a GC handle.
@@ -62,6 +62,6 @@ public int /*long*/ internal_new_GC (GCData data);
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC (int /*long*/ handle, GCData data);
+public void internal_dispose_GC (long /*int*/ handle, GCData data);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java
index ce73d17e0e..086bf2e8bd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java
@@ -28,7 +28,7 @@ public class Callback {
Object object;
String method, signature;
int argCount;
- int /*long*/ address, errorResult;
+ long /*int*/ address, errorResult;
boolean isStatic, isArrayBased;
static final String PTR_SIGNATURE = C.PTR_SIZEOF == 4 ? "I" : "J"; //$NON-NLS-1$ //$NON-NLS-2$
@@ -88,7 +88,7 @@ public Callback (Object object, String method, int argCount, boolean isArrayBase
* @param isArrayBased true if the arguments should be passed in an array and false otherwise
* @param errorResult the return value if the java code throws an exception
*/
-public Callback (Object object, String method, int argCount, boolean isArrayBased, int /*long*/ errorResult) {
+public Callback (Object object, String method, int argCount, boolean isArrayBased, long /*int*/ errorResult) {
/* Set the callback fields */
this.object = object;
@@ -131,7 +131,7 @@ public Callback (Object object, String method, int argCount, boolean isArrayBase
* @param isArrayBased whether the callback's method is array based
* @param errorResult the callback's error result
*/
-static native synchronized int /*long*/ bind (Callback callback, Object object, String method, String signature, int argCount, boolean isStatic, boolean isArrayBased, int /*long*/ errorResult);
+static native synchronized long /*int*/ bind (Callback callback, Object object, String method, String signature, int argCount, boolean isStatic, boolean isArrayBased, long /*int*/ errorResult);
/**
* Releases the native level resources associated with the callback,
@@ -152,7 +152,7 @@ public void dispose () {
*
* @return the callback address
*/
-public int /*long*/ getAddress () {
+public long /*int*/ getAddress () {
return address;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Monitor.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Monitor.java
index f22948a087..1ea2c09e07 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Monitor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Monitor.java
@@ -22,7 +22,7 @@ import org.eclipse.swt.graphics.*;
* @since 3.0
*/
public final class Monitor {
- int /*long*/ handle;
+ long /*int*/ handle;
int x, y, width, height;
int clientX, clientY, clientWidth, clientHeight;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TouchSource.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TouchSource.java
index 7caf92ab4f..101ba27a63 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TouchSource.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TouchSource.java
@@ -38,7 +38,7 @@ import org.eclipse.swt.graphics.*;
* @since 3.7
*/
public final class TouchSource {
- int /*long*/ handle;
+ long /*int*/ handle;
boolean direct;
Rectangle bounds;
@@ -49,7 +49,7 @@ public final class TouchSource {
* @param height height of the source in pixels.
* @param width width of the source in pixels.
*/
-TouchSource (int /*long*/ handle, boolean direct, Rectangle bounds) {
+TouchSource (long /*int*/ handle, boolean direct, Rectangle bounds) {
this.handle = handle;
this.direct = direct;
this.bounds = bounds;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/bidi/org/eclipse/swt/internal/BidiUtil.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/bidi/org/eclipse/swt/internal/BidiUtil.java
index b46c26361d..d39ac6c505 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/bidi/org/eclipse/swt/internal/BidiUtil.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/bidi/org/eclipse/swt/internal/BidiUtil.java
@@ -42,7 +42,7 @@ public class BidiUtil {
/*
* Not implemented.
*/
-public static void addLanguageListener(int /*long*/ hwnd, Runnable runnable) {
+public static void addLanguageListener(long /*int*/ hwnd, Runnable runnable) {
}
public static void addLanguageListener (Control control, Runnable runnable) {
}
@@ -93,7 +93,7 @@ public static int getKeyboardLanguage() {
/*
* Not implemented.
*/
-public static void removeLanguageListener(int /*long*/ hwnd) {
+public static void removeLanguageListener(long /*int*/ hwnd) {
}
public static void removeLanguageListener (Control control) {
}
@@ -105,7 +105,7 @@ public static void setKeyboardLanguage(int language) {
/*
* Not implemented.
*/
-public static boolean setOrientation(int /*long*/ hwnd, int orientation) {
+public static boolean setOrientation(long /*int*/ hwnd, int orientation) {
return false;
}
public static boolean setOrientation (Control control, int orientation) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Color.java
index c544508b2a..c516c866a6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Color.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Color.java
@@ -117,7 +117,7 @@ void destroy() {
device.gdkColors[pixel] = null;
}
}
- int /*long*/ colormap = OS.gdk_colormap_get_system();
+ long /*int*/ colormap = OS.gdk_colormap_get_system();
OS.gdk_colormap_free_colors(colormap, handle, 1);
handle = null;
}
@@ -244,7 +244,7 @@ void init(int red, int green, int blue) {
gdkColor.red = (short)((red & 0xFF) | ((red & 0xFF) << 8));
gdkColor.green = (short)((green & 0xFF) | ((green & 0xFF) << 8));
gdkColor.blue = (short)((blue & 0xFF) | ((blue & 0xFF) << 8));
- int /*long*/ colormap = OS.gdk_colormap_get_system();
+ long /*int*/ colormap = OS.gdk_colormap_get_system();
if (!OS.gdk_colormap_alloc_color(colormap, gdkColor, true, true)) {
/* Allocate black. */
gdkColor = new GdkColor();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java
index f66a8de530..6ac6cb7412 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java
@@ -54,7 +54,7 @@ public final class Cursor extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
static final byte[] APPSTARTING_SRC = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
@@ -290,15 +290,15 @@ public Cursor(Device device, ImageData source, int hotspotX, int hotspotY) {
hotspotY >= source.height || hotspotY < 0) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
- int /*long*/ display = 0;
+ long /*int*/ display = 0;
if (OS.GTK_VERSION >= OS.VERSION(2, 4, 0) && OS.gdk_display_supports_cursor_color(display = OS.gdk_display_get_default ())) {
int width = source.width;
int height = source.height;
PaletteData palette = source.palette;
- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height);
+ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height);
if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES);
int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
- int /*long*/ data = OS.gdk_pixbuf_get_pixels(pixbuf);
+ long /*int*/ data = OS.gdk_pixbuf_get_pixels(pixbuf);
byte[] buffer = source.data;
if (!palette.isDirect || source.depth != 24 || stride != source.bytesPerLine || palette.redMask != 0xFF000000 || palette.greenMask != 0xFF0000 || palette.blueMask != 0xFF00) {
buffer = new byte[source.width * source.height * 4];
@@ -432,10 +432,10 @@ public Cursor(Device device, ImageData source, int hotspotX, int hotspotY) {
init();
}
-int /*long*/ createCursor(byte[] sourceData, byte[] maskData, int width, int height, int hotspotX, int hotspotY, boolean reverse) {
- int /*long*/ sourcePixmap = OS.gdk_bitmap_create_from_data(0, sourceData, width, height);
- int /*long*/ maskPixmap = OS.gdk_bitmap_create_from_data(0, maskData, width, height);
- int /*long*/ cursor = 0;
+long /*int*/ createCursor(byte[] sourceData, byte[] maskData, int width, int height, int hotspotX, int hotspotY, boolean reverse) {
+ long /*int*/ sourcePixmap = OS.gdk_bitmap_create_from_data(0, sourceData, width, height);
+ long /*int*/ maskPixmap = OS.gdk_bitmap_create_from_data(0, maskData, width, height);
+ long /*int*/ cursor = 0;
if (sourcePixmap != 0 && maskPixmap != 0) {
GdkColor foreground = new GdkColor();
if (!reverse) foreground.red = foreground.green = foreground.blue = (short)0xFFFF;
@@ -485,7 +485,7 @@ public boolean equals(Object object) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public static Cursor gtk_new(Device device, int /*long*/ handle) {
+public static Cursor gtk_new(Device device, long /*int*/ handle) {
Cursor cursor = new Cursor(device);
cursor.handle = handle;
return cursor;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
index fd2a4ac32a..403eef490b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
@@ -36,8 +36,8 @@ public abstract class Device implements Drawable {
*
* @noreference This field is not intended to be referenced by clients.
*/
- protected int /*long*/ xDisplay;
- int /*long*/ shellHandle;
+ protected long /*int*/ xDisplay;
+ long /*int*/ shellHandle;
/* Debugging */
public static boolean DEBUG;
@@ -55,7 +55,7 @@ public abstract class Device implements Drawable {
boolean disposed;
/* Warning and Error Handlers */
- int /*long*/ logProc;
+ long /*int*/ logProc;
Callback logCallback;
//NOT DONE - get list of valid names
String [] log_domains = {"GLib-GObject", "GLib", "GObject", "Pango", "ATK", "GdkPixbuf", "Gdk", "Gtk", "GnomeVFS", "GIO"};
@@ -64,7 +64,7 @@ public abstract class Device implements Drawable {
/* X Warning and Error Handlers */
static Callback XErrorCallback, XIOErrorCallback;
- static int /*long*/ XErrorProc, XIOErrorProc, XNullErrorProc, XNullIOErrorProc;
+ static long /*int*/ XErrorProc, XIOErrorProc, XNullErrorProc, XNullIOErrorProc;
static Device[] Devices = new Device[4];
/*
@@ -82,7 +82,7 @@ public abstract class Device implements Drawable {
/* Device dpi */
Point dpi;
- int /*long*/ emptyTab;
+ long /*int*/ emptyTab;
boolean useXRender;
static boolean CAIRO_LOADED;
@@ -173,7 +173,7 @@ void checkCairo() {
} else {
buffer = Converter.wcsToMbcs(null, "libcairo.so.2", true);
}
- int /*long*/ libcairo = OS.dlopen(buffer, flags);
+ long /*int*/ libcairo = OS.dlopen(buffer, flags);
if (libcairo != 0) {
OS.dlclose(libcairo);
} else {
@@ -272,7 +272,7 @@ void dispose_Object (Object object) {
}
}
-static synchronized Device findDevice (int /*long*/ xDisplay) {
+static synchronized Device findDevice (long /*int*/ xDisplay) {
for (int i=0; itrue if the device has been disposed,
@@ -735,7 +735,7 @@ public boolean loadFont (String path) {
return OS.FcConfigAppFontAddFile (0, buffer);
}
-int /*long*/ logProc (int /*long*/ log_domain, int /*long*/ log_level, int /*long*/ message, int /*long*/ user_data) {
+long /*int*/ logProc (long /*int*/ log_domain, long /*int*/ log_level, long /*int*/ message, long /*int*/ user_data) {
if (warningLevel == 0) {
if (DEBUG || debug) {
new Error ().printStackTrace ();
@@ -806,7 +806,7 @@ protected void release () {
shellHandle = 0;
if (gdkColors != null) {
- int /*long*/ colormap = OS.gdk_colormap_get_system();
+ long /*int*/ colormap = OS.gdk_colormap_get_system();
for (int i = 0; i < gdkColors.length; i++) {
GdkColor color = gdkColors [i];
if (color != null) {
@@ -899,7 +899,7 @@ public void setWarnings (boolean warnings) {
}
}
-static int /*long*/ XErrorProc (int /*long*/ xDisplay, int /*long*/ xErrorEvent) {
+static long /*int*/ XErrorProc (long /*int*/ xDisplay, long /*int*/ xErrorEvent) {
Device device = findDevice (xDisplay);
if (device != null) {
if (device.warningLevel == 0) {
@@ -917,7 +917,7 @@ static int /*long*/ XErrorProc (int /*long*/ xDisplay, int /*long*/ xErrorEvent)
return 0;
}
-static int /*long*/ XIOErrorProc (int /*long*/ xDisplay) {
+static long /*int*/ XIOErrorProc (long /*int*/ xDisplay) {
Device device = findDevice (xDisplay);
if (device != null) {
if (DEBUG || device.debug) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java
index 70a7b7d7b9..62a2cba10e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Font.java
@@ -44,7 +44,7 @@ public final class Font extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
Font(Device device) {
super(device);
@@ -180,7 +180,7 @@ public boolean equals(Object object) {
public FontData[] getFontData() {
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
- int /*long*/ family = OS.pango_font_description_get_family(handle);
+ long /*int*/ family = OS.pango_font_description_get_family(handle);
int length = OS.strlen(family);
byte[] buffer = new byte[length];
OS.memmove(buffer, family, length);
@@ -194,7 +194,7 @@ public FontData[] getFontData() {
if (pangoStyle == OS.PANGO_STYLE_ITALIC) style |= SWT.ITALIC;
if (pangoStyle == OS.PANGO_STYLE_OBLIQUE) style |= SWT.ROMAN;
if (pangoWeight >= OS.PANGO_WEIGHT_BOLD) style |= SWT.BOLD;
- int /*long*/ fontString = OS.pango_font_description_to_string (handle);
+ long /*int*/ fontString = OS.pango_font_description_to_string (handle);
length = OS.strlen (fontString);
buffer = new byte [length + 1];
OS.memmove (buffer, fontString, length);
@@ -219,7 +219,7 @@ public FontData[] getFontData() {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public static Font gtk_new(Device device, int /*long*/ handle) {
+public static Font gtk_new(Device device, long /*int*/ handle) {
Font font = new Font(device);
font.handle = handle;
return font;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
index 61021eb94a..ac7c944e7b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
@@ -69,7 +69,7 @@ public final class GC extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
Drawable drawable;
GCData data;
@@ -156,7 +156,7 @@ public GC(Drawable drawable, int style) {
if (drawable == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
GCData data = new GCData();
data.style = checkStyle(style);
- int /*long*/ gdkGC = drawable.internal_new_GC(data);
+ long /*int*/ gdkGC = drawable.internal_new_GC(data);
Device device = data.device;
if (device == null) device = Device.getDevice();
if (device == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
@@ -165,10 +165,10 @@ public GC(Drawable drawable, int style) {
init();
}
-static void addCairoString(int /*long*/ cairo, String string, float x, float y, Font font) {
+static void addCairoString(long /*int*/ cairo, String string, float x, float y, Font font) {
byte[] buffer = Converter.wcsToMbcs(null, string, true);
if (OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {
- int /*long*/ layout = OS.pango_cairo_create_layout(cairo);
+ long /*int*/ layout = OS.pango_cairo_create_layout(cairo);
if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.pango_layout_set_text(layout, buffer, -1);
OS.pango_layout_set_font_description(layout, font.handle);
@@ -194,7 +194,7 @@ static int checkStyle (int style) {
return style & (SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT);
}
-public static GC gtk_new(int /*long*/ handle, GCData data) {
+public static GC gtk_new(long /*int*/ handle, GCData data) {
GC gc = new GC();
gc.device = data.device;
gc.init(null, data, handle);
@@ -203,7 +203,7 @@ public static GC gtk_new(int /*long*/ handle, GCData data) {
public static GC gtk_new(Drawable drawable, GCData data) {
GC gc = new GC();
- int /*long*/ gdkGC = drawable.internal_new_GC(data);
+ long /*int*/ gdkGC = drawable.internal_new_GC(data);
gc.device = data.device;
gc.init(drawable, data, gdkGC);
return gc;
@@ -214,7 +214,7 @@ void checkGC (int mask) {
if ((state & mask) == mask) return;
state = (state ^ mask) & mask;
data.state |= mask;
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
if ((state & (BACKGROUND | FOREGROUND)) != 0) {
GdkColor color;
@@ -230,7 +230,7 @@ void checkGC (int mask) {
}
if (pattern != null) {
if ((data.style & SWT.MIRRORED) != 0 && pattern.surface != 0) {
- int /*long*/ newPattern = Cairo.cairo_pattern_create_for_surface(pattern.surface);
+ long /*int*/ newPattern = Cairo.cairo_pattern_create_for_surface(pattern.surface);
if (newPattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_set_extend(newPattern, Cairo.CAIRO_EXTEND_REPEAT);
double[] matrix = {-1, 0, 0, 1, 0, 0};
@@ -390,10 +390,10 @@ void checkGC (int mask) {
}
}
-int /*long*/ convertRgn(int /*long*/ rgn, double[] matrix) {
- int /*long*/ newRgn = OS.gdk_region_new();
+long /*int*/ convertRgn(long /*int*/ rgn, double[] matrix) {
+ long /*int*/ newRgn = OS.gdk_region_new();
int[] nRects = new int[1];
- int /*long*/[] rects = new int /*long*/[1];
+ long /*int*/[] rects = new long /*int*/[1];
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
int[] pointArray = new int[8];
@@ -420,7 +420,7 @@ int /*long*/ convertRgn(int /*long*/ rgn, double[] matrix) {
Cairo.cairo_matrix_transform_point(matrix, x, y);
pointArray[6] = (int)x[0];
pointArray[7] = (int)Math.round(y[0]);
- int /*long*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE);
+ long /*int*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE);
OS.gdk_region_union(newRgn, polyRgn);
OS.gdk_region_destroy(polyRgn);
}
@@ -449,7 +449,7 @@ public void copyArea(Image image, int x, int y) {
if (image == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (image.type != SWT.BITMAP || image.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
if (OS.USE_CAIRO) {
- int /*long*/ cairo = Cairo.cairo_create(image.surface);
+ long /*int*/ cairo = Cairo.cairo_create(image.surface);
if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_translate(cairo, -x, -y);
if (data.image != null) {
@@ -461,10 +461,10 @@ public void copyArea(Image image, int x, int y) {
int[] w = new int[1], h = new int[1];
OS.gdk_drawable_get_size(data.drawable, w, h);
int width = w[0], height = h[0];
- int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
- int /*long*/ xDrawable = OS.gdk_x11_drawable_get_xid(data.drawable);
- int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());
- int /*long*/ srcSurface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height);
+ long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
+ long /*int*/ xDrawable = OS.gdk_x11_drawable_get_xid(data.drawable);
+ long /*int*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());
+ long /*int*/ srcSurface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height);
Cairo.cairo_set_source_surface(cairo, srcSurface, 0, 0);
}
} else {
@@ -476,7 +476,7 @@ public void copyArea(Image image, int x, int y) {
return;
}
Rectangle rect = image.getBounds();
- int /*long*/ gdkGC = OS.gdk_gc_new(image.pixmap);
+ long /*int*/ gdkGC = OS.gdk_gc_new(image.pixmap);
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.gdk_gc_set_subwindow(gdkGC, OS.GDK_INCLUDE_INFERIORS);
OS.gdk_draw_drawable(image.pixmap, gdkGC, data.drawable, x, y, 0, 0, rect.width, rect.height);
@@ -524,7 +524,7 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d
if (width <= 0 || height <= 0) return;
int deltaX = destX - srcX, deltaY = destY - srcY;
if (deltaX == 0 && deltaY == 0) return;
- int /*long*/ drawable = data.drawable;
+ long /*int*/ drawable = data.drawable;
if (OS.USE_CAIRO) {
if (data.image != null) {
Cairo.cairo_set_source_surface(handle, data.image.surface, deltaX, deltaY);
@@ -546,15 +546,15 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d
Cairo.cairo_paint(handle);
Cairo.cairo_restore(handle);
if (paint) {
- int /*long*/ visibleRegion = OS.gdk_drawable_get_visible_region (drawable);
+ long /*int*/ visibleRegion = OS.gdk_drawable_get_visible_region (drawable);
GdkRectangle srcRect = new GdkRectangle ();
srcRect.x = srcX;
srcRect.y = srcY;
srcRect.width = width;
srcRect.height = height;
- int /*long*/ copyRegion = OS.gdk_region_rectangle (srcRect);
+ long /*int*/ copyRegion = OS.gdk_region_rectangle (srcRect);
OS.gdk_region_intersect(copyRegion, visibleRegion);
- int /*long*/ invalidateRegion = OS.gdk_region_rectangle (srcRect);
+ long /*int*/ invalidateRegion = OS.gdk_region_rectangle (srcRect);
OS.gdk_region_subtract (invalidateRegion, visibleRegion);
OS.gdk_region_offset (invalidateRegion, deltaX, deltaY);
OS.gdk_window_invalidate_region(drawable, invalidateRegion, false);
@@ -604,10 +604,10 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d
}
void createLayout() {
- int /*long*/ context = OS.gdk_pango_context_get();
+ long /*int*/ context = OS.gdk_pango_context_get();
if (context == 0) SWT.error(SWT.ERROR_NO_HANDLES);
data.context = context;
- int /*long*/ layout = OS.pango_layout_new(context);
+ long /*int*/ layout = OS.pango_layout_new(context);
if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES);
data.layout = layout;
OS.pango_context_set_language(context, OS.gtk_get_default_language());
@@ -632,13 +632,13 @@ void disposeLayout() {
void destroy() {
if (data.disposeCairo) {
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) Cairo.cairo_destroy(cairo);
}
data.cairo = 0;
/* Free resources */
- int /*long*/ clipRgn = data.clipRgn;
+ long /*int*/ clipRgn = data.clipRgn;
if (clipRgn != 0) OS.gdk_region_destroy(clipRgn);
Image image = data.image;
if (image != null) {
@@ -701,7 +701,7 @@ public void drawArc(int x, int y, int width, int height, int startAngle, int arc
height = -height;
}
if (width == 0 || height == 0 || arcAngle == 0) return;
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
if (width == height) {
@@ -752,8 +752,8 @@ public void drawFocus(int x, int y, int width, int height) {
* are not valid in the default style. The fix is to use a style
* from a widget.
*/
- int /*long*/ style = OS.gtk_widget_get_style(data.device.shellHandle);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ style = OS.gtk_widget_get_style(data.device.shellHandle);
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
checkGC(FOREGROUND);
int[] lineWidth = new int[1];
@@ -868,7 +868,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
}
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
if (data.alpha != 0) {
srcImage.createSurface();
@@ -890,7 +890,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
case SWT.LOW: filter = Cairo.CAIRO_FILTER_FAST; break;
case SWT.HIGH: filter = Cairo.CAIRO_FILTER_BEST; break;
}
- int /*long*/ pattern = Cairo.cairo_pattern_create_for_surface(srcImage.surface);
+ long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface(srcImage.surface);
if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (srcWidth != destWidth || srcHeight != destHeight) {
/*
@@ -912,8 +912,8 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
*/
int version = Cairo.cairo_version ();
if (version >= Cairo.CAIRO_VERSION_ENCODE(1, 4, 0) && version < Cairo.CAIRO_VERSION_ENCODE(1, 8, 0)) {
- int /*long*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, imgWidth * 3, imgHeight * 3);
- int /*long*/ cr = Cairo.cairo_create(surface);
+ long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, imgWidth * 3, imgHeight * 3);
+ long /*int*/ cr = Cairo.cairo_create(surface);
Cairo.cairo_set_source_surface(cr, srcImage.surface, imgWidth, imgHeight);
Cairo.cairo_paint(cr);
Cairo.cairo_scale(cr, -1, -1);
@@ -936,7 +936,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
Cairo.cairo_set_source_surface(cr, srcImage.surface, imgWidth, -imgHeight * 3);
Cairo.cairo_paint(cr);
Cairo.cairo_destroy(cr);
- int /*long*/ newPattern = Cairo.cairo_pattern_create_for_surface(surface);
+ long /*int*/ newPattern = Cairo.cairo_pattern_create_for_surface(surface);
Cairo.cairo_surface_destroy(surface);
if (newPattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_destroy(pattern);
@@ -977,7 +977,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
drawImageXRender(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight, 0, -1);
return;
}
- int /*long*/ pixbuf = scale(srcImage.pixmap, srcX, srcY, srcWidth, srcHeight, destWidth, destHeight);
+ long /*int*/ pixbuf = scale(srcImage.pixmap, srcX, srcY, srcWidth, srcHeight, destWidth, destHeight);
if (pixbuf != 0) {
OS.gdk_pixbuf_render_to_drawable(pixbuf, data.drawable, handle, 0, 0, destX, destY, destWidth, destHeight, OS.GDK_RGB_DITHER_NORMAL, 0, 0);
OS.g_object_unref(pixbuf);
@@ -994,12 +994,12 @@ void drawImageAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHei
drawImageXRender(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight, srcImage.mask, OS.PictStandardA8);
return;
}
- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, srcWidth, srcHeight);
+ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, srcWidth, srcHeight);
if (pixbuf == 0) return;
- int /*long*/ colormap = OS.gdk_colormap_get_system();
+ long /*int*/ colormap = OS.gdk_colormap_get_system();
OS.gdk_pixbuf_get_from_drawable(pixbuf, srcImage.pixmap, colormap, srcX, srcY, 0, 0, srcWidth, srcHeight);
int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
byte[] line = new byte[stride];
byte alpha = (byte)srcImage.alpha;
byte[] alphaData = srcImage.alphaData;
@@ -1012,7 +1012,7 @@ void drawImageAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHei
OS.memmove(pixels + (y * stride), line, stride);
}
if (srcWidth != destWidth || srcHeight != destHeight) {
- int /*long*/ scaledPixbuf = OS.gdk_pixbuf_scale_simple(pixbuf, destWidth, destHeight, OS.GDK_INTERP_BILINEAR);
+ long /*int*/ scaledPixbuf = OS.gdk_pixbuf_scale_simple(pixbuf, destWidth, destHeight, OS.GDK_INTERP_BILINEAR);
OS.g_object_unref(pixbuf);
if (scaledPixbuf == 0) return;
pixbuf = scaledPixbuf;
@@ -1021,33 +1021,33 @@ void drawImageAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHei
OS.g_object_unref(pixbuf);
}
void drawImageMask(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple, int imgWidth, int imgHeight) {
- int /*long*/ drawable = data.drawable;
- int /*long*/ colorPixmap = srcImage.pixmap;
+ long /*int*/ drawable = data.drawable;
+ long /*int*/ colorPixmap = srcImage.pixmap;
/* Generate the mask if necessary. */
if (srcImage.transparentPixel != -1) srcImage.createMask();
- int /*long*/ maskPixmap = srcImage.mask;
+ long /*int*/ maskPixmap = srcImage.mask;
if (device.useXRender) {
drawImageXRender(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight, maskPixmap, OS.PictStandardA1);
} else {
if (srcWidth != destWidth || srcHeight != destHeight) {
- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, srcWidth, srcHeight);
+ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, srcWidth, srcHeight);
if (pixbuf != 0) {
- int /*long*/ colormap = OS.gdk_colormap_get_system();
+ long /*int*/ colormap = OS.gdk_colormap_get_system();
OS.gdk_pixbuf_get_from_drawable(pixbuf, colorPixmap, colormap, srcX, srcY, 0, 0, srcWidth, srcHeight);
- int /*long*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, srcWidth, srcHeight);
+ long /*int*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, srcWidth, srcHeight);
if (maskPixbuf != 0) {
OS.gdk_pixbuf_get_from_drawable(maskPixbuf, maskPixmap, 0, srcX, srcY, 0, 0, srcWidth, srcHeight);
int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
byte[] line = new byte[stride];
int maskStride = OS.gdk_pixbuf_get_rowstride(maskPixbuf);
- int /*long*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf);
+ long /*int*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf);
byte[] maskLine = new byte[maskStride];
for (int y=0; y naw) {
if (nh > nah) {
OS.gdk_draw_arc(drawable, handle, 0, nx, ny, naw, nah, 5760, 5760);
@@ -1695,7 +1695,7 @@ public void drawText (String string, int x, int y, int flags) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (string.length() == 0) return;
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
//TODO - honor flags
@@ -1744,13 +1744,13 @@ public void drawText (String string, int x, int y, int flags) {
if (!data.xorMode) {
OS.gdk_draw_layout_with_colors(data.drawable, handle, x, y, data.layout, null, background);
} else {
- int /*long*/ layout = data.layout;
+ long /*int*/ layout = data.layout;
if (data.stringWidth == -1) {
computeStringSize();
}
- int /*long*/ pixmap = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), data.stringWidth, data.stringHeight, -1);
+ long /*int*/ pixmap = OS.gdk_pixmap_new(OS.gdk_get_default_root_window(), data.stringWidth, data.stringHeight, -1);
if (pixmap == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ gdkGC = OS.gdk_gc_new(pixmap);
+ long /*int*/ gdkGC = OS.gdk_gc_new(pixmap);
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
GdkColor black = new GdkColor();
OS.gdk_gc_set_foreground(gdkGC, black);
@@ -1823,7 +1823,7 @@ public void fillArc(int x, int y, int width, int height, int startAngle, int arc
height = -height;
}
if (width == 0 || height == 0 || arcAngle == 0) return;
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
if (width == height) {
if (arcAngle >= 0) {
@@ -1900,9 +1900,9 @@ public void fillGradientRectangle(int x, int y, int width, int height, boolean v
fillRectangle(x, y, width, height);
return;
}
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
- int /*long*/ pattern;
+ long /*int*/ pattern;
if (vertical) {
pattern = Cairo.cairo_pattern_create_linear (0.0, 0.0, 0.0, 1.0);
} else {
@@ -1952,7 +1952,7 @@ public void fillOval(int x, int y, int width, int height) {
y = y + height;
height = -height;
}
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
if (width == height) {
Cairo.cairo_arc_negative(cairo, x + width / 2f, y + height / 2f, width / 2f, 0, 2 * (float)Compatibility.PI);
@@ -1998,8 +1998,8 @@ public void fillPath (Path path) {
if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
initCairo();
checkGC(FILL);
- int /*long*/ cairo = data.cairo;
- int /*long*/ copy = Cairo.cairo_copy_path(path.handle);
+ long /*int*/ cairo = data.cairo;
+ long /*int*/ copy = Cairo.cairo_copy_path(path.handle);
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
@@ -2029,7 +2029,7 @@ public void fillPolygon(int[] pointArray) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
checkGC(FILL);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
drawPolyline(cairo, pointArray, true);
Cairo.cairo_fill(cairo);
@@ -2064,7 +2064,7 @@ public void fillRectangle(int x, int y, int width, int height) {
y = y + height;
height = -height;
}
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
Cairo.cairo_rectangle(cairo, x, y, width, height);
Cairo.cairo_fill(cairo);
@@ -2130,7 +2130,7 @@ public void fillRoundRectangle(int x, int y, int width, int height, int arcWidth
}
if (naw < 0) naw = 0 - naw;
if (nah < 0) nah = 0 - nah;
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
if (naw == 0 || nah == 0) {
Cairo.cairo_rectangle(cairo, x, y, width, height);
@@ -2155,7 +2155,7 @@ public void fillRoundRectangle(int x, int y, int width, int height, int arcWidth
}
int naw2 = naw / 2;
int nah2 = nah / 2;
- int /*long*/ drawable = data.drawable;
+ long /*int*/ drawable = data.drawable;
if (nw > naw) {
if (nh > nah) {
OS.gdk_draw_arc(drawable, handle, 1, nx, ny, naw, nah, 5760, 5760);
@@ -2369,11 +2369,11 @@ public Rectangle getClipping() {
width = w[0];
height = h[0];
/* Intersect visible bounds with clipping in device space and then convert then to user space */
- int /*long*/ cairo = data.cairo;
- int /*long*/ clipRgn = data.clipRgn;
- int /*long*/ damageRgn = data.damageRgn;
+ long /*int*/ cairo = data.cairo;
+ long /*int*/ clipRgn = data.clipRgn;
+ long /*int*/ damageRgn = data.damageRgn;
if (clipRgn != 0 || damageRgn != 0 || cairo != 0) {
- int /*long*/ rgn = OS.gdk_region_new();
+ long /*int*/ rgn = OS.gdk_region_new();
GdkRectangle rect = new GdkRectangle();
rect.width = width;
rect.height = height;
@@ -2429,10 +2429,10 @@ public void getClipping(Region region) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (region == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (region.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
- int /*long*/ clipping = region.handle;
+ long /*int*/ clipping = region.handle;
OS.gdk_region_subtract(clipping, clipping);
- int /*long*/ cairo = data.cairo;
- int /*long*/ clipRgn = data.clipRgn;
+ long /*int*/ cairo = data.cairo;
+ long /*int*/ clipRgn = data.clipRgn;
if (clipRgn == 0) {
GdkRectangle rect = new GdkRectangle();
int[] width = new int[1], height = new int[1];
@@ -2443,7 +2443,7 @@ public void getClipping(Region region) {
} else {
/* Convert clipping to device space if needed */
if (data.clippingTransform != null) {
- int /*long*/ rgn = convertRgn(clipRgn, data.clippingTransform);
+ long /*int*/ rgn = convertRgn(clipRgn, data.clippingTransform);
OS.gdk_region_union(clipping, rgn);
OS.gdk_region_destroy(rgn);
} else {
@@ -2458,7 +2458,7 @@ public void getClipping(Region region) {
double[] matrix = new double[6];
Cairo.cairo_get_matrix(cairo, matrix);
Cairo.cairo_matrix_invert(matrix);
- int /*long*/ rgn = convertRgn(clipping, matrix);
+ long /*int*/ rgn = convertRgn(clipping, matrix);
OS.gdk_region_subtract(clipping, clipping);
OS.gdk_region_union(clipping, rgn);
OS.gdk_region_destroy(rgn);
@@ -2479,7 +2479,7 @@ public void getClipping(Region region) {
*/
public int getFillRule() {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo == 0) return SWT.FILL_EVEN_ODD;
return Cairo.cairo_get_fill_rule(cairo) == Cairo.CAIRO_FILL_RULE_WINDING ? SWT.FILL_WINDING : SWT.FILL_EVEN_ODD;
}
@@ -2515,9 +2515,9 @@ public FontMetrics getFontMetrics() {
if (data.context == 0) createLayout();
checkGC(FONT);
Font font = data.font;
- int /*long*/ context = data.context;
- int /*long*/ lang = OS.pango_context_get_language(context);
- int /*long*/ metrics = OS.pango_context_get_metrics(context, font.handle, lang);
+ long /*int*/ context = data.context;
+ long /*int*/ lang = OS.pango_context_get_language(context);
+ long /*int*/ metrics = OS.pango_context_get_metrics(context, font.handle, lang);
FontMetrics fm = new FontMetrics();
fm.ascent = OS.PANGO_PIXELS(OS.pango_font_metrics_get_ascent(metrics));
fm.descent = OS.PANGO_PIXELS(OS.pango_font_metrics_get_descent(metrics));
@@ -2757,7 +2757,7 @@ void getSize(int[] width, int[] height) {
return;
}
if (OS.USE_CAIRO) {
- int /*long*/ surface = Cairo.cairo_get_target(handle);
+ long /*int*/ surface = Cairo.cairo_get_target(handle);
switch (Cairo.cairo_surface_get_type(surface)) {
case Cairo.CAIRO_SURFACE_TYPE_IMAGE:
width[0] = Cairo.cairo_image_surface_get_width(surface);
@@ -2792,13 +2792,13 @@ public int getTextAntialias() {
if (data.cairo == 0) return SWT.DEFAULT;
int antialias = Cairo.CAIRO_ANTIALIAS_DEFAULT;
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
- int /*long*/ options = Cairo.cairo_font_options_create();
+ long /*int*/ options = Cairo.cairo_font_options_create();
Cairo.cairo_get_font_options(data.cairo, options);
antialias = Cairo.cairo_font_options_get_antialias(options);
Cairo.cairo_font_options_destroy(options);
} else {
if (data.context != 0) {
- int /*long*/ options = OS.pango_cairo_context_get_font_options(data.context);
+ long /*int*/ options = OS.pango_cairo_context_get_font_options(data.context);
if (options != 0) antialias = Cairo.cairo_font_options_get_antialias(options);
}
}
@@ -2833,7 +2833,7 @@ public void getTransform(Transform transform) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (transform == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
Cairo.cairo_get_matrix(cairo, transform.handle);
double[] identity = identity();
@@ -2896,7 +2896,7 @@ double[] identity() {
return identity;
}
-void init(Drawable drawable, GCData data, int /*long*/ gdkGC) {
+void init(Drawable drawable, GCData data, long /*int*/ gdkGC) {
if (data.foreground != null) data.state &= ~FOREGROUND;
if (data.background != null) data.state &= ~(BACKGROUND | BACKGROUND_BG);
if (data.font != null) data.state &= ~FONT;
@@ -2915,7 +2915,7 @@ void init(Drawable drawable, GCData data, int /*long*/ gdkGC) {
this.data = data;
handle = gdkGC;
if (OS.USE_CAIRO) {
- int /*long*/ cairo = data.cairo = handle;
+ long /*int*/ cairo = data.cairo = handle;
Cairo.cairo_set_fill_rule(cairo, Cairo.CAIRO_FILL_RULE_EVEN_ODD);
data.state &= ~(BACKGROUND | FOREGROUND | FONT | LINE_WIDTH | LINE_CAP | LINE_JOIN | LINE_STYLE | DRAW_OFFSET);
} else if (OS.INIT_CAIRO) {
@@ -2924,27 +2924,27 @@ void init(Drawable drawable, GCData data, int /*long*/ gdkGC) {
setClipping(data.clipRgn);
if ((data.style & SWT.MIRRORED) != 0) {
initCairo();
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
Cairo.cairo_set_matrix(cairo, identity());
}
}
void initCairo() {
data.device.checkCairo();
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) return;
if (OS.GTK_VERSION < OS.VERSION(2, 17, 0)) {
- int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
- int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());
- int /*long*/ xDrawable = 0;
+ long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
+ long /*int*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());
+ long /*int*/ xDrawable = 0;
int translateX = 0, translateY = 0;
- int /*long*/ drawable = data.drawable;
+ long /*int*/ drawable = data.drawable;
if (data.image != null) {
xDrawable = OS.GDK_PIXMAP_XID(drawable);
} else {
if (!data.realDrawable) {
int[] x = new int[1], y = new int[1];
- int /*long*/ [] real_drawable = new int /*long*/ [1];
+ long /*int*/ [] real_drawable = new long /*int*/ [1];
OS.gdk_window_get_internal_paint_info(drawable, real_drawable, x, y);
xDrawable = OS.gdk_x11_drawable_get_xid(real_drawable[0]);
translateX = -x[0];
@@ -2962,7 +2962,7 @@ void initCairo() {
width = w[0];
height = h[0];
}
- int /*long*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height);
+ long /*int*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height);
if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_surface_set_device_offset(surface, translateX, translateY);
data.cairo = cairo = Cairo.cairo_create(surface);
@@ -3086,7 +3086,7 @@ public void setAdvanced(boolean advanced) {
} catch (SWTException e) {}
} else {
if (!data.disposeCairo) return;
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) Cairo.cairo_destroy(cairo);
data.cairo = 0;
data.interpolation = SWT.DEFAULT;
@@ -3166,7 +3166,7 @@ public void setAntialias(int antialias) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
initCairo();
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
Cairo.cairo_set_antialias(cairo, mode);
}
@@ -3228,13 +3228,13 @@ public void setBackgroundPattern(Pattern pattern) {
data.state &= ~BACKGROUND;
}
-static void setCairoFont(int /*long*/ cairo, Font font) {
+static void setCairoFont(long /*int*/ cairo, Font font) {
if (font == null || font.isDisposed()) return;
setCairoFont(cairo, font.handle);
}
-static void setCairoFont(int /*long*/ cairo, int /*long*/ font) {
- int /*long*/ family = OS.pango_font_description_get_family(font);
+static void setCairoFont(long /*int*/ cairo, long /*int*/ font) {
+ long /*int*/ family = OS.pango_font_description_get_family(font);
int length = OS.strlen(family);
byte[] buffer = new byte[length + 1];
OS.memmove(buffer, family, length);
@@ -3251,12 +3251,12 @@ static void setCairoFont(int /*long*/ cairo, int /*long*/ font) {
Cairo.cairo_set_font_size(cairo, height);
}
-static void setCairoRegion(int /*long*/ cairo, int /*long*/ rgn) {
+static void setCairoRegion(long /*int*/ cairo, long /*int*/ rgn) {
if (OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {
OS.gdk_cairo_region(cairo, rgn);
} else {
int[] nRects = new int[1];
- int /*long*/[] rects = new int /*long*/[1];
+ long /*int*/[] rects = new long /*int*/[1];
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
for (int i=0; i= OS.VERSION(2,18,0) && data.drawable != 0) {
OS.gdk_cairo_reset_clip(cairo, data.drawable);
} else {
@@ -3299,8 +3299,8 @@ void setCairoClip(int /*long*/ damageRgn, int /*long*/ clipRgn) {
}
}
-void setClipping(int /*long*/ clipRgn) {
- int /*long*/ cairo = data.cairo;
+void setClipping(long /*int*/ clipRgn) {
+ long /*int*/ cairo = data.cairo;
if (clipRgn == 0) {
if (data.clipRgn != 0) {
OS.gdk_region_destroy(data.clipRgn);
@@ -3310,7 +3310,7 @@ void setClipping(int /*long*/ clipRgn) {
data.clippingTransform = null;
setCairoClip(data.damageRgn, 0);
} else {
- int /*long*/ clipping = data.damageRgn != 0 ? data.damageRgn : 0;
+ long /*int*/ clipping = data.damageRgn != 0 ? data.damageRgn : 0;
OS.gdk_gc_set_clip_region(handle, clipping);
}
} else {
@@ -3322,7 +3322,7 @@ void setClipping(int /*long*/ clipRgn) {
Cairo.cairo_get_matrix(cairo, data.clippingTransform);
setCairoClip(data.damageRgn, clipRgn);
} else {
- int /*long*/ clipping = clipRgn;
+ long /*int*/ clipping = clipRgn;
if (data.damageRgn != 0) {
clipping = OS.gdk_region_new();
OS.gdk_region_union(clipping, clipRgn);
@@ -3363,7 +3363,7 @@ public void setClipping(int x, int y, int width, int height) {
rect.y = y;
rect.width = width;
rect.height = height;
- int /*long*/ clipRgn = OS.gdk_region_new();
+ long /*int*/ clipRgn = OS.gdk_region_new();
OS.gdk_region_union_with_rect(clipRgn, rect);
setClipping(clipRgn);
OS.gdk_region_destroy(clipRgn);
@@ -3401,8 +3401,8 @@ public void setClipping(Path path) {
setClipping(0);
if (path != null) {
initCairo();
- int /*long*/ cairo = data.cairo;
- int /*long*/ copy = Cairo.cairo_copy_path(path.handle);
+ long /*int*/ cairo = data.cairo;
+ long /*int*/ copy = Cairo.cairo_copy_path(path.handle);
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
@@ -3505,7 +3505,7 @@ public void setFillRule(int rule) {
}
//TODO - need fill rule in X, GDK has no API
initCairo();
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
Cairo.cairo_set_fill_rule(cairo, cairo_mode);
}
@@ -3896,7 +3896,7 @@ void setString(String string, int flags) {
}
byte[] buffer;
int mnemonic, length = string.length ();
- int /*long*/ layout = data.layout;
+ long /*int*/ layout = data.layout;
char[] text = new char[length];
string.getChars(0, length, text, 0);
if ((flags & SWT.DRAW_MNEMONIC) != 0 && (mnemonic = fixMnemonic(text)) != -1) {
@@ -3909,8 +3909,8 @@ void setString(String string, int flags) {
buffer = new byte[buffer1.length + buffer2.length];
System.arraycopy(buffer1, 0, buffer, 0, buffer1.length);
System.arraycopy(buffer2, 0, buffer, buffer1.length, buffer2.length);
- int /*long*/ attr_list = OS.pango_attr_list_new();
- int /*long*/ attr = OS.pango_attr_underline_new(OS.PANGO_UNDERLINE_LOW);
+ long /*int*/ attr_list = OS.pango_attr_list_new();
+ long /*int*/ attr = OS.pango_attr_underline_new(OS.PANGO_UNDERLINE_LOW);
PangoAttribute attribute = new PangoAttribute();
OS.memmove(attribute, attr, PangoAttribute.sizeof);
attribute.start_index = buffer1.length;
@@ -3972,7 +3972,7 @@ public void setTextAntialias(int antialias) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
initCairo();
- int /*long*/ options = Cairo.cairo_font_options_create();
+ long /*int*/ options = Cairo.cairo_font_options_create();
Cairo.cairo_font_options_set_antialias(options, mode);
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
Cairo.cairo_set_font_options(data.cairo, options);
@@ -4014,7 +4014,7 @@ public void setTransform(Transform transform) {
if (transform != null && transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
if (data.cairo == 0 && transform == null) return;
initCairo();
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
double[] identity = identity();
if (transform != null) {
Cairo.cairo_matrix_multiply(identity, transform.handle, identity);
@@ -4046,7 +4046,7 @@ public void setTransform(Transform transform) {
*/
public void setXORMode(boolean xor) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
if (Cairo.cairo_version() >= Cairo.CAIRO_VERSION_ENCODE(1, 10, 0)) {
Cairo.cairo_set_operator(handle, xor ? Cairo.CAIRO_OPERATOR_DIFFERENCE : Cairo.CAIRO_OPERATOR_OVER);
@@ -4138,7 +4138,7 @@ public Point textExtent(String string) {
public Point textExtent(String string, int flags) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
//TODO - honor flags
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GCData.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GCData.java
index 2259ddccc9..c956db36c8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GCData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GCData.java
@@ -34,7 +34,7 @@ public final class GCData {
public Font font;
public Pattern foregroundPattern;
public Pattern backgroundPattern;
- public int /*long*/ clipRgn;
+ public long /*int*/ clipRgn;
public float lineWidth;
public int lineStyle = SWT.LINE_SOLID;
public float[] lineDashes;
@@ -46,12 +46,12 @@ public final class GCData {
public int alpha = 0xFF;
public int interpolation = SWT.DEFAULT;
- public int /*long*/ context;
- public int /*long*/ layout;
- public int /*long*/ damageRgn;
+ public long /*int*/ context;
+ public long /*int*/ layout;
+ public long /*int*/ damageRgn;
public Image image;
- public int /*long*/ drawable;
- public int /*long*/ cairo;
+ public long /*int*/ drawable;
+ public long /*int*/ cairo;
public double cairoXoffset, cairoYoffset;
public boolean disposeCairo;
public double[] identity, clippingTransform;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java
index 4367e36358..bdb9f1d901 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java
@@ -96,7 +96,7 @@ public final class Image extends Resource implements Drawable {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ pixmap;
+ public long /*int*/ pixmap;
/**
* The handle to the OS mask resource.
@@ -110,7 +110,7 @@ public final class Image extends Resource implements Drawable {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ mask;
+ public long /*int*/ mask;
/**
* The handle to the OS cairo surface resource.
@@ -124,7 +124,7 @@ public final class Image extends Resource implements Drawable {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ surface;
+ public long /*int*/ surface;
/**
* specifies the transparent pixel
@@ -255,14 +255,14 @@ public Image(Device device, Image srcImage, int flag) {
System.arraycopy(srcImage.alphaData, 0, alphaData, 0, alphaData.length);
}
- int /*long*/ imageSurface = srcImage.surface;
+ long /*int*/ imageSurface = srcImage.surface;
int width = this.width = srcImage.width;
int height = this.height = srcImage.height;
int format = Cairo.cairo_surface_get_content(imageSurface) == Cairo.CAIRO_CONTENT_COLOR ? Cairo.CAIRO_FORMAT_RGB24 : Cairo.CAIRO_FORMAT_ARGB32;
boolean hasAlpha = format == Cairo.CAIRO_FORMAT_ARGB32;
surface = Cairo.cairo_image_surface_create(format, width, height);
if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ cairo = Cairo.cairo_create(surface);
+ long /*int*/ cairo = Cairo.cairo_create(surface);
if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_set_operator(cairo, Cairo.CAIRO_OPERATOR_SOURCE);
Cairo.cairo_set_source_surface (cairo, imageSurface, 0, 0);
@@ -270,7 +270,7 @@ public Image(Device device, Image srcImage, int flag) {
Cairo.cairo_destroy(cairo);
if (flag != SWT.IMAGE_COPY) {
int stride = Cairo.cairo_image_surface_get_stride(surface);
- int /*long*/ data = Cairo.cairo_image_surface_get_data(surface);
+ long /*int*/ data = Cairo.cairo_image_surface_get_data(surface);
int oa, or, og, ob;
if (OS.BIG_ENDIAN) {
oa = 0; or = 1; og = 2; ob = 3;
@@ -375,9 +375,9 @@ public Image(Device device, Image srcImage, int flag) {
if ((srcImage.type == SWT.ICON && srcImage.mask != 0) || srcImage.transparentPixel != -1) {
/* Generate the mask if necessary. */
if (srcImage.transparentPixel != -1) srcImage.createMask();
- int /*long*/ mask = OS.gdk_pixmap_new(0, width, height, 1);
+ long /*int*/ mask = OS.gdk_pixmap_new(0, width, height, 1);
if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ gdkGC = OS.gdk_gc_new(mask);
+ long /*int*/ gdkGC = OS.gdk_gc_new(mask);
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.gdk_draw_drawable(mask, gdkGC, srcImage.mask, 0, 0, 0, 0, width, height);
OS.g_object_unref(gdkGC);
@@ -396,9 +396,9 @@ public Image(Device device, Image srcImage, int flag) {
createAlphaMask(width, height);
/* Create the new pixmap */
- int /*long*/ pixmap = OS.gdk_pixmap_new (OS.gdk_get_default_root_window(), width, height, -1);
+ long /*int*/ pixmap = OS.gdk_pixmap_new (OS.gdk_get_default_root_window(), width, height, -1);
if (pixmap == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ gdkGC = OS.gdk_gc_new(pixmap);
+ long /*int*/ gdkGC = OS.gdk_gc_new(pixmap);
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
this.pixmap = pixmap;
@@ -408,12 +408,12 @@ public Image(Device device, Image srcImage, int flag) {
} else {
/* Retrieve the source pixmap data */
- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);
+ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);
if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ colormap = OS.gdk_colormap_get_system();
+ long /*int*/ colormap = OS.gdk_colormap_get_system();
OS.gdk_pixbuf_get_from_drawable(pixbuf, srcImage.pixmap, colormap, 0, 0, 0, 0, width, height);
int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
/* Apply transformation */
switch (flag) {
@@ -675,7 +675,7 @@ void initNative(String filename) {
char [] chars = new char [length];
filename.getChars (0, length, chars, 0);
byte [] buffer = Converter.wcsToMbcs(null, chars, true);
- int /*long*/ pixbuf = OS.gdk_pixbuf_new_from_file(buffer, null);
+ long /*int*/ pixbuf = OS.gdk_pixbuf_new_from_file(buffer, null);
if (pixbuf != 0) {
try {
createFromPixbuf (SWT.BITMAP, pixbuf);
@@ -690,14 +690,14 @@ void createAlphaMask (int width, int height) {
if (device.useXRender && (alpha != -1 || alphaData != null)) {
mask = OS.gdk_pixmap_new(0, alpha != -1 ? 1 : width, alpha != -1 ? 1 : height, 8);
if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ gc = OS.gdk_gc_new(mask);
+ long /*int*/ gc = OS.gdk_gc_new(mask);
if (alpha != -1) {
GdkColor color = new GdkColor();
color.pixel = (alpha & 0xFF) << 8 | (alpha & 0xFF);
OS.gdk_gc_set_foreground(gc, color);
OS.gdk_draw_rectangle(mask, gc, 1, 0, 0, 1, 1);
} else {
- int /*long*/ imagePtr = OS.gdk_drawable_get_image(mask, 0, 0, width, height);
+ long /*int*/ imagePtr = OS.gdk_drawable_get_image(mask, 0, 0, width, height);
if (imagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES);
GdkImage gdkImage = new GdkImage();
OS.memmove(gdkImage, imagePtr);
@@ -717,18 +717,18 @@ void createAlphaMask (int width, int height) {
}
}
-void createFromPixbuf(int type, int /*long*/ pixbuf) {
+void createFromPixbuf(int type, long /*int*/ pixbuf) {
this.type = type;
boolean hasAlpha = OS.gdk_pixbuf_get_has_alpha(pixbuf);
if (OS.USE_CAIRO) {
int width = this.width = OS.gdk_pixbuf_get_width(pixbuf);
int height = this.height = OS.gdk_pixbuf_get_height(pixbuf);
int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
int format = hasAlpha ? Cairo.CAIRO_FORMAT_ARGB32 : Cairo.CAIRO_FORMAT_RGB24;
surface = Cairo.cairo_image_surface_create(format, width, height);
if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ data = Cairo.cairo_image_surface_get_data(surface);
+ long /*int*/ data = Cairo.cairo_image_surface_get_data(surface);
int cairoStride = Cairo.cairo_image_surface_get_stride(surface);
int oa = 0, or = 0, og = 0, ob = 0;
if (OS.BIG_ENDIAN) {
@@ -785,7 +785,7 @@ void createFromPixbuf(int type, int /*long*/ pixbuf) {
int width = OS.gdk_pixbuf_get_width(pixbuf);
int height = OS.gdk_pixbuf_get_height(pixbuf);
int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
byte[] line = new byte[stride];
alphaData = new byte[width * height];
for (int y = 0; y < height; y++) {
@@ -798,7 +798,7 @@ void createFromPixbuf(int type, int /*long*/ pixbuf) {
}
createAlphaMask(width, height);
}
- int /*long*/ [] pixmap_return = new int /*long*/ [1];
+ long /*int*/ [] pixmap_return = new long /*int*/ [1];
OS.gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, null, 0);
this.pixmap = pixmap_return[0];
if (pixmap == 0) SWT.error(SWT.ERROR_NO_HANDLES);
@@ -813,7 +813,7 @@ void createMask() {
int width = this.width;
int height = this.height;
int stride = Cairo.cairo_image_surface_get_stride(surface);
- int /*long*/ surfaceData = Cairo.cairo_image_surface_get_data(surface);
+ long /*int*/ surfaceData = Cairo.cairo_image_surface_get_data(surface);
int oa, or, og, ob, tr, tg, tb;
if (OS.BIG_ENDIAN) {
oa = 0; or = 1; og = 2; ob = 3;
@@ -854,7 +854,7 @@ void createMask() {
if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES);
}
-int /*long*/ createMask(ImageData image, boolean copy) {
+long /*int*/ createMask(ImageData image, boolean copy) {
ImageData mask = image.getTransparencyMask();
byte[] data = mask.data;
byte[] maskData = copy ? new byte[data.length] : data;
@@ -882,12 +882,12 @@ void createSurface() {
this.width = width;
this.height = height;
if (mask != 0 || alpha != -1 || alphaData != null) {
- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height);
+ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height);
if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ colormap = OS.gdk_colormap_get_system();
+ long /*int*/ colormap = OS.gdk_colormap_get_system();
OS.gdk_pixbuf_get_from_drawable(pixbuf, pixmap, colormap, 0, 0, 0, 0, width, height);
int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
byte[] line = new byte[stride];
int oa, or, og, ob;
if (OS.BIG_ENDIAN) {
@@ -896,13 +896,13 @@ void createSurface() {
oa = 3; or = 2; og = 1; ob = 0;
}
if (mask != 0 && OS.gdk_drawable_get_depth(mask) == 1) {
- int /*long*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);
+ long /*int*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);
if (maskPixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.gdk_pixbuf_get_from_drawable(maskPixbuf, mask, 0, 0, 0, 0, 0, width, height);
int maskStride = OS.gdk_pixbuf_get_rowstride(maskPixbuf);
- int /*long*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf);
+ long /*int*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf);
byte[] maskLine = new byte[maskStride];
- int /*long*/ offset = pixels, maskOffset = maskPixels;
+ long /*int*/ offset = pixels, maskOffset = maskPixels;
for (int y=0; y= OS.VERSION(2, 22, 0)) {
surface = OS.gdk_window_create_similar_surface(OS.gdk_get_default_root_window(), Cairo.CAIRO_CONTENT_COLOR, width, height);
} else {
- int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
- int /*long*/ xDrawable = OS.gdk_x11_drawable_get_xid(OS.gdk_get_default_root_window());
- int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());
- int /*long*/ rootSurface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, 1, 1);
+ long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
+ long /*int*/ xDrawable = OS.gdk_x11_drawable_get_xid(OS.gdk_get_default_root_window());
+ long /*int*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());
+ long /*int*/ rootSurface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, 1, 1);
if (rootSurface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
surface = Cairo.cairo_surface_create_similar(rootSurface, Cairo.CAIRO_CONTENT_COLOR, width, height);
Cairo.cairo_surface_destroy(rootSurface);
}
if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ cairo = Cairo.cairo_create(surface);
+ long /*int*/ cairo = Cairo.cairo_create(surface);
if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_set_source_rgb(cairo, 1, 1, 1);
Cairo.cairo_rectangle(cairo, 0, 0, width, height);
@@ -1317,9 +1317,9 @@ void init(int width, int height) {
white.red = (short)0xFFFF;
white.green = (short)0xFFFF;
white.blue = (short)0xFFFF;
- int /*long*/ colormap = OS.gdk_colormap_get_system();
+ long /*int*/ colormap = OS.gdk_colormap_get_system();
OS.gdk_colormap_alloc_color(colormap, white, true, true);
- int /*long*/ gdkGC = OS.gdk_gc_new(pixmap);
+ long /*int*/ gdkGC = OS.gdk_gc_new(pixmap);
OS.gdk_gc_set_foreground(gdkGC, white);
OS.gdk_draw_rectangle(pixmap, gdkGC, 1, 0, 0, width, height);
OS.g_object_unref(gdkGC);
@@ -1340,7 +1340,7 @@ void init(ImageData image) {
surface = Cairo.cairo_image_surface_create(format, width, height);
if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
int stride = Cairo.cairo_image_surface_get_stride(surface);
- int /*long*/ data = Cairo.cairo_image_surface_get_data(surface);
+ long /*int*/ data = Cairo.cairo_image_surface_get_data(surface);
int oa = 0, or = 0, og = 0, ob = 0;
int redMask, greenMask, blueMask, destDepth = 32, destOrder;
if (OS.BIG_ENDIAN) {
@@ -1465,10 +1465,10 @@ void init(ImageData image) {
//TODO convert to XLIB surface if opaque for better performance
return;
}
- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);
+ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height);
if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES);
int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
- int /*long*/ data = OS.gdk_pixbuf_get_pixels(pixbuf);
+ long /*int*/ data = OS.gdk_pixbuf_get_pixels(pixbuf);
byte[] buffer = image.data;
if (!palette.isDirect || image.depth != 24 || stride != image.bytesPerLine || palette.redMask != 0xFF0000 || palette.greenMask != 0xFF00 || palette.blueMask != 0xFF) {
buffer = new byte[stride * height];
@@ -1499,9 +1499,9 @@ void init(ImageData image) {
}
}
OS.memmove(data, buffer, stride * height);
- int /*long*/ pixmap = OS.gdk_pixmap_new (OS.gdk_get_default_root_window(), width, height, -1);
+ long /*int*/ pixmap = OS.gdk_pixmap_new (OS.gdk_get_default_root_window(), width, height, -1);
if (pixmap == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ gdkGC = OS.gdk_gc_new(pixmap);
+ long /*int*/ gdkGC = OS.gdk_gc_new(pixmap);
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.gdk_pixbuf_render_to_drawable(pixbuf, pixmap, gdkGC, 0, 0, 0, 0, width, height, OS.GDK_RGB_DITHER_NORMAL, 0, 0);
OS.g_object_unref(gdkGC);
@@ -1522,7 +1522,7 @@ void init(ImageData image) {
transparentPixel = rgb.red << 16 | rgb.green << 8 | rgb.blue;
}
}
- int /*long*/ mask = createMask(image, isIcon);
+ long /*int*/ mask = createMask(image, isIcon);
if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES);
this.mask = mask;
if (isIcon) {
@@ -1558,12 +1558,12 @@ void init(ImageData image) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public int /*long*/ internal_new_GC (GCData data) {
+public long /*int*/ internal_new_GC (GCData data) {
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (type != SWT.BITMAP || memGC != null) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
- int /*long*/ gc;
+ long /*int*/ gc;
if (OS.USE_CAIRO) {
gc = Cairo.cairo_create(surface);
} else {
@@ -1603,8 +1603,8 @@ public int /*long*/ internal_new_GC (GCData data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
- int /*long*/ gc = hDC;
+public void internal_dispose_GC (long /*int*/ hDC, GCData data) {
+ long /*int*/ gc = hDC;
if (OS.USE_CAIRO) {
Cairo.cairo_destroy(gc);
} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java
index a2b8995ec7..2c4cae5667 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java
@@ -40,7 +40,7 @@ public final class Region extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
/**
* Constructs a new empty region.
@@ -79,7 +79,7 @@ public Region(Device device) {
init();
}
-Region(Device device, int /*long*/ handle) {
+Region(Device device, long /*int*/ handle) {
super(device);
this.handle = handle;
}
@@ -109,7 +109,7 @@ public void add (int[] pointArray) {
* with enough points for a polygon.
*/
if (pointArray.length < 6) return;
- int /*long*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE);
+ long /*int*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE);
OS.gdk_region_union(handle, polyRgn);
OS.gdk_region_destroy(polyRgn);
}
@@ -265,7 +265,7 @@ public Rectangle getBounds() {
return new Rectangle(gdkRect.x, gdkRect.y, gdkRect.width, gdkRect.height);
}
-public static Region gtk_new(Device device, int /*long*/ handle) {
+public static Region gtk_new(Device device, long /*int*/ handle) {
return new Region(device, handle);
}
@@ -331,7 +331,7 @@ public void intersect(int x, int y, int width, int height) {
gdkRect.y = y;
gdkRect.width = width;
gdkRect.height = height;
- int /*long*/ rectRgn = OS.gdk_region_rectangle(gdkRect);
+ long /*int*/ rectRgn = OS.gdk_region_rectangle(gdkRect);
OS.gdk_region_intersect(handle, rectRgn);
OS.gdk_region_destroy(rectRgn);
}
@@ -462,7 +462,7 @@ public void subtract (int[] pointArray) {
* with enough points for a polygon.
*/
if (pointArray.length < 6) return;
- int /*long*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE);
+ long /*int*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE);
OS.gdk_region_subtract(handle, polyRgn);
OS.gdk_region_destroy(polyRgn);
}
@@ -515,7 +515,7 @@ public void subtract(int x, int y, int width, int height) {
gdkRect.y = y;
gdkRect.width = width;
gdkRect.height = height;
- int /*long*/ rectRgn = OS.gdk_region_rectangle(gdkRect);
+ long /*int*/ rectRgn = OS.gdk_region_rectangle(gdkRect);
OS.gdk_region_subtract(handle, rectRgn);
OS.gdk_region_destroy(rectRgn);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java
index 67695a3d5d..c61fadbe30 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java
@@ -54,7 +54,7 @@ public final class TextLayout extends Resource {
int[] tabs;
StyleItem[] styles;
int stylesCount;
- int /*long*/ layout, context, attrList, selAttrList;
+ long /*int*/ layout, context, attrList, selAttrList;
int[] invalidOffsets;
static final char LTR_MARK = '\u200E', RTL_MARK = '\u200F', ZWS = '\u200B', ZWNBS = '\uFEFF';
@@ -110,7 +110,7 @@ void computeRuns () {
byte[] buffer = Converter.wcsToMbcs(null, segmentsText, false);
OS.pango_layout_set_text (layout, buffer, buffer.length);
if (stylesCount == 2 && styles[0].style == null && ascent == -1 && descent == -1 && segments == null) return;
- int /*long*/ ptr = OS.pango_layout_get_text(layout);
+ long /*int*/ ptr = OS.pango_layout_get_text(layout);
attrList = OS.pango_attr_list_new();
selAttrList = OS.pango_attr_list_new();
PangoAttribute attribute = new PangoAttribute();
@@ -129,12 +129,12 @@ void computeRuns () {
int oldPos = 0, lineIndex = 0;
PangoLayoutLine line = new PangoLayoutLine();
while (lineIndex < lineCount) {
- int /*long*/ linePtr = OS.pango_layout_get_line(layout, lineIndex);
+ long /*int*/ linePtr = OS.pango_layout_get_line(layout, lineIndex);
OS.memmove(line, linePtr, PangoLayoutLine.sizeof);
int bytePos = line.start_index;
/* Note: The length in bytes of ZWS and ZWNBS are both equals to 3 */
int offset = lineIndex * 6;
- int /*long*/ attr = OS.pango_attr_shape_new (rect, rect);
+ long /*int*/ attr = OS.pango_attr_shape_new (rect, rect);
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = bytePos + offset;
attribute.end_index = bytePos + offset + 3;
@@ -196,7 +196,7 @@ void computeRuns () {
byteEnd = Math.min(byteEnd, strlen);
Font font = style.font;
if (font != null && !font.isDisposed() && !defaultFont.equals(font)) {
- int /*long*/ attr = OS.pango_attr_font_desc_new (font.handle);
+ long /*int*/ attr = OS.pango_attr_font_desc_new (font.handle);
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
@@ -219,7 +219,7 @@ void computeRuns () {
break;
case SWT.UNDERLINE_LINK: {
if (style.foreground == null) {
- int /*long*/ attr = OS.pango_attr_foreground_new((short)0, (short)0x3333, (short)0x9999);
+ long /*int*/ attr = OS.pango_attr_foreground_new((short)0, (short)0x3333, (short)0x9999);
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
@@ -230,7 +230,7 @@ void computeRuns () {
break;
}
}
- int /*long*/ attr = OS.pango_attr_underline_new(underlineStyle);
+ long /*int*/ attr = OS.pango_attr_underline_new(underlineStyle);
OS.memmove(attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
@@ -251,7 +251,7 @@ void computeRuns () {
}
}
if (style.strikeout) {
- int /*long*/ attr = OS.pango_attr_strikethrough_new(true);
+ long /*int*/ attr = OS.pango_attr_strikethrough_new(true);
OS.memmove(attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
@@ -274,7 +274,7 @@ void computeRuns () {
Color foreground = style.foreground;
if (foreground != null && !foreground.isDisposed()) {
GdkColor fg = foreground.handle;
- int /*long*/ attr = OS.pango_attr_foreground_new(fg.red, fg.green, fg.blue);
+ long /*int*/ attr = OS.pango_attr_foreground_new(fg.red, fg.green, fg.blue);
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
@@ -284,7 +284,7 @@ void computeRuns () {
Color background = style.background;
if (background != null && !background.isDisposed()) {
GdkColor bg = background.handle;
- int /*long*/ attr = OS.pango_attr_background_new(bg.red, bg.green, bg.blue);
+ long /*int*/ attr = OS.pango_attr_background_new(bg.red, bg.green, bg.blue);
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
@@ -297,7 +297,7 @@ void computeRuns () {
rect.y = -(metrics.ascent * OS.PANGO_SCALE);
rect.height = (metrics.ascent + metrics.descent) * OS.PANGO_SCALE;
rect.width = metrics.width * OS.PANGO_SCALE;
- int /*long*/ attr = OS.pango_attr_shape_new (rect, rect);
+ long /*int*/ attr = OS.pango_attr_shape_new (rect, rect);
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
@@ -307,7 +307,7 @@ void computeRuns () {
}
int rise = style.rise;
if (rise != 0) {
- int /*long*/ attr = OS.pango_attr_rise_new (rise * OS.PANGO_SCALE);
+ long /*int*/ attr = OS.pango_attr_rise_new (rise * OS.PANGO_SCALE);
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
@@ -436,15 +436,15 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
x += Math.min (indent, wrapIndent);
boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1;
GCData data = gc.data;
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if ((flags & (SWT.FULL_SELECTION | SWT.DELIMITER_SELECTION)) != 0 && (hasSelection || (flags & SWT.LAST_LINE_SELECTION) != 0)) {
- int /*long*/[] attrs = new int /*long*/[1];
+ long /*int*/[] attrs = new long /*int*/[1];
int[] nAttrs = new int[1];
PangoLogAttr logAttr = new PangoLogAttr();
PangoRectangle rect = new PangoRectangle();
int lineCount = OS.pango_layout_get_line_count(layout);
- int /*long*/ ptr = OS.pango_layout_get_text(layout);
- int /*long*/ iter = OS.pango_layout_get_iter(layout);
+ long /*int*/ ptr = OS.pango_layout_get_text(layout);
+ long /*int*/ iter = OS.pango_layout_get_iter(layout);
if (selectionBackground == null) selectionBackground = device.getSystemColor(SWT.COLOR_LIST_SELECTION);
if (cairo != 0) {
Cairo.cairo_save(cairo);
@@ -531,7 +531,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
boolean fullSelection = selectionStart == 0 && selectionEnd == length - 1;
if (fullSelection) {
if (cairo != 0) {
- int /*long*/ ptr = OS.pango_layout_get_text(layout);
+ long /*int*/ ptr = OS.pango_layout_get_text(layout);
if ((data.style & SWT.MIRRORED) != 0) {
Cairo.cairo_save(cairo);
Cairo.cairo_scale(cairo, -1, 1);
@@ -546,7 +546,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
drawBorder(gc, x, y, selectionForeground.handle);
}
} else {
- int /*long*/ ptr = OS.pango_layout_get_text(layout);
+ long /*int*/ ptr = OS.pango_layout_get_text(layout);
int byteSelStart = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, selectionStart) - ptr);
int byteSelEnd = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, selectionEnd + 1) - ptr);
int strlen = OS.strlen(ptr);
@@ -568,7 +568,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
OS.gdk_draw_layout(data.drawable, gc.handle, x, y, layout);
drawBorder(gc, x, y, null);
int[] ranges = new int[]{byteSelStart, byteSelEnd};
- int /*long*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2);
+ long /*int*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2);
if (rgn != 0) {
OS.gdk_gc_set_clip_region(gc.handle, rgn);
OS.gdk_region_destroy(rgn);
@@ -587,7 +587,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelection, GdkColor fg, GdkColor bg) {
GCData data = gc.data;
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
Cairo.cairo_save(cairo);
if (!fullSelection) {
Cairo.cairo_move_to(cairo, x, y);
@@ -595,7 +595,7 @@ void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelectio
drawBorder(gc, x, y, null);
}
int[] ranges = new int[]{start, end};
- int /*long*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2);
+ long /*int*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2);
if (rgn != 0) {
OS.gdk_cairo_region(cairo, rgn);
Cairo.cairo_clip(cairo);
@@ -614,9 +614,9 @@ void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelectio
void drawBorder(GC gc, int x, int y, GdkColor selectionColor) {
GCData data = gc.data;
- int /*long*/ cairo = data.cairo;
- int /*long*/ gdkGC = gc.handle;
- int /*long*/ ptr = OS.pango_layout_get_text(layout);
+ long /*int*/ cairo = data.cairo;
+ long /*int*/ gdkGC = gc.handle;
+ long /*int*/ ptr = OS.pango_layout_get_text(layout);
GdkGCValues gcValues = null;
if (cairo != 0) {
Cairo.cairo_save(cairo);
@@ -636,10 +636,10 @@ void drawBorder(GC gc, int x, int y, GdkColor selectionColor) {
int byteStart = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, start) - ptr);
int byteEnd = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, end + 1) - ptr);
int[] ranges = new int[]{byteStart, byteEnd};
- int /*long*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2);
+ long /*int*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2);
if (rgn != 0) {
int[] nRects = new int[1];
- int /*long*/[] rects = new int /*long*/[1];
+ long /*int*/[] rects = new long /*int*/[1];
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
GdkColor color = null;
@@ -818,14 +818,14 @@ public Rectangle getBounds(int start, int end) {
end = Math.min(Math.max(0, end), length - 1);
start = translateOffset(start);
end = translateOffset(end);
- int /*long*/ ptr = OS.pango_layout_get_text(layout);
+ long /*int*/ ptr = OS.pango_layout_get_text(layout);
int byteStart = (int)/*64*/(OS.g_utf16_offset_to_pointer (ptr, start) - ptr);
int byteEnd = (int)/*64*/(OS.g_utf16_offset_to_pointer (ptr, end + 1) - ptr);
int strlen = OS.strlen(ptr);
byteStart = Math.min(byteStart, strlen);
byteEnd = Math.min(byteEnd, strlen);
int[] ranges = new int[]{byteStart, byteEnd};
- int /*long*/ clipRegion = OS.gdk_pango_layout_get_clip_region(layout, 0, 0, ranges, 1);
+ long /*int*/ clipRegion = OS.gdk_pango_layout_get_clip_region(layout, 0, 0, ranges, 1);
if (clipRegion == 0) return new Rectangle(0, 0, 0, 0);
GdkRectangle rect = new GdkRectangle();
@@ -835,9 +835,9 @@ public Rectangle getBounds(int start, int end) {
* is to subtract these areas from the clip region.
*/
PangoRectangle pangoRect = new PangoRectangle();
- int /*long*/ iter = OS.pango_layout_get_iter(layout);
+ long /*int*/ iter = OS.pango_layout_get_iter(layout);
if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ linesRegion = OS.gdk_region_new();
+ long /*int*/ linesRegion = OS.gdk_region_new();
if (linesRegion == 0) SWT.error(SWT.ERROR_NO_HANDLES);
int lineEnd = 0;
do {
@@ -953,17 +953,17 @@ public int getLevel(int offset) {
int length = text.length();
if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE);
offset = translateOffset(offset);
- int /*long*/ iter = OS.pango_layout_get_iter(layout);
+ long /*int*/ iter = OS.pango_layout_get_iter(layout);
if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);
int level = 0;
PangoItem item = new PangoItem();
PangoLayoutRun run = new PangoLayoutRun();
- int /*long*/ ptr = OS.pango_layout_get_text(layout);
- int /*long*/ byteOffset = OS.g_utf16_offset_to_pointer(ptr, offset) - ptr;
+ long /*int*/ ptr = OS.pango_layout_get_text(layout);
+ long /*int*/ byteOffset = OS.g_utf16_offset_to_pointer(ptr, offset) - ptr;
int strlen = OS.strlen(ptr);
byteOffset = Math.min(byteOffset, strlen);
do {
- int /*long*/ runPtr = OS.pango_layout_iter_get_run(iter);
+ long /*int*/ runPtr = OS.pango_layout_iter_get_run(iter);
if (runPtr != 0) {
OS.memmove(run, runPtr, PangoLayoutRun.sizeof);
OS.memmove(item, run.item, PangoItem.sizeof);
@@ -995,7 +995,7 @@ public Rectangle getLineBounds(int lineIndex) {
computeRuns();
int lineCount = OS.pango_layout_get_line_count(layout);
if (!(0 <= lineIndex && lineIndex < lineCount)) SWT.error(SWT.ERROR_INVALID_RANGE);
- int /*long*/ iter = OS.pango_layout_get_iter(layout);
+ long /*int*/ iter = OS.pango_layout_get_iter(layout);
if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);
for (int i = 0; i < lineIndex; i++) OS.pango_layout_iter_next_line(iter);
PangoRectangle rect = new PangoRectangle();
@@ -1052,11 +1052,11 @@ public int getLineIndex(int offset) {
if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
offset = translateOffset(offset);
int line = 0;
- int /*long*/ ptr = OS.pango_layout_get_text(layout);
- int /*long*/ byteOffset = OS.g_utf16_offset_to_pointer(ptr,offset) - ptr;
+ long /*int*/ ptr = OS.pango_layout_get_text(layout);
+ long /*int*/ byteOffset = OS.g_utf16_offset_to_pointer(ptr,offset) - ptr;
int strlen = OS.strlen(ptr);
byteOffset = Math.min(byteOffset, strlen);
- int /*long*/ iter = OS.pango_layout_get_iter(layout);
+ long /*int*/ iter = OS.pango_layout_get_iter(layout);
if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);
while (OS.pango_layout_iter_next_line(iter)) {
if (OS.pango_layout_iter_get_index(iter) > byteOffset) break;
@@ -1088,9 +1088,9 @@ public FontMetrics getLineMetrics (int lineIndex) {
PangoLayoutLine line = new PangoLayoutLine();
OS.memmove(line, OS.pango_layout_get_line(layout, lineIndex), PangoLayoutLine.sizeof);
if (line.runs == 0) {
- int /*long*/ font = this.font != null ? this.font.handle : device.systemFont.handle;
- int /*long*/ lang = OS.pango_context_get_language(context);
- int /*long*/ metrics = OS.pango_context_get_metrics(context, font, lang);
+ long /*int*/ font = this.font != null ? this.font.handle : device.systemFont.handle;
+ long /*int*/ lang = OS.pango_context_get_language(context);
+ long /*int*/ metrics = OS.pango_context_get_metrics(context, font, lang);
ascent = OS.pango_font_metrics_get_ascent(metrics);
descent = OS.pango_font_metrics_get_descent(metrics);
OS.pango_font_metrics_unref(metrics);
@@ -1121,10 +1121,10 @@ public int[] getLineOffsets() {
computeRuns();
int lineCount = OS.pango_layout_get_line_count(layout);
int[] offsets = new int [lineCount + 1];
- int /*long*/ ptr = OS.pango_layout_get_text(layout);
+ long /*int*/ ptr = OS.pango_layout_get_text(layout);
PangoLayoutLine line = new PangoLayoutLine();
for (int i = 0; i < lineCount; i++) {
- int /*long*/ linePtr = OS.pango_layout_get_line(layout, i);
+ long /*int*/ linePtr = OS.pango_layout_get_line(layout, i);
OS.memmove(line, linePtr, PangoLayoutLine.sizeof);
int pos = (int)/*64*/OS.g_utf16_pointer_to_offset(ptr, ptr + line.start_index);
offsets[i] = untranslateOffset(pos);
@@ -1155,7 +1155,7 @@ public Point getLocation(int offset, boolean trailing) {
int length = text.length();
if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE);
offset = translateOffset(offset);
- int /*long*/ ptr = OS.pango_layout_get_text(layout);
+ long /*int*/ ptr = OS.pango_layout_get_text(layout);
int byteOffset = (int)/*64*/(OS.g_utf16_offset_to_pointer(ptr, offset) - ptr);
int strlen = OS.strlen(ptr);
byteOffset = Math.min(byteOffset, strlen);
@@ -1206,12 +1206,12 @@ int _getOffset (int offset, int movement, boolean forward) {
}
int step = forward ? 1 : -1;
if ((movement & SWT.MOVEMENT_CHAR) != 0) return offset + step;
- int /*long*/[] attrs = new int /*long*/[1];
+ long /*int*/[] attrs = new long /*int*/[1];
int[] nAttrs = new int[1];
OS.pango_layout_get_log_attrs(layout, attrs, nAttrs);
if (attrs[0] == 0) return offset + step;
- int /*long*/ ptr = OS.pango_layout_get_text(layout);
+ long /*int*/ ptr = OS.pango_layout_get_text(layout);
int utf8Offset = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, translateOffset(offset));
int utf8Length = (int)/*64*/OS.g_utf8_strlen(ptr, -1);
utf8Offset += step;
@@ -1329,7 +1329,7 @@ public int getOffset(int x, int y, int[] trailing) {
* visual offset. The fix is to clamp the coordinates inside the
* line bounds.
*/
- int /*long*/ iter = OS.pango_layout_get_iter(layout);
+ long /*int*/ iter = OS.pango_layout_get_iter(layout);
if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);
PangoRectangle rect = new PangoRectangle();
do {
@@ -1349,7 +1349,7 @@ public int getOffset(int x, int y, int[] trailing) {
int[] index = new int[1];
int[] piTrailing = new int[1];
OS.pango_layout_xy_to_index(layout, x * OS.PANGO_SCALE, y * OS.PANGO_SCALE, index, piTrailing);
- int /*long*/ ptr = OS.pango_layout_get_text(layout);
+ long /*int*/ ptr = OS.pango_layout_get_text(layout);
int offset = (int)/*64*/OS.g_utf16_pointer_to_offset(ptr, ptr + index[0]);
if (trailing != null) {
trailing[0] = piTrailing[0];
@@ -2049,7 +2049,7 @@ public void setTabs(int[] tabs) {
if (tabs == null) {
OS.pango_layout_set_tabs(layout, device.emptyTab);
} else {
- int /*long*/ tabArray = OS.pango_tab_array_new(tabs.length, true);
+ long /*int*/ tabArray = OS.pango_tab_array_new(tabs.length, true);
if (tabArray != 0) {
for (int i = 0; i < tabs.length; i++) {
OS.pango_tab_array_set_tab(tabArray, i, OS.PANGO_TAB_LEFT, tabs[i]);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/Converter.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/Converter.java
index 779baed6f8..717965f98a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/Converter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/Converter.java
@@ -37,8 +37,8 @@ public static String defaultCodePage () {
}
public static char [] mbcsToWcs (String codePage, byte [] buffer) {
- int /*long*/ [] items_written = new int /*long*/ [1];
- int /*long*/ ptr = OS.g_utf8_to_utf16 (buffer, buffer.length, null, items_written, null);
+ long /*int*/ [] items_written = new long /*int*/ [1];
+ long /*int*/ ptr = OS.g_utf8_to_utf16 (buffer, buffer.length, null, items_written, null);
if (ptr == 0) return EmptyCharArray;
int length = (int)/*64*/items_written [0];
char [] chars = new char [length];
@@ -55,12 +55,12 @@ public static byte [] wcsToMbcs (String codePage, String string, boolean termina
}
public static byte [] wcsToMbcs (String codePage, char [] buffer, boolean terminate) {
- int /*long*/ [] items_read = new int /*long*/ [1], items_written = new int /*long*/ [1];
+ long /*int*/ [] items_read = new long /*int*/ [1], items_written = new long /*int*/ [1];
/*
* Note that g_utf16_to_utf8() stops converting
* when it finds the first NULL.
*/
- int /*long*/ ptr = OS.g_utf16_to_utf8 (buffer, buffer.length, items_read, items_written, null);
+ long /*int*/ ptr = OS.g_utf16_to_utf8 (buffer, buffer.length, items_read, items_written, null);
if (ptr == 0) return terminate ? NullByteArray : EmptyByteArray;
int written = (int)/*64*/items_written [0];
byte [] bytes = new byte [written + (terminate ? 1 : 0)];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/ImageList.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/ImageList.java
index 0a57b144e1..39d0c33ae9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/ImageList.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/ImageList.java
@@ -17,24 +17,24 @@ import org.eclipse.swt.internal.gtk.*;
import org.eclipse.swt.graphics.*;
public class ImageList {
- int /*long*/ [] pixbufs;
+ long /*int*/ [] pixbufs;
int width = -1, height = -1;
Image [] images;
public ImageList() {
images = new Image [4];
- pixbufs = new int /*long*/ [4];
+ pixbufs = new long /*int*/ [4];
}
-public static int /*long*/ convertSurface(Image image) {
- int /*long*/ newSurface = image.surface;
+public static long /*int*/ convertSurface(Image image) {
+ long /*int*/ newSurface = image.surface;
int type = Cairo.cairo_surface_get_type(newSurface);
if (type != Cairo.CAIRO_SURFACE_TYPE_IMAGE) {
Rectangle bounds = image.getBounds();
int format = Cairo.cairo_surface_get_content(newSurface) == Cairo.CAIRO_CONTENT_COLOR ? Cairo.CAIRO_FORMAT_RGB24 : Cairo.CAIRO_FORMAT_ARGB32;
newSurface = Cairo.cairo_image_surface_create(format, bounds.width, bounds.height);
if (newSurface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ cairo = Cairo.cairo_create(newSurface);
+ long /*int*/ cairo = Cairo.cairo_create(newSurface);
if (cairo == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_set_operator(cairo, Cairo.CAIRO_OPERATOR_SOURCE);
Cairo.cairo_set_source_surface (cairo, image.surface, 0, 0);
@@ -46,10 +46,10 @@ public static int /*long*/ convertSurface(Image image) {
return newSurface;
}
-public static int /*long*/ createPixbuf(Image image) {
- int /*long*/ pixbuf;
+public static long /*int*/ createPixbuf(Image image) {
+ long /*int*/ pixbuf;
if (OS.USE_CAIRO) {
- int /*long*/ surface = convertSurface(image);
+ long /*int*/ surface = convertSurface(image);
int format = Cairo.cairo_image_surface_get_format(surface);
int width = Cairo.cairo_image_surface_get_width(surface);
int height = Cairo.cairo_image_surface_get_height(surface);
@@ -57,7 +57,7 @@ public static int /*long*/ createPixbuf(Image image) {
pixbuf = OS.gdk_pixbuf_new (OS.GDK_COLORSPACE_RGB, hasAlpha, 8, width, height);
if (pixbuf == 0) SWT.error (SWT.ERROR_NO_HANDLES);
int stride = OS.gdk_pixbuf_get_rowstride (pixbuf);
- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels (pixbuf);
+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels (pixbuf);
int oa, or, og, ob;
if (OS.BIG_ENDIAN) {
oa = 0; or = 1; og = 2; ob = 3;
@@ -65,7 +65,7 @@ public static int /*long*/ createPixbuf(Image image) {
oa = 3; or = 2; og = 1; ob = 0;
}
byte[] line = new byte[stride];
- int /*long*/ surfaceData = Cairo.cairo_image_surface_get_data(surface);
+ long /*int*/ surfaceData = Cairo.cairo_image_surface_get_data(surface);
if (hasAlpha) {
for (int y = 0; y < height; y++) {
OS.memmove (line, surfaceData + (y * stride), stride);
@@ -107,25 +107,25 @@ public static int /*long*/ createPixbuf(Image image) {
} else {
OS.gdk_drawable_get_size (image.pixmap, w, h);
}
- int /*long*/ colormap = OS.gdk_colormap_get_system ();
+ long /*int*/ colormap = OS.gdk_colormap_get_system ();
boolean hasMask = image.mask != 0 && OS.gdk_drawable_get_depth (image.mask) == 1;
if (hasMask) {
pixbuf = OS.gdk_pixbuf_new (OS.GDK_COLORSPACE_RGB, true, 8, w [0], h [0]);
if (pixbuf == 0) SWT.error (SWT.ERROR_NO_HANDLES);
OS.gdk_pixbuf_get_from_drawable (pixbuf, image.pixmap, colormap, 0, 0, 0, 0, w [0], h [0]);
- int /*long*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, w [0], h [0]);
+ long /*int*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, w [0], h [0]);
if (maskPixbuf == 0) SWT.error (SWT.ERROR_NO_HANDLES);
OS.gdk_pixbuf_get_from_drawable(maskPixbuf, image.mask, 0, 0, 0, 0, 0, w [0], h [0]);
int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf);
byte[] line = new byte[stride];
int maskStride = OS.gdk_pixbuf_get_rowstride(maskPixbuf);
- int /*long*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf);
+ long /*int*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf);
byte[] maskLine = new byte[maskStride];
for (int y=0; y= OS.VERSION (2, 18, 0)) {
@@ -506,8 +506,8 @@ int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ result = super.gtk_focus_out_event (widget, event);
+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ result = super.gtk_focus_out_event (widget, event);
// widget could be disposed at this point
if (handle == 0) return 0;
if ((style & SWT.PUSH) != 0) {
@@ -519,8 +519,8 @@ int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ result = super.gtk_key_press_event (widget, event);
+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ result = super.gtk_key_press_event (widget, event);
if (result != 0) return result;
if ((style & SWT.RADIO) != 0) selected = getSelection ();
return result;
@@ -756,7 +756,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
gtk_widget_get_allocation (boxHandle, allocation);
int boxWidth = allocation.width;
int boxHeight = allocation.height;
- int /*long*/ labelLayout = OS.gtk_label_get_layout (labelHandle);
+ long /*int*/ labelLayout = OS.gtk_label_get_layout (labelHandle);
int pangoWidth = OS.pango_layout_get_width (labelLayout);
OS.pango_layout_set_width (labelLayout, -1);
int [] w = new int [1], h = new int [1];
@@ -785,7 +785,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
return result;
}
-void setFontDescription (int /*long*/ font) {
+void setFontDescription (long /*int*/ font) {
super.setFontDescription (font);
if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);
if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font);
@@ -860,7 +860,7 @@ public void setImage (Image image) {
if (image.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
imageList = new ImageList ();
int imageIndex = imageList.add (image);
- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);
+ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
if (text.length () == 0) OS.gtk_widget_hide (labelHandle);
OS.gtk_widget_show (imageHandle);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java
index 9ebbe8e7e9..f45d8438fd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Canvas.java
@@ -144,46 +144,46 @@ public IME getIME () {
return ime;
}
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
if (ime != null) {
- int /*long*/ result = ime.gtk_button_press_event (widget, event);
+ long /*int*/ result = ime.gtk_button_press_event (widget, event);
if (result != 0) return result;
}
return super.gtk_button_press_event (widget, event);
}
-int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ text) {
+long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ text) {
if (ime != null) {
- int /*long*/ result = ime.gtk_commit (imcontext, text);
+ long /*int*/ result = ime.gtk_commit (imcontext, text);
if (result != 0) return result;
}
return super.gtk_commit (imcontext, text);
}
-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ event) {
if ((state & OBSCURED) != 0) return 0;
boolean isFocus = caret != null && caret.isFocusCaret ();
if (isFocus) caret.killFocus ();
- int /*long*/ result = super.gtk_expose_event (widget, event);
+ long /*int*/ result = super.gtk_expose_event (widget, event);
if (isFocus) caret.setFocus ();
return result;
}
-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ result = super.gtk_focus_in_event (widget, event);
+long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ result = super.gtk_focus_in_event (widget, event);
if (caret != null) caret.setFocus ();
return result;
}
-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ result = super.gtk_focus_out_event (widget, event);
+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ result = super.gtk_focus_out_event (widget, event);
if (caret != null) caret.killFocus ();
return result;
}
-int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) {
+long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) {
if (ime != null) {
- int /*long*/ result = ime.gtk_preedit_changed (imcontext);
+ long /*int*/ result = ime.gtk_preedit_changed (imcontext);
if (result != 0) return result;
}
return super.gtk_preedit_changed (imcontext);
@@ -249,16 +249,16 @@ public void scroll (int destX, int destY, int x, int y, int width, int height, b
if (!isVisible ()) return;
boolean isFocus = caret != null && caret.isFocusCaret ();
if (isFocus) caret.killFocus ();
- int /*long*/ window = paintWindow ();
- int /*long*/ visibleRegion = OS.gdk_drawable_get_visible_region (window);
+ long /*int*/ window = paintWindow ();
+ long /*int*/ visibleRegion = OS.gdk_drawable_get_visible_region (window);
GdkRectangle srcRect = new GdkRectangle ();
srcRect.x = x;
srcRect.y = y;
srcRect.width = width;
srcRect.height = height;
- int /*long*/ copyRegion = OS.gdk_region_rectangle (srcRect);
+ long /*int*/ copyRegion = OS.gdk_region_rectangle (srcRect);
OS.gdk_region_intersect(copyRegion, visibleRegion);
- int /*long*/ invalidateRegion = OS.gdk_region_rectangle (srcRect);
+ long /*int*/ invalidateRegion = OS.gdk_region_rectangle (srcRect);
OS.gdk_region_subtract (invalidateRegion, visibleRegion);
OS.gdk_region_offset (invalidateRegion, deltaX, deltaY);
GdkRectangle copyRect = new GdkRectangle();
@@ -276,7 +276,7 @@ public void scroll (int destX, int destY, int x, int y, int width, int height, b
// gc.copyArea (x, y, width, height, destX, destY);
// gc.dispose ();
//TODO: Use Cairo
- int /*long*/ gdkGC = OS.gdk_gc_new (window);
+ long /*int*/ gdkGC = OS.gdk_gc_new (window);
OS.gdk_gc_set_exposures (gdkGC, true);
OS.gdk_draw_drawable (window, gdkGC, window, copyRect.x, copyRect.y, copyRect.x + deltaX, copyRect.y + deltaY, copyRect.width, copyRect.height);
OS.g_object_unref (gdkGC);
@@ -398,7 +398,7 @@ public void setIME (IME ime) {
}
void updateCaret () {
- int /*long*/ imHandle = imHandle ();
+ long /*int*/ imHandle = imHandle ();
if (imHandle == 0) return;
GdkRectangle rect = new GdkRectangle ();
rect.x = caret.x;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Caret.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Caret.java
index 8292ab796d..16f95662b2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Caret.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Caret.java
@@ -97,14 +97,14 @@ void createWidget (int index) {
boolean drawCaret () {
if (parent == null) return false;
if (parent.isDisposed ()) return false;
- int /*long*/ window = parent.paintWindow ();
+ long /*int*/ window = parent.paintWindow ();
if (OS.USE_CAIRO) {
- int /*long*/ cairo = OS.gdk_cairo_create(window);
+ long /*int*/ cairo = OS.gdk_cairo_create(window);
if (cairo == 0) error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_set_source_rgb(cairo, 1, 1, 1);
Cairo.cairo_set_operator(cairo, Cairo.CAIRO_OPERATOR_DIFFERENCE);
if (image != null && !image.isDisposed() && image.mask == 0) {
- int /*long*/ surface = Cairo.cairo_get_target(cairo);
+ long /*int*/ surface = Cairo.cairo_get_target(cairo);
int nWidth = 0;
switch (Cairo.cairo_surface_get_type(surface)) {
case Cairo.CAIRO_SURFACE_TYPE_IMAGE:
@@ -130,12 +130,12 @@ boolean drawCaret () {
Cairo.cairo_destroy(cairo);
return true;
}
- int /*long*/ gc = OS.gdk_gc_new (window);
+ long /*int*/ gc = OS.gdk_gc_new (window);
GdkColor color = new GdkColor ();
color.red = (short) 0xffff;
color.green = (short) 0xffff;
color.blue = (short) 0xffff;
- int /*long*/ colormap = OS.gdk_colormap_get_system ();
+ long /*int*/ colormap = OS.gdk_colormap_get_system ();
OS.gdk_colormap_alloc_color (colormap, color, true, true);
OS.gdk_gc_set_foreground (gc, color);
OS.gdk_gc_set_function (gc, OS.GDK_XOR);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java
index aab32855cd..dea297df44 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ColorDialog.java
@@ -126,19 +126,19 @@ public RGB[] getRGBs() {
*/
public RGB open () {
byte [] buffer = Converter.wcsToMbcs (null, title, true);
- int /*long*/ handle = OS.gtk_color_selection_dialog_new (buffer);
+ long /*int*/ handle = OS.gtk_color_selection_dialog_new (buffer);
Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
if (parent != null) {
- int /*long*/ shellHandle = parent.topHandle ();
+ long /*int*/ shellHandle = parent.topHandle ();
OS.gtk_window_set_transient_for (handle, shellHandle);
- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
+ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
}
}
if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
- int /*long*/ group = OS.gtk_window_get_group(0);
+ long /*int*/ group = OS.gtk_window_get_group(0);
OS.gtk_window_group_add_window (group, handle);
}
OS.gtk_window_set_modal (handle, true);
@@ -153,7 +153,7 @@ public RGB open () {
}
OS.gtk_color_selection_set_has_palette (dialog.colorsel, true);
if (rgbs != null) {
- int /*long*/ colors = OS.g_malloc(GdkColor.sizeof * rgbs.length);
+ long /*int*/ colors = OS.g_malloc(GdkColor.sizeof * rgbs.length);
for (int i=0; i> 8) & 0xFF;
rgb = new RGB (red, green, blue);
}
- int /*long*/ settings = OS.gtk_settings_get_default ();
+ long /*int*/ settings = OS.gtk_settings_get_default ();
if (settings != 0) {
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
OS.g_object_get (settings, OS.gtk_color_palette, ptr, 0);
if (ptr [0] != 0) {
int length = OS.strlen (ptr [0]);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
index a0fcb98f99..d135c476a0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
@@ -57,9 +57,9 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Combo extends Composite {
- int /*long*/ buttonHandle, entryHandle, textRenderer, cellHandle, popupHandle, menuHandle;
+ long /*int*/ buttonHandle, entryHandle, textRenderer, cellHandle, popupHandle, menuHandle;
int lastEventTime, visibleCount = 10;
- int /*long*/ gdkEventKey = 0;
+ long /*int*/ gdkEventKey = 0;
int fixStart = -1, fixEnd = -1;
String [] items = new String [0];
boolean selectionAdded;
@@ -323,9 +323,9 @@ void clearText () {
if ((style & SWT.READ_ONLY) != 0) {
int index = OS.gtk_combo_box_get_active (handle);
if (index != -1) {
- int /*long*/ modelHandle = OS.gtk_combo_box_get_model (handle);
- int /*long*/ [] ptr = new int /*long*/ [1];
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ modelHandle = OS.gtk_combo_box_get_model (handle);
+ long /*int*/ [] ptr = new long /*int*/ [1];
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
OS.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);
OS.g_free (iter);
@@ -348,10 +348,10 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
int[] w = new int [1], h = new int [1];
OS.gtk_widget_realize (entryHandle);
- int /*long*/ layout = OS.gtk_entry_get_layout (entryHandle);
+ long /*int*/ layout = OS.gtk_entry_get_layout (entryHandle);
OS.pango_layout_get_size (layout, w, h);
int xborder = Display.INNER_BORDER, yborder = Display.INNER_BORDER;
- int /*long*/ style = OS.gtk_widget_get_style (entryHandle);
+ long /*int*/ style = OS.gtk_widget_get_style (entryHandle);
xborder += OS.gtk_style_get_xthickness (style);
yborder += OS.gtk_style_get_ythickness (style);
int [] property = new int [1];
@@ -366,7 +366,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
GtkRequisition arrowRequesition = new GtkRequisition ();
OS.gtk_widget_size_request (buttonHandle, arrowRequesition);
GtkRequisition listRequesition = new GtkRequisition ();
- int /*long*/ listParent = OS.gtk_bin_get_child(popupHandle);
+ long /*int*/ listParent = OS.gtk_bin_get_child(popupHandle);
OS.gtk_widget_size_request (listParent, listRequesition);
width = Math.max (listRequesition.width, width) + arrowRequesition.width;
width = wHint == SWT.DEFAULT ? width : wHint;
@@ -397,7 +397,7 @@ void createHandle (int index) {
fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
gtk_widget_set_has_window (fixedHandle, true);
- int /*long*/ oldList = OS.gtk_window_list_toplevels ();
+ long /*int*/ oldList = OS.gtk_window_list_toplevels ();
if ((style & SWT.READ_ONLY) != 0) {
handle = OS.gtk_combo_box_new_text ();
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -481,15 +481,15 @@ void deregister () {
if (entryHandle != 0) display.removeWidget (entryHandle);
if (popupHandle != 0) display.removeWidget (popupHandle);
if (menuHandle != 0) display.removeWidget (menuHandle);
- int /*long*/ imContext = imContext ();
+ long /*int*/ imContext = imContext ();
if (imContext != 0) display.removeWidget (imContext);
}
-boolean filterKey (int keyval, int /*long*/ event) {
+boolean filterKey (int keyval, long /*int*/ event) {
int time = OS.gdk_event_get_time (event);
if (time != lastEventTime) {
lastEventTime = time;
- int /*long*/ imContext = imContext ();
+ long /*int*/ imContext = imContext ();
if (imContext != 0) {
return OS.gtk_im_context_filter_keypress (imContext, event);
}
@@ -498,18 +498,18 @@ boolean filterKey (int keyval, int /*long*/ event) {
return false;
}
-int /*long*/ findPopupHandle (int /*long*/ oldList) {
- int /*long*/ result = 0;
- int /*long*/ currentList = OS.gtk_window_list_toplevels();
- int /*long*/ oldFromList = oldList;
- int /*long*/ newFromList = OS.g_list_last(currentList);
+long /*int*/ findPopupHandle (long /*int*/ oldList) {
+ long /*int*/ result = 0;
+ long /*int*/ currentList = OS.gtk_window_list_toplevels();
+ long /*int*/ oldFromList = oldList;
+ long /*int*/ newFromList = OS.g_list_last(currentList);
boolean isFound;
while (newFromList != 0) {
- int /*long*/ newToplevel = OS.g_list_data(newFromList);
+ long /*int*/ newToplevel = OS.g_list_data(newFromList);
isFound = false;
oldFromList = oldList;
while (oldFromList != 0) {
- int /*long*/ oldToplevel = OS.g_list_data(oldFromList);
+ long /*int*/ oldToplevel = OS.g_list_data(oldFromList);
if (newToplevel == oldToplevel) {
isFound = true;
break;
@@ -527,7 +527,7 @@ int /*long*/ findPopupHandle (int /*long*/ oldList) {
return result;
}
-int /*long*/ findButtonHandle() {
+long /*int*/ findButtonHandle() {
/*
* Feature in GTK. There is no API to query the button
* handle from a combo box although it is possible to get the
@@ -535,12 +535,12 @@ int /*long*/ findButtonHandle() {
* fix is to walk the combo tree and find the first child that is
* an instance of button.
*/
- int /*long*/ result = 0;
+ long /*int*/ result = 0;
OS.gtk_container_forall (handle, display.allChildrenProc, 0);
if (display.allChildren != 0) {
- int /*long*/ list = display.allChildren;
+ long /*int*/ list = display.allChildren;
while (list != 0) {
- int /*long*/ widget = OS.g_list_data (list);
+ long /*int*/ widget = OS.g_list_data (list);
if (OS.GTK_IS_BUTTON (widget)) {
result = widget;
break;
@@ -552,14 +552,14 @@ int /*long*/ findButtonHandle() {
return result;
}
-int /*long*/ findMenuHandle() {
+long /*int*/ findMenuHandle() {
if (popupHandle == 0) return 0;
- int /*long*/ result = 0;
+ long /*int*/ result = 0;
OS.gtk_container_forall (popupHandle, display.allChildrenProc, 0);
if (display.allChildren != 0) {
- int /*long*/ list = display.allChildren;
+ long /*int*/ list = display.allChildren;
while (list != 0) {
- int /*long*/ widget = OS.g_list_data (list);
+ long /*int*/ widget = OS.g_list_data (list);
if (OS.G_OBJECT_TYPE (widget) == OS.GTK_TYPE_MENU ()) {
result = widget;
break;
@@ -572,7 +572,7 @@ int /*long*/ findMenuHandle() {
return result;
}
-void fixModal (int /*long*/ group, int /*long*/ modalGroup) {
+void fixModal (long /*int*/ group, long /*int*/ modalGroup) {
if (popupHandle != 0) {
if (group != 0) {
OS.gtk_window_group_add_window (group, popupHandle);
@@ -594,7 +594,7 @@ void fixIM () {
* filter has to be called by SWT.
*/
if (gdkEventKey != 0 && gdkEventKey != -1) {
- int /*long*/ imContext = imContext ();
+ long /*int*/ imContext = imContext ();
if (imContext != 0) {
OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);
gdkEventKey = -1;
@@ -604,12 +604,12 @@ void fixIM () {
gdkEventKey = 0;
}
-int /*long*/ fontHandle () {
+long /*int*/ fontHandle () {
if (entryHandle != 0) return entryHandle;
return super.fontHandle ();
}
-int /*long*/ focusHandle () {
+long /*int*/ focusHandle () {
if (entryHandle != 0) return entryHandle;
return super.focusHandle ();
}
@@ -632,9 +632,9 @@ void hookEvents () {
OS.g_signal_connect_closure (entryHandle, OS.populate_popup, display.closures [POPULATE_POPUP], false);
}
- hookEvents(new int /*long*/ [] {buttonHandle, entryHandle, menuHandle});
+ hookEvents(new long /*int*/ [] {buttonHandle, entryHandle, menuHandle});
- int /*long*/ imContext = imContext ();
+ long /*int*/ imContext = imContext ();
if (imContext != 0) {
OS.g_signal_connect_closure (imContext, OS.commit, display.closures [COMMIT], false);
int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());
@@ -643,10 +643,10 @@ void hookEvents () {
}
}
-void hookEvents(int /*long*/ [] handles) {
+void hookEvents(long /*int*/ [] handles) {
int eventMask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_PRESS_MASK | OS.GDK_BUTTON_RELEASE_MASK;
for (int i=0; iSample code and further information
*/
public class Composite extends Scrollable {
- public int /*long*/ embeddedHandle;
- int /*long*/ imHandle, socketHandle;
+ public long /*int*/ embeddedHandle;
+ long /*int*/ imHandle, socketHandle;
Layout layout;
Control[] tabList;
int layoutCount, backgroundMode;
@@ -104,15 +104,15 @@ static int checkStyle (int style) {
}
Control [] _getChildren () {
- int /*long*/ parentHandle = parentingHandle ();
- int /*long*/ list = OS.gtk_container_get_children (parentHandle);
+ long /*int*/ parentHandle = parentingHandle ();
+ long /*int*/ list = OS.gtk_container_get_children (parentHandle);
if (list == 0) return new Control [0];
int count = OS.g_list_length (list);
Control [] children = new Control [count];
int i = 0;
- int /*long*/ temp = list;
+ long /*int*/ temp = list;
while (temp != 0) {
- int /*long*/ handle = OS.g_list_data (temp);
+ long /*int*/ handle = OS.g_list_data (temp);
if (handle != 0) {
Widget widget = display.getWidget (handle);
if (widget != null && widget != this) {
@@ -206,7 +206,7 @@ protected void checkSubclass () {
/* Do nothing - Subclassing is allowed */
}
-int /*long*/ childStyle () {
+long /*int*/ childStyle () {
if (scrolledHandle != 0) return 0;
return super.childStyle ();
}
@@ -267,9 +267,9 @@ void createHandle (int index, boolean fixed, boolean scrolled) {
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
gtk_widget_set_has_window (fixedHandle, true);
}
- int /*long*/ vadj = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);
+ long /*int*/ vadj = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);
if (vadj == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ hadj = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);
+ long /*int*/ hadj = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);
if (hadj == 0) error (SWT.ERROR_NO_HANDLES);
scrolledHandle = OS.gtk_scrolled_window_new (hadj, vadj);
if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -367,7 +367,7 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs
Control control = findBackgroundControl ();
if (control != null) {
GCData data = gc.getGCData ();
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
Cairo.cairo_save (cairo);
if (control.backgroundImage != null) {
@@ -375,12 +375,12 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs
Cairo.cairo_translate (cairo, -pt.x - offsetX, -pt.y - offsetY);
x += pt.x + offsetX;
y += pt.y + offsetY;
- int /*long*/ surface = control.backgroundImage.surface;
+ long /*int*/ surface = control.backgroundImage.surface;
if (surface == 0) {
- int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
- int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual (OS.gdk_visual_get_system());
- int /*long*/ drawable = control.backgroundImage.pixmap;
- int /*long*/ xDrawable = OS.GDK_PIXMAP_XID (drawable);
+ long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
+ long /*int*/ xVisual = OS.gdk_x11_visual_get_xvisual (OS.gdk_visual_get_system());
+ long /*int*/ drawable = control.backgroundImage.pixmap;
+ long /*int*/ xDrawable = OS.GDK_PIXMAP_XID (drawable);
int [] w = new int [1], h = new int [1];
gdk_pixmap_get_size (drawable, w, h);
surface = Cairo.cairo_xlib_surface_create (xDisplay, xDrawable, xVisual, w [0], h [0]);
@@ -388,7 +388,7 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs
} else {
Cairo.cairo_surface_reference(surface);
}
- int /*long*/ pattern = Cairo.cairo_pattern_create_for_surface (surface);
+ long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface (surface);
if (pattern == 0) error (SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_set_extend (pattern, Cairo.CAIRO_EXTEND_REPEAT);
if ((data.style & SWT.MIRRORED) != 0) {
@@ -406,7 +406,7 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs
Cairo.cairo_fill (cairo);
Cairo.cairo_restore (cairo);
} else {
- int /*long*/ gdkGC = gc.handle;
+ long /*int*/ gdkGC = gc.handle;
GdkGCValues values = new GdkGCValues ();
OS.gdk_gc_get_values (gdkGC, values);
if (control.backgroundImage != null) {
@@ -464,7 +464,7 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De
}
}
-void fixModal(int /*long*/ group, int /*long*/ modalGroup) {
+void fixModal(long /*int*/ group, long /*int*/ modalGroup) {
Control[] controls = _getChildren ();
for (int i = 0; i < controls.length; i++) {
controls[i].fixModal (group, modalGroup);
@@ -503,15 +503,15 @@ void fixTabList (Control control) {
void fixZOrder () {
if ((state & CANVAS) != 0) return;
- int /*long*/ parentHandle = parentingHandle ();
- int /*long*/ parentWindow = gtk_widget_get_window (parentHandle);
+ long /*int*/ parentHandle = parentingHandle ();
+ long /*int*/ parentWindow = gtk_widget_get_window (parentHandle);
if (parentWindow == 0) return;
- int /*long*/ [] userData = new int /*long*/ [1];
- int /*long*/ windowList = OS.gdk_window_get_children (parentWindow);
+ long /*int*/ [] userData = new long /*int*/ [1];
+ long /*int*/ windowList = OS.gdk_window_get_children (parentWindow);
if (windowList != 0) {
- int /*long*/ windows = windowList;
+ long /*int*/ windows = windowList;
while (windows != 0) {
- int /*long*/ window = OS.g_list_data (windows);
+ long /*int*/ window = OS.g_list_data (windows);
if (window != redrawWindow) {
OS.gdk_window_get_user_data (window, userData);
if (userData [0] == 0 || OS.G_OBJECT_TYPE (userData [0]) != display.gtk_fixed_get_type ()) {
@@ -524,12 +524,12 @@ void fixZOrder () {
}
}
-int /*long*/ focusHandle () {
+long /*int*/ focusHandle () {
if (socketHandle != 0) return socketHandle;
return super.focusHandle ();
}
-boolean forceFocus (int /*long*/ focusHandle) {
+boolean forceFocus (long /*int*/ focusHandle) {
if (socketHandle != 0) gtk_widget_set_can_focus (focusHandle, true);
boolean result = super.forceFocus (focusHandle);
if (socketHandle != 0) gtk_widget_set_can_focus (focusHandle, false);
@@ -590,7 +590,7 @@ int getChildrenCount () {
* NOTE: The current implementation will count
* non-registered children.
*/
- int /*long*/ list = OS.gtk_container_get_children (handle);
+ long /*int*/ list = OS.gtk_container_get_children (handle);
if (list == 0) return 0;
int count = OS.g_list_length (list);
OS.g_list_free (list);
@@ -604,7 +604,7 @@ public Rectangle getClientArea () {
return new Rectangle (0, 0, 0, 0);
}
forceResize ();
- int /*long*/ clientHandle = clientHandle ();
+ long /*int*/ clientHandle = clientHandle ();
GtkAllocation allocation = new GtkAllocation();
gtk_widget_get_allocation (clientHandle, allocation);
int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width;
@@ -690,8 +690,8 @@ public Control [] getTabList () {
return tabList;
}
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ result = super.gtk_button_press_event (widget, event);
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ result = super.gtk_button_press_event (widget, event);
if (result != 0) return result;
if ((state & CANVAS) != 0) {
if ((style & SWT.NO_FOCUS) == 0 && hooksKeys ()) {
@@ -705,7 +705,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) {
if ((state & OBSCURED) != 0) return 0;
if ((state & CANVAS) == 0) {
return super.gtk_expose_event (widget, eventPtr);
@@ -716,7 +716,7 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return 0;
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove(gdkEvent, eventPtr, GdkEventExpose.sizeof);
- int /*long*/ [] rectangles = new int /*long*/ [1];
+ long /*int*/ [] rectangles = new long /*int*/ [1];
int [] n_rectangles = new int [1];
OS.gdk_region_get_rectangles (gdkEvent.region, rectangles, n_rectangles);
GdkRectangle rect = new GdkRectangle ();
@@ -728,7 +728,7 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
event.width = rect.width;
event.height = rect.height;
if ((style & SWT.MIRRORED) != 0) event.x = getClientWidth () - event.width - event.x;
- int /*long*/ damageRgn = OS.gdk_region_new ();
+ long /*int*/ damageRgn = OS.gdk_region_new ();
OS.gdk_region_union_with_rect (damageRgn, rect);
GCData data = new GCData ();
data.damageRgn = damageRgn;
@@ -742,8 +742,8 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
return 0;
}
-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ result = super.gtk_key_press_event (widget, event);
+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ result = super.gtk_key_press_event (widget, event);
if (result != 0) return result;
/*
* Feature in GTK. The default behavior when the return key
@@ -763,30 +763,30 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
-int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ directionType) {
+long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) {
if (widget == socketHandle) return 0;
return super.gtk_focus (widget, directionType);
}
-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ result = super.gtk_focus_in_event (widget, event);
+long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ result = super.gtk_focus_in_event (widget, event);
return (state & CANVAS) != 0 ? 1 : result;
}
-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ result = super.gtk_focus_out_event (widget, event);
+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ result = super.gtk_focus_out_event (widget, event);
return (state & CANVAS) != 0 ? 1 : result;
}
-int /*long*/ gtk_map (int /*long*/ widget) {
+long /*int*/ gtk_map (long /*int*/ widget) {
fixZOrder ();
return 0;
}
-int /*long*/ gtk_realize (int /*long*/ widget) {
- int /*long*/ result = super.gtk_realize (widget);
+long /*int*/ gtk_realize (long /*int*/ widget) {
+ long /*int*/ result = super.gtk_realize (widget);
if ((style & SWT.NO_BACKGROUND) != 0) {
- int /*long*/ window = gtk_widget_get_window (paintHandle ());
+ long /*int*/ window = gtk_widget_get_window (paintHandle ());
if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, false);
}
if (socketHandle != 0) {
@@ -795,16 +795,16 @@ int /*long*/ gtk_realize (int /*long*/ widget) {
return result;
}
-int /*long*/ gtk_scroll_child (int /*long*/ widget, int /*long*/ scrollType, int /*long*/ horizontal) {
+long /*int*/ gtk_scroll_child (long /*int*/ widget, long /*int*/ scrollType, long /*int*/ horizontal) {
/* Stop GTK scroll child signal for canvas */
OS.g_signal_stop_emission_by_name (widget, OS.scroll_child);
return 1;
}
-int /*long*/ gtk_style_set (int /*long*/ widget, int /*long*/ previousStyle) {
- int /*long*/ result = super.gtk_style_set (widget, previousStyle);
+long /*int*/ gtk_style_set (long /*int*/ widget, long /*int*/ previousStyle) {
+ long /*int*/ result = super.gtk_style_set (widget, previousStyle);
if ((style & SWT.NO_BACKGROUND) != 0) {
- int /*long*/ window = gtk_widget_get_window (paintHandle ());
+ long /*int*/ window = gtk_widget_get_window (paintHandle ());
if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, false);
}
return result;
@@ -828,7 +828,7 @@ boolean hooksKeys () {
return hooks (SWT.KeyDown) || hooks (SWT.KeyUp);
}
-int /*long*/ imHandle () {
+long /*int*/ imHandle () {
return imHandle;
}
@@ -1123,16 +1123,16 @@ void markLayout (boolean changed, boolean all) {
}
}
-void moveAbove (int /*long*/ child, int /*long*/ sibling) {
+void moveAbove (long /*int*/ child, long /*int*/ sibling) {
if (child == sibling) return;
- int /*long*/ parentHandle = parentingHandle ();
+ long /*int*/ parentHandle = parentingHandle ();
GtkFixed fixed = new GtkFixed ();
OS.memmove (fixed, parentHandle);
- int /*long*/ children = fixed.children;
+ long /*int*/ children = fixed.children;
if (children == 0) return;
- int /*long*/ [] data = new int /*long*/ [1];
- int /*long*/ [] widget = new int /*long*/ [1];
- int /*long*/ childData = 0, childLink = 0, siblingLink = 0, temp = children;
+ long /*int*/ [] data = new long /*int*/ [1];
+ long /*int*/ [] widget = new long /*int*/ [1];
+ long /*int*/ childData = 0, childLink = 0, siblingLink = 0, temp = children;
while (temp != 0) {
OS.memmove (data, temp, OS.PTR_SIZEOF);
OS.memmove (widget, data [0], OS.PTR_SIZEOF);
@@ -1160,20 +1160,20 @@ void moveAbove (int /*long*/ child, int /*long*/ sibling) {
OS.memmove (parentHandle, fixed);
}
-void moveBelow (int /*long*/ child, int /*long*/ sibling) {
+void moveBelow (long /*int*/ child, long /*int*/ sibling) {
if (child == sibling) return;
- int /*long*/ parentHandle = parentingHandle ();
+ long /*int*/ parentHandle = parentingHandle ();
if (sibling == 0 && parentHandle == fixedHandle) {
moveAbove (child, scrolledHandle != 0 ? scrolledHandle : handle);
return;
}
GtkFixed fixed = new GtkFixed ();
OS.memmove (fixed, parentHandle);
- int /*long*/ children = fixed.children;
+ long /*int*/ children = fixed.children;
if (children == 0) return;
- int /*long*/ [] data = new int /*long*/ [1];
- int /*long*/ [] widget = new int /*long*/ [1];
- int /*long*/ childData = 0, childLink = 0, siblingLink = 0, temp = children;
+ long /*int*/ [] data = new long /*int*/ [1];
+ long /*int*/ [] widget = new long /*int*/ [1];
+ long /*int*/ childData = 0, childLink = 0, siblingLink = 0, temp = children;
while (temp != 0) {
OS.memmove (data, temp, OS.PTR_SIZEOF);
OS.memmove (widget, data [0], OS.PTR_SIZEOF);
@@ -1205,7 +1205,7 @@ void moveChildren(int oldWidth) {
Control[] children = _getChildren ();
for (int i = 0; i < children.length; i++) {
Control child = children[i];
- int /*long*/ topHandle = child.topHandle ();
+ long /*int*/ topHandle = child.topHandle ();
GtkAllocation allocation = new GtkAllocation();
gtk_widget_get_allocation (topHandle, allocation);
int x = allocation.x;
@@ -1247,12 +1247,12 @@ Point minimumSize (int wHint, int hHint, boolean changed) {
return new Point (width, height);
}
-int /*long*/ parentingHandle () {
+long /*int*/ parentingHandle () {
if ((state & CANVAS) != 0) return handle;
return fixedHandle != 0 ? fixedHandle : handle;
}
-void printWidget (GC gc, int /*long*/ drawable, int depth, int x, int y) {
+void printWidget (GC gc, long /*int*/ drawable, int depth, int x, int y) {
Region oldClip = new Region (gc.getDevice ());
Region newClip = new Region (gc.getDevice ());
gc.getClipping (oldClip);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
index 91407953dd..98260057c0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
@@ -44,8 +44,8 @@ import org.eclipse.swt.internal.gtk.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public abstract class Control extends Widget implements Drawable {
- int /*long*/ fixedHandle;
- int /*long*/ redrawWindow, enableWindow;
+ long /*int*/ fixedHandle;
+ long /*int*/ redrawWindow, enableWindow;
int drawCount;
Composite parent;
Cursor cursor;
@@ -104,13 +104,13 @@ Font defaultFont () {
void deregister () {
super.deregister ();
if (fixedHandle != 0) display.removeWidget (fixedHandle);
- int /*long*/ imHandle = imHandle ();
+ long /*int*/ imHandle = imHandle ();
if (imHandle != 0) display.removeWidget (imHandle);
}
-void drawBackground (Control control, int /*long*/ window, int /*long*/ region, int x, int y, int width, int height) {
+void drawBackground (Control control, long /*int*/ window, long /*int*/ region, int x, int y, int width, int height) {
if (OS.USE_CAIRO) {
- int /*long*/ cairo = OS.gdk_cairo_create(window);
+ long /*int*/ cairo = OS.gdk_cairo_create(window);
if (cairo == 0) error (SWT.ERROR_NO_HANDLES);
if (region != 0) {
OS.gdk_cairo_region(cairo, region);
@@ -121,7 +121,7 @@ void drawBackground (Control control, int /*long*/ window, int /*long*/ region,
Cairo.cairo_translate (cairo, -pt.x, -pt.y);
x += pt.x;
y += pt.y;
- int /*long*/ pattern = Cairo.cairo_pattern_create_for_surface (control.backgroundImage.surface);
+ long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface (control.backgroundImage.surface);
if (pattern == 0) error (SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_set_extend (pattern, Cairo.CAIRO_EXTEND_REPEAT);
if ((style & SWT.MIRRORED) != 0) {
@@ -139,7 +139,7 @@ void drawBackground (Control control, int /*long*/ window, int /*long*/ region,
Cairo.cairo_destroy(cairo);
return;
}
- int /*long*/ gdkGC = OS.gdk_gc_new (window);
+ long /*int*/ gdkGC = OS.gdk_gc_new (window);
if (region != 0) OS.gdk_gc_set_clip_region (gdkGC, region);
if (control.backgroundImage != null) {
Point pt = display.map (this, control, 0, 0);
@@ -156,8 +156,8 @@ void drawBackground (Control control, int /*long*/ window, int /*long*/ region,
}
boolean drawGripper (int x, int y, int width, int height, boolean vertical) {
- int /*long*/ paintHandle = paintHandle ();
- int /*long*/ window = gtk_widget_get_window (paintHandle);
+ long /*int*/ paintHandle = paintHandle ();
+ long /*int*/ window = gtk_widget_get_window (paintHandle);
if (window == 0) return false;
int orientation = vertical ? OS.GTK_ORIENTATION_HORIZONTAL : OS.GTK_ORIENTATION_VERTICAL;
if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - width - x;
@@ -169,16 +169,16 @@ void enableWidget (boolean enabled) {
OS.gtk_widget_set_sensitive (handle, enabled);
}
-int /*long*/ enterExitHandle () {
+long /*int*/ enterExitHandle () {
return eventHandle ();
}
-int /*long*/ eventHandle () {
+long /*int*/ eventHandle () {
return handle;
}
-int /*long*/ eventWindow () {
- int /*long*/ eventHandle = eventHandle ();
+long /*int*/ eventWindow () {
+ long /*int*/ eventHandle = eventHandle ();
OS.gtk_widget_realize (eventHandle);
return gtk_widget_get_window (eventHandle);
}
@@ -190,7 +190,7 @@ void fixFocus (Control focusControl) {
if (control.setFocus ()) return;
}
shell.setSavedFocus (focusControl);
- int /*long*/ focusHandle = shell.vboxHandle;
+ long /*int*/ focusHandle = shell.vboxHandle;
gtk_widget_set_can_focus (focusHandle, true);
OS.gtk_widget_grab_focus (focusHandle);
// widget could be disposed at this point
@@ -202,7 +202,7 @@ void fixStyle () {
if (fixedHandle != 0) fixStyle (fixedHandle);
}
-void fixStyle (int /*long*/ handle) {
+void fixStyle (long /*int*/ handle) {
/*
* Feature in GTK. Some GTK themes apply a different background to
* the contents of a GtkNotebook. However, in an SWT TabFolder, the
@@ -216,7 +216,7 @@ void fixStyle (int /*long*/ handle) {
*/
if ((state & BACKGROUND) != 0) return;
if ((state & THEME_BACKGROUND) == 0) return;
- int /*long*/ childStyle = parent.childStyle ();
+ long /*int*/ childStyle = parent.childStyle ();
if (childStyle != 0) {
GdkColor color = new GdkColor();
OS.gtk_style_get_bg (childStyle, 0, color);
@@ -224,11 +224,11 @@ void fixStyle (int /*long*/ handle) {
}
}
-int /*long*/ focusHandle () {
+long /*int*/ focusHandle () {
return handle;
}
-int /*long*/ fontHandle () {
+long /*int*/ fontHandle () {
return handle;
}
@@ -256,7 +256,7 @@ boolean hasFocus () {
void hookEvents () {
/* Connect the keyboard signals */
- int /*long*/ focusHandle = focusHandle ();
+ long /*int*/ focusHandle = focusHandle ();
int focusMask = OS.GDK_KEY_PRESS_MASK | OS.GDK_KEY_RELEASE_MASK | OS.GDK_FOCUS_CHANGE_MASK;
OS.gtk_widget_add_events (focusHandle, focusMask);
OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [POPUP_MENU], 0, display.closures [POPUP_MENU], false);
@@ -268,7 +268,7 @@ void hookEvents () {
OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [FOCUS_OUT_EVENT], 0, display.closures [FOCUS_OUT_EVENT], false);
/* Connect the mouse signals */
- int /*long*/ eventHandle = eventHandle ();
+ long /*int*/ eventHandle = eventHandle ();
int eventMask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_PRESS_MASK | OS.GDK_BUTTON_RELEASE_MASK;
OS.gtk_widget_add_events (eventHandle, eventMask);
OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.closures [BUTTON_PRESS_EVENT], false);
@@ -277,7 +277,7 @@ void hookEvents () {
OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [SCROLL_EVENT], 0, display.closures [SCROLL_EVENT], false);
/* Connect enter/exit signals */
- int /*long*/ enterExitHandle = enterExitHandle ();
+ long /*int*/ enterExitHandle = enterExitHandle ();
int enterExitMask = OS.GDK_ENTER_NOTIFY_MASK | OS.GDK_LEAVE_NOTIFY_MASK;
OS.gtk_widget_add_events (enterExitHandle, enterExitMask);
OS.g_signal_connect_closure_by_id (enterExitHandle, display.signalIds [ENTER_NOTIFY_EVENT], 0, display.closures [ENTER_NOTIFY_EVENT], false);
@@ -293,7 +293,7 @@ void hookEvents () {
* The signal is hooked to the fixedHandle to catch events sent to
* lightweight widgets.
*/
- int /*long*/ blockHandle = fixedHandle != 0 ? fixedHandle : eventHandle;
+ long /*int*/ blockHandle = fixedHandle != 0 ? fixedHandle : eventHandle;
OS.g_signal_connect_closure_by_id (blockHandle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.closures [BUTTON_PRESS_EVENT_INVERSE], true);
OS.g_signal_connect_closure_by_id (blockHandle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT_INVERSE], true);
OS.g_signal_connect_closure_by_id (blockHandle, display.signalIds [MOTION_NOTIFY_EVENT], 0, display.closures [MOTION_NOTIFY_EVENT_INVERSE], true);
@@ -305,7 +305,7 @@ void hookEvents () {
}
/* Connect the paint signal */
- int /*long*/ paintHandle = paintHandle ();
+ long /*int*/ paintHandle = paintHandle ();
int paintMask = OS.GDK_EXPOSURE_MASK | OS.GDK_VISIBILITY_NOTIFY_MASK;
OS.gtk_widget_add_events (paintHandle, paintMask);
OS.g_signal_connect_closure_by_id (paintHandle, display.signalIds [EXPOSE_EVENT], 0, display.closures [EXPOSE_EVENT_INVERSE], false);
@@ -322,7 +322,7 @@ void hookEvents () {
/* Connect the Input Method signals */
OS.g_signal_connect_closure_by_id (handle, display.signalIds [REALIZE], 0, display.closures [REALIZE], true);
OS.g_signal_connect_closure_by_id (handle, display.signalIds [UNREALIZE], 0, display.closures [UNREALIZE], false);
- int /*long*/ imHandle = imHandle ();
+ long /*int*/ imHandle = imHandle ();
if (imHandle != 0) {
OS.g_signal_connect_closure (imHandle, OS.commit, display.closures [COMMIT], false);
OS.g_signal_connect_closure (imHandle, OS.preedit_changed, display.closures [PREEDIT_CHANGED], false);
@@ -330,11 +330,11 @@ void hookEvents () {
OS.g_signal_connect_closure_by_id (paintHandle, display.signalIds [STYLE_SET], 0, display.closures [STYLE_SET], false);
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
OS.g_signal_connect_closure_by_id (topHandle, display.signalIds [MAP], 0, display.closures [MAP], true);
}
-int /*long*/ hoverProc (int /*long*/ widget) {
+long /*int*/ hoverProc (long /*int*/ widget) {
int [] x = new int [1], y = new int [1], mask = new int [1];
OS.gdk_window_get_pointer (0, x, y, mask);
sendMouseEvent (SWT.MouseHover, 0, /*time*/0, x [0], y [0], false, mask [0]);
@@ -342,14 +342,14 @@ int /*long*/ hoverProc (int /*long*/ widget) {
return 0;
}
-int /*long*/ topHandle() {
+long /*int*/ topHandle() {
if (fixedHandle != 0) return fixedHandle;
return super.topHandle ();
}
-int /*long*/ paintHandle () {
- int /*long*/ topHandle = topHandle ();
- int /*long*/ paintHandle = handle;
+long /*int*/ paintHandle () {
+ long /*int*/ topHandle = topHandle ();
+ long /*int*/ paintHandle = handle;
while (paintHandle != topHandle) {
if (gtk_widget_get_has_window (paintHandle)) break;
paintHandle = OS.gtk_widget_get_parent (paintHandle);
@@ -357,8 +357,8 @@ int /*long*/ paintHandle () {
return paintHandle;
}
-int /*long*/ paintWindow () {
- int /*long*/ paintHandle = paintHandle ();
+long /*int*/ paintWindow () {
+ long /*int*/ paintHandle = paintHandle ();
OS.gtk_widget_realize (paintHandle);
return gtk_widget_get_window (paintHandle);
}
@@ -384,27 +384,27 @@ public boolean print (GC gc) {
checkWidget ();
if (gc == null) error (SWT.ERROR_NULL_ARGUMENT);
if (gc.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
OS.gtk_widget_realize (topHandle);
- int /*long*/ window = gtk_widget_get_window (topHandle);
+ long /*int*/ window = gtk_widget_get_window (topHandle);
GCData data = gc.getGCData ();
OS.gdk_window_process_updates (window, true);
- int /*long*/ drawable = data.drawable;
+ long /*int*/ drawable = data.drawable;
if (drawable == 0) drawable = OS.gdk_get_default_root_window();
printWidget (gc, drawable, OS.gdk_drawable_get_depth (drawable), 0, 0);
return true;
}
-void printWidget (GC gc, int /*long*/ drawable, int depth, int x, int y) {
+void printWidget (GC gc, long /*int*/ drawable, int depth, int x, int y) {
boolean obscured = (state & OBSCURED) != 0;
state &= ~OBSCURED;
- int /*long*/ topHandle = topHandle ();
- int /*long*/ window = gtk_widget_get_window (topHandle);
+ long /*int*/ topHandle = topHandle ();
+ long /*int*/ window = gtk_widget_get_window (topHandle);
printWindow (true, this, gc, drawable, depth, window, x, y);
if (obscured) state |= OBSCURED;
}
-void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable, int depth, int /*long*/ window, int x, int y) {
+void printWindow (boolean first, Control control, GC gc, long /*int*/ drawable, int depth, long /*int*/ window, int x, int y) {
if (OS.gdk_drawable_get_depth (window) != depth) return;
GdkRectangle rect = new GdkRectangle ();
int [] width = new int [1], height = new int [1];
@@ -412,13 +412,13 @@ void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable,
rect.width = width [0];
rect.height = height [0];
OS.gdk_window_begin_paint_rect (window, rect);
- int /*long*/ [] real_drawable = new int /*long*/ [1];
+ long /*int*/ [] real_drawable = new long /*int*/ [1];
int [] x_offset = new int [1], y_offset = new int [1];
OS.gdk_window_get_internal_paint_info (window, real_drawable, x_offset, y_offset);
- int /*long*/ [] userData = new int /*long*/ [1];
+ long /*int*/ [] userData = new long /*int*/ [1];
OS.gdk_window_get_user_data (window, userData);
if (userData [0] != 0) {
- int /*long*/ eventPtr = OS.gdk_event_new (OS.GDK_EXPOSE);
+ long /*int*/ eventPtr = OS.gdk_event_new (OS.GDK_EXPOSE);
GdkEventExpose event = new GdkEventExpose ();
event.type = OS.GDK_EXPOSE;
event.window = OS.g_object_ref (window);
@@ -434,7 +434,7 @@ void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable,
if (!first) {
int [] cX = new int [1], cY = new int [1];
OS.gdk_window_get_position (window, cX, cY);
- int /*long*/ parentWindow = OS.gdk_window_get_parent (window);
+ long /*int*/ parentWindow = OS.gdk_window_get_parent (window);
int [] pW = new int [1], pH = new int [1];
gdk_window_get_size (parentWindow, pW, pH);
srcX = x_offset [0] - cX [0];
@@ -445,18 +445,18 @@ void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable,
destHeight = Math.min (cY [0] + height [0], pH [0]);
}
GCData gcData = gc.getGCData();
- int /*long*/ cairo = gcData.cairo;
+ long /*int*/ cairo = gcData.cairo;
if (cairo != 0) {
- int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
- int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());
- int /*long*/ xDrawable = OS.GDK_PIXMAP_XID(real_drawable [0]);
- int /*long*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width [0], height [0]);
+ long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
+ long /*int*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());
+ long /*int*/ xDrawable = OS.GDK_PIXMAP_XID(real_drawable [0]);
+ long /*int*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width [0], height [0]);
if (surface == 0) error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_save(cairo);
Cairo.cairo_rectangle(cairo, destX , destY, destWidth, destHeight);
Cairo.cairo_clip(cairo);
Cairo.cairo_translate(cairo, destX, destY);
- int /*long*/ pattern = Cairo.cairo_pattern_create_for_surface(surface);
+ long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface(surface);
if (pattern == 0) error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_set_filter(pattern, Cairo.CAIRO_FILTER_BEST);
Cairo.cairo_set_source(cairo, pattern);
@@ -472,13 +472,13 @@ void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable,
OS.gdk_draw_drawable (drawable, gc.handle, real_drawable [0], srcX, srcY, destX, destY, destWidth, destHeight);
}
OS.gdk_window_end_paint (window);
- int /*long*/ children = OS.gdk_window_get_children (window);
+ long /*int*/ children = OS.gdk_window_get_children (window);
if (children != 0) {
- int /*long*/ windows = children;
+ long /*int*/ windows = children;
while (windows != 0) {
- int /*long*/ child = OS.g_list_data (windows);
+ long /*int*/ child = OS.g_list_data (windows);
if (OS.gdk_window_is_visible (child)) {
- int /*long*/ [] data = new int /*long*/ [1];
+ long /*int*/ [] data = new long /*int*/ [1];
OS.gdk_window_get_user_data (child, data);
if (data [0] != 0) {
Widget widget = display.findWidget (data [0]);
@@ -592,7 +592,7 @@ void checkMirrored () {
if ((style & SWT.RIGHT_TO_LEFT) != 0) style |= SWT.MIRRORED;
}
-int /*long*/ childStyle () {
+long /*int*/ childStyle () {
return parent.childStyle ();
}
@@ -652,7 +652,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
return computeNativeSize (handle, wHint, hHint, changed);
}
-Point computeNativeSize (int /*long*/ h, int wHint, int hHint, boolean changed) {
+Point computeNativeSize (long /*int*/ h, int wHint, int hHint, boolean changed) {
int width = wHint, height = hHint;
if (wHint == SWT.DEFAULT && hHint == SWT.DEFAULT) {
GtkRequisition requisition = new GtkRequisition ();
@@ -678,7 +678,7 @@ void forceResize () {
* topHandle. Note that all calls to gtk_widget_size_allocate()
* must be preceded by a call to gtk_widget_size_request().
*/
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
GtkRequisition requisition = new GtkRequisition ();
gtk_widget_size_request (topHandle, requisition);
GtkAllocation allocation = new GtkAllocation ();
@@ -733,7 +733,7 @@ Accessible _getAccessible () {
*/
public Rectangle getBounds () {
checkWidget();
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
GtkAllocation allocation = new GtkAllocation ();
gtk_widget_get_allocation (topHandle, allocation);
int x = allocation.x;
@@ -800,7 +800,7 @@ void markLayout (boolean changed, boolean all) {
/* Do nothing */
}
-void modifyStyle (int /*long*/ handle, int /*long*/ style) {
+void modifyStyle (long /*int*/ handle, long /*int*/ style) {
super.modifyStyle(handle, style);
/*
* Bug in GTK. When changing the style of a control that
@@ -811,8 +811,8 @@ void modifyStyle (int /*long*/ handle, int /*long*/ style) {
}
void moveHandle (int x, int y) {
- int /*long*/ topHandle = topHandle ();
- int /*long*/ parentHandle = parent.parentingHandle ();
+ long /*int*/ topHandle = topHandle ();
+ long /*int*/ parentHandle = parent.parentingHandle ();
/*
* Feature in GTK. Calling gtk_fixed_move() to move a child causes
* the whole parent to redraw. This is a performance problem. The
@@ -830,13 +830,13 @@ void moveHandle (int x, int y) {
}
void resizeHandle (int width, int height) {
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
OS.gtk_widget_set_size_request (topHandle, width, height);
if (topHandle != handle) OS.gtk_widget_set_size_request (handle, width, height);
}
int setBounds (int x, int y, int width, int height, boolean move, boolean resize) {
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
boolean sendMove = move;
GtkAllocation allocation = new GtkAllocation ();
gtk_widget_get_allocation (topHandle, allocation);
@@ -955,7 +955,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
*/
public Point getLocation () {
checkWidget();
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
GtkAllocation allocation = new GtkAllocation ();
gtk_widget_get_allocation (topHandle, allocation);
int x = allocation.x;
@@ -1022,7 +1022,7 @@ public void setLocation(int x, int y) {
*/
public Point getSize () {
checkWidget();
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
GtkAllocation allocation = new GtkAllocation ();
gtk_widget_get_allocation (topHandle, allocation);
int width = (state & ZERO_WIDTH) != 0 ? 0 : allocation.width;
@@ -1074,15 +1074,15 @@ public void setSize (Point size) {
public void setRegion (Region region) {
checkWidget ();
if (region != null && region.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
- int /*long*/ window = gtk_widget_get_window (topHandle ());
- int /*long*/ shape_region = (region == null) ? 0 : region.handle;
+ long /*int*/ window = gtk_widget_get_window (topHandle ());
+ long /*int*/ shape_region = (region == null) ? 0 : region.handle;
OS.gdk_window_shape_combine_region (window, shape_region, 0, 0);
this.region = region;
}
void setRelations () {
- int /*long*/ parentHandle = parent.parentingHandle ();
- int /*long*/ list = OS.gtk_container_get_children (parentHandle);
+ long /*int*/ parentHandle = parent.parentingHandle ();
+ long /*int*/ list = OS.gtk_container_get_children (parentHandle);
if (list == 0) return;
int count = OS.g_list_length (list);
if (count > 1) {
@@ -1090,7 +1090,7 @@ void setRelations () {
* the receiver is the last item in the list, so its predecessor will
* be the second-last item in the list
*/
- int /*long*/ handle = OS.g_list_nth_data (list, count - 2);
+ long /*int*/ handle = OS.g_list_nth_data (list, count - 2);
if (handle != 0) {
Widget widget = display.getWidget (handle);
if (widget != null && widget != this) {
@@ -1138,7 +1138,7 @@ boolean isDescribedByLabel () {
return true;
}
-boolean isFocusHandle (int /*long*/ widget) {
+boolean isFocusHandle (long /*int*/ widget) {
return widget == focusHandle ();
}
@@ -1279,7 +1279,7 @@ public void setLayoutData (Object layoutData) {
*/
public Point toControl (int x, int y) {
checkWidget ();
- int /*long*/ window = eventWindow ();
+ long /*int*/ window = eventWindow ();
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
x -= origin_x [0];
@@ -1328,7 +1328,7 @@ public Point toControl (Point point) {
*/
public Point toDisplay (int x, int y) {
checkWidget();
- int /*long*/ window = eventWindow ();
+ long /*int*/ window = eventWindow ();
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - x;
@@ -2219,7 +2219,7 @@ boolean dragDetect (int button, int count, int stateMask, int x, int y) {
boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean [] consume) {
boolean quit = false, dragging = false;
while (!quit) {
- int /*long*/ eventPtr = 0;
+ long /*int*/ eventPtr = 0;
/*
* There should be an event on the queue already, but
* in cases where there isn't one, stop trying after
@@ -2274,8 +2274,8 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
return dragging;
}
-boolean filterKey (int keyval, int /*long*/ event) {
- int /*long*/ imHandle = imHandle ();
+boolean filterKey (int keyval, long /*int*/ event) {
+ long /*int*/ imHandle = imHandle ();
if (imHandle != 0) {
return OS.gtk_im_context_filter_keypress (imHandle, event);
}
@@ -2297,13 +2297,13 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De
oldDecorations.fixDecorations (newDecorations, this, menus);
}
-int /*long*/ fixedMapProc (int /*long*/ widget) {
+long /*int*/ fixedMapProc (long /*int*/ widget) {
gtk_widget_set_mapped (widget, true);
- int /*long*/ widgetList = OS.gtk_container_get_children (widget);
+ long /*int*/ widgetList = OS.gtk_container_get_children (widget);
if (widgetList != 0) {
- int /*long*/ widgets = widgetList;
+ long /*int*/ widgets = widgetList;
while (widgets != 0) {
- int /*long*/ child = OS.g_list_data (widgets);
+ long /*int*/ child = OS.g_list_data (widgets);
if (gtk_widget_get_visible (child) && OS.gtk_widget_get_child_visible (child) && !gtk_widget_get_mapped (child)) {
OS.gtk_widget_map (child);
}
@@ -2317,7 +2317,7 @@ int /*long*/ fixedMapProc (int /*long*/ widget) {
return 0;
}
-void fixModal(int /*long*/ group, int /*long*/ modalGroup) {
+void fixModal(long /*int*/ group, long /*int*/ modalGroup) {
}
/**
@@ -2343,7 +2343,7 @@ public boolean forceFocus () {
return forceFocus (focusHandle ());
}
-boolean forceFocus (int /*long*/ focusHandle) {
+boolean forceFocus (long /*int*/ focusHandle) {
if (gtk_widget_has_focus (focusHandle)) return true;
/* When the control is zero sized it must be realized */
OS.gtk_widget_realize (focusHandle);
@@ -2351,8 +2351,8 @@ boolean forceFocus (int /*long*/ focusHandle) {
// widget could be disposed at this point
if (isDisposed ()) return false;
Shell shell = getShell ();
- int /*long*/ shellHandle = shell.shellHandle;
- int /*long*/ handle = OS.gtk_window_get_focus (shellHandle);
+ long /*int*/ shellHandle = shell.shellHandle;
+ long /*int*/ handle = OS.gtk_window_get_focus (shellHandle);
while (handle != 0) {
if (handle == focusHandle) {
/* Cancel any previous ignoreFocus requests */
@@ -2413,7 +2413,7 @@ public Image getBackgroundImage () {
}
GdkColor getBgColor () {
- int /*long*/ fontHandle = fontHandle ();
+ long /*int*/ fontHandle = fontHandle ();
OS.gtk_widget_realize (fontHandle);
GdkColor color = new GdkColor ();
OS.gtk_style_get_bg (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
@@ -2421,7 +2421,7 @@ GdkColor getBgColor () {
}
GdkColor getBaseColor () {
- int /*long*/ fontHandle = fontHandle ();
+ long /*int*/ fontHandle = fontHandle ();
OS.gtk_widget_realize (fontHandle);
GdkColor color = new GdkColor ();
OS.gtk_style_get_base (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
@@ -2521,8 +2521,8 @@ public Font getFont () {
return font != null ? font : defaultFont ();
}
-int /*long*/ getFontDescription () {
- int /*long*/ fontHandle = fontHandle ();
+long /*int*/ getFontDescription () {
+ long /*int*/ fontHandle = fontHandle ();
OS.gtk_widget_realize (fontHandle);
return OS.gtk_style_get_font_desc (OS.gtk_widget_get_style (fontHandle));
}
@@ -2547,7 +2547,7 @@ GdkColor getForegroundColor () {
}
GdkColor getFgColor () {
- int /*long*/ fontHandle = fontHandle ();
+ long /*int*/ fontHandle = fontHandle ();
OS.gtk_widget_realize (fontHandle);
GdkColor color = new GdkColor ();
OS.gtk_style_get_fg (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
@@ -2559,7 +2559,7 @@ Point getIMCaretPos () {
}
GdkColor getTextColor () {
- int /*long*/ fontHandle = fontHandle ();
+ long /*int*/ fontHandle = fontHandle ();
OS.gtk_widget_realize (fontHandle);
GdkColor color = new GdkColor ();
OS.gtk_style_get_text (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
@@ -2616,7 +2616,7 @@ public Menu getMenu () {
public Monitor getMonitor () {
checkWidget();
Monitor monitor = null;
- int /*long*/ screen = OS.gdk_screen_get_default ();
+ long /*int*/ screen = OS.gdk_screen_get_default ();
if (screen != 0) {
int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, paintWindow ());
GdkRectangle dest = new GdkRectangle ();
@@ -2785,11 +2785,11 @@ public boolean getVisible () {
return (state & HIDDEN) == 0;
}
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
return gtk_button_press_event (widget, event, true);
}
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event, boolean sendMouseDown) {
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event, boolean sendMouseDown) {
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0;
@@ -2804,10 +2804,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event, bo
if (((shell.style & SWT.ON_TOP) != 0) && (((shell.style & SWT.NO_FOCUS) == 0) || ((style & SWT.NO_FOCUS) == 0))) {
shell.forceActive();
}
- int /*long*/ result = 0;
+ long /*int*/ result = 0;
if (gdkEvent.type == OS.GDK_BUTTON_PRESS) {
display.clickCount = 1;
- int /*long*/ nextEvent = OS.gdk_event_peek ();
+ long /*int*/ nextEvent = OS.gdk_event_peek ();
if (nextEvent != 0) {
int eventType = OS.GDK_EVENT_TYPE (nextEvent);
if (eventType == OS.GDK_2BUTTON_PRESS) display.clickCount = 2;
@@ -2854,13 +2854,13 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event, bo
return result;
}
-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) {
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
return sendMouseEvent (SWT.MouseUp, gdkEvent.button, display.clickCount, 0, false, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
}
-int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ text) {
+long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ text) {
if (text == 0) return 0;
int length = OS.strlen (text);
if (length == 0) return 0;
@@ -2871,7 +2871,7 @@ int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ text) {
return 0;
}
-int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) {
if (OS.GTK_VERSION >= OS.VERSION (2, 12, 0)) {
/*
* Feature in GTK. Children of a shell will inherit and display the shell's
@@ -2884,7 +2884,7 @@ int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
char [] chars = fixMnemonic (toolTipText, false);
buffer = Converter.wcsToMbcs (null, chars, true);
}
- int /*long*/ toolHandle = getShell().handle;
+ long /*int*/ toolHandle = getShell().handle;
OS.gtk_widget_set_tooltip_text (toolHandle, buffer);
}
if (display.currentControl == this) return 0;
@@ -2914,7 +2914,7 @@ boolean checkSubwindow () {
return false;
}
-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
switch (event.type) {
@@ -2956,7 +2956,7 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
}
} else {
display.ignoreFocus = false;
- int /*long*/ grabHandle = OS.gtk_grab_get_current ();
+ long /*int*/ grabHandle = OS.gtk_grab_get_current ();
if (grabHandle != 0) {
if (OS.G_OBJECT_TYPE (grabHandle) == OS.GTK_TYPE_MENU ()) {
display.ignoreFocus = true;
@@ -2972,7 +2972,7 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
return 0;
}
-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) {
if ((state & OBSCURED) != 0) return 0;
if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return 0;
GdkEventExpose gdkEvent = new GdkEventExpose ();
@@ -2993,34 +2993,34 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
return 0;
}
-int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ directionType) {
+long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) {
/* Stop GTK traversal for every widget */
return 1;
}
-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) {
// widget could be disposed at this point
if (handle != 0) {
Control oldControl = display.imControl;
if (oldControl != this) {
if (oldControl != null && !oldControl.isDisposed ()) {
- int /*long*/ oldIMHandle = oldControl.imHandle ();
+ long /*int*/ oldIMHandle = oldControl.imHandle ();
if (oldIMHandle != 0) OS.gtk_im_context_reset (oldIMHandle);
}
}
if (hooks (SWT.KeyDown) || hooks (SWT.KeyUp)) {
- int /*long*/ imHandle = imHandle ();
+ long /*int*/ imHandle = imHandle ();
if (imHandle != 0) OS.gtk_im_context_focus_in (imHandle);
}
}
return 0;
}
-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {
// widget could be disposed at this point
if (handle != 0) {
if (hooks (SWT.KeyDown) || hooks (SWT.KeyUp)) {
- int /*long*/ imHandle = imHandle ();
+ long /*int*/ imHandle = imHandle ();
if (imHandle != 0) {
OS.gtk_im_context_focus_out (imHandle);
}
@@ -3029,7 +3029,7 @@ int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {
return 0;
}
-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, event, GdkEventKey.sizeof);
@@ -3049,16 +3049,16 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
return super.gtk_key_press_event (widget, event);
}
-int /*long*/ gtk_key_release_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_key_release_event (long /*int*/ widget, long /*int*/ event) {
if (!hasFocus ()) return 0;
- int /*long*/ imHandle = imHandle ();
+ long /*int*/ imHandle = imHandle ();
if (imHandle != 0) {
if (OS.gtk_im_context_filter_keypress (imHandle, event)) return 1;
}
return super.gtk_key_release_event (widget, event);
}
-int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) {
if (display.currentControl != this) return 0;
display.removeMouseHoverTimeout (handle);
int result = 0;
@@ -3073,15 +3073,15 @@ int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
-int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) {
+long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) {
int result = 0;
- int /*long*/ eventPtr = OS.gtk_get_current_event ();
+ long /*int*/ eventPtr = OS.gtk_get_current_event ();
if (eventPtr != 0) {
GdkEventKey keyEvent = new GdkEventKey ();
OS.memmove (keyEvent, eventPtr, GdkEventKey.sizeof);
if (keyEvent.type == OS.GDK_KEY_PRESS) {
Control focusControl = display.getFocusControl ();
- int /*long*/ focusHandle = focusControl != null ? focusControl.focusHandle () : 0;
+ long /*int*/ focusHandle = focusControl != null ? focusControl.focusHandle () : 0;
if (focusHandle != 0) {
display.mnemonicControl = this;
OS.gtk_widget_event (focusHandle, eventPtr);
@@ -3094,7 +3094,7 @@ int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) {
return result;
}
-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {
GdkEventMotion gdkEvent = new GdkEventMotion ();
OS.memmove (gdkEvent, event, GdkEventMotion.sizeof);
if (this == display.currentControl && (hooks (SWT.MouseHover) || filters (SWT.MouseHover))) {
@@ -3104,7 +3104,7 @@ int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {
int state = gdkEvent.state;
if (gdkEvent.is_hint != 0) {
int [] pointer_x = new int [1], pointer_y = new int [1], mask = new int [1];
- int /*long*/ window = eventWindow ();
+ long /*int*/ window = eventWindow ();
OS.gdk_window_get_pointer (window, pointer_x, pointer_y, mask);
x = pointer_x [0];
y = pointer_y [0];
@@ -3114,22 +3114,22 @@ int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
-int /*long*/ gtk_popup_menu (int /*long*/ widget) {
+long /*int*/ gtk_popup_menu (long /*int*/ widget) {
if (!hasFocus()) return 0;
int [] x = new int [1], y = new int [1];
OS.gdk_window_get_pointer (0, x, y, null);
return showMenu (x [0], y [0], SWT.MENU_KEYBOARD) ? 1 : 0;
}
-int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) {
+long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) {
display.showIMWindow (this);
return 0;
}
-int /*long*/ gtk_realize (int /*long*/ widget) {
- int /*long*/ imHandle = imHandle ();
+long /*int*/ gtk_realize (long /*int*/ widget) {
+ long /*int*/ imHandle = imHandle ();
if (imHandle != 0) {
- int /*long*/ window = gtk_widget_get_window (paintHandle ());
+ long /*int*/ window = gtk_widget_get_window (paintHandle ());
OS.gtk_im_context_set_client_window (imHandle, window);
}
if (backgroundImage != null) {
@@ -3138,7 +3138,7 @@ int /*long*/ gtk_realize (int /*long*/ widget) {
return 0;
}
-int /*long*/ gtk_scroll_event (int /*long*/ widget, int /*long*/ eventPtr) {
+long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ eventPtr) {
GdkEventScroll gdkEvent = new GdkEventScroll ();
OS.memmove (gdkEvent, eventPtr, GdkEventScroll.sizeof);
switch (gdkEvent.direction) {
@@ -3154,25 +3154,25 @@ int /*long*/ gtk_scroll_event (int /*long*/ widget, int /*long*/ eventPtr) {
return 0;
}
-int /*long*/ gtk_show_help (int /*long*/ widget, int /*long*/ helpType) {
+long /*int*/ gtk_show_help (long /*int*/ widget, long /*int*/ helpType) {
if (!hasFocus ()) return 0;
return sendHelpEvent (helpType) ? 1 : 0;
}
-int /*long*/ gtk_style_set (int /*long*/ widget, int /*long*/ previousStyle) {
+long /*int*/ gtk_style_set (long /*int*/ widget, long /*int*/ previousStyle) {
if (backgroundImage != null) {
setBackgroundPixmap (backgroundImage);
}
return 0;
}
-int /*long*/ gtk_unrealize (int /*long*/ widget) {
- int /*long*/ imHandle = imHandle ();
+long /*int*/ gtk_unrealize (long /*int*/ widget) {
+ long /*int*/ imHandle = imHandle ();
if (imHandle != 0) OS.gtk_im_context_set_client_window (imHandle, 0);
return 0;
}
-int /*long*/ gtk_visibility_notify_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_visibility_notify_event (long /*int*/ widget, long /*int*/ event) {
/*
* As of GTK 2.17.11, obscured controls no longer send expose
* events. It is no longer necessary to track visiblity notify
@@ -3181,8 +3181,8 @@ int /*long*/ gtk_visibility_notify_event (int /*long*/ widget, int /*long*/ even
if (OS.GTK_VERSION >= OS.VERSION (2, 17, 11)) return 0;
GdkEventVisibility gdkEvent = new GdkEventVisibility ();
OS.memmove (gdkEvent, event, GdkEventVisibility.sizeof);
- int /*long*/ paintWindow = paintWindow();
- int /*long*/ window = gdkEvent.window;
+ long /*int*/ paintWindow = paintWindow();
+ long /*int*/ window = gdkEvent.window;
if (window == paintWindow) {
if (gdkEvent.state == OS.GDK_VISIBILITY_FULLY_OBSCURED) {
state |= OBSCURED;
@@ -3201,7 +3201,7 @@ int /*long*/ gtk_visibility_notify_event (int /*long*/ widget, int /*long*/ even
return 0;
}
-void gtk_widget_set_has_window (int /*long*/ fixedHandle, boolean value) {
+void gtk_widget_set_has_window (long /*int*/ fixedHandle, boolean value) {
if (OS.GTK_VERSION >= OS.VERSION (2, 18, 0)) {
OS.gtk_widget_set_has_window (fixedHandle, value);
} else {
@@ -3209,7 +3209,7 @@ void gtk_widget_set_has_window (int /*long*/ fixedHandle, boolean value) {
}
}
-void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
+void gtk_widget_size_request (long /*int*/ widget, GtkRequisition requisition) {
OS.gtk_widget_size_request (widget, requisition);
}
@@ -3228,11 +3228,11 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public int /*long*/ internal_new_GC (GCData data) {
+public long /*int*/ internal_new_GC (GCData data) {
checkWidget ();
- int /*long*/ window = paintWindow ();
+ long /*int*/ window = paintWindow ();
if (window == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ gc;
+ long /*int*/ gc;
if (OS.USE_CAIRO) {
gc = OS.gdk_cairo_create (window);
} else {
@@ -3259,7 +3259,7 @@ public int /*long*/ internal_new_GC (GCData data) {
return gc;
}
-int /*long*/ imHandle () {
+long /*int*/ imHandle () {
return 0;
}
@@ -3278,9 +3278,9 @@ int /*long*/ imHandle () {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
+public void internal_dispose_GC (long /*int*/ hDC, GCData data) {
checkWidget ();
- int /*long*/ gc = hDC;
+ long /*int*/ gc = hDC;
if (OS.USE_CAIRO) {
Cairo.cairo_destroy (gc);
} else {
@@ -3423,7 +3423,7 @@ boolean mnemonicMatch (char key) {
void register () {
super.register ();
if (fixedHandle != 0) display.addWidget (fixedHandle, this);
- int /*long*/ imHandle = imHandle ();
+ long /*int*/ imHandle = imHandle ();
if (imHandle != 0) display.addWidget (imHandle, this);
}
@@ -3499,7 +3499,7 @@ void redrawChildren () {
void redrawWidget (int x, int y, int width, int height, boolean redrawAll, boolean all, boolean trim) {
if (!gtk_widget_get_realized(handle)) return;
- int /*long*/ window = paintWindow ();
+ long /*int*/ window = paintWindow ();
GdkRectangle rect = new GdkRectangle ();
if (redrawAll) {
int [] w = new int [1], h = new int [1];
@@ -3553,7 +3553,7 @@ void releaseWidget () {
super.releaseWidget ();
if (display.currentControl == this) display.currentControl = null;
display.removeMouseHoverTimeout (handle);
- int /*long*/ imHandle = imHandle ();
+ long /*int*/ imHandle = imHandle ();
if (imHandle != 0) {
OS.gtk_im_context_reset (imHandle);
OS.gtk_im_context_set_client_window (imHandle, 0);
@@ -3578,7 +3578,7 @@ void releaseWidget () {
region = null;
}
-void restackWindow (int /*long*/ window, int /*long*/ sibling, boolean above) {
+void restackWindow (long /*int*/ window, long /*int*/ sibling, boolean above) {
if (OS.GTK_VERSION >= OS.VERSION (2, 17, 11)) {
OS.gdk_window_restack (window, sibling, above);
} else {
@@ -3591,8 +3591,8 @@ void restackWindow (int /*long*/ window, int /*long*/ sibling, boolean above) {
* When the receiver is not a top level shell, XReconfigureWMWindow ()
* behaves the same as XConfigureWindow ().
*/
- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
- int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (window);
+ long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
+ long /*int*/ xWindow = OS.gdk_x11_drawable_get_xid (window);
int xScreen = OS.XDefaultScreen (xDisplay);
int flags = OS.CWStackMode | OS.CWSibling;
XWindowChanges changes = new XWindowChanges ();
@@ -3646,7 +3646,7 @@ void sendFocusEvent (int type) {
}
}
-boolean sendHelpEvent (int /*long*/ helpType) {
+boolean sendHelpEvent (long /*int*/ helpType) {
Control control = this;
while (control != null) {
if (control.hooks (SWT.Help)) {
@@ -3677,7 +3677,7 @@ boolean sendMouseEvent (int type, int button, int count, int detail, boolean sen
event.x = (int)x;
event.y = (int)y;
} else {
- int /*long*/ window = eventWindow ();
+ long /*int*/ window = eventWindow ();
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
event.x = (int)x - origin_x [0];
@@ -3733,7 +3733,7 @@ public void setBackground (Color color) {
}
boolean set = false;
if (gdkColor == null) {
- int /*long*/ style = OS.gtk_widget_get_modifier_style (handle);
+ long /*int*/ style = OS.gtk_widget_get_modifier_style (handle);
set = (OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL) & OS.GTK_RC_BG) != 0;
} else {
GdkColor oldColor = getBackgroundColor ();
@@ -3750,10 +3750,10 @@ public void setBackground (Color color) {
}
}
-void setBackgroundColor (int /*long*/ handle, GdkColor color) {
+void setBackgroundColor (long /*int*/ handle, GdkColor color) {
int index = OS.GTK_STATE_NORMAL;
- int /*long*/ style = OS.gtk_widget_get_modifier_style (handle);
- int /*long*/ ptr = OS.gtk_rc_style_get_bg_pixmap_name (style, index);
+ long /*int*/ style = OS.gtk_widget_get_modifier_style (handle);
+ long /*int*/ ptr = OS.gtk_rc_style_get_bg_pixmap_name (style, index);
if (ptr != 0) OS.g_free (ptr);
ptr = 0;
@@ -3821,7 +3821,7 @@ public void setBackgroundImage (Image image) {
}
void setBackgroundPixmap (Image image) {
- int /*long*/ window = gtk_widget_get_window (paintHandle ());
+ long /*int*/ window = gtk_widget_get_window (paintHandle ());
if (window != 0) {
if (image.pixmap != 0) {
OS.gdk_window_set_back_pixmap (window, image.pixmap, false);
@@ -3833,11 +3833,11 @@ void setBackgroundPixmap (Image image) {
*
* For now draw background in windowProc().
*/
-// int /*long*/ surface = image.surface;
+// long /*int*/ surface = image.surface;
// int type = Cairo.cairo_surface_get_type(surface);
// switch (type) {
// case Cairo.CAIRO_SURFACE_TYPE_XLIB:
-// int /*long*/ pixmap = OS.gdk_pixmap_foreign_new(Cairo.cairo_xlib_surface_get_drawable(surface));
+// long /*int*/ pixmap = OS.gdk_pixmap_foreign_new(Cairo.cairo_xlib_surface_get_drawable(surface));
// OS.gdk_window_set_back_pixmap (window, pixmap, false);
// OS.g_object_unref(pixmap);
// break;
@@ -3896,14 +3896,14 @@ public void setCursor (Cursor cursor) {
setCursor (cursor != null ? cursor.handle : 0);
}
-void setCursor (int /*long*/ cursor) {
- int /*long*/ window = eventWindow ();
+void setCursor (long /*int*/ cursor) {
+ long /*int*/ window = eventWindow ();
if (window != 0) {
OS.gdk_window_set_cursor (window, cursor);
if (!OS.GDK_WINDOWING_X11 ()) {
OS.gdk_flush ();
} else {
- int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
+ long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
OS.XFlush (xDisplay);
}
}
@@ -3971,9 +3971,9 @@ public void setEnabled (boolean enabled) {
}
} else {
OS.gtk_widget_realize (handle);
- int /*long*/ parentHandle = parent.eventHandle ();
- int /*long*/ window = parent.eventWindow ();
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ parentHandle = parent.eventHandle ();
+ long /*int*/ window = parent.eventWindow ();
+ long /*int*/ topHandle = topHandle ();
GdkWindowAttr attributes = new GdkWindowAttr ();
GtkAllocation allocation = new GtkAllocation ();
gtk_widget_get_allocation (topHandle, allocation);
@@ -4037,7 +4037,7 @@ public void setFont (Font font) {
checkWidget();
if (((state & FONT) == 0) && font == null) return;
this.font = font;
- int /*long*/ fontDesc;
+ long /*int*/ fontDesc;
if (font == null) {
fontDesc = defaultFont ().handle;
} else {
@@ -4052,7 +4052,7 @@ public void setFont (Font font) {
setFontDescription (fontDesc);
}
-void setFontDescription (int /*long*/ font) {
+void setFontDescription (long /*int*/ font) {
OS.gtk_widget_modify_font (handle, font);
}
@@ -4083,7 +4083,7 @@ public void setForeground (Color color) {
}
boolean set = false;
if (gdkColor == null) {
- int /*long*/ style = OS.gtk_widget_get_modifier_style (handle);
+ long /*int*/ style = OS.gtk_widget_get_modifier_style (handle);
set = (OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL) & OS.GTK_RC_FG) != 0;
} else {
GdkColor oldColor = getForegroundColor ();
@@ -4111,7 +4111,7 @@ void setInitialBounds () {
* first sized. The fix is to set the value to (0, 0) as
* expected by SWT.
*/
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
GtkAllocation allocation = new GtkAllocation();
if ((parent.style & SWT.MIRRORED) != 0) {
if (OS.GTK_VERSION >= OS.VERSION (2, 18, 0)) {
@@ -4234,7 +4234,7 @@ public boolean setParent (Composite parent) {
if (this.parent == parent) return true;
if (!isReparentable ()) return false;
OS.gtk_widget_realize (parent.handle);
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
GtkAllocation allocation = new GtkAllocation ();
gtk_widget_get_allocation (topHandle, allocation);
int x = allocation.x;
@@ -4256,7 +4256,7 @@ public boolean setParent (Composite parent) {
newDecorations.fixAccelGroup ();
oldDecorations.fixAccelGroup ();
}
- int /*long*/ newParent = parent.parentingHandle();
+ long /*int*/ newParent = parent.parentingHandle();
OS.gtk_widget_reparent(topHandle, newParent);
OS.gtk_fixed_move (newParent, topHandle, x, y);
/*
@@ -4286,7 +4286,7 @@ void setParentBackground () {
if (fixedHandle != 0) setBackgroundColor (fixedHandle, null);
}
-void setParentWindow (int /*long*/ widget) {
+void setParentWindow (long /*int*/ widget) {
}
boolean setRadioSelection (boolean value) {
@@ -4321,7 +4321,7 @@ public void setRedraw (boolean redraw) {
if (redraw) {
if (--drawCount == 0) {
if (redrawWindow != 0) {
- int /*long*/ window = paintWindow ();
+ long /*int*/ window = paintWindow ();
/* Explicitly hiding the window avoids flicker on GTK+ >= 2.6 */
OS.gdk_window_hide (redrawWindow);
OS.gdk_window_destroy (redrawWindow);
@@ -4332,7 +4332,7 @@ public void setRedraw (boolean redraw) {
} else {
if (drawCount++ == 0) {
if (gtk_widget_get_realized (handle)) {
- int /*long*/ window = paintWindow ();
+ long /*int*/ window = paintWindow ();
Rectangle rect = getBounds ();
GdkWindowAttr attributes = new GdkWindowAttr ();
attributes.width = rect.width;
@@ -4447,7 +4447,7 @@ public void setTouchEnabled(boolean enabled) {
public void setVisible (boolean visible) {
checkWidget();
if (((state & HIDDEN) == 0) == visible) return;
- int /*long*/ topHandle = topHandle();
+ long /*int*/ topHandle = topHandle();
if (visible) {
/*
* It is possible (but unlikely), that application
@@ -4528,11 +4528,11 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi
}
}
- int /*long*/ topHandle = topHandle ();
- int /*long*/ siblingHandle = sibling != null ? sibling.topHandle () : 0;
- int /*long*/ window = gtk_widget_get_window (topHandle);
+ long /*int*/ topHandle = topHandle ();
+ long /*int*/ siblingHandle = sibling != null ? sibling.topHandle () : 0;
+ long /*int*/ window = gtk_widget_get_window (topHandle);
if (window != 0) {
- int /*long*/ siblingWindow = 0;
+ long /*int*/ siblingWindow = 0;
if (sibling != null) {
if (above && sibling.enableWindow != 0) {
siblingWindow = enableWindow;
@@ -4540,7 +4540,7 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi
siblingWindow = OS.GTK_WIDGET_WINDOW (siblingHandle);
}
}
- int /*long*/ redrawWindow = fixChildren ? parent.redrawWindow : 0;
+ long /*int*/ redrawWindow = fixChildren ? parent.redrawWindow : 0;
if (!OS.GDK_WINDOWING_X11 () || (siblingWindow == 0 && (!above || redrawWindow == 0))) {
if (above) {
OS.gdk_window_raise (window);
@@ -4551,7 +4551,7 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations, boolean fi
OS.gdk_window_lower (window);
}
} else {
- int /*long*/ siblingW = siblingWindow != 0 ? siblingWindow : redrawWindow;
+ long /*int*/ siblingW = siblingWindow != 0 ? siblingWindow : redrawWindow;
boolean stack_mode = above;
if (redrawWindow != 0 && siblingWindow == 0) stack_mode = false;
restackWindow (window, siblingW, stack_mode);
@@ -4639,8 +4639,8 @@ boolean showMenu (int x, int y, int detail) {
void showWidget () {
// Comment this line to disable zero-sized widgets
state |= ZERO_WIDTH | ZERO_HEIGHT;
- int /*long*/ topHandle = topHandle ();
- int /*long*/ parentHandle = parent.parentingHandle ();
+ long /*int*/ topHandle = topHandle ();
+ long /*int*/ parentHandle = parent.parentingHandle ();
parent.setParentWindow (topHandle);
OS.gtk_container_add (parentHandle, topHandle);
if (handle != 0 && handle != topHandle) OS.gtk_widget_show (handle);
@@ -5082,7 +5082,7 @@ void update (boolean all, boolean flush) {
// checkWidget();
if (!gtk_widget_get_visible (topHandle ())) return;
if (!gtk_widget_get_realized (handle)) return;
- int /*long*/ window = paintWindow ();
+ long /*int*/ window = paintWindow ();
if (flush) display.flushExposes (window, all);
OS.gdk_window_process_updates (window, all);
OS.gdk_flush ();
@@ -5100,7 +5100,7 @@ void updateLayout (boolean all) {
/* Do nothing */
}
-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case EXPOSE_EVENT_INVERSE: {
if ((state & OBSCURED) != 0) break;
@@ -5109,8 +5109,8 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us
if (control != null && control.backgroundImage != null) {
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, arg0, GdkEventExpose.sizeof);
- int /*long*/ paintWindow = paintWindow();
- int /*long*/ window = gdkEvent.window;
+ long /*int*/ paintWindow = paintWindow();
+ long /*int*/ window = gdkEvent.window;
if (window != paintWindow) break;
drawBackground(control, window, gdkEvent.region, gdkEvent.area_x, gdkEvent.area_y, gdkEvent.area_width, gdkEvent.area_height);
}
@@ -5120,10 +5120,10 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us
if (control != null && control.backgroundImage != null) {
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, arg0, GdkEventExpose.sizeof);
- int /*long*/ paintWindow = paintWindow();
- int /*long*/ window = gdkEvent.window;
+ long /*int*/ paintWindow = paintWindow();
+ long /*int*/ window = gdkEvent.window;
if (window != paintWindow) break;
- int /*long*/ gdkGC = OS.gdk_gc_new (window);
+ long /*int*/ gdkGC = OS.gdk_gc_new (window);
OS.gdk_gc_set_clip_region (gdkGC, gdkEvent.region);
int[] dest_x = new int[1], dest_y = new int[1];
OS.gtk_widget_translate_coordinates (paintHandle (), control.paintHandle (), 0, 0, dest_x, dest_y);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java
index 96cd6be002..c64230064b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java
@@ -435,7 +435,7 @@ void dropDownCalendar(boolean drop) {
display.addFilter(SWT.MouseDown, clickListener);
}
-int /*long*/ focusHandle () {
+long /*int*/ focusHandle () {
if (text != null) return text.handle;
return super.focusHandle ();
}
@@ -687,17 +687,17 @@ public int getYear () {
}
}
-int /*long*/ gtk_day_selected (int /*long*/ widget) {
+long /*int*/ gtk_day_selected (long /*int*/ widget) {
sendSelectionEvent ();
return 0;
}
-int /*long*/ gtk_day_selected_double_click (int /*long*/ widget) {
+long /*int*/ gtk_day_selected_double_click (long /*int*/ widget) {
sendSelectionEvent (SWT.DefaultSelection);
return 0;
}
-int /*long*/ gtk_month_changed (int /*long*/ widget) {
+long /*int*/ gtk_month_changed (long /*int*/ widget) {
/*
* Feature in GTK. "month-changed" signal is emitted when the
* calendar is displayed though the day/month is not changed.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java
index 70e1d66a6c..aea02d3370 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Decorations.java
@@ -103,7 +103,7 @@ public class Decorations extends Canvas {
Menu [] menus;
Control savedFocus;
Button defaultButton, saveDefault;
- int /*long*/ accelGroup, vboxHandle;
+ long /*int*/ accelGroup, vboxHandle;
Decorations () {
/* Do nothing */
@@ -172,17 +172,17 @@ void _setImages (Image [] images) {
sort (bestImages);
images = bestImages;
}
- int /*long*/ pixbufs = 0;
+ long /*int*/ pixbufs = 0;
if (images != null) {
for (int i = 0; i < images.length; i++) {
Image image = images [i];
- int /*long*/ pixbuf = ImageList.createPixbuf (image);
+ long /*int*/ pixbuf = ImageList.createPixbuf (image);
pixbufs = OS.g_list_append (pixbufs, pixbuf);
}
}
OS.gtk_window_set_icon_list (topHandle (), pixbufs);
- int /*long*/ [] data = new int /*long*/ [1];
- int /*long*/ temp = pixbufs;
+ long /*int*/ [] data = new long /*int*/ [1];
+ long /*int*/ temp = pixbufs;
while (temp != 0) {
OS.memmove (data, temp, OS.PTR_SIZEOF);
OS.g_object_unref (data [0]);
@@ -233,7 +233,7 @@ void createAccelGroup () {
accelGroup = OS.gtk_accel_group_new ();
if (accelGroup == 0) error (SWT.ERROR_NO_HANDLES);
//FIXME - what should we do for Decorations
- int /*long*/ shellHandle = topHandle ();
+ long /*int*/ shellHandle = topHandle ();
OS.gtk_window_add_accel_group (shellHandle, accelGroup);
}
@@ -244,7 +244,7 @@ void createWidget (int index) {
void destroyAccelGroup () {
if (accelGroup == 0) return;
- int /*long*/ shellHandle = topHandle ();
+ long /*int*/ shellHandle = topHandle ();
OS.gtk_window_remove_accel_group (shellHandle, accelGroup);
//TEMPORARY CODE
// OS.g_object_unref (accelGroup);
@@ -547,7 +547,7 @@ boolean restoreFocus () {
*/
public void setDefaultButton (Button button) {
checkWidget();
- int /*long*/ buttonHandle = 0;
+ long /*int*/ buttonHandle = 0;
if (button != null) {
if (button.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
if (button.menuShell () != this) error (SWT.ERROR_INVALID_PARENT);
@@ -766,7 +766,7 @@ boolean traverseReturn () {
* key.
*/
if (!button.isVisible () || !button.isEnabled ()) return true;
- int /*long*/ shellHandle = _getShell ().topHandle ();
+ long /*int*/ shellHandle = _getShell ().topHandle ();
return OS.gtk_window_activate_default (shellHandle);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java
index d10d2b8bf1..14891b2434 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DirectoryDialog.java
@@ -119,9 +119,9 @@ public String open () {
}
String openChooserDialog () {
byte [] titleBytes = Converter.wcsToMbcs (null, title, true);
- int /*long*/ shellHandle = parent.topHandle ();
+ long /*int*/ shellHandle = parent.topHandle ();
Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
- int /*long*/ handle = 0;
+ long /*int*/ handle = 0;
if (display.getDismissalAlignment() == SWT.RIGHT) {
handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, OS.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, 0);
} else {
@@ -129,11 +129,11 @@ String openChooserDialog () {
}
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
- int /*long*/ group = OS.gtk_window_get_group(0);
+ long /*int*/ group = OS.gtk_window_get_group(0);
OS.gtk_window_group_add_window (group, handle);
}
OS.gtk_window_set_modal (handle, true);
- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
+ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
@@ -151,7 +151,7 @@ String openChooserDialog () {
* when setting a file name that is not a true canonical path.
* The fix is to use the canonical path.
*/
- int /*long*/ ptr = OS.realpath (buffer, null);
+ long /*int*/ ptr = OS.realpath (buffer, null);
if (ptr != 0) {
OS.gtk_file_chooser_set_current_folder (handle, ptr);
OS.g_free (ptr);
@@ -159,7 +159,7 @@ String openChooserDialog () {
}
if (message.length () > 0) {
byte [] buffer = Converter.wcsToMbcs (null, message, true);
- int /*long*/ box = 0;
+ long /*int*/ box = 0;
if (OS.GTK_VERSION >= OS.VERSION (3, 0, 0)) {
box = OS.gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, 0);
OS.gtk_box_set_homogeneous (box, false);
@@ -167,7 +167,7 @@ String openChooserDialog () {
box = OS.gtk_hbox_new (false, 0);
}
if (box == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ label = OS.gtk_label_new (buffer);
+ long /*int*/ label = OS.gtk_label_new (buffer);
if (label == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_container_add (box, label);
OS.gtk_widget_show (label);
@@ -183,7 +183,7 @@ String openChooserDialog () {
display.setModalDialog (this);
}
int signalId = 0;
- int /*long*/ hookId = 0;
+ long /*int*/ hookId = 0;
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
@@ -203,14 +203,14 @@ String openChooserDialog () {
display.setModalDialog (oldModal);
}
if (response == OS.GTK_RESPONSE_OK) {
- int /*long*/ path = OS.gtk_file_chooser_get_filename (handle);
+ long /*int*/ path = OS.gtk_file_chooser_get_filename (handle);
if (path != 0) {
- int /*long*/ utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null);
+ long /*int*/ utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null);
if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (path);
if (path != utf8Ptr) OS.g_free (path);
if (utf8Ptr != 0) {
- int /*long*/ [] items_written = new int /*long*/ [1];
- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
+ long /*int*/ [] items_written = new long /*int*/ [1];
+ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
OS.g_free (utf8Ptr);
if (utf16Ptr != 0) {
int clength = (int)/*64*/items_written [0];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
index d478017676..3735b03dc3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
@@ -99,30 +99,30 @@ public class Display extends Device {
/* Events Dispatching and Callback */
int gdkEventCount;
- int /*long*/ [] gdkEvents;
+ long /*int*/ [] gdkEvents;
Widget [] gdkEventWidgets;
int [] dispatchEvents;
Event [] eventQueue;
- int /*long*/ fds;
+ long /*int*/ fds;
int allocated_nfds;
boolean wake;
int [] max_priority = new int [1], timeout = new int [1];
Callback eventCallback, filterCallback;
- int /*long*/ eventProc, filterProc, windowProc2, windowProc3, windowProc4, windowProc5;
+ long /*int*/ eventProc, filterProc, windowProc2, windowProc3, windowProc4, windowProc5;
Callback windowCallback2, windowCallback3, windowCallback4, windowCallback5;
EventTable eventTable, filterTable;
static String APP_NAME = "SWT"; //$NON-NLS-1$
static String APP_VERSION = ""; //$NON-NLS-1$
static final String DISPATCH_EVENT_KEY = "org.eclipse.swt.internal.gtk.dispatchEvent"; //$NON-NLS-1$
static final String ADD_WIDGET_KEY = "org.eclipse.swt.internal.addWidget"; //$NON-NLS-1$
- int /*long*/ [] closures;
+ long /*int*/ [] closures;
int [] signalIds;
- int /*long*/ shellMapProcClosure;
+ long /*int*/ shellMapProcClosure;
/* Widget Table */
int [] indexTable;
int freeSlot;
- int /*long*/ lastHandle;
+ long /*int*/ lastHandle;
Widget lastWidget;
Widget [] widgetTable;
final static int GROW_SIZE = 1024;
@@ -153,7 +153,7 @@ public class Display extends Device {
/* Input method resources */
Control imControl;
- int /*long*/ preeditWindow, preeditLabel;
+ long /*int*/ preeditWindow, preeditLabel;
/* Sync/Async Widget Communication */
Synchronizer synchronizer = new Synchronizer (this);
@@ -174,40 +174,40 @@ public class Display extends Device {
int [] timerIds;
Runnable [] timerList;
Callback timerCallback;
- int /*long*/ timerProc;
+ long /*int*/ timerProc;
Callback windowTimerCallback;
- int /*long*/ windowTimerProc;
+ long /*int*/ windowTimerProc;
/* Caret */
Caret currentCaret;
Callback caretCallback;
int caretId;
- int /*long*/ caretProc;
+ long /*int*/ caretProc;
/* Mnemonics */
Control mnemonicControl;
/* Mouse hover */
int mouseHoverId;
- int /*long*/ mouseHoverHandle, mouseHoverProc;
+ long /*int*/ mouseHoverHandle, mouseHoverProc;
Callback mouseHoverCallback;
/* Menu position callback */
- int /*long*/ menuPositionProc;
+ long /*int*/ menuPositionProc;
Callback menuPositionCallback;
/* Tooltip size allocate callback */
- int /*long*/ sizeAllocateProc;
+ long /*int*/ sizeAllocateProc;
Callback sizeAllocateCallback;
- int /*long*/ sizeRequestProc;
+ long /*int*/ sizeRequestProc;
Callback sizeRequestCallback;
/* Shell map callback */
- int /*long*/ shellMapProc;
+ long /*int*/ shellMapProc;
Callback shellMapCallback;
/* Idle proc callback */
- int /*long*/ idleProc;
+ long /*int*/ idleProc;
int idleHandle;
Callback idleCallback;
static final String ADD_IDLE_PROC_KEY = "org.eclipse.swt.internal.gtk.addIdleProc"; //$NON-NLS-1$
@@ -216,27 +216,27 @@ public class Display extends Device {
boolean idleNeeded;
/* GtkTreeView callbacks */
- int /*long*/ cellDataProc;
+ long /*int*/ cellDataProc;
Callback cellDataCallback;
/* Set direction callback */
- int /*long*/ setDirectionProc;
+ long /*int*/ setDirectionProc;
Callback setDirectionCallback;
static final String GET_DIRECTION_PROC_KEY = "org.eclipse.swt.internal.gtk.getDirectionProc"; //$NON-NLS-1$
/* Set emissionProc callback */
- int /*long*/ emissionProc;
+ long /*int*/ emissionProc;
Callback emissionProcCallback;
static final String GET_EMISSION_PROC_KEY = "org.eclipse.swt.internal.gtk.getEmissionProc"; //$NON-NLS-1$
/* Get all children callback */
- int /*long*/ allChildrenProc, allChildren;
+ long /*int*/ allChildrenProc, allChildren;
Callback allChildrenCallback;
/* Settings callbacks */
- int /*long*/ signalProc;
+ long /*int*/ signalProc;
Callback signalCallback;
- int /*long*/ shellHandle;
+ long /*int*/ shellHandle;
boolean settingsChanged, runSettings;
static final int STYLE_SET = 1;
static final int PROPERTY_NOTIFY = 2;
@@ -248,14 +248,14 @@ public class Display extends Device {
Control currentControl;
/* Flush exposes */
- int /*long*/ checkIfEventProc;
+ long /*int*/ checkIfEventProc;
Callback checkIfEventCallback;
- int /*long*/ flushWindow;
+ long /*int*/ flushWindow;
boolean flushAll;
GdkRectangle flushRect = new GdkRectangle ();
XExposeEvent exposeEvent = new XExposeEvent ();
XVisibilityEvent visibilityEvent = new XVisibilityEvent ();
- int /*long*/ [] flushData = new int /*long*/ [1];
+ long /*int*/ [] flushData = new long /*int*/ [1];
/* System Resources */
Font systemFont;
@@ -285,7 +285,7 @@ public class Display extends Device {
int lastEventTime, lastUserEventTime;
/* Pango layout constructor */
- int /*long*/ pangoLayoutNewProc;
+ long /*int*/ pangoLayoutNewProc;
/* Custom Resize */
double resizeLocationX, resizeLocationY;
@@ -293,16 +293,16 @@ public class Display extends Device {
int resizeMode;
/* Fixed Subclass */
- static int /*long*/ fixed_type;
- static int /*long*/ fixed_info_ptr;
+ static long /*int*/ fixed_type;
+ static long /*int*/ fixed_info_ptr;
static Callback fixedClassInitCallback, fixedMapCallback, fixedSizeAllocateCallback;
- static int /*long*/ fixedClassInitProc, fixedMapProc, fixedSizeAllocateProc, oldFixedSizeAllocateProc;
+ static long /*int*/ fixedClassInitProc, fixedMapProc, fixedSizeAllocateProc, oldFixedSizeAllocateProc;
/* Renderer Subclass */
- static int /*long*/ text_renderer_type, pixbuf_renderer_type, toggle_renderer_type;
- static int /*long*/ text_renderer_info_ptr, pixbuf_renderer_info_ptr, toggle_renderer_info_ptr;
+ static long /*int*/ text_renderer_type, pixbuf_renderer_type, toggle_renderer_type;
+ static long /*int*/ text_renderer_info_ptr, pixbuf_renderer_info_ptr, toggle_renderer_info_ptr;
static Callback rendererClassInitCallback, rendererRenderCallback, rendererGetSizeCallback;
- static int /*long*/ rendererClassInitProc, rendererRenderProc, rendererGetSizeProc;
+ static long /*int*/ rendererClassInitProc, rendererRenderProc, rendererGetSizeProc;
/* Key Mappings */
static final int [] [] KeyTable = {
@@ -550,16 +550,16 @@ void addLayoutDeferred (Composite comp) {
layoutDeferred[layoutDeferredCount++] = comp;
}
-void addGdkEvent (int /*long*/ event) {
+void addGdkEvent (long /*int*/ event) {
if (gdkEvents == null) {
int length = GROW_SIZE;
- gdkEvents = new int /*long*/ [length];
+ gdkEvents = new long /*int*/ [length];
gdkEventWidgets = new Widget [length];
gdkEventCount = 0;
}
if (gdkEventCount == gdkEvents.length) {
int length = gdkEventCount + GROW_SIZE;
- int /*long*/ [] newEvents = new int /*long*/ [length];
+ long /*int*/ [] newEvents = new long /*int*/ [length];
System.arraycopy (gdkEvents, 0, newEvents, 0, gdkEventCount);
gdkEvents = newEvents;
Widget [] newWidgets = new Widget [length];
@@ -567,7 +567,7 @@ void addGdkEvent (int /*long*/ event) {
gdkEventWidgets = newWidgets;
}
Widget widget = null;
- int /*long*/ handle = OS.gtk_get_event_widget (event);
+ long /*int*/ handle = OS.gtk_get_event_widget (event);
if (handle != 0) {
do {
widget = getWidget (handle);
@@ -618,7 +618,7 @@ public void addListener (int eventType, Listener listener) {
eventTable.hook (eventType, listener);
}
-int /*long*/ allChildrenProc (int /*long*/ widget, int /*long*/ recurse) {
+long /*int*/ allChildrenProc (long /*int*/ widget, long /*int*/ recurse) {
allChildren = OS.g_list_append (allChildren, widget);
if (recurse != 0 && OS.GTK_IS_CONTAINER (widget)) {
OS.gtk_container_forall (widget, allChildrenProc, recurse);
@@ -626,7 +626,7 @@ int /*long*/ allChildrenProc (int /*long*/ widget, int /*long*/ recurse) {
return 0;
}
-void addMouseHoverTimeout (int /*long*/ handle) {
+void addMouseHoverTimeout (long /*int*/ handle) {
if (mouseHoverId != 0) OS.g_source_remove (mouseHoverId);
mouseHoverId = OS.g_timeout_add (400, mouseHoverProc, handle);
mouseHoverHandle = handle;
@@ -660,7 +660,7 @@ void addSkinnableWidget (Widget widget) {
skinList [skinCount++] = widget;
}
-void addWidget (int /*long*/ handle, Widget widget) {
+void addWidget (long /*int*/ handle, Widget widget) {
if (handle == 0) return;
if (freeSlot == -1) {
int length = (freeSlot = indexTable.length) + GROW_SIZE;
@@ -733,12 +733,12 @@ public void beep () {
if (!OS.GDK_WINDOWING_X11 ()) {
OS.gdk_flush ();
} else {
- int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
+ long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
OS.XFlush (xDisplay);
}
}
-int /*long*/ cellDataProc (int /*long*/ tree_column, int /*long*/ cell, int /*long*/ tree_model, int /*long*/ iter, int /*long*/ data) {
+long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*int*/ tree_model, long /*int*/ iter, long /*int*/ data) {
Widget widget = getWidget (data);
if (widget == null) return 0;
return widget.cellDataProc (tree_column, cell, tree_model, iter, data);
@@ -761,7 +761,7 @@ static void checkDisplay (Thread thread, boolean multiple) {
}
}
-int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /*long*/ userData) {
+long /*int*/ checkIfEventProc (long /*int*/ display, long /*int*/ xEvent, long /*int*/ userData) {
int type = OS.X_EVENT_TYPE (xEvent);
switch (type) {
case OS.VisibilityNotify:
@@ -777,7 +777,7 @@ int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /*
default:
return 0;
}
- int /*long*/ window = 0;
+ long /*int*/ window = 0;
if (OS.GTK_VERSION >= OS.VERSION (2, 24, 0)) {
window = OS.gdk_x11_window_lookup_for_display(OS.gdk_display_get_default(), OS.X_EVENT_WINDOW (xEvent));
} else {
@@ -786,7 +786,7 @@ int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /*
if (window == 0) return 0;
if (flushWindow != 0) {
if (flushAll) {
- int /*long*/ tempWindow = window;
+ long /*int*/ tempWindow = window;
do {
if (tempWindow == flushWindow) break;
} while ((tempWindow = OS.gdk_window_get_parent (tempWindow)) != 0);
@@ -811,7 +811,7 @@ int /*long*/ checkIfEventProc (int /*long*/ display, int /*long*/ xEvent, int /*
case OS.VisibilityNotify: {
OS.memmove (visibilityEvent, xEvent, XVisibilityEvent.sizeof);
OS.gdk_window_get_user_data (window, flushData);
- int /*long*/ handle = flushData [0];
+ long /*int*/ handle = flushData [0];
Widget widget = handle != 0 ? getWidget (handle) : null;
if (widget != null && widget instanceof Control) {
Control control = (Control) widget;
@@ -909,11 +909,11 @@ void createDisplay (DeviceData data) {
if (OS.GTK_VERSION < OS.VERSION(2, 24, 0)) {
OS.gtk_set_locale();
}
- if (!OS.gtk_init_check (new int /*long*/ [] {0}, null)) {
+ if (!OS.gtk_init_check (new long /*int*/ [] {0}, null)) {
SWT.error (SWT.ERROR_NO_HANDLES, null, " [gtk_init_check() failed]"); //$NON-NLS-1$
}
if (OS.GDK_WINDOWING_X11 ()) xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
- int /*long*/ ptr = OS.gtk_check_version (MAJOR, MINOR, MICRO);
+ long /*int*/ ptr = OS.gtk_check_version (MAJOR, MINOR, MICRO);
if (ptr != 0) {
int length = OS.strlen (ptr);
byte [] buffer = new byte [length];
@@ -1011,14 +1011,14 @@ void createDisplay (DeviceData data) {
OS.gdk_window_add_filter (0, filterProc, 0);
if (OS.GDK_WINDOWING_X11 ()) {
- int /*long*/ xWindow;
+ long /*int*/ xWindow;
if (OS.GTK_VERSION >= OS.VERSION(2, 14, 0)){
xWindow = OS.gdk_x11_drawable_get_xid (OS.gtk_widget_get_window (shellHandle));
} else {
xWindow = OS.gdk_x11_drawable_get_xid (OS.GTK_WIDGET_WINDOW (shellHandle));
}
byte[] atomName = Converter.wcsToMbcs (null, "SWT_Window_" + APP_NAME, true); //$NON-NLS-1$
- int /*long*/ atom = OS.XInternAtom (xDisplay, atomName, false);
+ long /*int*/ atom = OS.XInternAtom (xDisplay, atomName, false);
OS.XSetSelectionOwner (xDisplay, atom, xWindow, OS.CurrentTime);
OS.XGetSelectionOwner (xDisplay, atom);
}
@@ -1031,9 +1031,9 @@ void createDisplay (DeviceData data) {
}
Image createImage (String name) {
- int /*long*/ style = OS.gtk_widget_get_default_style ();
+ long /*int*/ style = OS.gtk_widget_get_default_style ();
byte[] buffer = Converter.wcsToMbcs (null, name, true);
- int /*long*/ pixbuf = OS.gtk_icon_set_render_icon (
+ long /*int*/ pixbuf = OS.gtk_icon_set_render_icon (
OS.gtk_icon_factory_lookup_default (buffer), style,
OS.GTK_TEXT_DIR_NONE, OS.GTK_STATE_NORMAL, OS.GTK_ICON_SIZE_DIALOG, 0, 0);
if (pixbuf == 0) return null;
@@ -1041,7 +1041,7 @@ Image createImage (String name) {
int height = OS.gdk_pixbuf_get_height (pixbuf);
int stride = OS.gdk_pixbuf_get_rowstride (pixbuf);
boolean hasAlpha = OS.gdk_pixbuf_get_has_alpha (pixbuf);
- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels (pixbuf);
+ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels (pixbuf);
byte [] data = new byte [stride * height];
OS.memmove (data, pixels, data.length);
OS.g_object_unref (pixbuf);
@@ -1093,7 +1093,7 @@ protected void destroy () {
void destroyDisplay () {
}
-int /*long*/ emissionProc (int /*long*/ ihint, int /*long*/ n_param_values, int /*long*/ param_values, int /*long*/ data) {
+long /*int*/ emissionProc (long /*int*/ ihint, long /*int*/ n_param_values, long /*int*/ param_values, long /*int*/ data) {
if (OS.gtk_widget_get_toplevel (OS.g_value_peek_pointer(param_values)) == data) {
OS.gtk_widget_set_direction (OS.g_value_peek_pointer(param_values), OS.GTK_TEXT_DIR_RTL);
}
@@ -1162,7 +1162,7 @@ void error (int code) {
SWT.error (code);
}
-int /*long*/ eventProc (int /*long*/ event, int /*long*/ data) {
+long /*int*/ eventProc (long /*int*/ event, long /*int*/ data) {
/*
* Use gdk_event_get_time() rather than event.time or
* gtk_get_current_event_time(). If the event does not
@@ -1219,7 +1219,7 @@ int /*long*/ eventProc (int /*long*/ event, int /*long*/ data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public Widget findWidget (int /*long*/ handle) {
+public Widget findWidget (long /*int*/ handle) {
checkDevice ();
return getWidget (handle);
}
@@ -1248,7 +1248,7 @@ public Widget findWidget (int /*long*/ handle) {
*
* @since 3.1
*/
-public Widget findWidget (int /*long*/ handle, int /*long*/ id) {
+public Widget findWidget (long /*int*/ handle, long /*int*/ id) {
checkDevice ();
return null;
}
@@ -1270,12 +1270,12 @@ public Widget findWidget (int /*long*/ handle, int /*long*/ id) {
*
* @since 3.3
*/
-public Widget findWidget (Widget widget, int /*long*/ id) {
+public Widget findWidget (Widget widget, long /*int*/ id) {
checkDevice ();
return null;
}
-static int /*long*/ fixedClassInitProc (int /*long*/ g_class, int /*long*/ class_data) {
+static long /*int*/ fixedClassInitProc (long /*int*/ g_class, long /*int*/ class_data) {
GtkWidgetClass klass = new GtkWidgetClass ();
OS.memmove (klass, g_class);
klass.map = fixedMapProc;
@@ -1285,21 +1285,21 @@ static int /*long*/ fixedClassInitProc (int /*long*/ g_class, int /*long*/ class
return 0;
}
-static int /*long*/ fixedMapProc (int /*long*/ handle) {
+static long /*int*/ fixedMapProc (long /*int*/ handle) {
Display display = getCurrent ();
Widget widget = display.getWidget (handle);
if (widget != null) return widget.fixedMapProc (handle);
return 0;
}
-static int /*long*/ fixedSizeAllocateProc (int /*long*/ handle, int /*long*/ allocation) {
+static long /*int*/ fixedSizeAllocateProc (long /*int*/ handle, long /*int*/ allocation) {
Display display = getCurrent ();
Widget widget = display.getWidget (handle);
if (widget != null) return widget.fixedSizeAllocateProc (handle, allocation);
return OS.Call (oldFixedSizeAllocateProc, handle, allocation);
}
-static int /*long*/ rendererClassInitProc (int /*long*/ g_class, int /*long*/ class_data) {
+static long /*int*/ rendererClassInitProc (long /*int*/ g_class, long /*int*/ class_data) {
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
klass.render = rendererRenderProc;
@@ -1308,28 +1308,28 @@ static int /*long*/ rendererClassInitProc (int /*long*/ g_class, int /*long*/ cl
return 0;
}
-static int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ handle, int /*long*/ cell_area, int /*long*/ x_offset, int /*long*/ y_offset, int /*long*/ width, int /*long*/ height) {
+static long /*int*/ rendererGetSizeProc (long /*int*/ cell, long /*int*/ handle, long /*int*/ cell_area, long /*int*/ x_offset, long /*int*/ y_offset, long /*int*/ width, long /*int*/ height) {
Display display = getCurrent ();
Widget widget = display.getWidget (handle);
if (widget != null) return widget.rendererGetSizeProc (cell, handle, cell_area, x_offset, y_offset, width, height);
return 0;
}
-static int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*long*/ handle, int /*long*/ background_area, int /*long*/ cell_area, int /*long*/ expose_area, int /*long*/ flags) {
+static long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ window, long /*int*/ handle, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ expose_area, long /*int*/ flags) {
Display display = getCurrent ();
Widget widget = display.getWidget (handle);
if (widget != null) return widget.rendererRenderProc (cell, window, handle, background_area, cell_area, expose_area, flags);
return 0;
}
-void flushExposes (int /*long*/ window, boolean all) {
+void flushExposes (long /*int*/ window, boolean all) {
OS.gdk_flush ();
OS.gdk_flush ();
if (OS.GDK_WINDOWING_X11 ()) {
this.flushWindow = window;
this.flushAll = all;
- int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
- int /*long*/ xEvent = OS.g_malloc (XEvent.sizeof);
+ long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
+ long /*int*/ xEvent = OS.g_malloc (XEvent.sizeof);
OS.XCheckIfEvent (xDisplay, xEvent, checkIfEventProc, 0);
OS.g_free (xEvent);
this.flushWindow = 0;
@@ -1382,7 +1382,7 @@ public static Display getCurrent () {
int getCaretBlinkTime () {
// checkDevice ();
- int /*long*/ settings = OS.gtk_settings_get_default ();
+ long /*int*/ settings = OS.gtk_settings_get_default ();
if (settings == 0) return 500;
int [] buffer = new int [1];
OS.g_object_get (settings, OS.gtk_cursor_blink, buffer, 0);
@@ -1412,9 +1412,9 @@ int getCaretBlinkTime () {
public Control getCursorControl () {
checkDevice();
int[] x = new int[1], y = new int[1];
- int /*long*/ handle = 0;
- int /*long*/ [] user_data = new int /*long*/ [1];
- int /*long*/ window = OS.gdk_window_at_pointer (x,y);
+ long /*int*/ handle = 0;
+ long /*int*/ [] user_data = new long /*int*/ [1];
+ long /*int*/ window = OS.gdk_window_at_pointer (x,y);
if (window != 0) {
OS.gdk_window_get_user_data (window, user_data);
handle = user_data [0];
@@ -1427,8 +1427,8 @@ public Control getCursorControl () {
if (!OS.GDK_WINDOWING_X11 ()) return null;
OS.gdk_error_trap_push ();
int[] unusedInt = new int[1];
- int /*long*/[] unusedPtr = new int /*long*/[1], buffer = new int /*long*/[1];
- int /*long*/ xWindow, xParent = OS.XDefaultRootWindow (xDisplay);
+ long /*int*/[] unusedPtr = new long /*int*/[1], buffer = new long /*int*/[1];
+ long /*int*/ xWindow, xParent = OS.XDefaultRootWindow (xDisplay);
do {
if (OS.XQueryPointer (xDisplay, xParent, unusedPtr, buffer, unusedInt, unusedInt, unusedInt, unusedInt, unusedInt) == 0) {
handle = 0;
@@ -1436,7 +1436,7 @@ public Control getCursorControl () {
}
if ((xWindow = buffer [0]) != 0) {
xParent = xWindow;
- int /*long*/ gdkWindow = 0;
+ long /*int*/ gdkWindow = 0;
if (OS.GTK_VERSION >= OS.VERSION (2, 24, 0)) {
gdkWindow = OS.gdk_x11_window_lookup_for_display(OS.gdk_display_get_default(), xWindow);
} else {
@@ -1461,15 +1461,15 @@ public Control getCursorControl () {
return null;
}
-static GtkBorder getEntryInnerBorder (int /*long*/ handle) {
+static GtkBorder getEntryInnerBorder (long /*int*/ handle) {
GtkBorder gtkBorder = new GtkBorder();
if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
- int /*long*/ border = OS.gtk_entry_get_inner_border (handle);
+ long /*int*/ border = OS.gtk_entry_get_inner_border (handle);
if (border != 0) {
OS.memmove (gtkBorder, border, GtkBorder.sizeof);
return gtkBorder;
}
- int /*long*/ [] borderPtr = new int /*long*/ [1];
+ long /*int*/ [] borderPtr = new long /*int*/ [1];
OS.gtk_widget_style_get (handle, OS.inner_border, borderPtr,0);
if (borderPtr[0] != 0) {
OS.memmove (gtkBorder, borderPtr[0], GtkBorder.sizeof);
@@ -1494,7 +1494,7 @@ boolean filters (int eventType) {
return filterTable.hooks (eventType);
}
-int /*long*/ filterProc (int /*long*/ xEvent, int /*long*/ gdkEvent, int /*long*/ data) {
+long /*int*/ filterProc (long /*int*/ xEvent, long /*int*/ gdkEvent, long /*int*/ data) {
Widget widget = getWidget (data);
if (widget == null) return 0;
return widget.filterProc (xEvent, gdkEvent, data);
@@ -1610,19 +1610,19 @@ public Object getData () {
return data;
}
-int /*long*/ gtk_fixed_get_type () {
+long /*int*/ gtk_fixed_get_type () {
return fixed_type;
}
-int /*long*/ gtk_cell_renderer_text_get_type () {
+long /*int*/ gtk_cell_renderer_text_get_type () {
return text_renderer_type;
}
-int /*long*/ gtk_cell_renderer_pixbuf_get_type () {
+long /*int*/ gtk_cell_renderer_pixbuf_get_type () {
return pixbuf_renderer_type;
}
-int /*long*/ gtk_cell_renderer_toggle_get_type () {
+long /*int*/ gtk_cell_renderer_toggle_get_type () {
return toggle_renderer_type;
}
@@ -1684,7 +1684,7 @@ public int getDismissalAlignment () {
checkDevice ();
int [] buffer = new int [1];
if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {
- int /*long*/ settings = OS.gtk_settings_get_default ();
+ long /*int*/ settings = OS.gtk_settings_get_default ();
OS.g_object_get (settings, OS.gtk_alternative_button_order, buffer, 0);
}
return buffer [0] == 1 ? SWT.LEFT : SWT.RIGHT;
@@ -1704,7 +1704,7 @@ public int getDismissalAlignment () {
*/
public int getDoubleClickTime () {
checkDevice ();
- int /*long*/ settings = OS.gtk_settings_get_default ();
+ long /*int*/ settings = OS.gtk_settings_get_default ();
int [] buffer = new int [1];
OS.g_object_get (settings, OS.gtk_double_click_time, buffer, 0);
return buffer [0];
@@ -1729,8 +1729,8 @@ public Control getFocusControl () {
return focusControl;
}
if (activeShell == null) return null;
- int /*long*/ shellHandle = activeShell.shellHandle;
- int /*long*/ handle = OS.gtk_window_get_focus (shellHandle);
+ long /*int*/ shellHandle = activeShell.shellHandle;
+ long /*int*/ handle = OS.gtk_window_get_focus (shellHandle);
if (handle == 0) return null;
do {
Widget widget = getWidget (handle);
@@ -1827,12 +1827,12 @@ Dialog getModalDialog () {
*/
Rectangle getWorkArea() {
byte[] name = Converter.wcsToMbcs (null, "_NET_WORKAREA", true); //$NON-NLS-1$
- int /*long*/ atom = OS.gdk_atom_intern (name, true);
+ long /*int*/ atom = OS.gdk_atom_intern (name, true);
if (atom == OS.GDK_NONE) return null;
- int /*long*/[] actualType = new int /*long*/[1];
+ long /*int*/[] actualType = new long /*int*/[1];
int[] actualFormat = new int[1];
int[] actualLength = new int[1];
- int /*long*/[] data = new int /*long*/[1];
+ long /*int*/[] data = new long /*int*/[1];
if (!OS.gdk_property_get (OS.gdk_get_default_root_window(), atom, OS.GDK_NONE, 0, 16, 0, actualType, actualFormat, actualLength, data)) {
return null;
}
@@ -1863,7 +1863,7 @@ public Monitor [] getMonitors () {
checkDevice ();
Monitor [] monitors = null;
Rectangle workArea = getWorkArea();
- int /*long*/ screen = OS.gdk_screen_get_default ();
+ long /*int*/ screen = OS.gdk_screen_get_default ();
if (screen != 0) {
int monitorCount = OS.gdk_screen_get_n_monitors (screen);
if (monitorCount > 0) {
@@ -2183,12 +2183,12 @@ void initializeSystemColors () {
GdkColor gdkColor;
/* Get Tooltip resources */
- int /*long*/ tooltipShellHandle = OS.gtk_window_new (OS.GTK_WINDOW_POPUP);
+ long /*int*/ tooltipShellHandle = OS.gtk_window_new (OS.GTK_WINDOW_POPUP);
if (tooltipShellHandle == 0) error (SWT.ERROR_NO_HANDLES);
byte[] gtk_tooltips = Converter.wcsToMbcs (null, "gtk-tooltips", true); //$NON-NLS-1$
OS.gtk_widget_set_name (tooltipShellHandle, gtk_tooltips);
OS.gtk_widget_realize (tooltipShellHandle);
- int /*long*/ tooltipStyle = OS.gtk_widget_get_style (tooltipShellHandle);
+ long /*int*/ tooltipStyle = OS.gtk_widget_get_style (tooltipShellHandle);
gdkColor = new GdkColor();
OS.gtk_style_get_fg (tooltipStyle, OS.GTK_STATE_NORMAL, gdkColor);
COLOR_INFO_FOREGROUND = gdkColor;
@@ -2198,7 +2198,7 @@ void initializeSystemColors () {
OS.gtk_widget_destroy (tooltipShellHandle);
/* Get Shell resources */
- int /*long*/ style = OS.gtk_widget_get_style (shellHandle);
+ long /*int*/ style = OS.gtk_widget_get_style (shellHandle);
gdkColor = new GdkColor();
OS.gtk_style_get_black (style, gdkColor);
COLOR_WIDGET_DARK_SHADOW = gdkColor;
@@ -2279,8 +2279,8 @@ void initializeSystemColors () {
public Font getSystemFont () {
checkDevice ();
if (systemFont != null) return systemFont;
- int /*long*/ style = OS.gtk_widget_get_style (shellHandle);
- int /*long*/ defaultFont = OS.pango_font_description_copy (OS.gtk_style_get_font_desc (style));
+ long /*int*/ style = OS.gtk_widget_get_style (shellHandle);
+ long /*int*/ defaultFont = OS.pango_font_description_copy (OS.gtk_style_get_font_desc (style));
return systemFont = Font.gtk_new (this, defaultFont);
}
@@ -2353,10 +2353,10 @@ public boolean getTouchEnabled() {
return false;
}
-Widget getWidget (int /*long*/ handle) {
+Widget getWidget (long /*int*/ handle) {
if (handle == 0) return null;
if (lastWidget != null && lastHandle == handle) return lastWidget;
- int /*long*/ index = OS.g_object_get_qdata (handle, SWT_OBJECT_INDEX) - 1;
+ long /*int*/ index = OS.g_object_get_qdata (handle, SWT_OBJECT_INDEX) - 1;
if (0 <= index && index < widgetTable.length) {
lastHandle = handle;
return lastWidget = widgetTable [(int)/*64*/index];
@@ -2364,7 +2364,7 @@ Widget getWidget (int /*long*/ handle) {
return null;
}
-int /*long*/ idleProc (int /*long*/ data) {
+long /*int*/ idleProc (long /*int*/ data) {
boolean result = runAsyncMessages (false);
if (!result) {
synchronized (idleLock) {
@@ -2394,7 +2394,7 @@ protected void init () {
}
void initializeCallbacks () {
- closures = new int /*long*/ [Widget.LAST_SIGNAL];
+ closures = new long /*int*/ [Widget.LAST_SIGNAL];
signalIds = new int [Widget.LAST_SIGNAL];
/* Cache signals for GtkWidget */
@@ -2599,8 +2599,8 @@ void initializeCallbacks () {
}
void initializeSubclasses () {
- int /*long*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();
- int /*long*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);
+ long /*int*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();
+ long /*int*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);
pangoLayoutNewProc = OS.G_OBJECT_CLASS_CONSTRUCTOR (pangoLayoutClass);
OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, OS.pangoLayoutNewProc_CALLBACK(pangoLayoutNewProc));
OS.g_type_class_unref (pangoLayoutClass);
@@ -2618,10 +2618,10 @@ void initializeSystemSettings () {
* fix is to for the initializaion by creating
* a temporary GtkEntry.
*/
- int /*long*/ entry = OS.gtk_entry_new ();
+ long /*int*/ entry = OS.gtk_entry_new ();
OS.gtk_widget_destroy (entry);
int [] buffer2 = new int [1];
- int /*long*/ settings = OS.gtk_settings_get_default ();
+ long /*int*/ settings = OS.gtk_settings_get_default ();
OS.g_object_get (settings, OS.gtk_entry_select_on_focus, buffer2, 0);
entrySelectOnFocus = buffer2 [0] != 0;
}
@@ -2636,9 +2636,9 @@ void initializeWidgetTable () {
void initializeWindowManager () {
/* Get the window manager name */
windowManager = ""; //$NON-NLS-1$
- int /*long*/ screen = OS.gdk_screen_get_default ();
+ long /*int*/ screen = OS.gdk_screen_get_default ();
if (screen != 0) {
- int /*long*/ ptr2 = OS.gdk_x11_screen_get_window_manager_name (screen);
+ long /*int*/ ptr2 = OS.gdk_x11_screen_get_window_manager_name (screen);
if (ptr2 != 0) {
int length = OS.strlen (ptr2);
if (length > 0) {
@@ -2665,8 +2665,8 @@ void initializeWindowManager () {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
- int /*long*/ gc = hDC;
+public void internal_dispose_GC (long /*int*/ hDC, GCData data) {
+ long /*int*/ gc = hDC;
if (OS.USE_CAIRO) {
Cairo.cairo_destroy (gc);
} else {
@@ -2696,10 +2696,10 @@ public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public int /*long*/ internal_new_GC (GCData data) {
+public long /*int*/ internal_new_GC (GCData data) {
if (isDisposed()) error(SWT.ERROR_DEVICE_DISPOSED);
- int /*long*/ root = OS.gdk_get_default_root_window();
- int /*long*/ gc;
+ long /*int*/ root = OS.gdk_get_default_root_window();
+ long /*int*/ gc;
if (OS.USE_CAIRO) {
gc = OS.gdk_cairo_create (root);
if (gc == 0) error (SWT.ERROR_NO_HANDLES);
@@ -2812,7 +2812,7 @@ public Point map (Control from, Control to, int x, int y) {
Point point = new Point (x, y);
if (from == to) return point;
if (from != null) {
- int /*long*/ window = from.eventWindow ();
+ long /*int*/ window = from.eventWindow ();
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
if ((from.style & SWT.MIRRORED) != 0) point.x = from.getClientWidth () - point.x;
@@ -2820,7 +2820,7 @@ public Point map (Control from, Control to, int x, int y) {
point.y += origin_y [0];
}
if (to != null) {
- int /*long*/ window = to.eventWindow ();
+ long /*int*/ window = to.eventWindow ();
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
point.x -= origin_x [0];
@@ -2889,7 +2889,7 @@ static char mbcsToWcs (char ch) {
return result [0];
}
-int /*long*/ menuPositionProc (int /*long*/ menu, int /*long*/ x, int /*long*/ y, int /*long*/ push_in, int /*long*/ user_data) {
+long /*int*/ menuPositionProc (long /*int*/ menu, long /*int*/ x, long /*int*/ y, long /*int*/ push_in, long /*int*/ user_data) {
Widget widget = getWidget (menu);
if (widget == null) return 0;
return widget.menuPositionProc (menu, x, y, push_in, user_data);
@@ -2941,7 +2941,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
if (from == to) return rect;
boolean fromRTL = false, toRTL = false;
if (from != null) {
- int /*long*/ window = from.eventWindow ();
+ long /*int*/ window = from.eventWindow ();
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
if (fromRTL = (from.style & SWT.MIRRORED) != 0) rect.x = from.getClientWidth() - rect.x;
@@ -2949,7 +2949,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
rect.y += origin_y [0];
}
if (to != null) {
- int /*long*/ window = to.eventWindow ();
+ long /*int*/ window = to.eventWindow ();
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
rect.x -= origin_x [0];
@@ -2960,7 +2960,7 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
return rect;
}
-int /*long*/ mouseHoverProc (int /*long*/ handle) {
+long /*int*/ mouseHoverProc (long /*int*/ handle) {
Widget widget = getWidget (handle);
if (widget == null) return 0;
return widget.hoverProc (handle);
@@ -3040,13 +3040,13 @@ public boolean post (Event event) {
if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
if (event == null) error (SWT.ERROR_NULL_ARGUMENT);
if (!OS.GDK_WINDOWING_X11()) return false;
- int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
+ long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
int type = event.type;
switch (type) {
case SWT.KeyDown:
case SWT.KeyUp: {
int keyCode = 0;
- int /*long*/ keysym = untranslateKey (event.keyCode);
+ long /*int*/ keysym = untranslateKey (event.keyCode);
if (keysym != 0) keyCode = OS.XKeysymToKeycode (xDisplay, keysym);
if (keyCode == 0) {
char key = event.character;
@@ -3128,7 +3128,7 @@ void postEvent (Event event) {
void putGdkEvents () {
if (gdkEventCount != 0) {
for (int i = 0; i < gdkEventCount; i++) {
- int /*long*/ event = gdkEvents [i];
+ long /*int*/ event = gdkEvents [i];
Widget widget = gdkEventWidgets [i];
if (widget == null || !widget.isDisposed ()) {
OS.gdk_event_put (event);
@@ -3387,8 +3387,8 @@ void releaseDisplay () {
signalProc = 0;
/* Dispose subclass */
- int /*long*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();
- int /*long*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);
+ long /*int*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();
+ long /*int*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);
OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, pangoLayoutNewProc);
OS.g_type_class_unref (pangoLayoutClass);
pangoLayoutNewProc = 0;
@@ -3447,9 +3447,9 @@ public void removeFilter (int eventType, Listener listener) {
if (filterTable.size () == 0) filterTable = null;
}
-int /*long*/ removeGdkEvent () {
+long /*int*/ removeGdkEvent () {
if (gdkEventCount == 0) return 0;
- int /*long*/ event = gdkEvents [0];
+ long /*int*/ event = gdkEvents [0];
--gdkEventCount;
System.arraycopy (gdkEvents, 1, gdkEvents, 0, gdkEventCount);
System.arraycopy (gdkEventWidgets, 1, gdkEventWidgets, 0, gdkEventCount);
@@ -3498,7 +3498,7 @@ public void removeListener (int eventType, Listener listener) {
eventTable.unhook (eventType, listener);
}
-void removeMouseHoverTimeout (int /*long*/ handle) {
+void removeMouseHoverTimeout (long /*int*/ handle) {
if (handle != mouseHoverHandle) return;
if (mouseHoverId != 0) OS.g_source_remove (mouseHoverId);
mouseHoverId = 0;
@@ -3515,7 +3515,7 @@ void removePopup (Menu menu) {
}
}
-Widget removeWidget (int /*long*/ handle) {
+Widget removeWidget (long /*int*/ handle) {
if (handle == 0) return null;
lastWidget = null;
Widget widget = null;
@@ -3719,8 +3719,8 @@ public static void setAppVersion (String version) {
public void setCursorLocation (int x, int y) {
checkDevice ();
if (OS.GDK_WINDOWING_X11 ()) {
- int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
- int /*long*/ xWindow = OS.XDefaultRootWindow (xDisplay);
+ long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
+ long /*int*/ xWindow = OS.XDefaultRootWindow (xDisplay);
OS.XWarpPointer (xDisplay, OS.None, xWindow, 0, 0, 0, 0, x, y);
}
}
@@ -3788,7 +3788,7 @@ public void setData (String key, Object value) {
}
if (key.equals (ADD_WIDGET_KEY)) {
Object [] data = (Object []) value;
- int /*long*/ handle = ((LONG) data [0]).value;
+ long /*int*/ handle = ((LONG) data [0]).value;
Widget widget = (Widget) data [1];
if (widget != null) {
addWidget (handle, widget);
@@ -3877,10 +3877,10 @@ public void setData (Object data) {
this.data = data;
}
-int /*long*/ setDirectionProc (int /*long*/ widget, int /*long*/ direction) {
+long /*int*/ setDirectionProc (long /*int*/ widget, long /*int*/ direction) {
OS.gtk_widget_set_direction (widget, (int)/*64*/ direction);
if (OS.GTK_IS_MENU_ITEM (widget)) {
- int /*long*/ submenu = OS.gtk_menu_item_get_submenu (widget);
+ long /*int*/ submenu = OS.gtk_menu_item_get_submenu (widget);
if (submenu != 0) {
OS.gtk_widget_set_direction (submenu, (int)/*64*/ direction);
OS.gtk_container_forall (submenu, setDirectionProc, direction);
@@ -3955,9 +3955,9 @@ void showIMWindow (Control control) {
OS.gtk_container_add (preeditWindow, preeditLabel);
OS.gtk_widget_show (preeditLabel);
}
- int /*long*/ [] preeditString = new int /*long*/ [1];
- int /*long*/ [] pangoAttrs = new int /*long*/ [1];
- int /*long*/ imHandle = control.imHandle ();
+ long /*int*/ [] preeditString = new long /*int*/ [1];
+ long /*int*/ [] pangoAttrs = new long /*int*/ [1];
+ long /*int*/ imHandle = control.imHandle ();
OS.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, null);
if (preeditString [0] != 0 && OS.strlen (preeditString [0]) > 0) {
Control widget = control.findBackgroundControl ();
@@ -4011,7 +4011,7 @@ public boolean sleep () {
fds = OS.g_malloc (OS.GPollFD_sizeof () * allocated_nfds);
}
max_priority [0] = timeout [0] = 0;
- int /*long*/ context = OS.g_main_context_default ();
+ long /*int*/ context = OS.g_main_context_default ();
boolean result = false;
do {
if (OS.g_main_context_acquire (context)) {
@@ -4022,7 +4022,7 @@ public boolean sleep () {
allocated_nfds = nfds;
fds = OS.g_malloc (OS.GPollFD_sizeof() * allocated_nfds);
}
- int /*long*/ poll = OS.g_main_context_get_poll_func (context);
+ long /*int*/ poll = OS.g_main_context_get_poll_func (context);
if (poll != 0) {
if (nfds > 0 || timeout [0] != 0) {
/*
@@ -4116,7 +4116,7 @@ public void timerExec (int milliseconds, Runnable runnable) {
}
}
-int /*long*/ timerProc (int /*long*/ i) {
+long /*int*/ timerProc (long /*int*/ i) {
if (timerList == null) return 0;
int index = (int)/*64*/i;
if (0 <= index && index < timerList.length) {
@@ -4128,7 +4128,7 @@ int /*long*/ timerProc (int /*long*/ i) {
return 0;
}
-int /*long*/ caretProc (int /*long*/ clientData) {
+long /*int*/ caretProc (long /*int*/ clientData) {
caretId = 0;
if (currentCaret == null) {
return 0;
@@ -4143,13 +4143,13 @@ int /*long*/ caretProc (int /*long*/ clientData) {
return 0;
}
-int /*long*/ sizeAllocateProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+long /*int*/ sizeAllocateProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
Widget widget = getWidget (user_data);
if (widget == null) return 0;
return widget.sizeAllocateProc (handle, arg0, user_data);
}
-int /*long*/ sizeRequestProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+long /*int*/ sizeRequestProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
Widget widget = getWidget (user_data);
if (widget == null) return 0;
return widget.sizeRequestProc (handle, arg0, user_data);
@@ -4207,13 +4207,13 @@ void setCurrentCaret (Caret caret) {
caretId = OS.g_timeout_add (blinkRate, caretProc, 0);
}
-int /*long*/ shellMapProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+long /*int*/ shellMapProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
Widget widget = getWidget (handle);
if (widget == null) return 0;
return widget.shellMapProc (handle, arg0, user_data);
}
-int /*long*/ signalProc (int /*long*/ gobject, int /*long*/ arg1, int /*long*/ user_data) {
+long /*int*/ signalProc (long /*int*/ gobject, long /*int*/ arg1, long /*int*/ user_data) {
switch((int)/*64*/user_data) {
case STYLE_SET:
settingsChanged = true;
@@ -4223,19 +4223,19 @@ int /*long*/ signalProc (int /*long*/ gobject, int /*long*/ arg1, int /*long*/ u
OS.memmove (gdkEvent, arg1);
if (gdkEvent.type == OS.GDK_PROPERTY_NOTIFY) {
byte[] name = Converter.wcsToMbcs (null, "org.eclipse.swt.filePath.message", true); //$NON-NLS-1$
- int /*long*/ atom = OS.gdk_x11_atom_to_xatom (OS.gdk_atom_intern (name, true));
+ long /*int*/ atom = OS.gdk_x11_atom_to_xatom (OS.gdk_atom_intern (name, true));
if (atom == OS.gdk_x11_atom_to_xatom (gdkEvent.atom)) {
- int /*long*/ xWindow;
+ long /*int*/ xWindow;
if (OS.GTK_VERSION >= OS.VERSION(2, 14, 0)){
xWindow = OS.gdk_x11_drawable_get_xid (OS.gtk_widget_get_window( shellHandle));
} else {
xWindow = OS.gdk_x11_drawable_get_xid (OS.GTK_WIDGET_WINDOW( shellHandle));
}
- int /*long*/ [] type = new int /*long*/ [1];
+ long /*int*/ [] type = new long /*int*/ [1];
int [] format = new int [1];
int [] nitems = new int [1];
int [] bytes_after = new int [1];
- int /*long*/ [] data = new int /*long*/ [1];
+ long /*int*/ [] data = new long /*int*/ [1];
OS.XGetWindowProperty (OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default()), xWindow, atom, 0, -1, true, OS.AnyPropertyType,
type, format, nitems, bytes_after, data);
@@ -4367,31 +4367,31 @@ static char wcsToMbcs (char ch) {
return 0;
}
-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {
+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) {
Widget widget = getWidget (handle);
if (widget == null) return 0;
return widget.windowProc (handle, user_data);
}
-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
Widget widget = getWidget (handle);
if (widget == null) return 0;
return widget.windowProc (handle, arg0, user_data);
}
-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ user_data) {
+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) {
Widget widget = getWidget (handle);
if (widget == null) return 0;
return widget.windowProc (handle, arg0, arg1, user_data);
}
-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ user_data) {
+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) {
Widget widget = getWidget (handle);
if (widget == null) return 0;
return widget.windowProc (handle, arg0, arg1, arg2, user_data);
}
-int /*long*/ windowTimerProc (int /*long*/ handle) {
+long /*int*/ windowTimerProc (long /*int*/ handle) {
Widget widget = getWidget (handle);
if (widget == null) return 0;
return widget.timerProc (handle);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java
index c515ebaf77..8f4b923e3c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java
@@ -138,7 +138,7 @@ void createHandle (int index) {
OS.gtk_scrolled_window_set_policy (scrolledHandle, OS.GTK_POLICY_NEVER, OS.GTK_POLICY_AUTOMATIC);
OS.gtk_container_add (fixedHandle, scrolledHandle);
OS.gtk_scrolled_window_add_with_viewport (scrolledHandle, handle);
- int /*long*/ viewport = OS.gtk_bin_get_child (scrolledHandle);
+ long /*int*/ viewport = OS.gtk_bin_get_child (scrolledHandle);
OS.gtk_viewport_set_shadow_type (viewport, OS.GTK_SHADOW_NONE);
} else {
OS.gtk_container_add (fixedHandle, handle);
@@ -178,11 +178,11 @@ void destroyItem (ExpandItem item) {
layoutItems (index, true);
}
-int /*long*/ eventHandle () {
+long /*int*/ eventHandle () {
return fixedHandle;
}
-boolean forceFocus (int /*long*/ focusHandle) {
+boolean forceFocus (long /*int*/ focusHandle) {
if (lastFocus != null && lastFocus.setFocus ()) return true;
for (int i = 0; i < itemCount; i++) {
ExpandItem item = items [i];
@@ -288,9 +288,9 @@ public int getSpacing () {
return spacing;
}
-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {
if (!hasFocus ()) return 0;
- int /*long*/ result = super.gtk_key_press_event (widget, event);
+ long /*int*/ result = super.gtk_key_press_event (widget, event);
if (result != 0) return result;
int index = 0;
while (index < itemCount) {
@@ -349,13 +349,13 @@ void layoutItems (int index, boolean setScrollbar) {
}
}
-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
- int /*long*/ result = super.gtk_size_allocate (widget, allocation);
+long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
+ long /*int*/ result = super.gtk_size_allocate (widget, allocation);
layoutItems (0, false);
return result;
}
-int /*long*/ parentingHandle () {
+long /*int*/ parentingHandle () {
return fixedHandle;
}
@@ -404,7 +404,7 @@ void reskinChildren (int flags) {
super.reskinChildren (flags);
}
-void setFontDescription (int /*long*/ font) {
+void setFontDescription (long /*int*/ font) {
super.setFontDescription (font);
for (int i = 0; i < itemCount; i++) {
items[i].setFontDescription (font);
@@ -435,7 +435,7 @@ void setScrollbar () {
ExpandItem item = items [itemCount - 1];
int maxHeight = item.y + getBandHeight () + spacing;
if (item.expanded) maxHeight += item.height;
- int /*long*/ adjustmentHandle = OS.gtk_scrolled_window_get_vadjustment (scrolledHandle);
+ long /*int*/ adjustmentHandle = OS.gtk_scrolled_window_get_vadjustment (scrolledHandle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, adjustmentHandle);
yCurrentScroll = (int)adjustment.value;
@@ -457,7 +457,7 @@ void setScrollbar () {
gtk_widget_get_allocation (fixedHandle, allocation);
int width = allocation.width - spacing * 2;
if (policy == OS.GTK_POLICY_ALWAYS) {
- int /*long*/ vHandle = 0;
+ long /*int*/ vHandle = 0;
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
vHandle = OS.GTK_SCROLLED_WINDOW_VSCROLLBAR (scrolledHandle);
} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java
index 311e6b802b..93673774d4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java
@@ -39,7 +39,7 @@ public class ExpandItem extends Item {
ExpandBar parent;
Control control;
ImageList imageList;
- int /*long*/ clientHandle, boxHandle, labelHandle, imageHandle;
+ long /*int*/ clientHandle, boxHandle, labelHandle, imageHandle;
boolean expanded;
int x, y, width, height;
int imageHeight, imageWidth;
@@ -311,7 +311,7 @@ int getPreferredWidth (GC gc) {
return width;
}
-int /*long*/ gtk_activate (int /*long*/ widget) {
+long /*int*/ gtk_activate (long /*int*/ widget) {
Event event = new Event ();
event.item = this;
int type = OS.gtk_expander_get_expanded (handle) ? SWT.Collapse : SWT.Expand;
@@ -319,23 +319,23 @@ int /*long*/ gtk_activate (int /*long*/ widget) {
return 0;
}
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
setFocus ();
return 0;
}
-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {
gtk_widget_set_can_focus (handle, false);
parent.lastFocus = this;
return 0;
}
-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
+long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
parent.layoutItems (0, false);
return 0;
}
-int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) {
parent.gtk_enter_notify_event(widget, event);
return 0;
}
@@ -495,7 +495,7 @@ boolean setFocus () {
return result;
}
-void setFontDescription (int /*long*/ font) {
+void setFontDescription (long /*int*/ font) {
OS.gtk_widget_modify_font (handle, font);
if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);
if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font);
@@ -534,7 +534,7 @@ public void setImage (Image image) {
if (image.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
imageList = new ImageList ();
int imageIndex = imageList.add (image);
- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);
+ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
if (text.length () == 0) OS.gtk_widget_hide (labelHandle);
OS.gtk_widget_show (imageHandle);
@@ -569,7 +569,7 @@ void showWidget (int index) {
if (labelHandle != 0) OS.gtk_widget_show (labelHandle);
}
-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {
+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case ACTIVATE_INVERSE: {
expanded = OS.gtk_expander_get_expanded (handle);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java
index b57f25accb..23ba263587 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java
@@ -45,7 +45,7 @@ public class FileDialog extends Dialog {
int filterIndex = -1;
boolean overwrite = false;
boolean uriMode;
- int /*long*/ handle;
+ long /*int*/ handle;
static final char SEPARATOR = System.getProperty ("file.separator").charAt (0);
static final char EXTENSION_SEPARATOR = ';';
static final char FILE_EXTENSION_SEPARATOR = '.';
@@ -102,7 +102,7 @@ String computeResultChooserDialog () {
/* MULTI is only valid if the native dialog's action is Open */
fullPath = null;
if ((style & SWT.MULTI) != 0) {
- int /*long*/ list = 0;
+ long /*int*/ list = 0;
if (uriMode) {
list = OS.gtk_file_chooser_get_uris (handle);
} else {
@@ -110,11 +110,11 @@ String computeResultChooserDialog () {
}
int listLength = OS.g_slist_length (list);
fileNames = new String [listLength];
- int /*long*/ current = list;
+ long /*int*/ current = list;
int writePos = 0;
for (int i = 0; i < listLength; i++) {
- int /*long*/ name = OS.g_slist_data (current);
- int /*long*/ utf8Ptr = 0;
+ long /*int*/ name = OS.g_slist_data (current);
+ long /*int*/ utf8Ptr = 0;
if (uriMode) {
utf8Ptr = name;
} else {
@@ -123,8 +123,8 @@ String computeResultChooserDialog () {
}
if (name != utf8Ptr) OS.g_free (name);
if (utf8Ptr != 0) {
- int /*long*/ [] items_written = new int /*long*/ [1];
- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
+ long /*int*/ [] items_written = new long /*int*/ [1];
+ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
OS.g_free (utf8Ptr);
if (utf16Ptr != 0) {
int clength = (int)/*64*/items_written [0];
@@ -144,11 +144,11 @@ String computeResultChooserDialog () {
}
OS.g_slist_free (list);
} else {
- int /*long*/ utf8Ptr = 0;
+ long /*int*/ utf8Ptr = 0;
if (uriMode) {
utf8Ptr = OS.gtk_file_chooser_get_uri (handle);
} else {
- int /*long*/ path = OS.gtk_file_chooser_get_filename (handle);
+ long /*int*/ path = OS.gtk_file_chooser_get_filename (handle);
if (path != 0) {
utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null);
if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (path);
@@ -156,8 +156,8 @@ String computeResultChooserDialog () {
}
}
if (utf8Ptr != 0) {
- int /*long*/ [] items_written = new int /*long*/ [1];
- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
+ long /*int*/ [] items_written = new long /*int*/ [1];
+ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
OS.g_free (utf8Ptr);
if (utf16Ptr != 0) {
int clength = (int)/*64*/items_written [0];
@@ -171,9 +171,9 @@ String computeResultChooserDialog () {
}
}
filterIndex = -1;
- int /*long*/ filter = OS.gtk_file_chooser_get_filter (handle);
+ long /*int*/ filter = OS.gtk_file_chooser_get_filter (handle);
if (filter != 0) {
- int /*long*/ filterNamePtr = OS.gtk_file_filter_get_name (filter);
+ long /*int*/ filterNamePtr = OS.gtk_file_filter_get_name (filter);
if (filterNamePtr != 0) {
int length = OS.strlen (filterNamePtr);
byte[] buffer = new byte [length];
@@ -317,7 +317,7 @@ String openChooserDialog () {
int action = (style & SWT.SAVE) != 0 ?
OS.GTK_FILE_CHOOSER_ACTION_SAVE :
OS.GTK_FILE_CHOOSER_ACTION_OPEN;
- int /*long*/ shellHandle = parent.topHandle ();
+ long /*int*/ shellHandle = parent.topHandle ();
Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
if (display.getDismissalAlignment() == SWT.RIGHT) {
handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, 0);
@@ -327,10 +327,10 @@ String openChooserDialog () {
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_window_set_modal (handle, true);
if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
- int /*long*/ group = OS.gtk_window_get_group(0);
+ long /*int*/ group = OS.gtk_window_get_group(0);
OS.gtk_window_group_add_window (group, handle);
}
- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
+ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
@@ -347,7 +347,7 @@ String openChooserDialog () {
display.setModalDialog (this);
}
int signalId = 0;
- int /*long*/ hookId = 0;
+ long /*int*/ hookId = 0;
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
@@ -394,7 +394,7 @@ void presetChooserDialog () {
* when setting a file name that is not a true canonical path.
* The fix is to use the canonical path.
*/
- int /*long*/ ptr = OS.realpath (buffer, null);
+ long /*int*/ ptr = OS.realpath (buffer, null);
OS.gtk_file_chooser_set_current_folder (handle, ptr);
OS.g_free (ptr);
}
@@ -425,7 +425,7 @@ void presetChooserDialog () {
* when setting a file name that is not a true canonical path.
* The fix is to use the canonical path.
*/
- int /*long*/ ptr = OS.realpath (buffer, null);
+ long /*int*/ ptr = OS.realpath (buffer, null);
if (ptr != 0) {
if (fileName.length() > 0) {
OS.gtk_file_chooser_set_filename (handle, ptr);
@@ -447,10 +447,10 @@ void presetChooserDialog () {
/* Set the extension filters */
if (filterNames == null) filterNames = new String [0];
if (filterExtensions == null) filterExtensions = new String [0];
- int /*long*/ initialFilter = 0;
+ long /*int*/ initialFilter = 0;
for (int i = 0; i < filterExtensions.length; i++) {
if (filterExtensions [i] != null) {
- int /*long*/ filter = OS.gtk_file_filter_new ();
+ long /*int*/ filter = OS.gtk_file_filter_new ();
if (filterNames.length > i && filterNames [i] != null) {
byte [] name = Converter.wcsToMbcs (null, filterNames [i], true);
OS.gtk_file_filter_set_name (filter, name);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java
index 81e2e1d8ea..905110d34d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FontDialog.java
@@ -151,28 +151,28 @@ public RGB getRGB () {
*
*/
public FontData open () {
- int /*long*/ handle;
+ long /*int*/ handle;
byte [] titleBytes;
titleBytes = Converter.wcsToMbcs (null, title, true);
Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
handle = OS.gtk_font_selection_dialog_new (titleBytes);
if (parent!=null) {
- int /*long*/ shellHandle = parent.topHandle ();
+ long /*int*/ shellHandle = parent.topHandle ();
OS.gtk_window_set_transient_for(handle, shellHandle);
- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
+ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
}
}
if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
- int /*long*/ group = OS.gtk_window_get_group(0);
+ long /*int*/ group = OS.gtk_window_get_group(0);
OS.gtk_window_group_add_window (group, handle);
}
OS.gtk_window_set_modal (handle, true);
if (fontData != null) {
Font font = new Font (display, fontData);
- int /*long*/ fontName = OS.pango_font_description_to_string (font.handle);
+ long /*int*/ fontName = OS.pango_font_description_to_string (font.handle);
int length = OS.strlen (fontName);
byte [] buffer = new byte [length + 1];
OS.memmove (buffer, fontName, length);
@@ -187,7 +187,7 @@ public FontData open () {
display.setModalDialog (this);
}
int signalId = 0;
- int /*long*/ hookId = 0;
+ long /*int*/ hookId = 0;
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
@@ -208,12 +208,12 @@ public FontData open () {
}
boolean success = response == OS.GTK_RESPONSE_OK;
if (success) {
- int /*long*/ fontName = OS.gtk_font_selection_dialog_get_font_name (handle);
+ long /*int*/ fontName = OS.gtk_font_selection_dialog_get_font_name (handle);
int length = OS.strlen (fontName);
byte [] buffer = new byte [length + 1];
OS.memmove (buffer, fontName, length);
OS.g_free (fontName);
- int /*long*/ fontDesc = OS.pango_font_description_from_string (buffer);
+ long /*int*/ fontDesc = OS.pango_font_description_from_string (buffer);
Font font = Font.gtk_new (display, fontDesc);
fontData = font.getFontData () [0];
OS.pango_font_description_free (fontDesc);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java
index 0045057364..0a30a8d093 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Group.java
@@ -41,7 +41,7 @@ import org.eclipse.swt.graphics.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Group extends Composite {
- int /*long*/ clientHandle, labelHandle;
+ long /*int*/ clientHandle, labelHandle;
String text = "";
/**
@@ -96,7 +96,7 @@ protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
-int /*long*/ clientHandle () {
+long /*int*/ clientHandle () {
return clientHandle;
}
@@ -159,7 +159,7 @@ void enableWidget (boolean enabled) {
OS.gtk_widget_set_sensitive (labelHandle, enabled);
}
-int /*long*/ eventHandle () {
+long /*int*/ eventHandle () {
return fixedHandle;
}
@@ -203,7 +203,7 @@ boolean mnemonicMatch (char key) {
return mnemonicMatch (labelHandle, key);
}
-int /*long*/ parentingHandle() {
+long /*int*/ parentingHandle() {
return fixedHandle;
}
@@ -229,7 +229,7 @@ void setBackgroundColor (GdkColor color) {
setBackgroundColor(fixedHandle, color);
}
-void setFontDescription (int /*long*/ font) {
+void setFontDescription (long /*int*/ font) {
super.setFontDescription (font);
OS.gtk_widget_modify_font (labelHandle, font);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/IME.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/IME.java
index 4a4e2c0e9b..11e85a9f98 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/IME.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/IME.java
@@ -242,14 +242,14 @@ public boolean getWideCaret () {
return false;
}
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
if (!isInlineEnabled ()) return 0;
- int /*long*/ imHandle = imHandle ();
+ long /*int*/ imHandle = imHandle ();
if (imHandle != 0) OS.gtk_im_context_reset (imHandle);
return 0;
}
-int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ textPtr) {
+long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ textPtr) {
if (!isInlineEnabled ()) return 0;
boolean doit = true;
ranges = null;
@@ -278,14 +278,14 @@ int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ textPtr) {
return doit ? 0 : 1;
}
-int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) {
+long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) {
if (!isInlineEnabled ()) return 0;
ranges = null;
styles = null;
commitCount = 0;
- int /*long*/ imHandle = imHandle ();
- int /*long*/ [] preeditString = new int /*long*/ [1];
- int /*long*/ [] pangoAttrs = new int /*long*/ [1];
+ long /*int*/ imHandle = imHandle ();
+ long /*int*/ [] preeditString = new long /*int*/ [1];
+ long /*int*/ [] pangoAttrs = new long /*int*/ [1];
int [] cursorPos = new int [1];
OS.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, cursorPos);
caretOffset = cursorPos [0];
@@ -297,7 +297,7 @@ int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) {
chars = Converter.mbcsToWcs (null, buffer);
if (pangoAttrs [0] != 0) {
int count = 0;
- int /*long*/ iterator = OS.pango_attr_list_get_iterator (pangoAttrs [0]);
+ long /*int*/ iterator = OS.pango_attr_list_get_iterator (pangoAttrs [0]);
while (OS.pango_attr_iterator_next (iterator)) count++;
OS.pango_attr_iterator_destroy (iterator);
ranges = new int [count * 2];
@@ -312,7 +312,7 @@ int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) {
ranges [i * 2] = (int)/*64*/OS.g_utf16_pointer_to_offset (preeditString [0], preeditString [0] + start [0]);
ranges [i * 2 + 1] = (int)/*64*/OS.g_utf16_pointer_to_offset (preeditString [0], preeditString [0] + end [0]) - 1;
styles [i] = new TextStyle (null, null, null);
- int /*long*/ attr = OS.pango_attr_iterator_get (iterator, OS.PANGO_ATTR_FOREGROUND);
+ long /*int*/ attr = OS.pango_attr_iterator_get (iterator, OS.PANGO_ATTR_FOREGROUND);
if (attr != 0) {
OS.memmove (attrColor, attr, PangoAttrColor.sizeof);
GdkColor color = new GdkColor ();
@@ -395,7 +395,7 @@ int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) {
return 1;
}
-int /*long*/ imHandle () {
+long /*int*/ imHandle () {
return parent.imHandle ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java
index d7f8ab56ee..c75b7d6046 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java
@@ -50,7 +50,7 @@ import org.eclipse.swt.graphics.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Label extends Control {
- int /*long*/ frameHandle, labelHandle, imageHandle;
+ long /*int*/ frameHandle, labelHandle, imageHandle;
ImageList imageList;
Image image;
String text;
@@ -132,7 +132,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
boolean fixWrap = labelHandle != 0 && (style & SWT.WRAP) != 0 && gtk_widget_get_visible (labelHandle);
if (fixWrap || frameHandle != 0) forceResize ();
if (fixWrap) {
- int /*long*/ labelLayout = OS.gtk_label_get_layout (labelHandle);
+ long /*int*/ labelLayout = OS.gtk_label_get_layout (labelHandle);
int pangoWidth = OS.pango_layout_get_width (labelLayout);
if (wHint != SWT.DEFAULT) {
OS.pango_layout_set_width (labelLayout, wHint * OS.PANGO_SCALE);
@@ -176,11 +176,11 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
* muliple lines of text.
*/
if (hHint == SWT.DEFAULT && labelHandle != 0) {
- int /*long*/ layout = OS.gtk_label_get_layout (labelHandle);
- int /*long*/ context = OS.pango_layout_get_context (layout);
- int /*long*/ lang = OS.pango_context_get_language (context);
- int /*long*/ font = getFontDescription ();
- int /*long*/ metrics = OS.pango_context_get_metrics (context, font, lang);
+ long /*int*/ layout = OS.gtk_label_get_layout (labelHandle);
+ long /*int*/ context = OS.pango_layout_get_context (layout);
+ long /*int*/ lang = OS.pango_context_get_language (context);
+ long /*int*/ font = getFontDescription ();
+ long /*int*/ metrics = OS.pango_context_get_metrics (context, font, lang);
int ascent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_ascent (metrics));
int descent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_descent (metrics));
OS.pango_font_metrics_unref (metrics);
@@ -189,7 +189,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
OS.g_object_get (labelHandle, OS.ypad, buffer, 0);
fontHeight += 2 * buffer [0];
if (frameHandle != 0) {
- int /*long*/ style = OS.gtk_widget_get_style (frameHandle);
+ long /*int*/ style = OS.gtk_widget_get_style (frameHandle);
fontHeight += 2 * OS.gtk_style_get_ythickness (style);
fontHeight += 2 * OS.gtk_container_get_border_width (frameHandle);
}
@@ -251,7 +251,7 @@ void deregister () {
if (imageHandle != 0) display.removeWidget (imageHandle);
}
-int /*long*/ eventHandle () {
+long /*int*/ eventHandle () {
return fixedHandle;
}
@@ -484,7 +484,7 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
return result;
}
-void setFontDescription (int /*long*/ font) {
+void setFontDescription (long /*int*/ font) {
super.setFontDescription (font);
if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);
if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font);
@@ -529,7 +529,7 @@ public void setImage (Image image) {
if (image != null) {
imageList = new ImageList ();
int imageIndex = imageList.add (image);
- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);
+ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
OS.gtk_widget_hide (labelHandle);
OS.gtk_widget_show (imageHandle);
@@ -585,8 +585,8 @@ void showWidget () {
if (labelHandle != 0) OS.gtk_widget_show (labelHandle);
}
-int /*long*/ gtk_separator_new (int orientation) {
- int /*long*/ separator = 0;
+long /*int*/ gtk_separator_new (int orientation) {
+ long /*int*/ separator = 0;
if (OS.GTK_VERSION >= OS.VERSION (3, 0, 0)) {
separator = OS.gtk_separator_new (orientation);
} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java
index 2bceea8310..42945186d3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java
@@ -284,8 +284,8 @@ public String getText () {
return text;
}
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ result = super.gtk_button_press_event (widget, event);
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ result = super.gtk_button_press_event (widget, event);
if (result != 0) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
@@ -323,8 +323,8 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ result = super.gtk_button_release_event (widget, event);
+long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ result = super.gtk_button_release_event (widget, event);
if (result != 0) return result;
if (focusIndex == -1) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
@@ -347,8 +347,8 @@ int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event)
return result;
}
-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
- int /*long*/ result = super.gtk_event_after (widget, gdkEvent);
+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
+ long /*int*/ result = super.gtk_event_after (widget, gdkEvent);
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
switch (event.type) {
@@ -359,7 +359,7 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
return result;
}
-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) {
if ((state & OBSCURED) != 0) return 0;
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, eventPtr, GdkEventExpose.sizeof);
@@ -399,8 +399,8 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
return 0;
}
-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
- int /*long*/ result = super.gtk_key_press_event (widget, eventPtr);
+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) {
+ long /*int*/ result = super.gtk_key_press_event (widget, eventPtr);
if (result != 0) return result;
if (focusIndex == -1) return result;
GdkEventKey gdkEvent = new GdkEventKey ();
@@ -429,8 +429,8 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
return result;
}
-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ result = super.gtk_motion_notify_event (widget, event);
+long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ result = super.gtk_motion_notify_event (widget, event);
if (result != 0) return result;
GdkEventMotion gdkEvent = new GdkEventMotion ();
OS.memmove (gdkEvent, event, GdkEventMotion.sizeof);
@@ -695,7 +695,7 @@ int setBounds(int x, int y, int width, int height, boolean move, boolean resize)
return result;
}
-void setFontDescription (int /*long*/ font) {
+void setFontDescription (long /*int*/ font) {
super.setFontDescription (font);
layout.setFont (Font.gtk_new (display, font));
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
index f7dbfe5506..17f46889cd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java
@@ -40,7 +40,7 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class List extends Scrollable {
- int /*long*/ modelHandle;
+ long /*int*/ modelHandle;
static final int TEXT_COLUMN = 0;
@@ -96,7 +96,7 @@ public void add (String string) {
checkWidget();
if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
byte [] buffer = Converter.wcsToMbcs (null, string, true);
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED);
OS.gtk_list_store_append (modelHandle, iter);
OS.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1);
@@ -134,7 +134,7 @@ public void add (String string, int index) {
error (SWT.ERROR_INVALID_RANGE);
}
byte [] buffer = Converter.wcsToMbcs (null, string, true);
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED);
/*
* Feature in GTK. It is much faster to append to a list store
@@ -196,14 +196,14 @@ void createHandle (int index) {
* Columns:
* 0 - text
*/
- int /*long*/ [] types = new int /*long*/ [] {OS.G_TYPE_STRING ()};
+ long /*int*/ [] types = new long /*int*/ [] {OS.G_TYPE_STRING ()};
modelHandle = OS.gtk_list_store_newv (types.length, types);
if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES);
handle = OS.gtk_tree_view_new_with_model (modelHandle);
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ textRenderer = OS.gtk_cell_renderer_text_new ();
+ long /*int*/ textRenderer = OS.gtk_cell_renderer_text_new ();
if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ columnHandle = OS.gtk_tree_view_column_new ();
+ long /*int*/ columnHandle = OS.gtk_tree_view_column_new ();
if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_tree_view_column_pack_start (columnHandle, textRenderer, true);
OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.text, TEXT_COLUMN);
@@ -213,7 +213,7 @@ void createHandle (int index) {
OS.gtk_container_add (scrolledHandle, handle);
int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
- int /*long*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);
OS.gtk_tree_selection_set_mode (selectionHandle, mode);
OS.gtk_tree_view_set_headers_visible (handle, false);
int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
@@ -279,8 +279,8 @@ void deregister() {
public void deselect (int index) {
checkWidget();
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) return;
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
OS.gtk_tree_selection_unselect_iter (selection, iter);
@@ -310,8 +310,8 @@ public void deselect (int start, int end) {
if (start >= count && end >= count) return;
start = Math.min (count - 1, Math.max (0, start));
end = Math.min (count - 1, Math.max (0, end));
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int index=start; index<=end; index++) {
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
@@ -341,9 +341,9 @@ public void deselect (int start, int end) {
public void deselect (int [] indices) {
checkWidget();
if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int i=0; i=start; index--) {
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
@@ -998,8 +998,8 @@ public void remove (int [] indices) {
if (!(0 <= start && start <= end && end < count)) {
error (SWT.ERROR_INVALID_RANGE);
}
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
int last = -1;
for (int i=0; i= count) return;
start = Math.max (0, start);
end = Math.min (end, count - 1);
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int index=start; index<=end; index++) {
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
OS.gtk_tree_selection_select_iter (selection, iter);
if ((style & SWT.SINGLE) != 0) {
- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
@@ -1156,9 +1156,9 @@ public void select (int [] indices) {
if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);
int length = indices.length;
if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return;
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int i=0; i= OS.VERSION (2, 10, 0))) {
/*
* Popup-menu to the status icon should be aligned to
@@ -240,7 +240,7 @@ void _setVisible (boolean visible) {
}
}
-void addAccelerators (int /*long*/ accelGroup) {
+void addAccelerators (long /*int*/ accelGroup) {
MenuItem [] items = getItems ();
for (int i = 0; i < items.length; i++) {
MenuItem item = items[i];
@@ -306,7 +306,7 @@ void createHandle (int index) {
if ((style & SWT.BAR) != 0) {
handle = OS.gtk_menu_bar_new ();
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ vboxHandle = parent.vboxHandle;
+ long /*int*/ vboxHandle = parent.vboxHandle;
OS.gtk_container_add (vboxHandle, handle);
OS.gtk_box_set_child_packing (vboxHandle, handle, false, true, 0, OS.GTK_PACK_START);
} else {
@@ -315,9 +315,9 @@ void createHandle (int index) {
}
}
-void createIMMenu (int /*long*/ imHandle) {
+void createIMMenu (long /*int*/ imHandle) {
boolean showInputMethod = false;
- int /*long*/ settings = OS.gtk_settings_get_default ();
+ long /*int*/ settings = OS.gtk_settings_get_default ();
if (settings != 0) {
int [] buffer = new int [1];
OS.g_object_get (settings, OS.gtk_show_input_method_menu, buffer, 0);
@@ -349,7 +349,7 @@ void createIMMenu (int /*long*/ imHandle) {
OS.gtk_widget_show (imItem);
OS.gtk_menu_shell_insert (handle, imItem, -1);
}
- int /*long*/ imSubmenu = OS.gtk_menu_new ();
+ long /*int*/ imSubmenu = OS.gtk_menu_new ();
OS.gtk_im_multicontext_append_menuitems (imHandle, imSubmenu);
OS.gtk_menu_item_set_submenu (imItem, imSubmenu);
}
@@ -375,7 +375,7 @@ void fixMenus (Decorations newParent) {
if (!gtk_widget_get_mapped (handle)) {
return new Rectangle (0, 0, 0, 0);
}
- int /*long*/ window = gtk_widget_get_window (handle);
+ long /*int*/ window = gtk_widget_get_window (handle);
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
GtkAllocation allocation = new GtkAllocation ();
@@ -441,13 +441,13 @@ public boolean getEnabled () {
*/
public MenuItem getItem (int index) {
checkWidget();
- int /*long*/ list = OS.gtk_container_get_children (handle);
+ long /*int*/ list = OS.gtk_container_get_children (handle);
if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
int count = OS.g_list_length (list);
if (imSeparator != 0) count--;
if (imItem != 0) count--;
if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE);
- int /*long*/ data = OS.g_list_nth_data (list, index);
+ long /*int*/ data = OS.g_list_nth_data (list, index);
OS.g_list_free (list);
if (data == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
return (MenuItem) display.getWidget (data);
@@ -465,7 +465,7 @@ public MenuItem getItem (int index) {
*/
public int getItemCount () {
checkWidget();
- int /*long*/ list = OS.gtk_container_get_children (handle);
+ long /*int*/ list = OS.gtk_container_get_children (handle);
if (list == 0) return 0;
int count = OS.g_list_length (list);
OS.g_list_free (list);
@@ -492,7 +492,7 @@ public int getItemCount () {
*/
public MenuItem [] getItems () {
checkWidget();
- int /*long*/ list = OS.gtk_container_get_children (handle);
+ long /*int*/ list = OS.gtk_container_get_children (handle);
if (list == 0) return new MenuItem [0];
int count = OS.g_list_length (list);
if (imSeparator != 0) count--;
@@ -500,7 +500,7 @@ public MenuItem [] getItems () {
MenuItem [] items = new MenuItem [count];
int index = 0;
for (int i=0; i
*/
public int open () {
- int /*long*/ parentHandle = (parent != null) ? parent.topHandle() : 0;
+ long /*int*/ parentHandle = (parent != null) ? parent.topHandle() : 0;
int dialogFlags = OS.GTK_DIALOG_DESTROY_WITH_PARENT;
if ((style & (SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL)) != 0) {
dialogFlags |= OS.GTK_DIALOG_MODAL;
@@ -154,7 +154,7 @@ public int open () {
handle = OS.gtk_message_dialog_new(parentHandle, dialogFlags, messageType, 0, buffer);
if (handle == 0) error(SWT.ERROR_NO_HANDLES);
if (parentHandle != 0) {
- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (parentHandle);
+ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (parentHandle);
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
@@ -172,7 +172,7 @@ public int open () {
* dialog to the same window group as of the shells.
*/
if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
- int /*long*/ group = OS.gtk_window_get_group(0);
+ long /*int*/ group = OS.gtk_window_get_group(0);
OS.gtk_window_group_add_window (group, handle);
}
@@ -181,7 +181,7 @@ public int open () {
display.setModalDialog (this);
}
int signalId = 0;
- int /*long*/ hookId = 0;
+ long /*int*/ hookId = 0;
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ProgressBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ProgressBar.java
index 30a87bcb95..69559df1f7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ProgressBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ProgressBar.java
@@ -161,8 +161,8 @@ public int getState () {
return SWT.NORMAL;
}
-int /*long*/ gtk_realize (int /*long*/ widget) {
- int /*long*/ result = super.gtk_realize (widget);
+long /*int*/ gtk_realize (long /*int*/ widget) {
+ long /*int*/ result = super.gtk_realize (widget);
if (result != 0) return result;
/*
* Bug in GTK. When a progress bar has been unrealized after being
@@ -275,7 +275,7 @@ public void setState (int state) {
//NOT IMPLEMENTED
}
-int /*long*/ timerProc (int /*long*/ widget) {
+long /*int*/ timerProc (long /*int*/ widget) {
if (isVisible ()) OS.gtk_progress_bar_pulse (handle);
return 1;
}
@@ -298,7 +298,7 @@ void updateBar (int selection, int minimum, int maximum) {
* but unexpected. The fix is to force all
* outstanding redraws to be delivered.
*/
- int /*long*/ window = paintWindow ();
+ long /*int*/ window = paintWindow ();
OS.gdk_window_process_updates (window, false);
OS.gdk_flush ();
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java
index dbc04e8c55..c2da121da4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java
@@ -40,7 +40,7 @@ import org.eclipse.swt.events.*;
public class Sash extends Control {
boolean dragging;
int startX, startY, lastX, lastY;
- int /*long*/ defaultCursor;
+ long /*int*/ defaultCursor;
private final static int INCREMENT = 1;
private final static int PAGE_INCREMENT = 9;
@@ -145,12 +145,12 @@ void createHandle (int index) {
void drawBand (int x, int y, int width, int height) {
if ((style & SWT.SMOOTH) != 0) return;
//TODO: Use Cairo
- int /*long*/ window = gtk_widget_get_window (parent.paintHandle());
+ long /*int*/ window = gtk_widget_get_window (parent.paintHandle());
if (window == 0) return;
byte [] bits = {-86, 85, -86, 85, -86, 85, -86, 85};
- int /*long*/ stipplePixmap = OS.gdk_bitmap_create_from_data (window, bits, 8, 8);
- int /*long*/ gc = OS.gdk_gc_new (window);
- int /*long*/ colormap = OS.gdk_colormap_get_system();
+ long /*int*/ stipplePixmap = OS.gdk_bitmap_create_from_data (window, bits, 8, 8);
+ long /*int*/ gc = OS.gdk_gc_new (window);
+ long /*int*/ colormap = OS.gdk_colormap_get_system();
GdkColor color = new GdkColor ();
OS.gdk_color_white (colormap, color);
OS.gdk_gc_set_foreground (gc, color);
@@ -163,8 +163,8 @@ void drawBand (int x, int y, int width, int height) {
OS.g_object_unref (gc);
}
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
- int /*long*/ result = super.gtk_button_press_event (widget, eventPtr);
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) {
+ long /*int*/ result = super.gtk_button_press_event (widget, eventPtr);
if (result != 0) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
@@ -172,7 +172,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr)
if (button != 1) return 0;
if (gdkEvent.type == OS.GDK_2BUTTON_PRESS) return 0;
if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0;
- int /*long*/ window = gtk_widget_get_window (widget);
+ long /*int*/ window = gtk_widget_get_window (widget);
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
startX = (int) (gdkEvent.x_root - origin_x [0]);
@@ -212,8 +212,8 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr)
return result;
}
-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ eventPtr) {
- int /*long*/ result = super.gtk_button_release_event (widget, eventPtr);
+long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ eventPtr) {
+ long /*int*/ result = super.gtk_button_release_event (widget, eventPtr);
if (result != 0) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
@@ -244,8 +244,8 @@ int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ eventPt
return result;
}
-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ result = super.gtk_focus_in_event (widget, event);
+long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ result = super.gtk_focus_in_event (widget, event);
if (result != 0) return result;
// widget could be disposed at this point
if (handle != 0) {
@@ -257,8 +257,8 @@ int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) {
return 0;
}
-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
- int /*long*/ result = super.gtk_key_press_event (widget, eventPtr);
+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) {
+ long /*int*/ result = super.gtk_key_press_event (widget, eventPtr);
if (result != 0) return result;
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
@@ -295,9 +295,9 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
if (newX == lastX && newY == lastY) return result;
/* Ensure that the pointer image does not change */
- int /*long*/ window = gtk_widget_get_window (handle);
+ long /*int*/ window = gtk_widget_get_window (handle);
int grabMask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_RELEASE_MASK;
- int /*long*/ gdkCursor = cursor != null ? cursor.handle : defaultCursor;
+ long /*int*/ gdkCursor = cursor != null ? cursor.handle : defaultCursor;
int ptrGrabResult = gdk_pointer_grab (window, OS.GDK_OWNERSHIP_NONE, false, grabMask, window, gdkCursor, OS.GDK_CURRENT_TIME);
/* The event must be sent because its doit flag is used. */
@@ -334,8 +334,8 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
return result;
}
-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ eventPtr) {
- int /*long*/ result = super.gtk_motion_notify_event (widget, eventPtr);
+long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ eventPtr) {
+ long /*int*/ result = super.gtk_motion_notify_event (widget, eventPtr);
if (result != 0) return result;
if (!dragging) return 0;
GdkEventMotion gdkEvent = new GdkEventMotion ();
@@ -400,7 +400,7 @@ int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ eventPtr
return result;
}
-int /*long*/ gtk_realize (int /*long*/ widget) {
+long /*int*/ gtk_realize (long /*int*/ widget) {
setCursor (cursor != null ? cursor.handle : 0);
return super.gtk_realize (widget);
}
@@ -441,7 +441,7 @@ public void removeSelectionListener(SelectionListener listener) {
eventTable.unhook (SWT.DefaultSelection,listener);
}
-void setCursor (int /*long*/ cursor) {
+void setCursor (long /*int*/ cursor) {
super.setCursor (cursor != 0 ? cursor : defaultCursor);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java
index 4d925481c7..fbb9afb23f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java
@@ -126,7 +126,7 @@ void createHandle (int index) {
fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
gtk_widget_set_has_window (fixedHandle, true);
- int /*long*/ hAdjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 0);
+ long /*int*/ hAdjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 0);
if (hAdjustment == 0) error (SWT.ERROR_NO_HANDLES);
if ((style & SWT.HORIZONTAL) != 0) {
handle = gtk_scale_new (OS.GTK_ORIENTATION_HORIZONTAL, hAdjustment);
@@ -158,7 +158,7 @@ void hookEvents () {
*/
public int getIncrement () {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.step_increment;
@@ -176,7 +176,7 @@ public int getIncrement () {
*/
public int getMaximum () {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.upper;
@@ -194,7 +194,7 @@ public int getMaximum () {
*/
public int getMinimum () {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.lower;
@@ -214,7 +214,7 @@ public int getMinimum () {
*/
public int getPageIncrement () {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.page_increment;
@@ -232,13 +232,13 @@ public int getPageIncrement () {
*/
public int getSelection () {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.value;
}
-int /*long*/ gtk_value_changed (int /*long*/ adjustment) {
+long /*int*/ gtk_value_changed (long /*int*/ adjustment) {
sendSelectionEvent (SWT.Selection);
return 0;
}
@@ -373,8 +373,8 @@ public void setSelection (int value) {
OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
}
-int /*long*/ gtk_scale_new (int orientation, int /*long*/ adjustment) {
- int /*long*/ scale = 0;
+long /*int*/ gtk_scale_new (int orientation, long /*int*/ adjustment) {
+ long /*int*/ scale = 0;
if (OS.GTK_VERSION >= OS.VERSION(3, 0, 0)) {
scale = OS.gtk_scale_new (orientation, adjustment);
} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java
index e09afe3c7b..2d282c4efb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java
@@ -84,7 +84,7 @@ import org.eclipse.swt.events.*;
*/
public class ScrollBar extends Widget {
Scrollable parent;
- int /*long*/ adjustmentHandle;
+ long /*int*/ adjustmentHandle;
int detail;
boolean dragSent;
@@ -357,7 +357,7 @@ public Rectangle getThumbBounds () {
}
Rectangle rect = new Rectangle(x, y, width, height);
int [] origin_x = new int [1], origin_y = new int [1];
- int /*long*/ window = gtk_widget_get_window (parent.scrolledHandle);
+ long /*int*/ window = gtk_widget_get_window (parent.scrolledHandle);
if (window != 0) OS.gdk_window_get_origin (window, origin_x, origin_y);
rect.x += origin_x [0];
rect.y += origin_y [0];
@@ -429,7 +429,7 @@ public Rectangle getThumbTrackBounds () {
}
Rectangle rect = new Rectangle(x, y, width, height);
int [] origin_x = new int [1], origin_y = new int [1];
- int /*long*/ window = gtk_widget_get_window (parent.scrolledHandle);
+ long /*int*/ window = gtk_widget_get_window (parent.scrolledHandle);
if (window != 0) OS.gdk_window_get_origin (window, origin_x, origin_y);
rect.x += origin_x [0];
rect.y += origin_y [0];
@@ -459,7 +459,7 @@ public Rectangle getThumbTrackBounds () {
*/
public boolean getVisible () {
checkWidget ();
- int /*long*/ scrolledHandle = parent.scrolledHandle;
+ long /*int*/ scrolledHandle = parent.scrolledHandle;
int [] hsp = new int [1], vsp = new int [1];
OS.gtk_scrolled_window_get_policy (scrolledHandle, hsp, vsp);
if ((style & SWT.HORIZONTAL) != 0) {
@@ -469,20 +469,20 @@ public boolean getVisible () {
}
}
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
- int /*long*/ result = super.gtk_button_press_event (widget, eventPtr);
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) {
+ long /*int*/ result = super.gtk_button_press_event (widget, eventPtr);
if (result != 0) return result;
detail = OS.GTK_SCROLL_NONE;
dragSent = false;
return result;
}
-int /*long*/ gtk_change_value (int /*long*/ widget, int /*long*/ scroll, int /*long*/ value1, int /*long*/ value2) {
+long /*int*/ gtk_change_value (long /*int*/ widget, long /*int*/ scroll, long /*int*/ value1, long /*int*/ value2) {
detail = (int)/*64*/scroll;
return 0;
}
-void gtk_range_get_slider_range (int /*long*/ widget, int [] slider_start, int [] slider_end) {
+void gtk_range_get_slider_range (long /*int*/ widget, int [] slider_start, int [] slider_end) {
if (OS.GTK_VERSION >= OS.VERSION (2, 20, 0)) {
OS.gtk_range_get_slider_range (widget, slider_start, slider_end);
} else {
@@ -491,7 +491,7 @@ void gtk_range_get_slider_range (int /*long*/ widget, int [] slider_start, int [
}
}
-int /*long*/ gtk_value_changed (int /*long*/ adjustment) {
+long /*int*/ gtk_value_changed (long /*int*/ adjustment) {
Event event = new Event ();
dragSent = detail == OS.GTK_SCROLL_JUMP;
switch (detail) {
@@ -518,7 +518,7 @@ int /*long*/ gtk_value_changed (int /*long*/ adjustment) {
return 0;
}
-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
GdkEvent gtkEvent = new GdkEvent ();
OS.memmove (gtkEvent, gdkEvent, GdkEvent.sizeof);
switch (gtkEvent.type) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
index 89f5371ec5..9d6d313a8e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scrollable.java
@@ -33,7 +33,7 @@ import org.eclipse.swt.graphics.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public abstract class Scrollable extends Control {
- int /*long*/ scrolledHandle;
+ long /*int*/ scrolledHandle;
ScrollBar horizontalBar, verticalBar;
/**
@@ -74,7 +74,7 @@ public Scrollable (Composite parent, int style) {
super (parent, style);
}
-int /*long*/ clientHandle () {
+long /*int*/ clientHandle () {
return handle;
}
@@ -116,7 +116,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
trimWidth += vScrollBarWidth ();
if (scrolledHandle != 0) {
if (OS.gtk_scrolled_window_get_shadow_type (scrolledHandle) != OS.GTK_SHADOW_NONE) {
- int /*long*/ style = OS.gtk_widget_get_style (scrolledHandle);
+ long /*int*/ style = OS.gtk_widget_get_style (scrolledHandle);
int xthickness = OS.gtk_style_get_xthickness (style);
int ythickness = OS.gtk_style_get_ythickness (style);
trimX -= xthickness;
@@ -203,7 +203,7 @@ public int getBorderWidth () {
public Rectangle getClientArea () {
checkWidget ();
forceResize ();
- int /*long*/ clientHandle = clientHandle ();
+ long /*int*/ clientHandle = clientHandle ();
GtkAllocation allocation = new GtkAllocation ();
gtk_widget_get_allocation (clientHandle, allocation);
int x = allocation.x;
@@ -268,8 +268,8 @@ public ScrollBar getVerticalBar () {
return verticalBar;
}
-int /*long*/ gtk_scroll_event (int /*long*/ widget, int /*long*/ eventPtr) {
- int /*long*/ result = super.gtk_scroll_event (widget, eventPtr);
+long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ eventPtr) {
+ long /*int*/ result = super.gtk_scroll_event (widget, eventPtr);
/*
* Feature in GTK. Scrolled windows do not scroll if the scrollbars
@@ -303,7 +303,7 @@ int /*long*/ gtk_scroll_event (int /*long*/ widget, int /*long*/ eventPtr) {
int hScrollBarWidth() {
if (horizontalBar==null) return 0;
- int /*long*/ hBarHandle = 0;
+ long /*int*/ hBarHandle = 0;
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
hBarHandle = OS.GTK_SCROLLED_WINDOW_HSCROLLBAR (scrolledHandle);
} else {
@@ -361,9 +361,9 @@ void redrawWidget (int x, int y, int width, int height, boolean redrawAll, boole
super.redrawWidget (x, y, width, height, redrawAll, all, trim);
if (!gtk_widget_get_realized (handle)) return;
if (!trim) return;
- int /*long*/ topHandle = topHandle (), paintHandle = paintHandle ();
+ long /*int*/ topHandle = topHandle (), paintHandle = paintHandle ();
if (topHandle == paintHandle) return;
- int /*long*/ window = gtk_widget_get_window (topHandle);
+ long /*int*/ window = gtk_widget_get_window (topHandle);
GdkRectangle rect = new GdkRectangle ();
if (redrawAll) {
GtkAllocation allocation = new GtkAllocation ();
@@ -413,7 +413,7 @@ void showWidget () {
if (scrolledHandle != 0) OS.gtk_widget_show (scrolledHandle);
}
-int /*long*/ topHandle () {
+long /*int*/ topHandle () {
if (fixedHandle != 0) return fixedHandle;
if (scrolledHandle != 0) return scrolledHandle;
return super.topHandle ();
@@ -425,7 +425,7 @@ void updateScrollBarValue (ScrollBar bar) {
int vScrollBarWidth() {
if (verticalBar == null) return 0;
- int /*long*/ vBarHandle = 0;
+ long /*int*/ vBarHandle = 0;
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
vBarHandle = OS.GTK_SCROLLED_WINDOW_VSCROLLBAR (scrolledHandle);
} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
index 5f1a5416bc..e02976f04b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
@@ -118,7 +118,7 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Shell extends Decorations {
- int /*long*/ shellHandle, tooltipsHandle, tooltipWindow, group, modalGroup;
+ long /*int*/ shellHandle, tooltipsHandle, tooltipWindow, group, modalGroup;
boolean mapped, moved, resized, opened, fullScreen, showWithParent, modified, center;
int oldX, oldY, oldWidth, oldHeight;
int minWidth, minHeight;
@@ -254,7 +254,7 @@ public Shell (Display display, int style) {
this (display, null, style, 0, false);
}
-Shell (Display display, Shell parent, int style, int /*long*/ handle, boolean embedded) {
+Shell (Display display, Shell parent, int style, long /*int*/ handle, boolean embedded) {
super ();
checkSubclass ();
if (display == null) display = Display.getCurrent ();
@@ -359,7 +359,7 @@ public Shell (Shell parent, int style) {
this (parent != null ? parent.display : null, parent, style, 0, false);
}
-public static Shell gtk_new (Display display, int /*long*/ handle) {
+public static Shell gtk_new (Display display, long /*int*/ handle) {
return new Shell (display, null, SWT.NO_TRIM, handle, true);
}
@@ -382,7 +382,7 @@ public static Shell gtk_new (Display display, int /*long*/ handle) {
*
* @since 3.3
*/
-public static Shell internal_new (Display display, int /*long*/ handle) {
+public static Shell internal_new (Display display, long /*int*/ handle) {
return new Shell (display, null, SWT.NO_TRIM, handle, false);
}
@@ -455,7 +455,7 @@ void adjustTrim () {
gtk_widget_get_allocation (shellHandle, allocation);
int width = allocation.width;
int height = allocation.height;
- int /*long*/ window = gtk_widget_get_window (shellHandle);
+ long /*int*/ window = gtk_widget_get_window (shellHandle);
GdkRectangle rect = new GdkRectangle ();
OS.gdk_window_get_frame_extents (window, rect);
int trimWidth = Math.max (0, rect.width - width);
@@ -510,7 +510,7 @@ void bringToTop (boolean force) {
if (!force) {
if (activeShell == null) return;
if (!display.activePending) {
- int /*long*/ focusHandle = OS.gtk_window_get_focus (activeShell.shellHandle);
+ long /*int*/ focusHandle = OS.gtk_window_get_focus (activeShell.shellHandle);
if (focusHandle != 0 && !gtk_widget_has_focus (focusHandle)) return;
}
}
@@ -538,10 +538,10 @@ void bringToTop (boolean force) {
* window. The fix is to use XSetInputFocus() to force
* the focus.
*/
- int /*long*/ window = gtk_widget_get_window (shellHandle);
+ long /*int*/ window = gtk_widget_get_window (shellHandle);
if ((xFocus || (style & SWT.ON_TOP) != 0) && OS.GDK_WINDOWING_X11 ()) {
- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
- int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (window);
+ long /*int*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
+ long /*int*/ xWindow = OS.gdk_x11_drawable_get_xid (window);
OS.gdk_error_trap_push ();
/* Use CurrentTime instead of the last event time to ensure that the shell becomes active */
OS.XSetInputFocus (xDisplay, xWindow, OS.RevertToParent, OS.CurrentTime);
@@ -591,7 +591,7 @@ void checkOpen () {
if (!opened) resized = false;
}
-int /*long*/ childStyle () {
+long /*int*/ childStyle () {
return 0;
}
@@ -695,7 +695,7 @@ void createHandle (int index) {
} else {
vboxHandle = OS.gtk_bin_get_child (shellHandle);
if (vboxHandle == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ children = OS.gtk_container_get_children (vboxHandle);
+ long /*int*/ children = OS.gtk_container_get_children (vboxHandle);
if (OS.g_list_length (children) > 0) {
scrolledHandle = OS.g_list_data (children);
}
@@ -715,7 +715,7 @@ void createHandle (int index) {
OS.gtk_widget_realize (shellHandle);
}
-int /*long*/ filterProc (int /*long*/ xEvent, int /*long*/ gdkEvent, int /*long*/ data2) {
+long /*int*/ filterProc (long /*int*/ xEvent, long /*int*/ gdkEvent, long /*int*/ data2) {
int eventType = OS.X_EVENT_TYPE (xEvent);
if (eventType != OS.FocusOut && eventType != OS.FocusIn) return 0;
XFocusChangeEvent xFocusEvent = new XFocusChangeEvent();
@@ -812,7 +812,7 @@ void hookEvents () {
OS.g_signal_connect_closure_by_id (shellHandle, display.signalIds [MAP_EVENT], 0, display.shellMapProcClosure, false);
OS.g_signal_connect_closure_by_id (shellHandle, display.signalIds [ENTER_NOTIFY_EVENT], 0, display.closures [ENTER_NOTIFY_EVENT], false);
OS.g_signal_connect_closure (shellHandle, OS.move_focus, display.closures [MOVE_FOCUS], false);
- int /*long*/ window = gtk_widget_get_window (shellHandle);
+ long /*int*/ window = gtk_widget_get_window (shellHandle);
OS.gdk_window_add_filter (window, display.filterProc, shellHandle);
if (isCustomResize ()) {
int mask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_RELEASE_MASK | OS.GDK_BUTTON_PRESS_MASK | OS.GDK_ENTER_NOTIFY_MASK | OS.GDK_LEAVE_NOTIFY_MASK;
@@ -853,7 +853,7 @@ void releaseParent () {
/* Do nothing */
}
-int /*long*/ topHandle () {
+long /*int*/ topHandle () {
return shellHandle;
}
@@ -884,15 +884,15 @@ void fixShell (Shell newShell, Control control) {
}
}
-int /*long*/ fixedSizeAllocateProc(int /*long*/ widget, int /*long*/ allocationPtr) {
+long /*int*/ fixedSizeAllocateProc(long /*int*/ widget, long /*int*/ allocationPtr) {
int clientWidth = 0;
if ((style & SWT.MIRRORED) != 0) clientWidth = getClientWidth ();
- int /*long*/ result = super.fixedSizeAllocateProc (widget, allocationPtr);
+ long /*int*/ result = super.fixedSizeAllocateProc (widget, allocationPtr);
if ((style & SWT.MIRRORED) != 0) moveChildren (clientWidth);
return result;
}
-void fixStyle (int /*long*/ handle) {
+void fixStyle (long /*int*/ handle) {
}
void forceResize () {
@@ -1160,7 +1160,7 @@ public Shell [] getShells () {
return result;
}
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
if (widget == shellHandle) {
if (isCustomResize ()) {
if ((style & SWT.ON_TOP) != 0 && (style & SWT.NO_FOCUS) == 0) {
@@ -1186,7 +1186,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
return super.gtk_button_press_event (widget, event);
}
-int /*long*/ gtk_configure_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_configure_event (long /*int*/ widget, long /*int*/ event) {
int [] x = new int [1], y = new int [1];
OS.gtk_window_get_position (shellHandle, x, y);
if (!moved || oldX != x [0] || oldY != y [0]) {
@@ -1199,25 +1199,25 @@ int /*long*/ gtk_configure_event (int /*long*/ widget, int /*long*/ event) {
return 0;
}
-int /*long*/ gtk_delete_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_delete_event (long /*int*/ widget, long /*int*/ event) {
if (isEnabled()) closeWidget ();
return 1;
}
-int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) {
if (widget != shellHandle) {
return super.gtk_enter_notify_event (widget, event);
}
return 0;
}
-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ event) {
if (widget == shellHandle) {
if (isCustomResize ()) {
GdkEventExpose gdkEventExpose = new GdkEventExpose ();
OS.memmove (gdkEventExpose, event, GdkEventExpose.sizeof);
- int /*long*/ style = OS.gtk_widget_get_style (widget);
- int /*long*/ window = gtk_widget_get_window (widget);
+ long /*int*/ style = OS.gtk_widget_get_style (widget);
+ long /*int*/ window = gtk_widget_get_window (widget);
int [] width = new int [1];
int [] height = new int [1];
gdk_window_get_size (window, width, height);
@@ -1241,7 +1241,7 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) {
return super.gtk_expose_event (widget, event);
}
-int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ directionType) {
+long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) {
switch ((int)/*64*/directionType) {
case OS.GTK_DIR_TAB_FORWARD:
case OS.GTK_DIR_TAB_BACKWARD:
@@ -1258,13 +1258,13 @@ int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ directionType) {
return super.gtk_focus (widget, directionType);
}
-int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) {
if (widget == shellHandle) {
if (isCustomResize ()) {
GdkEventCrossing gdkEvent = new GdkEventCrossing ();
OS.memmove (gdkEvent, event, GdkEventCrossing.sizeof);
if ((gdkEvent.state & OS.GDK_BUTTON1_MASK) == 0) {
- int /*long*/ window = gtk_widget_get_window (shellHandle);
+ long /*int*/ window = gtk_widget_get_window (shellHandle);
OS.gdk_window_set_cursor (window, 0);
display.resizeMode = 0;
}
@@ -1274,17 +1274,17 @@ int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {
return super.gtk_leave_notify_event (widget, event);
}
-int /*long*/ gtk_move_focus (int /*long*/ widget, int /*long*/ directionType) {
+long /*int*/ gtk_move_focus (long /*int*/ widget, long /*int*/ directionType) {
Control control = display.getFocusControl ();
if (control != null) {
- int /*long*/ focusHandle = control.focusHandle ();
+ long /*int*/ focusHandle = control.focusHandle ();
OS.gtk_widget_child_focus (focusHandle, (int)/*64*/directionType);
}
OS.g_signal_stop_emission_by_name (shellHandle, OS.move_focus);
return 1;
}
-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {
if (widget == shellHandle) {
if (isCustomResize ()) {
GdkEventMotion gdkEvent = new GdkEventMotion ();
@@ -1343,8 +1343,8 @@ int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {
} else {
int mode = getResizeMode (gdkEvent.x, gdkEvent.y);
if (mode != display.resizeMode) {
- int /*long*/ window = gtk_widget_get_window (shellHandle);
- int /*long*/ cursor = OS.gdk_cursor_new (mode);
+ long /*int*/ window = gtk_widget_get_window (shellHandle);
+ long /*int*/ cursor = OS.gdk_cursor_new (mode);
OS.gdk_window_set_cursor (window, cursor);
OS.gdk_cursor_unref (cursor);
display.resizeMode = mode;
@@ -1356,7 +1356,7 @@ int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {
return super.gtk_motion_notify_event (widget, event);
}
-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {
if (widget == shellHandle) {
/* Stop menu mnemonics when the shell is disabled */
if ((state & DISABLED) != 0) return 1;
@@ -1364,8 +1364,8 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
if (menuBar != null && !menuBar.isDisposed ()) {
Control focusControl = display.getFocusControl ();
if (focusControl != null && (focusControl.hooks (SWT.KeyDown) || focusControl.filters (SWT.KeyDown))) {
- int /*long*/ [] accel = new int /*long*/ [1];
- int /*long*/ setting = OS.gtk_settings_get_default ();
+ long /*int*/ [] accel = new long /*int*/ [1];
+ long /*int*/ setting = OS.gtk_settings_get_default ();
OS.g_object_get (setting, OS.gtk_menu_bar_accel, accel, 0);
if (accel [0] != 0) {
int [] keyval = new int [1];
@@ -1388,7 +1388,7 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
return super.gtk_key_press_event (widget, event);
}
-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
+long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
GtkAllocation widgetAllocation = new GtkAllocation ();
gtk_widget_get_allocation (shellHandle, widgetAllocation);
int width = widgetAllocation.width;
@@ -1401,9 +1401,9 @@ int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
return 0;
}
-int /*long*/ gtk_realize (int /*long*/ widget) {
- int /*long*/ result = super.gtk_realize (widget);
- int /*long*/ window = gtk_widget_get_window (shellHandle);
+long /*int*/ gtk_realize (long /*int*/ widget) {
+ long /*int*/ result = super.gtk_realize (widget);
+ long /*int*/ window = gtk_widget_get_window (shellHandle);
if ((style & SWT.SHELL_TRIM) != SWT.SHELL_TRIM) {
int decorations = 0;
if ((style & SWT.NO_TRIM) == 0) {
@@ -1429,7 +1429,7 @@ int /*long*/ gtk_realize (int /*long*/ widget) {
return result;
}
-int /*long*/ gtk_window_state_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_window_state_event (long /*int*/ widget, long /*int*/ event) {
GdkEventWindowState gdkEvent = new GdkEventWindowState ();
OS.memmove (gdkEvent, event, GdkEventWindowState.sizeof);
minimized = (gdkEvent.new_window_state & OS.GDK_WINDOW_STATE_ICONIFIED) != 0;
@@ -1697,13 +1697,13 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
return result;
}
-void setCursor (int /*long*/ cursor) {
+void setCursor (long /*int*/ cursor) {
if (enableWindow != 0) {
OS.gdk_window_set_cursor (enableWindow, cursor);
if (!OS.GDK_WINDOWING_X11 ()) {
OS.gdk_flush ();
} else {
- int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
+ long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
OS.XFlush (xDisplay);
}
}
@@ -1736,9 +1736,9 @@ public void setEnabled (boolean enabled) {
enableWindow = 0;
}
} else {
- int /*long*/ parentHandle = shellHandle;
+ long /*int*/ parentHandle = shellHandle;
OS.gtk_widget_realize (parentHandle);
- int /*long*/ window = gtk_widget_get_window (parentHandle);
+ long /*int*/ window = gtk_widget_get_window (parentHandle);
Rectangle rect = getBounds ();
GdkWindowAttr attributes = new GdkWindowAttr ();
attributes.width = rect.width;
@@ -1753,7 +1753,7 @@ public void setEnabled (boolean enabled) {
if (!OS.GDK_WINDOWING_X11 ()) {
OS.gdk_flush ();
} else {
- int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
+ long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
OS.XFlush (xDisplay);
}
}
@@ -1827,7 +1827,7 @@ void setInitialBounds () {
if ((state & FOREIGN_HANDLE) != 0) return;
int width = OS.gdk_screen_width () * 5 / 8;
int height = OS.gdk_screen_height () * 5 / 8;
- int /*long*/ screen = OS.gdk_screen_get_default ();
+ long /*int*/ screen = OS.gdk_screen_get_default ();
if (screen != 0) {
if (OS.gdk_screen_get_n_monitors (screen) > 1) {
int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, paintWindow ());
@@ -1862,13 +1862,13 @@ public void setMenuBar (Menu menu) {
if (menu.parent != this) error (SWT.ERROR_INVALID_PARENT);
}
if (menuBar != null) {
- int /*long*/ menuHandle = menuBar.handle;
+ long /*int*/ menuHandle = menuBar.handle;
OS.gtk_widget_hide (menuHandle);
destroyAccelGroup ();
}
menuBar = menu;
if (menuBar != null) {
- int /*long*/ menuHandle = menu.handle;
+ long /*int*/ menuHandle = menu.handle;
OS.gtk_widget_show (menuHandle);
createAccelGroup ();
menuBar.addAccelerators (accelGroup);
@@ -2125,7 +2125,7 @@ void setZOrder (Control sibling, boolean above, boolean fixRelations) {
if (mapped) setZOrder (sibling, above, false, false);
}
-int /*long*/ shellMapProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+long /*int*/ shellMapProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
mapped = true;
display.dispatchEvents = null;
return 0;
@@ -2150,12 +2150,12 @@ void showWidget () {
if (vboxHandle != 0) OS.gtk_widget_show (vboxHandle);
}
-int /*long*/ sizeAllocateProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+long /*int*/ sizeAllocateProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
int offset = 16;
int [] x = new int [1], y = new int [1];
OS.gdk_window_get_pointer (0, x, y, null);
y [0] += offset;
- int /*long*/ screen = OS.gdk_screen_get_default ();
+ long /*int*/ screen = OS.gdk_screen_get_default ();
if (screen != 0) {
int monitorNumber = OS.gdk_screen_get_monitor_at_point (screen, x[0], y[0]);
GdkRectangle dest = new GdkRectangle ();
@@ -2175,7 +2175,7 @@ int /*long*/ sizeAllocateProc (int /*long*/ handle, int /*long*/ arg0, int /*lon
return 0;
}
-int /*long*/ sizeRequestProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+long /*int*/ sizeRequestProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
OS.gtk_widget_hide (handle);
return 0;
}
@@ -2222,7 +2222,7 @@ int trimWidth () {
void updateModal () {
if (OS.GTK_IS_PLUG (shellHandle)) return;
- int /*long*/ group = 0;
+ long /*int*/ group = 0;
boolean isModalShell = false;
if (display.getModalDialog () == null) {
Shell modal = getModalShell ();
@@ -2400,23 +2400,23 @@ void releaseWidget () {
tooltipsHandle = 0;
if (group != 0) OS.g_object_unref (group);
group = modalGroup = 0;
- int /*long*/ window = gtk_widget_get_window (shellHandle);
+ long /*int*/ window = gtk_widget_get_window (shellHandle);
OS.gdk_window_remove_filter(window, display.filterProc, shellHandle);
lastActive = null;
}
-void setToolTipText (int /*long*/ tipWidget, String string) {
+void setToolTipText (long /*int*/ tipWidget, String string) {
setToolTipText (tipWidget, tipWidget, string);
}
-void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String string) {
+void setToolTipText (long /*int*/ rootWidget, long /*int*/ tipWidget, String string) {
if (OS.GTK_VERSION >= OS.VERSION (2, 12, 0)) {
byte [] buffer = null;
if (string != null && string.length () > 0) {
char [] chars = fixMnemonic (string, false);
buffer = Converter.wcsToMbcs (null, chars, true);
}
- int /*long*/ oldTooltip = OS.gtk_widget_get_tooltip_text (rootWidget);
+ long /*int*/ oldTooltip = OS.gtk_widget_get_tooltip_text (rootWidget);
boolean same = false;
if (buffer == null && oldTooltip == 0) {
same = true;
@@ -2434,12 +2434,12 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
* 2 fake GDK_MOTION_NOTIFY events (to mimic the GTK call) which
* contain the proper x and y coordinates.
*/
- int /*long*/ eventPtr = 0;
- int /*long*/ tipWindow = gtk_widget_get_window (rootWidget);
+ long /*int*/ eventPtr = 0;
+ long /*int*/ tipWindow = gtk_widget_get_window (rootWidget);
if (tipWindow != 0) {
int [] x = new int [1], y = new int [1];
- int /*long*/ window = OS.gdk_window_at_pointer (x, y);
- int /*long*/ [] user_data = new int /*long*/ [1];
+ long /*int*/ window = OS.gdk_window_at_pointer (x, y);
+ long /*int*/ [] user_data = new long /*int*/ [1];
if (window != 0) OS.gdk_window_get_user_data (window, user_data);
if (tipWidget == user_data [0]) {
eventPtr = OS.gdk_event_new (OS.GDK_MOTION_NOTIFY);
@@ -2466,9 +2466,9 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
char [] chars = fixMnemonic (string, false);
buffer = Converter.wcsToMbcs (null, chars, true);
}
- int /*long*/ tipData = OS.gtk_tooltips_data_get(tipWidget);
+ long /*int*/ tipData = OS.gtk_tooltips_data_get(tipWidget);
if (tipData != 0) {
- int /*long*/ oldTooltip = OS.GTK_TOOLTIPS_GET_TIP_TEXT(tipData);
+ long /*int*/ oldTooltip = OS.GTK_TOOLTIPS_GET_TIP_TEXT(tipData);
if (string == null && oldTooltip == 0) {
return;
} else if (string != null && oldTooltip != 0) {
@@ -2496,7 +2496,7 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
* where it's deprecated.
*/
OS.gtk_tooltips_force_window (tooltipsHandle);
- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (tooltipsHandle);
+ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (tooltipsHandle);
if (tipWindow != 0 && tipWindow != tooltipWindow) {
OS.g_signal_connect (tipWindow, OS.size_allocate, display.sizeAllocateProc, shellHandle);
tooltipWindow = tipWindow;
@@ -2512,9 +2512,9 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
if (tipWindow != 0) {
if (gtk_widget_get_visible (tipWidget) || gtk_widget_get_realized (tipWidget)) {
int [] x = new int [1], y = new int [1];
- int /*long*/ window = OS.gdk_window_at_pointer (x, y);
+ long /*int*/ window = OS.gdk_window_at_pointer (x, y);
if (window != 0) {
- int /*long*/ [] user_data = new int /*long*/ [1];
+ long /*int*/ [] user_data = new long /*int*/ [1];
OS.gdk_window_get_user_data (window, user_data);
if (tipWidget == user_data [0]) {
/*
@@ -2528,7 +2528,7 @@ void setToolTipText (int /*long*/ rootWidget, int /*long*/ tipWidget, String str
int handler_id = OS.g_signal_connect (tipWindow, OS.size_request, display.sizeRequestProc, shellHandle);
OS.gtk_tooltips_set_tip (tooltipsHandle, tipWidget, buffer, null);
OS.gtk_widget_hide (tipWindow);
- int /*long*/ data = OS.gtk_tooltips_data_get (tipWidget);
+ long /*int*/ data = OS.gtk_tooltips_data_get (tipWidget);
OS.GTK_TOOLTIPS_SET_ACTIVE (tooltipsHandle, data);
OS.gtk_tooltips_set_tip (tooltipsHandle, tipWidget, buffer, null);
if (handler_id != 0) OS.g_signal_handler_disconnect (tipWindow, handler_id);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java
index 61a3f21d5e..82bc85f83a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java
@@ -153,7 +153,7 @@ void createHandle (int index) {
fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
gtk_widget_set_has_window (fixedHandle, true);
- int /*long*/ hAdjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);
+ long /*int*/ hAdjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 10);
if (hAdjustment == 0) error (SWT.ERROR_NO_HANDLES);
if ((style & SWT.HORIZONTAL) != 0) {
handle = gtk_scrollbar_new (OS.GTK_ORIENTATION_HORIZONTAL, hAdjustment);
@@ -175,20 +175,20 @@ void createHandle (int index) {
OS.gtk_container_add (fixedHandle, handle);
}
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
- int /*long*/ result = super.gtk_button_press_event (widget, eventPtr);
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) {
+ long /*int*/ result = super.gtk_button_press_event (widget, eventPtr);
if (result != 0) return result;
detail = OS.GTK_SCROLL_NONE;
dragSent = false;
return result;
}
-int /*long*/ gtk_change_value (int /*long*/ widget, int /*long*/ scroll, int /*long*/ value1, int /*long*/ value2) {
+long /*int*/ gtk_change_value (long /*int*/ widget, long /*int*/ scroll, long /*int*/ value1, long /*int*/ value2) {
detail = (int)/*64*/scroll;
return 0;
}
-int /*long*/ gtk_value_changed (int /*long*/ adjustment) {
+long /*int*/ gtk_value_changed (long /*int*/ adjustment) {
Event event = new Event ();
dragSent = detail == OS.GTK_SCROLL_JUMP;
switch (detail) {
@@ -214,7 +214,7 @@ int /*long*/ gtk_value_changed (int /*long*/ adjustment) {
return 0;
}
-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
GdkEvent gtkEvent = new GdkEvent ();
OS.memmove (gtkEvent, gdkEvent, GdkEvent.sizeof);
switch (gtkEvent.type) {
@@ -247,13 +247,13 @@ void hookEvents () {
void register () {
super.register ();
- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
display.addWidget (hAdjustment, this);
}
void deregister () {
super.deregister ();
- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
display.removeWidget (hAdjustment);
}
@@ -284,7 +284,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
*/
public int getIncrement () {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.step_increment;
@@ -302,7 +302,7 @@ public int getIncrement () {
*/
public int getMaximum () {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.upper;
@@ -320,7 +320,7 @@ public int getMaximum () {
*/
public int getMinimum () {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.lower;
@@ -340,7 +340,7 @@ public int getMinimum () {
*/
public int getPageIncrement () {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.page_increment;
@@ -358,7 +358,7 @@ public int getPageIncrement () {
*/
public int getSelection () {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.value;
@@ -376,7 +376,7 @@ public int getSelection () {
*/
public int getThumb () {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.page_size;
@@ -443,7 +443,7 @@ public void setIncrement (int value) {
*/
public void setMaximum (int value) {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int minimum = (int) adjustment.lower;
@@ -473,7 +473,7 @@ public void setMaximum (int value) {
public void setMinimum (int value) {
checkWidget ();
if (value < 0) return;
- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int maximum = (int) adjustment.upper;
@@ -556,7 +556,7 @@ public void setSelection (int value) {
public void setThumb (int value) {
checkWidget ();
if (value < 1) return;
- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
value = (int) Math.min (value, (int)(adjustment.upper - adjustment.lower));
@@ -597,7 +597,7 @@ public void setValues (int selection, int minimum, int maximum, int thumb, int i
if (increment < 1) return;
if (pageIncrement < 1) return;
thumb = Math.min (thumb, maximum - minimum);
- int /*long*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_range_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
adjustment.value = Math.min (Math.max (selection, minimum), maximum - thumb);
@@ -613,8 +613,8 @@ public void setValues (int selection, int minimum, int maximum, int thumb, int i
OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
}
-int /*long*/ gtk_scrollbar_new (int orientation, int /*long*/ adjustment) {
- int /*long*/ scrollbar = 0;
+long /*int*/ gtk_scrollbar_new (int orientation, long /*int*/ adjustment) {
+ long /*int*/ scrollbar = 0;
if (OS.GTK_VERSION >= OS.VERSION(3, 0, 0)) {
scrollbar = OS.gtk_scrollbar_new (orientation, adjustment);
} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java
index fbb57ce8d4..995f6e1051 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java
@@ -45,7 +45,7 @@ import org.eclipse.swt.events.*;
public class Spinner extends Composite {
static final int MIN_ARROW_WIDTH = 6;
int lastEventTime = 0;
- int /*long*/ gdkEventKey = 0;
+ long /*int*/ gdkEventKey = 0;
int fixStart = -1, fixEnd = -1;
double climbRate = 1;
@@ -203,8 +203,8 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
int[] w = new int [1], h = new int [1];
OS.gtk_widget_realize (handle);
- int /*long*/ layout = OS.gtk_entry_get_layout (handle);
- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
+ long /*int*/ layout = OS.gtk_entry_get_layout (handle);
+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
@@ -222,7 +222,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
string = buffer.toString ();
}
byte [] buffer1 = Converter.wcsToMbcs (null, string, false);
- int /*long*/ ptr = OS.pango_layout_get_text (layout);
+ long /*int*/ ptr = OS.pango_layout_get_text (layout);
int length = OS.strlen (ptr);
byte [] buffer2 = new byte [length];
OS.memmove (buffer2, ptr, length);
@@ -240,7 +240,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
public Rectangle computeTrim (int x, int y, int width, int height) {
checkWidget ();
int xborder = 0, yborder = 0;
- int /*long*/ style = OS.gtk_widget_get_style (handle);
+ long /*int*/ style = OS.gtk_widget_get_style (handle);
if ((this.style & SWT.BORDER) != 0) {
xborder += OS.gtk_style_get_xthickness (style);
yborder += OS.gtk_style_get_ythickness (style);
@@ -252,7 +252,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
xborder += property [0];
yborder += property [0];
}
- int /*long*/ fontDesc = OS.gtk_style_get_font_desc (style);
+ long /*int*/ fontDesc = OS.gtk_style_get_font_desc (style);
int fontSize = OS.pango_font_description_get_size (fontDesc);
int arrowSize = Math.max (OS.PANGO_PIXELS (fontSize), MIN_ARROW_WIDTH);
arrowSize = arrowSize - arrowSize % 2;
@@ -291,7 +291,7 @@ void createHandle (int index) {
fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
gtk_widget_set_has_window (fixedHandle, true);
- int /*long*/ adjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 0);
+ long /*int*/ adjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 0);
if (adjustment == 0) error (SWT.ERROR_NO_HANDLES);
handle = OS.gtk_spin_button_new (adjustment, climbRate, 0);
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -320,23 +320,23 @@ public void cut () {
void deregister () {
super.deregister ();
- int /*long*/ imContext = imContext ();
+ long /*int*/ imContext = imContext ();
if (imContext != 0) display.removeWidget (imContext);
}
-int /*long*/ eventWindow () {
+long /*int*/ eventWindow () {
return paintWindow ();
}
-int /*long*/ enterExitHandle () {
+long /*int*/ enterExitHandle () {
return fixedHandle;
}
-boolean filterKey (int keyval, int /*long*/ event) {
+boolean filterKey (int keyval, long /*int*/ event) {
int time = OS.gdk_event_get_time (event);
if (time != lastEventTime) {
lastEventTime = time;
- int /*long*/ imContext = imContext ();
+ long /*int*/ imContext = imContext ();
if (imContext != 0) {
return OS.gtk_im_context_filter_keypress (imContext, event);
}
@@ -355,7 +355,7 @@ void fixIM () {
* filter has to be called by SWT.
*/
if (gdkEventKey != 0 && gdkEventKey != -1) {
- int /*long*/ imContext = imContext ();
+ long /*int*/ imContext = imContext ();
if (imContext != 0) {
OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);
gdkEventKey = -1;
@@ -371,7 +371,7 @@ GdkColor getBackgroundColor () {
public int getBorderWidth () {
checkWidget();
- int /*long*/ style = OS.gtk_widget_get_style (handle);
+ long /*int*/ style = OS.gtk_widget_get_style (handle);
if ((this.style & SWT.BORDER) != 0) {
return OS.gtk_style_get_xthickness (style);
}
@@ -395,7 +395,7 @@ GdkColor getForegroundColor () {
*/
public int getIncrement () {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
@@ -416,7 +416,7 @@ public int getIncrement () {
*/
public int getMaximum () {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
@@ -437,7 +437,7 @@ public int getMaximum () {
*/
public int getMinimum () {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
@@ -459,7 +459,7 @@ public int getMinimum () {
*/
public int getPageIncrement () {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
@@ -480,7 +480,7 @@ public int getPageIncrement () {
*/
public int getSelection () {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
@@ -505,7 +505,7 @@ public int getSelection () {
*/
public String getText () {
checkWidget ();
- int /*long*/ str = OS.gtk_entry_get_text (handle);
+ long /*int*/ str = OS.gtk_entry_get_text (handle);
if (str == 0) return "";
int length = OS.strlen (str);
byte [] buffer = new byte [length];
@@ -552,26 +552,26 @@ public int getDigits () {
}
String getDecimalSeparator () {
- int /*long*/ ptr = OS.localeconv_decimal_point ();
+ long /*int*/ ptr = OS.localeconv_decimal_point ();
int length = OS.strlen (ptr);
byte [] buffer = new byte [length];
OS.memmove (buffer, ptr, length);
return new String (Converter.mbcsToWcs (null, buffer));
}
-int /*long*/ gtk_activate (int /*long*/ widget) {
+long /*int*/ gtk_activate (long /*int*/ widget) {
sendSelectionEvent (SWT.DefaultSelection);
return 0;
}
-int /*long*/ gtk_changed (int /*long*/ widget) {
- int /*long*/ str = OS.gtk_entry_get_text (handle);
+long /*int*/ gtk_changed (long /*int*/ widget) {
+ long /*int*/ str = OS.gtk_entry_get_text (handle);
int length = OS.strlen (str);
if (length > 0) {
- int /*long*/ [] endptr = new int /*long*/ [1];
+ long /*int*/ [] endptr = new long /*int*/ [1];
double value = OS.g_strtod (str, endptr);
if (endptr [0] == str + length) {
- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
if (value != adjustment.value && adjustment.lower <= value && value <= adjustment.upper) {
@@ -588,7 +588,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
* is to post the modify event when the user is typing.
*/
boolean keyPress = false;
- int /*long*/ eventPtr = OS.gtk_get_current_event ();
+ long /*int*/ eventPtr = OS.gtk_get_current_event ();
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
@@ -607,7 +607,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
return 0;
}
-int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) {
+long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) {
if (text == 0) return 0;
if (!OS.gtk_editable_get_editable (handle)) return 0;
int length = OS.strlen (text);
@@ -645,9 +645,9 @@ int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) {
return 0;
}
-int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int /*long*/ end_pos) {
+long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long /*int*/ end_pos) {
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
- int /*long*/ ptr = OS.gtk_entry_get_text (handle);
+ long /*int*/ ptr = OS.gtk_entry_get_text (handle);
if (end_pos == -1) end_pos = OS.g_utf8_strlen (ptr, -1);
int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start_pos);
int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end_pos);
@@ -670,17 +670,17 @@ int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int /
return 0;
}
-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
if (cursor != null) setCursor (cursor.handle);
return super.gtk_event_after (widget, gdkEvent);
}
-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {
fixIM ();
return super.gtk_focus_out_event (widget, event);
}
-int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*long*/ new_text_length, int /*long*/ position) {
+long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /*int*/ new_text_length, long /*int*/ position) {
// if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
if (new_text == 0 || new_text_length == 0) return 0;
byte [] buffer = new byte [(int)/*64*/new_text_length];
@@ -688,7 +688,7 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*
String oldText = new String (Converter.mbcsToWcs (null, buffer));
int [] pos = new int [1];
OS.memmove (pos, position, 4);
- int /*long*/ ptr = OS.gtk_entry_get_text (handle);
+ long /*int*/ ptr = OS.gtk_entry_get_text (handle);
if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
int start = (int)/*64*/OS.g_utf16_pointer_to_offset (ptr, pos [0]);
String newText = verifyText (oldText, start, start);
@@ -720,15 +720,15 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*
return 0;
}
-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ result = super.gtk_key_press_event (widget, event);
+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ result = super.gtk_key_press_event (widget, event);
if (result != 0) fixIM ();
if (gdkEventKey == -1) result = 1;
gdkEventKey = 0;
return result;
}
-int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) {
+long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) {
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL);
OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);
@@ -736,7 +736,7 @@ int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) {
return 0;
}
-int /*long*/ gtk_value_changed (int /*long*/ widget) {
+long /*int*/ gtk_value_changed (long /*int*/ widget) {
sendSelectionEvent (SWT.Selection);
return 0;
}
@@ -749,7 +749,7 @@ void hookEvents () {
OS.g_signal_connect_closure (handle, OS.value_changed, display.closures [VALUE_CHANGED], false);
OS.g_signal_connect_closure (handle, OS.activate, display.closures [ACTIVATE], false);
OS.g_signal_connect_closure (handle, OS.populate_popup, display.closures [POPULATE_POPUP], false);
- int /*long*/ imContext = imContext ();
+ long /*int*/ imContext = imContext ();
if (imContext != 0) {
OS.g_signal_connect_closure (imContext, OS.commit, display.closures [COMMIT], false);
int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());
@@ -758,13 +758,13 @@ void hookEvents () {
}
}
-int /*long*/ imContext () {
+long /*int*/ imContext () {
return OS.GTK_ENTRY_IM_CONTEXT (handle);
}
-int /*long*/ paintWindow () {
- int /*long*/ window = super.paintWindow ();
- int /*long*/ children = OS.gdk_window_get_children (window);
+long /*int*/ paintWindow () {
+ long /*int*/ window = super.paintWindow ();
+ long /*int*/ children = OS.gdk_window_get_children (window);
if (children != 0) window = OS.g_list_data (children);
OS.g_list_free (children);
return window;
@@ -789,7 +789,7 @@ public void paste () {
void register () {
super.register ();
- int /*long*/ imContext = imContext ();
+ long /*int*/ imContext = imContext ();
if (imContext != 0) display.addWidget (imContext, this);
}
@@ -876,14 +876,14 @@ void setBackgroundColor (GdkColor color) {
OS.gtk_widget_modify_base (handle, 0, color);
}
-void setCursor (int /*long*/ cursor) {
- int /*long*/ defaultCursor = 0;
+void setCursor (long /*int*/ cursor) {
+ long /*int*/ defaultCursor = 0;
if (cursor == 0) defaultCursor = OS.gdk_cursor_new (OS.GDK_XTERM);
super.setCursor (cursor != 0 ? cursor : defaultCursor);
if (cursor == 0) OS.gdk_cursor_unref (defaultCursor);
}
-void setFontDescription (int /*long*/ font) {
+void setFontDescription (long /*int*/ font) {
super.setFontDescription (font);
}
@@ -902,7 +902,7 @@ void setFontDescription (int /*long*/ font) {
public void setIncrement (int value) {
checkWidget ();
if (value < 1) return;
- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
@@ -928,7 +928,7 @@ public void setIncrement (int value) {
*/
public void setMaximum (int value) {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
@@ -955,7 +955,7 @@ public void setMaximum (int value) {
*/
public void setMinimum (int value) {
checkWidget ();
- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
@@ -982,7 +982,7 @@ public void setMinimum (int value) {
public void setPageIncrement (int value) {
checkWidget ();
if (value < 1) return;
- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
@@ -1069,7 +1069,7 @@ public void setDigits (int value) {
if (value < 0) error (SWT.ERROR_INVALID_ARGUMENT);
int digits = OS.gtk_spin_button_get_digits (handle);
if (value == digits) return;
- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int diff = Math.abs (value - digits);
@@ -1139,7 +1139,7 @@ public void setValues (int selection, int minimum, int maximum, int digits, int
* depending upon the value of digits.
*/
climbRate = 1.0 / factor;
- int /*long*/ adjustment = OS.gtk_spin_button_get_adjustment(handle);
+ long /*int*/ adjustment = OS.gtk_spin_button_get_adjustment(handle);
OS.gtk_spin_button_configure (handle, adjustment, climbRate, digits);
OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
}
@@ -1153,9 +1153,9 @@ boolean translateTraversal (GdkEventKey keyEvent) {
switch (key) {
case OS.GDK_KP_Enter:
case OS.GDK_Return: {
- int /*long*/ imContext = imContext ();
+ long /*int*/ imContext = imContext ();
if (imContext != 0) {
- int /*long*/ [] preeditString = new int /*long*/ [1];
+ long /*int*/ [] preeditString = new long /*int*/ [1];
OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
if (preeditString [0] != 0) {
int length = OS.strlen (preeditString [0]);
@@ -1174,7 +1174,7 @@ String verifyText (String string, int start, int end) {
event.text = string;
event.start = start;
event.end = end;
- int /*long*/ eventPtr = OS.gtk_get_current_event ();
+ long /*int*/ eventPtr = OS.gtk_get_current_event ();
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
@@ -1195,7 +1195,7 @@ String verifyText (String string, int start, int end) {
index = 0;
}
if (string.length () > 0) {
- int /*long*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
+ long /*int*/ hAdjustment = OS.gtk_spin_button_get_adjustment (handle);
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
if (adjustment.lower < 0 && string.charAt (0) == '-') index++;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java
index e8ff75e44b..ba5eb62a7e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java
@@ -101,8 +101,8 @@ protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
-int /*long*/ childStyle () {
- int /*long*/ rcStyle = OS.gtk_widget_get_modifier_style (handle);
+long /*int*/ childStyle () {
+ long /*int*/ rcStyle = OS.gtk_widget_get_modifier_style (handle);
if ((OS.gtk_rc_style_get_color_flags (rcStyle, 0) & OS.GTK_RC_BG) != 0) return 0;
OS.gtk_widget_realize (handle);
return OS.gtk_widget_get_style (handle);
@@ -140,7 +140,7 @@ public void addSelectionListener(SelectionListener listener) {
addListener(SWT.DefaultSelection,typedListener);
}
-int /*long*/ clientHandle () {
+long /*int*/ clientHandle () {
int index = OS.gtk_notebook_get_current_page (handle);
if (index != -1 && items [index] != null) {
return items [index].pageHandle;
@@ -165,7 +165,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
public Rectangle computeTrim (int x, int y, int width, int height) {
checkWidget();
forceResize ();
- int /*long*/ clientHandle = clientHandle ();
+ long /*int*/ clientHandle = clientHandle ();
GtkAllocation allocation = new GtkAllocation ();
gtk_widget_get_allocation (clientHandle, allocation);
int clientX = allocation.x;
@@ -205,7 +205,7 @@ void createWidget (int index) {
}
void createItem (TabItem item, int index) {
- int /*long*/ list = OS.gtk_container_get_children (handle);
+ long /*int*/ list = OS.gtk_container_get_children (handle);
int itemCount = 0;
if (list != 0) {
itemCount = OS.g_list_length (list);
@@ -217,15 +217,15 @@ void createItem (TabItem item, int index) {
System.arraycopy (items, 0, newItems, 0, items.length);
items = newItems;
}
- int /*long*/ boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 0);
+ long /*int*/ boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 0);
if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ labelHandle = OS.gtk_label_new_with_mnemonic (null);
+ long /*int*/ labelHandle = OS.gtk_label_new_with_mnemonic (null);
if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ imageHandle = OS.gtk_image_new ();
+ long /*int*/ imageHandle = OS.gtk_image_new ();
if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_container_add (boxHandle, imageHandle);
OS.gtk_container_add (boxHandle, labelHandle);
- int /*long*/ pageHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
+ long /*int*/ pageHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
if (pageHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
OS.gtk_notebook_insert_page (handle, pageHandle, boxHandle, index);
@@ -287,7 +287,7 @@ void destroyItem (TabItem item) {
}
}
-int /*long*/ eventHandle () {
+long /*int*/ eventHandle () {
return handle;
}
@@ -309,7 +309,7 @@ int /*long*/ eventHandle () {
public TabItem getItem (int index) {
checkWidget();
if (!(0 <= index && index < getItemCount())) error (SWT.ERROR_INVALID_RANGE);
- int /*long*/ list = OS.gtk_container_get_children (handle);
+ long /*int*/ list = OS.gtk_container_get_children (handle);
if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
@@ -338,7 +338,7 @@ public TabItem getItem (int index) {
public TabItem getItem(Point point) {
checkWidget();
if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
- int /*long*/ list = OS.gtk_container_get_children (handle);
+ long /*int*/ list = OS.gtk_container_get_children (handle);
if (list == 0) return null;
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
@@ -362,7 +362,7 @@ public TabItem getItem(Point point) {
*/
public int getItemCount () {
checkWidget();
- int /*long*/ list = OS.gtk_container_get_children (handle);
+ long /*int*/ list = OS.gtk_container_get_children (handle);
if (list == 0) return 0;
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
@@ -432,11 +432,11 @@ public int getSelectionIndex () {
return OS.gtk_notebook_get_current_page (handle);
}
-int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ directionType) {
+long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ directionType) {
return 0;
}
-int /*long*/ gtk_switch_page (int /*long*/ widget, int /*long*/ page, int /*long*/ page_num) {
+long /*int*/ gtk_switch_page (long /*int*/ widget, long /*int*/ page, long /*int*/ page_num) {
int index = OS.gtk_notebook_get_current_page (handle);
if (index != -1) {
Control control = items [index].getControl ();
@@ -481,7 +481,7 @@ void hookEvents () {
public int indexOf (TabItem item) {
checkWidget();
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
- int /*long*/ list = OS.gtk_container_get_children (handle);
+ long /*int*/ list = OS.gtk_container_get_children (handle);
if (list == 0) return -1;
int count = OS.g_list_length (list);
OS.g_list_free (list);
@@ -498,7 +498,7 @@ Point minimumSize (int wHint, int hHint, boolean flushCache) {
Control child = children [i];
int index = 0;
int count = 0;
- int /*long*/ list = OS.gtk_container_get_children (handle);
+ long /*int*/ list = OS.gtk_container_get_children (handle);
if (list != 0) {
count = OS.g_list_length (list);
OS.g_list_free (list);
@@ -523,7 +523,7 @@ Point minimumSize (int wHint, int hHint, boolean flushCache) {
boolean mnemonicHit (char key) {
int itemCount = getItemCount ();
for (int i=0; i= OS.VERSION(2, 12, 0)) {
list = OS.gtk_cell_layout_get_cells(column);
} else {
list = OS.gtk_tree_view_column_get_cell_renderers (column);
}
if (list == 0) return 0;
- int /*long*/ temp = list;
+ long /*int*/ temp = list;
while (temp != 0) {
- int /*long*/ renderer = OS.g_list_data (temp);
+ long /*int*/ renderer = OS.g_list_data (temp);
if (renderer != 0) {
OS.gtk_cell_renderer_get_size (renderer, handle, null, null, null, w, null);
width += w [0];
@@ -506,19 +506,19 @@ void createColumn (TableColumn column, int index) {
modelIndex++;
}
if (modelIndex == modelLength) {
- int /*long*/ oldModel = modelHandle;
- int /*long*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time
- int /*long*/ newModel = OS.gtk_list_store_newv (types.length, types);
+ long /*int*/ oldModel = modelHandle;
+ long /*int*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time
+ long /*int*/ newModel = OS.gtk_list_store_newv (types.length, types);
if (newModel == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
int [] ptr1 = new int [1];
for (int i=0; i 0) {
TableColumn checkColumn = columns [0];
@@ -601,7 +601,7 @@ void createHandle (int index) {
gtk_widget_set_has_window (fixedHandle, true);
scrolledHandle = OS.gtk_scrolled_window_new (0, 0);
if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ [] types = getColumnTypes (1);
+ long /*int*/ [] types = getColumnTypes (1);
modelHandle = OS.gtk_list_store_newv (types.length, types);
if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES);
handle = OS.gtk_tree_view_new_with_model (modelHandle);
@@ -616,7 +616,7 @@ void createHandle (int index) {
OS.gtk_container_add (scrolledHandle, handle);
int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
- int /*long*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);
OS.gtk_tree_selection_set_mode (selectionHandle, mode);
OS.gtk_tree_view_set_headers_visible (handle, false);
int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
@@ -658,11 +658,11 @@ void createItem (TableColumn column, int index) {
} else {
createColumn (column, index);
}
- int /*long*/ boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 3);
+ long /*int*/ boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 3);
if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ labelHandle = OS.gtk_label_new_with_mnemonic (null);
+ long /*int*/ labelHandle = OS.gtk_label_new_with_mnemonic (null);
if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ imageHandle = OS.gtk_image_new ();
+ long /*int*/ imageHandle = OS.gtk_image_new ();
if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_container_add (boxHandle, imageHandle);
OS.gtk_container_add (boxHandle, labelHandle);
@@ -671,7 +671,7 @@ void createItem (TableColumn column, int index) {
column.labelHandle = labelHandle;
column.imageHandle = imageHandle;
OS.gtk_tree_view_column_set_widget (column.handle, boxHandle);
- int /*long*/ widget = OS.gtk_widget_get_parent (boxHandle);
+ long /*int*/ widget = OS.gtk_widget_get_parent (boxHandle);
while (widget != handle) {
if (OS.GTK_IS_BUTTON (widget)) {
column.buttonHandle = widget;
@@ -737,7 +737,7 @@ void createItem (TableItem item, int index) {
items [index] = item;
}
-void createRenderers (int /*long*/ columnHandle, int modelIndex, boolean check, int columnStyle) {
+void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check, int columnStyle) {
OS.gtk_tree_view_column_clear (columnHandle);
if ((style & SWT.CHECK) != 0 && check) {
OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);
@@ -749,9 +749,9 @@ void createRenderers (int /*long*/ columnHandle, int modelIndex, boolean check,
OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);
}
}
- int /*long*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : OS.gtk_cell_renderer_pixbuf_new ();
+ long /*int*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : OS.gtk_cell_renderer_pixbuf_new ();
if (pixbufRenderer == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : OS.gtk_cell_renderer_text_new ();
+ long /*int*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : OS.gtk_cell_renderer_text_new ();
if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
if (ownerDraw) {
@@ -849,7 +849,7 @@ public void deselect (int index) {
checkWidget();
if (index < 0 || index >= itemCount) return;
boolean fixColumn = showFirstColumn ();
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_unselect_iter (selection, _getItem (index).handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
@@ -874,7 +874,7 @@ public void deselect (int index) {
public void deselect (int start, int end) {
checkWidget();
boolean fixColumn = showFirstColumn ();
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int index=start; index<=end; index++) {
if (index < 0 || index >= itemCount) continue;
@@ -905,7 +905,7 @@ public void deselect (int [] indices) {
checkWidget();
if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);
boolean fixColumn = showFirstColumn ();
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int i=0; i= OS.VERSION(2, 12, 0)) {
list = OS.gtk_cell_layout_get_cells(column);
} else {
@@ -1576,10 +1576,10 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) {
if (list == 0) return 0;
int count = OS.g_list_length (list);
- int /*long*/ pixbufRenderer = 0;
+ long /*int*/ pixbufRenderer = 0;
int i = 0;
while (i < count) {
- int /*long*/ renderer = OS.g_list_nth_data (list, i);
+ long /*int*/ renderer = OS.g_list_nth_data (list, i);
if (OS.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) {
pixbufRenderer = renderer;
break;
@@ -1608,15 +1608,15 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) {
*/
public TableItem [] getSelection () {
checkWidget();
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
- int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, null);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, null);
if (list != 0) {
int count = OS.g_list_length (list);
int [] treeSelection = new int [count];
int length = 0;
for (int i=0; i= OS.VERSION(2, 12, 0)) {
list = OS.gtk_cell_layout_get_cells(column);
} else {
@@ -1780,10 +1780,10 @@ int /*long*/ getTextRenderer (int /*long*/ column) {
}
if (list == 0) return 0;
int count = OS.g_list_length (list);
- int /*long*/ textRenderer = 0;
+ long /*int*/ textRenderer = 0;
int i = 0;
while (i < count) {
- int /*long*/ renderer = OS.g_list_nth_data (list, i);
+ long /*int*/ renderer = OS.g_list_nth_data (list, i);
if (OS.GTK_IS_CELL_RENDERER_TEXT (renderer)) {
textRenderer = renderer;
break;
@@ -1808,22 +1808,22 @@ int /*long*/ getTextRenderer (int /*long*/ column) {
*/
public int getTopIndex () {
checkWidget();
- int /*long*/ [] path = new int /*long*/ [1];
+ long /*int*/ [] path = new long /*int*/ [1];
OS.gtk_widget_realize (handle);
if (!OS.gtk_tree_view_get_path_at_pos (handle, 1, 1, path, null, null, null)) return 0;
if (path [0] == 0) return 0;
- int /*long*/ indices = OS.gtk_tree_path_get_indices (path[0]);
+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path[0]);
int[] index = new int [1];
if (indices != 0) OS.memmove (index, indices, 4);
OS.gtk_tree_path_free (path [0]);
return index [0];
}
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
if (gdkEvent.window != OS.gtk_tree_view_get_bin_window (handle)) return 0;
- int /*long*/ result = super.gtk_button_press_event (widget, event);
+ long /*int*/ result = super.gtk_button_press_event (widget, event);
if (result != 0) return result;
/*
* Feature in GTK. In a multi-select table view, when multiple items are already
@@ -1835,10 +1835,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
*/
int button = gdkEvent.button;
if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {
- int /*long*/ [] path = new int /*long*/ [1];
+ long /*int*/ [] path = new long /*int*/ [1];
if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
if (path [0] != 0) {
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
OS.gtk_tree_path_free (path [0]);
}
@@ -1853,10 +1853,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
* widget from automatically selecting the first item.
*/
if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {
- int /*long*/ [] path = new int /*long*/ [1];
+ long /*int*/ [] path = new long /*int*/ [1];
if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
if (path [0] != 0) {
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_view_set_cursor (handle, path [0], 0, false);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
@@ -1876,13 +1876,13 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ window = OS.GDK_EVENT_WINDOW (event);
+long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ window = OS.GDK_EVENT_WINDOW (event);
if (window != OS.gtk_tree_view_get_bin_window (handle)) return 0;
return super.gtk_button_release_event (widget, event);
}
-int /*long*/ gtk_changed (int /*long*/ widget) {
+long /*int*/ gtk_changed (long /*int*/ widget) {
TableItem item = getFocusItem ();
if (item != null) {
Event event = new Event ();
@@ -1892,7 +1892,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
return 0;
}
-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
switch (OS.GDK_EVENT_TYPE (gdkEvent)) {
case OS.GDK_EXPOSE: {
/*
@@ -1911,22 +1911,22 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
return super.gtk_event_after (widget, gdkEvent);
}
-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) {
if ((state & OBSCURED) != 0) return 0;
if ((state & PARENT_BACKGROUND) != 0 || backgroundImage != null) {
Control control = findBackgroundControl ();
if (control != null) {
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, eventPtr, GdkEventExpose.sizeof);
- int /*long*/ window = OS.gtk_tree_view_get_bin_window (handle);
+ long /*int*/ window = OS.gtk_tree_view_get_bin_window (handle);
if (window == gdkEvent.window) {
int [] width = new int [1], height = new int [1];
gdk_window_get_size (window, width, height);
int bottom = 0;
if (itemCount != 0) {
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, itemCount - 1);
- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
GdkRectangle rect = new GdkRectangle ();
OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);
bottom = rect.y + rect.height;
@@ -1942,8 +1942,8 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
return super.gtk_expose_event (widget, eventPtr);
}
-int /*long*/ gtk_popup_menu (int /*long*/ widget) {
- int /*long*/ result = super.gtk_popup_menu (widget);
+long /*int*/ gtk_popup_menu (long /*int*/ widget) {
+ long /*int*/ result = super.gtk_popup_menu (widget);
/*
* Bug in GTK. The context menu for the typeahead in GtkTreeViewer
* opens in the bottom right corner of the screen when Shift+F10
@@ -1956,15 +1956,15 @@ int /*long*/ gtk_popup_menu (int /*long*/ widget) {
return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;
}
-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ window = OS.GDK_EVENT_WINDOW (event);
+long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ window = OS.GDK_EVENT_WINDOW (event);
if (window != OS.gtk_tree_view_get_bin_window (handle)) return 0;
return super.gtk_motion_notify_event (widget, event);
}
-int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long*/ column) {
+long /*int*/ gtk_row_activated (long /*int*/ tree, long /*int*/ path, long /*int*/ column) {
TableItem item = null;
- int /*long*/ indices = OS.gtk_tree_path_get_indices (path);
+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path);
if (indices != 0) {
int [] index = new int []{-1};
OS.memmove (index, indices, 4);
@@ -1976,30 +1976,30 @@ int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long
return 0;
}
-int /*long*/ gtk_row_deleted (int /*long*/ model, int /*long*/ path) {
+long /*int*/ gtk_row_deleted (long /*int*/ model, long /*int*/ path) {
if (ignoreAccessibility) {
OS.g_signal_stop_emission_by_name (model, OS.row_deleted);
}
return 0;
}
-int /*long*/ gtk_row_inserted (int /*long*/ model, int /*long*/ path, int /*long*/ iter) {
+long /*int*/ gtk_row_inserted (long /*int*/ model, long /*int*/ path, long /*int*/ iter) {
if (ignoreAccessibility) {
OS.g_signal_stop_emission_by_name (model, OS.row_inserted);
}
return 0;
}
-int /*long*/ gtk_start_interactive_search(int /*long*/ widget) {
+long /*int*/ gtk_start_interactive_search(long /*int*/ widget) {
if (!searchEnabled()) {
OS.g_signal_stop_emission_by_name(widget, OS.start_interactive_search);
return 1;
}
return 0;
}
-int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) {
- int /*long*/ path = OS.gtk_tree_path_new_from_string (pathStr);
+long /*int*/ gtk_toggled (long /*int*/ renderer, long /*int*/ pathStr) {
+ long /*int*/ path = OS.gtk_tree_path_new_from_string (pathStr);
if (path == 0) return 0;
- int /*long*/ indices = OS.gtk_tree_path_get_indices (path);
+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path);
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
@@ -2014,7 +2014,7 @@ int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) {
return 0;
}
-void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
+void gtk_widget_size_request (long /*int*/ widget, GtkRequisition requisition) {
/*
* Bug in GTK. For some reason, gtk_widget_size_request() fails
* to include the height of the tree view items when there are
@@ -2025,17 +2025,17 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
super.gtk_widget_size_request (widget, requisition);
return;
}
- int /*long*/ columns = OS.gtk_tree_view_get_columns (handle), list = columns;
+ long /*int*/ columns = OS.gtk_tree_view_get_columns (handle), list = columns;
boolean fixVisible = columns != 0;
while (list != 0) {
- int /*long*/ column = OS.g_list_data (list);
+ long /*int*/ column = OS.g_list_data (list);
if (OS.gtk_tree_view_column_get_visible (column)) {
fixVisible = false;
break;
}
list = OS.g_list_next (list);
}
- int /*long*/ columnHandle = 0;
+ long /*int*/ columnHandle = 0;
if (fixVisible) {
columnHandle = OS.g_list_data (columns);
OS.gtk_tree_view_column_set_visible (columnHandle, true);
@@ -2048,13 +2048,13 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
}
void hideFirstColumn () {
- int /*long*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0);
+ long /*int*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0);
OS.gtk_tree_view_column_set_visible (firstColumn, false);
}
void hookEvents () {
super.hookEvents ();
- int /*long*/ selection = OS.gtk_tree_view_get_selection(handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection(handle);
OS.g_signal_connect_closure (selection, OS.changed, display.closures [CHANGED], false);
OS.g_signal_connect_closure (handle, OS.row_activated, display.closures [ROW_ACTIVATED], false);
if (checkRenderer != 0) {
@@ -2145,9 +2145,9 @@ public int indexOf (TableItem item) {
*/
public boolean isSelected (int index) {
checkWidget();
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
byte [] buffer = Converter.wcsToMbcs (null, Integer.toString (index), true);
- int /*long*/ path = OS.gtk_tree_path_new_from_string (buffer);
+ long /*int*/ path = OS.gtk_tree_path_new_from_string (buffer);
boolean answer = OS.gtk_tree_selection_path_is_selected (selection, path);
OS.gtk_tree_path_free (path);
return answer;
@@ -2155,7 +2155,7 @@ public boolean isSelected (int index) {
boolean mnemonicHit (char key) {
for (int i=0; i 0) {
- int /*long*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1);
+ long /*int*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1);
for (int i = 0; i < columnCount; i++) {
if (columns [i].handle == columnHandle) {
columnIndex = i;
@@ -2536,18 +2536,18 @@ int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ widget, int /*
return 0;
}
-int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*long*/ widget, int /*long*/ background_area, int /*long*/ cell_area, int /*long*/ expose_area, int /*long*/ flags) {
+long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ window, long /*int*/ widget, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ expose_area, long /*int*/ flags) {
TableItem item = null;
- int /*long*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);
+ long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);
if (iter != 0) {
- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
int [] buffer = new int [1];
OS.memmove (buffer, OS.gtk_tree_path_get_indices (path), 4);
int index = buffer [0];
item = _getItem (index);
OS.gtk_tree_path_free (path);
}
- int /*long*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1);
+ long /*int*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1);
int columnIndex = 0;
if (columnCount > 0) {
for (int i = 0; i < columnCount; i++) {
@@ -2561,7 +2561,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) || (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {
drawFlags = (int)/*64*/flags;
drawState = SWT.FOREGROUND;
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
OS.gtk_tree_model_get (modelHandle, item.handle, Table.BACKGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) {
int modelIndex = columnCount == 0 ? Table.FIRST_COLUMN : columns [columnIndex].modelIndex;
@@ -2575,7 +2575,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;
GdkRectangle rect = new GdkRectangle ();
- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
OS.gtk_tree_path_free (path);
@@ -2589,7 +2589,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
}
//send out measure before erase
- int /*long*/ textRenderer = getTextRenderer (columnHandle);
+ long /*int*/ textRenderer = getTextRenderer (columnHandle);
if (textRenderer != 0) OS.gtk_cell_renderer_get_size (textRenderer, handle, null, null, null, null, null);
@@ -2627,7 +2627,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if ((drawState & SWT.SELECTED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_SELECTED;
if ((drawState & SWT.FOCUSED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_FOCUSED;
if ((drawState & SWT.SELECTED) != 0) {
- int /*long*/ style = OS.gtk_widget_get_style (widget);
+ long /*int*/ style = OS.gtk_widget_get_style (widget);
//TODO - parity and sorted
byte[] detail = Converter.wcsToMbcs (null, "cell_odd", true);
OS.gtk_paint_flat_box (style, window, OS.GTK_STATE_SELECTED, OS.GTK_SHADOW_NONE, rect, widget, detail, rect.x, rect.y, rect.width, rect.height);
@@ -2638,7 +2638,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
}
}
}
- int /*long*/ result = 0;
+ long /*int*/ result = 0;
if ((drawState & SWT.BACKGROUND) != 0 && (drawState & SWT.SELECTED) == 0) {
GC gc = new GC (this);
gc.setBackground (item.getBackground (columnIndex));
@@ -2648,7 +2648,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
gc.dispose ();
}
if ((drawState & SWT.FOREGROUND) != 0 || OS.GTK_IS_CELL_RENDERER_TOGGLE (cell)) {
- int /*long*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));
+ long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
if (drawForeground != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
@@ -2660,7 +2660,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if (OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
if (hooks (SWT.PaintItem)) {
GdkRectangle rect = new GdkRectangle ();
- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
OS.gtk_tree_path_free (path);
ignoreSize = true;
@@ -2711,8 +2711,8 @@ void resetCustomDraw () {
for (int i=0; i 1)) return;
boolean fixColumn = showFirstColumn ();
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int i=0; i index || index > count - 1) return _getBackground ();
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_BACKGROUND, ptr, -1);
if (ptr [0] == 0) return _getBackground ();
@@ -156,7 +156,7 @@ boolean _getChecked () {
}
Color _getForeground () {
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
OS.gtk_tree_model_get (parent.modelHandle, handle, Table.FOREGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) return parent.getForeground ();
GdkColor gdkColor = new GdkColor ();
@@ -168,7 +168,7 @@ Color _getForeground () {
Color _getForeground (int index) {
int count = Math.max (1, parent.columnCount);
if (0 > index || index > count - 1) return _getForeground ();
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_FOREGROUND, ptr, -1);
if (ptr [0] == 0) return _getForeground ();
@@ -181,7 +181,7 @@ Color _getForeground (int index) {
Image _getImage (int index) {
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return null;
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_PIXBUF, ptr, -1);
if (ptr [0] == 0) return null;
@@ -195,7 +195,7 @@ Image _getImage (int index) {
String _getText (int index) {
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return "";
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_TEXT, ptr, -1);
if (ptr [0] == 0) return "";
@@ -219,7 +219,7 @@ void clear () {
OS.gtk_list_store_set (parent.modelHandle, handle, i, 0, -1);
}
for (int i=Table.FOREGROUND_COLUMN; i 0;
@@ -358,15 +358,15 @@ public Color getBackground (int index) {
public Rectangle getBounds (int index) {
checkWidget();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
- int /*long*/ parentHandle = parent.handle;
- int /*long*/ column = 0;
+ long /*int*/ parentHandle = parent.handle;
+ long /*int*/ column = 0;
if (index >= 0 && index < parent.columnCount) {
column = parent.columns [index].handle;
} else {
column = OS.gtk_tree_view_get_column (parentHandle, index);
}
if (column == 0) return new Rectangle (0, 0, 0, 0);
- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
OS.gtk_widget_realize (parentHandle);
GdkRectangle rect = new GdkRectangle ();
OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
@@ -541,18 +541,18 @@ public Image getImage (int index) {
public Rectangle getImageBounds (int index) {
checkWidget ();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
- int /*long*/ parentHandle = parent.handle;
- int /*long*/ column = 0;
+ long /*int*/ parentHandle = parent.handle;
+ long /*int*/ column = 0;
if (index >= 0 && index < parent.columnCount) {
column = parent.columns [index].handle;
} else {
column = OS.gtk_tree_view_get_column (parentHandle, index);
}
if (column == 0) return new Rectangle (0, 0, 0, 0);
- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);
+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
if (pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);
GdkRectangle rect = new GdkRectangle ();
- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
OS.gtk_widget_realize (parentHandle);
OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
OS.gtk_tree_path_free (path);
@@ -651,19 +651,19 @@ public Rectangle getTextBounds (int index) {
if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0);
// TODO fully test on early and later versions of GTK
// shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
- int /*long*/ parentHandle = parent.handle;
- int /*long*/ column = 0;
+ long /*int*/ parentHandle = parent.handle;
+ long /*int*/ column = 0;
if (index >= 0 && index < parent.columnCount) {
column = parent.columns [index].handle;
} else {
column = OS.gtk_tree_view_get_column (parentHandle, index);
}
if (column == 0) return new Rectangle (0, 0, 0, 0);
- int /*long*/ textRenderer = parent.getTextRenderer (column);
- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);
+ long /*int*/ textRenderer = parent.getTextRenderer (column);
+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);
- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
OS.gtk_widget_realize (parentHandle);
boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
@@ -702,12 +702,12 @@ public Rectangle getTextBounds (int index) {
void redraw () {
if (gtk_widget_get_realized (parent.handle)) {
- int /*long*/ parentHandle = parent.handle;
- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ long /*int*/ parentHandle = parent.handle;
+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
GdkRectangle rect = new GdkRectangle ();
OS.gtk_tree_view_get_cell_area (parentHandle, path, 0, rect);
OS.gtk_tree_path_free (path);
- int /*long*/ window = OS.gtk_tree_view_get_bin_window (parentHandle);
+ long /*int*/ window = OS.gtk_tree_view_get_bin_window (parentHandle);
rect.x = 0;
int [] w = new int [1], h = new int [1];
gdk_window_get_size (window, w, h);
@@ -812,16 +812,16 @@ public void setBackground (int index, Color color) {
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
- int /*long*/ parentHandle = parent.handle;
- int /*long*/ column = 0;
+ long /*int*/ parentHandle = parent.handle;
+ long /*int*/ column = 0;
if (parent.columnCount > 0) {
column = parent.columns [index].handle;
} else {
column = OS.gtk_tree_view_get_column (parentHandle, index);
}
if (column == 0) return;
- int /*long*/ textRenderer = parent.getTextRenderer (column);
- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
+ long /*int*/ textRenderer = parent.getTextRenderer (column);
+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
@@ -885,7 +885,7 @@ public void setFont (Font font){
if (oldFont == font) return;
this.font = font;
if (oldFont != null && oldFont.equals (font)) return;
- int /*long*/ fontHandle = font != null ? font.handle : 0;
+ long /*int*/ fontHandle = font != null ? font.handle : 0;
OS.gtk_list_store_set (parent.modelHandle, handle, Table.FONT_COLUMN, fontHandle, -1);
/*
* Bug in GTK. When using fixed-height-mode,
@@ -936,7 +936,7 @@ public void setFont (int index, Font font) {
if (oldFont != null && oldFont.equals (font)) return;
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
- int /*long*/ fontHandle = font != null ? font.handle : 0;
+ long /*int*/ fontHandle = font != null ? font.handle : 0;
OS.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_FONT, fontHandle, -1);
/*
* Bug in GTK. When using fixed-height-mode,
@@ -954,16 +954,16 @@ public void setFont (int index, Font font) {
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
- int /*long*/ parentHandle = parent.handle;
- int /*long*/ column = 0;
+ long /*int*/ parentHandle = parent.handle;
+ long /*int*/ column = 0;
if (parent.columnCount > 0) {
column = parent.columns [index].handle;
} else {
column = OS.gtk_tree_view_get_column (parentHandle, index);
}
if (column == 0) return;
- int /*long*/ textRenderer = parent.getTextRenderer (column);
- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
+ long /*int*/ textRenderer = parent.getTextRenderer (column);
+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
@@ -1059,16 +1059,16 @@ public void setForeground (int index, Color color){
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
- int /*long*/ parentHandle = parent.handle;
- int /*long*/ column = 0;
+ long /*int*/ parentHandle = parent.handle;
+ long /*int*/ column = 0;
if (parent.columnCount > 0) {
column = parent.columns [index].handle;
} else {
column = OS.gtk_tree_view_get_column (parentHandle, index);
}
if (column == 0) return;
- int /*long*/ textRenderer = parent.getTextRenderer (column);
- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
+ long /*int*/ textRenderer = parent.getTextRenderer (column);
+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
@@ -1131,7 +1131,7 @@ public void setImage (int index, Image image) {
}
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return;
- int /*long*/ pixbuf = 0;
+ long /*int*/ pixbuf = 0;
if (image != null) {
ImageList imageList = parent.imageList;
if (imageList == null) imageList = parent.imageList = new ImageList ();
@@ -1158,10 +1158,10 @@ public void setImage (int index, Image image) {
*/
if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {
if (image != null) {
- int /*long*/parentHandle = parent.handle;
- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
+ long /*int*/parentHandle = parent.handle;
+ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
int [] w = new int [1];
- int /*long*/ pixbufRenderer = parent.getPixbufRenderer(column);
+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer(column);
OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
if (w[0] < image.getBounds().width) {
/*
@@ -1169,7 +1169,7 @@ public void setImage (int index, Image image) {
* are relying on the fact that it is done as part of modifying
* the style.
*/
- int /*long*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
+ long /*int*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
parent.modifyStyle (parentHandle, style);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
index fdcb01cd48..f45e9ab5a3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java
@@ -57,9 +57,9 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Text extends Scrollable {
- int /*long*/ bufferHandle;
+ long /*int*/ bufferHandle;
int tabs = 8, lastEventTime = 0;
- int /*long*/ gdkEventKey = 0;
+ long /*int*/ gdkEventKey = 0;
int fixStart = -1, fixEnd = -1;
boolean doubleClick;
String message = "";
@@ -392,7 +392,7 @@ public void append (String string) {
OS.gtk_text_buffer_get_end_iter (bufferHandle, position);
OS.gtk_text_buffer_insert (bufferHandle, position, buffer, buffer.length);
OS.gtk_text_buffer_place_cursor (bufferHandle, position);
- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
+ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
}
applySegments ();
@@ -429,7 +429,7 @@ void applySegments () {
separator [0] = segmentsChars [i];
}
byte [] buffer = Converter.wcsToMbcs (null, separator, false);
- int /*long*/ ptr = OS.gtk_entry_get_text (handle);
+ long /*int*/ ptr = OS.gtk_entry_get_text (handle);
pos [0] = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, pos [0]);
OS.gtk_editable_insert_text (handle, buffer, buffer.length, pos);
}
@@ -443,7 +443,7 @@ void applySegments () {
byte [] endIter = new byte [ITER_SIZEOF];
for (int i = 0; i < nSegments; i++) {
OS.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
+ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, pos, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i] + i));
OS.g_free (ptr);
if (segmentsChars != null && segmentsChars.length > i) {
@@ -466,7 +466,7 @@ void clearSegments (boolean applyText) {
OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
if (applyText) {
OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, DELETE_TEXT);
- int /*long*/ ptr = OS.gtk_entry_get_text (handle);
+ long /*int*/ ptr = OS.gtk_entry_get_text (handle);
int start, end;
for (int i = 0; i < nSegments; i++) {
start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i]);
@@ -485,7 +485,7 @@ void clearSegments (boolean applyText) {
byte [] startIter = new byte [ITER_SIZEOF], endIter = new byte [ITER_SIZEOF];
for (int i = 0; i < nSegments; i++) {
OS.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
+ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, start, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i]));
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, end, (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, segments[i] + 1));
OS.gtk_text_buffer_delete (bufferHandle, start, end);
@@ -512,8 +512,8 @@ public void clearSelection () {
OS.gtk_editable_select_region (handle, position, position);
} else {
byte [] position = new byte [ITER_SIZEOF];
- int /*long*/ insertMark = OS.gtk_text_buffer_get_insert (bufferHandle);
- int /*long*/ selectionMark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);
+ long /*int*/ insertMark = OS.gtk_text_buffer_get_insert (bufferHandle);
+ long /*int*/ selectionMark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);
OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, insertMark);
OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, position);
OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, position);
@@ -527,13 +527,13 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
int[] w = new int [1], h = new int [1];
if ((style & SWT.SINGLE) != 0) {
OS.gtk_widget_realize (handle);
- int /*long*/ layout = OS.gtk_entry_get_layout (handle);
+ long /*int*/ layout = OS.gtk_entry_get_layout (handle);
OS.pango_layout_get_size (layout, w, h);
} else {
byte [] start = new byte [ITER_SIZEOF], end = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_bounds (bufferHandle, start, end);
- int /*long*/ text = OS.gtk_text_buffer_get_text (bufferHandle, start, end, true);
- int /*long*/ layout = OS.gtk_widget_create_pango_layout (handle, text);
+ long /*int*/ text = OS.gtk_text_buffer_get_text (bufferHandle, start, end, true);
+ long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, text);
OS.g_free (text);
OS.pango_layout_set_width (layout, wHint * OS.PANGO_SCALE);
OS.pango_layout_get_size (layout, w, h);
@@ -543,7 +543,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
int height = OS.PANGO_PIXELS (h [0]);
if ((style & SWT.SINGLE) != 0 && message.length () > 0) {
byte [] buffer = Converter.wcsToMbcs (null, message, true);
- int /*long*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);
+ long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);
OS.pango_layout_get_size (layout, w, h);
OS.g_object_unref (layout);
width = Math.max (width, OS.PANGO_PIXELS (w [0]));
@@ -562,7 +562,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
int xborder = 0, yborder = 0;
if ((style & SWT.SINGLE) != 0) {
if ((style & SWT.BORDER) != 0) {
- int /*long*/ style = OS.gtk_widget_get_style (handle);
+ long /*int*/ style = OS.gtk_widget_get_style (handle);
xborder += OS.gtk_style_get_xthickness (style);
yborder += OS.gtk_style_get_ythickness (style);
}
@@ -607,7 +607,7 @@ public void copy () {
if ((style & SWT.SINGLE) != 0) {
OS.gtk_editable_copy_clipboard (handle);
} else {
- int /*long*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);
+ long /*int*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);
clearSegments (true);
OS.gtk_text_buffer_copy_clipboard (bufferHandle, clipboard);
applySegments ();
@@ -631,7 +631,7 @@ public void cut () {
if ((style & SWT.SINGLE) != 0) {
OS.gtk_editable_cut_clipboard (handle);
} else {
- int /*long*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);
+ long /*int*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);
clearSegments (true);
OS.gtk_text_buffer_cut_clipboard (bufferHandle, clipboard, OS.gtk_text_view_get_editable (handle));
applySegments ();
@@ -670,7 +670,7 @@ char [] deprocessText (char [] text, int start, int end) {
void deregister () {
super.deregister ();
if (bufferHandle != 0) display.removeWidget (bufferHandle);
- int /*long*/ imContext = imContext ();
+ long /*int*/ imContext = imContext ();
if (imContext != 0) display.removeWidget (imContext);
}
@@ -698,9 +698,9 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
if ((style & SWT.SINGLE) != 0) {
int [] index = new int [1];
int [] trailing = new int [1];
- int /*long*/ layout = OS.gtk_entry_get_layout (handle);
+ long /*int*/ layout = OS.gtk_entry_get_layout (handle);
OS.pango_layout_xy_to_index (layout, x * OS.PANGO_SCALE, y * OS.PANGO_SCALE, index, trailing);
- int /*long*/ ptr = OS.pango_layout_get_text (layout);
+ long /*int*/ ptr = OS.pango_layout_get_text (layout);
position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];
} else {
byte [] p = new byte [ITER_SIZEOF];
@@ -719,15 +719,15 @@ boolean dragDetect (int x, int y, boolean filter, boolean dragOnTimeout, boolean
return super.dragDetect (x, y, filter, dragOnTimeout, consume);
}
-int /*long*/ eventWindow () {
+long /*int*/ eventWindow () {
return paintWindow ();
}
-boolean filterKey (int keyval, int /*long*/ event) {
+boolean filterKey (int keyval, long /*int*/ event) {
int time = OS.gdk_event_get_time (event);
if (time != lastEventTime) {
lastEventTime = time;
- int /*long*/ imContext = imContext ();
+ long /*int*/ imContext = imContext ();
if (imContext != 0) {
return OS.gtk_im_context_filter_keypress (imContext, event);
}
@@ -746,7 +746,7 @@ void fixIM () {
* filter has to be called by SWT.
*/
if (gdkEventKey != 0 && gdkEventKey != -1) {
- int /*long*/ imContext = imContext ();
+ long /*int*/ imContext = imContext ();
if (imContext != 0) {
OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);
gdkEventKey = -1;
@@ -763,7 +763,7 @@ GdkColor getBackgroundColor () {
public int getBorderWidth () {
checkWidget();
if ((style & SWT.MULTI) != 0) return super.getBorderWidth ();
- int /*long*/ style = OS.gtk_widget_get_style (handle);
+ long /*int*/ style = OS.gtk_widget_get_style (handle);
if ((this.style & SWT.BORDER) != 0) {
return OS.gtk_style_get_xthickness (style);
}
@@ -787,7 +787,7 @@ public int getCaretLineNumber () {
checkWidget ();
if ((style & SWT.SINGLE) != 0) return 0;
byte [] position = new byte [ITER_SIZEOF];
- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
+ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
return OS.gtk_text_iter_get_line (position);
}
@@ -812,7 +812,7 @@ public Point getCaretLocation () {
}
int [] offset_x = new int [1], offset_y = new int [1];
OS.gtk_entry_get_layout_offsets (handle, offset_x, offset_y);
- int /*long*/ layout = OS.gtk_entry_get_layout (handle);
+ long /*int*/ layout = OS.gtk_entry_get_layout (handle);
PangoRectangle pos = new PangoRectangle ();
OS.pango_layout_index_to_pos (layout, index, pos);
int x = offset_x [0] + OS.PANGO_PIXELS (pos.x) - getBorderWidth ();
@@ -820,7 +820,7 @@ public Point getCaretLocation () {
return new Point (x, y);
}
byte [] position = new byte [ITER_SIZEOF];
- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
+ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
GdkRectangle rect = new GdkRectangle ();
OS.gtk_text_view_get_iter_location (handle, position, rect);
@@ -847,15 +847,15 @@ public int getCaretPosition () {
checkWidget ();
int result;
if ((style & SWT.SINGLE) != 0) {
- int /*long*/ ptr = OS.gtk_entry_get_text (handle);
+ long /*int*/ ptr = OS.gtk_entry_get_text (handle);
result = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_editable_get_position (handle));
} else {
byte [] position = new byte [ITER_SIZEOF];
- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
+ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
byte [] zero = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, position, true);
+ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, position, true);
result = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (position));
OS.g_free (ptr);
}
@@ -876,13 +876,13 @@ public int getCharCount () {
checkWidget ();
int result;
if ((style & SWT.SINGLE) != 0) {
- int /*long*/ ptr = OS.gtk_entry_get_text (handle);
+ long /*int*/ ptr = OS.gtk_entry_get_text (handle);
result = (int)/*64*/OS.g_utf16_strlen (ptr, -1);
} else {
byte [] startIter = new byte [ITER_SIZEOF];
byte [] endIter = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
+ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
result = (int)/*64*/OS.g_utf16_strlen(ptr, -1);
OS.g_free (ptr);
}
@@ -1051,16 +1051,16 @@ public int getOrientation () {
if ((style & SWT.SINGLE) != 0) {
int [] index = new int [1];
int [] trailing = new int [1];
- int /*long*/ layout = OS.gtk_entry_get_layout (handle);
+ long /*int*/ layout = OS.gtk_entry_get_layout (handle);
OS.pango_layout_xy_to_index (layout, point.x * OS.PANGO_SCALE, point.y * OS.PANGO_SCALE, index, trailing);
- int /*long*/ ptr = OS.pango_layout_get_text (layout);
+ long /*int*/ ptr = OS.pango_layout_get_text (layout);
position = (int)/*64*/OS.g_utf16_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];
} else {
byte [] p = new byte [ITER_SIZEOF];
OS.gtk_text_view_get_iter_at_location (handle, p, point.x, point.y);
byte [] zero = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, p, true);
+ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, p, true);
position = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (p));
OS.g_free (ptr);
}
@@ -1092,7 +1092,7 @@ public Point getSelection () {
int [] start = new int [1];
int [] end = new int [1];
OS.gtk_editable_get_selection_bounds (handle, start, end);
- int /*long*/ ptr = OS.gtk_entry_get_text (handle);
+ long /*int*/ ptr = OS.gtk_entry_get_text (handle);
start[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start[0]);
end[0] = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end[0]);
selection = new Point (start [0], end [0]);
@@ -1102,7 +1102,7 @@ public Point getSelection () {
OS.gtk_text_buffer_get_selection_bounds (bufferHandle, startIter, endIter);
byte [] zero = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true);
+ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true);
int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (startIter));
int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, OS.gtk_text_iter_get_offset (endIter));
OS.g_free (ptr);
@@ -1167,7 +1167,7 @@ public int getTabs () {
int getTabWidth (int tabs) {
byte[] buffer = Converter.wcsToMbcs(null, " ", true);
- int /*long*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);
+ long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);
int [] width = new int [1];
int [] height = new int [1];
OS.pango_layout_get_size (layout, width, height);
@@ -1247,7 +1247,7 @@ public String getText (int start, int end) {
*/
public char [] getTextChars () {
checkWidget ();
- int /*long*/ address;
+ long /*int*/ address;
if ((style & SWT.SINGLE) != 0) {
address = OS.gtk_entry_get_text (handle);
} else {
@@ -1345,13 +1345,13 @@ public int getTopPixel () {
return lineTop [0];
}
-int /*long*/ gtk_activate (int /*long*/ widget) {
+long /*int*/ gtk_activate (long /*int*/ widget) {
sendSelectionEvent (SWT.DefaultSelection);
return 0;
}
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ result = super.gtk_button_press_event (widget, event);
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ result = super.gtk_button_press_event (widget, event);
if (result != 0) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
@@ -1366,7 +1366,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
}
-int /*long*/ gtk_changed (int /*long*/ widget) {
+long /*int*/ gtk_changed (long /*int*/ widget) {
/*
* Feature in GTK. When the user types, GTK positions
* the caret after sending the changed signal. This
@@ -1375,7 +1375,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
* is to post the modify event when the user is typing.
*/
boolean keyPress = false;
- int /*long*/ eventPtr = OS.gtk_get_current_event ();
+ long /*int*/ eventPtr = OS.gtk_get_current_event ();
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
@@ -1393,14 +1393,14 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
}
if ((style & SWT.SEARCH) != 0) {
if ((style & SWT.ICON_CANCEL) != 0) {
- int /*long*/ ptr = OS.gtk_entry_get_text (handle);
+ long /*int*/ ptr = OS.gtk_entry_get_text (handle);
OS.gtk_entry_set_icon_sensitive (handle, OS.GTK_ENTRY_ICON_SECONDARY, OS.g_utf16_strlen (ptr, -1) > 0);
}
}
return 0;
}
-int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) {
+long /*int*/ gtk_commit (long /*int*/ imContext, long /*int*/ text) {
if (text == 0) return 0;
if ((style & SWT.SINGLE) != 0) {
if (!OS.gtk_editable_get_editable (handle)) return 0;
@@ -1442,7 +1442,7 @@ int /*long*/ gtk_commit (int /*long*/ imContext, int /*long*/ text) {
return 0;
}
-int /*long*/ gtk_delete_range (int /*long*/ widget, int /*long*/ iter1, int /*long*/ iter2) {
+long /*int*/ gtk_delete_range (long /*int*/ widget, long /*int*/ iter1, long /*int*/ iter2) {
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
byte [] startIter = new byte [ITER_SIZEOF];
byte [] endIter = new byte [ITER_SIZEOF];
@@ -1452,7 +1452,7 @@ int /*long*/ gtk_delete_range (int /*long*/ widget, int /*long*/ iter1, int /*lo
int end = OS.gtk_text_iter_get_offset (endIter);
byte [] zero = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true);
+ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, endIter, true);
start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start);
end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end);
OS.g_free (ptr);
@@ -1484,9 +1484,9 @@ int /*long*/ gtk_delete_range (int /*long*/ widget, int /*long*/ iter1, int /*lo
return 0;
}
-int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int /*long*/ end_pos) {
+long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long /*int*/ end_pos) {
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
- int /*long*/ ptr = OS.gtk_entry_get_text (handle);
+ long /*int*/ ptr = OS.gtk_entry_get_text (handle);
if (end_pos == -1) end_pos = OS.g_utf8_strlen (ptr, -1);
int start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start_pos);
int end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end_pos);
@@ -1516,7 +1516,7 @@ int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int /
return 0;
}
-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
if (cursor != null) setCursor (cursor.handle);
/*
* Feature in GTK. The gtk-entry-select-on-focus property is a global
@@ -1532,7 +1532,7 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
GdkEventFocus gdkEventFocus = new GdkEventFocus ();
OS.memmove (gdkEventFocus, gdkEvent, GdkEventFocus.sizeof);
if (gdkEventFocus.in == 0) {
- int /*long*/ settings = OS.gtk_settings_get_default ();
+ long /*int*/ settings = OS.gtk_settings_get_default ();
OS.g_object_set (settings, OS.gtk_entry_select_on_focus, true, 0);
}
break;
@@ -1541,29 +1541,29 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
return super.gtk_event_after (widget, gdkEvent);
}
-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ event) {
if ((state & OBSCURED) != 0) return 0;
- int /*long*/ result = super.gtk_expose_event (widget, event);
+ long /*int*/ result = super.gtk_expose_event (widget, event);
if ((style & SWT.SINGLE) != 0 && message.length () > 0) {
- int /*long*/ str = OS.gtk_entry_get_text (handle);
+ long /*int*/ str = OS.gtk_entry_get_text (handle);
if (!gtk_widget_has_focus (handle) && OS.strlen (str) == 0) {
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, event, GdkEventExpose.sizeof);
- int /*long*/ window = paintWindow ();
+ long /*int*/ window = paintWindow ();
int [] w = new int [1], h = new int [1];
gdk_window_get_size (window, w, h);
GtkBorder innerBorder = Display.getEntryInnerBorder (handle);
int width = w [0] - innerBorder.left - innerBorder.right;
int height = h [0] - innerBorder.top - innerBorder.bottom;
- int /*long*/ context = OS.gtk_widget_get_pango_context (handle);
- int /*long*/ lang = OS.pango_context_get_language (context);
- int /*long*/ metrics = OS.pango_context_get_metrics (context, getFontDescription (), lang);
+ long /*int*/ context = OS.gtk_widget_get_pango_context (handle);
+ long /*int*/ lang = OS.pango_context_get_language (context);
+ long /*int*/ metrics = OS.pango_context_get_metrics (context, getFontDescription (), lang);
int ascent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_ascent (metrics));
int descent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_descent (metrics));
OS.pango_font_metrics_unref (metrics);
byte [] buffer = Converter.wcsToMbcs (null, message, true);
- int /*long*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);
- int /*long*/ line = OS.pango_layout_get_line (layout, 0);
+ long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);
+ long /*int*/ line = OS.pango_layout_get_line (layout, 0);
PangoRectangle rect = new PangoRectangle ();
OS.pango_layout_line_get_extents (line, null, rect);
rect.y = OS.PANGO_PIXELS (rect.y);
@@ -1586,19 +1586,19 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) {
case SWT.CENTER: x = (width - rect.width) / 2; break;
case SWT.RIGHT: x = rtl ? innerBorder.left : width - rect.width; break;
}
- int /*long*/ style = OS.gtk_widget_get_style (handle);
+ long /*int*/ style = OS.gtk_widget_get_style (handle);
GdkColor textColor = new GdkColor ();
OS.gtk_style_get_text (style, OS.GTK_STATE_INSENSITIVE, textColor);
GdkColor baseColor = new GdkColor ();
OS.gtk_style_get_base (style, OS.GTK_STATE_NORMAL, baseColor);
if (OS.USE_CAIRO) {
- int /*long*/ cairo = OS.gdk_cairo_create(window);
+ long /*int*/ cairo = OS.gdk_cairo_create(window);
Cairo.cairo_set_source_rgba(cairo, (textColor.red & 0xFFFF) / (float)0xFFFF, (textColor.green & 0xFFFF) / (float)0xFFFF, (textColor.blue & 0xFFFF) / (float)0xFFFF, 1);
Cairo.cairo_move_to(cairo, x, y);
OS.pango_cairo_show_layout(cairo, layout);
Cairo.cairo_destroy(cairo);
} else {
- int /*long*/ gc = OS.gdk_gc_new (window);
+ long /*int*/ gc = OS.gdk_gc_new (window);
OS.gdk_draw_layout_with_colors (window, gc, x, y, layout, textColor, baseColor);
OS.g_object_unref (gc);
}
@@ -1608,13 +1608,13 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {
fixIM ();
return super.gtk_focus_out_event (widget, event);
}
-int /*long*/ gtk_grab_focus (int /*long*/ widget) {
- int /*long*/ result = super.gtk_grab_focus (widget);
+long /*int*/ gtk_grab_focus (long /*int*/ widget) {
+ long /*int*/ result = super.gtk_grab_focus (widget);
/*
* Feature in GTK. GtkEntry widgets select their text on focus in,
* clearing the previous selection. This behavior is controlled by
@@ -1623,13 +1623,13 @@ int /*long*/ gtk_grab_focus (int /*long*/ widget) {
* the entry has done focus in processing.
*/
if ((style & SWT.SINGLE) != 0 && display.entrySelectOnFocus) {
- int /*long*/ settings = OS.gtk_settings_get_default ();
+ long /*int*/ settings = OS.gtk_settings_get_default ();
OS.g_object_set (settings, OS.gtk_entry_select_on_focus, false, 0);
}
return result;
}
-int /*long*/ gtk_icon_release (int /*long*/ widget, int /*long*/ icon_pos, int /*long*/ event) {
+long /*int*/ gtk_icon_release (long /*int*/ widget, long /*int*/ icon_pos, long /*int*/ event) {
Event e = new Event();
if (icon_pos == OS.GTK_ENTRY_ICON_PRIMARY) {
e.detail = SWT.ICON_SEARCH;
@@ -1641,7 +1641,7 @@ int /*long*/ gtk_icon_release (int /*long*/ widget, int /*long*/ icon_pos, int /
return 0;
}
-int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*long*/ new_text_length, int /*long*/ position) {
+long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /*int*/ new_text_length, long /*int*/ position) {
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
if (new_text == 0 || new_text_length == 0) return 0;
byte [] buffer = new byte [(int)/*64*/new_text_length];
@@ -1649,7 +1649,7 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*
String oldText = new String (Converter.mbcsToWcs (null, buffer));
int [] pos = new int [1];
OS.memmove (pos, position, 4);
- int /*long*/ ptr = OS.gtk_entry_get_text (handle);
+ long /*int*/ ptr = OS.gtk_entry_get_text (handle);
if (pos [0] == -1) pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
/* Use the selection when the text was deleted */
int start = pos [0], end = pos [0];
@@ -1689,7 +1689,7 @@ int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*
return 0;
}
-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {
boolean handleSegments = false, segmentsCleared = false;
if (hooks (SWT.Segments) || filters (SWT.Segments)) {
GdkEventKey gdkEvent = new GdkEventKey ();
@@ -1702,7 +1702,7 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
}
}
}
- int /*long*/ result = super.gtk_key_press_event (widget, event);
+ long /*int*/ result = super.gtk_key_press_event (widget, event);
if (result != 0) fixIM ();
if (gdkEventKey == -1) result = 1;
gdkEventKey = 0;
@@ -1712,7 +1712,7 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
-int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) {
+long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) {
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL);
OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);
@@ -1720,7 +1720,7 @@ int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) {
return 0;
}
-int /*long*/ gtk_text_buffer_insert_text (int /*long*/ widget, int /*long*/ iter, int /*long*/ text, int /*long*/ length) {
+long /*int*/ gtk_text_buffer_insert_text (long /*int*/ widget, long /*int*/ iter, long /*int*/ text, long /*int*/ length) {
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
byte [] position = new byte [ITER_SIZEOF];
OS.memmove (position, iter, position.length);
@@ -1733,7 +1733,7 @@ int /*long*/ gtk_text_buffer_insert_text (int /*long*/ widget, int /*long*/ iter
}
byte [] zero = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_iter_at_offset(bufferHandle, zero, 0);
- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, position, true);
+ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, zero, position, true);
start = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, start);
end = (int)/*64*/OS.g_utf8_offset_to_utf16_offset (ptr, end);
OS.g_free(ptr);
@@ -1773,7 +1773,7 @@ void hookEvents () {
OS.g_signal_connect_closure (bufferHandle, OS.delete_range, display.closures [DELETE_RANGE], false);
OS.g_signal_connect_closure (handle, OS.populate_popup, display.closures [POPULATE_POPUP], false);
}
- int /*long*/ imContext = imContext ();
+ long /*int*/ imContext = imContext ();
if (imContext != 0) {
OS.g_signal_connect_closure (imContext, OS.commit, display.closures [COMMIT], false);
int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());
@@ -1795,7 +1795,7 @@ void hookEvents () {
OS.g_signal_connect_closure (handle, OS.direction_changed, display.closures [DIRECTION_CHANGED], true);
}
-int /*long*/ imContext () {
+long /*int*/ imContext () {
if ((style & SWT.SINGLE) != 0) {
return OS.gtk_editable_get_editable (handle) ? OS.GTK_ENTRY_IM_CONTEXT (handle) : 0;
}
@@ -1837,16 +1837,16 @@ public void insert (String string) {
}
OS.gtk_text_buffer_insert (bufferHandle, start, buffer, buffer.length);
OS.gtk_text_buffer_place_cursor (bufferHandle, start);
- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
+ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
}
applySegments ();
}
-int /*long*/ paintWindow () {
+long /*int*/ paintWindow () {
if ((style & SWT.SINGLE) != 0) {
- int /*long*/ window = super.paintWindow ();
- int /*long*/ children = OS.gdk_window_get_children (window);
+ long /*int*/ window = super.paintWindow ();
+ long /*int*/ children = OS.gdk_window_get_children (window);
if (children != 0) {
/*
* When search or cancel icons are added to Text, those
@@ -1882,7 +1882,7 @@ public void paste () {
if ((style & SWT.SINGLE) != 0) {
OS.gtk_editable_paste_clipboard (handle);
} else {
- int /*long*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);
+ long /*int*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);
clearSegments (true);
OS.gtk_text_buffer_paste_clipboard (bufferHandle, clipboard, null, OS.gtk_text_view_get_editable (handle));
applySegments ();
@@ -1892,7 +1892,7 @@ public void paste () {
void register () {
super.register ();
if (bufferHandle != 0) display.addWidget (bufferHandle, this);
- int /*long*/ imContext = imContext ();
+ long /*int*/ imContext = imContext ();
if (imContext != 0) display.addWidget (imContext, this);
}
@@ -1907,7 +1907,7 @@ void releaseWidget () {
* it around until ownership of the clipboard is lost.
*/
if ((style & SWT.MULTI) != 0) {
- int /*long*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);
+ long /*int*/ clipboard = OS.gtk_clipboard_get (OS.GDK_NONE);
OS.gtk_text_buffer_paste_clipboard (bufferHandle, clipboard, null, OS.gtk_text_view_get_editable (handle));
}
}
@@ -2034,8 +2034,8 @@ public void selectAll () {
byte [] end = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, start, 0);
OS.gtk_text_buffer_get_end_iter (bufferHandle, end);
- int /*long*/ insertMark = OS.gtk_text_buffer_get_insert (bufferHandle);
- int /*long*/ selectionMark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);
+ long /*int*/ insertMark = OS.gtk_text_buffer_get_insert (bufferHandle);
+ long /*int*/ selectionMark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);
OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, start);
OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, end);
}
@@ -2046,8 +2046,8 @@ void setBackgroundColor (GdkColor color) {
OS.gtk_widget_modify_base (handle, 0, color);
}
-void setCursor (int /*long*/ cursor) {
- int /*long*/ defaultCursor = 0;
+void setCursor (long /*int*/ cursor) {
+ long /*int*/ defaultCursor = 0;
if (cursor == 0) defaultCursor = OS.gdk_cursor_new (OS.GDK_XTERM);
super.setCursor (cursor != 0 ? cursor : defaultCursor);
if (cursor == 0) OS.gdk_cursor_unref (defaultCursor);
@@ -2126,7 +2126,7 @@ public void setEditable (boolean editable) {
}
}
-void setFontDescription (int /*long*/ font) {
+void setFontDescription (long /*int*/ font) {
super.setFontDescription (font);
setTabStops (tabs);
}
@@ -2205,19 +2205,19 @@ public void setSelection (int start) {
checkWidget ();
start = translateOffset (start);
if ((style & SWT.SINGLE) != 0) {
- int /*long*/ ptr = OS.gtk_entry_get_text (handle);
+ long /*int*/ ptr = OS.gtk_entry_get_text (handle);
start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start);
OS.gtk_editable_set_position (handle, start);
} else {
byte [] startIter = new byte [ITER_SIZEOF];
byte [] endIter = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
+ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start);
OS.g_free (ptr);
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, startIter, start);
OS.gtk_text_buffer_place_cursor (bufferHandle, startIter);
- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
+ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
}
}
@@ -2252,7 +2252,7 @@ public void setSelection (int start, int end) {
start = translateOffset (start);
end = translateOffset (end);
if ((style & SWT.SINGLE) != 0) {
- int /*long*/ ptr = OS.gtk_entry_get_text (handle);
+ long /*int*/ ptr = OS.gtk_entry_get_text (handle);
start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start);
end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, end);
OS.gtk_editable_set_position (handle, start);
@@ -2261,14 +2261,14 @@ public void setSelection (int start, int end) {
byte [] startIter = new byte [ITER_SIZEOF];
byte [] endIter = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_bounds (bufferHandle, startIter, endIter);
- int /*long*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
+ long /*int*/ ptr = OS.gtk_text_buffer_get_text (bufferHandle, startIter, endIter, true);
start = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, start);
end = (int)/*64*/OS.g_utf16_offset_to_utf8_offset (ptr, end);
OS.g_free (ptr);
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, startIter, start);
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, endIter, end);
- int /*long*/ insertMark = OS.gtk_text_buffer_get_insert (bufferHandle);
- int /*long*/ selectionMark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);
+ long /*int*/ insertMark = OS.gtk_text_buffer_get_insert (bufferHandle);
+ long /*int*/ selectionMark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);
OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, startIter);
OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, endIter);
}
@@ -2334,7 +2334,7 @@ public void setTabs (int tabs) {
void setTabStops (int tabs) {
if ((style & SWT.SINGLE) != 0) return;
int tabWidth = getTabWidth (tabs);
- int /*long*/ tabArray = OS.pango_tab_array_new (1, false);
+ long /*int*/ tabArray = OS.pango_tab_array_new (1, false);
OS.pango_tab_array_set_tab (tabArray, 0, OS.PANGO_TAB_LEFT, tabWidth);
OS.gtk_text_view_set_tabs (handle, tabArray);
OS.pango_tab_array_free (tabArray);
@@ -2431,7 +2431,7 @@ void setText (char [] text) {
OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEXT_BUFFER_INSERT_TEXT);
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, position, 0);
OS.gtk_text_buffer_place_cursor (bufferHandle, position);
- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
+ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
}
sendEvent (SWT.Modify);
@@ -2511,7 +2511,7 @@ public void setTopIndex (int index) {
public void showSelection () {
checkWidget ();
if ((style & SWT.SINGLE) != 0) return;
- int /*long*/ mark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);
+ long /*int*/ mark = OS.gtk_text_buffer_get_selection_bound (bufferHandle);
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
mark = OS.gtk_text_buffer_get_insert (bufferHandle);
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
@@ -2530,9 +2530,9 @@ boolean translateTraversal (GdkEventKey keyEvent) {
switch (key) {
case OS.GDK_KP_Enter:
case OS.GDK_Return: {
- int /*long*/ imContext = imContext ();
+ long /*int*/ imContext = imContext ();
if (imContext != 0) {
- int /*long*/ [] preeditString = new int /*long*/ [1];
+ long /*int*/ [] preeditString = new long /*int*/ [1];
OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
if (preeditString [0] != 0) {
int length = OS.strlen (preeditString [0]);
@@ -2574,7 +2574,7 @@ String verifyText (String string, int start, int end) {
event.text = string;
event.start = start;
event.end = end;
- int /*long*/ eventPtr = OS.gtk_get_current_event ();
+ long /*int*/ eventPtr = OS.gtk_get_current_event ();
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
@@ -2596,7 +2596,7 @@ String verifyText (String string, int start, int end) {
return event.text;
}
-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {
+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) {
if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) {
switch ((int)/*64*/user_data) {
case BACKSPACE:
@@ -2618,7 +2618,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {
return super.windowProc (handle, user_data);
}
-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) {
switch ((int)/*64*/user_data) {
case DIRECTION_CHANGED: {
@@ -2631,7 +2631,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us
return super.windowProc (handle, arg0, user_data);
}
-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ user_data) {
+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) {
if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) {
switch ((int)/*64*/user_data) {
case DELETE_FROM_CURSOR: {
@@ -2647,7 +2647,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ ar
return super.windowProc (handle, arg0, arg1, user_data);
}
-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ user_data) {
+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) {
if (hooks (SWT.Segments) || filters (SWT.Segments) || segments != null) {
switch ((int)/*64*/user_data) {
case MOVE_CURSOR: {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java
index 0ba8e94db7..96ebcbf79a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java
@@ -204,11 +204,11 @@ Widget [] computeTabList () {
return result;
}
-int /*long*/ eventHandle () {
+long /*int*/ eventHandle () {
return fixedHandle;
}
-int /*long*/ enterExitHandle() {
+long /*int*/ enterExitHandle() {
return handle;
}
@@ -226,10 +226,10 @@ void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, De
}
}
-boolean forceFocus (int /*long*/ focusHandle) {
+boolean forceFocus (long /*int*/ focusHandle) {
int dir = OS.GTK_DIR_TAB_FORWARD;
if ((style & SWT.MIRRORED) != 0) dir = OS.GTK_DIR_TAB_BACKWARD;
- int /*long*/ childHandle = handle;
+ long /*int*/ childHandle = handle;
if (currentFocusItem != null) childHandle = currentFocusItem.handle;
/*
* Feature in GTK. GtkToolBar takes care of navigating through
@@ -298,7 +298,7 @@ public ToolItem getItem (Point point) {
*/
public int getItemCount () {
checkWidget();
- int /*long*/ list = OS.gtk_container_get_children (handle);
+ long /*int*/ list = OS.gtk_container_get_children (handle);
if (list == 0) return 0;
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
@@ -327,13 +327,13 @@ public ToolItem [] getItems () {
}
ToolItem [] _getItems () {
- int /*long*/ list = OS.gtk_container_get_children (handle);
+ long /*int*/ list = OS.gtk_container_get_children (handle);
if (list == 0) return new ToolItem [0];
int count = OS.g_list_length (list);
ToolItem [] items = new ToolItem [count];
int index = 0;
for (int i=0; i= OS.VERSION (2, 6, 0)) {
- int /*long*/ list = OS.gtk_container_get_children(eventHandle);
+ long /*int*/ list = OS.gtk_container_get_children(eventHandle);
eventHandle = OS.g_list_nth_data(list, 0);
if (arrowHandle != 0) OS.g_signal_connect_closure (arrowHandle, OS.clicked, display.closures [CLICKED], false);
}
@@ -748,7 +748,7 @@ void hookEvents () {
OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT], false);
OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [EVENT_AFTER], 0, display.closures[EVENT_AFTER], false);
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
OS.g_signal_connect_closure_by_id (topHandle, display.signalIds [MAP], 0, display.closures [MAP], true);
}
@@ -946,7 +946,7 @@ public void setDisabledImage (Image image) {
*/
public void setEnabled (boolean enabled) {
checkWidget();
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
if (gtk_widget_get_sensitive (topHandle) == enabled) return;
OS.gtk_widget_set_sensitive (topHandle, enabled);
if (enabled) {
@@ -980,7 +980,7 @@ boolean setFocus () {
return OS.gtk_widget_child_focus (handle, OS.GTK_DIR_TAB_FORWARD);
}
-void setFontDescription (int /*long*/ font) {
+void setFontDescription (long /*int*/ font) {
if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);
}
@@ -1034,7 +1034,7 @@ public void setImage (Image image) {
} else {
imageList.put (imageIndex, image);
}
- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);
+ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
} else {
OS.gtk_image_set_from_pixbuf(imageHandle, 0);
@@ -1192,10 +1192,10 @@ public void setToolTipText (String string) {
}
void setToolTipText (Shell shell, String newString) {
- int /*long*/ child = OS.gtk_bin_get_child (handle);
+ long /*int*/ child = OS.gtk_bin_get_child (handle);
if ((style & SWT.DROP_DOWN) != 0) {
if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {
- int /*long*/ list = OS.gtk_container_get_children (child);
+ long /*int*/ list = OS.gtk_container_get_children (child);
child = OS.g_list_nth_data (list, 0);
}
if (arrowHandle != 0) shell.setToolTipText (arrowHandle, newString);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java
index 2dd7b19b88..92ec814d9e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java
@@ -47,7 +47,7 @@ public class ToolTip extends Widget {
String text, message;
TrayItem item;
int x, y, timerId;
- int /*long*/ layoutText = 0, layoutMessage = 0;
+ long /*int*/ layoutText = 0, layoutMessage = 0;
int [] borderPolygon;
boolean spikeAbove, autohide;
@@ -135,7 +135,7 @@ public void addSelectionListener (SelectionListener listener) {
}
void configure () {
- int /*long*/ screen = OS.gdk_screen_get_default ();
+ long /*int*/ screen = OS.gdk_screen_get_default ();
OS.gtk_widget_realize (handle);
int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (handle));
GdkRectangle dest = new GdkRectangle ();
@@ -249,9 +249,9 @@ void configure () {
OS.gtk_window_move (handle, Math.min(dest.width - w, x - w + 17), y - h - TIP_HEIGHT);
}
}
- int /*long*/ rgn = OS.gdk_region_polygon (polyline, polyline.length / 2, OS.GDK_EVEN_ODD_RULE);
+ long /*int*/ rgn = OS.gdk_region_polygon (polyline, polyline.length / 2, OS.GDK_EVEN_ODD_RULE);
OS.gtk_widget_realize (handle);
- int /*long*/ window = gtk_widget_get_window (handle);
+ long /*int*/ window = gtk_widget_get_window (handle);
OS.gdk_window_shape_combine_region (window, rgn, 0, 0);
OS.gdk_region_destroy (rgn);
}
@@ -297,14 +297,14 @@ void deregister () {
super.deregister ();
if ((style & SWT.BALLOON) == 0) {
if (OS.GTK_VERSION < OS.VERSION (2, 12, 0)) {
- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);
+ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);
if (tipWindow != 0) display.removeWidget (tipWindow);
}
}
}
void destroyWidget () {
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
if (parent != null) parent.removeTooTip (this);
releaseHandle ();
if (topHandle != 0 && (state & HANDLE) != 0) {
@@ -337,7 +337,7 @@ Point getLocation () {
int x = this.x;
int y = this.y;
if (item != null) {
- int /*long*/ itemHandle = item.handle;
+ long /*int*/ itemHandle = item.handle;
if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
GdkRectangle area = new GdkRectangle ();
OS.gtk_status_icon_get_geometry (itemHandle, 0, area, 0);
@@ -345,7 +345,7 @@ Point getLocation () {
y = area.y + area.height / 2;
} else {
OS.gtk_widget_realize (itemHandle);
- int /*long*/ window = gtk_widget_get_window (itemHandle);
+ long /*int*/ window = gtk_widget_get_window (itemHandle);
int [] px = new int [1], py = new int [1];
OS.gdk_window_get_origin (window, px, py);
GtkAllocation allocation = new GtkAllocation ();
@@ -468,25 +468,25 @@ public boolean getVisible () {
checkWidget ();
if ((style & SWT.BALLOON) != 0) return gtk_widget_get_visible (handle);
if (OS.GTK_VERSION < OS.VERSION (2, 12, 0)) {
- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);
+ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);
return OS.GTK_WIDGET_VISIBLE (tipWindow);
}
return false;
}
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
sendSelectionEvent (SWT.Selection, null, true);
setVisible (false);
return 0;
}
-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) {
if ((state & OBSCURED) != 0) return 0;
- int /*long*/ window = gtk_widget_get_window (handle);
+ long /*int*/ window = gtk_widget_get_window (handle);
int x = BORDER + PADDING;
int y = BORDER + PADDING;
if (OS.USE_CAIRO) {
- int /*long*/ cairo = OS.gdk_cairo_create(window);
+ long /*int*/ cairo = OS.gdk_cairo_create(window);
if (cairo == 0) error (SWT.ERROR_NO_HANDLES);
int count = borderPolygon.length / 2;
if (count == 0) return 0;
@@ -507,8 +507,8 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
case SWT.ICON_WARNING: buffer = Converter.wcsToMbcs (null, "gtk-dialog-warning", true); break;
}
if (buffer != null) {
- int /*long*/ style = OS.gtk_widget_get_default_style ();
- int /*long*/ pixbuf = OS.gtk_icon_set_render_icon (
+ long /*int*/ style = OS.gtk_widget_get_default_style ();
+ long /*int*/ pixbuf = OS.gtk_icon_set_render_icon (
OS.gtk_icon_factory_lookup_default (buffer),
style,
OS.GTK_TEXT_DIR_NONE,
@@ -540,7 +540,7 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
Cairo.cairo_destroy(cairo);
return 0;
}
- int /*long*/ gdkGC = OS.gdk_gc_new (window);
+ long /*int*/ gdkGC = OS.gdk_gc_new (window);
OS.gdk_draw_polygon (window, gdkGC, 0, borderPolygon, borderPolygon.length / 2);
if (spikeAbove) y += TIP_HEIGHT;
if (layoutText != 0) {
@@ -552,8 +552,8 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
case SWT.ICON_WARNING: buffer = Converter.wcsToMbcs (null, "gtk-dialog-warning", true); break;
}
if (buffer != null) {
- int /*long*/ style = OS.gtk_widget_get_default_style ();
- int /*long*/ pixbuf = OS.gtk_icon_set_render_icon (
+ long /*int*/ style = OS.gtk_widget_get_default_style ();
+ long /*int*/ pixbuf = OS.gtk_icon_set_render_icon (
OS.gtk_icon_factory_lookup_default (buffer),
style,
OS.GTK_TEXT_DIR_NONE,
@@ -583,11 +583,11 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
return 0;
}
-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
+long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
Point point = getLocation ();
int x = point.x;
int y = point.y;
- int /*long*/ screen = OS.gdk_screen_get_default ();
+ long /*int*/ screen = OS.gdk_screen_get_default ();
OS.gtk_widget_realize (widget);
int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget));
GdkRectangle dest = new GdkRectangle ();
@@ -609,7 +609,7 @@ void hookEvents () {
OS.g_signal_connect_closure (handle, OS.button_press_event, display.closures [BUTTON_PRESS_EVENT], false);
} else {
if (OS.GTK_VERSION < OS.VERSION (2, 12, 0)) {
- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);
+ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);
if (tipWindow != 0) {
OS.g_signal_connect_closure (tipWindow, OS.size_allocate, display.closures [SIZE_ALLOCATE], false);
OS.gtk_widget_add_events (tipWindow, OS.GDK_BUTTON_PRESS_MASK);
@@ -642,7 +642,7 @@ void register () {
super.register ();
if ((style & SWT.BALLOON) == 0) {
if (OS.GTK_VERSION < OS.VERSION (2, 12, 0)) {
- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);
+ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);
if (tipWindow != 0) display.addWidget (tipWindow, this);
}
}
@@ -732,7 +732,7 @@ public void setLocation (int x, int y) {
if (gtk_widget_get_visible (handle)) configure ();
} else {
if (OS.GTK_VERSION < OS.VERSION (2, 12, 0)) {
- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);
+ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);
if (gtk_widget_get_visible (tipWindow)) {
OS.gtk_window_move (tipWindow, x, y);
}
@@ -825,13 +825,13 @@ public void setText (String string) {
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
OS.pango_layout_set_auto_dir (layoutText, false);
}
- int /*long*/ boldAttr = OS.pango_attr_weight_new (OS.PANGO_WEIGHT_BOLD);
+ long /*int*/ boldAttr = OS.pango_attr_weight_new (OS.PANGO_WEIGHT_BOLD);
PangoAttribute attribute = new PangoAttribute ();
OS.memmove (attribute, boldAttr, PangoAttribute.sizeof);
attribute.start_index = 0;
attribute.end_index = buffer.length;
OS.memmove (boldAttr, attribute, PangoAttribute.sizeof);
- int /*long*/ attrList = OS.pango_attr_list_new ();
+ long /*int*/ attrList = OS.pango_attr_list_new ();
OS.pango_attr_list_insert (attrList, boldAttr);
OS.pango_layout_set_attributes (layoutText, attrList);
OS.pango_attr_list_unref (attrList);
@@ -865,7 +865,7 @@ public void setVisible (boolean visible) {
configure ();
OS.gtk_widget_show (handle);
} else {
- int /*long*/ vboxHandle = parent.vboxHandle;
+ long /*int*/ vboxHandle = parent.vboxHandle;
StringBuffer string = new StringBuffer (text);
if (text.length () > 0) string.append ("\n\n");
string.append (message);
@@ -874,7 +874,7 @@ public void setVisible (boolean visible) {
OS.gtk_widget_set_tooltip_text(vboxHandle, buffer);
} else {
OS.gtk_tooltips_set_tip (handle, vboxHandle, buffer, null);
- int /*long*/ data = OS.gtk_tooltips_data_get (vboxHandle);
+ long /*int*/ data = OS.gtk_tooltips_data_get (vboxHandle);
OS.GTK_TOOLTIPS_SET_ACTIVE (handle, data);
OS.gtk_tooltips_set_tip (handle, vboxHandle, buffer, null);
}
@@ -884,7 +884,7 @@ public void setVisible (boolean visible) {
if ((style & SWT.BALLOON) != 0) {
OS.gtk_widget_hide (handle);
} else {
- int /*long*/ vboxHandle = parent.vboxHandle;
+ long /*int*/ vboxHandle = parent.vboxHandle;
byte[] buffer = Converter.wcsToMbcs(null, "", true);
if (OS.GTK_VERSION >= OS.VERSION(2, 12, 0)) {
OS.gtk_widget_set_tooltip_text(vboxHandle, buffer);
@@ -895,12 +895,12 @@ public void setVisible (boolean visible) {
}
}
-int /*long*/ timerProc (int /*long*/ widget) {
+long /*int*/ timerProc (long /*int*/ widget) {
if ((style & SWT.BALLOON) != 0) {
OS.gtk_widget_hide (handle);
} else {
if (OS.GTK_VERSION < OS.VERSION (2, 12, 0)) {
- int /*long*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);
+ long /*int*/ tipWindow = OS.GTK_TOOLTIPS_TIP_WINDOW (handle);
OS.gtk_widget_hide (tipWindow);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java
index 17f929b3db..8ecf5d5815 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java
@@ -42,7 +42,7 @@ import org.eclipse.swt.events.*;
public class Tracker extends Widget {
Composite parent;
Cursor cursor;
- int /*long*/ lastCursor, window;
+ long /*int*/ lastCursor, window;
boolean tracking, cancelled, grabbed, stippled;
Rectangle [] rectangles = new Rectangle [0], proportions = rectangles;
Rectangle bounds;
@@ -306,15 +306,15 @@ Rectangle [] computeProportions (Rectangle [] rects) {
}
void drawRectangles (Rectangle [] rects) {
- int /*long*/ window = OS.gdk_get_default_root_window();
+ long /*int*/ window = OS.gdk_get_default_root_window();
if (parent != null) {
window = gtk_widget_get_window (parent.paintHandle());
}
if (window == 0) return;
//TODO: Use Cairo
- int /*long*/ gc = OS.gdk_gc_new (window);
+ long /*int*/ gc = OS.gdk_gc_new (window);
if (gc == 0) return;
- int /*long*/ colormap = OS.gdk_colormap_get_system ();
+ long /*int*/ colormap = OS.gdk_colormap_get_system ();
GdkColor color = new GdkColor ();
OS.gdk_color_white (colormap, color);
OS.gdk_gc_set_foreground (gc, color);
@@ -367,17 +367,17 @@ public boolean getStippled () {
}
boolean grab () {
- int /*long*/ cursor = this.cursor != null ? this.cursor.handle : 0;
+ long /*int*/ cursor = this.cursor != null ? this.cursor.handle : 0;
int result = gdk_pointer_grab (window, OS.GDK_OWNERSHIP_NONE, false, OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_RELEASE_MASK, window, cursor, OS.GDK_CURRENT_TIME);
return result == OS.GDK_GRAB_SUCCESS;
}
-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) {
return gtk_mouse (OS.GDK_BUTTON_RELEASE, widget, event);
}
-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
- int /*long*/ result = super.gtk_key_press_event (widget, eventPtr);
+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ eventPtr) {
+ long /*int*/ result = super.gtk_key_press_event (widget, eventPtr);
if (result != 0) return result;
GdkEventKey keyEvent = new GdkEventKey ();
OS.memmove (keyEvent, eventPtr, GdkEventKey.sizeof);
@@ -511,8 +511,8 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
return result;
}
-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ eventPtr) {
- int /*long*/ cursor = this.cursor != null ? this.cursor.handle : 0;
+long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ eventPtr) {
+ long /*int*/ cursor = this.cursor != null ? this.cursor.handle : 0;
if (cursor != lastCursor) {
ungrab ();
grabbed = grab ();
@@ -521,7 +521,7 @@ int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ eventPtr
return gtk_mouse (OS.GDK_MOTION_NOTIFY, widget, eventPtr);
}
-int /*long*/ gtk_mouse (int eventType, int /*long*/ widget, int /*long*/ eventPtr) {
+long /*int*/ gtk_mouse (int eventType, long /*int*/ widget, long /*int*/ eventPtr) {
int [] newX = new int [1], newY = new int [1];
OS.gdk_window_get_pointer (window, newX, newY, null);
if (oldX != newX [0] || oldY != newY [0]) {
@@ -712,7 +712,7 @@ public boolean open () {
Display display = this.display;
while (tracking) {
if (parent != null && parent.isDisposed ()) break;
- int /*long*/ eventPtr;
+ long /*int*/ eventPtr;
while (true) {
display.runSkin ();
display.runDeferredLayouts ();
@@ -725,7 +725,7 @@ public boolean open () {
}
}
OS.memmove (gdkEvent, eventPtr, GdkEvent.sizeof);
- int /*long*/ widget = OS.gtk_get_event_widget (eventPtr);
+ long /*int*/ widget = OS.gtk_get_event_widget (eventPtr);
switch (gdkEvent.type) {
case OS.GDK_MOTION_NOTIFY: gtk_motion_notify_event (widget, eventPtr); break;
case OS.GDK_BUTTON_RELEASE: gtk_button_release_event (widget, eventPtr); break;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayItem.java
index 917575298b..2b28c146b5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayItem.java
@@ -40,8 +40,8 @@ public class TrayItem extends Item {
Tray parent;
ToolTip toolTip;
String toolTipText;
- int /*long*/ imageHandle;
- int /*long*/ tooltipsHandle;
+ long /*int*/ imageHandle;
+ long /*int*/ tooltipsHandle;
ImageList imageList;
Image highlightImage;
@@ -165,20 +165,20 @@ void createHandle (int index) {
OS.gtk_container_add (handle, imageHandle);
OS.gtk_widget_show (handle);
OS.gtk_widget_show (imageHandle);
- int /*long*/ id = OS.gtk_plug_get_id (handle);
+ long /*int*/ id = OS.gtk_plug_get_id (handle);
int monitor = 0;
- int /*long*/ screen = OS.gdk_screen_get_default ();
+ long /*int*/ screen = OS.gdk_screen_get_default ();
if (screen != 0) {
monitor = OS.gdk_screen_get_number (screen);
}
byte [] trayBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_S" + monitor, true);
- int /*long*/ trayAtom = OS.gdk_atom_intern (trayBuffer, true);
- int /*long*/ xTrayAtom = OS.gdk_x11_atom_to_xatom (trayAtom);
- int /*long*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
- int /*long*/ trayWindow = OS.XGetSelectionOwner (xDisplay, xTrayAtom);
+ long /*int*/ trayAtom = OS.gdk_atom_intern (trayBuffer, true);
+ long /*int*/ xTrayAtom = OS.gdk_x11_atom_to_xatom (trayAtom);
+ long /*int*/ xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_display_get_default());
+ long /*int*/ trayWindow = OS.XGetSelectionOwner (xDisplay, xTrayAtom);
byte [] messageBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_OPCODE", true);
- int /*long*/ messageAtom = OS.gdk_atom_intern (messageBuffer, true);
- int /*long*/ xMessageAtom = OS.gdk_x11_atom_to_xatom (messageAtom);
+ long /*int*/ messageAtom = OS.gdk_atom_intern (messageBuffer, true);
+ long /*int*/ xMessageAtom = OS.gdk_x11_atom_to_xatom (messageAtom);
XClientMessageEvent event = new XClientMessageEvent ();
event.type = OS.ClientMessage;
event.window = trayWindow;
@@ -187,7 +187,7 @@ void createHandle (int index) {
event.data [0] = OS.GDK_CURRENT_TIME;
event.data [1] = OS.SYSTEM_TRAY_REQUEST_DOCK;
event.data [2] = id;
- int /*long*/ clientEvent = OS.g_malloc (XClientMessageEvent.sizeof);
+ long /*int*/ clientEvent = OS.g_malloc (XClientMessageEvent.sizeof);
OS.memmove (clientEvent, event, XClientMessageEvent.sizeof);
OS.XSendEvent (xDisplay, trayWindow, false, OS.NoEventMask, clientEvent);
OS.g_free (clientEvent);
@@ -273,7 +273,7 @@ public String getToolTipText () {
return toolTipText;
}
-int /*long*/ gtk_activate (int /*long*/ widget) {
+long /*int*/ gtk_activate (long /*int*/ widget) {
sendSelectionEvent (SWT.Selection);
/*
* Feature in GTK. GTK will generate a single-click event before sending
@@ -281,10 +281,10 @@ int /*long*/ gtk_activate (int /*long*/ widget) {
* the single-click as the current event and for the double-click in the
* event queue.
*/
- int /*long*/ nextEvent = OS.gdk_event_peek ();
+ long /*int*/ nextEvent = OS.gdk_event_peek ();
if (nextEvent != 0) {
int nextEventType = OS.GDK_EVENT_TYPE (nextEvent);
- int /*long*/ currEvent = OS.gtk_get_current_event ();
+ long /*int*/ currEvent = OS.gtk_get_current_event ();
int currEventType = 0;
if (currEvent != 0) {
currEventType = OS.GDK_EVENT_TYPE (currEvent);
@@ -298,7 +298,7 @@ int /*long*/ gtk_activate (int /*long*/ widget) {
return 0;
}
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) {
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0;
@@ -314,7 +314,7 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr)
return 0;
}
-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
+long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
if (image != null && image.mask != 0) {
if (OS.gdk_drawable_get_depth (image.mask) == 1) {
GtkAllocation widgetAllocation = new GtkAllocation ();
@@ -322,7 +322,7 @@ int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
int xoffset = (int) Math.floor (widgetAllocation.x + ((widgetAllocation.width -OS.GTK_WIDGET_REQUISITION_WIDTH (widget)) * 0.5) + 0.5);
int yoffset = (int) Math.floor (widgetAllocation.y + ((widgetAllocation.height - OS.GTK_WIDGET_REQUISITION_HEIGHT (widget)) * 0.5) + 0.5);
Rectangle b = image.getBounds();
- int /*long*/ gdkImagePtr = OS.gdk_drawable_get_image (image.mask, 0, 0, b.width, b.height);
+ long /*int*/ gdkImagePtr = OS.gdk_drawable_get_image (image.mask, 0, 0, b.width, b.height);
if (gdkImagePtr == 0) error(SWT.ERROR_NO_HANDLES);
GdkImage gdkImage = new GdkImage();
OS.memmove (gdkImage, gdkImagePtr);
@@ -341,7 +341,7 @@ int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
}
}
OS.gtk_widget_realize (handle);
- int /*long*/ window = gtk_widget_get_window (handle);
+ long /*int*/ window = gtk_widget_get_window (handle);
OS.gdk_window_shape_combine_region (window, region.handle, 0, 0);
region.dispose ();
}
@@ -349,7 +349,7 @@ int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
return 0;
}
-int /*long*/ gtk_status_icon_popup_menu (int /*long*/ widget, int /*long*/ button, int /*long*/ activate_time) {
+long /*int*/ gtk_status_icon_popup_menu (long /*int*/ widget, long /*int*/ button, long /*int*/ activate_time) {
/*
* GTK provides a MenuPositionFunc for GtkStatusIcon in order
* to set the popup-menu aligned to the tray.
@@ -519,7 +519,7 @@ public void setImage (Image image) {
} else {
imageList.put (imageIndex, image);
}
- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);
+ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
OS.gtk_status_icon_set_from_pixbuf (handle, pixbuf);
OS.gtk_status_icon_set_visible (handle, true);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
index c8f04a5751..e38fe42eba 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
@@ -75,9 +75,9 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Tree extends Composite {
- int /*long*/ modelHandle, checkRenderer;
+ long /*int*/ modelHandle, checkRenderer;
int columnCount, sortDirection;
- int /*long*/ ignoreCell;
+ long /*int*/ ignoreCell;
TreeItem[] items;
TreeColumn [] columns;
TreeColumn sortColumn;
@@ -155,14 +155,14 @@ void _addListener (int eventType, Listener listener) {
}
}
-TreeItem _getItem (int /*long*/ iter) {
+TreeItem _getItem (long /*int*/ iter) {
int id = getId (iter, true);
if (items [id] != null) return items [id];
- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
int depth = OS.gtk_tree_path_get_depth (path);
int [] indices = new int [depth];
OS.memmove (indices, OS.gtk_tree_path_get_indices (path), 4*depth);
- int /*long*/ parentIter = 0;
+ long /*int*/ parentIter = 0;
if (depth > 1) {
OS.gtk_tree_path_up (path);
parentIter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
@@ -174,8 +174,8 @@ TreeItem _getItem (int /*long*/ iter) {
return items [id];
}
-TreeItem _getItem (int /*long*/ parentIter, int index) {
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+TreeItem _getItem (long /*int*/ parentIter, int index) {
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
OS.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index);
int id = getId (iter, true);
OS.g_free (iter);
@@ -183,7 +183,7 @@ TreeItem _getItem (int /*long*/ parentIter, int index) {
return items [id] = new TreeItem (this, parentIter, SWT.NONE, index, false);
}
-int getId (int /*long*/ iter, boolean queryModel) {
+int getId (long /*int*/ iter, boolean queryModel) {
if (queryModel) {
int[] value = new int[1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);
@@ -219,7 +219,7 @@ static int checkStyle (int style) {
return checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0);
}
-int /*long*/ cellDataProc (int /*long*/ tree_column, int /*long*/ cell, int /*long*/ tree_model, int /*long*/ iter, int /*long*/ data) {
+long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*int*/ tree_model, long /*int*/ iter, long /*int*/ data) {
if (cell == ignoreCell) return 0;
TreeItem item = _getItem (iter);
if (item != null) OS.g_object_set_qdata (cell, Display.SWT_OBJECT_INDEX2, item.handle);
@@ -245,7 +245,7 @@ int /*long*/ cellDataProc (int /*long*/ tree_column, int /*long*/ cell, int /*lo
setData = checkData (item);
}
}
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
if (setData) {
if (isPixbuf) {
ptr [0] = 0;
@@ -381,7 +381,7 @@ public void addTreeListener(TreeListener listener) {
addListener (SWT.Collapse, typedListener);
}
-int calculateWidth (int /*long*/ column, int /*long*/ iter, boolean recurse) {
+int calculateWidth (long /*int*/ column, long /*int*/ iter, boolean recurse) {
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
/*
* Bug in GTK. The width calculated by gtk_tree_view_column_cell_get_size()
@@ -395,7 +395,7 @@ int calculateWidth (int /*long*/ column, int /*long*/ iter, boolean recurse) {
int width = 0;
int [] w = new int [1];
- int /*long*/ path = 0;
+ long /*int*/ path = 0;
if (OS.gtk_tree_view_get_expander_column (handle) == column) {
/* indent */
@@ -410,16 +410,16 @@ int calculateWidth (int /*long*/ column, int /*long*/ iter, boolean recurse) {
}
OS.gtk_widget_style_get(handle, OS.focus_line_width, w, 0);
width += 2 * w [0];
- int /*long*/ list = 0;
+ long /*int*/ list = 0;
if (OS.GTK_VERSION >= OS.VERSION(2, 12, 0)) {
list = OS.gtk_cell_layout_get_cells(column);
} else {
list = OS.gtk_tree_view_column_get_cell_renderers (column);
}
if (list == 0) return 0;
- int /*long*/ temp = list;
+ long /*int*/ temp = list;
while (temp != 0) {
- int /*long*/ renderer = OS.g_list_data (temp);
+ long /*int*/ renderer = OS.g_list_data (temp);
if (renderer != 0) {
OS.gtk_cell_renderer_get_size (renderer, handle, null, null, null, w, null);
width += w [0];
@@ -432,7 +432,7 @@ int calculateWidth (int /*long*/ column, int /*long*/ iter, boolean recurse) {
if (path == 0) path = OS.gtk_tree_model_get_path (modelHandle, iter);
boolean expanded = OS.gtk_tree_view_row_expanded (handle, path);
if (expanded) {
- int /*long*/ childIter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ childIter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, childIter, iter);
while (valid) {
width = Math.max (width, calculateWidth (column, childIter, true));
@@ -478,8 +478,8 @@ public void clear(int index, boolean all) {
clear (0, index, all);
}
-void clear (int /*long*/ parentIter, int index, boolean all) {
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+void clear (long /*int*/ parentIter, int index, boolean all) {
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
OS.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index);
int[] value = new int[1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);
@@ -514,10 +514,10 @@ public void clearAll (boolean all) {
checkWidget ();
clearAll (all, 0);
}
-void clearAll (boolean all, int /*long*/ parentIter) {
+void clearAll (boolean all, long /*int*/ parentIter) {
int length = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);
if (length == 0) return;
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parentIter);
int[] value = new int[1];
while (valid) {
@@ -545,15 +545,15 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
return size;
}
-void copyModel (int /*long*/ oldModel, int oldStart, int /*long*/ newModel, int newStart, int /*long*/ [] types, int /*long*/ oldParent, int /*long*/ newParent, int modelLength) {
- int /*long*/ iter = OS.g_malloc(OS.GtkTreeIter_sizeof ());
+void copyModel (long /*int*/ oldModel, int oldStart, long /*int*/ newModel, int newStart, long /*int*/ [] types, long /*int*/ oldParent, long /*int*/ newParent, int modelLength) {
+ long /*int*/ iter = OS.g_malloc(OS.GtkTreeIter_sizeof ());
if (OS.gtk_tree_model_iter_children (oldModel, iter, oldParent)) {
- int /*long*/ [] oldItems = new int /*long*/ [OS.gtk_tree_model_iter_n_children (oldModel, oldParent)];
+ long /*int*/ [] oldItems = new long /*int*/ [OS.gtk_tree_model_iter_n_children (oldModel, oldParent)];
int oldIndex = 0;
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
int [] ptr1 = new int [1];
do {
- int /*long*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ newItem = OS.g_malloc (OS.GtkTreeIter_sizeof ());
if (newItem == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_tree_store_append (newModel, newItem, newParent);
OS.gtk_tree_model_get (oldModel, iter, ID_COLUMN, ptr1, -1);
@@ -562,7 +562,7 @@ void copyModel (int /*long*/ oldModel, int oldStart, int /*long*/ newModel, int
if (index != -1) {
item = items [index];
if (item != null) {
- int /*long*/ oldItem = item.handle;
+ long /*int*/ oldItem = item.handle;
oldItems[oldIndex++] = oldItem;
/* the columns before FOREGROUND_COLUMN contain int values, subsequent columns contain pointers */
for (int j = 0; j < FOREGROUND_COLUMN; j++) {
@@ -614,7 +614,7 @@ void copyModel (int /*long*/ oldModel, int oldStart, int /*long*/ newModel, int
}
} while (OS.gtk_tree_model_iter_next(oldModel, iter));
for (int i = 0; i < oldItems.length; i++) {
- int /*long*/ oldItem = oldItems [i];
+ long /*int*/ oldItem = oldItems [i];
if (oldItem != 0) {
OS.gtk_tree_store_remove (oldModel, oldItem);
OS.g_free (oldItem);
@@ -647,16 +647,16 @@ void createColumn (TreeColumn column, int index) {
modelIndex++;
}
if (modelIndex == modelLength) {
- int /*long*/ oldModel = modelHandle;
- int /*long*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time
- int /*long*/ newModel = OS.gtk_tree_store_newv (types.length, types);
+ long /*int*/ oldModel = modelHandle;
+ long /*int*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time
+ long /*int*/ newModel = OS.gtk_tree_store_newv (types.length, types);
if (newModel == 0) error (SWT.ERROR_NO_HANDLES);
- copyModel (oldModel, FIRST_COLUMN, newModel, FIRST_COLUMN, types, (int /*long*/)0, (int /*long*/)0, modelLength);
+ copyModel (oldModel, FIRST_COLUMN, newModel, FIRST_COLUMN, types, (long /*int*/)0, (long /*int*/)0, modelLength);
OS.gtk_tree_view_set_model (handle, newModel);
setModel (newModel);
}
}
- int /*long*/ columnHandle = OS.gtk_tree_view_column_new ();
+ long /*int*/ columnHandle = OS.gtk_tree_view_column_new ();
if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);
if (index == 0 && columnCount > 0) {
TreeColumn checkColumn = columns [0];
@@ -707,7 +707,7 @@ void createHandle (int index) {
gtk_widget_set_has_window (fixedHandle, true);
scrolledHandle = OS.gtk_scrolled_window_new (0, 0);
if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ [] types = getColumnTypes (1);
+ long /*int*/ [] types = getColumnTypes (1);
modelHandle = OS.gtk_tree_store_newv (types.length, types);
if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES);
handle = OS.gtk_tree_view_new_with_model (modelHandle);
@@ -722,7 +722,7 @@ void createHandle (int index) {
OS.gtk_container_add (scrolledHandle, handle);
int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
- int /*long*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selectionHandle = OS.gtk_tree_view_get_selection (handle);
OS.gtk_tree_selection_set_mode (selectionHandle, mode);
OS.gtk_tree_view_set_headers_visible (handle, false);
int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
@@ -769,11 +769,11 @@ void createItem (TreeColumn column, int index) {
} else {
createColumn (column, index);
}
- int /*long*/ boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 3);
+ long /*int*/ boxHandle = gtk_box_new (OS.GTK_ORIENTATION_HORIZONTAL, false, 3);
if (boxHandle == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ labelHandle = OS.gtk_label_new_with_mnemonic (null);
+ long /*int*/ labelHandle = OS.gtk_label_new_with_mnemonic (null);
if (labelHandle == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ imageHandle = OS.gtk_image_new ();
+ long /*int*/ imageHandle = OS.gtk_image_new ();
if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_container_add (boxHandle, imageHandle);
OS.gtk_container_add (boxHandle, labelHandle);
@@ -782,7 +782,7 @@ void createItem (TreeColumn column, int index) {
column.labelHandle = labelHandle;
column.imageHandle = imageHandle;
OS.gtk_tree_view_column_set_widget (column.handle, boxHandle);
- int /*long*/ widget = OS.gtk_widget_get_parent (boxHandle);
+ long /*int*/ widget = OS.gtk_widget_get_parent (boxHandle);
while (widget != handle) {
if (OS.GTK_IS_BUTTON (widget)) {
column.buttonHandle = widget;
@@ -816,7 +816,7 @@ void createItem (TreeColumn column, int index) {
}
}
-void createItem (TreeItem item, int /*long*/ parentIter, int index) {
+void createItem (TreeItem item, long /*int*/ parentIter, int index) {
int count = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);
if (index == -1) index = count;
if (!(0 <= index && index <= count)) error (SWT.ERROR_INVALID_RANGE);
@@ -836,7 +836,7 @@ void createItem (TreeItem item, int /*long*/ parentIter, int index) {
modelChanged = true;
}
-void createRenderers (int /*long*/ columnHandle, int modelIndex, boolean check, int columnStyle) {
+void createRenderers (long /*int*/ columnHandle, int modelIndex, boolean check, int columnStyle) {
OS.gtk_tree_view_column_clear (columnHandle);
if ((style & SWT.CHECK) != 0 && check) {
OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);
@@ -848,9 +848,9 @@ void createRenderers (int /*long*/ columnHandle, int modelIndex, boolean check,
OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);
}
}
- int /*long*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : OS.gtk_cell_renderer_pixbuf_new ();
+ long /*int*/ pixbufRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_pixbuf_get_type (), 0) : OS.gtk_cell_renderer_pixbuf_new ();
if (pixbufRenderer == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : OS.gtk_cell_renderer_text_new ();
+ long /*int*/ textRenderer = ownerDraw ? OS.g_object_new (display.gtk_cell_renderer_text_get_type (), 0) : OS.gtk_cell_renderer_text_new ();
if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
if (ownerDraw) {
@@ -954,7 +954,7 @@ public void deselect (TreeItem item) {
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
boolean fixColumn = showFirstColumn ();
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_unselect_iter (selection, item.handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
@@ -972,7 +972,7 @@ public void deselect (TreeItem item) {
public void deselectAll() {
checkWidget();
boolean fixColumn = showFirstColumn ();
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_unselect_all (selection);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
@@ -986,7 +986,7 @@ void destroyItem (TreeColumn column) {
index++;
}
if (index == columnCount) return;
- int /*long*/ columnHandle = column.handle;
+ long /*int*/ columnHandle = column.handle;
if (columnCount == 1) {
firstCustomDraw = column.customDraw;
}
@@ -994,11 +994,11 @@ void destroyItem (TreeColumn column) {
columns [columnCount] = null;
OS.gtk_tree_view_remove_column (handle, columnHandle);
if (columnCount == 0) {
- int /*long*/ oldModel = modelHandle;
- int /*long*/[] types = getColumnTypes (1);
- int /*long*/ newModel = OS.gtk_tree_store_newv (types.length, types);
+ long /*int*/ oldModel = modelHandle;
+ long /*int*/[] types = getColumnTypes (1);
+ long /*int*/ newModel = OS.gtk_tree_store_newv (types.length, types);
if (newModel == 0) error (SWT.ERROR_NO_HANDLES);
- copyModel(oldModel, column.modelIndex, newModel, FIRST_COLUMN, types, (int /*long*/)0, (int /*long*/)0, FIRST_COLUMN + CELL_TYPES);
+ copyModel(oldModel, column.modelIndex, newModel, FIRST_COLUMN, types, (long /*int*/)0, (long /*int*/)0, FIRST_COLUMN + CELL_TYPES);
OS.gtk_tree_view_set_model (handle, newModel);
setModel (newModel);
createColumn (null, 0);
@@ -1006,13 +1006,13 @@ void destroyItem (TreeColumn column) {
for (int i=0; i= OS.VERSION(2, 12, 0)) {
list = OS.gtk_cell_layout_get_cells(column);
} else {
@@ -1646,10 +1646,10 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) {
}
if (list == 0) return 0;
int count = OS.g_list_length (list);
- int /*long*/ pixbufRenderer = 0;
+ long /*int*/ pixbufRenderer = 0;
int i = 0;
while (i < count) {
- int /*long*/ renderer = OS.g_list_nth_data (list, i);
+ long /*int*/ renderer = OS.g_list_nth_data (list, i);
if (OS.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) {
pixbufRenderer = renderer;
break;
@@ -1678,15 +1678,15 @@ int /*long*/ getPixbufRenderer (int /*long*/ column) {
*/
public TreeItem[] getSelection () {
checkWidget();
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
- int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, null);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, null);
if (list != 0) {
int count = OS.g_list_length (list);
TreeItem [] treeSelection = new TreeItem [count];
int length = 0;
for (int i=0; i= OS.VERSION(2, 12, 0)) {
list = OS.gtk_cell_layout_get_cells(column);
} else {
@@ -1772,10 +1772,10 @@ int /*long*/ getTextRenderer (int /*long*/ column) {
}
if (list == 0) return 0;
int count = OS.g_list_length (list);
- int /*long*/ textRenderer = 0;
+ long /*int*/ textRenderer = 0;
int i = 0;
while (i < count) {
- int /*long*/ renderer = OS.g_list_nth_data (list, i);
+ long /*int*/ renderer = OS.g_list_nth_data (list, i);
if (OS.GTK_IS_CELL_RENDERER_TEXT (renderer)) {
textRenderer = renderer;
break;
@@ -1802,12 +1802,12 @@ int /*long*/ getTextRenderer (int /*long*/ column) {
*/
public TreeItem getTopItem () {
checkWidget ();
- int /*long*/ [] path = new int /*long*/ [1];
+ long /*int*/ [] path = new long /*int*/ [1];
OS.gtk_widget_realize (handle);
if (!OS.gtk_tree_view_get_path_at_pos (handle, 1, 1, path, null, null, null)) return null;
if (path [0] == 0) return null;
TreeItem item = null;
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof());
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof());
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
item = _getItem (iter);
}
@@ -1816,11 +1816,11 @@ public TreeItem getTopItem () {
return item;
}
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
if (gdkEvent.window != OS.gtk_tree_view_get_bin_window (handle)) return 0;
- int /*long*/ result = super.gtk_button_press_event (widget, event);
+ long /*int*/ result = super.gtk_button_press_event (widget, event);
if (result != 0) return result;
/*
* Feature in GTK. In a multi-select tree view, when multiple items are already
@@ -1832,10 +1832,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
*/
int button = gdkEvent.button;
if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {
- int /*long*/ [] path = new int /*long*/ [1];
+ long /*int*/ [] path = new long /*int*/ [1];
if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
if (path [0] != 0) {
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
OS.gtk_tree_path_free (path [0]);
}
@@ -1850,10 +1850,10 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
* widget from automatically selecting the first item.
*/
if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {
- int /*long*/ [] path = new int /*long*/ [1];
+ long /*int*/ [] path = new long /*int*/ [1];
if (OS.gtk_tree_view_get_path_at_pos (handle, (int)gdkEvent.x, (int)gdkEvent.y, path, null, null, null)) {
if (path [0] != 0) {
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_view_set_cursor (handle, path [0], 0, false);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
@@ -1873,13 +1873,13 @@ int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
return result;
}
-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ window = OS.GDK_EVENT_WINDOW (event);
+long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ window = OS.GDK_EVENT_WINDOW (event);
if (window != OS.gtk_tree_view_get_bin_window (handle)) return 0;
return super.gtk_button_release_event (widget, event);
}
-int /*long*/ gtk_changed (int /*long*/ widget) {
+long /*int*/ gtk_changed (long /*int*/ widget) {
TreeItem item = getFocusItem ();
if (item != null) {
Event event = new Event ();
@@ -1889,7 +1889,7 @@ int /*long*/ gtk_changed (int /*long*/ widget) {
return 0;
}
-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
switch (OS.GDK_EVENT_TYPE (gdkEvent)) {
case OS.GDK_EXPOSE: {
/*
@@ -1908,32 +1908,32 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
return super.gtk_event_after (widget, gdkEvent);
}
-int /*long*/ gtk_expand_collapse_cursor_row (int /*long*/ widget, int /*long*/ logical, int /*long*/ expand, int /*long*/ open_all) {
+long /*int*/ gtk_expand_collapse_cursor_row (long /*int*/ widget, long /*int*/ logical, long /*int*/ expand, long /*int*/ open_all) {
// FIXME - this flag is never cleared. It should be cleared when the expand all operation completes.
if (expand != 0 && open_all != 0) expandAll = true;
return 0;
}
-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ eventPtr) {
if ((state & OBSCURED) != 0) return 0;
if ((state & PARENT_BACKGROUND) != 0 || backgroundImage != null) {
Control control = findBackgroundControl ();
if (control != null) {
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, eventPtr, GdkEventExpose.sizeof);
- int /*long*/ window = OS.gtk_tree_view_get_bin_window (handle);
+ long /*int*/ window = OS.gtk_tree_view_get_bin_window (handle);
if (window == gdkEvent.window) {
int [] width = new int [1], height = new int [1];
gdk_window_get_size (window, width, height);
- int /*long*/ parent = 0;
+ long /*int*/ parent = 0;
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, parent);
GdkRectangle rect = new GdkRectangle ();
boolean expanded = true;
while (itemCount != 0 && expanded && height [0] > (rect.y + rect.height)) {
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, parent, itemCount - 1);
itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, iter);
- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
OS.gtk_tree_view_get_cell_area (handle, path, 0, rect);
expanded = OS.gtk_tree_view_row_expanded (handle, path);
OS.gtk_tree_path_free (path);
@@ -1950,14 +1950,14 @@ int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ eventPtr) {
return super.gtk_expose_event (widget, eventPtr);
}
-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {
- int /*long*/ window = OS.GDK_EVENT_WINDOW (event);
+long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {
+ long /*int*/ window = OS.GDK_EVENT_WINDOW (event);
if (window != OS.gtk_tree_view_get_bin_window (handle)) return 0;
return super.gtk_motion_notify_event (widget, event);
}
-int /*long*/ gtk_popup_menu (int /*long*/ widget) {
- int /*long*/ result = super.gtk_popup_menu (widget);
+long /*int*/ gtk_popup_menu (long /*int*/ widget) {
+ long /*int*/ result = super.gtk_popup_menu (widget);
/*
* Bug in GTK. The context menu for the typeahead in GtkTreeViewer
* opens in the bottom right corner of the screen when Shift+F10
@@ -1970,10 +1970,10 @@ int /*long*/ gtk_popup_menu (int /*long*/ widget) {
return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;
}
-int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long*/ column) {
+long /*int*/ gtk_row_activated (long /*int*/ tree, long /*int*/ path, long /*int*/ column) {
if (path == 0) return 0;
TreeItem item = null;
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path)) {
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
@@ -1986,21 +1986,21 @@ int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long
return 0;
}
-int /*long*/ gtk_row_deleted (int /*long*/ model, int /*long*/ path) {
+long /*int*/ gtk_row_deleted (long /*int*/ model, long /*int*/ path) {
if (ignoreAccessibility) {
OS.g_signal_stop_emission_by_name (model, OS.row_deleted);
}
return 0;
}
-int /*long*/ gtk_row_inserted (int /*long*/ model, int /*long*/ path, int /*long*/ iter) {
+long /*int*/ gtk_row_inserted (long /*int*/ model, long /*int*/ path, long /*int*/ iter) {
if (ignoreAccessibility) {
OS.g_signal_stop_emission_by_name (model, OS.row_inserted);
}
return 0;
}
-int /*long*/ gtk_start_interactive_search(int /*long*/ widget) {
+long /*int*/ gtk_start_interactive_search(long /*int*/ widget) {
if (!searchEnabled()) {
OS.g_signal_stop_emission_by_name(widget, OS.start_interactive_search);
return 1;
@@ -2008,7 +2008,7 @@ int /*long*/ gtk_start_interactive_search(int /*long*/ widget) {
return 0;
}
-int /*long*/ gtk_test_collapse_row (int /*long*/ tree, int /*long*/ iter, int /*long*/ path) {
+long /*int*/ gtk_test_collapse_row (long /*int*/ tree, long /*int*/ iter, long /*int*/ path) {
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
TreeItem item = items [index [0]];
@@ -2046,7 +2046,7 @@ int /*long*/ gtk_test_collapse_row (int /*long*/ tree, int /*long*/ iter, int /*
return 0;
}
-int /*long*/ gtk_test_expand_row (int /*long*/ tree, int /*long*/ iter, int /*long*/ path) {
+long /*int*/ gtk_test_expand_row (long /*int*/ tree, long /*int*/ iter, long /*int*/ path) {
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
TreeItem item = items [index [0]];
@@ -2088,11 +2088,11 @@ int /*long*/ gtk_test_expand_row (int /*long*/ tree, int /*long*/ iter, int /*lo
return 0;
}
-int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) {
- int /*long*/ path = OS.gtk_tree_path_new_from_string (pathStr);
+long /*int*/ gtk_toggled (long /*int*/ renderer, long /*int*/ pathStr) {
+ long /*int*/ path = OS.gtk_tree_path_new_from_string (pathStr);
if (path == 0) return 0;
TreeItem item = null;
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof());
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof());
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path)) {
item = _getItem (iter);
}
@@ -2108,7 +2108,7 @@ int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) {
return 0;
}
-void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
+void gtk_widget_size_request (long /*int*/ widget, GtkRequisition requisition) {
/*
* Bug in GTK. For some reason, gtk_widget_size_request() fails
* to include the height of the tree view items when there are
@@ -2119,17 +2119,17 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
super.gtk_widget_size_request (widget, requisition);
return;
}
- int /*long*/ columns = OS.gtk_tree_view_get_columns (handle), list = columns;
+ long /*int*/ columns = OS.gtk_tree_view_get_columns (handle), list = columns;
boolean fixVisible = columns != 0;
while (list != 0) {
- int /*long*/ column = OS.g_list_data (list);
+ long /*int*/ column = OS.g_list_data (list);
if (OS.gtk_tree_view_column_get_visible (column)) {
fixVisible = false;
break;
}
list = OS.g_list_next (list);
}
- int /*long*/ columnHandle = 0;
+ long /*int*/ columnHandle = 0;
if (fixVisible) {
columnHandle = OS.g_list_data (columns);
OS.gtk_tree_view_column_set_visible (columnHandle, true);
@@ -2142,13 +2142,13 @@ void gtk_widget_size_request (int /*long*/ widget, GtkRequisition requisition) {
}
void hideFirstColumn () {
- int /*long*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0);
+ long /*int*/ firstColumn = OS.gtk_tree_view_get_column (handle, 0);
OS.gtk_tree_view_column_set_visible (firstColumn, false);
}
void hookEvents () {
super.hookEvents ();
- int /*long*/ selection = OS.gtk_tree_view_get_selection(handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection(handle);
OS.g_signal_connect_closure (selection, OS.changed, display.closures [CHANGED], false);
OS.g_signal_connect_closure (handle, OS.row_activated, display.closures [ROW_ACTIVATED], false);
OS.g_signal_connect_closure (handle, OS.test_expand_row, display.closures [TEST_EXPAND_ROW], false);
@@ -2217,10 +2217,10 @@ public int indexOf (TreeItem item) {
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
int index = -1;
- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);
+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);
int depth = OS.gtk_tree_path_get_depth (path);
if (depth == 1) {
- int /*long*/ indices = OS.gtk_tree_path_get_indices (path);
+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path);
if (indices != 0) {
int[] temp = new int[1];
OS.memmove (temp, indices, 4);
@@ -2233,7 +2233,7 @@ public int indexOf (TreeItem item) {
boolean mnemonicHit (char key) {
for (int i=0; i end) return;
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);
if (!(0 <= start && start <= end && end < itemCount)) {
error (SWT.ERROR_INVALID_RANGE);
}
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
if (fixAccessibility ()) {
ignoreAccessibility = true;
@@ -2393,7 +2393,7 @@ public void removeAll () {
if (item != null && !item.isDisposed ()) item.release (false);
}
items = new TreeItem[4];
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
if (fixAccessibility ()) {
ignoreAccessibility = true;
@@ -2477,19 +2477,19 @@ public void removeTreeListener(TreeListener listener) {
eventTable.unhook (SWT.Collapse, listener);
}
-int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ widget, int /*long*/ cell_area, int /*long*/ x_offset, int /*long*/ y_offset, int /*long*/ width, int /*long*/ height) {
- int /*long*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));
+long /*int*/ rendererGetSizeProc (long /*int*/ cell, long /*int*/ widget, long /*int*/ cell_area, long /*int*/ x_offset, long /*int*/ y_offset, long /*int*/ width, long /*int*/ height) {
+ long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
OS.call_get_size (klass.get_size, cell, handle, cell_area, x_offset, y_offset, width, height);
if (!ignoreSize && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
- int /*long*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);
+ long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);
TreeItem item = null;
if (iter != 0) item = _getItem (iter);
if (item != null) {
int columnIndex = 0;
if (columnCount > 0) {
- int /*long*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1);
+ long /*int*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1);
for (int i = 0; i < columnCount; i++) {
if (columns [i].handle == columnHandle) {
columnIndex = i;
@@ -2516,8 +2516,8 @@ int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ widget, int /*
event.gc = gc;
event.width = contentWidth [0];
event.height = contentHeight [0];
- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
if (OS.gtk_tree_selection_path_is_selected (selection, path)) {
event.detail = SWT.SELECTED;
}
@@ -2534,11 +2534,11 @@ int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ widget, int /*
return 0;
}
-int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*long*/ widget, int /*long*/ background_area, int /*long*/ cell_area, int /*long*/ expose_area, int /*long*/ flags) {
+long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ window, long /*int*/ widget, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ expose_area, long /*int*/ flags) {
TreeItem item = null;
- int /*long*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);
+ long /*int*/ iter = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX2);
if (iter != 0) item = _getItem (iter);
- int /*long*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1);
+ long /*int*/ columnHandle = OS.g_object_get_qdata (cell, Display.SWT_OBJECT_INDEX1);
int columnIndex = 0;
if (columnCount > 0) {
for (int i = 0; i < columnCount; i++) {
@@ -2552,7 +2552,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) || (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {
drawFlags = (int)/*64*/flags;
drawState = SWT.FOREGROUND;
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
OS.gtk_tree_model_get (modelHandle, item.handle, Tree.BACKGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) {
int modelIndex = columnCount == 0 ? Tree.FIRST_COLUMN : columns [columnIndex].modelIndex;
@@ -2566,7 +2566,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;
GdkRectangle rect = new GdkRectangle ();
- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
OS.gtk_tree_path_free (path);
@@ -2580,7 +2580,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
}
//send out measure before erase
- int /*long*/ textRenderer = getTextRenderer (columnHandle);
+ long /*int*/ textRenderer = getTextRenderer (columnHandle);
if (textRenderer != 0) OS.gtk_cell_renderer_get_size (textRenderer, handle, null, null, null, null, null);
if (hooks (SWT.EraseItem)) {
@@ -2617,7 +2617,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if ((drawState & SWT.SELECTED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_SELECTED;
if ((drawState & SWT.FOCUSED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_FOCUSED;
if ((drawState & SWT.SELECTED) != 0) {
- int /*long*/ style = OS.gtk_widget_get_style (widget);
+ long /*int*/ style = OS.gtk_widget_get_style (widget);
//TODO - parity and sorted
byte[] detail = Converter.wcsToMbcs (null, "cell_odd", true);
OS.gtk_paint_flat_box (style, window, OS.GTK_STATE_SELECTED, OS.GTK_SHADOW_NONE, rect, widget, detail, rect.x, rect.y, rect.width, rect.height);
@@ -2628,7 +2628,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
}
}
}
- int /*long*/ result = 0;
+ long /*int*/ result = 0;
if ((drawState & SWT.BACKGROUND) != 0 && (drawState & SWT.SELECTED) == 0) {
GC gc = new GC (this);
gc.setBackground (item.getBackground (columnIndex));
@@ -2638,7 +2638,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
gc.dispose ();
}
if ((drawState & SWT.FOREGROUND) != 0 || OS.GTK_IS_CELL_RENDERER_TOGGLE (cell)) {
- int /*long*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));
+ long /*int*/ g_class = OS.g_type_class_peek_parent (OS.G_OBJECT_GET_CLASS (cell));
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
if (drawForeground != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
@@ -2651,7 +2651,7 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if (hooks (SWT.PaintItem)) {
GdkRectangle rect = new GdkRectangle ();
GdkRectangle clipRect = new GdkRectangle ();
- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
OS.gtk_tree_view_get_cell_area (handle, path, columnHandle, rect);
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, clipRect);
OS.gtk_tree_path_free (path);
@@ -2715,8 +2715,8 @@ void resetCustomDraw () {
for (int i=0; i 1)) return;
boolean fixColumn = showFirstColumn ();
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
boolean first = true;
for (int i = 0; i < length; i++) {
@@ -3133,7 +3133,7 @@ public void setSelection (TreeItem [] items) {
if (item == null) continue;
if (item.isDisposed ()) break;
if (item.parent != this) continue;
- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);
+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);
showItem (path, false);
if (first) {
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
@@ -3226,7 +3226,7 @@ public void setTopItem (TreeItem item) {
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);
if (item.parent != this) return;
- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);
+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);
showItem (path, false);
OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0f, 0f);
if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {
@@ -3301,10 +3301,10 @@ boolean showFirstColumn () {
*/
int columnCount = Math.max (1, this.columnCount);
for (int i=0; i 1) {
int [] indices = new int [depth - 1];
- int /*long*/ indicesPtr = OS.gtk_tree_path_get_indices (path);
+ long /*int*/ indicesPtr = OS.gtk_tree_path_get_indices (path);
OS.memmove (indices, indicesPtr, indices.length * 4);
- int /*long*/ tempPath = OS.gtk_tree_path_new ();
+ long /*int*/ tempPath = OS.gtk_tree_path_new ();
for (int i=0; i index || index > count - 1) return _getBackground ();
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_BACKGROUND, ptr, -1);
if (ptr [0] == 0) return _getBackground ();
@@ -241,7 +241,7 @@ boolean _getChecked () {
}
Color _getForeground () {
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.FOREGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) return parent.getForeground ();
GdkColor gdkColor = new GdkColor ();
@@ -253,7 +253,7 @@ Color _getForeground () {
Color _getForeground (int index) {
int count = Math.max (1, parent.columnCount);
if (0 > index || index > count - 1) return _getForeground ();
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_FOREGROUND, ptr, -1);
if (ptr [0] == 0) return _getForeground ();
@@ -266,7 +266,7 @@ Color _getForeground (int index) {
Image _getImage (int index) {
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return null;
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_PIXBUF, ptr, -1);
if (ptr [0] == 0) return null;
@@ -280,7 +280,7 @@ Image _getImage (int index) {
String _getText (int index) {
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return "";
- int /*long*/ [] ptr = new int /*long*/ [1];
+ long /*int*/ [] ptr = new long /*int*/ [1];
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_TEXT, ptr, -1);
if (ptr [0] == 0) return ""; //$NON-NLS-1$
@@ -300,7 +300,7 @@ void clear () {
OS.gtk_tree_store_set (parent.modelHandle, handle, i, 0, -1);
}
for (int i=Tree.FOREGROUND_COLUMN; i= 0 && index < parent.columnCount) {
column = parent.columns [index].handle;
} else {
column = OS.gtk_tree_view_get_column (parentHandle, index);
}
if (column == 0) return new Rectangle (0, 0, 0, 0);
- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
OS.gtk_widget_realize (parentHandle);
GdkRectangle rect = new GdkRectangle ();
OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
@@ -494,14 +494,14 @@ public Rectangle getBounds () {
// shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
checkWidget ();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
- int /*long*/ parentHandle = parent.handle;
- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);
+ long /*int*/ parentHandle = parent.handle;
+ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, 0);
if (column == 0) return new Rectangle (0, 0, 0, 0);
- int /*long*/ textRenderer = parent.getTextRenderer (column);
- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);
+ long /*int*/ textRenderer = parent.getTextRenderer (column);
+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);
- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
OS.gtk_widget_realize (parentHandle);
boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
@@ -585,7 +585,7 @@ public boolean getChecked () {
*/
public boolean getExpanded () {
checkWidget();
- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
boolean answer = OS.gtk_tree_view_row_expanded (parent.handle, path);
OS.gtk_tree_path_free (path);
return answer;
@@ -737,18 +737,18 @@ public Rectangle getImageBounds (int index) {
// TODO fully test on early and later versions of GTK
checkWidget ();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
- int /*long*/ parentHandle = parent.handle;
- int /*long*/ column = 0;
+ long /*int*/ parentHandle = parent.handle;
+ long /*int*/ column = 0;
if (index >= 0 && index < parent.getColumnCount ()) {
column = parent.columns [index].handle;
} else {
column = OS.gtk_tree_view_get_column (parentHandle, index);
}
if (column == 0) return new Rectangle (0, 0, 0, 0);
- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);
+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
if (pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);
GdkRectangle rect = new GdkRectangle ();
- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
OS.gtk_widget_realize (parentHandle);
OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x;
@@ -883,12 +883,12 @@ public Tree getParent () {
*/
public TreeItem getParentItem () {
checkWidget();
- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
TreeItem item = null;
int depth = OS.gtk_tree_path_get_depth (path);
if (depth > 1) {
OS.gtk_tree_path_up (path);
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
if (OS.gtk_tree_model_get_iter (parent.modelHandle, iter, path)) {
item = parent._getItem (iter);
}
@@ -946,19 +946,19 @@ public Rectangle getTextBounds (int index) {
if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0);
// TODO fully test on early and later versions of GTK
// shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
- int /*long*/ parentHandle = parent.handle;
- int /*long*/ column = 0;
+ long /*int*/ parentHandle = parent.handle;
+ long /*int*/ column = 0;
if (index >= 0 && index < parent.columnCount) {
column = parent.columns [index].handle;
} else {
column = OS.gtk_tree_view_get_column (parentHandle, index);
}
if (column == 0) return new Rectangle (0, 0, 0, 0);
- int /*long*/ textRenderer = parent.getTextRenderer (column);
- int /*long*/ pixbufRenderer = parent.getPixbufRenderer (column);
+ long /*int*/ textRenderer = parent.getTextRenderer (column);
+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer (column);
if (textRenderer == 0 || pixbufRenderer == 0) return new Rectangle (0, 0, 0, 0);
- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
OS.gtk_widget_realize (parentHandle);
boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
@@ -1032,8 +1032,8 @@ public int indexOf (TreeItem item) {
if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
int index = -1;
boolean isParent = false;
- int /*long*/ currentPath = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
- int /*long*/ parentPath = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);
+ long /*int*/ currentPath = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ long /*int*/ parentPath = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);
int depth = OS.gtk_tree_path_get_depth (parentPath);
if (depth > 1 && OS.gtk_tree_path_up(parentPath)) {
if (OS.gtk_tree_path_compare(currentPath, parentPath) == 0) isParent = true;
@@ -1041,9 +1041,9 @@ public int indexOf (TreeItem item) {
OS.gtk_tree_path_free (currentPath);
OS.gtk_tree_path_free (parentPath);
if (!isParent) return index;
- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);
+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, item.handle);
if (depth > 1) {
- int /*long*/ indices = OS.gtk_tree_path_get_indices (path);
+ long /*int*/ indices = OS.gtk_tree_path_get_indices (path);
if (indices != 0) {
int[] temp = new int[depth];
OS.memmove (temp, indices, 4 * temp.length);
@@ -1055,13 +1055,13 @@ public int indexOf (TreeItem item) {
}
void redraw () {
- int /*long*/ parentHandle = parent.handle;
+ long /*int*/ parentHandle = parent.handle;
if (gtk_widget_get_realized (parentHandle)) {
- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
GdkRectangle rect = new GdkRectangle ();
OS.gtk_tree_view_get_cell_area (parentHandle, path, 0, rect);
OS.gtk_tree_path_free (path);
- int /*long*/ window = OS.gtk_tree_view_get_bin_window (parentHandle);
+ long /*int*/ window = OS.gtk_tree_view_get_bin_window (parentHandle);
rect.x = 0;
int [] w = new int [1], h = new int [1];
gdk_window_get_size (window, w, h);
@@ -1102,15 +1102,15 @@ void releaseWidget () {
*/
public void removeAll () {
checkWidget ();
- int /*long*/ modelHandle = parent.modelHandle;
+ long /*int*/ modelHandle = parent.modelHandle;
int length = OS.gtk_tree_model_iter_n_children (modelHandle, handle);
if (length == 0) return;
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
if (parent.fixAccessibility ()) {
parent.ignoreAccessibility = true;
}
- int /*long*/ selection = OS.gtk_tree_view_get_selection (parent.handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (parent.handle);
int [] value = new int [1];
while (OS.gtk_tree_model_iter_children (modelHandle, iter, handle)) {
OS.gtk_tree_model_get (modelHandle, iter, Tree.ID_COLUMN, value, -1);
@@ -1215,16 +1215,16 @@ public void setBackground (int index, Color color) {
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
- int /*long*/ parentHandle = parent.handle;
- int /*long*/ column = 0;
+ long /*int*/ parentHandle = parent.handle;
+ long /*int*/ column = 0;
if (parent.columnCount > 0) {
column = parent.columns [index].handle;
} else {
column = OS.gtk_tree_view_get_column (parentHandle, index);
}
if (column == 0) return;
- int /*long*/ textRenderer = parent.getTextRenderer (column);
- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
+ long /*int*/ textRenderer = parent.getTextRenderer (column);
+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
@@ -1275,7 +1275,7 @@ public void setChecked (boolean checked) {
*/
public void setExpanded (boolean expanded) {
checkWidget();
- int /*long*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
+ long /*int*/ path = OS.gtk_tree_model_get_path (parent.modelHandle, handle);
if (expanded != OS.gtk_tree_view_row_expanded (parent.handle, path)) {
if (expanded) {
OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW);
@@ -1318,7 +1318,7 @@ public void setFont (Font font){
if (oldFont == font) return;
this.font = font;
if (oldFont != null && oldFont.equals (font)) return;
- int /*long*/ fontHandle = font != null ? font.handle : 0;
+ long /*int*/ fontHandle = font != null ? font.handle : 0;
OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.FONT_COLUMN, fontHandle, -1);
/*
* Bug in GTK. When using fixed-height-mode,
@@ -1369,7 +1369,7 @@ public void setFont (int index, Font font) {
if (oldFont != null && oldFont.equals (font)) return;
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
- int /*long*/ fontHandle = font != null ? font.handle : 0;
+ long /*int*/ fontHandle = font != null ? font.handle : 0;
OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_FONT, fontHandle, -1);
/*
* Bug in GTK. When using fixed-height-mode,
@@ -1387,16 +1387,16 @@ public void setFont (int index, Font font) {
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
- int /*long*/ parentHandle = parent.handle;
- int /*long*/ column = 0;
+ long /*int*/ parentHandle = parent.handle;
+ long /*int*/ column = 0;
if (parent.columnCount > 0) {
column = parent.columns [index].handle;
} else {
column = OS.gtk_tree_view_get_column (parentHandle, index);
}
if (column == 0) return;
- int /*long*/ textRenderer = parent.getTextRenderer (column);
- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
+ long /*int*/ textRenderer = parent.getTextRenderer (column);
+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
@@ -1494,16 +1494,16 @@ public void setForeground (int index, Color color){
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
- int /*long*/ parentHandle = parent.handle;
- int /*long*/ column = 0;
+ long /*int*/ parentHandle = parent.handle;
+ long /*int*/ column = 0;
if (parent.columnCount > 0) {
column = parent.columns [index].handle;
} else {
column = OS.gtk_tree_view_get_column (parentHandle, index);
}
if (column == 0) return;
- int /*long*/ textRenderer = parent.getTextRenderer (column);
- int /*long*/ imageRenderer = parent.getPixbufRenderer (column);
+ long /*int*/ textRenderer = parent.getTextRenderer (column);
+ long /*int*/ imageRenderer = parent.getPixbufRenderer (column);
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
@@ -1568,7 +1568,7 @@ public void setImage (int index, Image image) {
}
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return;
- int /*long*/ pixbuf = 0;
+ long /*int*/ pixbuf = 0;
if (image != null) {
ImageList imageList = parent.imageList;
if (imageList == null) imageList = parent.imageList = new ImageList ();
@@ -1597,10 +1597,10 @@ public void setImage (int index, Image image) {
*/
if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {
if (image != null) {
- int /*long*/parentHandle = parent.handle;
- int /*long*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
+ long /*int*/parentHandle = parent.handle;
+ long /*int*/ column = OS.gtk_tree_view_get_column (parentHandle, index);
int [] w = new int [1];
- int /*long*/ pixbufRenderer = parent.getPixbufRenderer(column);
+ long /*int*/ pixbufRenderer = parent.getPixbufRenderer(column);
OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
if (w[0] < image.getBounds().width) {
/*
@@ -1608,7 +1608,7 @@ public void setImage (int index, Image image) {
* are relying on the fact that it is done as part of modifying
* the style.
*/
- int /*long*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
+ long /*int*/ style = OS.gtk_widget_get_modifier_style (parentHandle);
parent.modifyStyle (parentHandle, style);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
index afe1444725..8d86e07d3a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
@@ -56,7 +56,7 @@ public abstract class Widget {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
int style, state;
Display display;
EventTable eventTable;
@@ -298,7 +298,7 @@ public void addDisposeListener (DisposeListener listener) {
addListener (SWT.Dispose, typedListener);
}
-int /*long*/ paintWindow () {
+long /*int*/ paintWindow () {
return 0;
}
@@ -314,7 +314,7 @@ static int checkBits (int style, int int0, int int1, int int2, int int3, int int
return style;
}
-int /*long*/ cellDataProc (int /*long*/ tree_column, int /*long*/ cell, int /*long*/ tree_model, int /*long*/ iter, int /*long*/ data) {
+long /*int*/ cellDataProc (long /*int*/ tree_column, long /*int*/ cell, long /*int*/ tree_model, long /*int*/ iter, long /*int*/ data) {
return 0;
}
@@ -435,7 +435,7 @@ void deregister () {
}
void destroyWidget () {
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
releaseHandle ();
if (topHandle != 0 && (state & HANDLE) != 0) {
OS.gtk_widget_destroy (topHandle);
@@ -634,271 +634,271 @@ public int getStyle () {
}
-int /*long*/ gtk_activate (int /*long*/ widget) {
+long /*int*/ gtk_activate (long /*int*/ widget) {
return 0;
}
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_button_release_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_button_release_event (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_changed (int /*long*/ widget) {
+long /*int*/ gtk_changed (long /*int*/ widget) {
return 0;
}
-int /*long*/ gtk_change_value (int /*long*/ widget, int /*long*/ scroll, int /*long*/ value1, int /*long*/ value2) {
+long /*int*/ gtk_change_value (long /*int*/ widget, long /*int*/ scroll, long /*int*/ value1, long /*int*/ value2) {
return 0;
}
-int /*long*/ gtk_clicked (int /*long*/ widget) {
+long /*int*/ gtk_clicked (long /*int*/ widget) {
return 0;
}
-int /*long*/ gtk_commit (int /*long*/ imcontext, int /*long*/ text) {
+long /*int*/ gtk_commit (long /*int*/ imcontext, long /*int*/ text) {
return 0;
}
-int /*long*/ gtk_configure_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_configure_event (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_create_menu_proxy (int /*long*/ widget) {
+long /*int*/ gtk_create_menu_proxy (long /*int*/ widget) {
return 0;
}
-int /*long*/ gtk_day_selected (int /*long*/ widget) {
+long /*int*/ gtk_day_selected (long /*int*/ widget) {
return 0;
}
-int /*long*/ gtk_day_selected_double_click (int /*long*/ widget) {
+long /*int*/ gtk_day_selected_double_click (long /*int*/ widget) {
return 0;
}
-int /*long*/ gtk_delete_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_delete_event (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_delete_range (int /*long*/ widget, int /*long*/ iter1, int /*long*/ iter2) {
+long /*int*/ gtk_delete_range (long /*int*/ widget, long /*int*/ iter1, long /*int*/ iter2) {
return 0;
}
-int /*long*/ gtk_delete_text (int /*long*/ widget, int /*long*/ start_pos, int /*long*/ end_pos) {
+long /*int*/ gtk_delete_text (long /*int*/ widget, long /*int*/ start_pos, long /*int*/ end_pos) {
return 0;
}
-int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_event (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_expand_collapse_cursor_row (int /*long*/ widget, int /*long*/ logical, int /*long*/ expand, int /*long*/ open_all) {
+long /*int*/ gtk_expand_collapse_cursor_row (long /*int*/ widget, long /*int*/ logical, long /*int*/ expand, long /*int*/ open_all) {
return 0;
}
-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_focus (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_focus (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_focus_in_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_focus_in_event (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_grab_focus (int /*long*/ widget) {
+long /*int*/ gtk_grab_focus (long /*int*/ widget) {
return 0;
}
-int /*long*/ gtk_hide (int /*long*/ widget) {
+long /*int*/ gtk_hide (long /*int*/ widget) {
return 0;
}
-int /*long*/ gtk_icon_release (int /*long*/ widget, int /*long*/ icon_pos, int /*long*/ event) {
+long /*int*/ gtk_icon_release (long /*int*/ widget, long /*int*/ icon_pos, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_input (int /*long*/ widget, int /*long*/ arg1) {
+long /*int*/ gtk_input (long /*int*/ widget, long /*int*/ arg1) {
return 0;
}
-int /*long*/ gtk_insert_text (int /*long*/ widget, int /*long*/ new_text, int /*long*/ new_text_length, int /*long*/ position) {
+long /*int*/ gtk_insert_text (long /*int*/ widget, long /*int*/ new_text, long /*int*/ new_text_length, long /*int*/ position) {
return 0;
}
-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_key_press_event (long /*int*/ widget, long /*int*/ event) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, event, GdkEventKey.sizeof);
return sendKeyEvent (SWT.KeyDown, gdkEvent) ? 0 : 1;
}
-int /*long*/ gtk_key_release_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_key_release_event (long /*int*/ widget, long /*int*/ event) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, event, GdkEventKey.sizeof);
return sendKeyEvent (SWT.KeyUp, gdkEvent) ? 0 : 1;
}
-int /*long*/ gtk_leave_notify_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_map (int /*long*/ widget) {
+long /*int*/ gtk_map (long /*int*/ widget) {
return 0;
}
-int /*long*/ gtk_map_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_map_event (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) {
+long /*int*/ gtk_mnemonic_activate (long /*int*/ widget, long /*int*/ arg1) {
return 0;
}
-int /*long*/ gtk_month_changed (int /*long*/ widget) {
+long /*int*/ gtk_month_changed (long /*int*/ widget) {
return 0;
}
-int /*long*/ gtk_motion_notify_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_motion_notify_event (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_move_focus (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_move_focus (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_output (int /*long*/ widget) {
+long /*int*/ gtk_output (long /*int*/ widget) {
return 0;
}
-int /*long*/ gtk_populate_popup (int /*long*/ widget, int /*long*/ menu) {
+long /*int*/ gtk_populate_popup (long /*int*/ widget, long /*int*/ menu) {
return 0;
}
-int /*long*/ gtk_popup_menu (int /*long*/ widget) {
+long /*int*/ gtk_popup_menu (long /*int*/ widget) {
return 0;
}
-int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) {
+long /*int*/ gtk_preedit_changed (long /*int*/ imcontext) {
return 0;
}
-int /*long*/ gtk_realize (int /*long*/ widget) {
+long /*int*/ gtk_realize (long /*int*/ widget) {
return 0;
}
-int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long*/ column) {
+long /*int*/ gtk_row_activated (long /*int*/ tree, long /*int*/ path, long /*int*/ column) {
return 0;
}
-int /*long*/ gtk_row_deleted (int /*long*/ model, int /*long*/ path) {
+long /*int*/ gtk_row_deleted (long /*int*/ model, long /*int*/ path) {
return 0;
}
-int /*long*/ gtk_row_inserted (int /*long*/ model, int /*long*/ path, int /*long*/ iter) {
+long /*int*/ gtk_row_inserted (long /*int*/ model, long /*int*/ path, long /*int*/ iter) {
return 0;
}
-int /*long*/ gtk_scroll_child (int /*long*/ widget, int /*long*/ scrollType, int /*long*/ horizontal) {
+long /*int*/ gtk_scroll_child (long /*int*/ widget, long /*int*/ scrollType, long /*int*/ horizontal) {
return 0;
}
-int /*long*/ gtk_scroll_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_scroll_event (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_select (int /*long*/ item) {
+long /*int*/ gtk_select (long /*int*/ item) {
return 0;
}
-int /*long*/ gtk_selection_done (int /*long*/ menushell) {
+long /*int*/ gtk_selection_done (long /*int*/ menushell) {
return 0;
}
-int /*long*/ gtk_show (int /*long*/ widget) {
+long /*int*/ gtk_show (long /*int*/ widget) {
return 0;
}
-int /*long*/ gtk_show_help (int /*long*/ widget, int /*long*/ helpType) {
+long /*int*/ gtk_show_help (long /*int*/ widget, long /*int*/ helpType) {
return 0;
}
-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
+long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
return 0;
}
-int /*long*/ gtk_status_icon_popup_menu (int /*long*/ handle, int /*long*/ button, int /*long*/ activate_time) {
+long /*int*/ gtk_status_icon_popup_menu (long /*int*/ handle, long /*int*/ button, long /*int*/ activate_time) {
return 0;
}
-int /*long*/ gtk_start_interactive_search (int /*long*/ widget) {
+long /*int*/ gtk_start_interactive_search (long /*int*/ widget) {
return 0;
}
-int /*long*/ gtk_style_set (int /*long*/ widget, int /*long*/ previousStyle) {
+long /*int*/ gtk_style_set (long /*int*/ widget, long /*int*/ previousStyle) {
return 0;
}
-int /*long*/ gtk_switch_page (int /*long*/ widget, int /*long*/ page, int /*long*/ page_num) {
+long /*int*/ gtk_switch_page (long /*int*/ widget, long /*int*/ page, long /*int*/ page_num) {
return 0;
}
-int /*long*/ gtk_test_collapse_row (int /*long*/ tree, int /*long*/ iter, int /*long*/ path) {
+long /*int*/ gtk_test_collapse_row (long /*int*/ tree, long /*int*/ iter, long /*int*/ path) {
return 0;
}
-int /*long*/ gtk_test_expand_row (int /*long*/ tree, int /*long*/ iter, int /*long*/ path) {
+long /*int*/ gtk_test_expand_row (long /*int*/ tree, long /*int*/ iter, long /*int*/ path) {
return 0;
}
-int /*long*/ gtk_text_buffer_insert_text (int /*long*/ widget, int /*long*/ iter, int /*long*/ text, int /*long*/ length) {
+long /*int*/ gtk_text_buffer_insert_text (long /*int*/ widget, long /*int*/ iter, long /*int*/ text, long /*int*/ length) {
return 0;
}
-int /*long*/ gtk_timer () {
+long /*int*/ gtk_timer () {
return 0;
}
-int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) {
+long /*int*/ gtk_toggled (long /*int*/ renderer, long /*int*/ pathStr) {
return 0;
}
-int /*long*/ gtk_unmap (int /*long*/ widget) {
+long /*int*/ gtk_unmap (long /*int*/ widget) {
return 0;
}
-int /*long*/ gtk_unmap_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_unmap_event (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int /*long*/ gtk_unrealize (int /*long*/ widget) {
+long /*int*/ gtk_unrealize (long /*int*/ widget) {
return 0;
}
-int /*long*/ gtk_value_changed (int /*long*/ adjustment) {
+long /*int*/ gtk_value_changed (long /*int*/ adjustment) {
return 0;
}
-int /*long*/ gtk_visibility_notify_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_visibility_notify_event (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-void gtk_widget_get_allocation (int /*long*/ widget, GtkAllocation allocation) {
+void gtk_widget_get_allocation (long /*int*/ widget, GtkAllocation allocation) {
if (OS.GTK_VERSION >= OS.VERSION (2, 18, 0)) {
OS.gtk_widget_get_allocation (widget, allocation);
} else {
@@ -909,7 +909,7 @@ void gtk_widget_get_allocation (int /*long*/ widget, GtkAllocation allocation) {
}
}
-boolean gtk_widget_get_mapped (int /*long*/ widget) {
+boolean gtk_widget_get_mapped (long /*int*/ widget) {
if (OS.GTK_VERSION >= OS.VERSION (2, 20, 0)) {
return OS.gtk_widget_get_mapped (widget);
} else {
@@ -917,7 +917,7 @@ boolean gtk_widget_get_mapped (int /*long*/ widget) {
}
}
-boolean gtk_widget_has_focus (int /*long*/ widget) {
+boolean gtk_widget_has_focus (long /*int*/ widget) {
if (OS.GTK_VERSION >= OS.VERSION (2, 18, 0)) {
return OS.gtk_widget_has_focus (widget);
} else {
@@ -925,21 +925,21 @@ boolean gtk_widget_has_focus (int /*long*/ widget) {
}
}
-int /*long*/ gtk_window_state_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_window_state_event (long /*int*/ widget, long /*int*/ event) {
return 0;
}
-int fontHeight (int /*long*/ font, int /*long*/ widgetHandle) {
- int /*long*/ context = OS.gtk_widget_get_pango_context (widgetHandle);
- int /*long*/ lang = OS.pango_context_get_language (context);
- int /*long*/ metrics = OS.pango_context_get_metrics (context, font, lang);
+int fontHeight (long /*int*/ font, long /*int*/ widgetHandle) {
+ long /*int*/ context = OS.gtk_widget_get_pango_context (widgetHandle);
+ long /*int*/ lang = OS.pango_context_get_language (context);
+ long /*int*/ metrics = OS.pango_context_get_metrics (context, font, lang);
int ascent = OS.pango_font_metrics_get_ascent (metrics);
int descent = OS.pango_font_metrics_get_descent (metrics);
OS.pango_font_metrics_unref (metrics);
return OS.PANGO_PIXELS (ascent + descent);
}
-int /*long*/ filterProc(int /*long*/ xEvent, int /*long*/ gdkEvent, int /*long*/ data2) {
+long /*int*/ filterProc(long /*int*/ xEvent, long /*int*/ gdkEvent, long /*int*/ data2) {
return 0;
}
@@ -947,11 +947,11 @@ boolean filters (int eventType) {
return display.filters (eventType);
}
-int /*long*/ fixedMapProc (int /*long*/ widget) {
+long /*int*/ fixedMapProc (long /*int*/ widget) {
return 0;
}
-int /*long*/ fixedSizeAllocateProc(int /*long*/ widget, int /*long*/ allocationPtr) {
+long /*int*/ fixedSizeAllocateProc(long /*int*/ widget, long /*int*/ allocationPtr) {
return OS.Call (Display.oldFixedSizeAllocateProc, widget, allocationPtr);
}
@@ -1054,15 +1054,15 @@ boolean hooks (int eventType) {
return eventTable.hooks (eventType);
}
-int /*long*/ hoverProc (int /*long*/ widget) {
+long /*int*/ hoverProc (long /*int*/ widget) {
return 0;
}
-int /*long*/ menuPositionProc (int /*long*/ menu, int /*long*/ x, int /*long*/ y, int /*long*/ push_in, int /*long*/ user_data) {
+long /*int*/ menuPositionProc (long /*int*/ menu, long /*int*/ x, long /*int*/ y, long /*int*/ push_in, long /*int*/ user_data) {
return 0;
}
-boolean mnemonicHit (int /*long*/ mnemonicHandle, char key) {
+boolean mnemonicHit (long /*int*/ mnemonicHandle, char key) {
if (!mnemonicMatch (mnemonicHandle, key)) return false;
OS.g_signal_handlers_block_matched (mnemonicHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, MNEMONIC_ACTIVATE);
boolean result = OS.gtk_widget_mnemonic_activate (mnemonicHandle, false);
@@ -1070,13 +1070,13 @@ boolean mnemonicHit (int /*long*/ mnemonicHandle, char key) {
return result;
}
-boolean mnemonicMatch (int /*long*/ mnemonicHandle, char key) {
+boolean mnemonicMatch (long /*int*/ mnemonicHandle, char key) {
int keyval1 = OS.gdk_keyval_to_lower (OS.gdk_unicode_to_keyval (key));
int keyval2 = OS.gdk_keyval_to_lower (OS.gtk_label_get_mnemonic_keyval (mnemonicHandle));
return keyval1 == keyval2;
}
-void modifyStyle (int /*long*/ handle, int /*long*/ style) {
+void modifyStyle (long /*int*/ handle, long /*int*/ style) {
OS.gtk_widget_modify_style (handle, style);
}
@@ -1221,11 +1221,11 @@ protected void removeListener (int eventType, SWTEventListener handler) {
eventTable.unhook (eventType, handler);
}
-int /*long*/ rendererGetSizeProc (int /*long*/ cell, int /*long*/ handle, int /*long*/ cell_area, int /*long*/ x_offset, int /*long*/ y_offset, int /*long*/ width, int /*long*/ height) {
+long /*int*/ rendererGetSizeProc (long /*int*/ cell, long /*int*/ handle, long /*int*/ cell_area, long /*int*/ x_offset, long /*int*/ y_offset, long /*int*/ width, long /*int*/ height) {
return 0;
}
-int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*long*/ handle, int /*long*/ background_area, int /*long*/ cell_area, int /*long*/ expose_area, int /*long*/ flags) {
+long /*int*/ rendererRenderProc (long /*int*/ cell, long /*int*/ window, long /*int*/ handle, long /*int*/ background_area, long /*int*/ cell_area, long /*int*/ expose_area, long /*int*/ flags) {
return 0;
}
@@ -1356,7 +1356,7 @@ boolean sendKeyEvent (int type, GdkEventKey keyEvent) {
char [] sendIMKeyEvent (int type, GdkEventKey keyEvent, char [] chars) {
int index = 0, count = 0, state = 0;
- int /*long*/ ptr = 0;
+ long /*int*/ ptr = 0;
if (keyEvent == null) {
ptr = OS.gtk_get_current_event ();
if (ptr != 0) {
@@ -1420,7 +1420,7 @@ void sendSelectionEvent (int eventType, Event event, boolean send) {
return;
}
if (event == null) event = new Event ();
- int /*long*/ ptr = OS.gtk_get_current_event ();
+ long /*int*/ ptr = OS.gtk_get_current_event ();
if (ptr != 0) {
GdkEvent gdkEvent = new GdkEvent ();
OS.memmove (gdkEvent, ptr, GdkEvent.sizeof);
@@ -1554,8 +1554,8 @@ public void setData (String key, Object value) {
if (key.equals(SWT.SKIN_CLASS) || key.equals(SWT.SKIN_ID)) this.reskin(SWT.ALL);
}
-void setForegroundColor (int /*long*/ handle, GdkColor color) {
- int /*long*/ style = OS.gtk_widget_get_modifier_style (handle);
+void setForegroundColor (long /*int*/ handle, GdkColor color) {
+ long /*int*/ style = OS.gtk_widget_get_modifier_style (handle);
OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_NORMAL, color);
OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_ACTIVE, color);
OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_PRELIGHT, color);
@@ -1689,18 +1689,18 @@ boolean setTabItemFocus (boolean next) {
return false;
}
-int /*long*/ shellMapProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+long /*int*/ shellMapProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
return 0;
}
-int /*long*/ sizeAllocateProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+long /*int*/ sizeAllocateProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
return 0;
}
-int /*long*/ sizeRequestProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+long /*int*/ sizeRequestProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
return 0;
}
-int /*long*/ g_object_ref_sink (int /*long*/ object) {
+long /*int*/ g_object_ref_sink (long /*int*/ object) {
if (OS.GLIB_VERSION >= OS.VERSION (2, 10, 0)) {
return OS.g_object_ref_sink (object);
} else {
@@ -1709,7 +1709,7 @@ int /*long*/ g_object_ref_sink (int /*long*/ object) {
return 0;
}
-boolean gtk_widget_get_sensitive (int /*long*/ widget) {
+boolean gtk_widget_get_sensitive (long /*int*/ widget) {
if (OS.GTK_VERSION >= OS.VERSION (2, 18, 0)) {
return OS.gtk_widget_get_sensitive (widget);
} else {
@@ -1717,7 +1717,7 @@ boolean gtk_widget_get_sensitive (int /*long*/ widget) {
}
}
-boolean gtk_widget_get_visible (int /*long*/ widget) {
+boolean gtk_widget_get_visible (long /*int*/ widget) {
if (OS.GTK_VERSION >= OS.VERSION (2, 18, 0)) {
return OS.gtk_widget_get_visible (widget);
} else {
@@ -1725,7 +1725,7 @@ boolean gtk_widget_get_visible (int /*long*/ widget) {
}
}
-boolean gtk_widget_get_realized (int /*long*/ widget) {
+boolean gtk_widget_get_realized (long /*int*/ widget) {
if (OS.GTK_VERSION >= OS.VERSION (2, 20, 0)) {
return OS.gtk_widget_get_realized (widget);
} else {
@@ -1733,7 +1733,7 @@ boolean gtk_widget_get_realized (int /*long*/ widget) {
}
}
-boolean gtk_widget_get_can_default (int /*long*/ widget){
+boolean gtk_widget_get_can_default (long /*int*/ widget){
if (OS.GTK_VERSION >= OS.VERSION (2, 18, 0)) {
return OS.gtk_widget_get_can_default (widget);
} else {
@@ -1741,7 +1741,7 @@ boolean gtk_widget_get_can_default (int /*long*/ widget){
}
}
-boolean gtk_widget_get_has_window (int /*long*/ widget) {
+boolean gtk_widget_get_has_window (long /*int*/ widget) {
if (OS.GTK_VERSION >= OS.VERSION (2, 18, 0)) {
return OS.gtk_widget_get_has_window (widget);
} else {
@@ -1749,7 +1749,7 @@ boolean gtk_widget_get_has_window (int /*long*/ widget) {
}
}
-int /*long*/ gtk_widget_get_window (int /*long*/ widget){
+long /*int*/ gtk_widget_get_window (long /*int*/ widget){
if (OS.GTK_VERSION >= OS.VERSION(2, 14, 0)){
return OS.gtk_widget_get_window (widget);
} else {
@@ -1757,7 +1757,7 @@ int /*long*/ gtk_widget_get_window (int /*long*/ widget){
}
}
-void gtk_widget_set_can_default (int /*long*/ widget, boolean can_default) {
+void gtk_widget_set_can_default (long /*int*/ widget, boolean can_default) {
if (OS.GTK_VERSION >= OS.VERSION (2, 18, 0)) {
OS.gtk_widget_set_can_default (widget, can_default);
} else {
@@ -1769,7 +1769,7 @@ void gtk_widget_set_can_default (int /*long*/ widget, boolean can_default) {
}
}
-void gtk_widget_set_can_focus (int /*long*/ widget, boolean can_focus) {
+void gtk_widget_set_can_focus (long /*int*/ widget, boolean can_focus) {
if (OS.GTK_VERSION >= OS.VERSION (2, 18, 0)) {
OS.gtk_widget_set_can_focus (widget, can_focus);
} else {
@@ -1781,7 +1781,7 @@ void gtk_widget_set_can_focus (int /*long*/ widget, boolean can_focus) {
}
}
-void gtk_widget_set_mapped (int /*long*/ widget, boolean mapped) {
+void gtk_widget_set_mapped (long /*int*/ widget, boolean mapped) {
if (OS.GTK_VERSION >= OS.VERSION (2, 20, 0)) {
OS.gtk_widget_set_mapped (widget, mapped);
} else {
@@ -1793,7 +1793,7 @@ void gtk_widget_set_mapped (int /*long*/ widget, boolean mapped) {
}
}
-void gtk_widget_set_visible (int /*long*/ widget, boolean visible) {
+void gtk_widget_set_visible (long /*int*/ widget, boolean visible) {
if (OS.GTK_VERSION >= OS.VERSION (3, 0, 0)) {
OS.gtk_widget_set_visible (widget,visible);
} else {
@@ -1805,7 +1805,7 @@ void gtk_widget_set_visible (int /*long*/ widget, boolean visible) {
}
}
-void gtk_widget_set_receives_default (int /*long*/ widget, boolean receives_default) {
+void gtk_widget_set_receives_default (long /*int*/ widget, boolean receives_default) {
if (OS.GTK_VERSION >= OS.VERSION (2, 18, 0)) {
OS.gtk_widget_set_receives_default (widget, receives_default);
} else {
@@ -1817,7 +1817,7 @@ void gtk_widget_set_receives_default (int /*long*/ widget, boolean receives_defa
}
}
-void gdk_pixmap_get_size (int /*long*/ pixmap, int[] width, int[] height) {
+void gdk_pixmap_get_size (long /*int*/ pixmap, int[] width, int[] height) {
if (OS.GTK_VERSION >= OS.VERSION (2, 24, 0)) {
OS.gdk_pixmap_get_size (pixmap, width, height);
} else {
@@ -1825,7 +1825,7 @@ void gdk_pixmap_get_size (int /*long*/ pixmap, int[] width, int[] height) {
}
}
-void gdk_window_get_size (int /*long*/ drawable, int[] width, int[] height) {
+void gdk_window_get_size (long /*int*/ drawable, int[] width, int[] height) {
if (OS.GTK_VERSION >= OS.VERSION (2, 24, 0)) {
width[0] = OS.gdk_window_get_width (drawable);
height[0] = OS.gdk_window_get_height (drawable);
@@ -1834,8 +1834,8 @@ void gdk_window_get_size (int /*long*/ drawable, int[] width, int[] height) {
}
}
-int /*long*/ gtk_box_new (int orientation, boolean homogeneous, int spacing) {
- int /*long*/ box = 0;
+long /*int*/ gtk_box_new (int orientation, boolean homogeneous, int spacing) {
+ long /*int*/ box = 0;
if (OS.GTK_VERSION >= OS.VERSION (3, 0, 0)) {
box = OS.gtk_box_new (orientation, spacing);
OS.gtk_box_set_homogeneous (box, homogeneous);
@@ -1849,17 +1849,17 @@ int /*long*/ gtk_box_new (int orientation, boolean homogeneous, int spacing) {
return box;
}
-int gdk_pointer_grab (int /*long*/ window, int grab_ownership, boolean owner_events, int event_mask, int /*long*/ confine_to, int /*long*/ cursor, int time_) {
+int gdk_pointer_grab (long /*int*/ window, int grab_ownership, boolean owner_events, int event_mask, long /*int*/ confine_to, long /*int*/ cursor, int time_) {
if (OS.GTK_VERSION >= OS.VERSION (3, 0, 0)) {
- int /*long*/ display = 0;
+ long /*int*/ display = 0;
if( window != 0) {
display = OS.gdk_window_get_display (window);
} else {
window = OS.gdk_get_default_root_window ();
display = OS.gdk_window_get_display (window);
}
- int /*long*/ device_manager = OS.gdk_display_get_device_manager (display);
- int /*long*/ pointer = OS.gdk_device_manager_get_client_pointer (device_manager);
+ long /*int*/ device_manager = OS.gdk_display_get_device_manager (display);
+ long /*int*/ pointer = OS.gdk_device_manager_get_client_pointer (device_manager);
return OS.gdk_device_grab (pointer, window, grab_ownership, owner_events, event_mask, cursor, time_);
} else {
return OS.gdk_pointer_grab (window, owner_events, event_mask, confine_to, cursor, time_);
@@ -1881,11 +1881,11 @@ public String toString () {
return getName () + " {" + string + "}";
}
-int /*long*/ topHandle () {
+long /*int*/ topHandle () {
return handle;
}
-int /*long*/ timerProc (int /*long*/ widget) {
+long /*int*/ timerProc (long /*int*/ widget) {
return 0;
}
@@ -1893,7 +1893,7 @@ boolean translateTraversal (int event) {
return false;
}
-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {
+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case ACTIVATE: return gtk_activate (handle);
case CHANGED: return gtk_changed (handle);
@@ -1920,13 +1920,13 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {
}
}
-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case EXPOSE_EVENT_INVERSE: {
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, arg0, GdkEventExpose.sizeof);
- int /*long*/ paintWindow = paintWindow();
- int /*long*/ window = gdkEvent.window;
+ long /*int*/ paintWindow = paintWindow();
+ long /*int*/ window = gdkEvent.window;
if (window != paintWindow) return 0;
return (state & OBSCURED) != 0 ? 1 : 0;
}
@@ -1969,7 +1969,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us
}
}
-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ user_data) {
+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case DELETE_RANGE: return gtk_delete_range (handle, arg0, arg1);
case DELETE_TEXT: return gtk_delete_text (handle, arg0, arg1);
@@ -1985,7 +1985,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ ar
}
}
-int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ user_data) {
+long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) {
switch ((int)/*64*/user_data) {
case CHANGE_VALUE: return gtk_change_value (handle, arg0, arg1, arg2);
case EXPAND_COLLAPSE_CURSOR_ROW: return gtk_expand_collapse_cursor_row (handle, arg0, arg1, arg2);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Device.java
index 83924037e1..0c33809ff6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Device.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Device.java
@@ -205,7 +205,7 @@ void checkCairo() {
try {
/* Check if cairo is available on the system */
byte[] buffer = Converter.wcsToMbcs(null, "libcairo.so.2", true);
- int /*long*/ libcairo = OS.dlopen(buffer, OS.RTLD_LAZY);
+ long /*int*/ libcairo = OS.dlopen(buffer, OS.RTLD_LAZY);
if (libcairo != 0) {
OS.dlclose(libcairo);
} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java
index a49e46975d..772a4fe91f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java
@@ -183,7 +183,7 @@ void checkGC (int mask) {
if ((state & mask) == mask) return;
state = (state ^ mask) & mask;
data.state |= mask;
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
if ((state & (BACKGROUND | FOREGROUND)) != 0) {
XColor color;
@@ -346,7 +346,7 @@ void checkGC (int mask) {
}
}
int convertRgn(int rgn, double[] matrix) {
- int /*long*/ newRgn = OS.XCreateRegion();
+ long /*int*/ newRgn = OS.XCreateRegion();
//TODO - get rectangles from region instead of clip box
XRectangle rect = new XRectangle();
OS.XClipBox(rgn, rect);
@@ -372,7 +372,7 @@ int convertRgn(int rgn, double[] matrix) {
Cairo.cairo_matrix_transform_point(matrix, x, y);
pointArray[6] = (short)x[0];
pointArray[7] = (short)Math.round(y[0]);
- int /*long*/ polyRgn = OS.XPolygonRegion(pointArray, pointArray.length / 2, OS.EvenOddRule);
+ long /*int*/ polyRgn = OS.XPolygonRegion(pointArray, pointArray.length / 2, OS.EvenOddRule);
OS.XUnionRegion(newRgn, polyRgn, newRgn);
OS.XDestroyRegion(polyRgn);
return newRgn;
@@ -475,7 +475,7 @@ public void copyArea(Image image, int x, int y) {
OS.XFreeGC(xDisplay, xGC);
}
void destroy() {
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) Cairo.cairo_destroy(cairo);
data.cairo = 0;
@@ -550,7 +550,7 @@ public void drawArc(int x, int y, int width, int height, int startAngle, int arc
height = -height;
}
if (width == 0 || height == 0 || arcAngle == 0) return;
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
if (width == height) {
@@ -722,7 +722,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
}
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
if (data.alpha != 0) {
srcImage.createSurface();
@@ -740,7 +740,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
case SWT.LOW: filter = Cairo.CAIRO_FILTER_FAST; break;
case SWT.HIGH: filter = Cairo.CAIRO_FILTER_BEST; break;
}
- int /*long*/ pattern = Cairo.cairo_pattern_create_for_surface(srcImage.surface);
+ long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface(srcImage.surface);
if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (srcWidth != destWidth || srcHeight != destHeight) {
/*
@@ -759,8 +759,8 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
* the image that was created or the edges are still faded.
*/
if (Cairo.cairo_version () >= Cairo.CAIRO_VERSION_ENCODE(1, 4, 2)) {
- int /*long*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, imgWidth * 3, imgHeight * 3);
- int /*long*/ cr = Cairo.cairo_create(surface);
+ long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, imgWidth * 3, imgHeight * 3);
+ long /*int*/ cr = Cairo.cairo_create(surface);
Cairo.cairo_set_source_surface(cr, srcImage.surface, imgWidth, imgHeight);
Cairo.cairo_paint(cr);
Cairo.cairo_scale(cr, -1, -1);
@@ -783,7 +783,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
Cairo.cairo_set_source_surface(cr, srcImage.surface, imgWidth, -imgHeight * 3);
Cairo.cairo_paint(cr);
Cairo.cairo_destroy(cr);
- int /*long*/ newPattern = Cairo.cairo_pattern_create_for_surface(surface);
+ long /*int*/ newPattern = Cairo.cairo_pattern_create_for_surface(surface);
Cairo.cairo_surface_destroy(surface);
if (newPattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_destroy(pattern);
@@ -1151,7 +1151,7 @@ static int scalePixmap(int display, int pixmap, int srcX, int srcY, int srcWidth
public void drawLine (int x1, int y1, int x2, int y2) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
checkGC(DRAW);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
Cairo.cairo_move_to(cairo, x1 + xOffset, y1 + yOffset);
@@ -1193,7 +1193,7 @@ public void drawOval(int x, int y, int width, int height) {
y = y + height;
height = -height;
}
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
if (width == height) {
@@ -1239,11 +1239,11 @@ public void drawPath(Path path) {
if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
initCairo();
checkGC(DRAW);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
Cairo.cairo_save(cairo);
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
Cairo.cairo_translate(cairo, xOffset, yOffset);
- int /*long*/ copy = Cairo.cairo_copy_path(path.handle);
+ long /*int*/ copy = Cairo.cairo_copy_path(path.handle);
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
@@ -1270,7 +1270,7 @@ public void drawPath(Path path) {
public void drawPoint (int x, int y) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
checkGC(DRAW);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
Cairo.cairo_rectangle(cairo, x, y, 1, 1);
Cairo.cairo_fill(cairo);
@@ -1299,7 +1299,7 @@ public void drawPolygon(int[] pointArray) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
checkGC(DRAW);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
drawPolyline(cairo, pointArray, true);
Cairo.cairo_stroke(cairo);
@@ -1365,7 +1365,7 @@ public void drawPolyline(int[] pointArray) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
checkGC(DRAW);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
drawPolyline(cairo, pointArray, false);
Cairo.cairo_stroke(cairo);
@@ -1377,7 +1377,7 @@ public void drawPolyline(int[] pointArray) {
}
OS.XDrawLines(data.display,data.drawable,handle,xPoints,xPoints.length / 2, OS.CoordModeOrigin);
}
-void drawPolyline(int /*long*/ cairo, int[] pointArray, boolean close) {
+void drawPolyline(long /*int*/ cairo, int[] pointArray, boolean close) {
int count = pointArray.length / 2;
if (count == 0) return;
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
@@ -1413,7 +1413,7 @@ public void drawRectangle (int x, int y, int width, int height) {
y = y + height;
height = -height;
}
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
Cairo.cairo_rectangle(cairo, x + xOffset, y + yOffset, width, height);
@@ -1482,7 +1482,7 @@ public void drawRoundRectangle (int x, int y, int width, int height, int arcWidt
}
if (naw < 0) naw = 0 - naw;
if (nah < 0) nah = 0 - nah;
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
if (naw == 0 || nah == 0) {
@@ -1582,7 +1582,7 @@ public void drawString (String string, int x, int y, boolean isTransparent) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (string.length() == 0) return;
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
//TODO - honor isTransparent
checkGC(FOREGROUND | FONT);
@@ -1735,7 +1735,7 @@ public void drawText (String string, int x, int y, int flags) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (string.length() == 0) return;
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
//TODO - honor flags
checkGC(FOREGROUND | FONT);
@@ -1824,7 +1824,7 @@ public void fillArc(int x, int y, int width, int height, int startAngle, int arc
height = -height;
}
if (width == 0 || height == 0 || arcAngle == 0) return;
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
if (width == height) {
if (arcAngle >= 0) {
@@ -1916,9 +1916,9 @@ public void fillGradientRectangle(int x, int y, int width, int height, boolean v
// this is not always the case.
//final boolean directColor = (visual.c_class == OS.TrueColor) || (visual.c_class == OS.DirectColor);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
- int /*long*/ pattern;
+ long /*int*/ pattern;
if (vertical) {
pattern = Cairo.cairo_pattern_create_linear (0.0, 0.0, 0.0, 1.0);
} else {
@@ -1990,7 +1990,7 @@ public void fillOval (int x, int y, int width, int height) {
y = y + height;
height = -height;
}
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
if (width == height) {
Cairo.cairo_arc_negative(cairo, x + width / 2f, y + height / 2f, width / 2f, 0, 2 * (float)Compatibility.PI);
@@ -2035,8 +2035,8 @@ public void fillPath (Path path) {
if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
initCairo();
checkGC(FILL);
- int /*long*/ cairo = data.cairo;
- int /*long*/ copy = Cairo.cairo_copy_path(path.handle);
+ long /*int*/ cairo = data.cairo;
+ long /*int*/ copy = Cairo.cairo_copy_path(path.handle);
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
@@ -2065,7 +2065,7 @@ public void fillPolygon(int[] pointArray) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
checkGC(FILL);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
drawPolyline(cairo, pointArray, true);
Cairo.cairo_fill(cairo);
@@ -2103,7 +2103,7 @@ public void fillRectangle (int x, int y, int width, int height) {
y = y + height;
height = -height;
}
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
Cairo.cairo_rectangle(cairo, x, y, width, height);
Cairo.cairo_fill(cairo);
@@ -2166,7 +2166,7 @@ public void fillRoundRectangle (int x, int y, int width, int height, int arcWidt
}
if (naw < 0) naw = 0 - naw;
if (nah < 0) nah = 0 - nah;
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
if (naw == 0 || nah == 0) {
Cairo.cairo_rectangle(cairo, x, y, width, height);
@@ -2742,7 +2742,7 @@ public void getClipping(Region region) {
if (region == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
int clipping = region.handle;
OS.XSubtractRegion (clipping, clipping, clipping);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
int clipRgn = data.clipRgn;
if (clipRgn == 0) {
int[] width = new int[1], height = new int[1], unused = new int[1];
@@ -3276,7 +3276,7 @@ public int getStyle () {
public int getTextAntialias() {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (data.cairo == 0) return SWT.DEFAULT;
- int /*long*/ options = Cairo.cairo_font_options_create();
+ long /*int*/ options = Cairo.cairo_font_options_create();
Cairo.cairo_get_font_options(data.cairo, options);
int antialias = Cairo.cairo_font_options_get_antialias(options);
Cairo.cairo_font_options_destroy(options);
@@ -3310,7 +3310,7 @@ public void getTransform(Transform transform) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (transform == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
Cairo.cairo_get_matrix(cairo, transform.handle);
} else {
@@ -3374,14 +3374,14 @@ void init(Drawable drawable, GCData data, int xGC) {
}
void initCairo() {
data.device.checkCairo();
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) return;
int xDisplay = data.display;
int xDrawable = data.drawable;
int xVisual = OS.XDefaultVisual(xDisplay, OS.XDefaultScreen(xDisplay));
int[] width = new int[1], height = new int[1], unused = new int[1];
OS.XGetGeometry(xDisplay, xDrawable, unused, unused, unused, width, height, unused, unused);
- int /*long*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width[0], height[0]);
+ long /*int*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width[0], height[0]);
if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
data.cairo = cairo = Cairo.cairo_create(surface);
Cairo.cairo_surface_destroy(surface);
@@ -3475,7 +3475,7 @@ public void setAdvanced(boolean advanced) {
initCairo();
} catch (SWTException e) {}
} else {
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) Cairo.cairo_destroy(cairo);
data.cairo = 0;
data.interpolation = SWT.DEFAULT;
@@ -3552,7 +3552,7 @@ public void setAntialias(int antialias) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
initCairo();
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
Cairo.cairo_set_antialias(cairo, mode);
}
/**
@@ -3659,7 +3659,7 @@ public void setBackgroundPattern(Pattern pattern) {
data.backgroundPattern = pattern;
data.state &= ~BACKGROUND;
}
-static void setCairoFont(int /*long*/ cairo, Font font) {
+static void setCairoFont(long /*int*/ cairo, Font font) {
//TODO - use X font instead of loading new one???
FontData[] fds = font.getFontData();
FontData fd = fds[0];
@@ -3675,13 +3675,13 @@ static void setCairoFont(int /*long*/ cairo, Font font) {
Cairo.cairo_select_font_face(cairo, buffer, slant, weight);
Cairo.cairo_set_font_size(cairo, fd.getHeight());
}
-static void setCairoRegion(int /*long*/ cairo, int /*long*/ rgn) {
+static void setCairoRegion(long /*int*/ cairo, long /*int*/ rgn) {
//TODO - get rectangles from region instead of clip box
XRectangle rect = new XRectangle();
OS.XClipBox(rgn, rect);
Cairo.cairo_rectangle(cairo, rect.x, rect.y, rect.width, rect.height);
}
-static void setCairoPatternColor(int /*long*/ pattern, int offset, Color c, int alpha) {
+static void setCairoPatternColor(long /*int*/ pattern, int offset, Color c, int alpha) {
XColor color = c.handle;
double aa = (alpha & 0xFF) / (double)0xFF;
double red = ((color.red & 0xFFFF) / (double)0xFFFF);
@@ -3689,8 +3689,8 @@ static void setCairoPatternColor(int /*long*/ pattern, int offset, Color c, int
double blue = ((color.blue & 0xFFFF) / (double)0xFFFF);
Cairo.cairo_pattern_add_color_stop_rgba(pattern, offset, red, green, blue, aa);
}
-void setCairoClip(int /*long*/ damageRgn, int /*long*/ clipRgn) {
- int /*long*/ cairo = data.cairo;
+void setCairoClip(long /*int*/ damageRgn, long /*int*/ clipRgn) {
+ long /*int*/ cairo = data.cairo;
Cairo.cairo_reset_clip(cairo);
if (damageRgn != 0) {
double[] matrix = new double[6];
@@ -3706,7 +3706,7 @@ void setCairoClip(int /*long*/ damageRgn, int /*long*/ clipRgn) {
}
}
void setClipping(int clipRgn) {
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (clipRgn == 0) {
if (data.clipRgn != 0) {
OS.XDestroyRegion (data.clipRgn);
@@ -3808,8 +3808,8 @@ public void setClipping(Path path) {
setClipping(0);
if (path != null) {
initCairo();
- int /*long*/ cairo = data.cairo;
- int /*long*/ copy = Cairo.cairo_copy_path(path.handle);
+ long /*int*/ cairo = data.cairo;
+ long /*int*/ copy = Cairo.cairo_copy_path(path.handle);
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
@@ -3887,7 +3887,7 @@ public void setFillRule(int rule) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
OS.XSetFillRule(data.display, handle, mode);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
Cairo.cairo_set_fill_rule(cairo, cairo_mode);
}
@@ -4364,7 +4364,7 @@ public void setTextAntialias(int antialias) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
initCairo();
- int /*long*/ options = Cairo.cairo_font_options_create();
+ long /*int*/ options = Cairo.cairo_font_options_create();
Cairo.cairo_font_options_set_antialias(options, mode);
Cairo.cairo_set_font_options(data.cairo, options);
Cairo.cairo_font_options_destroy(options);
@@ -4400,7 +4400,7 @@ public void setTransform(Transform transform) {
if (transform != null && transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
if (data.cairo == 0 && transform == null) return;
initCairo();
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (transform != null) {
Cairo.cairo_set_matrix(cairo, transform.handle);
} else {
@@ -4455,7 +4455,7 @@ public void setXORMode(boolean xor) {
public Point stringExtent(String string) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
checkGC(FONT);
byte[] buffer = Converter.wcsToMbcs(null, string, true);
@@ -4536,7 +4536,7 @@ public Point textExtent(String string) {
public Point textExtent(String string, int flags) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
//TODO - honor flags
checkGC(FONT);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GCData.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GCData.java
index 8d6836cd9a..6785780cc7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GCData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GCData.java
@@ -52,7 +52,7 @@ public final class GCData {
public Image image;
public int display;
public int drawable;
- public int /*long*/ cairo;
+ public long /*int*/ cairo;
public double cairoXoffset, cairoYoffset;
public double[] clippingTransform;
public String string;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java
index 340d524787..231f5bb4c1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java
@@ -109,7 +109,7 @@ public final class Image extends Resource implements Drawable {
*/
public int mask;
- int /*long*/ surface;
+ long /*int*/ surface;
/**
* specifies the transparent pixel
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java
index 71d6ef020e..03575a4497 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java
@@ -337,7 +337,7 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs
Control control = findBackgroundControl ();
if (control != null) {
GCData data = gc.getGCData ();
- int /*long*/ cairo = data.cairo;
+ long /*int*/ cairo = data.cairo;
if (cairo != 0) {
Cairo.cairo_save (cairo);
if (control.backgroundImage != null) {
@@ -354,9 +354,9 @@ public void drawBackground (GC gc, int x, int y, int width, int height, int offs
int xDrawable = control.backgroundImage.pixmap;
int [] unused = new int [1]; int [] w = new int [1]; int [] h = new int [1];
OS.XGetGeometry (xDisplay, xDrawable, unused, unused, unused, w, h, unused, unused);
- int /*long*/ surface = Cairo.cairo_xlib_surface_create (xDisplay, xDrawable, xVisual, w [0], h [0]);
+ long /*int*/ surface = Cairo.cairo_xlib_surface_create (xDisplay, xDrawable, xVisual, w [0], h [0]);
if (surface == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ pattern = Cairo.cairo_pattern_create_for_surface (surface);
+ long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface (surface);
if (pattern == 0) error (SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_set_extend (pattern, Cairo.CAIRO_EXTEND_REPEAT);
Cairo.cairo_set_source (cairo, pattern);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java
index d1c6a09805..25bf06620b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java
@@ -121,7 +121,7 @@ void destroy() {
* If the reference count reaches 0, the slot may
* be reused when another color is allocated.
*/
- int /*long*/ hPal = device.hPalette;
+ long /*int*/ hPal = device.hPalette;
if (hPal != 0) {
int index = OS.GetNearestPaletteIndex(hPal, handle);
int[] colorRefCount = device.colorRefCount;
@@ -241,7 +241,7 @@ void init(int red, int green, int blue) {
handle = (red & 0xFF) | ((green & 0xFF) << 8) | ((blue & 0xFF) << 16);
/* If this is not a palette-based device, return */
- int /*long*/ hPal = device.hPalette;
+ long /*int*/ hPal = device.hPalette;
if (hPal == 0) return;
int[] colorRefCount = device.colorRefCount;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java
index 2f064a3e22..062a9f39d1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java
@@ -56,7 +56,7 @@ public final class Cursor extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
boolean isIcon;
@@ -192,7 +192,7 @@ Cursor(Device device) {
*/
public Cursor(Device device, int style) {
super(device);
- int /*long*/ lpCursorName = 0;
+ long /*int*/ lpCursorName = 0;
switch (style) {
case SWT.CURSOR_HAND: lpCursorName = OS.IDC_HAND; break;
case SWT.CURSOR_ARROW: lpCursorName = OS.IDC_ARROW; break;
@@ -228,7 +228,7 @@ public Cursor(Device device, int style) {
int width = OS.GetSystemMetrics(OS.SM_CXCURSOR);
int height = OS.GetSystemMetrics(OS.SM_CYCURSOR);
if (width == 32 && height == 32) {
- int /*long*/ hInst = OS.GetModuleHandle(null);
+ long /*int*/ hInst = OS.GetModuleHandle(null);
if (OS.IsWinCE) SWT.error(SWT.ERROR_NOT_IMPLEMENTED);
handle = OS.CreateCursor(hInst, 5, 0, 32, 32, HAND_SOURCE, HAND_MASK);
@@ -296,7 +296,7 @@ public Cursor(Device device, ImageData source, ImageData mask, int hotspotX, int
byte[] maskData = ImageData.convertPad(mask.data, mask.width, mask.height, mask.depth, mask.scanlinePad, 2);
/* Create the cursor */
- int /*long*/ hInst = OS.GetModuleHandle(null);
+ long /*int*/ hInst = OS.GetModuleHandle(null);
if (OS.IsWinCE) SWT.error (SWT.ERROR_NOT_IMPLEMENTED);
handle = OS.CreateCursor(hInst, hotspotX, hotspotY, source.width, source.height, sourceData, maskData);
if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
@@ -338,8 +338,8 @@ public Cursor(Device device, ImageData source, int hotspotX, int hotspotY) {
hotspotY >= source.height || hotspotY < 0) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
- int /*long*/ hBitmap = 0;
- int /*long*/ hMask = 0;
+ long /*int*/ hBitmap = 0;
+ long /*int*/ hMask = 0;
if (source.maskData == null && source.transparentPixel == -1 && (source.alpha != -1 || source.alphaData != null)) {
PaletteData palette = source.palette;
PaletteData newPalette = new PaletteData(0xFF00, 0xFF0000, 0xFF000000);
@@ -388,7 +388,7 @@ public Cursor(Device device, ImageData source, int hotspotX, int hotspotY) {
if (hMask == 0) SWT.error(SWT.ERROR_NO_HANDLES);
} else {
ImageData mask = source.getTransparencyMask();
- int /*long*/ [] result = Image.init(this.device, null, source, mask);
+ long /*int*/ [] result = Image.init(this.device, null, source, mask);
hBitmap = result[0];
hMask = result[1];
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java
index a885a9d07c..f8df00e229 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java
@@ -46,7 +46,7 @@ public abstract class Device implements Drawable {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ hPalette = 0;
+ public long /*int*/ hPalette = 0;
int [] colorRefCount;
/* System Font */
@@ -59,11 +59,11 @@ public abstract class Device implements Drawable {
int[] pixels;
/* Scripts */
- int /*long*/ [] scripts;
+ long /*int*/ [] scripts;
/* Advanced Graphics */
- int /*long*/ [] gdipToken;
- int /*long*/ fontCollection;
+ long /*int*/ [] gdipToken;
+ long /*int*/ fontCollection;
String[] loadedFonts;
boolean disposed;
@@ -186,7 +186,7 @@ void checkGDIP() {
int oldErrorMode = 0;
if (!OS.IsWinCE) oldErrorMode = OS.SetErrorMode (OS.SEM_FAILCRITICALERRORS);
try {
- int /*long*/ [] token = new int /*long*/ [1];
+ long /*int*/ [] token = new long /*int*/ [1];
GdiplusStartupInput input = new GdiplusStartupInput ();
input.GdiplusVersion = 1;
if (Gdip.GdiplusStartup (token, input, 0) == 0) {
@@ -231,14 +231,14 @@ protected void create (DeviceData data) {
}
int computePixels(float height) {
- int /*long*/ hDC = internal_new_GC (null);
+ long /*int*/ hDC = internal_new_GC (null);
int pixels = -(int)(0.5f + (height * OS.GetDeviceCaps(hDC, OS.LOGPIXELSY) / 72f));
internal_dispose_GC (hDC, null);
return pixels;
}
-float computePoints(LOGFONT logFont, int /*long*/ hFont) {
- int /*long*/ hDC = internal_new_GC (null);
+float computePoints(LOGFONT logFont, long /*int*/ hFont) {
+ long /*int*/ hDC = internal_new_GC (null);
int logPixelsY = OS.GetDeviceCaps(hDC, OS.LOGPIXELSY);
int pixels = 0;
if (logFont.lfHeight > 0) {
@@ -249,7 +249,7 @@ float computePoints(LOGFONT logFont, int /*long*/ hFont) {
* height of a font in points does not include the internal leading,
* we must subtract the internal leading, which requires a TEXTMETRIC.
*/
- int /*long*/ oldFont = OS.SelectObject(hDC, hFont);
+ long /*int*/ oldFont = OS.SelectObject(hDC, hFont);
TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW() : new TEXTMETRICA();
OS.GetTextMetrics(hDC, lptm);
OS.SelectObject(hDC, oldFont);
@@ -318,7 +318,7 @@ void dispose_Object (Object object) {
}
}
-int /*long*/ EnumFontFamProc (int /*long*/ lpelfe, int /*long*/ lpntme, int /*long*/ FontType, int /*long*/ lParam) {
+long /*int*/ EnumFontFamProc (long /*int*/ lpelfe, long /*int*/ lpntme, long /*int*/ FontType, long /*int*/ lParam) {
boolean isScalable = ((int)/*64*/FontType & OS.RASTER_FONTTYPE) == 0;
boolean scalable = lParam == 1;
if (isScalable == scalable) {
@@ -365,7 +365,7 @@ int /*long*/ EnumFontFamProc (int /*long*/ lpelfe, int /*long*/ lpntme, int /*lo
*/
public Rectangle getBounds () {
checkDevice ();
- int /*long*/ hDC = internal_new_GC (null);
+ long /*int*/ hDC = internal_new_GC (null);
int width = OS.GetDeviceCaps (hDC, OS.HORZRES);
int height = OS.GetDeviceCaps (hDC, OS.VERTRES);
internal_dispose_GC (hDC, null);
@@ -444,7 +444,7 @@ public Rectangle getClientArea () {
*/
public int getDepth () {
checkDevice ();
- int /*long*/ hDC = internal_new_GC (null);
+ long /*int*/ hDC = internal_new_GC (null);
int bits = OS.GetDeviceCaps (hDC, OS.BITSPIXEL);
int planes = OS.GetDeviceCaps (hDC, OS.PLANES);
internal_dispose_GC (hDC, null);
@@ -464,7 +464,7 @@ public int getDepth () {
*/
public Point getDPI () {
checkDevice ();
- int /*long*/ hDC = internal_new_GC (null);
+ long /*int*/ hDC = internal_new_GC (null);
int dpiX = OS.GetDeviceCaps (hDC, OS.LOGPIXELSX);
int dpiY = OS.GetDeviceCaps (hDC, OS.LOGPIXELSY);
internal_dispose_GC (hDC, null);
@@ -489,7 +489,7 @@ public FontData [] getFontList (String faceName, boolean scalable) {
/* Create the callback */
Callback callback = new Callback (this, "EnumFontFamProc", 4); //$NON-NLS-1$
- int /*long*/ lpEnumFontFamProc = callback.getAddress ();
+ long /*int*/ lpEnumFontFamProc = callback.getAddress ();
if (lpEnumFontFamProc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
/* Initialize the instance variables */
@@ -503,7 +503,7 @@ public FontData [] getFontList (String faceName, boolean scalable) {
/* Enumerate */
int offset = 0;
- int /*long*/ hDC = internal_new_GC (null);
+ long /*int*/ hDC = internal_new_GC (null);
if (faceName == null) {
/* The user did not specify a face name, so they want all versions of all available face names */
OS.EnumFontFamilies (hDC, null, lpEnumFontFamProc, scalable ? 1 : 0);
@@ -574,7 +574,7 @@ String getLastError () {
String getLastErrorText () {
int error = OS.GetLastError();
if (error == 0) return ""; //$NON-NLS-1$
- int /*long*/ [] buffer = new int /*long*/ [1];
+ long /*int*/ [] buffer = new long /*int*/ [1];
int dwFlags = OS.FORMAT_MESSAGE_ALLOCATE_BUFFER | OS.FORMAT_MESSAGE_FROM_SYSTEM | OS.FORMAT_MESSAGE_IGNORE_INSERTS;
int length = OS.FormatMessage(dwFlags, 0, error, OS.LANG_USER_DEFAULT, buffer, 0, 0);
if (length == 0) return " [GetLastError=0x" + Integer.toHexString(error) + "]"; //$NON-NLS-1$ //$NON-NLS-2$
@@ -648,7 +648,7 @@ public Color getSystemColor (int id) {
*/
public Font getSystemFont () {
checkDevice ();
- int /*long*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT);
+ long /*int*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT);
return Font.win32_new (this, hFont);
}
@@ -690,10 +690,10 @@ protected void init () {
/* Initialize scripts list */
if (!OS.IsWinCE) {
- int /*long*/ [] ppSp = new int /*long*/ [1];
+ long /*int*/ [] ppSp = new long /*int*/ [1];
int [] piNumScripts = new int [1];
OS.ScriptGetProperties (ppSp, piNumScripts);
- scripts = new int /*long*/ [piNumScripts [0]];
+ scripts = new long /*int*/ [piNumScripts [0]];
OS.MoveMemory (scripts, ppSp [0], scripts.length * OS.PTR_SIZEOF);
}
@@ -701,7 +701,7 @@ protected void init () {
* If we're not on a device which supports palettes,
* don't create one.
*/
- int /*long*/ hDC = internal_new_GC (null);
+ long /*int*/ hDC = internal_new_GC (null);
int rc = OS.GetDeviceCaps (hDC, OS.RASTERCAPS);
int bits = OS.GetDeviceCaps (hDC, OS.BITSPIXEL);
int planes = OS.GetDeviceCaps (hDC, OS.PLANES);
@@ -775,7 +775,7 @@ protected void init () {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public abstract int /*long*/ internal_new_GC (GCData data);
+public abstract long /*int*/ internal_new_GC (GCData data);
/**
* Invokes platform specific functionality to dispose a GC handle.
@@ -792,7 +792,7 @@ public abstract int /*long*/ internal_new_GC (GCData data);
*
* @noreference This method is not intended to be referenced by clients.
*/
-public abstract void /*long*/ internal_dispose_GC (int /*long*/ hDC, GCData data);
+public abstract void /*long*/ internal_dispose_GC (long /*int*/ hDC, GCData data);
/**
* Returns true if the device has been disposed,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java
index b21356c1d0..816c8df78b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java
@@ -45,7 +45,7 @@ public final class Font extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
/**
* Prevents uninitialized instances from being created outside the package.
@@ -253,7 +253,7 @@ public String toString () {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public static Font win32_new(Device device, int /*long*/ handle) {
+public static Font win32_new(Device device, long /*int*/ handle) {
Font font = new Font(device);
font.handle = handle;
return font;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java
index 31c12847b7..a39509ee91 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java
@@ -321,7 +321,7 @@ public boolean equals (Object object) {
getName().equals(fd.getName());
}
-int /*long*/ EnumLocalesProc(int /*long*/ lpLocaleString) {
+long /*int*/ EnumLocalesProc(long /*int*/ lpLocaleString) {
/* Get the locale ID */
int length = 8;
@@ -531,7 +531,7 @@ public void setLocale(String locale) {
data.lfCharSet = (byte)OS.DEFAULT_CHARSET;
} else {
Callback callback = new Callback (this, "EnumLocalesProc", 1); //$NON-NLS-1$
- int /*long*/ lpEnumLocalesProc = callback.getAddress ();
+ long /*int*/ lpEnumLocalesProc = callback.getAddress ();
if (lpEnumLocalesProc == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS);
OS.EnumSystemLocales(lpEnumLocalesProc, OS.LCID_SUPPORTED);
callback.dispose ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
index 2a80067e29..b91cf6c166 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
@@ -71,7 +71,7 @@ public final class GC extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
Drawable drawable;
GCData data;
@@ -163,7 +163,7 @@ public GC(Drawable drawable, int style) {
if (drawable == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
GCData data = new GCData ();
data.style = checkStyle(style);
- int /*long*/ hDC = drawable.internal_new_GC(data);
+ long /*int*/ hDC = drawable.internal_new_GC(data);
Device device = data.device;
if (device == null) device = Device.getDevice();
if (device == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
@@ -182,14 +182,14 @@ void checkGC(int mask) {
if ((state & mask) == mask) return;
state = (state ^ mask) & mask;
data.state |= mask;
- int /*long*/ gdipGraphics = data.gdipGraphics;
+ long /*int*/ gdipGraphics = data.gdipGraphics;
if (gdipGraphics != 0) {
- int /*long*/ pen = data.gdipPen;
+ long /*int*/ pen = data.gdipPen;
float width = data.lineWidth;
if ((state & FOREGROUND) != 0 || (pen == 0 && (state & (LINE_WIDTH | LINE_STYLE | LINE_MITERLIMIT | LINE_JOIN | LINE_CAP)) != 0)) {
if (data.gdipFgBrush != 0) Gdip.SolidBrush_delete(data.gdipFgBrush);
data.gdipFgBrush = 0;
- int /*long*/ brush;
+ long /*int*/ brush;
Pattern pattern = data.foregroundPattern;
if (pattern != null) {
brush = pattern.handle;
@@ -205,7 +205,7 @@ void checkGC(int mask) {
} else {
int foreground = data.foreground;
int rgb = ((foreground >> 16) & 0xFF) | (foreground & 0xFF00) | ((foreground & 0xFF) << 16);
- int /*long*/ color = Gdip.Color_new(data.alpha << 24 | rgb);
+ long /*int*/ color = Gdip.Color_new(data.alpha << 24 | rgb);
if (color == 0) SWT.error(SWT.ERROR_NO_HANDLES);
brush = Gdip.SolidBrush_new(color);
if (brush == 0) SWT.error(SWT.ERROR_NO_HANDLES);
@@ -285,7 +285,7 @@ void checkGC(int mask) {
if ((data.style & SWT.MIRRORED) != 0) {
switch (Gdip.Brush_GetType(data.gdipBrush)) {
case Gdip.BrushTypeTextureFill:
- int /*long*/ brush = Gdip.Brush_Clone(data.gdipBrush);
+ long /*int*/ brush = Gdip.Brush_Clone(data.gdipBrush);
if (brush == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Gdip.TextureBrush_ScaleTransform(brush, -1, 1, Gdip.MatrixOrderPrepend);
data.gdipBrush = data.gdipBgBrush = brush;
@@ -294,9 +294,9 @@ void checkGC(int mask) {
} else {
int background = data.background;
int rgb = ((background >> 16) & 0xFF) | (background & 0xFF00) | ((background & 0xFF) << 16);
- int /*long*/ color = Gdip.Color_new(data.alpha << 24 | rgb);
+ long /*int*/ color = Gdip.Color_new(data.alpha << 24 | rgb);
if (color == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ brush = Gdip.SolidBrush_new(color);
+ long /*int*/ brush = Gdip.SolidBrush_new(color);
if (brush == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Gdip.Color_delete(color);
data.gdipBrush = data.gdipBgBrush = brush;
@@ -305,8 +305,8 @@ void checkGC(int mask) {
if ((state & FONT) != 0) {
Font font = data.font;
OS.SelectObject(handle, font.handle);
- int /*long*/[] hFont = new int /*long*/[1];
- int /*long*/ gdipFont = createGdipFont(handle, font.handle, gdipGraphics, device.fontCollection, null, hFont);
+ long /*int*/[] hFont = new long /*int*/[1];
+ long /*int*/ gdipFont = createGdipFont(handle, font.handle, gdipGraphics, device.fontCollection, null, hFont);
if (hFont[0] != 0) OS.SelectObject(handle, hFont[0]);
if (data.hGDIFont != 0) OS.DeleteObject(data.hGDIFont);
data.hGDIFont = hFont[0];
@@ -315,7 +315,7 @@ void checkGC(int mask) {
}
if ((state & DRAW_OFFSET) != 0) {
data.gdipXOffset = data.gdipYOffset = 0;
- int /*long*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0);
+ long /*int*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0);
PointF point = new PointF();
point.X = point.Y = 1;
Gdip.Graphics_GetTransform(gdipGraphics, matrix);
@@ -379,7 +379,7 @@ void checkGC(int mask) {
* PS_SOLID for pens wider than 1 pixel created with CreatePen(). The fix
* is to use ExtCreatePen() instead.
*/
- int /*long*/ newPen;
+ long /*int*/ newPen;
if (OS.IsWinCE || (width == 0 && lineStyle != OS.PS_USERSTYLE) || style == 0) {
newPen = OS.CreatePen(style & OS.PS_STYLE_MASK, width, color);
} else {
@@ -402,7 +402,7 @@ void checkGC(int mask) {
data.state &= ~PEN;
}
if ((state & BACKGROUND) != 0) {
- int /*long*/ newBrush = OS.CreateSolidBrush(data.background);
+ long /*int*/ newBrush = OS.CreateSolidBrush(data.background);
OS.SelectObject(handle, newBrush);
data.state |= BRUSH;
data.state &= ~NULL_BRUSH;
@@ -450,8 +450,8 @@ public void copyArea(Image image, int x, int y) {
/* Copy the bitmap area */
Rectangle rect = image.getBounds();
- int /*long*/ memHdc = OS.CreateCompatibleDC(handle);
- int /*long*/ hOldBitmap = OS.SelectObject(memHdc, image.handle);
+ long /*int*/ memHdc = OS.CreateCompatibleDC(handle);
+ long /*int*/ hOldBitmap = OS.SelectObject(memHdc, image.handle);
OS.BitBlt(memHdc, 0, 0, rect.width, rect.height, handle, x, y, OS.SRCCOPY);
OS.SelectObject(memHdc, hOldBitmap);
OS.DeleteDC(memHdc);
@@ -501,12 +501,12 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d
* Feature in WinCE. The function WindowFromDC is not part of the
* WinCE SDK. The fix is to remember the HWND.
*/
- int /*long*/ hwnd = data.hwnd;
+ long /*int*/ hwnd = data.hwnd;
if (hwnd == 0) {
OS.BitBlt(handle, destX, destY, width, height, handle, srcX, srcY, OS.SRCCOPY);
} else {
RECT lprcClip = null;
- int /*long*/ hrgn = OS.CreateRectRgn(0, 0, 0, 0);
+ long /*int*/ hrgn = OS.CreateRectRgn(0, 0, 0, 0);
if (OS.GetClipRgn(handle, hrgn) == 1) {
lprcClip = new RECT();
OS.GetRgnBox(hrgn, lprcClip);
@@ -547,10 +547,10 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d
}
}
}
-static int /*long*/ createGdipFont(int /*long*/ hDC, int /*long*/ hFont, int /*long*/ graphics, int /*long*/ fontCollection, int /*long*/ [] outFamily, int /*long*/[] outFont) {
- int /*long*/ font = Gdip.Font_new(hDC, hFont);
+static long /*int*/ createGdipFont(long /*int*/ hDC, long /*int*/ hFont, long /*int*/ graphics, long /*int*/ fontCollection, long /*int*/ [] outFamily, long /*int*/[] outFont) {
+ long /*int*/ font = Gdip.Font_new(hDC, hFont);
if (font == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ family = 0;
+ long /*int*/ family = 0;
if (!Gdip.Font_IsAvailable(font)) {
Gdip.Font_delete(font);
LOGFONT logFont = OS.IsUnicode ? (LOGFONT)new LOGFONTW() : new LOGFONTA();
@@ -595,8 +595,8 @@ static int /*long*/ createGdipFont(int /*long*/ hDC, int /*long*/ hFont, int /*l
font = Gdip.Font_new(buffer, size, style, Gdip.UnitPixel, 0);
}
if (outFont != null && font != 0) {
- int /*long*/ hHeap = OS.GetProcessHeap();
- int /*long*/ pLogFont = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, LOGFONTW.sizeof);
+ long /*int*/ hHeap = OS.GetProcessHeap();
+ long /*int*/ pLogFont = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, LOGFONTW.sizeof);
Gdip.Font_GetLogFontW(font, graphics, pLogFont);
outFont[0] = OS.CreateFontIndirectW(pLogFont);
OS.HeapFree(hHeap, 0, pLogFont);
@@ -615,7 +615,7 @@ static int /*long*/ createGdipFont(int /*long*/ hDC, int /*long*/ hFont, int /*l
return font;
}
-static void destroyGdipBrush(int /*long*/ brush) {
+static void destroyGdipBrush(long /*int*/ brush) {
int type = Gdip.Brush_GetType(brush);
switch (type) {
case Gdip.BrushTypeSolidColor:
@@ -666,7 +666,7 @@ void destroy() {
* This will ensure that we have not left a bitmap
* selected in it when we delete the HDC.
*/
- int /*long*/ hNullBitmap = data.hNullBitmap;
+ long /*int*/ hNullBitmap = data.hNullBitmap;
if (hNullBitmap != 0) {
OS.SelectObject(handle, hNullBitmap);
data.hNullBitmap = 0;
@@ -737,15 +737,15 @@ public void drawArc (int x, int y, int width, int height, int startAngle, int ar
height = -height;
}
if (width == 0 || height == 0 || arcAngle == 0) return;
- int /*long*/ gdipGraphics = data.gdipGraphics;
+ long /*int*/ gdipGraphics = data.gdipGraphics;
if (gdipGraphics != 0) {
Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend);
if (width == height) {
Gdip.Graphics_DrawArc(gdipGraphics, data.gdipPen, x, y, width, height, -startAngle, -arcAngle);
} else {
- int /*long*/ path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate);
+ long /*int*/ path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate);
if (path == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ matrix = Gdip.Matrix_new(width, 0, 0, height, x, y);
+ long /*int*/ matrix = Gdip.Matrix_new(width, 0, 0, height, x, y);
if (matrix == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Gdip.GraphicsPath_AddArc(path, 0, 0, 1, 1, -startAngle, -arcAngle);
Gdip.GraphicsPath_Transform(path, matrix);
@@ -827,13 +827,13 @@ public void drawFocus (int x, int y, int width, int height) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if ((data.uiState & OS.UISF_HIDEFOCUS) != 0) return;
data.focusDrawn = true;
- int /*long*/ hdc = handle;
+ long /*int*/ hdc = handle;
int state = 0;
- int /*long*/ gdipGraphics = data.gdipGraphics;
+ long /*int*/ gdipGraphics = data.gdipGraphics;
if (gdipGraphics != 0) {
- int /*long*/ clipRgn = 0;
+ long /*int*/ clipRgn = 0;
Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeNone);
- int /*long*/ rgn = Gdip.Region_new();
+ long /*int*/ rgn = Gdip.Region_new();
if (rgn == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Gdip.Graphics_GetClip(gdipGraphics, rgn);
if (!Gdip.Region_IsInfinite(rgn, gdipGraphics)) {
@@ -842,7 +842,7 @@ public void drawFocus (int x, int y, int width, int height) {
Gdip.Region_delete(rgn);
Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeHalf);
float[] lpXform = null;
- int /*long*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0);
+ long /*int*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0);
if (matrix == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Gdip.Graphics_GetTransform(gdipGraphics, matrix);
if (!Gdip.Matrix_IsIdentity(matrix)) {
@@ -946,8 +946,8 @@ public void drawImage(Image image, int srcX, int srcY, int srcWidth, int srcHeig
void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple) {
if (data.gdipGraphics != 0) {
//TODO - cache bitmap
- int /*long*/ [] gdipImage = srcImage.createGdipImage();
- int /*long*/ img = gdipImage[0];
+ long /*int*/ [] gdipImage = srcImage.createGdipImage();
+ long /*int*/ img = gdipImage[0];
int imgWidth = Gdip.Image_GetWidth(img);
int imgHeight = Gdip.Image_GetHeight(img);
if (simple) {
@@ -970,7 +970,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
* Note that if the wrap mode is not WrapModeTileFlipXY, the scaled image
* is translucent around the borders.
*/
- int /*long*/ attrib = Gdip.ImageAttributes_new();
+ long /*int*/ attrib = Gdip.ImageAttributes_new();
Gdip.ImageAttributes_SetWrapMode(attrib, Gdip.WrapModeTileFlipXY);
if (data.alpha != 0xFF) {
float[] matrix = new float[]{
@@ -995,7 +995,7 @@ void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
Gdip.ImageAttributes_delete(attrib);
Gdip.Bitmap_delete(img);
if (gdipImage[1] != 0) {
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
OS.HeapFree(hHeap, 0, gdipImage[1]);
}
return;
@@ -1053,7 +1053,7 @@ void drawIcon(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, i
}
/* Get the icon width and height */
- int /*long*/ hBitmap = srcIconInfo.hbmColor;
+ long /*int*/ hBitmap = srcIconInfo.hbmColor;
if (hBitmap == 0) hBitmap = srcIconInfo.hbmMask;
BITMAP bm = new BITMAP();
OS.GetObject(hBitmap, BITMAP.sizeof, bm);
@@ -1082,20 +1082,20 @@ void drawIcon(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, i
/* Create the icon info and HDC's */
ICONINFO newIconInfo = new ICONINFO();
newIconInfo.fIcon = true;
- int /*long*/ srcHdc = OS.CreateCompatibleDC(handle);
- int /*long*/ dstHdc = OS.CreateCompatibleDC(handle);
+ long /*int*/ srcHdc = OS.CreateCompatibleDC(handle);
+ long /*int*/ dstHdc = OS.CreateCompatibleDC(handle);
/* Blt the color bitmap */
int srcColorY = srcY;
- int /*long*/ srcColor = srcIconInfo.hbmColor;
+ long /*int*/ srcColor = srcIconInfo.hbmColor;
if (srcColor == 0) {
srcColor = srcIconInfo.hbmMask;
srcColorY += iconHeight;
}
- int /*long*/ oldSrcBitmap = OS.SelectObject(srcHdc, srcColor);
+ long /*int*/ oldSrcBitmap = OS.SelectObject(srcHdc, srcColor);
newIconInfo.hbmColor = OS.CreateCompatibleBitmap(srcHdc, destWidth, destHeight);
if (newIconInfo.hbmColor == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ oldDestBitmap = OS.SelectObject(dstHdc, newIconInfo.hbmColor);
+ long /*int*/ oldDestBitmap = OS.SelectObject(dstHdc, newIconInfo.hbmColor);
boolean stretch = !simple && (srcWidth != destWidth || srcHeight != destHeight);
if (stretch) {
if (!OS.IsWinCE) OS.SetStretchBltMode(dstHdc, OS.COLORONCOLOR);
@@ -1124,7 +1124,7 @@ void drawIcon(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, i
} else {
OS.SelectObject(srcHdc, oldSrcBitmap);
OS.SelectObject(dstHdc, oldDestBitmap);
- int /*long*/ hIcon = OS.CreateIconIndirect(newIconInfo);
+ long /*int*/ hIcon = OS.CreateIconIndirect(newIconInfo);
if (hIcon == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (offsetX != 0 || offsetY != 0) OS.SetWindowOrgEx(handle, 0, 0, null);
OS.DrawIconEx(handle, destX - offsetX, destY - offsetY, hIcon, destWidth, destHeight, 0, 0, flags);
@@ -1184,7 +1184,7 @@ void drawBitmap(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight,
drawBitmap(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, bm, imgWidth, imgHeight);
}
if (mustRestore) {
- int /*long*/ hOldBitmap = OS.SelectObject(memGC.handle, srcImage.handle);
+ long /*int*/ hOldBitmap = OS.SelectObject(memGC.handle, srcImage.handle);
memGC.data.hNullBitmap = hOldBitmap;
}
}
@@ -1212,16 +1212,16 @@ void drawBitmapAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHe
if (alphaBlendSupport) {
BLENDFUNCTION blend = new BLENDFUNCTION();
blend.BlendOp = OS.AC_SRC_OVER;
- int /*long*/ srcHdc = OS.CreateCompatibleDC(handle);
- int /*long*/ oldSrcBitmap = OS.SelectObject(srcHdc, srcImage.handle);
+ long /*int*/ srcHdc = OS.CreateCompatibleDC(handle);
+ long /*int*/ oldSrcBitmap = OS.SelectObject(srcHdc, srcImage.handle);
if (srcImage.alpha != -1) {
blend.SourceConstantAlpha = (byte)srcImage.alpha;
OS.AlphaBlend(handle, destX, destY, destWidth, destHeight, srcHdc, srcX, srcY, srcWidth, srcHeight, blend);
} else {
- int /*long*/ memDib = Image.createDIB(srcWidth, srcHeight, 32);
+ long /*int*/ memDib = Image.createDIB(srcWidth, srcHeight, 32);
if (memDib == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ memHdc = OS.CreateCompatibleDC(handle);
- int /*long*/ oldMemBitmap = OS.SelectObject(memHdc, memDib);
+ long /*int*/ memHdc = OS.CreateCompatibleDC(handle);
+ long /*int*/ oldMemBitmap = OS.SelectObject(memHdc, memDib);
BITMAP dibBM = new BITMAP();
OS.GetObject(memDib, BITMAP.sizeof, dibBM);
OS.BitBlt(memHdc, 0, 0, srcWidth, srcHeight, srcHdc, srcX, srcY, OS.SRCCOPY);
@@ -1283,12 +1283,12 @@ void drawBitmapAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHe
srcHeight = Math.max(1, sy2 - sy1);
/* Create resources */
- int /*long*/ srcHdc = OS.CreateCompatibleDC(handle);
- int /*long*/ oldSrcBitmap = OS.SelectObject(srcHdc, srcImage.handle);
- int /*long*/ memHdc = OS.CreateCompatibleDC(handle);
- int /*long*/ memDib = Image.createDIB(Math.max(srcWidth, destWidth), Math.max(srcHeight, destHeight), 32);
+ long /*int*/ srcHdc = OS.CreateCompatibleDC(handle);
+ long /*int*/ oldSrcBitmap = OS.SelectObject(srcHdc, srcImage.handle);
+ long /*int*/ memHdc = OS.CreateCompatibleDC(handle);
+ long /*int*/ memDib = Image.createDIB(Math.max(srcWidth, destWidth), Math.max(srcHeight, destHeight), 32);
if (memDib == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ oldMemBitmap = OS.SelectObject(memHdc, memDib);
+ long /*int*/ oldMemBitmap = OS.SelectObject(memHdc, memDib);
BITMAP dibBM = new BITMAP();
OS.GetObject(memDib, BITMAP.sizeof, dibBM);
@@ -1334,10 +1334,10 @@ void drawBitmapAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHe
* Note that this also fails when drawing to a printer.
*/
if ((OS.IsWinCE && (destWidth > srcWidth || destHeight > srcHeight)) || (!OS.IsWinNT && !OS.IsWinCE) || isPrinter) {
- int /*long*/ tempHdc = OS.CreateCompatibleDC(handle);
- int /*long*/ tempDib = Image.createDIB(destWidth, destHeight, 32);
+ long /*int*/ tempHdc = OS.CreateCompatibleDC(handle);
+ long /*int*/ tempDib = Image.createDIB(destWidth, destHeight, 32);
if (tempDib == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ oldTempBitmap = OS.SelectObject(tempHdc, tempDib);
+ long /*int*/ oldTempBitmap = OS.SelectObject(tempHdc, tempDib);
if (!simple && (srcWidth != destWidth || srcHeight != destHeight)) {
if (!OS.IsWinCE) OS.SetStretchBltMode(memHdc, OS.COLORONCOLOR);
OS.StretchBlt(tempHdc, 0, 0, destWidth, destHeight, memHdc, 0, 0, srcWidth, srcHeight, OS.SRCCOPY);
@@ -1384,13 +1384,13 @@ void drawBitmapAlpha(Image srcImage, int srcX, int srcY, int srcWidth, int srcHe
OS.DeleteDC(srcHdc);
}
-void drawBitmapTransparentByClipping(int /*long*/ srcHdc, int /*long*/ maskHdc, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple, int imgWidth, int imgHeight) {
+void drawBitmapTransparentByClipping(long /*int*/ srcHdc, long /*int*/ maskHdc, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple, int imgWidth, int imgHeight) {
/* Create a clipping region from the mask */
- int /*long*/ rgn = OS.CreateRectRgn(0, 0, 0, 0);
+ long /*int*/ rgn = OS.CreateRectRgn(0, 0, 0, 0);
for (int y=0; y naw) {
if (nh > nah) {
@@ -2140,7 +2140,7 @@ public void drawString (String string, int x, int y, boolean isTransparent) {
if (length == 0) return;
char[] buffer = new char [length];
string.getChars(0, length, buffer, 0);
- int /*long*/ gdipGraphics = data.gdipGraphics;
+ long /*int*/ gdipGraphics = data.gdipGraphics;
if (gdipGraphics != 0) {
checkGC(FONT | FOREGROUND | (isTransparent ? 0 : BACKGROUND));
drawText(gdipGraphics, string, x, y, isTransparent ? SWT.DRAW_TRANSPARENT : 0, null);
@@ -2181,10 +2181,10 @@ public void drawString (String string, int x, int y, boolean isTransparent) {
OS.GetTextExtentPoint32W(handle, buffer, length, size);
}
int width = size.cx, height = size.cy;
- int /*long*/ hBitmap = OS.CreateCompatibleBitmap(handle, width, height);
+ long /*int*/ hBitmap = OS.CreateCompatibleBitmap(handle, width, height);
if (hBitmap == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ memDC = OS.CreateCompatibleDC(handle);
- int /*long*/ hOldBitmap = OS.SelectObject(memDC, hBitmap);
+ long /*int*/ memDC = OS.CreateCompatibleDC(handle);
+ long /*int*/ hOldBitmap = OS.SelectObject(memDC, hBitmap);
OS.PatBlt(memDC, 0, 0, width, height, OS.BLACKNESS);
OS.SetBkMode(memDC, OS.TRANSPARENT);
OS.SetTextColor(memDC, foreground);
@@ -2290,7 +2290,7 @@ public void drawText (String string, int x, int y, int flags) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (string.length() == 0) return;
- int /*long*/ gdipGraphics = data.gdipGraphics;
+ long /*int*/ gdipGraphics = data.gdipGraphics;
if (gdipGraphics != 0) {
checkGC(FONT | FOREGROUND | ((flags & SWT.DRAW_TRANSPARENT) != 0 ? 0 : BACKGROUND));
drawText(gdipGraphics, string, x, y, flags, null);
@@ -2336,10 +2336,10 @@ public void drawText (String string, int x, int y, int flags) {
OS.DrawText(handle, buffer, buffer.length(), rect, uFormat | OS.DT_CALCRECT);
int width = rect.right - rect.left;
int height = rect.bottom - rect.top;
- int /*long*/ hBitmap = OS.CreateCompatibleBitmap(handle, width, height);
+ long /*int*/ hBitmap = OS.CreateCompatibleBitmap(handle, width, height);
if (hBitmap == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ memDC = OS.CreateCompatibleDC(handle);
- int /*long*/ hOldBitmap = OS.SelectObject(memDC, hBitmap);
+ long /*int*/ memDC = OS.CreateCompatibleDC(handle);
+ long /*int*/ hOldBitmap = OS.SelectObject(memDC, hBitmap);
OS.PatBlt(memDC, 0, 0, width, height, OS.BLACKNESS);
OS.SetBkMode(memDC, OS.TRANSPARENT);
OS.SetTextColor(memDC, foreground);
@@ -2360,7 +2360,7 @@ public void drawText (String string, int x, int y, int flags) {
OS.SetBkMode(handle, oldBkMode);
}
-boolean useGDIP (int /*long*/ hdc, char[] buffer) {
+boolean useGDIP (long /*int*/ hdc, char[] buffer) {
if (OS.IsWinCE || !OS.IsUnicode) return false;
short[] glyphs = new short[buffer.length];
OS.GetGlyphIndicesW(hdc, buffer, buffer.length, glyphs, OS.GGI_MARK_NONEXISTING_GLYPHS);
@@ -2379,14 +2379,14 @@ boolean useGDIP (int /*long*/ hdc, char[] buffer) {
return false;
}
-void drawText(int /*long*/ gdipGraphics, String string, int x, int y, int flags, Point size) {
+void drawText(long /*int*/ gdipGraphics, String string, int x, int y, int flags, Point size) {
int length = string.length();
char[] chars = new char [length];
string.getChars(0, length, chars, 0);
- int /*long*/ hdc = Gdip.Graphics_GetHDC(gdipGraphics);
- int /*long*/ hFont = data.hGDIFont;
+ long /*int*/ hdc = Gdip.Graphics_GetHDC(gdipGraphics);
+ long /*int*/ hFont = data.hGDIFont;
if (hFont == 0 && data.font != null) hFont = data.font.handle;
- int /*long*/ oldFont = 0;
+ long /*int*/ oldFont = 0;
if (hFont != 0) oldFont = OS.SelectObject(hdc, hFont);
TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW() : new TEXTMETRICA();
OS.GetTextMetrics(hdc, lptm);
@@ -2450,7 +2450,7 @@ void drawText(int /*long*/ gdipGraphics, String string, int x, int y, int flags,
}
}
-RectF drawText(int /*long*/ gdipGraphics, char[] buffer, int start, int length, int x, int y, int flags, int mnemonicIndex, TEXTMETRIC lptm, boolean draw) {
+RectF drawText(long /*int*/ gdipGraphics, char[] buffer, int start, int length, int x, int y, int flags, int mnemonicIndex, TEXTMETRIC lptm, boolean draw) {
boolean drawMnemonic = draw && mnemonicIndex != -1 && (data.uiState & OS.UISF_HIDEACCEL) == 0;
boolean needsBounds = !draw || drawMnemonic || (flags & SWT.DRAW_TRANSPARENT) == 0 || (data.style & SWT.MIRRORED) != 0 || (flags & SWT.DRAW_DELIMITER) != 0;
if (length <= 0) {
@@ -2465,18 +2465,18 @@ RectF drawText(int /*long*/ gdipGraphics, char[] buffer, int start, int length,
GCP_RESULTS result = new GCP_RESULTS();
result.lStructSize = GCP_RESULTS.sizeof;
result.nGlyphs = nGlyphs;
- int /*long*/ hHeap = OS.GetProcessHeap();
- int /*long*/ lpDx = result.lpDx = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, nGlyphs * 4);
- int /*long*/ lpGlyphs = result.lpGlyphs = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, nGlyphs * 2);
- int /*long*/ lpOrder = 0;
+ long /*int*/ hHeap = OS.GetProcessHeap();
+ long /*int*/ lpDx = result.lpDx = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, nGlyphs * 4);
+ long /*int*/ lpGlyphs = result.lpGlyphs = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, nGlyphs * 2);
+ long /*int*/ lpOrder = 0;
int dwFlags = OS.GCP_GLYPHSHAPE | OS.GCP_REORDER | OS.GCP_LIGATE;
if (drawMnemonic) {
lpOrder = result.lpOrder = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, nGlyphs * 4);
}
- int /*long*/ hdc = Gdip.Graphics_GetHDC(gdipGraphics);
- int /*long*/ hFont = data.hGDIFont;
+ long /*int*/ hdc = Gdip.Graphics_GetHDC(gdipGraphics);
+ long /*int*/ hFont = data.hGDIFont;
if (hFont == 0 && data.font != null) hFont = data.font.handle;
- int /*long*/ oldFont = 0;
+ long /*int*/ oldFont = 0;
if (hFont != 0) oldFont = OS.SelectObject(hdc, hFont);
if (start != 0) {
char[] temp = new char[length];
@@ -2508,7 +2508,7 @@ RectF drawText(int /*long*/ gdipGraphics, char[] buffer, int start, int length,
Gdip.Graphics_FillRectangle(gdipGraphics, data.gdipBrush, x, y, (int)Math.ceil(bounds.Width), (int)Math.ceil(bounds.Height));
}
int gstate = 0;
- int /*long*/ brush = getFgBrush();
+ long /*int*/ brush = getFgBrush();
if ((data.style & SWT.MIRRORED) != 0) {
switch (Gdip.Brush_GetType(brush)) {
case Gdip.BrushTypeLinearGradient:
@@ -2537,7 +2537,7 @@ RectF drawText(int /*long*/ gdipGraphics, char[] buffer, int start, int length,
Gdip.Graphics_Restore(gdipGraphics, gstate);
}
if (drawMnemonic) {
- int /*long*/ pen = Gdip.Pen_new(brush, 1);
+ long /*int*/ pen = Gdip.Pen_new(brush, 1);
if (pen != 0) {
int[] order = new int[1];
OS.MoveMemory(order, result.lpOrder + mnemonicIndex * 4, 4);
@@ -2564,7 +2564,7 @@ RectF drawText(int /*long*/ gdipGraphics, char[] buffer, int start, int length,
return bounds;
}
-void drawTextGDIP(int /*long*/ gdipGraphics, String string, int x, int y, int flags, boolean draw, Point size) {
+void drawTextGDIP(long /*int*/ gdipGraphics, String string, int x, int y, int flags, boolean draw, Point size) {
boolean needsBounds = !draw || (flags & SWT.DRAW_TRANSPARENT) == 0;
char[] buffer;
int length = string.length();
@@ -2576,7 +2576,7 @@ void drawTextGDIP(int /*long*/ gdipGraphics, String string, int x, int y, int fl
buffer = new char[]{' '};
}
PointF pt = new PointF();
- int /*long*/ format = Gdip.StringFormat_Clone(Gdip.StringFormat_GenericTypographic());
+ long /*int*/ format = Gdip.StringFormat_Clone(Gdip.StringFormat_GenericTypographic());
int formatFlags = Gdip.StringFormat_GetFormatFlags(format) | Gdip.StringFormatFlagsMeasureTrailingSpaces;
if ((data.style & SWT.MIRRORED) != 0) formatFlags |= Gdip.StringFormatFlagsDirectionRightToLeft;
Gdip.StringFormat_SetFormatFlags(format, formatFlags);
@@ -2595,7 +2595,7 @@ void drawTextGDIP(int /*long*/ gdipGraphics, String string, int x, int y, int fl
Gdip.Graphics_FillRectangle(gdipGraphics, data.gdipBrush, x, y, (int)Math.ceil(bounds.Width), (int)Math.ceil(bounds.Height));
}
int gstate = 0;
- int /*long*/ brush = getFgBrush();
+ long /*int*/ brush = getFgBrush();
if ((data.style & SWT.MIRRORED) != 0) {
switch (Gdip.Brush_GetType(brush)) {
case Gdip.BrushTypeLinearGradient:
@@ -2692,7 +2692,7 @@ public void fillArc (int x, int y, int width, int height, int startAngle, int ar
height = -height;
}
if (width == 0 || height == 0 || arcAngle == 0) return;
- int /*long*/ gdipGraphics = data.gdipGraphics;
+ long /*int*/ gdipGraphics = data.gdipGraphics;
if (gdipGraphics != 0) {
if (width == height) {
Gdip.Graphics_FillPie(gdipGraphics, data.gdipBrush, x, y, width, height, -startAngle, -arcAngle);
@@ -2823,12 +2823,12 @@ public void fillGradientRectangle(int x, int y, int width, int height, boolean v
p2.Y = p1.Y;
}
int rgb = ((fromRGB.red & 0xFF) << 16) | ((fromRGB.green & 0xFF) << 8) | (fromRGB.blue & 0xFF);
- int /*long*/ fromGpColor = Gdip.Color_new(data.alpha << 24 | rgb);
+ long /*int*/ fromGpColor = Gdip.Color_new(data.alpha << 24 | rgb);
if (fromGpColor == 0) SWT.error(SWT.ERROR_NO_HANDLES);
rgb = ((toRGB.red & 0xFF) << 16) | ((toRGB.green & 0xFF) << 8) | (toRGB.blue & 0xFF);
- int /*long*/ toGpColor = Gdip.Color_new(data.alpha << 24 | rgb);
+ long /*int*/ toGpColor = Gdip.Color_new(data.alpha << 24 | rgb);
if (toGpColor == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ brush = Gdip.LinearGradientBrush_new(p1, p2, fromGpColor, toGpColor);
+ long /*int*/ brush = Gdip.LinearGradientBrush_new(p1, p2, fromGpColor, toGpColor);
Gdip.Graphics_FillRectangle(data.gdipGraphics, brush, x, y, width, height);
Gdip.LinearGradientBrush_delete(brush);
Gdip.Color_delete(fromGpColor);
@@ -2852,10 +2852,10 @@ public void fillGradientRectangle(int x, int y, int width, int height, boolean v
rop2 = OS.GetROP2(handle);
}
if (OS.IsWinNT && rop2 != OS.R2_XORPEN && OS.GetDeviceCaps(handle, OS.TECHNOLOGY) != OS.DT_RASPRINTER) {
- final int /*long*/ hHeap = OS.GetProcessHeap();
- final int /*long*/ pMesh = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, GRADIENT_RECT.sizeof + TRIVERTEX.sizeof * 2);
+ final long /*int*/ hHeap = OS.GetProcessHeap();
+ final long /*int*/ pMesh = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, GRADIENT_RECT.sizeof + TRIVERTEX.sizeof * 2);
if (pMesh == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- final int /*long*/ pVertex = pMesh + GRADIENT_RECT.sizeof;
+ final long /*int*/ pVertex = pMesh + GRADIENT_RECT.sizeof;
GRADIENT_RECT gradientRect = new GRADIENT_RECT();
gradientRect.UpperLeft = 0;
@@ -3082,7 +3082,7 @@ public void fillRoundRectangle (int x, int y, int width, int height, int arcWidt
OS.RoundRect(handle, x,y,x+width+1,y+height+1,arcWidth, arcHeight);
}
-void fillRoundRectangleGdip (int /*long*/ gdipGraphics, int /*long*/ brush, int x, int y, int width, int height, int arcWidth, int arcHeight) {
+void fillRoundRectangleGdip (long /*int*/ gdipGraphics, long /*int*/ brush, int x, int y, int width, int height, int arcWidth, int arcHeight) {
int nx = x;
int ny = y;
int nw = width;
@@ -3106,7 +3106,7 @@ void fillRoundRectangleGdip (int /*long*/ gdipGraphics, int /*long*/ brush, int
if (naw == 0 || nah == 0) {
Gdip.Graphics_FillRectangle(data.gdipGraphics, data.gdipBrush, x, y, width, height);
} else {
- int /*long*/ path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate);
+ long /*int*/ path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate);
if (path == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (nw > naw) {
if (nh > nah) {
@@ -3140,7 +3140,7 @@ void flush () {
* underline HDC. This is done by calling GetHDC()
* followed by ReleaseHDC().
*/
- int /*long*/ hdc = Gdip.Graphics_GetHDC(data.gdipGraphics);
+ long /*int*/ hdc = Gdip.Graphics_GetHDC(data.gdipGraphics);
Gdip.Graphics_ReleaseHDC(data.gdipGraphics, hdc);
}
}
@@ -3344,7 +3344,7 @@ public int getCharWidth(char ch) {
*/
public Rectangle getClipping() {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
- int /*long*/ gdipGraphics = data.gdipGraphics;
+ long /*int*/ gdipGraphics = data.gdipGraphics;
if (gdipGraphics != 0) {
Rect rect = new Rect();
Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeNone);
@@ -3375,9 +3375,9 @@ public void getClipping (Region region) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (region == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
if (region.isDisposed()) SWT.error (SWT.ERROR_INVALID_ARGUMENT);
- int /*long*/ gdipGraphics = data.gdipGraphics;
+ long /*int*/ gdipGraphics = data.gdipGraphics;
if (gdipGraphics != 0) {
- int /*long*/ rgn = Gdip.Region_new();
+ long /*int*/ rgn = Gdip.Region_new();
Gdip.Graphics_GetClip(data.gdipGraphics, rgn);
if (Gdip.Region_IsInfinite(rgn, gdipGraphics)) {
Rect rect = new Rect();
@@ -3386,11 +3386,11 @@ public void getClipping (Region region) {
Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeHalf);
OS.SetRectRgn(region.handle, rect.X, rect.Y, rect.X + rect.Width, rect.Y + rect.Height);
} else {
- int /*long*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0);
- int /*long*/ identity = Gdip.Matrix_new(1, 0, 0, 1, 0, 0);
+ long /*int*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0);
+ long /*int*/ identity = Gdip.Matrix_new(1, 0, 0, 1, 0, 0);
Gdip.Graphics_GetTransform(gdipGraphics, matrix);
Gdip.Graphics_SetTransform(gdipGraphics, identity);
- int /*long*/ hRgn = Gdip.Region_GetHRGN(rgn, data.gdipGraphics);
+ long /*int*/ hRgn = Gdip.Region_GetHRGN(rgn, data.gdipGraphics);
Gdip.Graphics_SetTransform(gdipGraphics, matrix);
Gdip.Matrix_delete(identity);
Gdip.Matrix_delete(matrix);
@@ -3416,22 +3416,22 @@ public void getClipping (Region region) {
OS.OffsetRgn (region.handle, pt.x, pt.y);
}
if (!OS.IsWinCE) {
- int /*long*/ metaRgn = OS.CreateRectRgn (0, 0, 0, 0);
+ long /*int*/ metaRgn = OS.CreateRectRgn (0, 0, 0, 0);
if (OS.GetMetaRgn (handle, metaRgn) != 0) {
OS.OffsetRgn (metaRgn, pt.x, pt.y);
OS.CombineRgn (region.handle, metaRgn, region.handle, OS.RGN_AND);
}
OS.DeleteObject(metaRgn);
- int /*long*/ hwnd = data.hwnd;
+ long /*int*/ hwnd = data.hwnd;
if (hwnd != 0 && data.ps != null) {
- int /*long*/ sysRgn = OS.CreateRectRgn (0, 0, 0, 0);
+ long /*int*/ sysRgn = OS.CreateRectRgn (0, 0, 0, 0);
if (OS.GetRandomRgn (handle, sysRgn, OS.SYSRGN) == 1) {
if (OS.WIN32_VERSION >= OS.VERSION(4, 10)) {
if ((OS.GetLayout(handle) & OS.LAYOUT_RTL) != 0) {
int nBytes = OS.GetRegionData (sysRgn, 0, null);
int [] lpRgnData = new int [nBytes / 4];
OS.GetRegionData (sysRgn, nBytes, lpRgnData);
- int /*long*/ newSysRgn = OS.ExtCreateRegion(new float [] {-1, 0, 0, 1, 0, 0}, nBytes, lpRgnData);
+ long /*int*/ newSysRgn = OS.ExtCreateRegion(new float [] {-1, 0, 0, 1, 0, 0}, nBytes, lpRgnData);
OS.DeleteObject(sysRgn);
sysRgn = newSysRgn;
}
@@ -3455,7 +3455,7 @@ int getCodePage () {
return lpCs[1];
}
-int /*long*/ getFgBrush() {
+long /*int*/ getFgBrush() {
return data.foregroundPattern != null ? data.foregroundPattern.handle : data.gdipFgBrush;
}
@@ -3790,10 +3790,10 @@ public void getTransform(Transform transform) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (transform == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
- int /*long*/ gdipGraphics = data.gdipGraphics;
+ long /*int*/ gdipGraphics = data.gdipGraphics;
if (gdipGraphics != 0) {
Gdip.Graphics_GetTransform(gdipGraphics, transform.handle);
- int /*long*/ identity = identity();
+ long /*int*/ identity = identity();
Gdip.Matrix_Invert(identity);
Gdip.Matrix_Multiply(transform.handle, identity, Gdip.MatrixOrderAppend);
Gdip.Matrix_delete(identity);
@@ -3830,7 +3830,7 @@ public boolean getXORMode() {
void initGdip() {
data.device.checkGDIP();
- int /*long*/ gdipGraphics = data.gdipGraphics;
+ long /*int*/ gdipGraphics = data.gdipGraphics;
if (gdipGraphics != 0) return;
/*
* Feature in GDI+. The GDI+ clipping set with Graphics->SetClip()
@@ -3839,7 +3839,7 @@ void initGdip() {
* cannot be reset. The fix is to clear the clipping before
* the GDI+ graphics is created and reset it afterwards.
*/
- int /*long*/ hRgn = OS.CreateRectRgn(0, 0, 0, 0);
+ long /*int*/ hRgn = OS.CreateRectRgn(0, 0, 0, 0);
int result = OS.GetClipRgn(handle, hRgn);
if (!OS.IsWinCE) {
POINT pt = new POINT ();
@@ -3864,7 +3864,7 @@ void initGdip() {
Gdip.Graphics_SetPageUnit(gdipGraphics, Gdip.UnitPixel);
Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeHalf);
if ((data.style & SWT.MIRRORED) != 0) {
- int /*long*/ matrix = identity();
+ long /*int*/ matrix = identity();
Gdip.Graphics_SetTransform(gdipGraphics, matrix);
Gdip.Matrix_delete(matrix);
}
@@ -3883,7 +3883,7 @@ void initGdip() {
}
}
-int /*long*/ identity() {
+long /*int*/ identity() {
if ((data.style & SWT.MIRRORED) != 0) {
int width = 0;
int technology = OS.GetDeviceCaps(handle, OS.TECHNOLOGY);
@@ -3896,13 +3896,13 @@ int /*long*/ identity() {
OS.GetObject(image.handle, BITMAP.sizeof, bm);
width = bm.bmWidth;
} else {
- int /*long*/ hwnd = OS.IsWinCE ? data.hwnd : OS.WindowFromDC(handle);
+ long /*int*/ hwnd = OS.IsWinCE ? data.hwnd : OS.WindowFromDC(handle);
if (hwnd != 0) {
RECT rect = new RECT();
OS.GetClientRect(hwnd, rect);
width = rect.right - rect.left;
} else {
- int /*long*/ hBitmap = OS.GetCurrentObject(handle, OS.OBJ_BITMAP);
+ long /*int*/ hBitmap = OS.GetCurrentObject(handle, OS.OBJ_BITMAP);
BITMAP bm = new BITMAP();
OS.GetObject(hBitmap, BITMAP.sizeof, bm);
width = bm.bmWidth;
@@ -3916,7 +3916,7 @@ int /*long*/ identity() {
return Gdip.Matrix_new(1, 0, 0, 1, 0, 0);
}
-void init(Drawable drawable, GCData data, int /*long*/ hDC) {
+void init(Drawable drawable, GCData data, long /*int*/ hDC) {
int foreground = data.foreground;
if (foreground != -1) {
data.state &= ~(FOREGROUND | FOREGROUND_TEXT | PEN);
@@ -3936,7 +3936,7 @@ void init(Drawable drawable, GCData data, int /*long*/ hDC) {
} else {
data.font = Font.win32_new(device, OS.GetCurrentObject(hDC, OS.OBJ_FONT));
}
- int /*long*/ hPalette = data.device.hPalette;
+ long /*int*/ hPalette = data.device.hPalette;
if (hPalette != 0) {
OS.SelectPalette(hDC, hPalette, true);
OS.RealizePalette(hDC);
@@ -3996,15 +3996,15 @@ public int hashCode () {
*/
public boolean isClipped() {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
- int /*long*/ gdipGraphics = data.gdipGraphics;
+ long /*int*/ gdipGraphics = data.gdipGraphics;
if (gdipGraphics != 0) {
- int /*long*/ rgn = Gdip.Region_new();
+ long /*int*/ rgn = Gdip.Region_new();
Gdip.Graphics_GetClip(data.gdipGraphics, rgn);
boolean isInfinite = Gdip.Region_IsInfinite(rgn, gdipGraphics);
Gdip.Region_delete(rgn);
return !isInfinite;
}
- int /*long*/ region = OS.CreateRectRgn(0, 0, 0, 0);
+ long /*int*/ region = OS.CreateRectRgn(0, 0, 0, 0);
int result = OS.GetClipRgn(handle, region);
OS.DeleteObject(region);
return result > 0;
@@ -4024,7 +4024,7 @@ public boolean isDisposed() {
return handle == 0;
}
-float measureSpace(int /*long*/ font, int /*long*/ format) {
+float measureSpace(long /*int*/ font, long /*int*/ format) {
PointF pt = new PointF();
RectF bounds = new RectF();
Gdip.Graphics_MeasureString(data.gdipGraphics, new char[]{' '}, 1, font, pt, format, bounds);
@@ -4228,12 +4228,12 @@ public void setBackgroundPattern (Pattern pattern) {
data.state &= ~BACKGROUND;
}
-void setClipping(int /*long*/ clipRgn) {
- int /*long*/ hRgn = clipRgn;
- int /*long*/ gdipGraphics = data.gdipGraphics;
+void setClipping(long /*int*/ clipRgn) {
+ long /*int*/ hRgn = clipRgn;
+ long /*int*/ gdipGraphics = data.gdipGraphics;
if (gdipGraphics != 0) {
if (hRgn != 0) {
- int /*long*/ region = Gdip.Region_new(hRgn);
+ long /*int*/ region = Gdip.Region_new(hRgn);
Gdip.Graphics_SetClip(gdipGraphics, region, Gdip.CombineModeReplace);
Gdip.Region_delete(region);
} else {
@@ -4269,7 +4269,7 @@ void setClipping(int /*long*/ clipRgn) {
*/
public void setClipping (int x, int y, int width, int height) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
- int /*long*/ hRgn = OS.CreateRectRgn(x, y, x + width, y + height);
+ long /*int*/ hRgn = OS.CreateRectRgn(x, y, x + width, y + height);
setClipping(hRgn);
OS.DeleteObject(hRgn);
}
@@ -4898,7 +4898,7 @@ public void setTransform(Transform transform) {
if (transform != null && transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
if (data.gdipGraphics == 0 && transform == null) return;
initGdip();
- int /*long*/ identity = identity();
+ long /*int*/ identity = identity();
if (transform != null) {
Gdip.Matrix_Multiply(identity, transform.handle, Gdip.MatrixOrderPrepend);
}
@@ -4931,7 +4931,7 @@ public Point stringExtent(String string) {
if (string == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
checkGC(FONT);
int length = string.length();
- int /*long*/ gdipGraphics = data.gdipGraphics;
+ long /*int*/ gdipGraphics = data.gdipGraphics;
if (gdipGraphics != 0) {
Point size = new Point(0, 0);
drawText(gdipGraphics, string, 0, 0, 0, size);
@@ -5009,7 +5009,7 @@ public Point textExtent(String string, int flags) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (string == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
checkGC(FONT);
- int /*long*/ gdipGraphics = data.gdipGraphics;
+ long /*int*/ gdipGraphics = data.gdipGraphics;
if (gdipGraphics != 0) {
Point size = new Point(0, 0);
drawText(gdipGraphics, string, 0, 0, flags, size);
@@ -5061,7 +5061,7 @@ public String toString () {
*/
public static GC win32_new(Drawable drawable, GCData data) {
GC gc = new GC();
- int /*long*/ hDC = drawable.internal_new_GC(data);
+ long /*int*/ hDC = drawable.internal_new_GC(data);
gc.device = data.device;
gc.init(drawable, data, hDC);
return gc;
@@ -5084,7 +5084,7 @@ public static GC win32_new(Drawable drawable, GCData data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public static GC win32_new(int /*long*/ hDC, GCData data) {
+public static GC win32_new(long /*int*/ hDC, GCData data) {
GC gc = new GC();
gc.device = data.device;
data.style |= SWT.LEFT_TO_RIGHT;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java
index 8ccb803401..fa4c631e4f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java
@@ -45,19 +45,19 @@ public final class GCData {
public int alpha = 0xFF;
public Image image;
- public int /*long*/ hPen, hOldPen;
- public int /*long*/ hBrush, hOldBrush;
- public int /*long*/ hNullBitmap;
- public int /*long*/ hwnd;
+ public long /*int*/ hPen, hOldPen;
+ public long /*int*/ hBrush, hOldBrush;
+ public long /*int*/ hNullBitmap;
+ public long /*int*/ hwnd;
public PAINTSTRUCT ps;
public int layout = -1;
- public int /*long*/ gdipGraphics;
- public int /*long*/ gdipPen;
- public int /*long*/ gdipBrush;
- public int /*long*/ gdipFgBrush;
- public int /*long*/ gdipBgBrush;
- public int /*long*/ gdipFont;
- public int /*long*/ hGDIFont;
+ public long /*int*/ gdipGraphics;
+ public long /*int*/ gdipPen;
+ public long /*int*/ gdipBrush;
+ public long /*int*/ gdipFgBrush;
+ public long /*int*/ gdipBgBrush;
+ public long /*int*/ gdipFont;
+ public long /*int*/ hGDIFont;
public float gdipXOffset, gdipYOffset;
public int uiState = 0;
public boolean focusDrawn;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java
index 25997c9183..dca9e8a368 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java
@@ -96,7 +96,7 @@ public final class Image extends Resource implements Drawable {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
/**
* specifies the transparent pixel
@@ -225,17 +225,17 @@ public Image(Device device, Image srcImage, int flag) {
switch (type) {
case SWT.BITMAP:
/* Get the HDC for the device */
- int /*long*/ hDC = device.internal_new_GC(null);
+ long /*int*/ hDC = device.internal_new_GC(null);
/* Copy the bitmap */
- int /*long*/ hdcSource = OS.CreateCompatibleDC(hDC);
- int /*long*/ hdcDest = OS.CreateCompatibleDC(hDC);
- int /*long*/ hOldSrc = OS.SelectObject(hdcSource, srcImage.handle);
+ long /*int*/ hdcSource = OS.CreateCompatibleDC(hDC);
+ long /*int*/ hdcDest = OS.CreateCompatibleDC(hDC);
+ long /*int*/ hOldSrc = OS.SelectObject(hdcSource, srcImage.handle);
BITMAP bm = new BITMAP();
OS.GetObject(srcImage.handle, BITMAP.sizeof, bm);
handle = OS.CreateCompatibleBitmap(hdcSource, rect.width, bm.bmBits != 0 ? -rect.height : rect.height);
if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ hOldDest = OS.SelectObject(hdcDest, handle);
+ long /*int*/ hOldDest = OS.SelectObject(hdcDest, handle);
OS.BitBlt(hdcDest, 0, 0, rect.width, rect.height, hdcSource, 0, 0, OS.SRCCOPY);
OS.SelectObject(hdcSource, hOldSrc);
OS.SelectObject(hdcDest, hOldDest);
@@ -604,14 +604,14 @@ void initNative(String filename) {
int length = filename.length();
char[] chars = new char[length+1];
filename.getChars(0, length, chars, 0);
- int /*long*/ bitmap = Gdip.Bitmap_new(chars, false);
+ long /*int*/ bitmap = Gdip.Bitmap_new(chars, false);
if (bitmap != 0) {
int error = SWT.ERROR_NO_HANDLES;
int status = Gdip.Image_GetLastStatus(bitmap);
if (status == 0) {
if (filename.toLowerCase().endsWith(".ico")) {
this.type = SWT.ICON;
- int /*long*/[] hicon = new int /*long*/[1];
+ long /*int*/[] hicon = new long /*int*/[1];
status = Gdip.Bitmap_GetHICON(bitmap, hicon);
this.handle = hicon[0];
} else {
@@ -643,10 +643,10 @@ void initNative(String filename) {
* This performs better than getting the bits with Bitmap.LockBits(),
* but it cannot be used when there is transparency.
*/
- int /*long*/ hDC = device.internal_new_GC(null);
- int /*long*/ srcHDC = OS.CreateCompatibleDC(hDC);
- int /*long*/ oldSrcBitmap = OS.SelectObject(srcHDC, this.handle);
- int /*long*/ graphics = Gdip.Graphics_new(srcHDC);
+ long /*int*/ hDC = device.internal_new_GC(null);
+ long /*int*/ srcHDC = OS.CreateCompatibleDC(hDC);
+ long /*int*/ oldSrcBitmap = OS.SelectObject(srcHDC, this.handle);
+ long /*int*/ graphics = Gdip.Graphics_new(srcHDC);
if (graphics != 0) {
Rect rect = new Rect();
rect.Width = width;
@@ -663,14 +663,14 @@ void initNative(String filename) {
OS.DeleteDC(srcHDC);
device.internal_dispose_GC(hDC, null);
} else {
- int /*long*/ lockedBitmapData = Gdip.BitmapData_new();
+ long /*int*/ lockedBitmapData = Gdip.BitmapData_new();
if (lockedBitmapData != 0) {
status = Gdip.Bitmap_LockBits(bitmap, 0, 0, pixelFormat, lockedBitmapData);
if (status == 0) {
BitmapData bitmapData = new BitmapData();
Gdip.MoveMemory(bitmapData, lockedBitmapData);
int stride = bitmapData.Stride;
- int /*long*/ pixels = bitmapData.Scan0;
+ long /*int*/ pixels = bitmapData.Scan0;
int depth = 0, scanlinePad = 4, transparentPixel = -1;
switch (bitmapData.PixelFormat) {
case Gdip.PixelFormat1bppIndexed: depth = 1; break;
@@ -690,8 +690,8 @@ void initNative(String filename) {
case Gdip.PixelFormat4bppIndexed:
case Gdip.PixelFormat8bppIndexed:
int paletteSize = Gdip.Image_GetPaletteSize(bitmap);
- int /*long*/ hHeap = OS.GetProcessHeap();
- int /*long*/ palette = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, paletteSize);
+ long /*int*/ hHeap = OS.GetProcessHeap();
+ long /*int*/ palette = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, paletteSize);
if (palette == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Gdip.Image_GetPalette(bitmap, palette, paletteSize);
ColorPalette colorPalette = new ColorPalette();
@@ -757,7 +757,7 @@ void initNative(String filename) {
* Create a DIB from a DDB without using GetDIBits. Note that
* the DDB should not be selected into a HDC.
*/
-int /*long*/ createDIBFromDDB(int /*long*/ hDC, int /*long*/ hBitmap, int width, int height) {
+long /*int*/ createDIBFromDDB(long /*int*/ hDC, long /*int*/ hBitmap, int width, int height) {
/* Determine the DDB depth */
int bits = OS.GetDeviceCaps (hDC, OS.BITSPIXEL);
@@ -848,15 +848,15 @@ int /*long*/ createDIBFromDDB(int /*long*/ hDC, int /*long*/ hBitmap, int width,
offset += 4;
}
}
- int /*long*/[] pBits = new int /*long*/[1];
- int /*long*/ hDib = OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
+ long /*int*/[] pBits = new long /*int*/[1];
+ long /*int*/ hDib = OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
if (hDib == 0) SWT.error(SWT.ERROR_NO_HANDLES);
/* Bitblt DDB into DIB */
- int /*long*/ hdcSource = OS.CreateCompatibleDC(hDC);
- int /*long*/ hdcDest = OS.CreateCompatibleDC(hDC);
- int /*long*/ hOldSrc = OS.SelectObject(hdcSource, hBitmap);
- int /*long*/ hOldDest = OS.SelectObject(hdcDest, hDib);
+ long /*int*/ hdcSource = OS.CreateCompatibleDC(hDC);
+ long /*int*/ hdcDest = OS.CreateCompatibleDC(hDC);
+ long /*int*/ hOldSrc = OS.SelectObject(hdcSource, hBitmap);
+ long /*int*/ hOldDest = OS.SelectObject(hdcDest, hDib);
OS.BitBlt(hdcDest, 0, 0, width, height, hdcSource, 0, 0, OS.SRCCOPY);
OS.SelectObject(hdcSource, hOldSrc);
OS.SelectObject(hdcDest, hOldDest);
@@ -866,7 +866,7 @@ int /*long*/ createDIBFromDDB(int /*long*/ hDC, int /*long*/ hBitmap, int width,
return hDib;
}
-int /*long*/ [] createGdipImage() {
+long /*int*/ [] createGdipImage() {
switch (type) {
case SWT.BITMAP: {
if (alpha != -1 || alphaData != null || transparentPixel != -1) {
@@ -874,13 +874,13 @@ int /*long*/ [] createGdipImage() {
OS.GetObject(handle, BITMAP.sizeof, bm);
int imgWidth = bm.bmWidth;
int imgHeight = bm.bmHeight;
- int /*long*/ hDC = device.internal_new_GC(null);
- int /*long*/ srcHdc = OS.CreateCompatibleDC(hDC);
- int /*long*/ oldSrcBitmap = OS.SelectObject(srcHdc, handle);
- int /*long*/ memHdc = OS.CreateCompatibleDC(hDC);
- int /*long*/ memDib = createDIB(imgWidth, imgHeight, 32);
+ long /*int*/ hDC = device.internal_new_GC(null);
+ long /*int*/ srcHdc = OS.CreateCompatibleDC(hDC);
+ long /*int*/ oldSrcBitmap = OS.SelectObject(srcHdc, handle);
+ long /*int*/ memHdc = OS.CreateCompatibleDC(hDC);
+ long /*int*/ memDib = createDIB(imgWidth, imgHeight, 32);
if (memDib == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ oldMemBitmap = OS.SelectObject(memHdc, memDib);
+ long /*int*/ oldMemBitmap = OS.SelectObject(memHdc, memDib);
BITMAP dibBM = new BITMAP();
OS.GetObject(memDib, BITMAP.sizeof, dibBM);
int sizeInBytes = dibBM.bmWidthBytes * dibBM.bmHeight;
@@ -956,13 +956,13 @@ int /*long*/ [] createGdipImage() {
}
}
}
- int /*long*/ hHeap = OS.GetProcessHeap();
- int /*long*/ pixels = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, srcData.length);
+ long /*int*/ hHeap = OS.GetProcessHeap();
+ long /*int*/ pixels = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, srcData.length);
if (pixels == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.MoveMemory(pixels, srcData, sizeInBytes);
- return new int /*long*/ []{Gdip.Bitmap_new(imgWidth, imgHeight, dibBM.bmWidthBytes, Gdip.PixelFormat32bppARGB, pixels), pixels};
+ return new long /*int*/ []{Gdip.Bitmap_new(imgWidth, imgHeight, dibBM.bmWidthBytes, Gdip.PixelFormat32bppARGB, pixels), pixels};
}
- return new int /*long*/ []{Gdip.Bitmap_new(handle, 0), 0};
+ return new long /*int*/ []{Gdip.Bitmap_new(handle, 0), 0};
}
case SWT.ICON: {
/*
@@ -976,13 +976,13 @@ int /*long*/ [] createGdipImage() {
} else {
OS.GetIconInfo(handle, iconInfo);
}
- int /*long*/ hBitmap = iconInfo.hbmColor;
+ long /*int*/ hBitmap = iconInfo.hbmColor;
if (hBitmap == 0) hBitmap = iconInfo.hbmMask;
BITMAP bm = new BITMAP();
OS.GetObject(hBitmap, BITMAP.sizeof, bm);
int imgWidth = bm.bmWidth;
int imgHeight = hBitmap == iconInfo.hbmMask ? bm.bmHeight / 2 : bm.bmHeight;
- int /*long*/ img = 0, pixels = 0;
+ long /*int*/ img = 0, pixels = 0;
/*
* Bug in GDI+. Bitmap_new() segments fault if the image width
* is greater than the image height.
@@ -991,13 +991,13 @@ int /*long*/ [] createGdipImage() {
* channel when the icon depth is 32.
*/
if (imgWidth > imgHeight || bm.bmBitsPixel == 32) {
- int /*long*/ hDC = device.internal_new_GC(null);
- int /*long*/ srcHdc = OS.CreateCompatibleDC(hDC);
- int /*long*/ oldSrcBitmap = OS.SelectObject(srcHdc, hBitmap);
- int /*long*/ memHdc = OS.CreateCompatibleDC(hDC);
- int /*long*/ memDib = createDIB(imgWidth, imgHeight, 32);
+ long /*int*/ hDC = device.internal_new_GC(null);
+ long /*int*/ srcHdc = OS.CreateCompatibleDC(hDC);
+ long /*int*/ oldSrcBitmap = OS.SelectObject(srcHdc, hBitmap);
+ long /*int*/ memHdc = OS.CreateCompatibleDC(hDC);
+ long /*int*/ memDib = createDIB(imgWidth, imgHeight, 32);
if (memDib == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ oldMemBitmap = OS.SelectObject(memHdc, memDib);
+ long /*int*/ oldMemBitmap = OS.SelectObject(memHdc, memDib);
BITMAP dibBM = new BITMAP();
OS.GetObject(memDib, BITMAP.sizeof, dibBM);
OS.BitBlt(memHdc, 0, 0, imgWidth, imgHeight, srcHdc, 0, hBitmap == iconInfo.hbmMask ? imgHeight : 0, OS.SRCCOPY);
@@ -1022,7 +1022,7 @@ int /*long*/ [] createGdipImage() {
OS.SelectObject(srcHdc, oldSrcBitmap);
OS.DeleteObject(srcHdc);
device.internal_dispose_GC(hDC, null);
- int /*long*/ hHeap = OS.GetProcessHeap();
+ long /*int*/ hHeap = OS.GetProcessHeap();
pixels = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, srcData.length);
if (pixels == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.MoveMemory(pixels, srcData, srcData.length);
@@ -1032,7 +1032,7 @@ int /*long*/ [] createGdipImage() {
}
if (iconInfo.hbmColor != 0) OS.DeleteObject(iconInfo.hbmColor);
if (iconInfo.hbmMask != 0) OS.DeleteObject(iconInfo.hbmMask);
- return new int /*long*/ []{img, pixels};
+ return new long /*int*/ []{img, pixels};
}
default: SWT.error(SWT.ERROR_INVALID_IMAGE);
}
@@ -1091,13 +1091,13 @@ public Color getBackground() {
if (transparentPixel == -1) return null;
/* Get the HDC for the device */
- int /*long*/ hDC = device.internal_new_GC(null);
+ long /*int*/ hDC = device.internal_new_GC(null);
/* Compute the background color */
BITMAP bm = new BITMAP();
OS.GetObject(handle, BITMAP.sizeof, bm);
- int /*long*/ hdcMem = OS.CreateCompatibleDC(hDC);
- int /*long*/ hOldObject = OS.SelectObject(hdcMem, handle);
+ long /*int*/ hdcMem = OS.CreateCompatibleDC(hDC);
+ long /*int*/ hOldObject = OS.SelectObject(hdcMem, handle);
int red = 0, green = 0, blue = 0;
if (bm.bmBitsPixel <= 8) {
if (OS.IsWinCE) {
@@ -1177,7 +1177,7 @@ public Rectangle getBounds() {
} else {
ICONINFO info = new ICONINFO();
OS.GetIconInfo(handle, info);
- int /*long*/ hBitmap = info.hbmColor;
+ long /*int*/ hBitmap = info.hbmColor;
if (hBitmap == 0) hBitmap = info.hbmMask;
bm = new BITMAP();
OS.GetObject(hBitmap, BITMAP.sizeof, bm);
@@ -1217,7 +1217,7 @@ public ImageData getImageData() {
if (OS.IsWinCE) SWT.error(SWT.ERROR_NOT_IMPLEMENTED);
OS.GetIconInfo(handle, info);
/* Get the basic BITMAP information */
- int /*long*/ hBitmap = info.hbmColor;
+ long /*int*/ hBitmap = info.hbmColor;
if (hBitmap == 0) hBitmap = info.hbmMask;
bm = new BITMAP();
OS.GetObject(hBitmap, BITMAP.sizeof, bm);
@@ -1239,15 +1239,15 @@ public ImageData getImageData() {
OS.MoveMemory(bmi, bmiHeader, BITMAPINFOHEADER.sizeof);
/* Get the HDC for the device */
- int /*long*/ hDC = device.internal_new_GC(null);
+ long /*int*/ hDC = device.internal_new_GC(null);
/* Create the DC and select the bitmap */
- int /*long*/ hBitmapDC = OS.CreateCompatibleDC(hDC);
- int /*long*/ hOldBitmap = OS.SelectObject(hBitmapDC, hBitmap);
+ long /*int*/ hBitmapDC = OS.CreateCompatibleDC(hDC);
+ long /*int*/ hOldBitmap = OS.SelectObject(hBitmapDC, hBitmap);
/* Select the palette if necessary */
- int /*long*/ oldPalette = 0;
+ long /*int*/ oldPalette = 0;
if (depth <= 8) {
- int /*long*/ hPalette = device.hPalette;
+ long /*int*/ hPalette = device.hPalette;
if (hPalette != 0) {
oldPalette = OS.SelectPalette(hBitmapDC, hPalette, false);
OS.RealizePalette(hBitmapDC);
@@ -1359,14 +1359,14 @@ public ImageData getImageData() {
/* Find out whether this is a DIB or a DDB. */
boolean isDib = (bm.bmBits != 0);
/* Get the HDC for the device */
- int /*long*/ hDC = device.internal_new_GC(null);
+ long /*int*/ hDC = device.internal_new_GC(null);
/*
* Feature in WinCE. GetDIBits is not available in WinCE. The
* workaround is to create a temporary DIB from the DDB and use
* the bmBits field of DIBSECTION to retrieve the image data.
*/
- int /*long*/ handle = this.handle;
+ long /*int*/ handle = this.handle;
if (OS.IsWinCE) {
if (!isDib) {
boolean mustRestore = false;
@@ -1381,7 +1381,7 @@ public ImageData getImageData() {
}
handle = createDIBFromDDB(hDC, this.handle, width, height);
if (mustRestore) {
- int /*long*/ hOldBitmap = OS.SelectObject(memGC.handle, this.handle);
+ long /*int*/ hOldBitmap = OS.SelectObject(memGC.handle, this.handle);
memGC.data.hNullBitmap = hOldBitmap;
}
isDib = true;
@@ -1417,12 +1417,12 @@ public ImageData getImageData() {
}
/* Create the DC and select the bitmap */
- int /*long*/ hBitmapDC = OS.CreateCompatibleDC(hDC);
- int /*long*/ hOldBitmap = OS.SelectObject(hBitmapDC, handle);
+ long /*int*/ hBitmapDC = OS.CreateCompatibleDC(hDC);
+ long /*int*/ hOldBitmap = OS.SelectObject(hBitmapDC, handle);
/* Select the palette if necessary */
- int /*long*/ oldPalette = 0;
+ long /*int*/ oldPalette = 0;
if (!isDib && depth <= 8) {
- int /*long*/ hPalette = device.hPalette;
+ long /*int*/ hPalette = device.hPalette;
if (hPalette != 0) {
oldPalette = OS.SelectPalette(hBitmapDC, hPalette, false);
OS.RealizePalette(hBitmapDC);
@@ -1558,7 +1558,7 @@ void init(int width, int height) {
SWT.error (SWT.ERROR_INVALID_ARGUMENT);
}
type = SWT.BITMAP;
- int /*long*/ hDC = device.internal_new_GC(null);
+ long /*int*/ hDC = device.internal_new_GC(null);
handle = OS.CreateCompatibleBitmap(hDC, width, height);
/*
* Feature in Windows. CreateCompatibleBitmap() may fail
@@ -1573,8 +1573,8 @@ void init(int width, int height) {
handle = createDIB(width, height, depth);
}
if (handle != 0) {
- int /*long*/ memDC = OS.CreateCompatibleDC(hDC);
- int /*long*/ hOldBitmap = OS.SelectObject(memDC, handle);
+ long /*int*/ memDC = OS.CreateCompatibleDC(hDC);
+ long /*int*/ hOldBitmap = OS.SelectObject(memDC, handle);
OS.PatBlt(memDC, 0, 0, width, height, OS.PATCOPY);
OS.SelectObject(memDC, hOldBitmap);
OS.DeleteDC(memDC);
@@ -1585,7 +1585,7 @@ void init(int width, int height) {
}
}
-static int /*long*/ createDIB(int width, int height, int depth) {
+static long /*int*/ createDIB(int width, int height, int depth) {
BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER();
bmiHeader.biSize = BITMAPINFOHEADER.sizeof;
bmiHeader.biWidth = width;
@@ -1617,7 +1617,7 @@ static int /*long*/ createDIB(int width, int height, int depth) {
bmi[offset + 11] = (byte)((blueMask & 0xFF) >> 0);
}
- int /*long*/[] pBits = new int /*long*/[1];
+ long /*int*/[] pBits = new long /*int*/[1];
return OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
}
@@ -1633,12 +1633,12 @@ static int /*long*/ createDIB(int width, int height, int depth) {
* if the regular GetIconInfo had been used.
*/
static void GetIconInfo(Image image, ICONINFO info) {
- int /*long*/ [] result = init(image.device, null, image.data);
+ long /*int*/ [] result = init(image.device, null, image.data);
info.hbmColor = result[0];
info.hbmMask = result[1];
}
-static int /*long*/ [] init(Device device, Image image, ImageData i) {
+static long /*int*/ [] init(Device device, Image image, ImageData i) {
/*
* BUG in Windows 98:
* A monochrome DIBSection will display as solid black
@@ -1794,8 +1794,8 @@ static int /*long*/ [] init(Device device, Image image, ImageData i) {
offset += 4;
}
}
- int /*long*/[] pBits = new int /*long*/[1];
- int /*long*/ hDib = OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
+ long /*int*/[] pBits = new long /*int*/[1];
+ long /*int*/ hDib = OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
if (hDib == 0) SWT.error(SWT.ERROR_NO_HANDLES);
/* In case of a scanline pad other than 4, do the work to convert it */
byte[] data = i.data;
@@ -1804,17 +1804,17 @@ static int /*long*/ [] init(Device device, Image image, ImageData i) {
}
OS.MoveMemory(pBits[0], data, data.length);
- int /*long*/ [] result = null;
+ long /*int*/ [] result = null;
if (i.getTransparencyType() == SWT.TRANSPARENCY_MASK) {
/* Get the HDC for the device */
- int /*long*/ hDC = device.internal_new_GC(null);
+ long /*int*/ hDC = device.internal_new_GC(null);
/* Create the color bitmap */
- int /*long*/ hdcSrc = OS.CreateCompatibleDC(hDC);
+ long /*int*/ hdcSrc = OS.CreateCompatibleDC(hDC);
OS.SelectObject(hdcSrc, hDib);
- int /*long*/ hBitmap = OS.CreateCompatibleBitmap(hDC, i.width, i.height);
+ long /*int*/ hBitmap = OS.CreateCompatibleBitmap(hDC, i.width, i.height);
if (hBitmap == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ hdcDest = OS.CreateCompatibleDC(hDC);
+ long /*int*/ hdcDest = OS.CreateCompatibleDC(hDC);
OS.SelectObject(hdcDest, hBitmap);
OS.BitBlt(hdcDest, 0, 0, i.width, i.height, hdcSrc, 0, 0, OS.SRCCOPY);
@@ -1823,7 +1823,7 @@ static int /*long*/ [] init(Device device, Image image, ImageData i) {
/* Create the mask. Windows requires icon masks to have a scanline pad of 2. */
byte[] maskData = ImageData.convertPad(i.maskData, i.width, i.height, 1, i.maskPad, 2);
- int /*long*/ hMask = OS.CreateBitmap(i.width, i.height, 1, 1, maskData);
+ long /*int*/ hMask = OS.CreateBitmap(i.width, i.height, 1, 1, maskData);
if (hMask == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.SelectObject(hdcSrc, hMask);
OS.PatBlt(hdcSrc, 0, 0, i.width, i.height, OS.DSTINVERT);
@@ -1832,14 +1832,14 @@ static int /*long*/ [] init(Device device, Image image, ImageData i) {
OS.DeleteObject(hDib);
if (image == null) {
- result = new int /*long*/ []{hBitmap, hMask};
+ result = new long /*int*/ []{hBitmap, hMask};
} else {
/* Create the icon */
ICONINFO info = new ICONINFO();
info.fIcon = true;
info.hbmColor = hBitmap;
info.hbmMask = hMask;
- int /*long*/ hIcon = OS.CreateIconIndirect(info);
+ long /*int*/ hIcon = OS.CreateIconIndirect(info);
if (hIcon == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.DeleteObject(hBitmap);
OS.DeleteObject(hMask);
@@ -1849,7 +1849,7 @@ static int /*long*/ [] init(Device device, Image image, ImageData i) {
}
} else {
if (image == null) {
- result = new int /*long*/ []{hDib};
+ result = new long /*int*/ []{hDib};
} else {
image.handle = hDib;
image.type = SWT.BITMAP;
@@ -1867,7 +1867,7 @@ static int /*long*/ [] init(Device device, Image image, ImageData i) {
return result;
}
-static int /*long*/ [] init(Device device, Image image, ImageData source, ImageData mask) {
+static long /*int*/ [] init(Device device, Image image, ImageData source, ImageData mask) {
/* Create a temporary image and locate the black pixel */
ImageData imageData;
int blackIndex = 0;
@@ -1960,7 +1960,7 @@ void init(ImageData i) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public int /*long*/ internal_new_GC (GCData data) {
+public long /*int*/ internal_new_GC (GCData data) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
/*
* Create a new GC that can draw into the image.
@@ -1971,8 +1971,8 @@ public int /*long*/ internal_new_GC (GCData data) {
}
/* Create a compatible HDC for the device */
- int /*long*/ hDC = device.internal_new_GC(null);
- int /*long*/ imageDC = OS.CreateCompatibleDC(hDC);
+ long /*int*/ hDC = device.internal_new_GC(null);
+ long /*int*/ imageDC = OS.CreateCompatibleDC(hDC);
device.internal_dispose_GC(hDC, null);
if (imageDC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
@@ -2006,7 +2006,7 @@ public int /*long*/ internal_new_GC (GCData data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
+public void internal_dispose_GC (long /*int*/ hDC, GCData data) {
OS.DeleteDC(hDC);
}
@@ -2070,12 +2070,12 @@ public void setBackground(Color color) {
transparentColor = -1;
/* Get the HDC for the device */
- int /*long*/ hDC = device.internal_new_GC(null);
+ long /*int*/ hDC = device.internal_new_GC(null);
/* Change the background color in the image */
BITMAP bm = new BITMAP();
OS.GetObject(handle, BITMAP.sizeof, bm);
- int /*long*/ hdcMem = OS.CreateCompatibleDC(hDC);
+ long /*int*/ hdcMem = OS.CreateCompatibleDC(hDC);
OS.SelectObject(hdcMem, handle);
int maxColors = 1 << bm.bmBitsPixel;
byte[] colors = new byte[maxColors * 4];
@@ -2121,7 +2121,7 @@ public String toString () {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public static Image win32_new(Device device, int type, int /*long*/ handle) {
+public static Image win32_new(Device device, int type, long /*int*/ handle) {
Image image = new Image(device);
image.type = type;
image.handle = handle;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java
index 44c6bbb375..496a995d9b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java
@@ -49,7 +49,7 @@ public class Path extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
PointF currentPoint = new PointF(), startPoint = new PointF();
@@ -199,9 +199,9 @@ public void addArc(float x, float y, float width, float height, float startAngle
if (width == height) {
Gdip.GraphicsPath_AddArc(handle, x, y, width, height, -startAngle, -arcAngle);
} else {
- int /*long*/ path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate);
+ long /*int*/ path = Gdip.GraphicsPath_new(Gdip.FillModeAlternate);
if (path == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ matrix = Gdip.Matrix_new(width, 0, 0, height, x, y);
+ long /*int*/ matrix = Gdip.Matrix_new(width, 0, 0, height, x, y);
if (matrix == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Gdip.GraphicsPath_AddArc(path, 0, 0, 1, 1, -startAngle, -arcAngle);
Gdip.GraphicsPath_Transform(path, matrix);
@@ -283,9 +283,9 @@ public void addString(String string, float x, float y, Font font) {
int length = string.length();
char[] buffer = new char[length];
string.getChars(0, length, buffer, 0);
- int /*long*/ hDC = device.internal_new_GC(null);
- int /*long*/ [] family = new int /*long*/ [1];
- int /*long*/ gdipFont = GC.createGdipFont(hDC, font.handle, 0, device.fontCollection, family, null);
+ long /*int*/ hDC = device.internal_new_GC(null);
+ long /*int*/ [] family = new long /*int*/ [1];
+ long /*int*/ gdipFont = GC.createGdipFont(hDC, font.handle, 0, device.fontCollection, family, null);
PointF point = new PointF();
point.X = x - (Gdip.Font_GetSize(gdipFont) / 6);
point.Y = y;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java
index 8c094dda81..f1178eeecd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Pattern.java
@@ -47,7 +47,7 @@ public class Pattern extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
/**
* Constructs a new Pattern given an image. Drawing with the resulting
@@ -79,14 +79,14 @@ public Pattern(Device device, Image image) {
if (image == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (image.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
this.device.checkGDIP();
- int /*long*/[] gdipImage = image.createGdipImage();
- int /*long*/ img = gdipImage[0];
+ long /*int*/[] gdipImage = image.createGdipImage();
+ long /*int*/ img = gdipImage[0];
int width = Gdip.Image_GetWidth(img);
int height = Gdip.Image_GetHeight(img);
handle = Gdip.TextureBrush_new(img, Gdip.WrapModeTile, 0, 0, width, height);
Gdip.Bitmap_delete(img);
if (gdipImage[1] != 0) {
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
OS.HeapFree(hHeap, 0, gdipImage[1]);
}
if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
@@ -174,14 +174,14 @@ public Pattern(Device device, float x1, float y1, float x2, float y2, Color colo
this.device.checkGDIP();
int colorRef1 = color1.handle;
int rgb = ((colorRef1 >> 16) & 0xFF) | (colorRef1 & 0xFF00) | ((colorRef1 & 0xFF) << 16);
- int /*long*/ foreColor = Gdip.Color_new((alpha1 & 0xFF) << 24 | rgb);
+ long /*int*/ foreColor = Gdip.Color_new((alpha1 & 0xFF) << 24 | rgb);
if (x1 == x2 && y1 == y2) {
handle = Gdip.SolidBrush_new(foreColor);
if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
} else {
int colorRef2 = color2.handle;
rgb = ((colorRef2 >> 16) & 0xFF) | (colorRef2 & 0xFF00) | ((colorRef2 & 0xFF) << 16);
- int /*long*/ backColor = Gdip.Color_new((alpha2 & 0xFF) << 24 | rgb);
+ long /*int*/ backColor = Gdip.Color_new((alpha2 & 0xFF) << 24 | rgb);
PointF p1 = new PointF();
p1.X = x1;
p1.Y = y1;
@@ -195,8 +195,8 @@ public Pattern(Device device, float x1, float y1, float x2, float y2, Color colo
int r = (int)(((colorRef1 & 0xFF) >> 0) * 0.5f + ((colorRef2 & 0xFF) >> 0) * 0.5f);
int g = (int)(((colorRef1 & 0xFF00) >> 8) * 0.5f + ((colorRef2 & 0xFF00) >> 8) * 0.5f);
int b = (int)(((colorRef1 & 0xFF0000) >> 16) * 0.5f + ((colorRef2 & 0xFF0000) >> 16) * 0.5f);
- int /*long*/ midColor = Gdip.Color_new(a << 24 | r << 16 | g << 8 | b);
- Gdip.LinearGradientBrush_SetInterpolationColors(handle, new int /*long*/ []{foreColor, midColor, backColor}, new float[]{0, 0.5f, 1}, 3);
+ long /*int*/ midColor = Gdip.Color_new(a << 24 | r << 16 | g << 8 | b);
+ Gdip.LinearGradientBrush_SetInterpolationColors(handle, new long /*int*/ []{foreColor, midColor, backColor}, new float[]{0, 0.5f, 1}, 3);
Gdip.Color_delete(midColor);
}
Gdip.Color_delete(backColor);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java
index f1d7800e8a..4382821950 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java
@@ -42,7 +42,7 @@ public final class Region extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
/**
* Constructs a new empty region.
@@ -112,7 +112,7 @@ public void add (int[] pointArray) {
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (OS.IsWinCE) SWT.error(SWT.ERROR_NOT_IMPLEMENTED);
- int /*long*/ polyRgn = OS.CreatePolygonRgn(pointArray, pointArray.length / 2, OS.ALTERNATE);
+ long /*int*/ polyRgn = OS.CreatePolygonRgn(pointArray, pointArray.length / 2, OS.ALTERNATE);
OS.CombineRgn (handle, handle, polyRgn, OS.RGN_OR);
OS.DeleteObject (polyRgn);
}
@@ -158,7 +158,7 @@ public void add (Rectangle rect) {
public void add (int x, int y, int width, int height) {
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (width < 0 || height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
- int /*long*/ rectRgn = OS.CreateRectRgn (x, y, x + width, y + height);
+ long /*int*/ rectRgn = OS.CreateRectRgn (x, y, x + width, y + height);
OS.CombineRgn (handle, handle, rectRgn, OS.RGN_OR);
OS.DeleteObject (rectRgn);
}
@@ -323,7 +323,7 @@ public void intersect (Rectangle rect) {
public void intersect (int x, int y, int width, int height) {
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (width < 0 || height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
- int /*long*/ rectRgn = OS.CreateRectRgn (x, y, x + width, y + height);
+ long /*int*/ rectRgn = OS.CreateRectRgn (x, y, x + width, y + height);
OS.CombineRgn (handle, handle, rectRgn, OS.RGN_AND);
OS.DeleteObject (rectRgn);
}
@@ -451,7 +451,7 @@ public void subtract (int[] pointArray) {
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (OS.IsWinCE) SWT.error(SWT.ERROR_NOT_IMPLEMENTED);
- int /*long*/ polyRgn = OS.CreatePolygonRgn(pointArray, pointArray.length / 2, OS.ALTERNATE);
+ long /*int*/ polyRgn = OS.CreatePolygonRgn(pointArray, pointArray.length / 2, OS.ALTERNATE);
OS.CombineRgn (handle, handle, polyRgn, OS.RGN_DIFF);
OS.DeleteObject (polyRgn);
}
@@ -499,7 +499,7 @@ public void subtract (Rectangle rect) {
public void subtract (int x, int y, int width, int height) {
if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (width < 0 || height < 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
- int /*long*/ rectRgn = OS.CreateRectRgn (x, y, x + width, y + height);
+ long /*int*/ rectRgn = OS.CreateRectRgn (x, y, x + width, y + height);
OS.CombineRgn (handle, handle, rectRgn, OS.RGN_DIFF);
OS.DeleteObject (rectRgn);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java
index 3816b1273a..0896598a92 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java
@@ -54,7 +54,7 @@ public final class TextLayout extends Resource {
StyleItem[] allRuns;
StyleItem[][] runs;
int[] lineOffset, lineY, lineWidth;
- int /*long*/ mLangFontLink2;
+ long /*int*/ mLangFontLink2;
static final char LTR_MARK = '\u200E', RTL_MARK = '\u200F';
static final int SCRIPT_VISATTR_SIZEOF = 2;
@@ -81,17 +81,17 @@ public final class TextLayout extends Resource {
/*Script cache and analysis */
SCRIPT_ANALYSIS analysis;
- int /*long*/ psc = 0;
+ long /*int*/ psc = 0;
/*Shape info (malloc when the run is shaped) */
- int /*long*/ glyphs;
+ long /*int*/ glyphs;
int glyphCount;
- int /*long*/ clusters;
- int /*long*/ visAttrs;
+ long /*int*/ clusters;
+ long /*int*/ visAttrs;
/*Place info (malloc when the run is placed) */
- int /*long*/ advances;
- int /*long*/ goffsets;
+ long /*int*/ advances;
+ long /*int*/ goffsets;
int width;
int ascent;
int descent;
@@ -101,15 +101,15 @@ public final class TextLayout extends Resource {
int strikeoutPos, strikeoutThickness;
/* Justify info (malloc during computeRuns) */
- int /*long*/ justify;
+ long /*int*/ justify;
/* ScriptBreak */
- int /*long*/ psla;
+ long /*int*/ psla;
- int /*long*/ fallbackFont;
+ long /*int*/ fallbackFont;
void free() {
- int /*long*/ hHeap = OS.GetProcessHeap();
+ long /*int*/ hHeap = OS.GetProcessHeap();
if (psc != 0) {
OS.ScriptFreeCache (psc);
OS.HeapFree(hHeap, 0, psc);
@@ -180,7 +180,7 @@ public TextLayout (Device device) {
styles[1] = new StyleItem();
stylesCount = 2;
text = ""; //$NON-NLS-1$
- int /*long*/[] ppv = new int /*long*/[1];
+ long /*int*/[] ppv = new long /*int*/[1];
OS.OleInitialize(0);
if (OS.CoCreateInstance(CLSID_CMultiLanguage, 0, OS.CLSCTX_INPROC_SERVER, IID_IMLangFontLink2, ppv) == OS.S_OK) {
mLangFontLink2 = ppv[0];
@@ -217,7 +217,7 @@ void breakRun(StyleItem run) {
if (run.psla != 0) return;
char[] chars = new char[run.length];
segmentsText.getChars(run.start, run.start + run.length, chars, 0);
- int /*long*/ hHeap = OS.GetProcessHeap();
+ long /*int*/ hHeap = OS.GetProcessHeap();
run.psla = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, SCRIPT_LOGATTR.sizeof * chars.length);
if (run.psla == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.ScriptBreak(chars, chars.length, run.analysis, run.psla);
@@ -233,8 +233,8 @@ void checkLayout () {
*/
void computeRuns (GC gc) {
if (runs != null) return;
- int /*long*/ hDC = gc != null ? gc.handle : device.internal_new_GC(null);
- int /*long*/ srcHdc = OS.CreateCompatibleDC(hDC);
+ long /*int*/ hDC = gc != null ? gc.handle : device.internal_new_GC(null);
+ long /*int*/ srcHdc = OS.CreateCompatibleDC(hDC);
allRuns = itemize();
for (int i=0; i> 16) & 0xFF) | (pixel & 0xFF00) | ((pixel & 0xFF) << 16);
- int /*long*/ gdiColor = Gdip.Color_new(argb);
- int /*long*/ brush = Gdip.SolidBrush_new(gdiColor);
+ long /*int*/ gdiColor = Gdip.Color_new(argb);
+ long /*int*/ brush = Gdip.SolidBrush_new(gdiColor);
Gdip.Color_delete(gdiColor);
return brush;
}
-int /*long*/ createGdipBrush(Color color, int alpha) {
+long /*int*/ createGdipBrush(Color color, int alpha) {
return createGdipBrush(color.handle, alpha);
}
@@ -620,16 +620,16 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col
if (selectionBackground != null && selectionBackground.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
int length = text.length();
if (length == 0 && flags == 0) return;
- int /*long*/ hdc = gc.handle;
+ long /*int*/ hdc = gc.handle;
Rectangle clip = gc.getClipping();
GCData data = gc.data;
- int /*long*/ gdipGraphics = data.gdipGraphics;
+ long /*int*/ gdipGraphics = data.gdipGraphics;
int foreground = data.foreground;
int linkColor = OS.GetSysColor (OS.COLOR_HOTLIGHT);
int alpha = data.alpha;
boolean gdip = gdipGraphics != 0;
- int /*long*/ gdipForeground = 0;
- int /*long*/ gdipLinkColor = 0;
+ long /*int*/ gdipForeground = 0;
+ long /*int*/ gdipLinkColor = 0;
int state = 0;
if (gdip) {
gc.checkGC(GC.FOREGROUND);
@@ -641,8 +641,8 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col
}
}
boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1;
- int /*long*/ gdipSelBackground = 0, gdipSelForeground = 0, gdipFont = 0, lastHFont = 0;
- int /*long*/ selBackground = 0;
+ long /*int*/ gdipSelBackground = 0, gdipSelForeground = 0, gdipFont = 0, lastHFont = 0;
+ long /*int*/ selBackground = 0;
int selForeground = 0;
if (hasSelection || ((flags & SWT.LAST_LINE_SELECTION) != 0 && (flags & (SWT.FULL_SELECTION | SWT.DELIMITER_SELECTION)) != 0)) {
int fgSel = selectionForeground != null ? selectionForeground.handle : OS.GetSysColor (OS.COLOR_HIGHLIGHTTEXT);
@@ -740,11 +740,11 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col
if (!skipTab && (!run.lineBreak || run.softBreak) && !(style != null && style.metrics != null)) {
OS.SetRect(rect, drawX, drawY, drawX + run.width, drawY + lineHeight);
if (gdip) {
- int /*long*/ hFont = getItemFont(run);
+ long /*int*/ hFont = getItemFont(run);
if (hFont != lastHFont) {
lastHFont = hFont;
if (gdipFont != 0) Gdip.Font_delete(gdipFont);
- int /*long*/ oldFont = OS.SelectObject(hdc, hFont);
+ long /*int*/ oldFont = OS.SelectObject(hdc, hFont);
gdipFont = Gdip.Font_new(hdc, hFont);
OS.SelectObject(hdc, oldFont);
if (gdipFont == 0) SWT.error(SWT.ERROR_NO_HANDLES);
@@ -753,7 +753,7 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col
gdipFont = 0;
}
}
- int /*long*/ gdipFg = gdipForeground;
+ long /*int*/ gdipFg = gdipForeground;
if (style != null && style.underline && style.underlineStyle == SWT.UNDERLINE_LINK) {
if (gdipLinkColor == 0) gdipLinkColor = createGdipBrush(linkColor, alpha);
gdipFg = gdipLinkColor;
@@ -787,7 +787,7 @@ public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Col
if (selBackground != 0) OS.DeleteObject (selBackground);
}
-RECT drawBorder(int /*long*/ hdc, int x, int y, int lineHeight, StyleItem[] line, int index, int color, int selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, Rectangle drawClip) {
+RECT drawBorder(long /*int*/ hdc, int x, int y, int lineHeight, StyleItem[] line, int index, int color, int selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, Rectangle drawClip) {
StyleItem run = line[index];
TextStyle style = run.style;
if (style == null) return null;
@@ -834,12 +834,12 @@ RECT drawBorder(int /*long*/ hdc, int x, int y, int lineHeight, StyleItem[] line
break;
}
}
- int /*long*/ oldBrush = OS.SelectObject(hdc, OS.GetStockObject(OS.NULL_BRUSH));
+ long /*int*/ oldBrush = OS.SelectObject(hdc, OS.GetStockObject(OS.NULL_BRUSH));
LOGBRUSH logBrush = new LOGBRUSH();
logBrush.lbStyle = OS.BS_SOLID;
logBrush.lbColor = /*64*/(int)color;
- int /*long*/ newPen = OS.ExtCreatePen(lineStyle | OS.PS_GEOMETRIC, lineWidth, logBrush, 0, null);
- int /*long*/ oldPen = OS.SelectObject(hdc, newPen);
+ long /*int*/ newPen = OS.ExtCreatePen(lineStyle | OS.PS_GEOMETRIC, lineWidth, logBrush, 0, null);
+ long /*int*/ oldPen = OS.SelectObject(hdc, newPen);
RECT drawRect = new RECT();
OS.SetRect(drawRect, x + left, y, x + run.x + run.width, y + lineHeight);
if (drawClip != null) {
@@ -861,7 +861,7 @@ RECT drawBorder(int /*long*/ hdc, int x, int y, int lineHeight, StyleItem[] line
if (clipRect.right == -1) clipRect.right = 0x7ffff;
OS.IntersectClipRect(hdc, clipRect.left, clipRect.top, clipRect.right, clipRect.bottom);
logBrush.lbColor = /*64*/(int)selectionColor;
- int /*long*/ selPen = OS.ExtCreatePen (lineStyle | OS.PS_GEOMETRIC, lineWidth, logBrush, 0, null);
+ long /*int*/ selPen = OS.ExtCreatePen (lineStyle | OS.PS_GEOMETRIC, lineWidth, logBrush, 0, null);
oldPen = OS.SelectObject(hdc, selPen);
OS.Rectangle(hdc, drawRect.left, drawRect.top, drawRect.right, drawRect.bottom);
OS.RestoreDC(hdc, state);
@@ -874,7 +874,7 @@ RECT drawBorder(int /*long*/ hdc, int x, int y, int lineHeight, StyleItem[] line
return clipRect;
}
-RECT drawBorderGDIP(int /*long*/ graphics, int x, int y, int lineHeight, StyleItem[] line, int index, int /*long*/ color, int /*long*/ selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, int alpha, Rectangle drawClip) {
+RECT drawBorderGDIP(long /*int*/ graphics, int x, int y, int lineHeight, StyleItem[] line, int index, long /*int*/ color, long /*int*/ selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, int alpha, Rectangle drawClip) {
StyleItem run = line[index];
TextStyle style = run.style;
if (style == null) return null;
@@ -892,7 +892,7 @@ RECT drawBorderGDIP(int /*long*/ graphics, int x, int y, int lineHeight, StyleIt
}
boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1;
boolean fullSelection = hasSelection && selectionStart <= start && end <= selectionEnd;
- int /*long*/ brush = color;
+ long /*int*/ brush = color;
if (style.borderColor != null) {
brush = createGdipBrush(style.borderColor, alpha);
clipRect = null;
@@ -913,7 +913,7 @@ RECT drawBorderGDIP(int /*long*/ graphics, int x, int y, int lineHeight, StyleIt
case SWT.BORDER_DASH: lineStyle = Gdip.DashStyleDash; break;
case SWT.BORDER_DOT: lineStyle = Gdip.DashStyleDot; break;
}
- int /*long*/ pen = Gdip.Pen_new(brush, lineWidth);
+ long /*int*/ pen = Gdip.Pen_new(brush, lineWidth);
Gdip.Pen_SetDashStyle(pen, lineStyle);
Gdip.Graphics_SetPixelOffsetMode(graphics, Gdip.PixelOffsetModeNone);
int smoothingMode = Gdip.Graphics_GetSmoothingMode(graphics);
@@ -932,7 +932,7 @@ RECT drawBorderGDIP(int /*long*/ graphics, int x, int y, int lineHeight, StyleIt
Gdip.Graphics_Restore(graphics, gstate);
gstate = Gdip.Graphics_Save(graphics);
Gdip.Graphics_SetClip(graphics, gdipRect, Gdip.CombineModeIntersect);
- int /*long*/ selPen = Gdip.Pen_new(selectionColor, lineWidth);
+ long /*int*/ selPen = Gdip.Pen_new(selectionColor, lineWidth);
Gdip.Pen_SetDashStyle(selPen, lineStyle);
Gdip.Graphics_DrawRectangle(graphics, selPen, x + left, y, run.x + run.width - left - 1, lineHeight - 1);
Gdip.Pen_delete(selPen);
@@ -949,7 +949,7 @@ RECT drawBorderGDIP(int /*long*/ graphics, int x, int y, int lineHeight, StyleIt
return clipRect;
}
-void drawRunBackground(StyleItem run, int /*long*/ hdc, RECT rect, int selectionStart, int selectionEnd, int /*long*/ selBrush, boolean hasSelection) {
+void drawRunBackground(StyleItem run, long /*int*/ hdc, RECT rect, int selectionStart, int selectionEnd, long /*int*/ selBrush, boolean hasSelection) {
int end = run.start + run.length - 1;
boolean fullSelection = hasSelection && selectionStart <= run.start && selectionEnd >= end;
if (fullSelection) {
@@ -958,8 +958,8 @@ void drawRunBackground(StyleItem run, int /*long*/ hdc, RECT rect, int selection
} else {
if (run.style != null && run.style.background != null) {
int bg = run.style.background.handle;
- int /*long*/ hBrush = OS.CreateSolidBrush (bg);
- int /*long*/ oldBrush = OS.SelectObject(hdc, hBrush);
+ long /*int*/ hBrush = OS.CreateSolidBrush (bg);
+ long /*int*/ oldBrush = OS.SelectObject(hdc, hBrush);
OS.PatBlt(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY);
OS.SelectObject(hdc, oldBrush);
OS.DeleteObject(hBrush);
@@ -973,14 +973,14 @@ void drawRunBackground(StyleItem run, int /*long*/ hdc, RECT rect, int selection
}
}
-void drawRunBackgroundGDIP(StyleItem run, int /*long*/ graphics, RECT rect, int selectionStart, int selectionEnd, int alpha, int /*long*/ selBrush, boolean hasSelection) {
+void drawRunBackgroundGDIP(StyleItem run, long /*int*/ graphics, RECT rect, int selectionStart, int selectionEnd, int alpha, long /*int*/ selBrush, boolean hasSelection) {
int end = run.start + run.length - 1;
boolean fullSelection = hasSelection && selectionStart <= run.start && selectionEnd >= end;
if (fullSelection) {
Gdip.Graphics_FillRectangle(graphics, selBrush, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top);
} else {
if (run.style != null && run.style.background != null) {
- int /*long*/ brush = createGdipBrush(run.style.background, alpha);
+ long /*int*/ brush = createGdipBrush(run.style.background, alpha);
Gdip.Graphics_FillRectangle(graphics, brush, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top);
Gdip.SolidBrush_delete(brush);
}
@@ -997,7 +997,7 @@ void drawRunBackgroundGDIP(StyleItem run, int /*long*/ graphics, RECT rect, int
}
}
-RECT drawRunText(int /*long*/ hdc, StyleItem run, RECT rect, int baseline, int color, int selectionColor, int selectionStart, int selectionEnd) {
+RECT drawRunText(long /*int*/ hdc, StyleItem run, RECT rect, int baseline, int color, int selectionColor, int selectionStart, int selectionEnd) {
int end = run.start + run.length - 1;
boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1;
boolean fullSelection = hasSelection && selectionStart <= run.start && selectionEnd >= end;
@@ -1005,7 +1005,7 @@ RECT drawRunText(int /*long*/ hdc, StyleItem run, RECT rect, int baseline, int c
int offset = (orientation & SWT.RIGHT_TO_LEFT) != 0 ? -1 : 0;
int x = rect.left + offset;
int y = rect.top + (baseline - run.ascent);
- int /*long*/ hFont = getItemFont(run);
+ long /*int*/ hFont = getItemFont(run);
OS.SelectObject(hdc, hFont);
if (fullSelection) {
color = selectionColor;
@@ -1024,7 +1024,7 @@ RECT drawRunText(int /*long*/ hdc, StyleItem run, RECT rect, int baseline, int c
return fullSelection || partialSelection ? rect : null;
}
-RECT drawRunTextGDIP(int /*long*/ graphics, StyleItem run, RECT rect, int /*long*/ gdipFont, int baseline, int /*long*/ color, int /*long*/ selectionColor, int selectionStart, int selectionEnd, int alpha) {
+RECT drawRunTextGDIP(long /*int*/ graphics, StyleItem run, RECT rect, long /*int*/ gdipFont, int baseline, long /*int*/ color, long /*int*/ selectionColor, int selectionStart, int selectionEnd, int alpha) {
int end = run.start + run.length - 1;
boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1;
boolean fullSelection = hasSelection && selectionStart <= run.start && selectionEnd >= end;
@@ -1032,7 +1032,7 @@ RECT drawRunTextGDIP(int /*long*/ graphics, StyleItem run, RECT rect, int /*long
int drawY = rect.top + baseline;
if (run.style != null && run.style.rise != 0) drawY -= run.style.rise;
int drawX = rect.left;
- int /*long*/ brush = color;
+ long /*int*/ brush = color;
if (fullSelection) {
brush = selectionColor;
} else {
@@ -1109,10 +1109,10 @@ RECT drawRunTextGDIP(int /*long*/ graphics, StyleItem run, RECT rect, int /*long
return fullSelection || partialSelection ? rect : null;
}
-RECT drawRunTextGDIPRaster(int /*long*/ graphics, StyleItem run, RECT rect, int baseline, int color, int selectionColor, int selectionStart, int selectionEnd) {
- int /*long*/ clipRgn = 0;
+RECT drawRunTextGDIPRaster(long /*int*/ graphics, StyleItem run, RECT rect, int baseline, int color, int selectionColor, int selectionStart, int selectionEnd) {
+ long /*int*/ clipRgn = 0;
Gdip.Graphics_SetPixelOffsetMode(graphics, Gdip.PixelOffsetModeNone);
- int /*long*/ rgn = Gdip.Region_new();
+ long /*int*/ rgn = Gdip.Region_new();
if (rgn == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Gdip.Graphics_GetClip(graphics, rgn);
if (!Gdip.Region_IsInfinite(rgn, graphics)) {
@@ -1121,7 +1121,7 @@ RECT drawRunTextGDIPRaster(int /*long*/ graphics, StyleItem run, RECT rect, int
Gdip.Region_delete(rgn);
Gdip.Graphics_SetPixelOffsetMode(graphics, Gdip.PixelOffsetModeHalf);
float[] lpXform = null;
- int /*long*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0);
+ long /*int*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0);
if (matrix == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Gdip.Graphics_GetTransform(graphics, matrix);
if (!Gdip.Matrix_IsIdentity(matrix)) {
@@ -1129,7 +1129,7 @@ RECT drawRunTextGDIPRaster(int /*long*/ graphics, StyleItem run, RECT rect, int
Gdip.Matrix_GetElements(matrix, lpXform);
}
Gdip.Matrix_delete(matrix);
- int /*long*/ hdc = Gdip.Graphics_GetHDC(graphics);
+ long /*int*/ hdc = Gdip.Graphics_GetHDC(graphics);
int state = OS.SaveDC(hdc);
if (lpXform != null) {
OS.SetGraphicsMode(hdc, OS.GM_ADVANCED);
@@ -1149,7 +1149,7 @@ RECT drawRunTextGDIPRaster(int /*long*/ graphics, StyleItem run, RECT rect, int
return pRect;
}
-RECT drawStrikeout(int /*long*/ hdc, int x, int baseline, StyleItem[] line, int index, int color, int selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, Rectangle drawClip) {
+RECT drawStrikeout(long /*int*/ hdc, int x, int baseline, StyleItem[] line, int index, int color, int selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, Rectangle drawClip) {
StyleItem run = line[index];
TextStyle style = run.style;
if (style == null) return null;
@@ -1182,11 +1182,11 @@ RECT drawStrikeout(int /*long*/ hdc, int x, int baseline, StyleItem[] line, int
}
RECT rect = new RECT();
OS.SetRect(rect, x + left, baseline - run.strikeoutPos - style.rise, x + run.x + run.width, baseline - run.strikeoutPos + run.strikeoutThickness - style.rise);
- int /*long*/ brush = OS.CreateSolidBrush(color);
+ long /*int*/ brush = OS.CreateSolidBrush(color);
OS.FillRect(hdc, rect, brush);
OS.DeleteObject(brush);
if (clipRect != null) {
- int /*long*/ selBrush = OS.CreateSolidBrush(selectionColor);
+ long /*int*/ selBrush = OS.CreateSolidBrush(selectionColor);
if (clipRect.left == -1) clipRect.left = 0;
if (clipRect.right == -1) clipRect.right = 0x7ffff;
OS.SetRect(clipRect, Math.max(rect.left, clipRect.left), rect.top, Math.min(rect.right, clipRect.right), rect.bottom);
@@ -1198,7 +1198,7 @@ RECT drawStrikeout(int /*long*/ hdc, int x, int baseline, StyleItem[] line, int
return clipRect;
}
-RECT drawStrikeoutGDIP(int /*long*/ graphics, int x, int baseline, StyleItem[] line, int index, int /*long*/ color, int /*long*/ selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, int alpha, Rectangle drawClip) {
+RECT drawStrikeoutGDIP(long /*int*/ graphics, int x, int baseline, StyleItem[] line, int index, long /*int*/ color, long /*int*/ selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, int alpha, Rectangle drawClip) {
StyleItem run = line[index];
TextStyle style = run.style;
if (style == null) return null;
@@ -1216,7 +1216,7 @@ RECT drawStrikeoutGDIP(int /*long*/ graphics, int x, int baseline, StyleItem[] l
}
boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1;
boolean fullSelection = hasSelection && selectionStart <= start && end <= selectionEnd;
- int /*long*/ brush = color;
+ long /*int*/ brush = color;
if (style.strikeoutColor != null) {
brush = createGdipBrush(style.strikeoutColor, alpha);
clipRect = null;
@@ -1255,7 +1255,7 @@ RECT drawStrikeoutGDIP(int /*long*/ graphics, int x, int baseline, StyleItem[] l
return clipRect;
}
-RECT drawUnderline(int /*long*/ hdc, int x, int baseline, int lineUnderlinePos, int lineBottom, StyleItem[] line, int index, int color, int selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, Rectangle drawClip) {
+RECT drawUnderline(long /*int*/ hdc, int x, int baseline, int lineUnderlinePos, int lineBottom, StyleItem[] line, int index, int color, int selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, Rectangle drawClip) {
StyleItem run = line[index];
TextStyle style = run.style;
if (style == null) return null;
@@ -1300,8 +1300,8 @@ RECT drawUnderline(int /*long*/ hdc, int x, int baseline, int lineUnderlinePos,
int squigglyHeight = 2 * squigglyThickness;
int squigglyY = Math.min(rect.top - squigglyHeight / 2, lineBottom - squigglyHeight - 1);
int[] points = computePolyline(rect.left, squigglyY, rect.right, squigglyY + squigglyHeight);
- int /*long*/ pen = OS.CreatePen(OS.PS_SOLID, squigglyThickness, color);
- int /*long*/ oldPen = OS.SelectObject(hdc, pen);
+ long /*int*/ pen = OS.CreatePen(OS.PS_SOLID, squigglyThickness, color);
+ long /*int*/ oldPen = OS.SelectObject(hdc, pen);
int state = OS.SaveDC(hdc);
OS.IntersectClipRect(hdc, rect.left, squigglyY, rect.right + 1, squigglyY + squigglyHeight + 1);
OS.Polyline(hdc, points, points.length / 2);
@@ -1340,7 +1340,7 @@ RECT drawUnderline(int /*long*/ hdc, int x, int baseline, int lineUnderlinePos,
OS.OffsetRect(rect, 0, lineBottom - bottom);
if (clipRect != null) OS.OffsetRect(clipRect, 0, lineBottom - bottom);
}
- int /*long*/ brush = OS.CreateSolidBrush(color);
+ long /*int*/ brush = OS.CreateSolidBrush(color);
OS.FillRect(hdc, rect, brush);
if (style.underlineStyle == SWT.UNDERLINE_DOUBLE) {
OS.SetRect(rect, rect.left, rect.top + run.underlineThickness * 2, rect.right, rect.bottom + run.underlineThickness * 2);
@@ -1348,7 +1348,7 @@ RECT drawUnderline(int /*long*/ hdc, int x, int baseline, int lineUnderlinePos,
}
OS.DeleteObject(brush);
if (clipRect != null) {
- int /*long*/ selBrush = OS.CreateSolidBrush(selectionColor);
+ long /*int*/ selBrush = OS.CreateSolidBrush(selectionColor);
OS.FillRect(hdc, clipRect, selBrush);
if (style.underlineStyle == SWT.UNDERLINE_DOUBLE) {
OS.SetRect(clipRect, clipRect.left, rect.top, clipRect.right, rect.bottom);
@@ -1360,8 +1360,8 @@ RECT drawUnderline(int /*long*/ hdc, int x, int baseline, int lineUnderlinePos,
case UNDERLINE_IME_DASH:
case UNDERLINE_IME_DOT: {
int penStyle = style.underlineStyle == UNDERLINE_IME_DASH ? OS.PS_DASH : OS.PS_DOT;
- int /*long*/ pen = OS.CreatePen(penStyle, 1, color);
- int /*long*/ oldPen = OS.SelectObject(hdc, pen);
+ long /*int*/ pen = OS.CreatePen(penStyle, 1, color);
+ long /*int*/ oldPen = OS.SelectObject(hdc, pen);
OS.SetRect(rect, rect.left, baseline + run.descent, rect.right, baseline + run.descent + run.underlineThickness);
OS.MoveToEx(hdc, rect.left, rect.top, 0);
OS.LineTo(hdc, rect.right, rect.top);
@@ -1384,7 +1384,7 @@ RECT drawUnderline(int /*long*/ hdc, int x, int baseline, int lineUnderlinePos,
return clipRect;
}
-RECT drawUnderlineGDIP (int /*long*/ graphics, int x, int baseline, int lineUnderlinePos, int lineBottom, StyleItem[] line, int index, int /*long*/ color, int /*long*/ selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, int alpha, Rectangle drawClip) {
+RECT drawUnderlineGDIP (long /*int*/ graphics, int x, int baseline, int lineUnderlinePos, int lineBottom, StyleItem[] line, int index, long /*int*/ color, long /*int*/ selectionColor, RECT clipRect, RECT pRect, int selectionStart, int selectionEnd, int alpha, Rectangle drawClip) {
StyleItem run = line[index];
TextStyle style = run.style;
if (style == null) return null;
@@ -1402,7 +1402,7 @@ RECT drawUnderlineGDIP (int /*long*/ graphics, int x, int baseline, int lineUnde
}
boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1;
boolean fullSelection = hasSelection && selectionStart <= start && end <= selectionEnd;
- int /*long*/ brush = color;
+ long /*int*/ brush = color;
if (style.underlineColor != null) {
brush = createGdipBrush(style.underlineColor, alpha);
clipRect = null;
@@ -1440,7 +1440,7 @@ RECT drawUnderlineGDIP (int /*long*/ graphics, int x, int baseline, int lineUnde
int squigglyHeight = 2 * squigglyThickness;
int squigglyY = Math.min(rect.top - squigglyHeight / 2, lineBottom - squigglyHeight - 1);
int[] points = computePolyline(rect.left, squigglyY, rect.right, squigglyY + squigglyHeight);
- int /*long*/ pen = Gdip.Pen_new(brush, squigglyThickness);
+ long /*int*/ pen = Gdip.Pen_new(brush, squigglyThickness);
gstate = Gdip.Graphics_Save(graphics);
if (gdipRect != null) {
Gdip.Graphics_SetClip(graphics, gdipRect, Gdip.CombineModeExclude);
@@ -1454,7 +1454,7 @@ RECT drawUnderlineGDIP (int /*long*/ graphics, int x, int baseline, int lineUnde
}
Gdip.Graphics_DrawLines(graphics, pen, points, points.length / 2);
if (gdipRect != null) {
- int /*long*/ selPen = Gdip.Pen_new(selectionColor, squigglyThickness);
+ long /*int*/ selPen = Gdip.Pen_new(selectionColor, squigglyThickness);
Gdip.Graphics_Restore(graphics, gstate);
gstate = Gdip.Graphics_Save(graphics);
Gdip.Graphics_SetClip(graphics, gdipRect, Gdip.CombineModeIntersect);
@@ -1505,7 +1505,7 @@ RECT drawUnderlineGDIP (int /*long*/ graphics, int x, int baseline, int lineUnde
break;
case UNDERLINE_IME_DOT:
case UNDERLINE_IME_DASH: {
- int /*long*/ pen = Gdip.Pen_new(brush, 1);
+ long /*int*/ pen = Gdip.Pen_new(brush, 1);
int dashStyle = style.underlineStyle == UNDERLINE_IME_DOT ? Gdip.DashStyleDot : Gdip.DashStyleDash;
Gdip.Pen_SetDashStyle(pen, dashStyle);
if (gdipRect != null) {
@@ -1517,7 +1517,7 @@ RECT drawUnderlineGDIP (int /*long*/ graphics, int x, int baseline, int lineUnde
Gdip.Graphics_Restore(graphics, gstate);
gstate = Gdip.Graphics_Save(graphics);
Gdip.Graphics_SetClip(graphics, gdipRect, Gdip.CombineModeIntersect);
- int /*long*/ selPen = Gdip.Pen_new(brush, 1);
+ long /*int*/ selPen = Gdip.Pen_new(brush, 1);
Gdip.Pen_SetDashStyle(selPen, dashStyle);
Gdip.Graphics_DrawLine(graphics, selPen, rect.left, baseline + run.descent, run.width - run.length, baseline + run.descent);
Gdip.Graphics_Restore(graphics, gstate);
@@ -1670,7 +1670,7 @@ public Rectangle getBounds (int start, int end) {
cx = metrics.width * (start - run.start);
} else if (!run.tab) {
int[] piX = new int[1];
- int /*long*/ advances = run.justify != 0 ? run.justify : run.advances;
+ long /*int*/ advances = run.justify != 0 ? run.justify : run.advances;
OS.ScriptCPtoX(start - run.start, false, run.length, run.glyphCount, run.clusters, run.visAttrs, advances, run.analysis, piX);
cx = isRTL ? run.width - piX[0] : piX[0];
}
@@ -1687,7 +1687,7 @@ public Rectangle getBounds (int start, int end) {
cx = metrics.width * (end - run.start + 1);
} else if (!run.tab) {
int[] piX = new int[1];
- int /*long*/ advances = run.justify != 0 ? run.justify : run.advances;
+ long /*int*/ advances = run.justify != 0 ? run.justify : run.advances;
OS.ScriptCPtoX(end - run.start, true, run.length, run.glyphCount, run.clusters, run.visAttrs, advances, run.analysis, piX);
cx = isRTL ? run.width - piX[0] : piX[0];
}
@@ -1775,7 +1775,7 @@ public boolean getJustify () {
return justify;
}
-int /*long*/ getItemFont (StyleItem item) {
+long /*int*/ getItemFont (StyleItem item) {
if (item.fallbackFont != 0) return item.fallbackFont;
if (item.style != null && item.style.font != null) {
return item.style.font.handle;
@@ -1929,8 +1929,8 @@ public FontMetrics getLineMetrics (int lineIndex) {
checkLayout();
computeRuns(null);
if (!(0 <= lineIndex && lineIndex < runs.length)) SWT.error(SWT.ERROR_INVALID_RANGE);
- int /*long*/ hDC = device.internal_new_GC(null);
- int /*long*/ srcHdc = OS.CreateCompatibleDC(hDC);
+ long /*int*/ hDC = device.internal_new_GC(null);
+ long /*int*/ srcHdc = OS.CreateCompatibleDC(hDC);
TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW() : new TEXTMETRICA();
OS.SelectObject(srcHdc, font != null ? font.handle : device.systemFont.handle);
OS.GetTextMetrics(srcHdc, lptm);
@@ -2053,7 +2053,7 @@ public Point getLocation (int offset, boolean trailing) {
int cChars = run.length;
int gGlyphs = run.glyphCount;
int[] piX = new int[1];
- int /*long*/ advances = run.justify != 0 ? run.justify : run.advances;
+ long /*int*/ advances = run.justify != 0 ? run.justify : run.advances;
OS.ScriptCPtoX(runOffset, trailing, cChars, gGlyphs, run.clusters, run.visAttrs, advances, run.analysis, piX);
width = (orientation & SWT.RIGHT_TO_LEFT) != 0 ? run.width - piX[0] : piX[0];
}
@@ -2263,7 +2263,7 @@ public int getOffset (int x, int y, int[] trailing) {
if ((orientation & SWT.RIGHT_TO_LEFT) != 0) {
xRun = run.width - xRun;
}
- int /*long*/ advances = run.justify != 0 ? run.justify : run.advances;
+ long /*int*/ advances = run.justify != 0 ? run.justify : run.advances;
OS.ScriptXtoCP(xRun, cChars, cGlyphs, run.clusters, run.visAttrs, advances, run.analysis, piCP, piTrailing);
int offset = run.start + piCP[0];
int length = segmentsText.length();
@@ -2319,7 +2319,7 @@ void getPartialSelection(StyleItem run, int selectionStart, int selectionEnd, RE
int gGlyphs = run.glyphCount;
int[] piX = new int[1];
int x = rect.left;
- int /*long*/ advances = run.justify != 0 ? run.justify : run.advances;
+ long /*int*/ advances = run.justify != 0 ? run.justify : run.advances;
OS.ScriptCPtoX(selStart, false, cChars, gGlyphs, run.clusters, run.visAttrs, advances, run.analysis, piX);
int runX = (orientation & SWT.RIGHT_TO_LEFT) != 0 ? run.width - piX[0] : piX[0];
rect.left = x + runX;
@@ -2621,8 +2621,8 @@ StyleItem[] itemize () {
OS.ScriptApplyDigitSubstitution(null, scriptControl, scriptState);
- int /*long*/ hHeap = OS.GetProcessHeap();
- int /*long*/ pItems = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, MAX_ITEM * SCRIPT_ITEM.sizeof);
+ long /*int*/ hHeap = OS.GetProcessHeap();
+ long /*int*/ pItems = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, MAX_ITEM * SCRIPT_ITEM.sizeof);
if (pItems == 0) SWT.error(SWT.ERROR_NO_HANDLES);
int[] pcItems = new int[1];
char[] chars = new char[length];
@@ -2638,7 +2638,7 @@ StyleItem[] itemize () {
/*
* Merge styles ranges and script items
*/
-StyleItem[] merge (int /*long*/ items, int itemCount) {
+StyleItem[] merge (long /*int*/ items, int itemCount) {
if (styles.length > stylesCount) {
StyleItem[] newStyles = new StyleItem[stylesCount];
System.arraycopy(styles, 0, newStyles, 0, stylesCount);
@@ -3233,7 +3233,7 @@ public void setWrapIndent (int wrapIndent) {
this.wrapIndent = wrapIndent;
}
-boolean shape (int /*long*/ hdc, StyleItem run, char[] chars, int[] glyphCount, int maxGlyphs, SCRIPT_PROPERTIES sp) {
+boolean shape (long /*int*/ hdc, StyleItem run, char[] chars, int[] glyphCount, int maxGlyphs, SCRIPT_PROPERTIES sp) {
boolean useCMAPcheck = !sp.fComplex && !run.analysis.fNoGlyphIndex;
if (useCMAPcheck) {
short[] glyphs = new short[chars.length];
@@ -3241,7 +3241,7 @@ boolean shape (int /*long*/ hdc, StyleItem run, char[] chars, int[] glyphCount,
if (run.psc != 0) {
OS.ScriptFreeCache(run.psc);
glyphCount[0] = 0;
- OS.MoveMemory(run.psc, new int /*long*/ [1], OS.PTR_SIZEOF);
+ OS.MoveMemory(run.psc, new long /*int*/ [1], OS.PTR_SIZEOF);
}
return false;
}
@@ -3266,7 +3266,7 @@ boolean shape (int /*long*/ hdc, StyleItem run, char[] chars, int[] glyphCount,
if (run.psc != 0) {
OS.ScriptFreeCache(run.psc);
glyphCount[0] = 0;
- OS.MoveMemory(run.psc, new int /*long*/ [1], OS.PTR_SIZEOF);
+ OS.MoveMemory(run.psc, new long /*int*/ [1], OS.PTR_SIZEOF);
}
run.glyphCount = 0;
return false;
@@ -3275,7 +3275,7 @@ boolean shape (int /*long*/ hdc, StyleItem run, char[] chars, int[] glyphCount,
/*
* Generate glyphs for one Run.
*/
-void shape (final int /*long*/ hdc, final StyleItem run) {
+void shape (final long /*int*/ hdc, final StyleItem run) {
if (run.tab || run.lineBreak) return;
if (run.glyphs != 0) return;
final int[] buffer = new int[1];
@@ -3283,7 +3283,7 @@ void shape (final int /*long*/ hdc, final StyleItem run) {
segmentsText.getChars(run.start, run.start + run.length, chars, 0);
final int maxGlyphs = (chars.length * 3 / 2) + 16;
- int /*long*/ hHeap = OS.GetProcessHeap();
+ long /*int*/ hHeap = OS.GetProcessHeap();
run.glyphs = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, maxGlyphs * 2);
if (run.glyphs == 0) SWT.error(SWT.ERROR_NO_HANDLES);
run.clusters = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, maxGlyphs * 2);
@@ -3303,8 +3303,8 @@ void shape (final int /*long*/ hdc, final StyleItem run) {
}
}
if (!shapeSucceed) {
- int /*long*/ hFont = OS.GetCurrentObject(hdc, OS.OBJ_FONT);
- int /*long*/ newFont = 0;
+ long /*int*/ hFont = OS.GetCurrentObject(hdc, OS.OBJ_FONT);
+ long /*int*/ newFont = 0;
/*
* Bug in Uniscribe. In some version of Uniscribe, ScriptStringAnalyse crashes
* when the character array is too long. The fix is to limit the size of character
@@ -3323,9 +3323,9 @@ void shape (final int /*long*/ hdc, final StyleItem run) {
}
}
if (count > 0) {
- int /*long*/ ssa = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, OS.SCRIPT_STRING_ANALYSIS_sizeof());
- int /*long*/ metaFileDc = OS.CreateEnhMetaFile(hdc, null, null, null);
- int /*long*/ oldMetaFont = OS.SelectObject(metaFileDc, hFont);
+ long /*int*/ ssa = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, OS.SCRIPT_STRING_ANALYSIS_sizeof());
+ long /*int*/ metaFileDc = OS.CreateEnhMetaFile(hdc, null, null, null);
+ long /*int*/ oldMetaFont = OS.SelectObject(metaFileDc, hFont);
int flags = OS.SSA_METAFILE | OS.SSA_FALLBACK | OS.SSA_GLYPHS | OS.SSA_LINK;
if (OS.ScriptStringAnalyse(metaFileDc, sampleChars, count, 0, -1, flags, 0, null, null, 0, 0, 0, ssa) == OS.S_OK) {
OS.ScriptStringOut(ssa, 0, 0, 0, null, 0, 0, false);
@@ -3333,10 +3333,10 @@ void shape (final int /*long*/ hdc, final StyleItem run) {
}
OS.HeapFree(hHeap, 0, ssa);
OS.SelectObject(metaFileDc, oldMetaFont);
- int /*long*/ metaFile = OS.CloseEnhMetaFile(metaFileDc);
+ long /*int*/ metaFile = OS.CloseEnhMetaFile(metaFileDc);
final EMREXTCREATEFONTINDIRECTW emr = new EMREXTCREATEFONTINDIRECTW();
class MetaFileEnumProc {
- int /*long*/ metaFileEnumProc (int /*long*/ hDC, int /*long*/ table, int /*long*/ record, int /*long*/ nObj, int /*long*/ lpData) {
+ long /*int*/ metaFileEnumProc (long /*int*/ hDC, long /*int*/ table, long /*int*/ record, long /*int*/ nObj, long /*int*/ lpData) {
OS.MoveMemory(emr.emr, record, EMR.sizeof);
switch (emr.emr.iType) {
case OS.EMR_EXTCREATEFONTINDIRECTW:
@@ -3353,7 +3353,7 @@ void shape (final int /*long*/ hdc, final StyleItem run) {
boolean compilerWarningWorkaround = false;
if (compilerWarningWorkaround) object.metaFileEnumProc(0, 0, 0, 0, 0);
Callback callback = new Callback(object, "metaFileEnumProc", 5);
- int /*long*/ address = callback.getAddress();
+ long /*int*/ address = callback.getAddress();
if (address == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS);
OS.EnumEnhMetaFile(0, metaFile, address, 0, null);
OS.DeleteEnhMetaFile(metaFile);
@@ -3372,7 +3372,7 @@ void shape (final int /*long*/ hdc, final StyleItem run) {
if (index > 0) {
StyleItem pRun = allRuns[index - 1];
if (pRun.analysis.eScript == run.analysis.eScript) {
- int /*long*/ pFont = getItemFont(pRun);
+ long /*int*/ pFont = getItemFont(pRun);
LOGFONT logFont = OS.IsUnicode ? (LOGFONT)new LOGFONTW() : new LOGFONTA();
OS.GetObject(pFont, LOGFONT.sizeof, logFont);
newFont = OS.CreateFontIndirect(logFont);
@@ -3384,7 +3384,7 @@ void shape (final int /*long*/ hdc, final StyleItem run) {
if (nRun.analysis.eScript == run.analysis.eScript) {
OS.SelectObject(hdc, getItemFont(nRun));
shape(hdc, nRun);
- int /*long*/ nFont = getItemFont(nRun);
+ long /*int*/ nFont = getItemFont(nRun);
LOGFONT logFont = OS.IsUnicode ? (LOGFONT)new LOGFONTW() : new LOGFONTA();
OS.GetObject(nFont, LOGFONT.sizeof, logFont);
newFont = OS.CreateFontIndirect(logFont);
@@ -3414,7 +3414,7 @@ void shape (final int /*long*/ hdc, final StyleItem run) {
}
if (!shapeSucceed) {
if (mLangFontLink2 != 0) {
- int /*long*/[] hNewFont = new int /*long*/[1];
+ long /*int*/[] hNewFont = new long /*int*/[1];
int[] dwCodePages = new int[1], cchCodePages = new int[1];
/* GetStrCodePages() */
OS.VtblCall(4, mLangFontLink2, chars, chars.length, 0, dwCodePages, cchCodePages);
@@ -3424,8 +3424,8 @@ void shape (final int /*long*/ hdc, final StyleItem run) {
OS.GetObject(hNewFont[0], LOGFONT.sizeof, logFont);
/* ReleaseFont() */
OS.VtblCall(8, mLangFontLink2, hNewFont[0]);
- int /*long*/ mLangFont = OS.CreateFontIndirect(logFont);
- int /*long*/ oldFont = OS.SelectObject(hdc, mLangFont);
+ long /*int*/ mLangFont = OS.CreateFontIndirect(logFont);
+ long /*int*/ oldFont = OS.SelectObject(hdc, mLangFont);
if (shapeSucceed = shape(hdc, run, chars, buffer, maxGlyphs, sp)) {
run.fallbackFont = mLangFont;
} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java
index 41fa940be6..7e3b953985 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Transform.java
@@ -45,7 +45,7 @@ public class Transform extends Resource {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
/**
* Constructs a new identity Transform.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/BidiUtil.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/BidiUtil.java
index 54cba35304..b2b09bd730 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/BidiUtil.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/BidiUtil.java
@@ -106,7 +106,7 @@ public class BidiUtil {
* @param runnable the code that should be executed when a keyboard language change
* occurs
*/
-public static void addLanguageListener (int /*long*/ hwnd, Runnable runnable) {
+public static void addLanguageListener (long /*int*/ hwnd, Runnable runnable) {
languageMap.put(new LONG(hwnd), runnable);
subclass(hwnd);
}
@@ -116,7 +116,7 @@ public static void addLanguageListener (Control control, Runnable runnable) {
/**
* Proc used for OS.EnumSystemLanguageGroups call during isBidiPlatform test.
*/
-static int /*long*/ EnumSystemLanguageGroupsProc(int /*long*/ lpLangGrpId, int /*long*/ lpLangGrpIdString, int /*long*/ lpLangGrpName, int /*long*/ options, int /*long*/ lParam) {
+static long /*int*/ EnumSystemLanguageGroupsProc(long /*int*/ lpLangGrpId, long /*int*/ lpLangGrpIdString, long /*int*/ lpLangGrpName, long /*int*/ options, long /*int*/ lParam) {
if ((int)/*64*/lpLangGrpId == OS.LGRPID_HEBREW) {
isBidiPlatform = 1;
return 0;
@@ -172,7 +172,7 @@ public static void drawGlyphs(GC gc, char[] renderBuffer, int[] renderDx, int x,
*/
public static char[] getRenderInfo(GC gc, String text, int[] order, byte[] classBuffer, int[] dx, int flags, int [] offsets) {
int fontLanguageInfo = OS.GetFontLanguageInfo(gc.handle);
- int /*long*/ hHeap = OS.GetProcessHeap();
+ long /*int*/ hHeap = OS.GetProcessHeap();
int[] lpCs = new int[8];
int cs = OS.GetTextCharset(gc.handle);
boolean isRightOriented = false;
@@ -188,10 +188,10 @@ public static char[] getRenderInfo(GC gc, String text, int[] order, byte[] class
GCP_RESULTS result = new GCP_RESULTS();
result.lStructSize = GCP_RESULTS.sizeof;
result.nGlyphs = byteCount;
- int /*long*/ lpOrder = result.lpOrder = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4);
- int /*long*/ lpDx = result.lpDx = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4);
- int /*long*/ lpClass = result.lpClass = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
- int /*long*/ lpGlyphs = result.lpGlyphs = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 2);
+ long /*int*/ lpOrder = result.lpOrder = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4);
+ long /*int*/ lpDx = result.lpDx = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4);
+ long /*int*/ lpClass = result.lpClass = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ lpGlyphs = result.lpGlyphs = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 2);
// set required dwFlags
int dwFlags = 0;
@@ -305,7 +305,7 @@ public static char[] getRenderInfo(GC gc, String text, int[] order, byte[] class
*/
public static void getOrderInfo(GC gc, String text, int[] order, byte[] classBuffer, int flags, int [] offsets) {
int fontLanguageInfo = OS.GetFontLanguageInfo(gc.handle);
- int /*long*/ hHeap = OS.GetProcessHeap();
+ long /*int*/ hHeap = OS.GetProcessHeap();
int[] lpCs = new int[8];
int cs = OS.GetTextCharset(gc.handle);
OS.TranslateCharsetInfo(cs, lpCs, OS.TCI_SRCCHARSET);
@@ -319,8 +319,8 @@ public static void getOrderInfo(GC gc, String text, int[] order, byte[] classBuf
GCP_RESULTS result = new GCP_RESULTS();
result.lStructSize = GCP_RESULTS.sizeof;
result.nGlyphs = byteCount;
- int /*long*/ lpOrder = result.lpOrder = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4);
- int /*long*/ lpClass = result.lpClass = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ lpOrder = result.lpOrder = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount * 4);
+ long /*int*/ lpClass = result.lpClass = OS.HeapAlloc(hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
// set required dwFlags, these values will affect how the text gets rendered and
// ordered
@@ -407,7 +407,7 @@ public static int getFontBidiAttributes(GC gc) {
* KEYBOARD_NON_BIDI)
*/
public static int getKeyboardLanguage() {
- int /*long*/ layout = OS.GetKeyboardLayout(0);
+ long /*int*/ layout = OS.GetKeyboardLayout(0);
return isBidiLang(layout) ? KEYBOARD_BIDI : KEYBOARD_NON_BIDI;
}
/**
@@ -416,15 +416,15 @@ public static int getKeyboardLanguage() {
*
* @return integer array with an entry for each installed language
*/
-static int /*long*/[] getKeyboardLanguageList() {
+static long /*int*/[] getKeyboardLanguageList() {
int maxSize = 10;
- int /*long*/[] tempList = new int /*long*/[maxSize];
+ long /*int*/[] tempList = new long /*int*/[maxSize];
int size = OS.GetKeyboardLayoutList(maxSize, tempList);
- int /*long*/[] list = new int /*long*/[size];
+ long /*int*/[] list = new long /*int*/[size];
System.arraycopy(tempList, 0, list, 0, size);
return list;
}
-static boolean isBidiLang(int /*long*/ lang) {
+static boolean isBidiLang(long /*int*/ lang) {
int id = OS.PRIMARYLANGID(OS.LOWORD(lang));
return id == LANG_ARABIC || id == LANG_HEBREW || id == LANG_FARSI;
}
@@ -455,7 +455,7 @@ public static boolean isBidiPlatform() {
Callback callback = null;
try {
callback = new Callback (Class.forName (CLASS_NAME), "EnumSystemLanguageGroupsProc", 5); //$NON-NLS-1$
- int /*long*/ lpEnumSystemLanguageGroupsProc = callback.getAddress ();
+ long /*int*/ lpEnumSystemLanguageGroupsProc = callback.getAddress ();
if (lpEnumSystemLanguageGroupsProc == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS);
OS.EnumSystemLanguageGroups(lpEnumSystemLanguageGroupsProc, OS.LGRPID_INSTALLED, 0);
callback.dispose ();
@@ -479,7 +479,7 @@ public static boolean isBidiPlatform() {
* @return true if bidi is supported, false otherwise.
*/
public static boolean isKeyboardBidi() {
- int /*long*/[] list = getKeyboardLanguageList();
+ long /*int*/[] list = getKeyboardLanguageList();
for (int i=0; i= 6) {
flags |= OS.ILC_COLOR32;
} else {
- int /*long*/ hDC = OS.GetDC (0);
+ long /*int*/ hDC = OS.GetDC (0);
int bits = OS.GetDeviceCaps (hDC, OS.BITSPIXEL);
int planes = OS.GetDeviceCaps (hDC, OS.PLANES);
OS.ReleaseDC (0, hDC);
@@ -81,13 +81,13 @@ public int addRef() {
return ++refCount;
}
-int /*long*/ copyBitmap (int /*long*/ hImage, int width, int height) {
+long /*int*/ copyBitmap (long /*int*/ hImage, int width, int height) {
BITMAP bm = new BITMAP ();
OS.GetObject (hImage, BITMAP.sizeof, bm);
- int /*long*/ hDC = OS.GetDC (0);
- int /*long*/ hdc1 = OS.CreateCompatibleDC (hDC);
+ long /*int*/ hDC = OS.GetDC (0);
+ long /*int*/ hdc1 = OS.CreateCompatibleDC (hDC);
OS.SelectObject (hdc1, hImage);
- int /*long*/ hdc2 = OS.CreateCompatibleDC (hDC);
+ long /*int*/ hdc2 = OS.CreateCompatibleDC (hDC);
/*
* Feature in Windows. If a bitmap has a 32-bit depth and any
* pixel has an alpha value different than zero, common controls
@@ -98,7 +98,7 @@ int /*long*/ copyBitmap (int /*long*/ hImage, int width, int height) {
* remove the alpha channel of opaque images by down sampling
* it to 24-bit depth.
*/
- int /*long*/ hBitmap;
+ long /*int*/ hBitmap;
if (bm.bmBitsPixel == 32 && OS.COMCTL32_MAJOR >= 6) {
BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER();
bmiHeader.biSize = BITMAPINFOHEADER.sizeof;
@@ -130,7 +130,7 @@ int /*long*/ copyBitmap (int /*long*/ hImage, int width, int height) {
bmi[offset + 10] = (byte)((blueMask & 0xFF00) >> 8);
bmi[offset + 11] = (byte)((blueMask & 0xFF) >> 0);
}
- int /*long*/[] pBits = new int /*long*/[1];
+ long /*int*/[] pBits = new long /*int*/[1];
hBitmap = OS.CreateDIBSection(0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
} else {
hBitmap = OS.CreateCompatibleBitmap (hDC, width, height);
@@ -148,23 +148,23 @@ int /*long*/ copyBitmap (int /*long*/ hImage, int width, int height) {
return hBitmap;
}
-int /*long*/ copyIcon (int /*long*/ hImage, int width, int height) {
+long /*int*/ copyIcon (long /*int*/ hImage, int width, int height) {
if (OS.IsWinCE) SWT.error(SWT.ERROR_NOT_IMPLEMENTED);
- int /*long*/ hIcon = OS.CopyImage (hImage, OS.IMAGE_ICON, width, height, 0);
+ long /*int*/ hIcon = OS.CopyImage (hImage, OS.IMAGE_ICON, width, height, 0);
return hIcon != 0 ? hIcon : hImage;
}
-int /*long*/ copyWithAlpha (int /*long*/ hBitmap, int background, byte[] alphaData, int destWidth, int destHeight) {
+long /*int*/ copyWithAlpha (long /*int*/ hBitmap, int background, byte[] alphaData, int destWidth, int destHeight) {
BITMAP bm = new BITMAP ();
OS.GetObject (hBitmap, BITMAP.sizeof, bm);
int srcWidth = bm.bmWidth;
int srcHeight = bm.bmHeight;
/* Create resources */
- int /*long*/ hdc = OS.GetDC (0);
- int /*long*/ srcHdc = OS.CreateCompatibleDC (hdc);
- int /*long*/ oldSrcBitmap = OS.SelectObject (srcHdc, hBitmap);
- int /*long*/ memHdc = OS.CreateCompatibleDC (hdc);
+ long /*int*/ hdc = OS.GetDC (0);
+ long /*int*/ srcHdc = OS.CreateCompatibleDC (hdc);
+ long /*int*/ oldSrcBitmap = OS.SelectObject (srcHdc, hBitmap);
+ long /*int*/ memHdc = OS.CreateCompatibleDC (hdc);
BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER ();
bmiHeader.biSize = BITMAPINFOHEADER.sizeof;
bmiHeader.biWidth = srcWidth;
@@ -174,10 +174,10 @@ int /*long*/ copyWithAlpha (int /*long*/ hBitmap, int background, byte[] alphaDa
bmiHeader.biCompression = OS.BI_RGB;
byte [] bmi = new byte[BITMAPINFOHEADER.sizeof];
OS.MoveMemory (bmi, bmiHeader, BITMAPINFOHEADER.sizeof);
- int /*long*/ [] pBits = new int /*long*/ [1];
- int /*long*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
+ long /*int*/ [] pBits = new long /*int*/ [1];
+ long /*int*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
if (memDib == 0) SWT.error (SWT.ERROR_NO_HANDLES);
- int /*long*/ oldMemBitmap = OS.SelectObject (memHdc, memDib);
+ long /*int*/ oldMemBitmap = OS.SelectObject (memHdc, memDib);
BITMAP dibBM = new BITMAP ();
OS.GetObject (memDib, BITMAP.sizeof, dibBM);
@@ -226,10 +226,10 @@ int /*long*/ copyWithAlpha (int /*long*/ hBitmap, int background, byte[] alphaDa
bmiHeader2.biCompression = OS.BI_RGB;
byte [] bmi2 = new byte[BITMAPINFOHEADER.sizeof];
OS.MoveMemory (bmi2, bmiHeader2, BITMAPINFOHEADER.sizeof);
- int /*long*/ [] pBits2 = new int /*long*/ [1];
- int /*long*/ memDib2 = OS.CreateDIBSection (0, bmi2, OS.DIB_RGB_COLORS, pBits2, 0, 0);
- int /*long*/ memHdc2 = OS.CreateCompatibleDC (hdc);
- int /*long*/ oldMemBitmap2 = OS.SelectObject (memHdc2, memDib2);
+ long /*int*/ [] pBits2 = new long /*int*/ [1];
+ long /*int*/ memDib2 = OS.CreateDIBSection (0, bmi2, OS.DIB_RGB_COLORS, pBits2, 0, 0);
+ long /*int*/ memHdc2 = OS.CreateCompatibleDC (hdc);
+ long /*int*/ oldMemBitmap2 = OS.SelectObject (memHdc2, memDib2);
if (!OS.IsWinCE) OS.SetStretchBltMode(memHdc2, OS.COLORONCOLOR);
OS.StretchBlt (memHdc2, 0, 0, destWidth, destHeight, memHdc, 0, 0, srcWidth, srcHeight, OS.SRCCOPY);
OS.SelectObject (memHdc2, oldMemBitmap2);
@@ -248,7 +248,7 @@ int /*long*/ copyWithAlpha (int /*long*/ hBitmap, int background, byte[] alphaDa
return memDib;
}
-int /*long*/ createMaskFromAlpha (ImageData data, int destWidth, int destHeight) {
+long /*int*/ createMaskFromAlpha (ImageData data, int destWidth, int destHeight) {
int srcWidth = data.width;
int srcHeight = data.height;
ImageData mask = ImageData.internal_new (srcWidth, srcHeight, 1,
@@ -260,13 +260,13 @@ int /*long*/ createMaskFromAlpha (ImageData data, int destWidth, int destHeight)
mask.setPixel (x, y, (data.alphaData [ap++] & 0xff) <= 127 ? 1 : 0);
}
}
- int /*long*/ hMask = OS.CreateBitmap (srcWidth, srcHeight, 1, 1, mask.data);
+ long /*int*/ hMask = OS.CreateBitmap (srcWidth, srcHeight, 1, 1, mask.data);
if (srcWidth != destWidth || srcHeight != destHeight) {
- int /*long*/ hdc = OS.GetDC (0);
- int /*long*/ hdc1 = OS.CreateCompatibleDC (hdc);
+ long /*int*/ hdc = OS.GetDC (0);
+ long /*int*/ hdc1 = OS.CreateCompatibleDC (hdc);
OS.SelectObject (hdc1, hMask);
- int /*long*/ hdc2 = OS.CreateCompatibleDC (hdc);
- int /*long*/ hMask2 = OS.CreateBitmap (destWidth, destHeight, 1, 1, null);
+ long /*int*/ hdc2 = OS.CreateCompatibleDC (hdc);
+ long /*int*/ hMask2 = OS.CreateBitmap (destWidth, destHeight, 1, 1, null);
OS.SelectObject (hdc2, hMask2);
if (!OS.IsWinCE) OS.SetStretchBltMode(hdc2, OS.COLORONCOLOR);
OS.StretchBlt (hdc2, 0, 0, destWidth, destHeight, hdc1, 0, 0, srcWidth, srcHeight, OS.SRCCOPY);
@@ -279,14 +279,14 @@ int /*long*/ createMaskFromAlpha (ImageData data, int destWidth, int destHeight)
return hMask;
}
-int /*long*/ createMask (int /*long*/ hBitmap, int destWidth, int destHeight, int background, int transparentPixel) {
+long /*int*/ createMask (long /*int*/ hBitmap, int destWidth, int destHeight, int background, int transparentPixel) {
BITMAP bm = new BITMAP ();
OS.GetObject (hBitmap, BITMAP.sizeof, bm);
int srcWidth = bm.bmWidth;
int srcHeight = bm.bmHeight;
- int /*long*/ hMask = OS.CreateBitmap (destWidth, destHeight, 1, 1, null);
- int /*long*/ hDC = OS.GetDC (0);
- int /*long*/ hdc1 = OS.CreateCompatibleDC (hDC);
+ long /*int*/ hMask = OS.CreateBitmap (destWidth, destHeight, 1, 1, null);
+ long /*int*/ hDC = OS.GetDC (0);
+ long /*int*/ hdc1 = OS.CreateCompatibleDC (hDC);
if (background != -1) {
OS.SelectObject (hdc1, hBitmap);
@@ -316,7 +316,7 @@ int /*long*/ createMask (int /*long*/ hBitmap, int destWidth, int destHeight, in
OS.SetBkColor (hdc1, background);
}
- int /*long*/ hdc2 = OS.CreateCompatibleDC (hDC);
+ long /*int*/ hdc2 = OS.CreateCompatibleDC (hDC);
OS.SelectObject (hdc2, hMask);
if (destWidth != srcWidth || destHeight != srcHeight) {
if (!OS.IsWinCE) OS.SetStretchBltMode (hdc2, OS.COLORONCOLOR);
@@ -329,7 +329,7 @@ int /*long*/ createMask (int /*long*/ hBitmap, int destWidth, int destHeight, in
/* Put back the original palette */
if (originalColors != null) OS.SetDIBColorTable(hdc1, 0, 1 << bm.bmBitsPixel, originalColors);
} else {
- int /*long*/ hOldBitmap = OS.SelectObject (hdc1, hMask);
+ long /*int*/ hOldBitmap = OS.SelectObject (hdc1, hMask);
OS.PatBlt (hdc1, 0, 0, destWidth, destHeight, OS.BLACKNESS);
OS.SelectObject (hdc1, hOldBitmap);
}
@@ -352,7 +352,7 @@ public int getStyle () {
return style;
}
-public int /*long*/ getHandle () {
+public long /*int*/ getHandle () {
return handle;
}
@@ -393,7 +393,7 @@ public int removeRef() {
}
void set (int index, Image image, int count) {
- int /*long*/ hImage = image.handle;
+ long /*int*/ hImage = image.handle;
int [] cx = new int [1], cy = new int [1];
OS.ImageList_GetIconSize (handle, cx, cy);
switch (image.type) {
@@ -401,7 +401,7 @@ void set (int index, Image image, int count) {
/*
* Note that the image size has to match the image list icon size.
*/
- int /*long*/ hBitmap = 0, hMask = 0;
+ long /*int*/ hBitmap = 0, hMask = 0;
ImageData data = image.getImageData ();
switch (data.getTransparencyType ()) {
case SWT.TRANSPARENCY_ALPHA:
@@ -439,7 +439,7 @@ void set (int index, Image image, int count) {
if (OS.IsWinCE) {
OS.ImageList_ReplaceIcon (handle, index == count ? -1 : index, hImage);
} else {
- int /*long*/ hIcon = copyIcon (hImage, cx [0], cy [0]);
+ long /*int*/ hIcon = copyIcon (hImage, cx [0], cy [0]);
OS.ImageList_ReplaceIcon (handle, index == count ? -1 : index, hIcon);
OS.DestroyIcon (hIcon);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java
index 4b44a64e42..04b29fb7e6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java
@@ -54,10 +54,10 @@ public class Button extends Control {
static final int CHECK_WIDTH, CHECK_HEIGHT;
static final int ICON_WIDTH = 128, ICON_HEIGHT = 128;
static /*final*/ boolean COMMAND_LINK = false;
- static final int /*long*/ ButtonProc;
+ static final long /*int*/ ButtonProc;
static final TCHAR ButtonClass = new TCHAR (0, "BUTTON", true);
static {
- int /*long*/ hBitmap = OS.LoadBitmap (0, OS.OBM_CHECKBOXES);
+ long /*int*/ hBitmap = OS.LoadBitmap (0, OS.OBM_CHECKBOXES);
if (hBitmap == 0) {
CHECK_WIDTH = OS.GetSystemMetrics (OS.IsWinCE ? OS.SM_CXSMICON : OS.SM_CXVSCROLL);
CHECK_HEIGHT = OS.GetSystemMetrics (OS.IsWinCE ? OS.SM_CYSMICON : OS.SM_CYVSCROLL);
@@ -164,7 +164,7 @@ void _setImage (Image image) {
} else {
if (image2 != null) image2.dispose ();
image2 = null;
- int /*long*/ hImage = 0;
+ long /*int*/ hImage = 0;
int imageBits = 0, fImageType = 0;
if (image != null) {
switch (image.type) {
@@ -215,14 +215,14 @@ void _setImage (Image image) {
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (4, 10)) {
Rectangle rect = image.getBounds ();
- int /*long*/ hDC = OS.GetDC (handle);
- int /*long*/ dstHdc = OS.CreateCompatibleDC (hDC);
- int /*long*/ hBitmap = OS.CreateCompatibleBitmap (hDC, rect.width, rect.height);
- int /*long*/ oldBitmap = OS.SelectObject (dstHdc, hBitmap);
+ long /*int*/ hDC = OS.GetDC (handle);
+ long /*int*/ dstHdc = OS.CreateCompatibleDC (hDC);
+ long /*int*/ hBitmap = OS.CreateCompatibleBitmap (hDC, rect.width, rect.height);
+ long /*int*/ oldBitmap = OS.SelectObject (dstHdc, hBitmap);
OS.SetLayout (dstHdc, OS.LAYOUT_RTL);
if (fImageType == OS.IMAGE_BITMAP) {
- int /*long*/ srcHdc = OS.CreateCompatibleDC (hDC);
- int /*long*/ oldSrcBitmap = OS.SelectObject (srcHdc, hImage);
+ long /*int*/ srcHdc = OS.CreateCompatibleDC (hDC);
+ long /*int*/ oldSrcBitmap = OS.SelectObject (srcHdc, hImage);
OS.SetLayout (dstHdc, 0);
OS.BitBlt (dstHdc, 0, 0, rect.width, rect.height, srcHdc, 0, 0, OS.SRCCOPY);
OS.SelectObject (srcHdc, oldSrcBitmap);
@@ -230,8 +230,8 @@ void _setImage (Image image) {
} else {
Control control = findBackgroundControl ();
if (control == null) control = this;
- int /*long*/ newBrush = OS.CreateSolidBrush (control.getBackgroundPixel ());
- int /*long*/ oldBrush = OS.SelectObject (dstHdc, newBrush);
+ long /*int*/ newBrush = OS.CreateSolidBrush (control.getBackgroundPixel ());
+ long /*int*/ oldBrush = OS.SelectObject (dstHdc, newBrush);
OS.PatBlt (dstHdc, 0, 0, rect.width, rect.height, OS.PATCOPY);
OS.DrawIconEx (dstHdc, 0, 0, hImage, 0, 0, 0, 0, OS.DI_NORMAL);
OS.SelectObject (dstHdc, oldBrush);
@@ -338,7 +338,7 @@ public void addSelectionListener (SelectionListener listener) {
addListener (SWT.DefaultSelection,typedListener);
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.CallWindowProc (ButtonProc, hwnd, msg, wParam, lParam);
}
@@ -377,9 +377,9 @@ int computeLeftMargin () {
if (image != null && text.length () != 0) {
Rectangle bounds = image.getBounds ();
margin += bounds.width + MARGIN * 2;
- int /*long*/ oldFont = 0;
- int /*long*/ hDC = OS.GetDC (handle);
- int /*long*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
+ long /*int*/ oldFont = 0;
+ long /*int*/ hDC = OS.GetDC (handle);
+ long /*int*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
TCHAR buffer = new TCHAR (getCodePage (), text, true);
RECT rect = new RECT ();
@@ -446,9 +446,9 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
}
}
if (hasText) {
- int /*long*/ oldFont = 0;
- int /*long*/ hDC = OS.GetDC (handle);
- int /*long*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
+ long /*int*/ oldFont = 0;
+ long /*int*/ hDC = OS.GetDC (handle);
+ long /*int*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
OS.GetTextMetrics (hDC, lptm);
@@ -720,7 +720,7 @@ String getNameText () {
public boolean getSelection () {
checkWidget ();
if ((style & (SWT.CHECK | SWT.RADIO | SWT.TOGGLE)) == 0) return false;
- int /*long*/ flags = OS.SendMessage (handle, OS.BM_GETCHECK, 0, 0);
+ long /*int*/ flags = OS.SendMessage (handle, OS.BM_GETCHECK, 0, 0);
return flags != OS.BST_UNCHECKED;
}
@@ -886,7 +886,7 @@ public void setAlignment (int alignment) {
void setDefault (boolean value) {
if ((style & SWT.PUSH) == 0) return;
- int /*long*/ hwndShell = menuShell ().handle;
+ long /*int*/ hwndShell = menuShell ().handle;
int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
if (value) {
bits |= OS.BS_DEFPUSHBUTTON;
@@ -961,7 +961,7 @@ public void setGrayed (boolean grayed) {
checkWidget ();
if ((style & SWT.CHECK) == 0) return;
this.grayed = grayed;
- int /*long*/ flags = OS.SendMessage (handle, OS.BM_GETCHECK, 0, 0);
+ long /*int*/ flags = OS.SendMessage (handle, OS.BM_GETCHECK, 0, 0);
if (grayed) {
if (flags == OS.BST_CHECKED) updateSelection (OS.BST_INDETERMINATE);
} else {
@@ -1179,12 +1179,12 @@ TCHAR windowClass () {
return ButtonClass;
}
-int /*long*/ windowProc () {
+long /*int*/ windowProc () {
return ButtonProc;
}
-LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
if (result != null) return result;
/*
@@ -1206,7 +1206,7 @@ LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETDLGCODE (wParam, lParam);
if (result != null) return result;
if ((style & SWT.ARROW) != 0) {
@@ -1215,7 +1215,7 @@ LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Ensure that there is an accessible object created for this
* control because support for radio button position in group
@@ -1227,7 +1227,7 @@ LRESULT WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_GETOBJECT (wParam, lParam);
}
-LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KILLFOCUS (wParam, lParam);
if ((style & SWT.PUSH) != 0 && getDefault ()) {
menuShell ().setDefaultButton (null, false);
@@ -1235,17 +1235,17 @@ LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreMouse) return null;
return super.WM_LBUTTONDOWN (wParam, lParam);
}
-LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreMouse) return null;
return super.WM_LBUTTONUP (wParam, lParam);
}
-LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When Windows sets focus to
* a radio button, it sets the WS_TABSTOP style.
@@ -1266,7 +1266,7 @@ LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
if (result != null) return result;
if (OS.COMCTL32_MAJOR >= 6) {
@@ -1284,14 +1284,14 @@ LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SYSCOLORCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SYSCOLORCHANGE (wParam, lParam);
if (result != null) return result;
if (image2 != null) _setImage (image);
return result;
}
-LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam);
if (result != null) return result;
/*
@@ -1318,7 +1318,7 @@ LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) {
}
if (redraw) {
OS.InvalidateRect (handle, null, false);
- int /*long*/ code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam);
+ long /*int*/ code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam);
return new LRESULT (code);
}
}
@@ -1336,7 +1336,7 @@ LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) {
int code = OS.HIWORD (wParam);
switch (code) {
case OS.BN_CLICKED:
@@ -1357,7 +1357,7 @@ LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) {
return super.wmCommandChild (wParam, lParam);
}
-LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Bug in Windows. For some reason, the HBRUSH that
* is returned from WM_CTRLCOLOR is misaligned when
@@ -1378,7 +1378,7 @@ LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT wmDrawChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmDrawChild (long /*int*/ wParam, long /*int*/ lParam) {
if ((style & SWT.ARROW) == 0) return super.wmDrawChild (wParam, lParam);
DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT ();
OS.MoveMemory (struct, lParam, DRAWITEMSTRUCT.sizeof);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java
index 6e50f11203..5391eaccbd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java
@@ -84,7 +84,7 @@ void clearArea (int x, int y, int width, int height) {
if (OS.IsWindowVisible (handle)) {
RECT rect = new RECT ();
OS.SetRect (rect, x, y, x + width, y + height);
- int /*long*/ hDC = OS.GetDCEx (handle, 0, OS.DCX_CACHE | OS.DCX_CLIPCHILDREN | OS.DCX_CLIPSIBLINGS);
+ long /*int*/ hDC = OS.GetDCEx (handle, 0, OS.DCX_CACHE | OS.DCX_CLIPCHILDREN | OS.DCX_CLIPSIBLINGS);
drawBackground (hDC, rect);
OS.ReleaseDC (handle, hDC);
}
@@ -328,7 +328,7 @@ TCHAR windowClass () {
return super.windowClass ();
}
-int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (msg == Display.SWT_RESTORECARET) {
if ((state & CANVAS) != 0) {
if (caret != null) {
@@ -341,7 +341,7 @@ int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*
return super.windowProc (hwnd, msg, wParam, lParam);
}
-LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CHAR (wParam, lParam);
if (result != null) return result;
if (caret != null) {
@@ -363,7 +363,7 @@ LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_IME_COMPOSITION (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_IME_COMPOSITION (long /*int*/ wParam, long /*int*/ lParam) {
if (ime != null) {
LRESULT result = ime.WM_IME_COMPOSITION (wParam, lParam);
if (result != null) return result;
@@ -389,7 +389,7 @@ LRESULT WM_IME_COMPOSITION (int /*long*/ wParam, int /*long*/ lParam) {
lpCompForm.dwStyle = OS.CFS_POINT;
lpCompForm.x = ptCurrentPos.x;
lpCompForm.y = ptCurrentPos.y;
- int /*long*/ hIMC = OS.ImmGetContext (handle);
+ long /*int*/ hIMC = OS.ImmGetContext (handle);
OS.ImmSetCompositionWindow (hIMC, lpCompForm);
OS.ImmReleaseContext (handle, hIMC);
}
@@ -400,7 +400,7 @@ LRESULT WM_IME_COMPOSITION (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_IME_COMPOSITION (wParam, lParam);
}
-LRESULT WM_IME_COMPOSITION_START (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_IME_COMPOSITION_START (long /*int*/ wParam, long /*int*/ lParam) {
if (ime != null) {
LRESULT result = ime.WM_IME_COMPOSITION_START (wParam, lParam);
if (result != null) return result;
@@ -408,7 +408,7 @@ LRESULT WM_IME_COMPOSITION_START (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_IME_COMPOSITION_START (wParam, lParam);
}
-LRESULT WM_IME_ENDCOMPOSITION (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_IME_ENDCOMPOSITION (long /*int*/ wParam, long /*int*/ lParam) {
if (ime != null) {
LRESULT result = ime.WM_IME_ENDCOMPOSITION (wParam, lParam);
if (result != null) return result;
@@ -416,7 +416,7 @@ LRESULT WM_IME_ENDCOMPOSITION (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_IME_ENDCOMPOSITION (wParam, lParam);
}
-LRESULT WM_INPUTLANGCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_INPUTLANGCHANGE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_INPUTLANGCHANGE (wParam, lParam);
if (caret != null && caret.isFocusCaret ()) {
caret.setIMEFont ();
@@ -425,7 +425,7 @@ LRESULT WM_INPUTLANGCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
if (ime != null) {
LRESULT result = ime.WM_KILLFOCUS (wParam, lParam);
if (result != null) return result;
@@ -436,7 +436,7 @@ LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
if (ime != null) {
LRESULT result = ime.WM_LBUTTONDOWN (wParam, lParam);
if (result != null) return result;
@@ -444,19 +444,19 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_LBUTTONDOWN (wParam, lParam);
}
-LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETFOCUS (wParam, lParam);
if (caret != null && caret.isFocusCaret ()) caret.setFocus ();
return result;
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
if (caret != null && caret.isFocusCaret ()) caret.resizeIME ();
return result;
}
-LRESULT WM_WINDOWPOSCHANGED (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_WINDOWPOSCHANGED (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_WINDOWPOSCHANGED (wParam, lParam);
//if (result != null) return result;
/*
@@ -471,7 +471,7 @@ LRESULT WM_WINDOWPOSCHANGED (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam);
if (result != null) return result;
/*
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java
index 890eee4bc1..60f497a1d3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java
@@ -84,10 +84,10 @@ void createWidget () {
}
}
-int /*long*/ defaultFont () {
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hwndIME = OS.ImmGetDefaultIMEWnd (hwnd);
- int /*long*/ hFont = 0;
+long /*int*/ defaultFont () {
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hwndIME = OS.ImmGetDefaultIMEWnd (hwnd);
+ long /*int*/ hFont = 0;
if (hwndIME != 0) {
hFont = OS.SendMessage (hwndIME, OS.WM_GETFONT, 0, 0);
}
@@ -138,7 +138,7 @@ public Rectangle getBounds () {
public Font getFont () {
checkWidget();
if (font == null) {
- int /*long*/ hFont = defaultFont ();
+ long /*int*/ hFont = defaultFont ();
return Font.win32_new (display, hFont);
}
return font;
@@ -280,8 +280,8 @@ void resizeIME () {
if (!OS.IsDBLocale) return;
POINT ptCurrentPos = new POINT ();
if (!OS.GetCaretPos (ptCurrentPos)) return;
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hIMC = OS.ImmGetContext (hwnd);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hIMC = OS.ImmGetContext (hwnd);
IME ime = parent.getIME ();
if (ime != null && ime.isInlineEnabled ()) {
Point size = getSize ();
@@ -322,9 +322,9 @@ void releaseWidget () {
void resize () {
resized = false;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
OS.DestroyCaret ();
- int /*long*/ hBitmap = image != null ? image.handle : 0;
+ long /*int*/ hBitmap = image != null ? image.handle : 0;
int width = this.width;
if (!OS.IsWinCE && image == null && width == 0) {
int [] buffer = new int [1];
@@ -341,8 +341,8 @@ void resize () {
void restoreIMEFont () {
if (!OS.IsDBLocale) return;
if (oldFont == null) return;
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hIMC = OS.ImmGetContext (hwnd);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hIMC = OS.ImmGetContext (hwnd);
OS.ImmSetCompositionFont (hIMC, oldFont);
OS.ImmReleaseContext (hwnd, hIMC);
oldFont = null;
@@ -401,8 +401,8 @@ public void setBounds (Rectangle rect) {
}
void setFocus () {
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hBitmap = 0;
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hBitmap = 0;
if (image != null) hBitmap = image.handle;
int width = this.width;
if (!OS.IsWinCE && image == null && width == 0) {
@@ -467,11 +467,11 @@ public void setImage (Image image) {
void setIMEFont () {
if (!OS.IsDBLocale) return;
- int /*long*/ hFont = 0;
+ long /*int*/ hFont = 0;
if (font != null) hFont = font.handle;
if (hFont == 0) hFont = defaultFont ();
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hIMC = OS.ImmGetContext (hwnd);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hIMC = OS.ImmGetContext (hwnd);
/* Save the current IME font */
if (oldFont == null) {
oldFont = OS.IsUnicode ? (LOGFONT) new LOGFONTW () : new LOGFONTA ();
@@ -582,7 +582,7 @@ public void setVisible (boolean visible) {
checkWidget();
if (visible == isVisible) return;
isVisible = visible;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
if (OS.GetFocus () != hwnd) return;
if (!isVisible) {
OS.HideCaret (hwnd);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java
index 42b641ab22..f98d0c32d6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java
@@ -96,7 +96,7 @@ public ColorDialog (Shell parent, int style) {
checkSubclass ();
}
-int /*long*/ CCHookProc (int /*long*/ hdlg, int /*long*/ uiMsg, int /*long*/ lParam, int /*long*/ lpData) {
+long /*int*/ CCHookProc (long /*int*/ hdlg, long /*int*/ uiMsg, long /*int*/ lParam, long /*int*/ lpData) {
switch ((int)/*64*/uiMsg) {
case OS.WM_INITDIALOG: {
RECT rect = new RECT ();
@@ -168,8 +168,8 @@ public RGB[] getRGBs() {
public RGB open () {
/* Get the owner HWND for the dialog */
- int /*long*/ hwndOwner = parent.handle;
- int /*long*/ hwndParent = parent.handle;
+ long /*int*/ hwndOwner = parent.handle;
+ long /*int*/ hwndParent = parent.handle;
/*
* Feature in Windows. There is no API to set the orientation of a
@@ -201,13 +201,13 @@ public RGB open () {
/* Create the CCHookProc */
Callback callback = new Callback (this, "CCHookProc", 4); //$NON-NLS-1$
- int /*long*/ lpfnHook = callback.getAddress ();
+ long /*int*/ lpfnHook = callback.getAddress ();
if (lpfnHook == 0) error(SWT.ERROR_NO_MORE_CALLBACKS);
/* Allocate the Custom Colors and initialize to white */
display = parent.display;
if (display.lpCustColors == 0) {
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
display.lpCustColors = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, CUSTOM_COLOR_COUNT * 4);
for (int i=0; i < CUSTOM_COLOR_COUNT; i++) {
colors[i] = 0x00FFFFFF;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java
index 151a99a213..b4260ccfd1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java
@@ -60,7 +60,7 @@ import org.eclipse.swt.events.*;
public class Combo extends Composite {
boolean noSelection, ignoreDefaultSelection, ignoreCharacter, ignoreModify, ignoreResize, lockText;
int scrollWidth, visibleCount;
- int /*long*/ cbtHook;
+ long /*int*/ cbtHook;
static final int VISIBLE_COUNT = 5;
@@ -87,9 +87,9 @@ public class Combo extends Composite {
*/
static final int CBID_LIST = 1000;
static final int CBID_EDIT = 1001;
- static /*final*/ int /*long*/ EditProc, ListProc;
+ static /*final*/ long /*int*/ EditProc, ListProc;
- static final int /*long*/ ComboProc;
+ static final long /*int*/ ComboProc;
static final TCHAR ComboClass = new TCHAR (0, "COMBOBOX", true);
static {
WNDCLASS lpWndClass = new WNDCLASS ();
@@ -283,7 +283,7 @@ public void addVerifyListener (VerifyListener listener) {
addListener (SWT.Verify, typedListener);
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
if (hwnd == handle) {
switch (msg) {
@@ -291,7 +291,7 @@ int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, in
ignoreResize = true;
boolean oldLockText = lockText;
if ((style & SWT.READ_ONLY) == 0) lockText = true;
- int /*long*/ result = OS.CallWindowProc (ComboProc, hwnd, msg, wParam, lParam);
+ long /*int*/ result = OS.CallWindowProc (ComboProc, hwnd, msg, wParam, lParam);
if ((style & SWT.READ_ONLY) == 0) lockText = oldLockText;
ignoreResize = false;
return result;
@@ -299,30 +299,30 @@ int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, in
}
return OS.CallWindowProc (ComboProc, hwnd, msg, wParam, lParam);
}
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwnd == hwndText) {
if (lockText && msg == OS.WM_SETTEXT) {
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
int length = OS.GetWindowTextLength (handle);
TCHAR buffer = new TCHAR (getCodePage (), length + 1);
OS.GetWindowText (handle, buffer, length + 1);
int byteCount = buffer.length () * TCHAR.sizeof;
- int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (pszText, buffer, byteCount);
- int /*long*/ code = OS.CallWindowProc (EditProc, hwndText, msg, wParam, pszText);
+ long /*int*/ code = OS.CallWindowProc (EditProc, hwndText, msg, wParam, pszText);
OS.HeapFree (hHeap, 0, pszText);
return code;
}
return OS.CallWindowProc (EditProc, hwnd, msg, wParam, lParam);
}
- int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
+ long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
if (hwnd == hwndList) {
return OS.CallWindowProc (ListProc, hwnd, msg, wParam, lParam);
}
return OS.DefWindowProc (hwnd, msg, wParam, lParam);
}
-int /*long*/ CBTProc (int /*long*/ nCode, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ CBTProc (long /*int*/ nCode, long /*int*/ wParam, long /*int*/ lParam) {
if ((int)/*64*/nCode == OS.HCBT_CREATEWND) {
TCHAR buffer = new TCHAR (0, 128);
OS.GetClassName (wParam, buffer, buffer.length ());
@@ -335,7 +335,7 @@ int /*long*/ CBTProc (int /*long*/ nCode, int /*long*/ wParam, int /*long*/ lPar
return OS.CallNextHookEx (cbtHook, (int)/*64*/nCode, wParam, lParam);
}
-boolean checkHandle (int /*long*/ hwnd) {
+boolean checkHandle (long /*int*/ hwnd) {
return hwnd == handle || hwnd == OS.GetDlgItem (handle, CBID_EDIT) || hwnd == OS.GetDlgItem (handle, CBID_LIST);
}
@@ -397,8 +397,8 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int width = 0, height = 0;
if (wHint == SWT.DEFAULT) {
- int /*long*/ newFont, oldFont = 0;
- int /*long*/ hDC = OS.GetDC (handle);
+ long /*int*/ newFont, oldFont = 0;
+ long /*int*/ hDC = OS.GetDC (handle);
newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
int count = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0);
@@ -443,9 +443,9 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
if ((style & SWT.READ_ONLY) != 0) {
width += 8;
} else {
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwndText != 0) {
- int /*long*/ margins = OS.SendMessage (hwndText, OS.EM_GETMARGINS, 0, 0);
+ long /*int*/ margins = OS.SendMessage (hwndText, OS.EM_GETMARGINS, 0, 0);
int marginWidth = OS.LOWORD (margins) + OS.HIWORD (margins);
width += marginWidth + 3;
}
@@ -505,7 +505,7 @@ void createHandle () {
} else {
int threadId = OS.GetCurrentThreadId ();
Callback cbtCallback = new Callback (this, "CBTProc", 3); //$NON-NLS-1$
- int /*long*/ cbtProc = cbtCallback.getAddress ();
+ long /*int*/ cbtProc = cbtCallback.getAddress ();
if (cbtProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
cbtHook = OS.SetWindowsHookEx (OS.WH_CBT, cbtProc, 0, threadId);
super.createHandle ();
@@ -516,11 +516,11 @@ void createHandle () {
state &= ~(CANVAS | THEME_BACKGROUND);
/* Get the text and list window procs */
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwndText != 0 && EditProc == 0) {
EditProc = OS.GetWindowLongPtr (hwndText, OS.GWLP_WNDPROC);
}
- int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
+ long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
if (hwndList != 0 && ListProc == 0) {
ListProc = OS.GetWindowLongPtr (hwndList, OS.GWLP_WNDPROC);
}
@@ -550,7 +550,7 @@ void createWidget() {
OS.SystemParametersInfo (OS.SPI_GETWORKAREA, 0, rect, 0);
maxHeight = (rect.bottom - rect.top) / 3;
} else {
- int /*long*/ hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST);
+ long /*int*/ hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST);
MONITORINFO lpmi = new MONITORINFO ();
lpmi.cbSize = MONITORINFO.sizeof;
OS.GetMonitorInfo (hmonitor, lpmi);
@@ -587,9 +587,9 @@ int defaultBackground () {
void deregister () {
super.deregister ();
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwndText != 0) display.removeControl (hwndText);
- int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
+ long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
if (hwndList != 0) display.removeControl (hwndList);
}
@@ -635,14 +635,14 @@ public void deselectAll () {
// widget could be disposed at this point
}
-boolean dragDetect (int /*long*/ hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) {
+boolean dragDetect (long /*int*/ hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) {
if (filter && (style & SWT.READ_ONLY) == 0) {
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwndText != 0) {
int [] start = new int [1], end = new int [1];
OS.SendMessage (handle, OS.CB_GETEDITSEL, start, end);
if (start [0] != end [0]) {
- int /*long*/ lParam = OS.MAKELPARAM (x, y);
+ long /*int*/ lParam = OS.MAKELPARAM (x, y);
int position = OS.LOWORD (OS.SendMessage (hwndText, OS.EM_CHARFROMPOS, 0, lParam));
if (start [0] <= position && position < end [0]) {
if (super.dragDetect (hwnd, x, y, filter, detect, consume)) {
@@ -684,8 +684,8 @@ public Point getCaretLocation () {
* pixel coordinates (0,0).
*/
int position = getCaretPosition ();
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
- int /*long*/ caretPos = OS.SendMessage (hwndText, OS.EM_POSFROMCHAR, position, 0);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ caretPos = OS.SendMessage (hwndText, OS.EM_POSFROMCHAR, position, 0);
if (caretPos == -1) {
caretPos = 0;
if (position >= OS.GetWindowTextLength (hwndText)) {
@@ -739,7 +739,7 @@ public Point getCaretLocation () {
public int getCaretPosition () {
checkWidget ();
int [] start = new int [1], end = new int [1];
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
OS.SendMessage (hwndText, OS.EM_GETSEL, start, end);
/*
* In Windows, there is no API to get the position of the caret
@@ -761,9 +761,9 @@ public int getCaretPosition () {
if (lpgui.hwndCaret == hwndText || lpgui.hwndCaret == 0) {
POINT ptCurrentPos = new POINT ();
if (OS.GetCaretPos (ptCurrentPos)) {
- int /*long*/ endPos = OS.SendMessage (hwndText, OS.EM_POSFROMCHAR, end [0], 0);
+ long /*int*/ endPos = OS.SendMessage (hwndText, OS.EM_POSFROMCHAR, end [0], 0);
if (endPos == -1) {
- int /*long*/ startPos = OS.SendMessage (hwndText, OS.EM_POSFROMCHAR, start [0], 0);
+ long /*int*/ startPos = OS.SendMessage (hwndText, OS.EM_POSFROMCHAR, start [0], 0);
int startX = OS.GET_X_LPARAM (startPos);
if (ptCurrentPos.x > startX) caret = end [0];
} else {
@@ -1050,7 +1050,7 @@ public int getTextHeight () {
*/
public int getTextLimit () {
checkWidget ();
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwndText == 0) return LIMIT;
return (int)/*64*/OS.SendMessage (hwndText, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF;
}
@@ -1078,12 +1078,12 @@ public int getVisibleItemCount () {
}
boolean hasFocus () {
- int /*long*/ hwndFocus = OS.GetFocus ();
+ long /*int*/ hwndFocus = OS.GetFocus ();
if (hwndFocus == handle) return true;
if (hwndFocus == 0) return false;
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwndFocus == hwndText) return true;
- int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
+ long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
if (hwndFocus == hwndList) return true;
return false;
}
@@ -1161,7 +1161,7 @@ public int indexOf (String string, int start) {
int mbcsToWcsPos (int mbcsPos) {
if (mbcsPos <= 0) return 0;
if (OS.IsUnicode) return mbcsPos;
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwndText == 0) return mbcsPos;
int mbcsSize = OS.GetWindowTextLengthA (hwndText);
if (mbcsSize == 0) return 0;
@@ -1193,9 +1193,9 @@ public void paste () {
void register () {
super.register ();
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwndText != 0) display.addControl (hwndText, this);
- int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
+ long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
if (hwndList != 0) display.addControl (hwndList, this);
}
@@ -1285,7 +1285,7 @@ public void remove (int start, int end) {
}
int textLength = OS.GetWindowTextLength (handle);
RECT rect = null;
- int /*long*/ hDC = 0, oldFont = 0, newFont = 0;
+ long /*int*/ hDC = 0, oldFont = 0, newFont = 0;
int newWidth = 0;
if ((style & SWT.H_SCROLL) != 0) {
rect = new RECT ();
@@ -1449,7 +1449,7 @@ public void removeVerifyListener (VerifyListener listener) {
eventTable.unhook (SWT.Verify, listener);
}
-boolean sendKeyEvent (int type, int msg, int /*long*/ wParam, int /*long*/ lParam, Event event) {
+boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lParam, Event event) {
if (!super.sendKeyEvent (type, msg, wParam, lParam, event)) {
return false;
}
@@ -1490,7 +1490,7 @@ boolean sendKeyEvent (int type, int msg, int /*long*/ wParam, int /*long*/ lPara
/* Verify the character */
String oldText = "";
int [] start = new int [1], end = new int [1];
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwndText == 0) return true;
OS.SendMessage (hwndText, OS.EM_GETSEL, start, end);
switch (key) {
@@ -1562,19 +1562,19 @@ public void select (int index) {
}
}
-void setBackgroundImage (int /*long*/ hBitmap) {
+void setBackgroundImage (long /*int*/ hBitmap) {
super.setBackgroundImage (hBitmap);
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwndText != 0) OS.InvalidateRect (hwndText, null, true);
- int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
+ long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
if (hwndList != 0) OS.InvalidateRect (hwndList, null, true);
}
void setBackgroundPixel (int pixel) {
super.setBackgroundPixel (pixel);
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwndText != 0) OS.InvalidateRect (hwndText, null, true);
- int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
+ long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
if (hwndList != 0) OS.InvalidateRect (hwndList, null, true);
}
@@ -1647,9 +1647,9 @@ public void setFont (Font font) {
void setForegroundPixel (int pixel) {
super.setForegroundPixel (pixel);
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwndText != 0) OS.InvalidateRect (hwndText, null, true);
- int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
+ long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
if (hwndList != 0) OS.InvalidateRect (hwndList, null, true);
}
@@ -1700,7 +1700,7 @@ public void setItems (String [] items) {
if (items [i] == null) error (SWT.ERROR_INVALID_ARGUMENT);
}
RECT rect = null;
- int /*long*/ hDC = 0, oldFont = 0, newFont = 0;
+ long /*int*/ hDC = 0, oldFont = 0, newFont = 0;
int newWidth = 0;
if ((style & SWT.H_SCROLL) != 0) {
rect = new RECT ();
@@ -1753,8 +1753,8 @@ public void setOrientation (int orientation) {
void setScrollWidth () {
int newWidth = 0;
RECT rect = new RECT ();
- int /*long*/ newFont, oldFont = 0;
- int /*long*/ hDC = OS.GetDC (handle);
+ long /*int*/ newFont, oldFont = 0;
+ long /*int*/ hDC = OS.GetDC (handle);
newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
int cp = getCodePage ();
@@ -1791,7 +1791,7 @@ void setScrollWidth (int scrollWidth) {
OS.SystemParametersInfo (OS.SPI_GETWORKAREA, 0, rect, 0);
maxWidth = (rect.right - rect.left) / 4;
} else {
- int /*long*/ hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST);
+ long /*int*/ hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST);
MONITORINFO lpmi = new MONITORINFO ();
lpmi.cbSize = MONITORINFO.sizeof;
OS.GetMonitorInfo (hmonitor, lpmi);
@@ -1823,8 +1823,8 @@ void setScrollWidth (int scrollWidth) {
void setScrollWidth (TCHAR buffer, boolean grow) {
RECT rect = new RECT ();
- int /*long*/ newFont, oldFont = 0;
- int /*long*/ hDC = OS.GetDC (handle);
+ long /*int*/ newFont, oldFont = 0;
+ long /*int*/ hDC = OS.GetDC (handle);
newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX;
@@ -1868,7 +1868,7 @@ public void setSelection (Point selection) {
start = wcsToMbcsPos (start);
end = wcsToMbcsPos (end);
}
- int /*long*/ bits = OS.MAKELPARAM (start, end);
+ long /*int*/ bits = OS.MAKELPARAM (start, end);
OS.SendMessage (handle, OS.CB_SETEDITSEL, 0, bits);
}
@@ -1906,7 +1906,7 @@ public void setText (String string) {
return;
}
int limit = LIMIT;
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwndText != 0) {
limit = (int)/*64*/OS.SendMessage (hwndText, OS.EM_GETLIMITTEXT, 0, 0) & 0x7FFFFFFF;
}
@@ -1945,8 +1945,8 @@ public void setTextLimit (int limit) {
}
void setToolTipText (Shell shell, String string) {
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
- int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
if (hwndText != 0) shell.setToolTipText (hwndText, string);
if (hwndList != 0) shell.setToolTipText (hwndList, string);
shell.setToolTipText (handle, string);
@@ -1978,12 +1978,12 @@ public void setVisibleItemCount (int count) {
void subclass () {
super.subclass ();
- int /*long*/ newProc = display.windowProc;
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ newProc = display.windowProc;
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwndText != 0) {
OS.SetWindowLongPtr (hwndText, OS.GWLP_WNDPROC, newProc);
}
- int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
+ long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
if (hwndList != 0) {
OS.SetWindowLongPtr (hwndList, OS.GWLP_WNDPROC, newProc);
}
@@ -2029,11 +2029,11 @@ boolean traverseReturn () {
void unsubclass () {
super.unsubclass ();
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwndText != 0 && EditProc != 0) {
OS.SetWindowLongPtr (hwndText, OS.GWLP_WNDPROC, EditProc);
}
- int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
+ long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
if (hwndList != 0 && ListProc != 0) {
OS.SetWindowLongPtr (hwndList, OS.GWLP_WNDPROC, ListProc);
}
@@ -2068,7 +2068,7 @@ void updateOrientation () {
bits &= ~OS.WS_EX_LAYOUTRTL;
}
OS.SetWindowLong (handle, OS.GWL_EXSTYLE, bits);
- int /*long*/ hwndText = 0, hwndList = 0;
+ long /*int*/ hwndText = 0, hwndList = 0;
COMBOBOXINFO pcbi = new COMBOBOXINFO ();
pcbi.cbSize = COMBOBOXINFO.sizeof;
if (OS.GetComboBoxInfo (handle, pcbi)) {
@@ -2145,7 +2145,7 @@ String verifyText (String string, int start, int end, Event keyEvent) {
int wcsToMbcsPos (int wcsPos) {
if (wcsPos <= 0) return 0;
if (OS.IsUnicode) return wcsPos;
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwndText == 0) return wcsPos;
int mbcsSize = OS.GetWindowTextLengthA (hwndText);
if (mbcsSize == 0) return 0;
@@ -2175,15 +2175,15 @@ TCHAR windowClass () {
return ComboClass;
}
-int /*long*/ windowProc () {
+long /*int*/ windowProc () {
return ComboProc;
}
-int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
if (hwnd != handle) {
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
- int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
if ((hwndText != 0 && hwnd == hwndText) || (hwndList != 0 && hwnd == hwndList)) {
LRESULT result = null;
switch (msg) {
@@ -2266,16 +2266,16 @@ int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*
return super.windowProc (hwnd, msg, wParam, lParam);
}
-LRESULT WM_CTLCOLOR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CTLCOLOR (long /*int*/ wParam, long /*int*/ lParam) {
return wmColorChild (wParam, lParam);
}
-LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) {
- int /*long*/ code = callWindowProc (handle, OS.WM_GETDLGCODE, wParam, lParam);
+LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
+ long /*int*/ code = callWindowProc (handle, OS.WM_GETDLGCODE, wParam, lParam);
return new LRESULT (code | OS.DLGC_WANTARROWS);
}
-LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Bug in Windows. When a combo box that is read only
* is disposed in CBN_KILLFOCUS, Windows segment faults.
@@ -2295,7 +2295,7 @@ LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When an editable combo box is dropped
* down and the text in the entry field partially matches an
@@ -2318,7 +2318,7 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Return NULL - Focus notification is
* done by WM_COMMAND with CBN_SETFOCUS.
@@ -2326,7 +2326,7 @@ LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When a combo box is resized,
* the size of the drop down rectangle is specified
@@ -2347,9 +2347,9 @@ LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
if (OS.IsWindowVisible (handle)) {
if (OS.IsWinCE) {
- int /*long*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
+ long /*int*/ hwndText = OS.GetDlgItem (handle, CBID_EDIT);
if (hwndText != 0) OS.InvalidateRect (hwndText, null, true);
- int /*long*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
+ long /*int*/ hwndList = OS.GetDlgItem (handle, CBID_LIST);
if (hwndList != 0) OS.InvalidateRect (hwndList, null, true);
} else {
int uFlags = OS.RDW_ERASE | OS.RDW_INVALIDATE | OS.RDW_ALLCHILDREN;
@@ -2381,14 +2381,14 @@ LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam);
if (result != null) return result;
OS.InvalidateRect (handle, null, true);
return result;
}
-LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam);
if (result != null) return result;
/*
@@ -2417,15 +2417,15 @@ LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
int width = rect.right - rect.left;
int height = rect.bottom - rect.top;
if (width != 0 && height != 0) {
- int /*long*/ hwndParent = parent.handle;
- int /*long*/ hwndChild = OS.GetWindow (hwndParent, OS.GW_CHILD);
+ long /*int*/ hwndParent = parent.handle;
+ long /*int*/ hwndChild = OS.GetWindow (hwndParent, OS.GW_CHILD);
OS.MapWindowPoints (0, hwndParent, rect, 2);
- int /*long*/ rgn1 = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom);
+ long /*int*/ rgn1 = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom);
while (hwndChild != 0) {
if (hwndChild != handle) {
OS.GetWindowRect (hwndChild, rect);
OS.MapWindowPoints (0, hwndParent, rect, 2);
- int /*long*/ rgn2 = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom);
+ long /*int*/ rgn2 = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom);
OS.CombineRgn (rgn1, rgn1, rgn2, OS.RGN_DIFF);
OS.DeleteObject (rgn2);
}
@@ -2440,7 +2440,7 @@ LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT wmChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreCharacter) return null;
LRESULT result = super.wmChar (hwnd, wParam, lParam);
if (result != null) return result;
@@ -2470,7 +2470,7 @@ LRESULT wmChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT wmClipboard (int /*long*/ hwndText, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmClipboard (long /*int*/ hwndText, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if ((style & SWT.READ_ONLY) != 0) return null;
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return null;
boolean call = false;
@@ -2529,11 +2529,11 @@ LRESULT wmClipboard (int /*long*/ hwndText, int msg, int /*long*/ wParam, int /*
}
TCHAR buffer = new TCHAR (getCodePage (), newText, true);
if (msg == OS.WM_SETTEXT) {
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
int byteCount = buffer.length () * TCHAR.sizeof;
- int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (pszText, buffer, byteCount);
- int /*long*/ code = OS.CallWindowProc (EditProc, hwndText, msg, wParam, pszText);
+ long /*int*/ code = OS.CallWindowProc (EditProc, hwndText, msg, wParam, pszText);
OS.HeapFree (hHeap, 0, pszText);
return new LRESULT (code);
} else {
@@ -2545,7 +2545,7 @@ LRESULT wmClipboard (int /*long*/ hwndText, int msg, int /*long*/ wParam, int /*
return null;
}
-LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) {
int code = OS.HIWORD (wParam);
switch (code) {
case OS.CBN_EDITCHANGE:
@@ -2616,7 +2616,7 @@ LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) {
event.doit = true;
sendEvent (SWT.OrientationChange, event);
if (!event.doit) {
- int /*long*/ hwnd = lParam;
+ long /*int*/ hwnd = lParam;
int bits1 = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE);
int bits2 = OS.GetWindowLong (hwnd, OS.GWL_STYLE);
if (code == OS.EN_ALIGN_LTR_EC) {
@@ -2634,7 +2634,7 @@ LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) {
return super.wmCommandChild (wParam, lParam);
}
-LRESULT wmIMEChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmIMEChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
/* Process a DBCS character */
Display display = this.display;
@@ -2653,7 +2653,7 @@ LRESULT wmIMEChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam)
* them to the application.
*/
ignoreCharacter = true;
- int /*long*/ result = callWindowProc (hwnd, OS.WM_IME_CHAR, wParam, lParam);
+ long /*int*/ result = callWindowProc (hwnd, OS.WM_IME_CHAR, wParam, lParam);
MSG msg = new MSG ();
int flags = OS.PM_REMOVE | OS.PM_NOYIELD | OS.PM_QS_INPUT | OS.PM_QS_POSTMESSAGE;
while (OS.PeekMessage (msg, hwnd, OS.WM_CHAR, OS.WM_CHAR, flags)) {
@@ -2668,7 +2668,7 @@ LRESULT wmIMEChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam)
return new LRESULT (result);
}
-LRESULT wmKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreCharacter) return null;
LRESULT result = super.wmKeyDown (hwnd, wParam, lParam);
if (result != null) return result;
@@ -2683,7 +2683,7 @@ LRESULT wmKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam)
return result;
}
-LRESULT wmSysKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmSysKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When an editable combo box is dropped
* down using Alt+Down and the text in the entry field partially
@@ -2696,7 +2696,7 @@ LRESULT wmSysKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lPara
if (result != null) return result;
if ((style & SWT.READ_ONLY) == 0) {
if (wParam == OS.VK_DOWN) {
- int /*long*/ code = callWindowProc (hwnd, OS.WM_SYSKEYDOWN, wParam, lParam);
+ long /*int*/ code = callWindowProc (hwnd, OS.WM_SYSKEYDOWN, wParam, lParam);
int newSelection = (int)/*64*/OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0);
if (oldSelection != newSelection) {
sendEvent (SWT.Modify);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
index 746b0ab655..1f91f9e7f2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
@@ -97,7 +97,7 @@ public Composite (Composite parent, int style) {
Control [] _getChildren () {
int count = 0;
- int /*long*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD);
+ long /*int*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD);
if (hwndChild == 0) return new Control [0];
while (hwndChild != 0) {
count++;
@@ -193,7 +193,7 @@ void checkBuffered () {
void checkComposited () {
if ((state & CANVAS) != 0) {
if ((style & SWT.TRANSPARENT) != 0) {
- int /*long*/ hwndParent = parent.handle;
+ long /*int*/ hwndParent = parent.handle;
int bits = OS.GetWindowLong (hwndParent, OS.GWL_EXSTYLE);
bits |= OS.WS_EX_COMPOSITED;
OS.SetWindowLong (hwndParent, OS.GWL_EXSTYLE, bits);
@@ -273,13 +273,13 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
//#define PW_CLIENTONLY 0x00000001
//DCOrg() wrong
//topHandle wrong for Tree?
- int /*long*/ hDC = gc.handle;
+ long /*int*/ hDC = gc.handle;
int nSavedDC = OS.SaveDC (hDC);
OS.IntersectClipRect (hDC, 0, 0, width, height);
//WRONG PARENT
POINT lpPoint = new POINT ();
- int /*long*/ hwndParent = OS.GetParent (handle);
+ long /*int*/ hwndParent = OS.GetParent (handle);
OS.MapWindowPoints (handle, hwndParent, lpPoint, 1);
RECT rect = new RECT ();
OS.GetWindowRect (handle, rect);
@@ -347,7 +347,7 @@ public void drawBackground(GC gc, int x, int y, int width, int height, int offse
if (gc.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
RECT rect = new RECT ();
OS.SetRect (rect, x, y, x + width, y + height);
- int /*long*/ hDC = gc.handle;
+ long /*int*/ hDC = gc.handle;
int pixel = background == -1 ? gc.getBackground ().handle : -1;
drawBackground (hDC, rect, pixel, offsetX, offsetY);
}
@@ -457,7 +457,7 @@ int getChildrenCount () {
* non-registered children.
*/
int count = 0;
- int /*long*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD);
+ long /*int*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD);
while (hwndChild != 0) {
count++;
hwndChild = OS.GetWindow (hwndChild, OS.GW_HWNDNEXT);
@@ -849,8 +849,8 @@ void releaseParent () {
super.releaseParent ();
if ((state & CANVAS) != 0) {
if ((style & SWT.TRANSPARENT) != 0) {
- int /*long*/ hwndParent = parent.handle;
- int /*long*/ hwndChild = OS.GetWindow (hwndParent, OS.GW_CHILD);
+ long /*int*/ hwndParent = parent.handle;
+ long /*int*/ hwndChild = OS.GetWindow (hwndParent, OS.GW_CHILD);
while (hwndChild != 0) {
if (hwndChild != handle) {
int bits = OS.GetWindowLong (hwndParent, OS.GWL_EXSTYLE);
@@ -879,7 +879,7 @@ void releaseChildren (boolean destroy) {
void releaseWidget () {
super.releaseWidget ();
if ((state & CANVAS) != 0 && (style & SWT.EMBEDDED) != 0) {
- int /*long*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD);
+ long /*int*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD);
if (hwndChild != 0) {
int threadId = OS.GetWindowThreadProcessId (hwndChild, null);
if (threadId != OS.GetCurrentThreadId ()) {
@@ -920,7 +920,7 @@ void resizeChildren () {
boolean resizeChildren (boolean defer, WINDOWPOS [] pwp) {
if (pwp == null) return true;
- int /*long*/ hdwp = 0;
+ long /*int*/ hdwp = 0;
if (defer) {
hdwp = OS.BeginDeferWindowPos (pwp.length);
if (hdwp == 0) return false;
@@ -950,7 +950,7 @@ boolean resizeChildren (boolean defer, WINDOWPOS [] pwp) {
return true;
}
-void resizeEmbeddedHandle(int /*long*/ embeddedHandle, int width, int height) {
+void resizeEmbeddedHandle(long /*int*/ embeddedHandle, int width, int height) {
if (embeddedHandle == 0) return;
int [] processID = new int [1];
int threadId = OS.GetWindowThreadProcessId (embeddedHandle, processID);
@@ -1294,7 +1294,7 @@ void updateOrientation () {
}
void updateUIState () {
- int /*long*/ hwndShell = getShell ().handle;
+ long /*int*/ hwndShell = getShell ().handle;
int uiState = /*64*/(int)OS.SendMessage (hwndShell, OS.WM_QUERYUISTATE, 0, 0);
if ((uiState & OS.UISF_HIDEFOCUS) != 0) {
OS.SendMessage (hwndShell, OS.WM_CHANGEUISTATE, OS.MAKEWPARAM (OS.UIS_CLEAR, OS.UISF_HIDEFOCUS), 0);
@@ -1306,7 +1306,7 @@ int widgetStyle () {
return super.widgetStyle () | OS.WS_CLIPCHILDREN;
}
-LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
if (result != null) return result;
if ((state & CANVAS) != 0) {
@@ -1318,7 +1318,7 @@ LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETDLGCODE (wParam, lParam);
if (result != null) return result;
if ((state & CANVAS) != 0) {
@@ -1333,15 +1333,15 @@ LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_GETFONT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETFONT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETFONT (wParam, lParam);
if (result != null) return result;
- int /*long*/ code = callWindowProc (handle, OS.WM_GETFONT, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_GETFONT, wParam, lParam);
if (code != 0) return new LRESULT (code);
return new LRESULT (font != null ? font.handle : defaultFont ());
}
-LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam);
if (result == LRESULT.ZERO) return result;
@@ -1354,7 +1354,7 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_NCHITTEST (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_NCHITTEST (wParam, lParam);
if (result != null) return result;
/*
@@ -1371,7 +1371,7 @@ LRESULT WM_NCHITTEST (int /*long*/ wParam, int /*long*/ lParam) {
*/
if (!OS.IsWinCE && OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
if ((state & CANVAS)!= 0) {
- int /*long*/ code = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam);
if (code == OS.HTCLIENT) {
RECT rect = new RECT ();
OS.GetClientRect (handle, rect);
@@ -1390,7 +1390,7 @@ LRESULT WM_NCHITTEST (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_PARENTNOTIFY (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PARENTNOTIFY (long /*int*/ wParam, long /*int*/ lParam) {
if ((state & CANVAS) != 0 && (style & SWT.EMBEDDED) != 0) {
if (OS.LOWORD (wParam) == OS.WM_CREATE) {
RECT rect = new RECT ();
@@ -1401,7 +1401,7 @@ LRESULT WM_PARENTNOTIFY (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_PARENTNOTIFY (wParam, lParam);
}
-LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) {
if ((state & CANVAS) == 0 || (state & FOREIGN_HANDLE) != 0) {
return super.WM_PAINT (wParam, lParam);
}
@@ -1428,15 +1428,15 @@ LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
}
}
if (bufferedPaint) {
- int /*long*/ hDC = OS.BeginPaint (handle, ps);
+ long /*int*/ hDC = OS.BeginPaint (handle, ps);
int width = ps.right - ps.left;
int height = ps.bottom - ps.top;
if (width != 0 && height != 0) {
- int /*long*/ [] phdc = new int /*long*/ [1];
+ long /*int*/ [] phdc = new long /*int*/ [1];
int flags = OS.BPBF_COMPATIBLEBITMAP;
RECT prcTarget = new RECT ();
OS.SetRect (prcTarget, ps.left, ps.top, ps.right, ps.bottom);
- int /*long*/ hBufferedPaint = OS.BeginBufferedPaint (hDC, prcTarget, flags, null, phdc);
+ long /*int*/ hBufferedPaint = OS.BeginBufferedPaint (hDC, prcTarget, flags, null, phdc);
GCData data = new GCData ();
data.device = display;
data.foreground = getForegroundPixel ();
@@ -1475,7 +1475,7 @@ LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
GC gc = GC.win32_new (this, data);
/* Get the system region for the paint HDC */
- int /*long*/ sysRgn = 0;
+ long /*int*/ sysRgn = 0;
if ((style & (SWT.DOUBLE_BUFFERED | SWT.TRANSPARENT)) != 0 || (style & SWT.NO_MERGE_PAINTS) != 0) {
sysRgn = OS.CreateRectRgn (0, 0, 0, 0);
if (OS.GetRandomRgn (gc.handle, sysRgn, OS.SYSRGN) == 1) {
@@ -1484,7 +1484,7 @@ LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
int nBytes = OS.GetRegionData (sysRgn, 0, null);
int [] lpRgnData = new int [nBytes / 4];
OS.GetRegionData (sysRgn, nBytes, lpRgnData);
- int /*long*/ newSysRgn = OS.ExtCreateRegion (new float [] {-1, 0, 0, 1, 0, 0}, nBytes, lpRgnData);
+ long /*int*/ newSysRgn = OS.ExtCreateRegion (new float [] {-1, 0, 0, 1, 0, 0}, nBytes, lpRgnData);
OS.DeleteObject (sysRgn);
sysRgn = newSysRgn;
}
@@ -1583,7 +1583,7 @@ LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
gc.dispose ();
}
} else {
- int /*long*/ hDC = OS.BeginPaint (handle, ps);
+ long /*int*/ hDC = OS.BeginPaint (handle, ps);
if ((style & (SWT.NO_BACKGROUND | SWT.TRANSPARENT)) == 0) {
RECT rect = new RECT ();
OS.SetRect (rect, ps.left, ps.top, ps.right, ps.bottom);
@@ -1609,7 +1609,7 @@ LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
return LRESULT.ZERO;
}
-LRESULT WM_PRINTCLIENT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_PRINTCLIENT (wParam, lParam);
if (result != null) return result;
if ((state & CANVAS) != 0) {
@@ -1645,12 +1645,12 @@ LRESULT WM_PRINTCLIENT (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SETFONT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) {
if (lParam != 0) OS.InvalidateRect (handle, null, true);
return super.WM_SETFONT (wParam, lParam);
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = null;
if ((state & RESIZE_DEFERRED) != 0) {
result = super.WM_SIZE (wParam, lParam);
@@ -1698,10 +1698,10 @@ LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SYSCOLORCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SYSCOLORCHANGE (wParam, lParam);
if (result != null) return result;
- int /*long*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD);
+ long /*int*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD);
while (hwndChild != 0) {
OS.SendMessage (hwndChild, OS.WM_SYSCOLORCHANGE, 0, 0);
hwndChild = OS.GetWindow (hwndChild, OS.GW_HWNDNEXT);
@@ -1709,7 +1709,7 @@ LRESULT WM_SYSCOLORCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SYSCOMMAND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SYSCOMMAND (wParam, lParam);
if (result != null) return result;
@@ -1735,7 +1735,7 @@ LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) {
case OS.SC_VSCROLL:
boolean showHBar = horizontalBar != null && horizontalBar.getVisible ();
boolean showVBar = verticalBar != null && verticalBar.getVisible ();
- int /*long*/ code = callWindowProc (handle, OS.WM_SYSCOMMAND, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_SYSCOMMAND, wParam, lParam);
if ((showHBar != (horizontalBar != null && horizontalBar.getVisible ())) ||
(showVBar != (verticalBar != null && verticalBar.getVisible ()))) {
int flags = OS.RDW_FRAME | OS.RDW_INVALIDATE | OS.RDW_UPDATENOW;
@@ -1749,7 +1749,7 @@ LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam);
if (result != null) return result;
if ((state & CANVAS) != 0 && hooks (SWT.Paint)) {
@@ -1758,20 +1758,20 @@ LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT wmNCPaint (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNCPaint (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.wmNCPaint (hwnd, wParam, lParam);
if (result != null) return result;
- int /*long*/ borderHandle = borderHandle ();
+ long /*int*/ borderHandle = borderHandle ();
if ((state & CANVAS) != 0 || (hwnd == borderHandle && handle != borderHandle)) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
int bits1 = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE);
if ((bits1 & OS.WS_EX_CLIENTEDGE) != 0) {
- int /*long*/ code = 0;
+ long /*int*/ code = 0;
int bits2 = OS.GetWindowLong (hwnd, OS.GWL_STYLE);
if ((bits2 & (OS.WS_HSCROLL | OS.WS_VSCROLL)) != 0) {
code = callWindowProc (hwnd, OS.WM_NCPAINT, wParam, lParam);
}
- int /*long*/ hDC = OS.GetWindowDC (hwnd);
+ long /*int*/ hDC = OS.GetWindowDC (hwnd);
RECT rect = new RECT ();
OS.GetWindowRect (hwnd, rect);
rect.right -= rect.left;
@@ -1788,7 +1788,7 @@ LRESULT wmNCPaint (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam)
return result;
}
-LRESULT wmNotify (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
if (!OS.IsWinCE) {
switch (hdr.code) {
/*
@@ -1814,7 +1814,7 @@ LRESULT wmNotify (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
* check if the parent is already on top and neither set or clear
* the topmost status of the tool tip.
*/
- int /*long*/ hwndParent = hdr.hwndFrom;
+ long /*int*/ hwndParent = hdr.hwndFrom;
do {
hwndParent = OS.GetParent (hwndParent);
if (hwndParent == 0) break;
@@ -1824,7 +1824,7 @@ LRESULT wmNotify (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
if (hwndParent != 0) break;
display.lockActiveWindow = true;
int flags = OS.SWP_NOACTIVATE | OS.SWP_NOMOVE | OS.SWP_NOSIZE;
- int /*long*/ hwndInsertAfter = hdr.code == OS.TTN_SHOW ? OS.HWND_TOPMOST : OS.HWND_NOTOPMOST;
+ long /*int*/ hwndInsertAfter = hdr.code == OS.TTN_SHOW ? OS.HWND_TOPMOST : OS.HWND_NOTOPMOST;
SetWindowPos (hdr.hwndFrom, hwndInsertAfter, 0, 0, 0, 0, flags);
display.lockActiveWindow = false;
break;
@@ -1862,7 +1862,7 @@ LRESULT wmNotify (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
* the orientation of the control.
*/
Widget widget = null;
- int /*long*/ hwnd = hdr.idFrom;
+ long /*int*/ hwnd = hdr.idFrom;
if ((lpnmtdi.uFlags & OS.TTF_IDISHWND) != 0) {
widget = display.getControl (hwnd);
} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
index 7f7ad8410e..92056be90c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
@@ -58,7 +58,7 @@ public abstract class Control extends Widget implements Drawable {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
Composite parent;
Cursor cursor;
Menu menu;
@@ -531,7 +531,7 @@ int binarySearch (int [] indices, int start, int end, int index) {
return -low - 1;
}
-int /*long*/ borderHandle () {
+long /*int*/ borderHandle () {
return handle;
}
@@ -572,7 +572,7 @@ void checkComposited () {
/* Do nothing */
}
-boolean checkHandle (int /*long*/ hwnd) {
+boolean checkHandle (long /*int*/ hwnd) {
return hwnd == handle;
}
@@ -690,7 +690,7 @@ Widget [] computeTabList () {
}
void createHandle () {
- int /*long*/ hwndParent = widgetParent ();
+ long /*int*/ hwndParent = widgetParent ();
handle = OS.CreateWindowEx (
widgetExtStyle (),
windowClass (),
@@ -707,7 +707,7 @@ void createHandle () {
OS.SetWindowLongPtr (handle, OS.GWLP_ID, handle);
}
if (OS.IsDBLocale && hwndParent != 0) {
- int /*long*/ hIMC = OS.ImmGetContext (hwndParent);
+ long /*int*/ hIMC = OS.ImmGetContext (hwndParent);
OS.ImmAssociateContext (handle, hIMC);
OS.ImmReleaseContext (hwndParent, hIMC);
}
@@ -722,8 +722,8 @@ void checkGesture () {
* Feature in Windows 7: All gestures are enabled by default except GID_ROTATE.
* Enable it explicitly by calling SetGestureConfig.
*/
- int /*long*/ hHeap = OS.GetProcessHeap ();
- int /*long*/ pConfigs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, GESTURECONFIG.sizeof);
+ long /*int*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ pConfigs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, GESTURECONFIG.sizeof);
if (pConfigs != 0) {
GESTURECONFIG config = new GESTURECONFIG();
config.dwID = OS.GID_ROTATE;
@@ -761,7 +761,7 @@ int defaultBackground () {
return OS.GetSysColor (OS.COLOR_BTNFACE);
}
-int /*long*/ defaultFont () {
+long /*int*/ defaultFont () {
return display.getSystemFont ().handle;
}
@@ -774,7 +774,7 @@ void deregister () {
}
void destroyWidget () {
- int /*long*/ hwnd = topHandle ();
+ long /*int*/ hwnd = topHandle ();
releaseHandle ();
if (hwnd != 0) {
OS.DestroyWindow (hwnd);
@@ -902,7 +902,7 @@ boolean dragDetect (int button, int count, int stateMask, int x, int y) {
if ((stateMask & SWT.BUTTON3) != 0) wParam |= OS.MK_RBUTTON;
if ((stateMask & SWT.BUTTON4) != 0) wParam |= OS.MK_XBUTTON1;
if ((stateMask & SWT.BUTTON5) != 0) wParam |= OS.MK_XBUTTON2;
- int /*long*/ lParam = OS.MAKELPARAM (x, y);
+ long /*int*/ lParam = OS.MAKELPARAM (x, y);
OS.SendMessage (handle, OS.WM_LBUTTONUP, wParam, lParam);
}
return false;
@@ -910,17 +910,17 @@ boolean dragDetect (int button, int count, int stateMask, int x, int y) {
return sendDragEvent (button, stateMask, x, y);
}
-void drawBackground (int /*long*/ hDC) {
+void drawBackground (long /*int*/ hDC) {
RECT rect = new RECT ();
OS.GetClientRect (handle, rect);
drawBackground (hDC, rect);
}
-void drawBackground (int /*long*/ hDC, RECT rect) {
+void drawBackground (long /*int*/ hDC, RECT rect) {
drawBackground (hDC, rect, -1, 0, 0);
}
-void drawBackground (int /*long*/ hDC, RECT rect, int pixel, int tx, int ty) {
+void drawBackground (long /*int*/ hDC, RECT rect, int pixel, int tx, int ty) {
Control control = findBackgroundControl ();
if (control != null) {
if (control.backgroundImage != null) {
@@ -944,21 +944,21 @@ void drawBackground (int /*long*/ hDC, RECT rect, int pixel, int tx, int ty) {
fillBackground (hDC, pixel, rect);
}
-void drawImageBackground (int /*long*/ hDC, int /*long*/ hwnd, int /*long*/ hBitmap, RECT rect, int tx, int ty) {
+void drawImageBackground (long /*int*/ hDC, long /*int*/ hwnd, long /*int*/ hBitmap, RECT rect, int tx, int ty) {
RECT rect2 = new RECT ();
OS.GetClientRect (hwnd, rect2);
OS.MapWindowPoints (hwnd, handle, rect2, 2);
- int /*long*/ hBrush = findBrush (hBitmap, OS.BS_PATTERN);
+ long /*int*/ hBrush = findBrush (hBitmap, OS.BS_PATTERN);
POINT lpPoint = new POINT ();
OS.GetWindowOrgEx (hDC, lpPoint);
OS.SetBrushOrgEx (hDC, -rect2.left - lpPoint.x - tx, -rect2.top - lpPoint.y - ty, lpPoint);
- int /*long*/ hOldBrush = OS.SelectObject (hDC, hBrush);
+ long /*int*/ hOldBrush = OS.SelectObject (hDC, hBrush);
OS.PatBlt (hDC, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY);
OS.SetBrushOrgEx (hDC, lpPoint.x, lpPoint.y, null);
OS.SelectObject (hDC, hOldBrush);
}
-void drawThemeBackground (int /*long*/ hDC, int /*long*/ hwnd, RECT rect) {
+void drawThemeBackground (long /*int*/ hDC, long /*int*/ hwnd, RECT rect) {
/* Do nothing */
}
@@ -970,9 +970,9 @@ void enableWidget (boolean enabled) {
OS.EnableWindow (handle, enabled);
}
-void fillBackground (int /*long*/ hDC, int pixel, RECT rect) {
+void fillBackground (long /*int*/ hDC, int pixel, RECT rect) {
if (rect.left > rect.right || rect.top > rect.bottom) return;
- int /*long*/ hPalette = display.hPalette;
+ long /*int*/ hPalette = display.hPalette;
if (hPalette != 0) {
OS.SelectPalette (hDC, hPalette, false);
OS.RealizePalette (hDC);
@@ -980,7 +980,7 @@ void fillBackground (int /*long*/ hDC, int pixel, RECT rect) {
OS.FillRect (hDC, rect, findBrush (pixel, OS.BS_SOLID));
}
-void fillImageBackground (int /*long*/ hDC, Control control, RECT rect, int tx, int ty) {
+void fillImageBackground (long /*int*/ hDC, Control control, RECT rect, int tx, int ty) {
if (rect.left > rect.right || rect.top > rect.bottom) return;
if (control != null) {
Image image = control.backgroundImage;
@@ -990,7 +990,7 @@ void fillImageBackground (int /*long*/ hDC, Control control, RECT rect, int tx,
}
}
-void fillThemeBackground (int /*long*/ hDC, Control control, RECT rect) {
+void fillThemeBackground (long /*int*/ hDC, Control control, RECT rect) {
if (rect.left > rect.right || rect.top > rect.bottom) return;
if (control != null) {
control.drawThemeBackground (hDC, handle, rect);
@@ -1002,7 +1002,7 @@ Control findBackgroundControl () {
return (state & PARENT_BACKGROUND) != 0 ? parent.findBackgroundControl () : null;
}
-int /*long*/ findBrush (int /*long*/ value, int lbStyle) {
+long /*int*/ findBrush (long /*int*/ value, int lbStyle) {
return parent.findBrush (value, lbStyle);
}
@@ -1207,7 +1207,7 @@ int getBackgroundPixel () {
*/
public int getBorderWidth () {
checkWidget ();
- int /*long*/ borderHandle = borderHandle ();
+ long /*int*/ borderHandle = borderHandle ();
int bits1 = OS.GetWindowLong (borderHandle, OS.GWL_EXSTYLE);
if ((bits1 & OS.WS_EX_CLIENTEDGE) != 0) return OS.GetSystemMetrics (OS.SM_CXEDGE);
if ((bits1 & OS.WS_EX_STATICEDGE) != 0) return OS.GetSystemMetrics (OS.SM_CXBORDER);
@@ -1234,7 +1234,7 @@ public Rectangle getBounds () {
forceResize ();
RECT rect = new RECT ();
OS.GetWindowRect (topHandle (), rect);
- int /*long*/ hwndParent = parent == null ? 0 : parent.handle;
+ long /*int*/ hwndParent = parent == null ? 0 : parent.handle;
OS.MapWindowPoints (0, hwndParent, rect, 2);
int width = rect.right - rect.left;
int height = rect.bottom - rect.top;
@@ -1243,7 +1243,7 @@ public Rectangle getBounds () {
int getCodePage () {
if (OS.IsUnicode) return OS.CP_ACP;
- int /*long*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
+ long /*int*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
LOGFONT logFont = OS.IsUnicode ? (LOGFONT) new LOGFONTW () : new LOGFONTA ();
OS.GetObject (hFont, LOGFONT.sizeof, logFont);
int cs = logFont.lfCharSet & 0xFF;
@@ -1257,11 +1257,11 @@ int getCodePage () {
String getClipboardText () {
String string = "";
if (OS.OpenClipboard (0)) {
- int /*long*/ hMem = OS.GetClipboardData (OS.IsUnicode ? OS.CF_UNICODETEXT : OS.CF_TEXT);
+ long /*int*/ hMem = OS.GetClipboardData (OS.IsUnicode ? OS.CF_UNICODETEXT : OS.CF_TEXT);
if (hMem != 0) {
/* Ensure byteCount is a multiple of 2 bytes on UNICODE platforms */
int byteCount = OS.GlobalSize (hMem) / TCHAR.sizeof * TCHAR.sizeof;
- int /*long*/ ptr = OS.GlobalLock (hMem);
+ long /*int*/ ptr = OS.GlobalLock (hMem);
if (ptr != 0) {
/* Use the character encoding for the default locale */
TCHAR buffer = new TCHAR (0, byteCount / TCHAR.sizeof);
@@ -1351,7 +1351,7 @@ public boolean getEnabled () {
public Font getFont () {
checkWidget ();
if (font != null) return font;
- int /*long*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
+ long /*int*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (hFont == 0) hFont = defaultFont ();
return Font.win32_new (display, hFont);
}
@@ -1408,7 +1408,7 @@ public Point getLocation () {
forceResize ();
RECT rect = new RECT ();
OS.GetWindowRect (topHandle (), rect);
- int /*long*/ hwndParent = parent == null ? 0 : parent.handle;
+ long /*int*/ hwndParent = parent == null ? 0 : parent.handle;
OS.MapWindowPoints (0, hwndParent, rect, 2);
return new Point (rect.left, rect.top);
}
@@ -1450,7 +1450,7 @@ public Monitor getMonitor () {
if (OS.IsWinCE || OS.WIN32_VERSION < OS.VERSION (4, 10)) {
return display.getPrimaryMonitor ();
}
- int /*long*/ hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST);
+ long /*int*/ hmonitor = OS.MonitorFromWindow (handle, OS.MONITOR_DEFAULTTONEAREST);
MONITORINFO lpmi = new MONITORINFO ();
lpmi.cbSize = MONITORINFO.sizeof;
OS.GetMonitorInfo (hmonitor, lpmi);
@@ -1659,7 +1659,7 @@ boolean hasFocus () {
* then this control is considered to have focus
* even though it does not have focus in Windows.
*/
- int /*long*/ hwndFocus = OS.GetFocus ();
+ long /*int*/ hwndFocus = OS.GetFocus ();
while (hwndFocus != 0) {
if (hwndFocus == handle) return true;
if (display.getControl (hwndFocus) != null) {
@@ -1685,12 +1685,12 @@ boolean hasFocus () {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public int /*long*/ internal_new_GC (GCData data) {
+public long /*int*/ internal_new_GC (GCData data) {
checkWidget();
- int /*long*/ hwnd = handle;
+ long /*int*/ hwnd = handle;
if (data != null && data.hwnd != 0) hwnd = data.hwnd;
if (data != null) data.hwnd = hwnd;
- int /*long*/ hDC = 0;
+ long /*int*/ hDC = 0;
if (data == null || data.ps == null) {
hDC = OS.GetDC (hwnd);
} else {
@@ -1741,9 +1741,9 @@ public int /*long*/ internal_new_GC (GCData data) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public void internal_dispose_GC (int /*long*/ hDC, GCData data) {
+public void internal_dispose_GC (long /*int*/ hDC, GCData data) {
checkWidget ();
- int /*long*/ hwnd = handle;
+ long /*int*/ hwnd = handle;
if (data != null && data.hwnd != 0) {
hwnd = data.hwnd;
}
@@ -1874,7 +1874,7 @@ boolean isShowing () {
*/
// if (!OS.IsWindowVisible (handle)) return false;
// int flags = OS.DCX_CACHE | OS.DCX_CLIPCHILDREN | OS.DCX_CLIPSIBLINGS;
-// int /*long*/ hDC = OS.GetDCEx (handle, 0, flags);
+// long /*int*/ hDC = OS.GetDCEx (handle, 0, flags);
// int result = OS.GetClipBox (hDC, new RECT ());
// OS.ReleaseDC (handle, hDC);
// return result != OS.NULLREGION;
@@ -1900,7 +1900,7 @@ boolean isTabItem () {
}
int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
if ((bits & OS.WS_TABSTOP) != 0) return false;
- int /*long*/ code = OS.SendMessage (handle, OS.WM_GETDLGCODE, 0, 0);
+ long /*int*/ code = OS.SendMessage (handle, OS.WM_GETDLGCODE, 0, 0);
if ((code & OS.DLGC_STATIC) != 0) return false;
if ((code & OS.DLGC_WANTALLKEYS) != 0) return false;
if ((code & OS.DLGC_WANTARROWS) != 0) return false;
@@ -1928,7 +1928,7 @@ public boolean isVisible () {
return getVisible () && parent.isVisible ();
}
-void mapEvent (int /*long*/ hwnd, Event event) {
+void mapEvent (long /*int*/ hwnd, Event event) {
if (hwnd != handle) {
POINT point = new POINT ();
point.x = event.x;
@@ -1977,11 +1977,11 @@ boolean mnemonicMatch (char key) {
*/
public void moveAbove (Control control) {
checkWidget ();
- int /*long*/ topHandle = topHandle (), hwndAbove = OS.HWND_TOP;
+ long /*int*/ topHandle = topHandle (), hwndAbove = OS.HWND_TOP;
if (control != null) {
if (control.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);
if (parent != control.parent) return;
- int /*long*/ hwnd = control.topHandle ();
+ long /*int*/ hwnd = control.topHandle ();
if (hwnd == 0 || hwnd == topHandle) return;
hwndAbove = OS.GetWindow (hwnd, OS.GW_HWNDPREV);
/*
@@ -2021,7 +2021,7 @@ public void moveAbove (Control control) {
*/
public void moveBelow (Control control) {
checkWidget ();
- int /*long*/ topHandle = topHandle (), hwndAbove = OS.HWND_BOTTOM;
+ long /*int*/ topHandle = topHandle (), hwndAbove = OS.HWND_BOTTOM;
if (control != null) {
if (control.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);
if (parent != control.parent) return;
@@ -2045,7 +2045,7 @@ public void moveBelow (Control control) {
* this case and do nothing because the control is already
* at the bottom.
*/
- int /*long*/ hwndParent = parent.handle, hwnd = hwndParent;
+ long /*int*/ hwndParent = parent.handle, hwnd = hwndParent;
hwndAbove = OS.GetWindow (hwnd, OS.GW_HWNDPREV);
while (hwndAbove != 0 && hwndAbove != hwnd) {
if (OS.GetWindow (hwndAbove, OS.GW_OWNER) == hwndParent) break;
@@ -2132,14 +2132,14 @@ public boolean print (GC gc) {
if (gc == null) error (SWT.ERROR_NULL_ARGUMENT);
if (gc.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 1)) {
- int /*long*/ topHandle = topHandle ();
- int /*long*/ hdc = gc.handle;
+ long /*int*/ topHandle = topHandle ();
+ long /*int*/ hdc = gc.handle;
int state = 0;
- int /*long*/ gdipGraphics = gc.getGCData().gdipGraphics;
+ long /*int*/ gdipGraphics = gc.getGCData().gdipGraphics;
if (gdipGraphics != 0) {
- int /*long*/ clipRgn = 0;
+ long /*int*/ clipRgn = 0;
Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeNone);
- int /*long*/ rgn = Gdip.Region_new();
+ long /*int*/ rgn = Gdip.Region_new();
if (rgn == 0) error(SWT.ERROR_NO_HANDLES);
Gdip.Graphics_GetClip(gdipGraphics, rgn);
if (!Gdip.Region_IsInfinite(rgn, gdipGraphics)) {
@@ -2148,7 +2148,7 @@ public boolean print (GC gc) {
Gdip.Region_delete(rgn);
Gdip.Graphics_SetPixelOffsetMode(gdipGraphics, Gdip.PixelOffsetModeHalf);
float[] lpXform = null;
- int /*long*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0);
+ long /*int*/ matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0);
if (matrix == 0) error(SWT.ERROR_NO_HANDLES);
Gdip.Graphics_GetTransform(gdipGraphics, matrix);
if (!Gdip.Matrix_IsIdentity(matrix)) {
@@ -2183,7 +2183,7 @@ public boolean print (GC gc) {
return false;
}
-void printWidget (int /*long*/ hwnd, int /*long*/ hdc, GC gc) {
+void printWidget (long /*int*/ hwnd, long /*int*/ hdc, GC gc) {
/*
* Bug in Windows. For some reason, PrintWindow()
* returns success but does nothing when it is called
@@ -2198,8 +2198,8 @@ void printWidget (int /*long*/ hwnd, int /*long*/ hdc, GC gc) {
* The fix is temporarily reparent the window to the desktop,
* call PrintWindow() then reparent the window back.
*/
- int /*long*/ hwndParent = OS.GetParent (hwnd);
- int /*long*/ hwndShell = hwndParent;
+ long /*int*/ hwndParent = OS.GetParent (hwnd);
+ long /*int*/ hwndShell = hwndParent;
while (OS.GetParent (hwndShell) != 0) {
if (OS.GetWindow (hwndShell, OS.GW_OWNER) != 0) break;
hwndShell = OS.GetParent (hwndShell);
@@ -2221,8 +2221,8 @@ void printWidget (int /*long*/ hwnd, int /*long*/ hdc, GC gc) {
* back.
*/
if (!fixPrintWindow) {
- int /*long*/ rgn = OS.CreateRectRgn(0, 0, 0, 0);
- int /*long*/ parent = OS.GetParent(hwnd);
+ long /*int*/ rgn = OS.CreateRectRgn(0, 0, 0, 0);
+ long /*int*/ parent = OS.GetParent(hwnd);
while (parent != hwndShell && !fixPrintWindow) {
if (OS.GetWindowRgn(parent, rgn) != 0) {
fixPrintWindow = true;
@@ -2233,7 +2233,7 @@ void printWidget (int /*long*/ hwnd, int /*long*/ hdc, GC gc) {
}
int bits1 = OS.GetWindowLong (hwnd, OS.GWL_STYLE);
int bits2 = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE);
- int /*long*/ hwndInsertAfter = OS.GetWindow (hwnd, OS.GW_HWNDPREV);
+ long /*int*/ hwndInsertAfter = OS.GetWindow (hwnd, OS.GW_HWNDPREV);
/*
* Bug in Windows. For some reason, when GetWindow ()
* with GW_HWNDPREV is used to query the previous window
@@ -2798,7 +2798,7 @@ public void removeTraverseListener(TraverseListener listener) {
}
void showWidget (boolean visible) {
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
OS.ShowWindow (topHandle, visible ? OS.SW_SHOW : OS.SW_HIDE);
if (handle != topHandle) OS.ShowWindow (handle, visible ? OS.SW_SHOW : OS.SW_HIDE);
}
@@ -3034,7 +3034,7 @@ public void setBackgroundImage (Image image) {
updateBackgroundImage ();
}
-void setBackgroundImage (int /*long*/ hBitmap) {
+void setBackgroundImage (long /*int*/ hBitmap) {
if (OS.IsWinCE) {
OS.InvalidateRect (handle, null, true);
} else {
@@ -3095,7 +3095,7 @@ void setBounds (int x, int y, int width, int height, int flags, boolean defer) {
}
}
}
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
if (defer && parent != null) {
forceResize ();
if (parent.lpwp != null) {
@@ -3173,7 +3173,7 @@ public void setCapture (boolean capture) {
}
void setCursor () {
- int /*long*/ lParam = OS.MAKELPARAM (OS.HTCLIENT, OS.WM_MOUSEMOVE);
+ long /*int*/ lParam = OS.MAKELPARAM (OS.HTCLIENT, OS.WM_MOUSEMOVE);
OS.SendMessage (handle, OS.WM_SETCURSOR, handle, lParam);
}
@@ -3201,15 +3201,15 @@ public void setCursor (Cursor cursor) {
if (cursor != null && cursor.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
this.cursor = cursor;
if (OS.IsWinCE) {
- int /*long*/ hCursor = cursor != null ? cursor.handle : 0;
+ long /*int*/ hCursor = cursor != null ? cursor.handle : 0;
OS.SetCursor (hCursor);
return;
}
- int /*long*/ hwndCursor = OS.GetCapture ();
+ long /*int*/ hwndCursor = OS.GetCapture ();
if (hwndCursor == 0) {
POINT pt = new POINT ();
if (!OS.GetCursorPos (pt)) return;
- int /*long*/ hwnd = hwndCursor = OS.WindowFromPoint (pt);
+ long /*int*/ hwnd = hwndCursor = OS.WindowFromPoint (pt);
while (hwnd != 0 && hwnd != handle) {
hwnd = OS.GetParent (hwnd);
}
@@ -3221,7 +3221,7 @@ public void setCursor (Cursor cursor) {
}
void setDefaultFont () {
- int /*long*/ hFont = display.getSystemFont ().handle;
+ long /*int*/ hFont = display.getSystemFont ().handle;
OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0);
}
@@ -3320,7 +3320,7 @@ public boolean setFocus () {
*/
public void setFont (Font font) {
checkWidget ();
- int /*long*/ hFont = 0;
+ long /*int*/ hFont = 0;
if (font != null) {
if (font.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
hFont = font.handle;
@@ -3540,7 +3540,7 @@ public void setRedraw (boolean redraw) {
}
if (redraw) {
if (--drawCount == 0) {
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
OS.SendMessage (topHandle, OS.WM_SETREDRAW, 1, 0);
if (handle != topHandle) OS.SendMessage (handle, OS.WM_SETREDRAW, 1, 0);
if ((state & HIDDEN) != 0) {
@@ -3559,7 +3559,7 @@ public void setRedraw (boolean redraw) {
}
} else {
if (drawCount++ == 0) {
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
OS.SendMessage (topHandle, OS.WM_SETREDRAW, 0, 0);
if (handle != topHandle) OS.SendMessage (handle, OS.WM_SETREDRAW, 0, 0);
}
@@ -3586,7 +3586,7 @@ public void setRedraw (boolean redraw) {
public void setRegion (Region region) {
checkWidget ();
if (region != null && region.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
- int /*long*/ hRegion = 0;
+ long /*int*/ hRegion = 0;
if (region != null) {
hRegion = OS.CreateRectRgn (0, 0, 0, 0);
OS.CombineRgn (hRegion, region.handle, hRegion, OS.RGN_OR);
@@ -3779,8 +3779,8 @@ void sort (int [] items) {
}
void subclass () {
- int /*long*/ oldProc = windowProc ();
- int /*long*/ newProc = display.windowProc;
+ long /*int*/ oldProc = windowProc ();
+ long /*int*/ newProc = display.windowProc;
if (oldProc == newProc) return;
OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, newProc);
}
@@ -3877,7 +3877,7 @@ public Point toDisplay (Point point) {
return toDisplay (point.x, point.y);
}
-int /*long*/ topHandle () {
+long /*int*/ topHandle () {
return handle;
}
@@ -3894,9 +3894,9 @@ boolean translateMnemonic (Event event, Control control) {
boolean translateMnemonic (MSG msg) {
if (msg.wParam < 0x20) return false;
- int /*long*/ hwnd = msg.hwnd;
+ long /*int*/ hwnd = msg.hwnd;
if (OS.GetKeyState (OS.VK_MENU) >= 0) {
- int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+ long /*int*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
if ((code & OS.DLGC_WANTALLKEYS) != 0) return false;
if ((code & OS.DLGC_BUTTON) == 0) return false;
}
@@ -3914,7 +3914,7 @@ boolean translateMnemonic (MSG msg) {
}
boolean translateTraversal (MSG msg) {
- int /*long*/ hwnd = msg.hwnd;
+ long /*int*/ hwnd = msg.hwnd;
int key = (int)/*64*/msg.wParam;
if (key == OS.VK_MENU) {
if ((msg.lParam & 0x40000000) == 0) {
@@ -3930,7 +3930,7 @@ boolean translateTraversal (MSG msg) {
case OS.VK_ESCAPE: {
all = true;
lastAscii = 27;
- int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+ long /*int*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
if ((code & OS.DLGC_WANTALLKEYS) != 0) {
/*
* Use DLGC_HASSETSEL to determine that the control
@@ -3947,7 +3947,7 @@ boolean translateTraversal (MSG msg) {
case OS.VK_RETURN: {
all = true;
lastAscii = '\r';
- int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+ long /*int*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
if ((code & OS.DLGC_WANTALLKEYS) != 0) doit = false;
detail = SWT.TRAVERSE_RETURN;
break;
@@ -3955,7 +3955,7 @@ boolean translateTraversal (MSG msg) {
case OS.VK_TAB: {
lastAscii = '\t';
boolean next = OS.GetKeyState (OS.VK_SHIFT) >= 0;
- int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+ long /*int*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
if ((code & (OS.DLGC_WANTTAB | OS.DLGC_WANTALLKEYS)) != 0) {
/*
* Use DLGC_HASSETSEL to determine that the control is a
@@ -3989,7 +3989,7 @@ boolean translateTraversal (MSG msg) {
if (key == OS.VK_LEFT || key == OS.VK_RIGHT) return false;
}
lastVirtual = true;
- int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+ long /*int*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
if ((code & (OS.DLGC_WANTARROWS /*| OS.DLGC_WANTALLKEYS*/)) != 0) doit = false;
boolean next = key == OS.VK_DOWN || key == OS.VK_RIGHT;
if (parent != null && (parent.style & SWT.MIRRORED) != 0) {
@@ -4003,7 +4003,7 @@ boolean translateTraversal (MSG msg) {
all = true;
lastVirtual = true;
if (OS.GetKeyState (OS.VK_CONTROL) >= 0) return false;
- int /*long*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
+ long /*int*/ code = OS.SendMessage (hwnd, OS.WM_GETDLGCODE, 0, 0);
if ((code & OS.DLGC_WANTALLKEYS) != 0) {
/*
* Use DLGC_HASSETSEL to determine that the control is a
@@ -4340,8 +4340,8 @@ boolean traverseReturn () {
}
void unsubclass () {
- int /*long*/ newProc = windowProc ();
- int /*long*/ oldProc = display.windowProc;
+ long /*int*/ newProc = windowProc ();
+ long /*int*/ oldProc = display.windowProc;
if (oldProc == newProc) return;
OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, newProc);
}
@@ -4449,7 +4449,7 @@ int widgetExtStyle () {
return bits;
}
-int /*long*/ widgetParent () {
+long /*int*/ widgetParent () {
return parent.handle;
}
@@ -4506,7 +4506,7 @@ public boolean setParent (Composite parent) {
Menu [] menus = oldShell.findMenus (this);
fixChildren (newShell, oldShell, newDecorations, oldDecorations, menus);
}
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
if (OS.SetParent (topHandle, parent.handle) == 0) return false;
this.parent = parent;
int flags = OS.SWP_NOSIZE | OS.SWP_NOMOVE | OS.SWP_NOACTIVATE;
@@ -4517,9 +4517,9 @@ public boolean setParent (Composite parent) {
abstract TCHAR windowClass ();
-abstract int /*long*/ windowProc ();
+abstract long /*int*/ windowProc ();
-int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = null;
switch (msg) {
case OS.WM_ACTIVATE: result = WM_ACTIVATE (wParam, lParam); break;
@@ -4623,32 +4623,32 @@ int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*
return callWindowProc (hwnd, msg, wParam, lParam);
}
-LRESULT WM_ACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ACTIVATE (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_CAPTURECHANGED (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CAPTURECHANGED (long /*int*/ wParam, long /*int*/ lParam) {
return wmCaptureChanged (handle, wParam, lParam);
}
-LRESULT WM_CHANGEUISTATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CHANGEUISTATE (long /*int*/ wParam, long /*int*/ lParam) {
if ((state & IGNORE_WM_CHANGEUISTATE) != 0) return LRESULT.ZERO;
return null;
}
-LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
return wmChar (handle, wParam, lParam);
}
-LRESULT WM_CLEAR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CLEAR (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_CLOSE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CLOSE (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_COMMAND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_COMMAND (long /*int*/ wParam, long /*int*/ lParam) {
/*
* When the WM_COMMAND message is sent from a
* menu, the HWND parameter in LPARAM is zero.
@@ -4669,12 +4669,12 @@ LRESULT WM_COMMAND (int /*long*/ wParam, int /*long*/ lParam) {
return control.wmCommandChild (wParam, lParam);
}
-LRESULT WM_CONTEXTMENU (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CONTEXTMENU (long /*int*/ wParam, long /*int*/ lParam) {
return wmContextMenu (handle, wParam, lParam);
}
-LRESULT WM_CTLCOLOR (int /*long*/ wParam, int /*long*/ lParam) {
- int /*long*/ hPalette = display.hPalette;
+LRESULT WM_CTLCOLOR (long /*int*/ wParam, long /*int*/ lParam) {
+ long /*int*/ hPalette = display.hPalette;
if (hPalette != 0) {
OS.SelectPalette (wParam, hPalette, false);
OS.RealizePalette (wParam);
@@ -4684,15 +4684,15 @@ LRESULT WM_CTLCOLOR (int /*long*/ wParam, int /*long*/ lParam) {
return control.wmColorChild (wParam, lParam);
}
-LRESULT WM_CUT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CUT (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_DESTROY (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_DESTROY (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_DRAWITEM (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_DRAWITEM (long /*int*/ wParam, long /*int*/ lParam) {
DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT ();
OS.MoveMemory (struct, lParam, DRAWITEMSTRUCT.sizeof);
if (struct.CtlType == OS.ODT_MENU) {
@@ -4705,15 +4705,15 @@ LRESULT WM_DRAWITEM (int /*long*/ wParam, int /*long*/ lParam) {
return control.wmDrawChild (wParam, lParam);
}
-LRESULT WM_ENDSESSION (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ENDSESSION (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_ENTERIDLE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ENTERIDLE (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
if ((state & DRAW_BACKGROUND) != 0) {
if (findImageControl () != null) return LRESULT.ONE;
}
@@ -4725,7 +4725,7 @@ LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT WM_GESTURE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GESTURE (long /*int*/ wParam, long /*int*/ lParam) {
if (hooks (SWT.Gesture) || filters (SWT.Gesture)) {
GESTUREINFO gi = new GESTUREINFO ();
gi.cbSize = GESTUREINFO.sizeof;
@@ -4739,31 +4739,31 @@ LRESULT WM_GESTURE (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_GETFONT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETFONT (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) {
if (accessible != null) {
- int /*long*/ result = accessible.internal_WM_GETOBJECT (wParam, lParam);
+ long /*int*/ result = accessible.internal_WM_GETOBJECT (wParam, lParam);
if (result != 0) return new LRESULT (result);
}
return null;
}
-LRESULT WM_GETMINMAXINFO (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETMINMAXINFO (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_HOTKEY (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_HOTKEY (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_HELP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_HELP (long /*int*/ wParam, long /*int*/ lParam) {
if (OS.IsWinCE) return null;
HELPINFO lphi = new HELPINFO ();
OS.MoveMemory (lphi, lParam, HELPINFO.sizeof);
@@ -4780,7 +4780,7 @@ LRESULT WM_HELP (int /*long*/ wParam, int /*long*/ lParam) {
if (menu.hooks (SWT.Help)) widget = menu;
}
if (widget != null) {
- int /*long*/ hwndShell = shell.handle;
+ long /*int*/ hwndShell = shell.handle;
OS.SendMessage (hwndShell, OS.WM_CANCELMODE, 0, 0);
widget.postEvent (SWT.Help);
return LRESULT.ONE;
@@ -4795,29 +4795,29 @@ LRESULT WM_HELP (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT WM_HSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_HSCROLL (long /*int*/ wParam, long /*int*/ lParam) {
Control control = display.getControl (lParam);
if (control == null) return null;
return control.wmScrollChild (wParam, lParam);
}
-LRESULT WM_IME_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_IME_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
return wmIMEChar (handle, wParam, lParam);
}
-LRESULT WM_IME_COMPOSITION (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_IME_COMPOSITION (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_IME_COMPOSITION_START (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_IME_COMPOSITION_START (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_IME_ENDCOMPOSITION (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_IME_ENDCOMPOSITION (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_UNINITMENUPOPUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_UNINITMENUPOPUP (long /*int*/ wParam, long /*int*/ lParam) {
Menu hiddenMenu = menuShell ().findMenu (wParam);
if (hiddenMenu != null) {
Shell shell = getShell ();
@@ -4827,7 +4827,7 @@ LRESULT WM_UNINITMENUPOPUP (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT WM_INITMENUPOPUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_INITMENUPOPUP (long /*int*/ wParam, long /*int*/ lParam) {
/* Ignore WM_INITMENUPOPUP for an accelerator */
if (display.accelKeyHit) return null;
@@ -4884,47 +4884,47 @@ LRESULT WM_INITMENUPOPUP (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT WM_INPUTLANGCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_INPUTLANGCHANGE (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
return wmKeyDown (handle, wParam, lParam);
}
-LRESULT WM_KEYUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KEYUP (long /*int*/ wParam, long /*int*/ lParam) {
return wmKeyUp (handle, wParam, lParam);
}
-LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
return wmKillFocus (handle, wParam, lParam);
}
-LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
return wmLButtonDblClk (handle, wParam, lParam);
}
-LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
return wmLButtonDown (handle, wParam, lParam);
}
-LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
return wmLButtonUp (handle, wParam, lParam);
}
-LRESULT WM_MBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
return wmMButtonDblClk (handle, wParam, lParam);
}
-LRESULT WM_MBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
return wmMButtonDown (handle, wParam, lParam);
}
-LRESULT WM_MBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
return wmMButtonUp (handle, wParam, lParam);
}
-LRESULT WM_MEASUREITEM (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MEASUREITEM (long /*int*/ wParam, long /*int*/ lParam) {
MEASUREITEMSTRUCT struct = new MEASUREITEMSTRUCT ();
OS.MoveMemory (struct, lParam, MEASUREITEMSTRUCT.sizeof);
if (struct.CtlType == OS.ODT_MENU) {
@@ -4932,13 +4932,13 @@ LRESULT WM_MEASUREITEM (int /*long*/ wParam, int /*long*/ lParam) {
if (item == null) return null;
return item.wmMeasureChild (wParam, lParam);
}
- int /*long*/ hwnd = OS.GetDlgItem (handle, struct.CtlID);
+ long /*int*/ hwnd = OS.GetDlgItem (handle, struct.CtlID);
Control control = display.getControl (hwnd);
if (control == null) return null;
return control.wmMeasureChild (wParam, lParam);
}
-LRESULT WM_MENUCHAR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MENUCHAR (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When the user types Alt+
* and does not match a mnemonic in the System
@@ -4955,7 +4955,7 @@ LRESULT WM_MENUCHAR (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT WM_MENUSELECT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MENUSELECT (long /*int*/ wParam, long /*int*/ lParam) {
int code = OS.HIWORD (wParam);
Shell shell = getShell ();
if (code == 0xFFFF && lParam == 0) {
@@ -5015,32 +5015,32 @@ LRESULT WM_MENUSELECT (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT WM_MOUSEACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEACTIVATE (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_MOUSEHOVER (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEHOVER (long /*int*/ wParam, long /*int*/ lParam) {
return wmMouseHover (handle, wParam, lParam);
}
-LRESULT WM_MOUSELEAVE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSELEAVE (long /*int*/ wParam, long /*int*/ lParam) {
if (OS.COMCTL32_MAJOR >= 6) getShell ().fixToolTip ();
return wmMouseLeave (handle, wParam, lParam);
}
-LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) {
return wmMouseMove (handle, wParam, lParam);
}
-LRESULT WM_MOUSEWHEEL (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEWHEEL (long /*int*/ wParam, long /*int*/ lParam) {
return wmMouseWheel (handle, wParam, lParam);
}
-LRESULT WM_MOUSEHWHEEL (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEHWHEEL (long /*int*/ wParam, long /*int*/ lParam) {
return wmMouseHWheel (handle, wParam, lParam);
}
-LRESULT WM_MOVE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOVE (long /*int*/ wParam, long /*int*/ lParam) {
state |= MOVE_OCCURRED;
if (findImageControl () != null) {
if (this != getShell ()) redrawChildren ();
@@ -5058,83 +5058,83 @@ LRESULT WM_MOVE (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT WM_NCACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NCACTIVATE (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_NCCALCSIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NCCALCSIZE (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_NCHITTEST (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) {
if (!OS.IsWindowEnabled (handle)) return null;
if (!isActive ()) return new LRESULT (OS.HTTRANSPARENT);
return null;
}
-LRESULT WM_NCLBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NCLBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_NCPAINT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NCPAINT (long /*int*/ wParam, long /*int*/ lParam) {
return wmNCPaint (handle, wParam, lParam);
}
-LRESULT WM_NOTIFY (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NOTIFY (long /*int*/ wParam, long /*int*/ lParam) {
NMHDR hdr = new NMHDR ();
OS.MoveMemory (hdr, lParam, NMHDR.sizeof);
return wmNotify (hdr, wParam, lParam);
}
-LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) {
return wmPaint (handle, wParam, lParam);
}
-LRESULT WM_PALETTECHANGED (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PALETTECHANGED (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_PARENTNOTIFY (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PARENTNOTIFY (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_PASTE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PASTE (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_PRINT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PRINT (long /*int*/ wParam, long /*int*/ lParam) {
return wmPrint (handle, wParam, lParam);
}
-LRESULT WM_PRINTCLIENT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_QUERYENDSESSION (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_QUERYENDSESSION (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_QUERYNEWPALETTE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_QUERYNEWPALETTE (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_QUERYOPEN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_QUERYOPEN (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_RBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_RBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
return wmRButtonDblClk (handle, wParam, lParam);
}
-LRESULT WM_RBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_RBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
return wmRButtonDown (handle, wParam, lParam);
}
-LRESULT WM_RBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_RBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
return wmRButtonUp (handle, wParam, lParam);
}
-LRESULT WM_SETCURSOR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) {
int hitTest = (short) OS.LOWORD (lParam);
if (hitTest == OS.HTCLIENT) {
Control control = display.getControl (wParam);
@@ -5148,42 +5148,42 @@ LRESULT WM_SETCURSOR (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
return wmSetFocus (handle, wParam, lParam);
}
-LRESULT WM_SETTINGCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETTINGCHANGE (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_SETFONT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_SETREDRAW (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_SHOWWINDOW (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SHOWWINDOW (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
state |= RESIZE_OCCURRED;
if ((state & RESIZE_DEFERRED) == 0) sendEvent (SWT.Resize);
// widget could be disposed at this point
return null;
}
-LRESULT WM_SYSCHAR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SYSCHAR (long /*int*/ wParam, long /*int*/ lParam) {
return wmSysChar (handle, wParam, lParam);
}
-LRESULT WM_SYSCOLORCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SYSCOMMAND (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Check to see if the command is a system command or
* a user menu item that was added to the System menu.
@@ -5205,7 +5205,7 @@ LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) {
int cmd = (int)/*64*/wParam & 0xFFF0;
switch (cmd) {
case OS.SC_CLOSE:
- int /*long*/ hwndShell = menuShell ().handle;
+ long /*int*/ hwndShell = menuShell ().handle;
int bits = OS.GetWindowLong (hwndShell, OS.GWL_STYLE);
if ((bits & OS.WS_SYSMENU) == 0) return LRESULT.ZERO;
break;
@@ -5298,19 +5298,19 @@ LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT WM_SYSKEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SYSKEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
return wmSysKeyDown (handle, wParam, lParam);
}
-LRESULT WM_SYSKEYUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SYSKEYUP (long /*int*/ wParam, long /*int*/ lParam) {
return wmSysKeyUp (handle, wParam, lParam);
}
-LRESULT WM_TABLET_FLICK (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_TABLET_FLICK (long /*int*/ wParam, long /*int*/ lParam) {
if (!hooks (SWT.Gesture) && !filters (SWT.Gesture)) return null;
Event event = new Event ();
FLICK_DATA fData = new FLICK_DATA ();
- int /*long*/ [] source = new int /*long*/ [1];
+ long /*int*/ [] source = new long /*int*/ [1];
source[0] = wParam;
OS.MoveMemory (fData, source, OS.FLICK_DATA_sizeof ());
FLICK_POINT fPoint = new FLICK_POINT ();
@@ -5361,12 +5361,12 @@ LRESULT WM_TABLET_FLICK (int /*long*/ wParam, int /*long*/ lParam) {
return event.doit ? null : LRESULT.ONE;
}
-LRESULT WM_TOUCH (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_TOUCH (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = null;
if (hooks (SWT.Touch) || filters (SWT.Touch)) {
int cInputs = OS.LOWORD (wParam);
- int /*long*/ hHeap = OS.GetProcessHeap ();
- int /*long*/ pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, cInputs * TOUCHINPUT.sizeof);
+ long /*int*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, cInputs * TOUCHINPUT.sizeof);
if (pInputs != 0) {
if (OS.GetTouchInputInfo (lParam, cInputs, pInputs, TOUCHINPUT.sizeof)) {
TOUCHINPUT ti [] = new TOUCHINPUT [cInputs];
@@ -5384,35 +5384,35 @@ LRESULT WM_TOUCH (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_TIMER (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_TIMER (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_UNDO (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_UNDO (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_VSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) {
Control control = display.getControl (lParam);
if (control == null) return null;
return control.wmScrollChild (wParam, lParam);
}
-LRESULT WM_WINDOWPOSCHANGED (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_WINDOWPOSCHANGED (long /*int*/ wParam, long /*int*/ lParam) {
try {
display.resizeCount++;
- int /*long*/ code = callWindowProc (handle, OS.WM_WINDOWPOSCHANGED, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_WINDOWPOSCHANGED, wParam, lParam);
return code == 0 ? LRESULT.ZERO : new LRESULT (code);
} finally {
--display.resizeCount;
}
}
-LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Bug in Windows. When WM_SETREDRAW is used to turn off drawing
* for a control and the control is moved or resized, Windows does
@@ -5430,13 +5430,13 @@ LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
int width = rect.right - rect.left;
int height = rect.bottom - rect.top;
if (width != 0 && height != 0) {
- int /*long*/ hwndParent = parent == null ? 0 : parent.handle;
+ long /*int*/ hwndParent = parent == null ? 0 : parent.handle;
OS.MapWindowPoints (0, hwndParent, rect, 2);
if (OS.IsWinCE) {
OS.InvalidateRect (hwndParent, rect, true);
} else {
- int /*long*/ rgn1 = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom);
- int /*long*/ rgn2 = OS.CreateRectRgn (lpwp.x, lpwp.y, lpwp.x + lpwp.cx, lpwp.y + lpwp.cy);
+ long /*int*/ rgn1 = OS.CreateRectRgn (rect.left, rect.top, rect.right, rect.bottom);
+ long /*int*/ rgn2 = OS.CreateRectRgn (lpwp.x, lpwp.y, lpwp.x + lpwp.cx, lpwp.y + lpwp.cy);
OS.CombineRgn (rgn1, rgn1, rgn2, OS.RGN_DIFF);
int flags = OS.RDW_ERASE | OS.RDW_FRAME | OS.RDW_INVALIDATE | OS.RDW_ALLCHILDREN;
OS.RedrawWindow (hwndParent, null, rgn1, flags);
@@ -5450,19 +5450,19 @@ LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT WM_XBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_XBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
return wmXButtonDblClk (handle, wParam, lParam);
}
-LRESULT WM_XBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_XBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
return wmXButtonDown (handle, wParam, lParam);
}
-LRESULT WM_XBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_XBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
return wmXButtonUp (handle, wParam, lParam);
}
-LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) {
Control control = findBackgroundControl ();
if (control == null) {
if ((state & THEME_BACKGROUND) != 0) {
@@ -5489,15 +5489,15 @@ LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
if (control.backgroundImage != null) {
RECT rect = new RECT ();
OS.GetClientRect (handle, rect);
- int /*long*/ hwnd = control.handle;
- int /*long*/ hBitmap = control.backgroundImage.handle;
+ long /*int*/ hwnd = control.handle;
+ long /*int*/ hBitmap = control.backgroundImage.handle;
OS.MapWindowPoints (handle, hwnd, rect, 2);
POINT lpPoint = new POINT ();
OS.GetWindowOrgEx (wParam, lpPoint);
OS.SetBrushOrgEx (wParam, -rect.left - lpPoint.x, -rect.top - lpPoint.y, lpPoint);
- int /*long*/ hBrush = findBrush (hBitmap, OS.BS_PATTERN);
+ long /*int*/ hBrush = findBrush (hBitmap, OS.BS_PATTERN);
if ((state & DRAW_BACKGROUND) != 0) {
- int /*long*/ hOldBrush = OS.SelectObject (wParam, hBrush);
+ long /*int*/ hOldBrush = OS.SelectObject (wParam, hBrush);
OS.MapWindowPoints (hwnd, handle, rect, 2);
OS.PatBlt (wParam, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY);
OS.SelectObject (wParam, hOldBrush);
@@ -5505,40 +5505,40 @@ LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
OS.SetBkMode (wParam, OS.TRANSPARENT);
return new LRESULT (hBrush);
}
- int /*long*/ hBrush = findBrush (backPixel, OS.BS_SOLID);
+ long /*int*/ hBrush = findBrush (backPixel, OS.BS_SOLID);
if ((state & DRAW_BACKGROUND) != 0) {
RECT rect = new RECT ();
OS.GetClientRect (handle, rect);
- int /*long*/ hOldBrush = OS.SelectObject (wParam, hBrush);
+ long /*int*/ hOldBrush = OS.SelectObject (wParam, hBrush);
OS.PatBlt (wParam, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY);
OS.SelectObject (wParam, hOldBrush);
}
return new LRESULT (hBrush);
}
-LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT wmDrawChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmDrawChild (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT wmMeasureChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmMeasureChild (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT wmNotify (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
Control control = display.getControl (hdr.hwndFrom);
if (control == null) return null;
return control.wmNotifyChild (hdr, wParam, lParam);
}
-LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT wmScrollChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmScrollChild (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java
index 94bc063e8f..0833b5f86d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java
@@ -49,7 +49,7 @@ public class CoolBar extends Composite {
CoolItem [] originalItems;
boolean locked;
boolean ignoreResize;
- static final int /*long*/ ReBarProc;
+ static final long /*int*/ ReBarProc;
static final TCHAR ReBarClass = new TCHAR (0, OS.REBARCLASSNAME, true);
static {
INITCOMMONCONTROLSEX icex = new INITCOMMONCONTROLSEX ();
@@ -118,7 +118,7 @@ public CoolBar (Composite parent, int style) {
}
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.CallWindowProc (ReBarProc, hwnd, msg, wParam, lParam);
}
@@ -224,7 +224,7 @@ void createHandle () {
* The control will not destroy a font that it did not
* create.
*/
- int /*long*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT);
+ long /*int*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT);
OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0);
}
@@ -238,8 +238,8 @@ void createItem (CoolItem item, int index) {
System.arraycopy (items, 0, newItems, 0, items.length);
items = newItems;
}
- int /*long*/ hHeap = OS.GetProcessHeap ();
- int /*long*/ lpText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof);
+ long /*int*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ lpText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof);
REBARBANDINFO rbBand = new REBARBANDINFO ();
rbBand.cbSize = REBARBANDINFO.sizeof;
rbBand.fMask = OS.RBBIM_TEXT | OS.RBBIM_STYLE | OS.RBBIM_ID;
@@ -368,7 +368,7 @@ void destroyItem (CoolItem item) {
originalItems = newOriginals;
}
-void drawThemeBackground (int /*long*/ hDC, int /*long*/ hwnd, RECT rect) {
+void drawThemeBackground (long /*int*/ hDC, long /*int*/ hwnd, RECT rect) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
if (background == -1 && (style & SWT.FLAT) != 0) {
Control control = findBackgroundControl ();
@@ -992,11 +992,11 @@ TCHAR windowClass () {
return ReBarClass;
}
-int /*long*/ windowProc () {
+long /*int*/ windowProc () {
return ReBarProc;
}
-LRESULT WM_COMMAND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_COMMAND (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When the coolbar window
* proc processes WM_COMMAND, it forwards this
@@ -1020,7 +1020,7 @@ LRESULT WM_COMMAND (int /*long*/ wParam, int /*long*/ lParam) {
return LRESULT.ZERO;
}
-LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
/*
* Feature in Windows. For some reason, Windows
@@ -1042,7 +1042,7 @@ LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_NOTIFY (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NOTIFY (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When the cool bar window
* proc processes WM_NOTIFY, it forwards this
@@ -1066,7 +1066,7 @@ LRESULT WM_NOTIFY (int /*long*/ wParam, int /*long*/ lParam) {
return LRESULT.ZERO;
}
-LRESULT WM_SETREDRAW (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETREDRAW (wParam, lParam);
if (result != null) return result;
/*
@@ -1090,7 +1090,7 @@ LRESULT WM_SETREDRAW (int /*long*/ wParam, int /*long*/ lParam) {
*/
if (OS.COMCTL32_MAJOR >= 6) return LRESULT.ZERO;
Rectangle rect = getBounds ();
- int /*long*/ code = callWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam);
OS.DefWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam);
if (!rect.equals (getBounds ())) {
parent.redraw (rect.x, rect.y, rect.width, rect.height, true);
@@ -1098,9 +1098,9 @@ LRESULT WM_SETREDRAW (int /*long*/ wParam, int /*long*/ lParam) {
return new LRESULT (code);
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreResize) {
- int /*long*/ code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam);
if (code == 0) return LRESULT.ZERO;
return new LRESULT (code);
}
@@ -1113,7 +1113,7 @@ LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_SIZE (wParam, lParam);
}
-LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
switch (hdr.code) {
case OS.RBN_BEGINDRAG: {
int pos = OS.GetMessagePos ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java
index 3b21e1ab53..593309dc87 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java
@@ -218,7 +218,7 @@ public Rectangle getBounds () {
checkWidget ();
int index = parent.indexOf (this);
if (index == -1) return new Rectangle (0, 0, 0, 0);
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
RECT rect = new RECT ();
OS.SendMessage (hwnd, OS.RB_GETRECT, index, rect);
if (OS.COMCTL32_MAJOR >= 6) {
@@ -242,7 +242,7 @@ Rectangle getClientArea () {
checkWidget ();
int index = parent.indexOf (this);
if (index == -1) return new Rectangle (0, 0, 0, 0);
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
RECT insetRect = new RECT ();
OS.SendMessage (hwnd, OS.RB_GETBANDBORDERS, index, insetRect);
RECT rect = new RECT ();
@@ -330,8 +330,8 @@ public void setControl (Control control) {
this.control = null;
}
Control oldControl = this.control, newControl = control;
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hwndChild = newControl != null ? control.topHandle () : 0;
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hwndChild = newControl != null ? control.topHandle () : 0;
REBARBANDINFO rbBand = new REBARBANDINFO ();
rbBand.cbSize = REBARBANDINFO.sizeof;
rbBand.fMask = OS.RBBIM_CHILD;
@@ -344,7 +344,7 @@ public void setControl (Control control) {
* moves the new child to the top of the Z-order. The fix is
* to save and restore the visibility and Z-order.
*/
- int /*long*/ hwndAbove = 0;
+ long /*int*/ hwndAbove = 0;
if (newControl != null) {
hwndAbove = OS.GetWindow (hwndChild, OS.GW_HWNDPREV);
}
@@ -375,7 +375,7 @@ public Point getPreferredSize () {
checkWidget ();
int index = parent.indexOf (this);
if (index == -1) return new Point (0, 0);
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
REBARBANDINFO rbBand = new REBARBANDINFO ();
rbBand.cbSize = REBARBANDINFO.sizeof;
rbBand.fMask = OS.RBBIM_CHILDSIZE | OS.RBBIM_IDEALSIZE;
@@ -405,7 +405,7 @@ public void setPreferredSize (int width, int height) {
width = Math.max (0, width);
height = Math.max (0, height);
ideal = true;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
int cxIdeal, cyMaxChild;
if ((parent.style & SWT.VERTICAL) != 0) {
cxIdeal = Math.max (0, height - parent.getMargin (index));
@@ -465,7 +465,7 @@ public Point getSize() {
checkWidget ();
int index = parent.indexOf (this);
if (index == -1) new Point (0, 0);
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
RECT rect = new RECT ();
OS.SendMessage (hwnd, OS.RB_GETRECT, index, rect);
if (OS.COMCTL32_MAJOR >= 6) {
@@ -507,7 +507,7 @@ public void setSize (int width, int height) {
if (index == -1) return;
width = Math.max (0, width);
height = Math.max (0, height);
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
int cx, cyChild, cxIdeal;
if ((parent.style & SWT.VERTICAL) != 0) {
cx = height;
@@ -586,7 +586,7 @@ public Point getMinimumSize () {
checkWidget ();
int index = parent.indexOf (this);
if (index == -1) return new Point (0, 0);
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
REBARBANDINFO rbBand = new REBARBANDINFO ();
rbBand.cbSize = REBARBANDINFO.sizeof;
rbBand.fMask = OS.RBBIM_CHILDSIZE;
@@ -618,7 +618,7 @@ public void setMinimumSize (int width, int height) {
width = Math.max (0, width);
height = Math.max (0, height);
minimum = true;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
int cxMinChild, cyMinChild;
if ((parent.style & SWT.VERTICAL) != 0) {
cxMinChild = height;
@@ -664,7 +664,7 @@ public void setMinimumSize (Point size) {
boolean getWrap() {
int index = parent.indexOf (this);
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
REBARBANDINFO rbBand = new REBARBANDINFO ();
rbBand.cbSize = REBARBANDINFO.sizeof;
rbBand.fMask = OS.RBBIM_STYLE;
@@ -674,7 +674,7 @@ boolean getWrap() {
void setWrap(boolean wrap) {
int index = parent.indexOf (this);
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
REBARBANDINFO rbBand = new REBARBANDINFO ();
rbBand.cbSize = REBARBANDINFO.sizeof;
rbBand.fMask = OS.RBBIM_STYLE;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java
index ba07146c54..b544d605b7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java
@@ -51,9 +51,9 @@ public class DateTime extends Composite {
boolean doubleClick, ignoreSelection;
SYSTEMTIME lastSystemTime;
SYSTEMTIME time = new SYSTEMTIME (); // only used in calendar mode
- static final int /*long*/ DateTimeProc;
+ static final long /*int*/ DateTimeProc;
static final TCHAR DateTimeClass = new TCHAR (0, OS.DATETIMEPICK_CLASS, true);
- static final int /*long*/ CalendarProc;
+ static final long /*int*/ CalendarProc;
static final TCHAR CalendarClass = new TCHAR (0, OS.MONTHCAL_CLASS, true);
static {
INITCOMMONCONTROLSEX icex = new INITCOMMONCONTROLSEX ();
@@ -82,13 +82,13 @@ public class DateTime extends Composite {
* code, other than SWT, could create a control with
* this class name, and fail unexpectedly.
*/
- int /*long*/ hInstance = OS.GetModuleHandle (null);
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hInstance = OS.GetModuleHandle (null);
+ long /*int*/ hHeap = OS.GetProcessHeap ();
lpWndClass.hInstance = hInstance;
lpWndClass.style &= ~OS.CS_GLOBALCLASS;
lpWndClass.style |= OS.CS_DBLCLKS;
int byteCount = DateTimeClass.length () * TCHAR.sizeof;
- int /*long*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (lpszClassName, DateTimeClass, byteCount);
lpWndClass.lpszClassName = lpszClassName;
OS.RegisterClass (lpWndClass);
@@ -115,13 +115,13 @@ public class DateTime extends Composite {
* code, other than SWT, could create a control with
* this class name, and fail unexpectedly.
*/
- int /*long*/ hInstance = OS.GetModuleHandle (null);
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hInstance = OS.GetModuleHandle (null);
+ long /*int*/ hHeap = OS.GetProcessHeap ();
lpWndClass.hInstance = hInstance;
lpWndClass.style &= ~OS.CS_GLOBALCLASS;
lpWndClass.style |= OS.CS_DBLCLKS;
int byteCount = CalendarClass.length () * TCHAR.sizeof;
- int /*long*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (lpszClassName, CalendarClass, byteCount);
lpWndClass.lpszClassName = lpszClassName;
OS.RegisterClass (lpWndClass);
@@ -222,7 +222,7 @@ public void addSelectionListener (SelectionListener listener) {
addListener (SWT.DefaultSelection, typedListener);
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.CallWindowProc (windowProc (), hwnd, msg, wParam, lParam);
}
@@ -263,8 +263,8 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
width = size.cx;
height = size.cy;
} else {
- int /*long*/ newFont, oldFont = 0;
- int /*long*/ hDC = OS.GetDC (handle);
+ long /*int*/ newFont, oldFont = 0;
+ long /*int*/ hDC = OS.GetDC (handle);
newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
RECT rect = new RECT ();
@@ -783,11 +783,11 @@ TCHAR windowClass () {
return (style & SWT.CALENDAR) != 0 ? CalendarClass : DateTimeClass;
}
-int /*long*/ windowProc () {
+long /*int*/ windowProc () {
return (style & SWT.CALENDAR) != 0 ? CalendarProc : DateTimeProc;
}
-LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
switch (hdr.code) {
case OS.DTN_CLOSEUP: {
/*
@@ -822,7 +822,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
return super.wmNotifyChild (hdr, wParam, lParam);
}
-LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CHAR (wParam, lParam);
if (result != null) return result;
/*
@@ -841,7 +841,7 @@ LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONDBLCLK (wParam, lParam);
if (isDisposed ()) return LRESULT.ZERO;
if ((style & SWT.CALENDAR) != 0) {
@@ -851,13 +851,13 @@ LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
pt.x = OS.GET_X_LPARAM (lParam);
pt.y = OS.GET_Y_LPARAM (lParam);
pMCHitTest.pt = pt;
- int /*long*/ code = OS.SendMessage (handle, OS.MCM_HITTEST, 0, pMCHitTest);
+ long /*int*/ code = OS.SendMessage (handle, OS.MCM_HITTEST, 0, pMCHitTest);
if ((code & OS.MCHT_CALENDARDATE) == OS.MCHT_CALENDARDATE) doubleClick = true;
}
return result;
}
-LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam);
if (result == LRESULT.ZERO) return result;
doubleClick = false;
@@ -872,7 +872,7 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONUP (wParam, lParam);
if (isDisposed ()) return LRESULT.ZERO;
if (doubleClick) sendSelectionEvent (SWT.DefaultSelection);
@@ -880,7 +880,7 @@ LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_TIMER (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_TIMER (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_TIMER (wParam, lParam);
if (result != null) return result;
/*
@@ -889,7 +889,7 @@ LRESULT WM_TIMER (int /*long*/ wParam, int /*long*/ lParam) {
* to ignore MCN_SELCHANGE during WM_TIMER.
*/
ignoreSelection = true;
- int /*long*/ code = callWindowProc(handle, OS.WM_TIMER, wParam, lParam);
+ long /*int*/ code = callWindowProc(handle, OS.WM_TIMER, wParam, lParam);
ignoreSelection = false;
return code == 0 ? LRESULT.ZERO : new LRESULT(code);
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java
index 27fd287fb4..14e1ac5626 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java
@@ -103,7 +103,7 @@ public class Decorations extends Canvas {
Control savedFocus;
Button defaultButton, saveDefault;
int swFlags, nAccel;
- int /*long*/ hAccel;
+ long /*int*/ hAccel;
boolean moved, resized, opened;
int oldX = OS.CW_USEDEFAULT, oldY = OS.CW_USEDEFAULT;
int oldWidth = OS.CW_USEDEFAULT, oldHeight = OS.CW_USEDEFAULT;
@@ -171,7 +171,7 @@ void _setMaximized (boolean maximized) {
if (OS.IsPPC) {
/* Leave space for the menu bar */
if (menuBar != null) {
- int /*long*/ hwndCB = menuBar.hwndCB;
+ long /*int*/ hwndCB = menuBar.hwndCB;
RECT rectCB = new RECT ();
OS.GetWindowRect (hwndCB, rectCB);
height -= rectCB.bottom - rectCB.top;
@@ -299,7 +299,7 @@ protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.DefMDIChildProc (hwnd, msg, wParam, lParam);
}
@@ -448,7 +448,7 @@ public void dispose () {
super.dispose ();
}
-Menu findMenu (int /*long*/ hMenu) {
+Menu findMenu (long /*int*/ hMenu) {
if (menus == null) return null;
for (int i=0; i= OS.VERSION (5, 1)) {
hBitmap = Display.create32bitDIB (image.handle, data.alpha, data.alphaData, data.transparentPixel);
hMask = OS.CreateBitmap (width, height, 1, 1, null);
@@ -1103,8 +1103,8 @@ static Image createIcon (Image image) {
/* Icons need black pixels where the mask is transparent */
hBitmap = OS.CreateCompatibleBitmap (hDC, width, height);
oldDstBitmap = OS.SelectObject (dstHdc, hBitmap);
- int /*long*/ srcHdc = OS.CreateCompatibleDC (hDC);
- int /*long*/ oldSrcBitmap = OS.SelectObject (srcHdc, image.handle);
+ long /*int*/ srcHdc = OS.CreateCompatibleDC (hDC);
+ long /*int*/ oldSrcBitmap = OS.SelectObject (srcHdc, image.handle);
OS.PatBlt (dstHdc, 0, 0, width, height, OS.BLACKNESS);
OS.BitBlt (dstHdc, 0, 0, width, height, srcHdc, 0, 0, OS.SRCINVERT);
OS.SelectObject (srcHdc, hMask);
@@ -1121,14 +1121,14 @@ static Image createIcon (Image image) {
info.fIcon = true;
info.hbmColor = hBitmap;
info.hbmMask = hMask;
- int /*long*/ hIcon = OS.CreateIconIndirect (info);
+ long /*int*/ hIcon = OS.CreateIconIndirect (info);
if (hIcon == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.DeleteObject (hBitmap);
OS.DeleteObject (hMask);
return Image.win32_new (device, SWT.ICON, hIcon);
}
-static int /*long*/ createMaskFromAlpha (ImageData data, int destWidth, int destHeight) {
+static long /*int*/ createMaskFromAlpha (ImageData data, int destWidth, int destHeight) {
int srcWidth = data.width;
int srcHeight = data.height;
ImageData mask = ImageData.internal_new (srcWidth, srcHeight, 1,
@@ -1140,13 +1140,13 @@ static int /*long*/ createMaskFromAlpha (ImageData data, int destWidth, int dest
mask.setPixel (x, y, (data.alphaData [ap++] & 0xff) <= 127 ? 1 : 0);
}
}
- int /*long*/ hMask = OS.CreateBitmap (srcWidth, srcHeight, 1, 1, mask.data);
+ long /*int*/ hMask = OS.CreateBitmap (srcWidth, srcHeight, 1, 1, mask.data);
if (srcWidth != destWidth || srcHeight != destHeight) {
- int /*long*/ hdc = OS.GetDC (0);
- int /*long*/ hdc1 = OS.CreateCompatibleDC (hdc);
+ long /*int*/ hdc = OS.GetDC (0);
+ long /*int*/ hdc1 = OS.CreateCompatibleDC (hdc);
OS.SelectObject (hdc1, hMask);
- int /*long*/ hdc2 = OS.CreateCompatibleDC (hdc);
- int /*long*/ hMask2 = OS.CreateBitmap (destWidth, destHeight, 1, 1, null);
+ long /*int*/ hdc2 = OS.CreateCompatibleDC (hdc);
+ long /*int*/ hMask2 = OS.CreateBitmap (destWidth, destHeight, 1, 1, null);
OS.SelectObject (hdc2, hMask2);
if (!OS.IsWinCE) OS.SetStretchBltMode(hdc2, OS.COLORONCOLOR);
OS.StretchBlt (hdc2, 0, 0, destWidth, destHeight, hdc1, 0, 0, srcWidth, srcHeight, OS.SRCCOPY);
@@ -1223,14 +1223,14 @@ void drawMenuBars () {
bars = null;
}
-int /*long*/ embeddedProc (int /*long*/ hwnd, int /*long*/ msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ embeddedProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wParam, long /*int*/ lParam) {
switch ((int)/*64*/msg) {
case SWT_KEYMSG: {
MSG keyMsg = new MSG ();
OS.MoveMemory (keyMsg, lParam, MSG.sizeof);
OS.TranslateMessage (keyMsg);
OS.DispatchMessage (keyMsg);
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
OS.HeapFree (hHeap, 0, lParam);
break;
}
@@ -1283,9 +1283,9 @@ boolean filterMessage (MSG msg) {
return false;
}
-Control findControl (int /*long*/ handle) {
+Control findControl (long /*int*/ handle) {
if (handle == 0) return null;
- int /*long*/ hwndOwner = 0;
+ long /*int*/ hwndOwner = 0;
do {
Control control = getControl (handle);
if (control != null) return control;
@@ -1315,7 +1315,7 @@ Control findControl (int /*long*/ handle) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public Widget findWidget (int /*long*/ handle) {
+public Widget findWidget (long /*int*/ handle) {
checkDevice ();
return getControl (handle);
}
@@ -1344,7 +1344,7 @@ public Widget findWidget (int /*long*/ handle) {
*
* @since 3.1
*/
-public Widget findWidget (int /*long*/ handle, int /*long*/ id) {
+public Widget findWidget (long /*int*/ handle, long /*int*/ id) {
checkDevice ();
//TODO - should ids be long
Control control = getControl (handle);
@@ -1368,7 +1368,7 @@ public Widget findWidget (int /*long*/ handle, int /*long*/ id) {
*
* @since 3.3
*/
-public Widget findWidget (Widget widget, int /*long*/ id) {
+public Widget findWidget (Widget widget, long /*int*/ id) {
checkDevice ();
//TODO - should ids be long
if (widget instanceof Control) {
@@ -1377,7 +1377,7 @@ public Widget findWidget (Widget widget, int /*long*/ id) {
return null;
}
-int /*long*/ foregroundIdleProc (int /*long*/ code, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ foregroundIdleProc (long /*int*/ code, long /*int*/ wParam, long /*int*/ lParam) {
if (code >= 0) {
if (runMessages && getMessageCount () != 0) {
if (runMessagesInIdle) {
@@ -1430,7 +1430,7 @@ public static Display findDisplay (Thread thread) {
}
}
-TouchSource findTouchSource (int /*long*/ touchDevice, Monitor monitor) {
+TouchSource findTouchSource (long /*int*/ touchDevice, Monitor monitor) {
if (touchSources == null) touchSources = new TouchSource [4];
int length = touchSources.length;
for (int i=0; i= monitors.length) {
Monitor[] newMonitors = new Monitor [monitors.length + 4];
System.arraycopy (monitors, 0, newMonitors, 0, monitors.length);
@@ -3440,7 +3440,7 @@ int /*long*/ monitorEnumProc (int /*long*/ hmonitor, int /*long*/ hdc, int /*lon
return 1;
}
-int /*long*/ msgFilterProc (int /*long*/ code, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ msgFilterProc (long /*int*/ code, long /*int*/ wParam, long /*int*/ lParam) {
switch ((int)/*64*/code) {
case OS.MSGF_COMMCTRL_BEGINDRAG: {
if (!runDragDrop && !dragCancelled) {
@@ -3618,8 +3618,8 @@ public boolean post (Event event) {
case OS.VK_DIVIDE:
inputs.dwFlags |= OS.KEYEVENTF_EXTENDEDKEY;
}
- int /*long*/ hHeap = OS.GetProcessHeap ();
- int /*long*/ pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, INPUT.sizeof);
+ long /*int*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, INPUT.sizeof);
OS.MoveMemory(pInputs, new int[] {OS.INPUT_KEYBOARD}, 4);
//TODO - DWORD type of INPUT structure aligned to 8 bytes on 64 bit
OS.MoveMemory (pInputs + OS.PTR_SIZEOF, inputs, KEYBDINPUT.sizeof);
@@ -3683,8 +3683,8 @@ public boolean post (Event event) {
}
}
}
- int /*long*/ hHeap = OS.GetProcessHeap ();
- int /*long*/ pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, INPUT.sizeof);
+ long /*int*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ pInputs = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, INPUT.sizeof);
OS.MoveMemory(pInputs, new int[] {OS.INPUT_MOUSE}, 4);
//TODO - DWORD type of INPUT structure aligned to 8 bytes on 64 bit
OS.MoveMemory (pInputs + OS.PTR_SIZEOF, inputs, MOUSEINPUT.sizeof);
@@ -3874,8 +3874,8 @@ void releaseDisplay () {
messageProc = 0;
/* Unregister the SWT window class */
- int /*long*/ hHeap = OS.GetProcessHeap ();
- int /*long*/ hInstance = OS.GetModuleHandle (null);
+ long /*int*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hInstance = OS.GetModuleHandle (null);
OS.UnregisterClass (windowClass, hInstance);
/* Unregister the SWT drop shadow and CS_OWNDC window class */
@@ -4105,7 +4105,7 @@ void removeBar (Menu menu) {
}
}
-Control removeControl (int /*long*/ handle) {
+Control removeControl (long /*int*/ handle) {
if (handle == 0) return null;
lastControl = lastGetControl = null;
Control control = null;
@@ -4258,7 +4258,7 @@ boolean runSkin () {
return false;
}
-boolean runTimer (int /*long*/ id) {
+boolean runTimer (long /*int*/ id) {
if (timerList != null && timerIds != null) {
int index = 0;
while (index 0) {
- int /*long*/ hDC = OS.GetDC (handle);
- int /*long*/ hTheme = 0;
+ long /*int*/ hDC = OS.GetDC (handle);
+ long /*int*/ hTheme = 0;
if (isAppThemed ()) {
hTheme = display.hExplorerBarTheme ();
}
- int /*long*/ hCurrentFont = 0, oldFont = 0;
+ long /*int*/ hCurrentFont = 0, oldFont = 0;
if (hTheme == 0) {
if (hFont != 0) {
hCurrentFont = hFont;
@@ -237,7 +237,7 @@ void destroyItem (ExpandItem item) {
layoutItems (index, true);
}
-void drawThemeBackground (int /*long*/ hDC, int /*long*/ hwnd, RECT rect) {
+void drawThemeBackground (long /*int*/ hDC, long /*int*/ hwnd, RECT rect) {
RECT rect2 = new RECT ();
OS.GetClientRect (handle, rect2);
OS.MapWindowPoints (handle, hwnd, rect2, 2);
@@ -245,7 +245,7 @@ void drawThemeBackground (int /*long*/ hDC, int /*long*/ hwnd, RECT rect) {
}
void drawWidget (GC gc, RECT clipRect) {
- int /*long*/ hTheme = 0;
+ long /*int*/ hTheme = 0;
if (isAppThemed ()) {
hTheme = display.hExplorerBarTheme ();
}
@@ -261,7 +261,7 @@ void drawWidget (GC gc, RECT clipRect) {
int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0);
drawFocus = (uiState & OS.UISF_HIDEFOCUS) == 0;
}
- int /*long*/ hCurrentFont = 0, oldFont = 0;
+ long /*int*/ hCurrentFont = 0, oldFont = 0;
if (hTheme == 0) {
if (hFont != 0) {
hCurrentFont = hFont;
@@ -306,8 +306,8 @@ Control findThemeControl () {
int getBandHeight () {
if (hFont == 0) return ExpandItem.CHEVRON_SIZE;
- int /*long*/ hDC = OS.GetDC (handle);
- int /*long*/ oldHFont = OS.SelectObject (hDC, hFont);
+ long /*int*/ hDC = OS.GetDC (handle);
+ long /*int*/ oldHFont = OS.SelectObject (hDC, hFont);
TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC)new TEXTMETRICW() : new TEXTMETRICA();
OS.GetTextMetrics (hDC, lptm);
OS.SelectObject (hDC, oldHFont);
@@ -617,11 +617,11 @@ TCHAR windowClass () {
return display.windowClass;
}
-int /*long*/ windowProc () {
+long /*int*/ windowProc () {
return display.windowProc;
}
-LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
if (focusItem == null) return result;
@@ -660,13 +660,13 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KILLFOCUS (wParam, lParam);
if (focusItem != null) focusItem.redraw (true);
return result;
}
-LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam);
if (result == LRESULT.ZERO) return result;
int x = OS.GET_X_LPARAM (lParam);
@@ -685,7 +685,7 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONUP (wParam, lParam);
if (result == LRESULT.ZERO) return result;
if (focusItem == null) return result;
@@ -702,7 +702,7 @@ LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_MOUSELEAVE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSELEAVE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOUSELEAVE (wParam, lParam);
if (result != null) return result;
for (int i = 0; i < itemCount; i++) {
@@ -716,7 +716,7 @@ LRESULT WM_MOUSELEAVE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOUSEMOVE (wParam, lParam);
if (result == LRESULT.ZERO) return result;
int x = OS.GET_X_LPARAM (lParam);
@@ -732,11 +732,11 @@ LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_MOUSEWHEEL (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEWHEEL (long /*int*/ wParam, long /*int*/ lParam) {
return wmScrollWheel (true, wParam, lParam);
}
-LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) {
PAINTSTRUCT ps = new PAINTSTRUCT ();
GCData data = new GCData ();
data.ps = ps;
@@ -765,7 +765,7 @@ LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
return LRESULT.ZERO;
}
-LRESULT WM_PRINTCLIENT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_PRINTCLIENT (wParam, lParam);
RECT rect = new RECT ();
OS.GetClientRect (handle, rect);
@@ -778,7 +778,7 @@ LRESULT WM_PRINTCLIENT (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SETCURSOR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETCURSOR (wParam, lParam);
if (result != null) return result;
int hitTest = (short) OS.LOWORD (lParam);
@@ -786,7 +786,7 @@ LRESULT WM_SETCURSOR (int /*long*/ wParam, int /*long*/ lParam) {
for (int i = 0; i < itemCount; i++) {
ExpandItem item = items [i];
if (item.hover) {
- int /*long*/ hCursor = OS.LoadCursor (0, OS.IDC_HAND);
+ long /*int*/ hCursor = OS.LoadCursor (0, OS.IDC_HAND);
OS.SetCursor (hCursor);
return LRESULT.ONE;
}
@@ -795,13 +795,13 @@ LRESULT WM_SETCURSOR (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETFOCUS (wParam, lParam);
if (focusItem != null) focusItem.redraw (true);
return result;
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
RECT rect = new RECT ();
OS.GetClientRect (handle, rect);
@@ -815,7 +815,7 @@ LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT wmScroll (ScrollBar bar, boolean update, int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmScroll (ScrollBar bar, boolean update, long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.wmScroll (bar, true, hwnd, msg, wParam, lParam);
SCROLLINFO info = new SCROLLINFO ();
info.cbSize = SCROLLINFO.sizeof;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java
index 51ba1ea3f9..3ef2b02572 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java
@@ -116,16 +116,16 @@ static ExpandBar checkNull (ExpandBar control) {
return control;
}
-private void drawChevron (int /*long*/ hDC, RECT rect) {
- int /*long*/ oldBrush = OS.SelectObject (hDC, OS.GetSysColorBrush (OS.COLOR_BTNFACE));
+private void drawChevron (long /*int*/ hDC, RECT rect) {
+ long /*int*/ oldBrush = OS.SelectObject (hDC, OS.GetSysColorBrush (OS.COLOR_BTNFACE));
OS.PatBlt (hDC, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY);
OS.SelectObject (hDC, oldBrush);
rect.left += 4;
rect.top += 4;
rect.right -= 4;
rect.bottom -= 4;
- int /*long*/ hPen = OS.CreatePen (OS.PS_SOLID, 1, parent.getForegroundPixel ());
- int /*long*/ oldPen = OS.SelectObject (hDC, hPen);
+ long /*int*/ hPen = OS.CreatePen (OS.PS_SOLID, 1, parent.getForegroundPixel ());
+ long /*int*/ oldPen = OS.SelectObject (hDC, hPen);
int [] polyline1, polyline2;
if (expanded) {
int px = rect.left + 5;
@@ -151,8 +151,8 @@ private void drawChevron (int /*long*/ hDC, RECT rect) {
OS.Polyline (hDC, polyline1, polyline1.length / 2);
OS.Polyline (hDC, polyline2, polyline2.length / 2);
if (hover) {
- int /*long*/ whitePen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DHILIGHT));
- int /*long*/ darkGrayPen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DSHADOW));
+ long /*int*/ whitePen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DHILIGHT));
+ long /*int*/ darkGrayPen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DSHADOW));
OS.SelectObject (hDC, whitePen);
int [] points1 = {
rect.left, rect.bottom,
@@ -174,15 +174,15 @@ private void drawChevron (int /*long*/ hDC, RECT rect) {
OS.DeleteObject (hPen);
}
-void drawItem (GC gc, int /*long*/ hTheme, RECT clipRect, boolean drawFocus) {
- int /*long*/ hDC = gc.handle;
+void drawItem (GC gc, long /*int*/ hTheme, RECT clipRect, boolean drawFocus) {
+ long /*int*/ hDC = gc.handle;
int headerHeight = parent.getBandHeight ();
RECT rect = new RECT ();
OS.SetRect (rect, x, y, x + width, y + headerHeight);
if (hTheme != 0) {
OS.DrawThemeBackground (hTheme, hDC, OS.EBP_NORMALGROUPHEAD, 0, rect, clipRect);
} else {
- int /*long*/ oldBrush = OS.SelectObject (hDC, OS.GetSysColorBrush (OS.COLOR_BTNFACE));
+ long /*int*/ oldBrush = OS.SelectObject (hDC, OS.GetSysColorBrush (OS.COLOR_BTNFACE));
OS.PatBlt (hDC, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY);
OS.SelectObject (hDC, oldBrush);
}
@@ -223,8 +223,8 @@ void drawItem (GC gc, int /*long*/ hTheme, RECT clipRect, boolean drawFocus) {
}
if (expanded) {
if (!parent.isAppThemed ()) {
- int /*long*/ pen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_BTNFACE));
- int /*long*/ oldPen = OS.SelectObject (hDC, pen);
+ long /*int*/ pen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_BTNFACE));
+ long /*int*/ oldPen = OS.SelectObject (hDC, pen);
int [] points = {
x, y + headerHeight,
x, y + headerHeight + height,
@@ -319,7 +319,7 @@ public ExpandBar getParent () {
return parent;
}
-int getPreferredWidth (int /*long*/ hTheme, int /*long*/ hDC) {
+int getPreferredWidth (long /*int*/ hTheme, long /*int*/ hDC) {
int width = ExpandItem.TEXT_INSET * 2 + ExpandItem.CHEVRON_SIZE;
if (image != null) {
width += ExpandItem.TEXT_INSET + imageWidth;
@@ -343,7 +343,7 @@ boolean isHover (int x, int y) {
}
void redraw (boolean all) {
- int /*long*/ parentHandle = parent.handle;
+ long /*int*/ parentHandle = parent.handle;
int headerHeight = parent.getBandHeight ();
RECT rect = new RECT ();
int left = all ? x : x + width - headerHeight;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java
index 212fcbecf2..079fcd48c7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java
@@ -196,7 +196,7 @@ public boolean getOverwrite () {
return overwrite;
}
-int /*long*/ OFNHookProc (int /*long*/ hdlg, int /*long*/ uiMsg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ OFNHookProc (long /*int*/ hdlg, long /*int*/ uiMsg, long /*int*/ wParam, long /*int*/ lParam) {
switch ((int)/*64*/uiMsg) {
case OS.WM_NOTIFY:
OFNOTIFY ofn = new OFNOTIFY ();
@@ -208,8 +208,8 @@ int /*long*/ OFNHookProc (int /*long*/ hdlg, int /*long*/ uiMsg, int /*long*/ wP
OPENFILENAME lpofn = new OPENFILENAME ();
OS.MoveMemory (lpofn, ofn.lpOFN, OPENFILENAME.sizeof);
if (lpofn.nMaxFile < lResult) {
- int /*long*/ hHeap = OS.GetProcessHeap ();
- int /*long*/ lpstrFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, lResult * TCHAR.sizeof);
+ long /*int*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ lpstrFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, lResult * TCHAR.sizeof);
if (lpstrFile != 0) {
if (lpofn.lpstrFile != 0) OS.HeapFree (hHeap, 0, lpofn.lpstrFile);
lpofn.lpstrFile = lpstrFile;
@@ -237,11 +237,11 @@ int /*long*/ OFNHookProc (int /*long*/ hdlg, int /*long*/ uiMsg, int /*long*/ wP
*
*/
public String open () {
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
/* Get the owner HWND for the dialog */
- int /*long*/ hwndOwner = parent.handle;
- int /*long*/ hwndParent = parent.handle;
+ long /*int*/ hwndOwner = parent.handle;
+ long /*int*/ hwndParent = parent.handle;
/*
* Feature in Windows. There is no API to set the orientation of a
@@ -276,7 +276,7 @@ public String open () {
/* Use the character encoding for the default locale */
TCHAR buffer3 = new TCHAR (0, title, true);
int byteCount3 = buffer3.length () * TCHAR.sizeof;
- int /*long*/ lpstrTitle = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount3);
+ long /*int*/ lpstrTitle = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount3);
OS.MoveMemory (lpstrTitle, buffer3, byteCount3);
/* Compute filters and copy into lpstrFilter */
@@ -294,7 +294,7 @@ public String open () {
/* Use the character encoding for the default locale */
TCHAR buffer4 = new TCHAR (0, strFilter, true);
int byteCount4 = buffer4.length () * TCHAR.sizeof;
- int /*long*/ lpstrFilter = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount4);
+ long /*int*/ lpstrFilter = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount4);
OS.MoveMemory (lpstrFilter, buffer4, byteCount4);
/* Convert the fileName and filterName to C strings */
@@ -309,7 +309,7 @@ public String open () {
int nMaxFile = OS.MAX_PATH;
if ((style & SWT.MULTI) != 0) nMaxFile = Math.max (nMaxFile, BUFFER_SIZE);
int byteCount = nMaxFile * TCHAR.sizeof;
- int /*long*/ lpstrFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ lpstrFile = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
int byteCountFile = Math.min (name.length () * TCHAR.sizeof, byteCount - TCHAR.sizeof);
OS.MoveMemory (lpstrFile, name, byteCountFile);
@@ -321,7 +321,7 @@ public String open () {
/* Use the character encoding for the default locale */
TCHAR path = new TCHAR (0, filterPath.replace ('/', '\\'), true);
int byteCount5 = OS.MAX_PATH * TCHAR.sizeof;
- int /*long*/ lpstrInitialDir = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount5);
+ long /*int*/ lpstrInitialDir = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount5);
int byteCountDir = Math.min (path.length () * TCHAR.sizeof, byteCount5 - TCHAR.sizeof);
OS.MoveMemory (lpstrInitialDir, path, byteCountDir);
@@ -336,7 +336,7 @@ public String open () {
struct.Flags |= OS.OFN_ALLOWMULTISELECT | OS.OFN_EXPLORER | OS.OFN_ENABLESIZING;
if (!OS.IsWinCE && USE_HOOK) {
callback = new Callback (this, "OFNHookProc", 4); //$NON-NLS-1$
- int /*long*/ lpfnHook = callback.getAddress ();
+ long /*int*/ lpfnHook = callback.getAddress ();
if (lpfnHook == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
struct.lpfnHook = lpfnHook;
struct.Flags |= OS.OFN_ENABLEHOOK;
@@ -356,7 +356,7 @@ public String open () {
* empty, Windows uses the current value of the filter
* extension at the time that the dialog is closed.
*/
- int /*long*/ lpstrDefExt = 0;
+ long /*int*/ lpstrDefExt = 0;
if (save) {
lpstrDefExt = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof);
struct.lpstrDefExt = lpstrDefExt;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java
index 855c758791..27582d5b95 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java
@@ -155,8 +155,8 @@ public FontData open () {
if (OS.IsWinCE) error (SWT.ERROR_NOT_IMPLEMENTED);
/* Get the owner HWND for the dialog */
- int /*long*/ hwndOwner = parent.handle;
- int /*long*/ hwndParent = parent.handle;
+ long /*int*/ hwndOwner = parent.handle;
+ long /*int*/ hwndParent = parent.handle;
/*
* Feature in Windows. There is no API to set the orientation of a
@@ -187,7 +187,7 @@ public FontData open () {
}
/* Open the dialog */
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
CHOOSEFONT lpcf = new CHOOSEFONT ();
lpcf.lStructSize = CHOOSEFONT.sizeof;
lpcf.hwndOwner = hwndOwner;
@@ -196,11 +196,11 @@ public FontData open () {
lpcf.Flags |= OS.CF_EFFECTS;
}
- int /*long*/ lpLogFont = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, LOGFONT.sizeof);
+ long /*int*/ lpLogFont = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, LOGFONT.sizeof);
if (fontData != null && fontData.data != null) {
LOGFONT logFont = fontData.data;
int lfHeight = logFont.lfHeight;
- int /*long*/ hDC = OS.GetDC (0);
+ long /*int*/ hDC = OS.GetDC (0);
int pixels = -(int)(0.5f + (fontData.height * OS.GetDeviceCaps(hDC, OS.LOGPIXELSY) / 72));
OS.ReleaseDC (0, hDC);
logFont.lfHeight = pixels;
@@ -242,7 +242,7 @@ public FontData open () {
* This will not work on multiple screens or
* for printing. Should use DC for the proper device.
*/
- int /*long*/ hDC = OS.GetDC(0);
+ long /*int*/ hDC = OS.GetDC(0);
int logPixelsY = OS.GetDeviceCaps(hDC, OS.LOGPIXELSY);
int pixels = 0;
if (logFont.lfHeight > 0) {
@@ -254,8 +254,8 @@ public FontData open () {
* we must subtract the internal leading, which requires a TEXTMETRIC,
* which in turn requires font creation.
*/
- int /*long*/ hFont = OS.CreateFontIndirect(logFont);
- int /*long*/ oldFont = OS.SelectObject(hDC, hFont);
+ long /*int*/ hFont = OS.CreateFontIndirect(logFont);
+ long /*int*/ oldFont = OS.SelectObject(hDC, hFont);
TEXTMETRIC lptm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
OS.GetTextMetrics(hDC, lptm);
OS.SelectObject(hDC, oldFont);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java
index 8d00eef630..bded168bba 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java
@@ -43,7 +43,7 @@ import org.eclipse.swt.graphics.*;
public class Group extends Composite {
String text = "";
static final int CLIENT_INSET = 3;
- static final int /*long*/ GroupProc;
+ static final long /*int*/ GroupProc;
static final TCHAR GroupClass = new TCHAR (0, OS.IsWinCE ? "BUTTON" : "SWT_GROUP", true);
static {
/*
@@ -67,13 +67,13 @@ public class Group extends Composite {
TCHAR WC_BUTTON = new TCHAR (0, "BUTTON", true);
OS.GetClassInfo (0, WC_BUTTON, lpWndClass);
GroupProc = lpWndClass.lpfnWndProc;
- int /*long*/ hInstance = OS.GetModuleHandle (null);
+ long /*int*/ hInstance = OS.GetModuleHandle (null);
if (!OS.GetClassInfo (hInstance, GroupClass, lpWndClass)) {
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
lpWndClass.hInstance = hInstance;
lpWndClass.style &= ~(OS.CS_HREDRAW | OS.CS_VREDRAW);
int byteCount = GroupClass.length () * TCHAR.sizeof;
- int /*long*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (lpszClassName, GroupClass, byteCount);
lpWndClass.lpszClassName = lpszClassName;
OS.RegisterClass (lpWndClass);
@@ -118,7 +118,7 @@ public Group (Composite parent, int style) {
super (parent, checkStyle (style));
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
/*
* Feature in Windows. When the user clicks on the group
@@ -172,8 +172,8 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
* client area, pad the width so the text is not clipped.
*/
TCHAR buffer = new TCHAR (getCodePage (), string, true);
- int /*long*/ newFont, oldFont = 0;
- int /*long*/ hDC = OS.GetDC (handle);
+ long /*int*/ newFont, oldFont = 0;
+ long /*int*/ hDC = OS.GetDC (handle);
newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
RECT rect = new RECT ();
@@ -190,8 +190,8 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
public Rectangle computeTrim (int x, int y, int width, int height) {
checkWidget ();
Rectangle trim = super.computeTrim (x, y, width, height);
- int /*long*/ newFont, oldFont = 0;
- int /*long*/ hDC = OS.GetDC (handle);
+ long /*int*/ newFont, oldFont = 0;
+ long /*int*/ hDC = OS.GetDC (handle);
newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
@@ -244,8 +244,8 @@ public Rectangle getClientArea () {
forceResize ();
RECT rect = new RECT ();
OS.GetClientRect (handle, rect);
- int /*long*/ newFont, oldFont = 0;
- int /*long*/ hDC = OS.GetDC (handle);
+ long /*int*/ newFont, oldFont = 0;
+ long /*int*/ hDC = OS.GetDC (handle);
newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
@@ -290,7 +290,7 @@ boolean mnemonicMatch (char key) {
return Character.toUpperCase (key) == Character.toUpperCase (mnemonic);
}
-void printWidget (int /*long*/ hwnd, int /*long*/ hdc, GC gc) {
+void printWidget (long /*int*/ hwnd, long /*int*/ hdc, GC gc) {
/*
* Bug in Windows. For some reason, PrintWindow()
* returns success but does nothing when it is called
@@ -339,7 +339,7 @@ void printWidget (int /*long*/ hwnd, int /*long*/ hdc, GC gc) {
} else {
OS.SetWindowOrgEx (hdc, -location.x, -location.y, null);
}
- int /*long*/ topHandle = children [i].topHandle();
+ long /*int*/ topHandle = children [i].topHandle();
int bits = OS.GetWindowLong (topHandle, OS.GWL_STYLE);
if ((bits & OS.WS_VISIBLE) != 0) {
children [i].printWidget (topHandle, hdc, gc);
@@ -429,11 +429,11 @@ TCHAR windowClass () {
return GroupClass;
}
-int /*long*/ windowProc () {
+long /*int*/ windowProc () {
return GroupProc;
}
-LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
if (result != null) return result;
/*
@@ -445,7 +445,7 @@ LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
return LRESULT.ONE;
}
-LRESULT WM_NCHITTEST (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_NCHITTEST (wParam, lParam);
if (result != null) return result;
/*
@@ -457,12 +457,12 @@ LRESULT WM_NCHITTEST (int /*long*/ wParam, int /*long*/ lParam) {
* allow children, answer HTCLIENT to allow mouse messages
* to be delivered to the children.
*/
- int /*long*/ code = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam);
if (code == OS.HTTRANSPARENT) code = OS.HTCLIENT;
return new LRESULT (code);
}
-LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOUSEMOVE (wParam, lParam);
if (result != null) return result;
/*
@@ -474,7 +474,7 @@ LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) {
return LRESULT.ZERO;
}
-LRESULT WM_PRINTCLIENT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_PRINTCLIENT (wParam, lParam);
if (result != null) return result;
/*
@@ -489,14 +489,14 @@ LRESULT WM_PRINTCLIENT (int /*long*/ wParam, int /*long*/ lParam) {
*/
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
int nSavedDC = OS.SaveDC (wParam);
- int /*long*/ code = callWindowProc (handle, OS.WM_PRINTCLIENT, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_PRINTCLIENT, wParam, lParam);
OS.RestoreDC (wParam, nSavedDC);
return new LRESULT (code);
}
return result;
}
-LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam);
if (result != null) return result;
/*
@@ -518,13 +518,13 @@ LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) {
}
if (redraw) {
OS.InvalidateRect (handle, null, false);
- int /*long*/ code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam);
+ long /*int*/ code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam);
return new LRESULT (code);
}
return result;
}
-LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam);
if (result != null) return result;
/*
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/IME.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/IME.java
index 3d09962e20..f3b1e26977 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/IME.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/IME.java
@@ -165,7 +165,7 @@ public int getCompositionOffset () {
}
TF_DISPLAYATTRIBUTE getDisplayAttribute (short langid, int attInfo) {
- int /*long*/ [] pProfiles = new int /*long*/ [1];
+ long /*int*/ [] pProfiles = new long /*int*/ [1];
int hr = OS.CoCreateInstance (CLSID_TF_InputProcessorProfiles, 0, OS.CLSCTX_INPROC_SERVER, IID_ITfInputProcessorProfiles, pProfiles);
TF_DISPLAYATTRIBUTE pda = null;
if (hr == OS.S_OK) {
@@ -174,14 +174,14 @@ TF_DISPLAYATTRIBUTE getDisplayAttribute (short langid, int attInfo) {
/* pProfiles.GetDefaultLanguageProfile () */
hr = OS.VtblCall (8, pProfiles [0], langid, GUID_TFCAT_TIP_KEYBOARD, pclsid, pguidProfile);
if (hr == OS.S_OK) {
- int /*long*/ [] pProvider = new int /*long*/ [1];
+ long /*int*/ [] pProvider = new long /*int*/ [1];
hr = OS.CoCreateInstance (pclsid, 0, OS.CLSCTX_INPROC_SERVER, IID_ITfDisplayAttributeProvider, pProvider);
if (hr == OS.S_OK) {
- int /*long*/ [] pEnum = new int /*long*/ [1];
+ long /*int*/ [] pEnum = new long /*int*/ [1];
/* pProvider.EnumDisplayAttributeInfo () */
hr = OS.VtblCall (3, pProvider [0], pEnum);
if (hr == OS.S_OK) {
- int /*long*/ [] pDispInfo = new int /*long*/ [1];
+ long /*int*/ [] pDispInfo = new long /*int*/ [1];
TF_DISPLAYATTRIBUTE tempPda = new TF_DISPLAYATTRIBUTE ();
/* pEnum.Next () */
while ((hr = OS.VtblCall (4, pEnum [0], 1, pDispInfo, (int[])null)) == OS.S_OK) {
@@ -310,7 +310,7 @@ public String getText () {
*/
public boolean getWideCaret() {
checkWidget ();
- int /*long*/ layout = OS.GetKeyboardLayout (0);
+ long /*int*/ layout = OS.GetKeyboardLayout (0);
short langID = (short)OS.LOWORD (layout);
return OS.PRIMARYLANGID (langID) == OS.LANG_KOREAN;
}
@@ -357,13 +357,13 @@ public void setCompositionOffset (int offset) {
}
}
-LRESULT WM_IME_COMPOSITION (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_IME_COMPOSITION (long /*int*/ wParam, long /*int*/ lParam) {
if (!isInlineEnabled ()) return null;
ranges = null;
styles = null;
caretOffset = commitCount = 0;
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hIMC = OS.ImmGetContext (hwnd);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hIMC = OS.ImmGetContext (hwnd);
int codePage = parent.getCodePage ();
if (hIMC != 0) {
TCHAR buffer = null;
@@ -430,7 +430,7 @@ LRESULT WM_IME_COMPOSITION (int /*long*/ wParam, int /*long*/ lParam) {
length = clauses.length - 1;
ranges = new int [length * 2];
styles = new TextStyle [length];
- int /*long*/ layout = OS.GetKeyboardLayout (0);
+ long /*int*/ layout = OS.GetKeyboardLayout (0);
short langID = (short)OS.LOWORD (layout);
TF_DISPLAYATTRIBUTE attr = null;
TextStyle style = null;
@@ -512,18 +512,18 @@ LRESULT WM_IME_COMPOSITION (int /*long*/ wParam, int /*long*/ lParam) {
return LRESULT.ONE;
}
-LRESULT WM_IME_COMPOSITION_START (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_IME_COMPOSITION_START (long /*int*/ wParam, long /*int*/ lParam) {
return isInlineEnabled () ? LRESULT.ONE : null;
}
-LRESULT WM_IME_ENDCOMPOSITION (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_IME_ENDCOMPOSITION (long /*int*/ wParam, long /*int*/ lParam) {
return isInlineEnabled () ? LRESULT.ONE : null;
}
-LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
if (!isInlineEnabled ()) return null;
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hIMC = OS.ImmGetContext (hwnd);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hIMC = OS.ImmGetContext (hwnd);
if (hIMC != 0) {
if (OS.ImmGetOpenStatus (hIMC)) {
OS.ImmNotifyIME (hIMC, OS.NI_COMPOSITIONSTR, OS.CPS_COMPLETE, 0);
@@ -533,10 +533,10 @@ LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
if (!isInlineEnabled ()) return null;
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hIMC = OS.ImmGetContext (hwnd);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hIMC = OS.ImmGetContext (hwnd);
if (hIMC != 0) {
if (OS.ImmGetOpenStatus (hIMC)) {
if (OS.ImmGetCompositionString (hIMC, OS.GCS_COMPSTR, (TCHAR)null, 0) > 0) {
@@ -548,10 +548,10 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
int offset = event.index;
int length = text.length();
if (offset != -1 && startOffset != -1 && startOffset <= offset && offset < startOffset + length) {
- int /*long*/ imeWnd = OS.ImmGetDefaultIMEWnd (hwnd);
+ long /*int*/ imeWnd = OS.ImmGetDefaultIMEWnd (hwnd);
offset = event.index + event.count - startOffset;
int trailing = event.count > 0 ? 1 : 2;
- int /*long*/ param = OS.MAKEWPARAM (OS.MAKEWORD (OS.IMEMOUSE_LDOWN, trailing), offset);
+ long /*int*/ param = OS.MAKEWPARAM (OS.MAKEWORD (OS.IMEMOUSE_LDOWN, trailing), offset);
OS.SendMessage (imeWnd, WM_MSIME_MOUSE, param, hIMC);
} else {
OS.ImmNotifyIME (hIMC, OS.NI_COMPOSITIONSTR, OS.CPS_COMPLETE, 0);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
index f32a57b30d..e94602af60 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
@@ -52,7 +52,7 @@ public class Label extends Control {
Image image;
static final int MARGIN = 4;
static /*final*/ boolean IMAGE_AND_TEXT = false;
- static final int /*long*/ LabelProc;
+ static final long /*int*/ LabelProc;
static final TCHAR LabelClass = new TCHAR (0, "STATIC", true);
static {
WNDCLASS lpWndClass = new WNDCLASS ();
@@ -101,7 +101,7 @@ public Label (Composite parent, int style) {
super (parent, checkStyle (style));
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
/*
* Feature in Windows 7. When the user double clicks
@@ -157,9 +157,9 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
}
}
if (drawText) {
- int /*long*/ hDC = OS.GetDC (handle);
- int /*long*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
- int /*long*/ oldFont = OS.SelectObject (hDC, newFont);
+ long /*int*/ hDC = OS.GetDC (handle);
+ long /*int*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
+ long /*int*/ oldFont = OS.SelectObject (hDC, newFont);
int length = OS.GetWindowTextLength (handle);
if (length == 0) {
TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
@@ -446,11 +446,11 @@ TCHAR windowClass () {
return LabelClass;
}
-int /*long*/ windowProc () {
+long /*int*/ windowProc () {
return LabelProc;
}
-LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
if (result != null) return result;
int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
@@ -474,7 +474,7 @@ LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
if (isDisposed ()) return result;
if ((style & SWT.SEPARATOR) != 0) {
@@ -500,7 +500,7 @@ LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_UPDATEUISTATE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam);
if (result != null) return result;
/*
@@ -521,13 +521,13 @@ LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) {
}
if (redraw) {
OS.InvalidateRect (handle, null, false);
- int /*long*/ code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam);
+ long /*int*/ code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam);
return new LRESULT (code);
}
return result;
}
-LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Bug in Windows. For some reason, the HBRUSH that
* is returned from WM_CTRLCOLOR is misaligned when
@@ -549,7 +549,7 @@ LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) {
if (OS.IsWinCE) {
boolean drawImage = image != null;
boolean drawSeparator = (style & SWT.SEPARATOR) != 0 && (style & SWT.SHADOW_NONE) == 0;
@@ -613,7 +613,7 @@ LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_PAINT(wParam, lParam);
}
-LRESULT wmDrawChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmDrawChild (long /*int*/ wParam, long /*int*/ lParam) {
DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT ();
OS.MoveMemory (struct, lParam, DRAWITEMSTRUCT.sizeof);
drawBackground (struct.hDC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java
index 5f13a902f7..7181cab877 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java
@@ -47,9 +47,9 @@ public class Link extends Control {
String [] ids;
int [] mnemonics;
int focusIndex, mouseDownIndex;
- int /*long*/ font;
+ long /*int*/ font;
static final RGB LINK_FOREGROUND = new RGB (0, 51, 153);
- static final int /*long*/ LinkProc;
+ static final long /*int*/ LinkProc;
static final TCHAR LinkClass = new TCHAR (0, OS.WC_LINK, true);
static {
if (OS.COMCTL32_MAJOR >= 6) {
@@ -73,13 +73,13 @@ public class Link extends Control {
* code, other than SWT, could create a control with
* this class name, and fail unexpectedly.
*/
- int /*long*/ hInstance = OS.GetModuleHandle (null);
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hInstance = OS.GetModuleHandle (null);
+ long /*int*/ hHeap = OS.GetProcessHeap ();
lpWndClass.hInstance = hInstance;
lpWndClass.style &= ~OS.CS_GLOBALCLASS;
lpWndClass.style |= OS.CS_DBLCLKS;
int byteCount = LinkClass.length () * TCHAR.sizeof;
- int /*long*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (lpszClassName, LinkClass, byteCount);
lpWndClass.lpszClassName = lpszClassName;
OS.RegisterClass (lpWndClass);
@@ -152,7 +152,7 @@ public void addSelectionListener (SelectionListener listener) {
addListener (SWT.DefaultSelection, typedListener);
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
if (LinkProc != 0) {
/*
@@ -180,9 +180,9 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
int width, height;
if (OS.COMCTL32_MAJOR >= 6) {
- int /*long*/ hDC = OS.GetDC (handle);
- int /*long*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
- int /*long*/ oldFont = OS.SelectObject (hDC, newFont);
+ long /*int*/ hDC = OS.GetDC (handle);
+ long /*int*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
+ long /*int*/ oldFont = OS.SelectObject (hDC, newFont);
if (text.length () > 0) {
TCHAR buffer = new TCHAR (getCodePage (), parse (text), false);
RECT rect = new RECT ();
@@ -747,11 +747,11 @@ TCHAR windowClass () {
return OS.COMCTL32_MAJOR >= 6 ? LinkClass : display.windowClass;
}
-int /*long*/ windowProc () {
+long /*int*/ windowProc () {
return LinkProc != 0 ? LinkProc : display.windowProc;
}
-LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CHAR (wParam, lParam);
if (result != null) return result;
if (OS.COMCTL32_MAJOR < 6) {
@@ -789,7 +789,7 @@ LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
* This allows the application to cancel an operation that is normally
* performed in WM_KEYDOWN from WM_CHAR.
*/
- int /*long*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam);
return new LRESULT (code);
}
@@ -797,11 +797,11 @@ LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETDLGCODE (wParam, lParam);
if (result != null) return result;
int index, count;
- int /*long*/ code = 0;
+ long /*int*/ code = 0;
if (OS.COMCTL32_MAJOR >= 6) {
LITEM item = new LITEM ();
item.mask = OS.LIF_ITEMINDEX | OS.LIF_STATE;
@@ -832,16 +832,16 @@ LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_GETFONT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETFONT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETFONT (wParam, lParam);
if (result != null) return result;
- int /*long*/ code = callWindowProc (handle, OS.WM_GETFONT, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_GETFONT, wParam, lParam);
if (code != 0) return new LRESULT (code);
if (font == 0) font = defaultFont ();
return new LRESULT (font);
}
-LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
if (OS.COMCTL32_MAJOR >= 6) {
@@ -861,13 +861,13 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KILLFOCUS (wParam, lParam);
if (OS.COMCTL32_MAJOR < 6) redraw ();
return result;
}
-LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam);
if (result == LRESULT.ZERO) return result;
if (OS.COMCTL32_MAJOR < 6) {
@@ -905,7 +905,7 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONUP (wParam, lParam);
if (result == LRESULT.ZERO) return result;
if (OS.COMCTL32_MAJOR < 6) {
@@ -927,7 +927,7 @@ LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_NCHITTEST (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_NCHITTEST (wParam, lParam);
if (result != null) return result;
@@ -941,7 +941,7 @@ LRESULT WM_NCHITTEST (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOUSEMOVE (wParam, lParam);
if (OS.COMCTL32_MAJOR < 6) {
int x = OS.GET_X_LPARAM (lParam);
@@ -976,7 +976,7 @@ LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) {
if (OS.COMCTL32_MAJOR >= 6) {
return super.WM_PAINT (wParam, lParam);
}
@@ -998,7 +998,7 @@ LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
return LRESULT.ZERO;
}
-LRESULT WM_PRINTCLIENT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PRINTCLIENT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_PRINTCLIENT (wParam, lParam);
if (OS.COMCTL32_MAJOR < 6) {
RECT rect = new RECT ();
@@ -1013,13 +1013,13 @@ LRESULT WM_PRINTCLIENT (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETFOCUS (wParam, lParam);
if (OS.COMCTL32_MAJOR < 6) redraw ();
return result;
}
-LRESULT WM_SETFONT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) {
if (OS.COMCTL32_MAJOR < 6) {
layout.setFont (Font.win32_new (display, wParam));
}
@@ -1027,7 +1027,7 @@ LRESULT WM_SETFONT (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_SETFONT (font = wParam, lParam);
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
if (OS.COMCTL32_MAJOR < 6) {
RECT rect = new RECT ();
@@ -1038,7 +1038,7 @@ LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.wmColorChild (wParam, lParam);
/*
* Feature in Windows. When a SysLink is disabled, it does
@@ -1051,7 +1051,7 @@ LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
if (result == null) {
int backPixel = getBackgroundPixel ();
OS.SetBkColor (wParam, backPixel);
- int /*long*/ hBrush = findBrush (backPixel, OS.BS_SOLID);
+ long /*int*/ hBrush = findBrush (backPixel, OS.BS_SOLID);
return new LRESULT (hBrush);
}
}
@@ -1059,7 +1059,7 @@ LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
if (OS.COMCTL32_MAJOR >= 6) {
switch (hdr.code) {
case OS.NM_RETURN:
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java
index 26376aed54..d7f2f2dc42 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java
@@ -41,7 +41,7 @@ import org.eclipse.swt.events.*;
public class List extends Scrollable {
static final int INSET = 3;
- static final int /*long*/ ListProc;
+ static final long /*int*/ ListProc;
static final TCHAR ListClass = new TCHAR (0, "LISTBOX", true);
static {
WNDCLASS lpWndClass = new WNDCLASS ();
@@ -178,7 +178,7 @@ public void addSelectionListener(SelectionListener listener) {
addListener (SWT.DefaultSelection,typedListener);
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
boolean redraw = false;
switch (msg) {
@@ -189,7 +189,7 @@ int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, in
break;
}
}
- int /*long*/ code = OS.CallWindowProc (ListProc, hwnd, msg, wParam, lParam);
+ long /*int*/ code = OS.CallWindowProc (ListProc, hwnd, msg, wParam, lParam);
switch (msg) {
case OS.WM_HSCROLL:
case OS.WM_VSCROLL: {
@@ -216,8 +216,8 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
width -= INSET;
} else {
int count = (int)/*64*/OS.SendMessage (handle, OS.LB_GETCOUNT, 0, 0);
- int /*long*/ newFont, oldFont = 0;
- int /*long*/ hDC = OS.GetDC (handle);
+ long /*int*/ newFont, oldFont = 0;
+ long /*int*/ hDC = OS.GetDC (handle);
newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
RECT rect = new RECT ();
@@ -741,7 +741,7 @@ public void remove (int [] indices) {
}
int topIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0);
RECT rect = null;
- int /*long*/ hDC = 0, oldFont = 0, newFont = 0;
+ long /*int*/ hDC = 0, oldFont = 0, newFont = 0;
int newWidth = 0;
if ((style & SWT.H_SCROLL) != 0) {
rect = new RECT ();
@@ -861,7 +861,7 @@ public void remove (int start, int end) {
}
int topIndex = (int)/*64*/OS.SendMessage (handle, OS.LB_GETTOPINDEX, 0, 0);
RECT rect = null;
- int /*long*/ hDC = 0, oldFont = 0, newFont = 0;
+ long /*int*/ hDC = 0, oldFont = 0, newFont = 0;
int newWidth = 0;
if ((style & SWT.H_SCROLL) != 0) {
rect = new RECT ();
@@ -1198,14 +1198,14 @@ public void setItems (String [] items) {
for (int i=0; i= 0) flags |= OS.TPM_RIGHTBUTTON;
@@ -266,7 +266,7 @@ void _setVisible (boolean visible) {
* is not returned to the focus control. This causes confusion for AT users.
* The fix is to explicitly set the accessibility focus back to the focus control.
*/
- int /*long*/ hFocus = OS.GetFocus();
+ long /*int*/ hFocus = OS.GetFocus();
if (hFocus != 0) {
OS.NotifyWinEvent (OS.EVENT_OBJECT_FOCUS, hFocus, OS.OBJID_CLIENT, 0);
}
@@ -348,7 +348,7 @@ void createHandle () {
if (handle != 0) return;
if ((style & SWT.BAR) != 0) {
if (OS.IsPPC) {
- int /*long*/ hwndShell = parent.handle;
+ long /*int*/ hwndShell = parent.handle;
SHMENUBARINFO mbi = new SHMENUBARINFO ();
mbi.cbSize = SHMENUBARINFO.sizeof;
mbi.hwndParent = hwndShell;
@@ -405,7 +405,7 @@ void createHandle () {
/* Set first item */
if (nToolBarId == ID_SPMM || nToolBarId == ID_SPMB) {
- int /*long*/ hMenu = OS.SendMessage (hwndCB, OS.SHCMBM_GETSUBMENU, 0, ID_SPSOFTKEY0);
+ long /*int*/ hMenu = OS.SendMessage (hwndCB, OS.SHCMBM_GETSUBMENU, 0, ID_SPSOFTKEY0);
/* Remove the item from the resource file */
OS.RemoveMenu (hMenu, 0, OS.MF_BYPOSITION);
Menu menu = new Menu (parent, SWT.DROP_DOWN, hMenu);
@@ -418,7 +418,7 @@ void createHandle () {
/* Set second item */
if (nToolBarId == ID_SPMM || nToolBarId == ID_SPBM) {
- int /*long*/ hMenu = OS.SendMessage (hwndCB, OS.SHCMBM_GETSUBMENU, 0, ID_SPSOFTKEY1);
+ long /*int*/ hMenu = OS.SendMessage (hwndCB, OS.SHCMBM_GETSUBMENU, 0, ID_SPSOFTKEY1);
OS.RemoveMenu (hMenu, 0, OS.MF_BYPOSITION);
Menu menu = new Menu (parent, SWT.DROP_DOWN, hMenu);
item = new MenuItem (this, menu, SWT.CASCADE, 1);
@@ -434,14 +434,14 @@ void createHandle () {
* a result, Shell on WinCE SP must use the class Dialog.
*/
int dwMask = OS.SHMBOF_NODEFAULT | OS.SHMBOF_NOTIFY;
- int /*long*/ lParam = OS.MAKELPARAM (dwMask, dwMask);
+ long /*int*/ lParam = OS.MAKELPARAM (dwMask, dwMask);
OS.SendMessage (hwndCB, OS.SHCMBM_OVERRIDEKEY, OS.VK_ESCAPE, lParam);
return;
}
handle = OS.CreateMenu ();
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
if (OS.IsHPC) {
- int /*long*/ hwndShell = parent.handle;
+ long /*int*/ hwndShell = parent.handle;
hwndCB = OS.CommandBar_Create (OS.GetModuleHandle (null), hwndShell, 1);
if (hwndCB == 0) error (SWT.ERROR_NO_HANDLES);
OS.CommandBar_Show (hwndCB, false);
@@ -505,10 +505,10 @@ void createItem (MenuItem item, int index) {
* becomes unexpectedly disabled. The fix is to insert a
* space.
*/
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
TCHAR buffer = new TCHAR (0, " ", true);
int byteCount = buffer.length () * TCHAR.sizeof;
- int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (pszText, buffer, byteCount);
MENUITEMINFO info = new MENUITEMINFO ();
info.cbSize = MENUITEMINFO.sizeof;
@@ -605,7 +605,7 @@ void destroyItem (MenuItem item) {
void destroyWidget () {
MenuItem cascade = this.cascade;
- int /*long*/ hMenu = handle, hCB = hwndCB;
+ long /*int*/ hMenu = handle, hCB = hwndCB;
releaseHandle ();
if (OS.IsWinCE && hCB != 0) {
OS.CommandBar_Destroy (hCB);
@@ -689,7 +689,7 @@ void fixMenus (Decorations newParent) {
if (parent.menuBar != this) {
return new Rectangle (0, 0, 0, 0);
}
- int /*long*/ hwndShell = parent.handle;
+ long /*int*/ hwndShell = parent.handle;
MENUBARINFO info = new MENUBARINFO ();
info.cbSize = MENUBARINFO.sizeof;
if (OS.GetMenuBarInfo (hwndShell, OS.OBJID_MENU, 0, info)) {
@@ -797,7 +797,7 @@ public MenuItem getItem (int index) {
if ((OS.IsPPC || OS.IsSP) && hwndCB != 0) {
if (OS.IsPPC) {
TBBUTTON lpButton = new TBBUTTON ();
- int /*long*/ result = OS.SendMessage (hwndCB, OS.TB_GETBUTTON, index, lpButton);
+ long /*int*/ result = OS.SendMessage (hwndCB, OS.TB_GETBUTTON, index, lpButton);
if (result == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
id = lpButton.idCommand;
}
@@ -892,7 +892,7 @@ public MenuItem [] getItems () {
return result;
}
-int GetMenuItemCount (int /*long*/ handle) {
+int GetMenuItemCount (long /*int*/ handle) {
if (OS.IsWinCE) {
if ((OS.IsPPC || OS.IsSP) && hwndCB != 0) {
return OS.IsSP ? 2 : (int)/*64*/OS.SendMessage (hwndCB, OS.TB_BUTTONCOUNT, 0, 0);
@@ -1050,7 +1050,7 @@ int imageIndex (Image image) {
Rectangle bounds = image.getBounds ();
imageList = display.getImageList (style & SWT.RIGHT_TO_LEFT, bounds.width, bounds.height);
int index = imageList.add (image);
- int /*long*/ hImageList = imageList.getHandle ();
+ long /*int*/ hImageList = imageList.getHandle ();
OS.SendMessage (hwndCB, OS.TB_SETIMAGELIST, 0, hImageList);
return index;
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java
index 376d077bae..cfa8287700 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java
@@ -38,7 +38,7 @@ import org.eclipse.swt.events.*;
public class MenuItem extends Item {
Menu parent, menu;
- int /*long*/ hBitmap;
+ long /*int*/ hBitmap;
int id, accelerator, userId;
/*
* Feature in Windows. On Windows 98, it is necessary
@@ -335,7 +335,7 @@ public int getAccelerator () {
if (shell.menuBar != parent) {
return new Rectangle (0, 0, 0, 0);
}
- int /*long*/ hwndShell = shell.handle;
+ long /*int*/ hwndShell = shell.handle;
MENUBARINFO info1 = new MENUBARINFO ();
info1.cbSize = MENUBARINFO.sizeof;
if (!OS.GetMenuBarInfo (hwndShell, OS.OBJID_MENU, 1, info1)) {
@@ -352,7 +352,7 @@ public int getAccelerator () {
int height = info2.bottom - info2.top;
return new Rectangle (x, y, width, height);
} else {
- int /*long*/ hMenu = parent.handle;
+ long /*int*/ hMenu = parent.handle;
RECT rect1 = new RECT ();
if (!OS.GetMenuItemRect (0, hMenu, 0, rect1)) {
return new Rectangle (0, 0, 0, 0);
@@ -387,7 +387,7 @@ public int getAccelerator () {
public boolean getEnabled () {
checkWidget ();
if ((OS.IsPPC || OS.IsSP) && parent.hwndCB != 0) {
- int /*long*/ hwndCB = parent.hwndCB;
+ long /*int*/ hwndCB = parent.hwndCB;
TBBUTTONINFO info = new TBBUTTONINFO ();
info.cbSize = TBBUTTONINFO.sizeof;
info.dwMask = OS.TBIF_STATE;
@@ -403,7 +403,7 @@ public boolean getEnabled () {
if ((style & SWT.SEPARATOR) != 0) {
return (state & DISABLED) == 0;
}
- int /*long*/ hMenu = parent.handle;
+ long /*int*/ hMenu = parent.handle;
MENUITEMINFO info = new MENUITEMINFO ();
info.cbSize = MENUITEMINFO.sizeof;
info.fMask = OS.MIIM_STATE;
@@ -493,7 +493,7 @@ public boolean getSelection () {
checkWidget ();
if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return false;
if ((OS.IsPPC || OS.IsSP) && parent.hwndCB != 0) return false;
- int /*long*/ hMenu = parent.handle;
+ long /*int*/ hMenu = parent.handle;
MENUITEMINFO info = new MENUITEMINFO ();
info.cbSize = MENUITEMINFO.sizeof;
info.fMask = OS.MIIM_STATE;
@@ -681,7 +681,7 @@ public void setAccelerator (int accelerator) {
public void setEnabled (boolean enabled) {
checkWidget ();
if ((OS.IsPPC || OS.IsSP) && parent.hwndCB != 0) {
- int /*long*/ hwndCB = parent.hwndCB;
+ long /*int*/ hwndCB = parent.hwndCB;
TBBUTTONINFO info = new TBBUTTONINFO ();
info.cbSize = TBBUTTONINFO.sizeof;
info.dwMask = OS.TBIF_STATE;
@@ -703,7 +703,7 @@ public void setEnabled (boolean enabled) {
state |= DISABLED;
}
}
- int /*long*/ hMenu = parent.handle;
+ long /*int*/ hMenu = parent.handle;
if (OS.IsWinCE) {
int index = parent.indexOf (this);
if (index == -1) return;
@@ -792,7 +792,7 @@ public void setImage (Image image) {
super.setImage (image);
if (OS.IsWinCE) {
if ((OS.IsPPC || OS.IsSP) && parent.hwndCB != 0) {
- int /*long*/ hwndCB = parent.hwndCB;
+ long /*int*/ hwndCB = parent.hwndCB;
TBBUTTONINFO info = new TBBUTTONINFO ();
info.cbSize = TBBUTTONINFO.sizeof;
info.dwMask = OS.TBIF_IMAGE;
@@ -815,7 +815,7 @@ public void setImage (Image image) {
info.hbmpItem = image != null ? OS.HBMMENU_CALLBACK : 0;
}
}
- int /*long*/ hMenu = parent.handle;
+ long /*int*/ hMenu = parent.handle;
OS.SetMenuItemInfo (hMenu, id, false, info);
parent.redraw ();
}
@@ -875,13 +875,13 @@ void setMenu (Menu menu, boolean dispose) {
/* Assign the new menu in the OS */
if ((OS.IsPPC || OS.IsSP) && parent.hwndCB != 0) {
if (OS.IsPPC) {
- int /*long*/ hwndCB = parent.hwndCB;
- int /*long*/ hMenu = menu == null ? 0 : menu.handle;
+ long /*int*/ hwndCB = parent.hwndCB;
+ long /*int*/ hMenu = menu == null ? 0 : menu.handle;
OS.SendMessage (hwndCB, OS.SHCMBM_SETSUBMENU, id, hMenu);
}
if (OS.IsSP) error (SWT.ERROR_CANNOT_SET_MENU);
} else {
- int /*long*/ hMenu = parent.handle;
+ long /*int*/ hMenu = parent.handle;
MENUITEMINFO info = new MENUITEMINFO ();
info.cbSize = MENUITEMINFO.sizeof;
info.fMask = OS.MIIM_DATA;
@@ -892,9 +892,9 @@ void setMenu (Menu menu, boolean dispose) {
}
if (info.dwItemData != id) return;
int cch = 128;
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
int byteCount = cch * TCHAR.sizeof;
- int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
info.fMask = OS.MIIM_STATE | OS.MIIM_ID | OS.MIIM_DATA;
/*
* Bug in Windows. When GetMenuItemInfo() is used to get the text,
@@ -925,7 +925,7 @@ void setMenu (Menu menu, boolean dispose) {
* the item, SetMenuItemInfo() to set the string and EnableMenuItem()
* and CheckMenuItem() to set the state.
*/
- int /*long*/ uIDNewItem = id;
+ long /*int*/ uIDNewItem = id;
int uFlags = OS.MF_BYPOSITION;
if (menu != null) {
uFlags |= OS.MF_POPUP;
@@ -978,7 +978,7 @@ boolean setRadioSelection (boolean value) {
}
void setOrientation (int orientation) {
- int /*long*/ hMenu = parent.handle;
+ long /*int*/ hMenu = parent.handle;
MENUITEMINFO info = new MENUITEMINFO ();
info.cbSize = MENUITEMINFO.sizeof;
info.fMask = OS.MIIM_FTYPE;
@@ -1004,7 +1004,7 @@ public void setSelection (boolean selected) {
checkWidget ();
if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return;
if ((OS.IsPPC || OS.IsSP) && parent.hwndCB != 0) return;
- int /*long*/ hMenu = parent.handle;
+ long /*int*/ hMenu = parent.handle;
if (OS.IsWinCE) {
int index = parent.indexOf (this);
if (index == -1) return;
@@ -1082,8 +1082,8 @@ public void setText (String string) {
if ((style & SWT.SEPARATOR) != 0) return;
if (text.equals (string)) return;
super.setText (string);
- int /*long*/ hHeap = OS.GetProcessHeap ();
- int /*long*/ pszText = 0;
+ long /*int*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ pszText = 0;
boolean success = false;
if ((OS.IsPPC || OS.IsSP) && parent.hwndCB != 0) {
/*
@@ -1107,7 +1107,7 @@ public void setText (String string) {
int byteCount = buffer.length () * TCHAR.sizeof;
pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (pszText, buffer, byteCount);
- int /*long*/ hwndCB = parent.hwndCB;
+ long /*int*/ hwndCB = parent.hwndCB;
TBBUTTONINFO info2 = new TBBUTTONINFO ();
info2.cbSize = TBBUTTONINFO.sizeof;
info2.dwMask = OS.TBIF_TEXT;
@@ -1116,7 +1116,7 @@ public void setText (String string) {
} else {
MENUITEMINFO info = new MENUITEMINFO ();
info.cbSize = MENUITEMINFO.sizeof;
- int /*long*/ hMenu = parent.handle;
+ long /*int*/ hMenu = parent.handle;
/* Use the character encoding for the default locale */
TCHAR buffer = new TCHAR (0, string, true);
@@ -1162,7 +1162,7 @@ int widgetStyle () {
return bits | OS.MFT_STRING;
}
-LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) {
if ((style & SWT.CHECK) != 0) {
setSelection (!getSelection ());
} else {
@@ -1178,7 +1178,7 @@ LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT wmDrawChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmDrawChild (long /*int*/ wParam, long /*int*/ lParam) {
DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT ();
OS.MoveMemory (struct, lParam, DRAWITEMSTRUCT.sizeof);
if (image != null) {
@@ -1201,7 +1201,7 @@ LRESULT wmDrawChild (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT wmMeasureChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmMeasureChild (long /*int*/ wParam, long /*int*/ lParam) {
MEASUREITEMSTRUCT struct = new MEASUREITEMSTRUCT ();
OS.MoveMemory (struct, lParam, MEASUREITEMSTRUCT.sizeof);
int width = 0, height = 0;
@@ -1223,7 +1223,7 @@ LRESULT wmMeasureChild (int /*long*/ wParam, int /*long*/ lParam) {
MENUINFO lpcmi = new MENUINFO ();
lpcmi.cbSize = MENUINFO.sizeof;
lpcmi.fMask = OS.MIM_STYLE;
- int /*long*/ hMenu = parent.handle;
+ long /*int*/ hMenu = parent.handle;
OS.GetMenuInfo (hMenu, lpcmi);
if ((lpcmi.dwStyle & OS.MNS_CHECKORBMP) == 0) {
MenuItem [] items = parent.getItems ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java
index 8694a26c2d..04ec9096a8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java
@@ -190,7 +190,7 @@ public int open () {
* anyway and not rely on MB_MODAL to work by making the
* parent be temporarily modal.
*/
- int /*long*/ hwndOwner = parent != null ? parent.handle : 0;
+ long /*int*/ hwndOwner = parent != null ? parent.handle : 0;
Dialog oldModal = null;
Display display = null;
if ((bits & OS.MB_TASKMODAL) != 0) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java
index 1083d0f62b..4d3214c9db 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java
@@ -40,7 +40,7 @@ public class ProgressBar extends Control {
static final int DELAY = 100;
static final int TIMER_ID = 100;
static final int MINIMUM_WIDTH = 100;
- static final int /*long*/ ProgressBarProc;
+ static final long /*int*/ ProgressBarProc;
static final TCHAR ProgressBarClass = new TCHAR (0, OS.PROGRESS_CLASS, true);
static {
WNDCLASS lpWndClass = new WNDCLASS ();
@@ -63,13 +63,13 @@ public class ProgressBar extends Control {
* code, other than SWT, could create a control with
* this class name, and fail unexpectedly.
*/
- int /*long*/ hInstance = OS.GetModuleHandle (null);
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hInstance = OS.GetModuleHandle (null);
+ long /*int*/ hHeap = OS.GetProcessHeap ();
lpWndClass.hInstance = hInstance;
lpWndClass.style &= ~OS.CS_GLOBALCLASS;
lpWndClass.style |= OS.CS_DBLCLKS;
int byteCount = ProgressBarClass.length () * TCHAR.sizeof;
- int /*long*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (lpszClassName, ProgressBarClass, byteCount);
lpWndClass.lpszClassName = lpszClassName;
OS.RegisterClass (lpWndClass);
@@ -111,7 +111,7 @@ public ProgressBar (Composite parent, int style) {
super (parent, checkStyle (style));
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.CallWindowProc (ProgressBarProc, hwnd, msg, wParam, lParam);
}
@@ -323,7 +323,7 @@ public void setSelection (int value) {
* a second time.
*/
if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) {
- int /*long*/ state = OS.SendMessage (handle, OS.PBM_GETSTATE, 0, 0);
+ long /*int*/ state = OS.SendMessage (handle, OS.PBM_GETSTATE, 0, 0);
if (state != OS.PBST_NORMAL) {
OS.SendMessage (handle, OS.PBM_SETPOS, value, 0);
}
@@ -380,11 +380,11 @@ TCHAR windowClass () {
return ProgressBarClass;
}
-int /*long*/ windowProc () {
+long /*int*/ windowProc () {
return ProgressBarProc;
}
-LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETDLGCODE (wParam, lParam);
if (result != null) return result;
/*
@@ -399,7 +399,7 @@ LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) {
return new LRESULT (OS.DLGC_STATIC);
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
if (result != null) return result;
/*
@@ -435,7 +435,7 @@ LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_TIMER (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_TIMER (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_TIMER (wParam, lParam);
if (result != null) return result;
if ((style & SWT.INDETERMINATE) != 0) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java
index e87b67adda..b834ad02fc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java
@@ -110,7 +110,7 @@ public void addSelectionListener (SelectionListener listener) {
addListener (SWT.DefaultSelection,typedListener);
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.DefWindowProc (hwnd, msg, wParam, lParam);
}
@@ -140,12 +140,12 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
void drawBand (int x, int y, int width, int height) {
if ((style & SWT.SMOOTH) != 0) return;
- int /*long*/ hwndTrack = parent.handle;
+ long /*int*/ hwndTrack = parent.handle;
byte [] bits = {-86, 0, 85, 0, -86, 0, 85, 0, -86, 0, 85, 0, -86, 0, 85, 0};
- int /*long*/ stippleBitmap = OS.CreateBitmap (8, 8, 1, 1, bits);
- int /*long*/ stippleBrush = OS.CreatePatternBrush (stippleBitmap);
- int /*long*/ hDC = OS.GetDCEx (hwndTrack, 0, OS.DCX_CACHE);
- int /*long*/ oldBrush = OS.SelectObject (hDC, stippleBrush);
+ long /*int*/ stippleBitmap = OS.CreateBitmap (8, 8, 1, 1, bits);
+ long /*int*/ stippleBrush = OS.CreatePatternBrush (stippleBitmap);
+ long /*int*/ hDC = OS.GetDCEx (hwndTrack, 0, OS.DCX_CACHE);
+ long /*int*/ oldBrush = OS.SelectObject (hDC, stippleBrush);
OS.PatBlt (hDC, x, y, width, height, OS.PATINVERT);
OS.SelectObject (hDC, oldBrush);
OS.ReleaseDC (hwndTrack, hDC);
@@ -182,17 +182,17 @@ TCHAR windowClass () {
return display.windowClass;
}
-int /*long*/ windowProc () {
+long /*int*/ windowProc () {
return display.windowProc;
}
-LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
super.WM_ERASEBKGND (wParam, lParam);
drawBackground (wParam);
return LRESULT.ONE;
}
-LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
switch ((int)/*64*/wParam) {
@@ -216,7 +216,7 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
OS.GetWindowRect (handle, rect);
int width = rect.right - rect.left;
int height = rect.bottom - rect.top;
- int /*long*/ hwndTrack = parent.handle;
+ long /*int*/ hwndTrack = parent.handle;
RECT clientRect = new RECT ();
OS.GetClientRect (hwndTrack, clientRect);
int clientWidth = clientRect.right - clientRect.left;
@@ -254,16 +254,16 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
return new LRESULT (OS.DLGC_STATIC);
}
-LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam);
if (result == LRESULT.ZERO) return result;
/* Compute the banding rectangle */
- int /*long*/ hwndTrack = parent.handle;
+ long /*int*/ hwndTrack = parent.handle;
POINT pt = new POINT ();
OS.POINTSTOPOINT (pt, lParam);
RECT rect = new RECT ();
@@ -311,7 +311,7 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONUP (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_LBUTTONUP (wParam, lParam);
if (result == LRESULT.ZERO) return result;
@@ -341,7 +341,7 @@ LRESULT WM_LBUTTONUP (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOUSEMOVE (wParam, lParam);
if (result != null) return result;
if (!dragging || (wParam & OS.MK_LBUTTON) == 0) return result;
@@ -349,7 +349,7 @@ LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) {
/* Compute the banding rectangle */
POINT pt = new POINT ();
OS.POINTSTOPOINT (pt, lParam);
- int /*long*/ hwndTrack = parent.handle;
+ long /*int*/ hwndTrack = parent.handle;
OS.MapWindowPoints (handle, hwndTrack, pt, 1);
RECT rect = new RECT (), clientRect = new RECT ();
OS.GetWindowRect (handle, rect);
@@ -396,12 +396,12 @@ LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SETCURSOR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETCURSOR (wParam, lParam);
if (result != null) return result;
int hitTest = (short) OS.LOWORD (lParam);
if (hitTest == OS.HTCLIENT) {
- int /*long*/ hCursor = 0;
+ long /*int*/ hCursor = 0;
if ((style & SWT.HORIZONTAL) != 0) {
hCursor = OS.LoadCursor (0, OS.IDC_SIZENS);
} else {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java
index e02cf81d49..5b76a9cd47 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java
@@ -41,7 +41,7 @@ import org.eclipse.swt.events.*;
public class Scale extends Control {
boolean ignoreResize, ignoreSelection;
- static final int /*long*/ TrackBarProc;
+ static final long /*int*/ TrackBarProc;
static final TCHAR TrackBarClass = new TCHAR (0, OS.TRACKBAR_CLASS, true);
boolean createdAsRTL;
static {
@@ -65,13 +65,13 @@ public class Scale extends Control {
* code, other than SWT, could create a control with
* this class name, and fail unexpectedly.
*/
- int /*long*/ hInstance = OS.GetModuleHandle (null);
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hInstance = OS.GetModuleHandle (null);
+ long /*int*/ hHeap = OS.GetProcessHeap ();
lpWndClass.hInstance = hInstance;
lpWndClass.style &= ~OS.CS_GLOBALCLASS;
lpWndClass.style |= OS.CS_DBLCLKS;
int byteCount = TrackBarClass.length () * TCHAR.sizeof;
- int /*long*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (lpszClassName, TrackBarClass, byteCount);
lpWndClass.lpszClassName = lpszClassName;
OS.RegisterClass (lpWndClass);
@@ -142,7 +142,7 @@ public void addSelectionListener(SelectionListener listener) {
addListener (SWT.DefaultSelection,typedListener);
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.CallWindowProc (TrackBarProc, hwnd, msg, wParam, lParam);
}
@@ -288,7 +288,7 @@ public void removeSelectionListener(SelectionListener listener) {
eventTable.unhook (SWT.DefaultSelection,listener);
}
-void setBackgroundImage (int /*long*/ hImage) {
+void setBackgroundImage (long /*int*/ hImage) {
super.setBackgroundImage (hImage);
/*
* Bug in Windows. Changing the background color of the Scale
@@ -454,11 +454,11 @@ TCHAR windowClass () {
return TrackBarClass;
}
-int /*long*/ windowProc () {
+long /*int*/ windowProc () {
return TrackBarProc;
}
-LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
switch ((int)/*64*/wParam) {
@@ -473,7 +473,7 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
*/
boolean isRTL = (style & SWT.RIGHT_TO_LEFT) != 0;
if (isRTL != createdAsRTL) {
- int /*long*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam == OS.VK_RIGHT ? OS.VK_LEFT : OS.VK_RIGHT, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam == OS.VK_RIGHT ? OS.VK_LEFT : OS.VK_RIGHT, lParam);
return new LRESULT (code);
}
break;
@@ -481,7 +481,7 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_MOUSEWHEEL (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEWHEEL (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOUSEWHEEL (wParam, lParam);
if (result != null) return result;
/*
@@ -494,7 +494,7 @@ LRESULT WM_MOUSEWHEEL (int /*long*/ wParam, int /*long*/ lParam) {
*/
int oldPosition = (int)/*64*/OS.SendMessage (handle, OS.TBM_GETPOS, 0, 0);
ignoreSelection = true;
- int /*long*/ code = callWindowProc (handle, OS.WM_MOUSEWHEEL, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_MOUSEWHEEL, wParam, lParam);
ignoreSelection = false;
int newPosition = (int)/*64*/OS.SendMessage (handle, OS.TBM_GETPOS, 0, 0);
if (oldPosition != newPosition) {
@@ -509,7 +509,7 @@ LRESULT WM_MOUSEWHEEL (int /*long*/ wParam, int /*long*/ lParam) {
return new LRESULT (code);
}
-LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Bug in Windows. For some reason, when WM_CTLCOLORSTATIC
* is used to implement transparency and returns a NULL brush,
@@ -541,12 +541,12 @@ LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_PAINT (wParam, lParam);
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreResize) return null;
return super.WM_SIZE (wParam, lParam);
}
-LRESULT wmScrollChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmScrollChild (long /*int*/ wParam, long /*int*/ lParam) {
/* Do nothing when scrolling is ending */
int code = OS.LOWORD (wParam);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java
index cf21cc258d..60f692a04b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java
@@ -182,7 +182,7 @@ void createWidget () {
}
void destroyWidget () {
- int /*long*/ hwnd = hwndScrollBar ();
+ long /*int*/ hwnd = hwndScrollBar ();
int type = scrollBarType ();
if (OS.IsWinCE) {
SCROLLINFO info = new SCROLLINFO ();
@@ -271,7 +271,7 @@ public int getMaximum () {
SCROLLINFO info = new SCROLLINFO ();
info.cbSize = SCROLLINFO.sizeof;
info.fMask = OS.SIF_RANGE;
- int /*long*/ hwnd = hwndScrollBar ();
+ long /*int*/ hwnd = hwndScrollBar ();
int type = scrollBarType ();
OS.GetScrollInfo (hwnd, type, info);
return info.nMax;
@@ -292,7 +292,7 @@ public int getMinimum () {
SCROLLINFO info = new SCROLLINFO ();
info.cbSize = SCROLLINFO.sizeof;
info.fMask = OS.SIF_RANGE;
- int /*long*/ hwnd = hwndScrollBar ();
+ long /*int*/ hwnd = hwndScrollBar ();
int type = scrollBarType ();
OS.GetScrollInfo (hwnd, type, info);
return info.nMin;
@@ -345,7 +345,7 @@ public int getSelection () {
SCROLLINFO info = new SCROLLINFO ();
info.cbSize = SCROLLINFO.sizeof;
info.fMask = OS.SIF_POS;
- int /*long*/ hwnd = hwndScrollBar ();
+ long /*int*/ hwnd = hwndScrollBar ();
int type = scrollBarType ();
OS.GetScrollInfo (hwnd, type, info);
return info.nPos;
@@ -397,7 +397,7 @@ public int getThumb () {
SCROLLINFO info = new SCROLLINFO ();
info.cbSize = SCROLLINFO.sizeof;
info.fMask = OS.SIF_PAGE;
- int /*long*/ hwnd = hwndScrollBar ();
+ long /*int*/ hwnd = hwndScrollBar ();
int type = scrollBarType ();
OS.GetScrollInfo (hwnd, type, info);
if (info.nPage != 0) --info.nPage;
@@ -530,7 +530,7 @@ public boolean getVisible () {
return (state & HIDDEN) == 0;
}
-int /*long*/ hwndScrollBar () {
+long /*int*/ hwndScrollBar () {
return parent.scrolledHandle ();
}
@@ -634,7 +634,7 @@ public void setEnabled (boolean enabled) {
*/
// if (OS.IsWinCE) error (SWT.ERROR_NOT_IMPLEMENTED);
if (!OS.IsWinCE) {
- int /*long*/ hwnd = hwndScrollBar ();
+ long /*int*/ hwnd = hwndScrollBar ();
int type = scrollBarType ();
int flags = enabled ? OS.ESB_ENABLE_BOTH : OS.ESB_DISABLE_BOTH;
OS.EnableScrollBar (hwnd, type, flags);
@@ -683,7 +683,7 @@ public void setMaximum (int value) {
if (value < 0) return;
SCROLLINFO info = new SCROLLINFO ();
info.cbSize = SCROLLINFO.sizeof;
- int /*long*/ hwnd = hwndScrollBar ();
+ long /*int*/ hwnd = hwndScrollBar ();
int type = scrollBarType ();
info.fMask = OS.SIF_RANGE | OS.SIF_DISABLENOSCROLL;
OS.GetScrollInfo (hwnd, type, info);
@@ -710,7 +710,7 @@ public void setMinimum (int value) {
if (value < 0) return;
SCROLLINFO info = new SCROLLINFO ();
info.cbSize = SCROLLINFO.sizeof;
- int /*long*/ hwnd = hwndScrollBar ();
+ long /*int*/ hwnd = hwndScrollBar ();
int type = scrollBarType ();
info.fMask = OS.SIF_RANGE | OS.SIF_DISABLENOSCROLL;
OS.GetScrollInfo (hwnd, type, info);
@@ -738,7 +738,7 @@ public void setPageIncrement (int value) {
pageIncrement = value;
}
-boolean SetScrollInfo (int /*long*/ hwnd, int flags, SCROLLINFO info, boolean fRedraw) {
+boolean SetScrollInfo (long /*int*/ hwnd, int flags, SCROLLINFO info, boolean fRedraw) {
/*
* Bug in Windows. For some reason, when SetScrollInfo()
* is used with SIF_POS and the scroll bar is hidden,
@@ -844,7 +844,7 @@ public void setSelection (int selection) {
checkWidget();
SCROLLINFO info = new SCROLLINFO ();
info.cbSize = SCROLLINFO.sizeof;
- int /*long*/ hwnd = hwndScrollBar ();
+ long /*int*/ hwnd = hwndScrollBar ();
int type = scrollBarType ();
info.fMask = OS.SIF_POS;
info.nPos = selection;
@@ -873,7 +873,7 @@ public void setThumb (int value) {
if (value < 1) return;
SCROLLINFO info = new SCROLLINFO ();
info.cbSize = SCROLLINFO.sizeof;
- int /*long*/ hwnd = hwndScrollBar ();
+ long /*int*/ hwnd = hwndScrollBar ();
int type = scrollBarType ();
info.fMask = OS.SIF_PAGE | OS.SIF_RANGE | OS.SIF_DISABLENOSCROLL;
OS.GetScrollInfo (hwnd, type, info);
@@ -920,7 +920,7 @@ public void setValues (int selection, int minimum, int maximum, int thumb, int i
info.nMax = maximum;
info.nPage = thumb;
if (info.nPage != 0) info.nPage++;
- int /*long*/ hwnd = hwndScrollBar ();
+ long /*int*/ hwnd = hwndScrollBar ();
int type = scrollBarType ();
SetScrollInfo (hwnd, type, info, true);
}
@@ -953,7 +953,7 @@ public void setVisible (boolean visible) {
if (OS.IsWinCE) {
SCROLLINFO info = new SCROLLINFO ();
info.cbSize = SCROLLINFO.sizeof;
- int /*long*/ hwnd = hwndScrollBar ();
+ long /*int*/ hwnd = hwndScrollBar ();
int type = scrollBarType ();
info.fMask = OS.SIF_RANGE | OS.SIF_PAGE;
if (visible) info.fMask |= OS.SIF_DISABLENOSCROLL;
@@ -990,7 +990,7 @@ public void setVisible (boolean visible) {
* of the scroll bar will get the correct value.
*/
state = visible ? state & ~HIDDEN : state | HIDDEN;
- int /*long*/ hwnd = hwndScrollBar ();
+ long /*int*/ hwnd = hwndScrollBar ();
int type = scrollBarType ();
if (OS.ShowScrollBar (hwnd, type, visible)) {
/*
@@ -1020,7 +1020,7 @@ public void setVisible (boolean visible) {
}
}
-LRESULT wmScrollChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmScrollChild (long /*int*/ wParam, long /*int*/ lParam) {
/* Do nothing when scrolling is ending */
int code = OS.LOWORD (wParam);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java
index 0b2e0add0d..af1bcc82ee 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java
@@ -75,7 +75,7 @@ public Scrollable (Composite parent, int style) {
super (parent, style);
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.DefWindowProc (hwnd, msg, wParam, lParam);
}
@@ -109,7 +109,7 @@ int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, in
*/
public Rectangle computeTrim (int x, int y, int width, int height) {
checkWidget ();
- int /*long*/ scrolledHandle = scrolledHandle ();
+ long /*int*/ scrolledHandle = scrolledHandle ();
RECT rect = new RECT ();
OS.SetRect (rect, x, y, x + width, y + height);
int bits1 = OS.GetWindowLong (scrolledHandle, OS.GWL_STYLE);
@@ -137,7 +137,7 @@ void createWidget () {
}
void destroyScrollBar (int type) {
- int /*long*/ hwnd = scrolledHandle ();
+ long /*int*/ hwnd = scrolledHandle ();
int bits = OS.GetWindowLong (hwnd, OS.GWL_STYLE);
if ((type & SWT.HORIZONTAL) != 0) {
style &= ~SWT.H_SCROLL;
@@ -168,7 +168,7 @@ public Rectangle getClientArea () {
checkWidget ();
forceResize ();
RECT rect = new RECT ();
- int /*long*/ scrolledHandle = scrolledHandle ();
+ long /*int*/ scrolledHandle = scrolledHandle ();
OS.GetClientRect (scrolledHandle, rect);
int x = rect.left, y = rect.top;
int width = rect.right - rect.left;
@@ -258,7 +258,7 @@ void reskinChildren (int flags) {
super.reskinChildren (flags);
}
-int /*long*/ scrolledHandle () {
+long /*int*/ scrolledHandle () {
return handle;
}
@@ -287,11 +287,11 @@ TCHAR windowClass () {
return display.windowClass;
}
-int /*long*/ windowProc () {
+long /*int*/ windowProc () {
return display.windowProc;
}
-LRESULT WM_HSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_HSCROLL (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_HSCROLL (wParam, lParam);
if (result != null) return result;
@@ -308,19 +308,19 @@ LRESULT WM_HSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_MOUSEWHEEL (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEWHEEL (long /*int*/ wParam, long /*int*/ lParam) {
return wmScrollWheel ((state & CANVAS) != 0, wParam, lParam);
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
- int /*long*/ code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam);
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
+ long /*int*/ code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam);
super.WM_SIZE (wParam, lParam);
// widget may be disposed at this point
if (code == 0) return LRESULT.ZERO;
return new LRESULT (code);
}
-LRESULT WM_VSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_VSCROLL (wParam, lParam);
if (result != null) return result;
/*
@@ -336,7 +336,7 @@ LRESULT WM_VSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT wmNCPaint (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNCPaint (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.wmNCPaint (hwnd, wParam, lParam);
if (result != null) return result;
/*
@@ -374,11 +374,11 @@ LRESULT wmNCPaint (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam)
cornerRect.left = cornerRect.right - (hVisible ? OS.GetSystemMetrics (OS.SM_CXVSCROLL) : 0);
}
if (cornerRect.left != cornerRect.right && cornerRect.top != cornerRect.bottom) {
- int /*long*/ hDC = OS.GetWindowDC (hwnd);
+ long /*int*/ hDC = OS.GetWindowDC (hwnd);
OS.FillRect (hDC, cornerRect, OS.COLOR_BTNFACE + 1);
Decorations shell = menuShell ();
if ((shell.style & SWT.RESIZE) != 0) {
- int /*long*/ hwndScroll = shell.scrolledHandle ();
+ long /*int*/ hwndScroll = shell.scrolledHandle ();
boolean drawGripper = hwnd == hwndScroll;
if (!drawGripper) {
RECT shellRect = new RECT ();
@@ -398,7 +398,7 @@ LRESULT wmNCPaint (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam)
return result;
}
-LRESULT wmScrollWheel (boolean update, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmScrollWheel (boolean update, long /*int*/ wParam, long /*int*/ lParam) {
int scrollRemainder = display.scrollRemainder;
LRESULT result = super.WM_MOUSEWHEEL (wParam, lParam);
if (result != null) return result;
@@ -457,7 +457,7 @@ LRESULT wmScrollWheel (boolean update, int /*long*/ wParam, int /*long*/ lParam)
*/
int vPosition = verticalBar == null ? 0 : verticalBar.getSelection ();
int hPosition = horizontalBar == null ? 0 : horizontalBar.getSelection ();
- int /*long*/ code = callWindowProc (handle, OS.WM_MOUSEWHEEL, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_MOUSEWHEEL, wParam, lParam);
if (verticalBar != null) {
int position = verticalBar.getSelection ();
if (position != vPosition) {
@@ -477,7 +477,7 @@ LRESULT wmScrollWheel (boolean update, int /*long*/ wParam, int /*long*/ lParam)
return new LRESULT (code);
}
-LRESULT wmScroll (ScrollBar bar, boolean update, int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmScroll (ScrollBar bar, boolean update, long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = null;
if (update) {
int type = msg == OS.WM_HSCROLL ? OS.SB_HORZ : OS.SB_VERT;
@@ -522,7 +522,7 @@ LRESULT wmScroll (ScrollBar bar, boolean update, int /*long*/ hwnd, int msg, int
}
OS.SetScrollInfo (hwnd, type, info, true);
} else {
- int /*long*/ code = callWindowProc (hwnd, msg, wParam, lParam);
+ long /*int*/ code = callWindowProc (hwnd, msg, wParam, lParam);
result = code == 0 ? LRESULT.ZERO : new LRESULT (code);
}
bar.wmScrollChild (wParam, lParam);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java
index eb6a6aca64..bff0bfaf6d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java
@@ -119,17 +119,17 @@ import org.eclipse.swt.events.*;
public class Shell extends Decorations {
Menu activeMenu;
ToolTip [] toolTips;
- int /*long*/ hIMC, hwndMDIClient, lpstrTip, toolTipHandle, balloonTipHandle;
+ long /*int*/ hIMC, hwndMDIClient, lpstrTip, toolTipHandle, balloonTipHandle;
int minWidth = SWT.DEFAULT, minHeight = SWT.DEFAULT;
- int /*long*/ [] brushes;
+ long /*int*/ [] brushes;
boolean showWithParent, fullScreen, wasMaximized, modified, center;
String toolTitle, balloonTitle;
- int /*long*/ toolIcon, balloonIcon;
- int /*long*/ windowProc;
+ long /*int*/ toolIcon, balloonIcon;
+ long /*int*/ windowProc;
Control lastActive;
SHACTIVATEINFO psai;
- static /*final*/ int /*long*/ ToolTipProc;
- static final int /*long*/ DialogProc;
+ static /*final*/ long /*int*/ ToolTipProc;
+ static final long /*int*/ DialogProc;
static final TCHAR DialogClass = new TCHAR (0, OS.IsWinCE ? "Dialog" : "#32770", true);
final static int [] SYSTEM_COLORS = {
OS.COLOR_BTNFACE,
@@ -274,7 +274,7 @@ public Shell (Display display, int style) {
this (display, null, style, 0, false);
}
-Shell (Display display, Shell parent, int style, int /*long*/ handle, boolean embedded) {
+Shell (Display display, Shell parent, int style, long /*int*/ handle, boolean embedded) {
super ();
checkSubclass ();
if (display == null) display = Display.getCurrent ();
@@ -392,7 +392,7 @@ public Shell (Shell parent, int style) {
*
* @noreference This method is not intended to be referenced by clients.
*/
-public static Shell win32_new (Display display, int /*long*/ handle) {
+public static Shell win32_new (Display display, long /*int*/ handle) {
return new Shell (display, null, SWT.NO_TRIM, handle, true);
}
@@ -415,7 +415,7 @@ public static Shell win32_new (Display display, int /*long*/ handle) {
*
* @since 3.3
*/
-public static Shell internal_new (Display display, int /*long*/ handle) {
+public static Shell internal_new (Display display, long /*int*/ handle) {
return new Shell (display, null, SWT.NO_TRIM, handle, false);
}
@@ -467,12 +467,12 @@ public void addShellListener (ShellListener listener) {
addListener (SWT.Deactivate, typedListener);
}
-int /*long*/ balloonTipHandle () {
+long /*int*/ balloonTipHandle () {
if (balloonTipHandle == 0) createBalloonTipHandle ();
return balloonTipHandle;
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
if (hwnd == toolTipHandle || hwnd == balloonTipHandle) {
return OS.CallWindowProc (ToolTipProc, hwnd, msg, wParam, lParam);
@@ -730,7 +730,7 @@ void enableWidget (boolean enabled) {
}
}
-int /*long*/ findBrush (int /*long*/ value, int lbStyle) {
+long /*int*/ findBrush (long /*int*/ value, int lbStyle) {
if (lbStyle == OS.BS_SOLID) {
for (int i=0; i 0) {
OS.InvalidateRect (handle, null, true);
@@ -1379,7 +1379,7 @@ LRESULT selectPalette (int /*long*/ hPalette) {
return (result > 0) ? LRESULT.ONE : LRESULT.ZERO;
}
-boolean sendKeyEvent (int type, int msg, int /*long*/ wParam, int /*long*/ lParam, Event event) {
+boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lParam, Event event) {
if (!isEnabled () || !isActive ()) return false;
return super.sendKeyEvent (type, msg, wParam, lParam, event);
}
@@ -1578,7 +1578,7 @@ public void setImeInputMode (int mode) {
checkWidget ();
if (!OS.IsDBLocale) return;
boolean imeOn = mode != SWT.NONE;
- int /*long*/ hIMC = OS.ImmGetContext (handle);
+ long /*int*/ hIMC = OS.ImmGetContext (handle);
OS.ImmSetOpenStatus (hIMC, imeOn);
if (imeOn) {
int [] lpfdwConversion = new int [1], lpfdwSentence = new int [1];
@@ -1596,7 +1596,7 @@ public void setImeInputMode (int mode) {
}
boolean fullShape = (mode & SWT.DBCS) != 0;
if ((mode & SWT.NATIVE) != 0) {
- int /*long*/ hkl = OS.GetKeyboardLayout (0);
+ long /*int*/ hkl = OS.GetKeyboardLayout (0);
int langid = OS.PRIMARYLANGID (OS.LOWORD (hkl));
if (langid == OS.LANG_JAPANESE) {
fullShape = true;
@@ -1703,7 +1703,7 @@ public void setModified (boolean modified) {
}
void setItemEnabled (int cmd, boolean enabled) {
- int /*long*/ hMenu = OS.GetSystemMenu (handle, false);
+ long /*int*/ hMenu = OS.GetSystemMenu (handle, false);
if (hMenu == 0) return;
int flags = OS.MF_ENABLED;
if (!enabled) flags = OS.MF_DISABLED | OS.MF_GRAYED;
@@ -1740,13 +1740,13 @@ public void setRegion (Region region) {
super.setRegion (region);
}
-void setToolTipText (int /*long*/ hwnd, String text) {
+void setToolTipText (long /*int*/ hwnd, String text) {
if (OS.IsWinCE) return;
TOOLINFO lpti = new TOOLINFO ();
lpti.cbSize = TOOLINFO.sizeof;
lpti.hwnd = handle;
lpti.uId = hwnd;
- int /*long*/ hwndToolTip = toolTipHandle ();
+ long /*int*/ hwndToolTip = toolTipHandle ();
if (text == null) {
OS.SendMessage (hwndToolTip, OS.TTM_DELTOOL, 0, lpti);
} else {
@@ -1768,7 +1768,7 @@ void setToolTipText (NMTTDISPINFO lpnmtdi, byte [] buffer) {
* shell trimmings.
*/
if (!hasCursor ()) return;
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
if (lpstrTip != 0) OS.HeapFree (hHeap, 0, lpstrTip);
int byteCount = buffer.length;
lpstrTip = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
@@ -1784,7 +1784,7 @@ void setToolTipText (NMTTDISPINFO lpnmtdi, char [] buffer) {
* shell trimmings.
*/
if (!hasCursor ()) return;
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
if (lpstrTip != 0) OS.HeapFree (hHeap, 0, lpstrTip);
int byteCount = buffer.length * 2;
lpstrTip = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
@@ -1792,7 +1792,7 @@ void setToolTipText (NMTTDISPINFO lpnmtdi, char [] buffer) {
lpnmtdi.lpszText = lpstrTip;
}
-void setToolTipTitle (int /*long*/ hwndToolTip, String text, int icon) {
+void setToolTipTitle (long /*int*/ hwndToolTip, String text, int icon) {
/*
* Bug in Windows. For some reason, when TTM_SETTITLE
* is used to set the title of a tool tip, Windows leaks
@@ -1864,7 +1864,7 @@ public void setVisible (boolean visible) {
bringToTop ();
if (isDisposed ()) return;
}
- int /*long*/ hwndShell = OS.GetActiveWindow ();
+ long /*int*/ hwndShell = OS.GetActiveWindow ();
if (hwndShell == 0) {
if (parent != null) hwndShell = parent.handle;
}
@@ -1905,7 +1905,7 @@ public void setVisible (boolean visible) {
/* Make the foreign window parent appear in the task bar */
if (visible) {
if (parent != null && (parent.state & FOREIGN_HANDLE) != 0) {
- int /*long*/ hwndParent = parent.handle;
+ long /*int*/ hwndParent = parent.handle;
int style = OS.GetWindowLong (hwndParent, OS.GWL_EXSTYLE);
if ((style & OS.WS_EX_TOOLWINDOW) != 0) {
OS.SetWindowLong (hwndParent, OS.GWL_EXSTYLE, style & ~OS.WS_EX_TOOLWINDOW);
@@ -1924,7 +1924,7 @@ public void setVisible (boolean visible) {
void subclass () {
super.subclass ();
if (ToolTipProc != 0) {
- int /*long*/ newProc = display.windowProc;
+ long /*int*/ newProc = display.windowProc;
if (toolTipHandle != 0) {
OS.SetWindowLongPtr (toolTipHandle, OS.GWLP_WNDPROC, newProc);
}
@@ -1934,7 +1934,7 @@ void subclass () {
}
}
-int /*long*/ toolTipHandle () {
+long /*int*/ toolTipHandle () {
if (toolTipHandle == 0) createToolTipHandle ();
return toolTipHandle;
}
@@ -1976,7 +1976,7 @@ CREATESTRUCT widgetCreateStruct () {
return null;
}
-int /*long*/ widgetParent () {
+long /*int*/ widgetParent () {
if (handle != 0) return handle;
return parent != null ? parent.handle : 0;
}
@@ -2033,7 +2033,7 @@ TCHAR windowClass () {
return parent != null ? DialogClass : super.windowClass ();
}
-int /*long*/ windowProc () {
+long /*int*/ windowProc () {
if (windowProc != 0) return windowProc;
if (OS.IsSP) return DialogProc;
if ((style & SWT.TOOL) != 0) {
@@ -2043,7 +2043,7 @@ int /*long*/ windowProc () {
return parent != null ? DialogProc : super.windowProc ();
}
-int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
if (hwnd == toolTipHandle || hwnd == balloonTipHandle) {
switch (msg) {
@@ -2108,7 +2108,7 @@ int widgetStyle () {
return bits | OS.WS_OVERLAPPED | OS.WS_CAPTION;
}
-LRESULT WM_ACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ACTIVATE (long /*int*/ wParam, long /*int*/ lParam) {
if (OS.IsPPC) {
/*
* Note: this does not work when we get WM_ACTIVATE prior
@@ -2116,7 +2116,7 @@ LRESULT WM_ACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
*/
if (hooks (SWT.HardKeyDown) || hooks (SWT.HardKeyUp)) {
int fActive = OS.LOWORD (wParam);
- int /*long*/ hwnd = fActive != 0 ? handle : 0;
+ long /*int*/ hwnd = fActive != 0 ? handle : 0;
for (int bVk=OS.VK_APP1; bVk<=OS.VK_APP6; bVk++) {
OS.SHSetAppKeyWndAssoc ((byte) bVk, hwnd);
}
@@ -2152,7 +2152,7 @@ LRESULT WM_ACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
return parent != null ? LRESULT.ZERO : result;
}
-LRESULT WM_COMMAND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_COMMAND (long /*int*/ wParam, long /*int*/ lParam) {
if (OS.IsPPC) {
/*
* Note in WinCE PPC: Close the Shell when the "Done Button" has
@@ -2177,12 +2177,12 @@ LRESULT WM_COMMAND (int /*long*/ wParam, int /*long*/ lParam) {
*/
if (OS.IsPPC || OS.IsSP) {
if (menuBar != null) {
- int /*long*/ hwndCB = menuBar.hwndCB;
+ long /*int*/ hwndCB = menuBar.hwndCB;
if (lParam != 0 && hwndCB != 0) {
if (lParam == hwndCB) {
return super.WM_COMMAND (wParam, 0);
} else {
- int /*long*/ hwndChild = OS.GetWindow (hwndCB, OS.GW_CHILD);
+ long /*int*/ hwndChild = OS.GetWindow (hwndCB, OS.GW_CHILD);
if (lParam == hwndChild) return super.WM_COMMAND (wParam, 0);
}
}
@@ -2191,7 +2191,7 @@ LRESULT WM_COMMAND (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_COMMAND (wParam, lParam);
}
-LRESULT WM_DESTROY (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_DESTROY (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_DESTROY (wParam, lParam);
/*
* When the shell is a WS_CHILD window of a non-SWT
@@ -2207,7 +2207,7 @@ LRESULT WM_DESTROY (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
if (result != null) return result;
/*
@@ -2225,7 +2225,7 @@ LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_ENTERIDLE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ENTERIDLE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ENTERIDLE (wParam, lParam);
if (result != null) return result;
Display display = this.display;
@@ -2235,7 +2235,7 @@ LRESULT WM_ENTERIDLE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_GETMINMAXINFO (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETMINMAXINFO (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETMINMAXINFO (wParam, lParam);
if (result != null) return result;
if (minWidth != SWT.DEFAULT || minHeight != SWT.DEFAULT) {
@@ -2249,7 +2249,7 @@ LRESULT WM_GETMINMAXINFO (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_MOUSEACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEACTIVATE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOUSEACTIVATE (wParam, lParam);
if (result != null) return result;
@@ -2303,7 +2303,7 @@ LRESULT WM_MOUSEACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
int pos = OS.GetMessagePos ();
OS.POINTSTOPOINT (pt, pos);
}
- int /*long*/ hwnd = OS.WindowFromPoint (pt);
+ long /*int*/ hwnd = OS.WindowFromPoint (pt);
if (hwnd == 0) return null;
Control control = display.findControl (hwnd);
@@ -2324,12 +2324,12 @@ LRESULT WM_MOUSEACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
}
}
- int /*long*/ code = callWindowProc (handle, OS.WM_MOUSEACTIVATE, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_MOUSEACTIVATE, wParam, lParam);
setActiveControl (control);
return new LRESULT (code);
}
-LRESULT WM_MOVE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOVE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOVE (wParam, lParam);
if (result != null) return result;
ToolTip tip = getCurrentToolTip ();
@@ -2337,23 +2337,23 @@ LRESULT WM_MOVE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_NCHITTEST (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) {
if (!OS.IsWindowEnabled (handle)) return null;
if (!isEnabled () || !isActive ()) {
if (!Display.TrimEnabled) return new LRESULT (OS.HTNOWHERE);
- int /*long*/ hittest = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam);
+ long /*int*/ hittest = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam);
if (hittest == OS.HTCLIENT || hittest == OS.HTMENU) hittest = OS.HTBORDER;
return new LRESULT (hittest);
}
if (menuBar != null && !menuBar.getEnabled ()) {
- int /*long*/ hittest = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam);
+ long /*int*/ hittest = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam);
if (hittest == OS.HTMENU) hittest = OS.HTBORDER;
return new LRESULT (hittest);
}
return null;
}
-LRESULT WM_NCLBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NCLBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_NCLBUTTONDOWN (wParam, lParam);
if (result != null) return result;
/*
@@ -2365,11 +2365,11 @@ LRESULT WM_NCLBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
*/
if (!display.ignoreRestoreFocus) return result;
Display display = this.display;
- int /*long*/ hwndActive = 0;
+ long /*int*/ hwndActive = 0;
boolean fixActive = OS.IsWin95 && display.lastHittest == OS.HTCAPTION;
if (fixActive) hwndActive = OS.SetActiveWindow (handle);
display.lockActiveWindow = true;
- int /*long*/ code = callWindowProc (handle, OS.WM_NCLBUTTONDOWN, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_NCLBUTTONDOWN, wParam, lParam);
display.lockActiveWindow = false;
if (fixActive) OS.SetActiveWindow (hwndActive);
Control focusControl = display.lastHittestControl;
@@ -2381,21 +2381,21 @@ LRESULT WM_NCLBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return new LRESULT (code);
}
-LRESULT WM_PALETTECHANGED (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PALETTECHANGED (long /*int*/ wParam, long /*int*/ lParam) {
if (wParam != handle) {
- int /*long*/ hPalette = display.hPalette;
+ long /*int*/ hPalette = display.hPalette;
if (hPalette != 0) return selectPalette (hPalette);
}
return super.WM_PALETTECHANGED (wParam, lParam);
}
-LRESULT WM_QUERYNEWPALETTE (int /*long*/ wParam, int /*long*/ lParam) {
- int /*long*/ hPalette = display.hPalette;
+LRESULT WM_QUERYNEWPALETTE (long /*int*/ wParam, long /*int*/ lParam) {
+ long /*int*/ hPalette = display.hPalette;
if (hPalette != 0) return selectPalette (hPalette);
return super.WM_QUERYNEWPALETTE (wParam, lParam);
}
-LRESULT WM_SETCURSOR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETCURSOR (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When the shell is disabled
* by a Windows standard dialog (like a MessageBox
@@ -2409,7 +2409,7 @@ LRESULT WM_SETCURSOR (int /*long*/ wParam, int /*long*/ lParam) {
if (!Display.TrimEnabled) {
Shell modalShell = display.getModalShell ();
if (modalShell != null && !isActive ()) {
- int /*long*/ hwndModal = modalShell.handle;
+ long /*int*/ hwndModal = modalShell.handle;
if (OS.IsWindowEnabled (hwndModal)) {
OS.SetActiveWindow (hwndModal);
}
@@ -2417,7 +2417,7 @@ LRESULT WM_SETCURSOR (int /*long*/ wParam, int /*long*/ lParam) {
}
if (!OS.IsWindowEnabled (handle)) {
if (!OS.IsWinCE) {
- int /*long*/ hwndPopup = OS.GetLastActivePopup (handle);
+ long /*int*/ hwndPopup = OS.GetLastActivePopup (handle);
if (hwndPopup != 0 && hwndPopup != handle) {
if (display.getControl (hwndPopup) == null) {
if (OS.IsWindowEnabled (hwndPopup)) {
@@ -2467,7 +2467,7 @@ LRESULT WM_SETCURSOR (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_SETCURSOR (wParam, lParam);
}
-LRESULT WM_SETTINGCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETTINGCHANGE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETTINGCHANGE (wParam, lParam);
if (result != null) return result;
if (OS.IsPPC) {
@@ -2492,7 +2492,7 @@ LRESULT WM_SETTINGCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SHOWWINDOW (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SHOWWINDOW (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SHOWWINDOW (wParam, lParam);
if (result != null) return result;
/*
@@ -2514,7 +2514,7 @@ LRESULT WM_SHOWWINDOW (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SYSCOMMAND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SYSCOMMAND (wParam, lParam);
if (result != null) return result;
/*
@@ -2548,7 +2548,7 @@ LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_WINDOWPOSCHANGING (wParam,lParam);
if (result != null) return result;
WINDOWPOS lpwp = new WINDOWPOS ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java
index e20f00c890..6f1fa17fe8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java
@@ -71,7 +71,7 @@ import org.eclipse.swt.events.*;
public class Slider extends Control {
int increment, pageIncrement;
boolean ignoreFocus;
- static final int /*long*/ ScrollBarProc;
+ static final long /*int*/ ScrollBarProc;
static final TCHAR ScrollBarClass = new TCHAR (0, "SCROLLBAR", true);
static {
WNDCLASS lpWndClass = new WNDCLASS ();
@@ -152,7 +152,7 @@ public void addSelectionListener (SelectionListener listener) {
addListener (SWT.DefaultSelection,typedListener);
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
/*
* Feature in Windows. Windows runs a modal message
@@ -473,7 +473,7 @@ public void setPageIncrement (int value) {
pageIncrement = value;
}
-boolean SetScrollInfo (int /*long*/ hwnd, int flags, SCROLLINFO info, boolean fRedraw) {
+boolean SetScrollInfo (long /*int*/ hwnd, int flags, SCROLLINFO info, boolean fRedraw) {
/*
* Feature in Windows. Using SIF_DISABLENOSCROLL,
* SetScrollInfo () can change enabled and disabled
@@ -625,11 +625,11 @@ TCHAR windowClass () {
return ScrollBarClass;
}
-int /*long*/ windowProc () {
+long /*int*/ windowProc () {
return ScrollBarProc;
}
-LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
if ((style & SWT.VERTICAL) != 0) return result;
@@ -647,7 +647,7 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
case OS.VK_LEFT:
case OS.VK_RIGHT: {
int key = wParam == OS.VK_LEFT ? OS.VK_RIGHT : OS.VK_LEFT;
- int /*long*/ code = callWindowProc (handle, OS.WM_KEYDOWN, key, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, key, lParam);
return new LRESULT (code);
}
}
@@ -655,7 +655,7 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. Windows uses the WS_TABSTOP
* style for the scroll bar to decide that focus
@@ -688,7 +688,7 @@ LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. Windows uses the WS_TABSTOP
* style for the scroll bar to decide that focus
@@ -721,12 +721,12 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreFocus) return null;
return super.WM_SETFOCUS (wParam, lParam);
}
-LRESULT wmScrollChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmScrollChild (long /*int*/ wParam, long /*int*/ lParam) {
/* Do nothing when scrolling is ending */
int code = OS.LOWORD (wParam);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java
index 82dd8c81da..fe4030ef0e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java
@@ -42,12 +42,12 @@ import org.eclipse.swt.events.*;
* @noextend This class is not intended to be subclassed by clients.
*/
public class Spinner extends Composite {
- int /*long*/ hwndText, hwndUpDown;
+ long /*int*/ hwndText, hwndUpDown;
boolean ignoreModify, ignoreCharacter;
int pageIncrement, digits;
- static final int /*long*/ EditProc;
+ static final long /*int*/ EditProc;
static final TCHAR EditClass = new TCHAR (0, "EDIT", true);
- static final int /*long*/ UpDownProc;
+ static final long /*int*/ UpDownProc;
static final TCHAR UpDownClass = new TCHAR (0, OS.UPDOWN_CLASS, true);
static {
WNDCLASS lpWndClass = new WNDCLASS ();
@@ -107,7 +107,7 @@ public Spinner (Composite parent, int style) {
super (parent, checkStyle (style));
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
if (hwnd == hwndText) {
return OS.CallWindowProc (EditProc, hwnd, msg, wParam, lParam);
@@ -129,7 +129,7 @@ static int checkStyle (int style) {
return style & ~(SWT.H_SCROLL | SWT.V_SCROLL);
}
-boolean checkHandle (int /*long*/ hwnd) {
+boolean checkHandle (long /*int*/ hwnd) {
return hwnd == handle || hwnd == hwndText || hwnd == hwndUpDown;
}
@@ -140,7 +140,7 @@ protected void checkSubclass () {
void createHandle () {
super.createHandle ();
state &= ~(CANVAS | THEME_BACKGROUND);
- int /*long*/ hInstance = OS.GetModuleHandle (null);
+ long /*int*/ hInstance = OS.GetModuleHandle (null);
int textExStyle = (style & SWT.BORDER) != 0 ? OS.WS_EX_CLIENTEDGE : 0;
int textStyle = OS.WS_CHILD | OS.WS_VISIBLE | OS.ES_AUTOHSCROLL | OS.WS_CLIPSIBLINGS;
if ((style & SWT.READ_ONLY) != 0) textStyle |= OS.ES_READONLY;
@@ -183,7 +183,7 @@ void createHandle () {
SetWindowPos (hwndText, hwndUpDown, 0, 0, 0, 0, flags);
OS.SetWindowLongPtr (hwndUpDown, OS.GWLP_ID, hwndUpDown);
if (OS.IsDBLocale) {
- int /*long*/ hIMC = OS.ImmGetContext (handle);
+ long /*int*/ hIMC = OS.ImmGetContext (handle);
OS.ImmAssociateContext (hwndText, hIMC);
OS.ImmAssociateContext (hwndUpDown, hIMC);
OS.ImmReleaseContext (handle, hIMC);
@@ -280,7 +280,7 @@ void addVerifyListener (VerifyListener listener) {
addListener (SWT.Verify, typedListener);
}
-int /*long*/ borderHandle () {
+long /*int*/ borderHandle () {
return hwndText;
}
@@ -288,8 +288,8 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int width = 0, height = 0;
if (wHint == SWT.DEFAULT || hHint == SWT.DEFAULT) {
- int /*long*/ newFont, oldFont = 0;
- int /*long*/ hDC = OS.GetDC (hwndText);
+ long /*int*/ newFont, oldFont = 0;
+ long /*int*/ hDC = OS.GetDC (hwndText);
newFont = OS.SendMessage (hwndText, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
@@ -350,7 +350,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
* the single-line text widget in an editable combo
* box.
*/
- int /*long*/ margins = OS.SendMessage (hwndText, OS.EM_GETMARGINS, 0, 0);
+ long /*int*/ margins = OS.SendMessage (hwndText, OS.EM_GETMARGINS, 0, 0);
x -= OS.LOWORD (margins);
width += OS.LOWORD (margins) + OS.HIWORD (margins);
if ((style & SWT.BORDER) != 0) {
@@ -414,7 +414,7 @@ void deregister () {
}
boolean hasFocus () {
- int /*long*/ hwndFocus = OS.GetFocus ();
+ long /*int*/ hwndFocus = OS.GetFocus ();
if (hwndFocus == handle) return true;
if (hwndFocus == hwndText) return true;
if (hwndFocus == hwndUpDown) return true;
@@ -730,7 +730,7 @@ void removeVerifyListener (VerifyListener listener) {
eventTable.unhook (SWT.Verify, listener);
}
-boolean sendKeyEvent (int type, int msg, int /*long*/ wParam, int /*long*/ lParam, Event event) {
+boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lParam, Event event) {
if (!super.sendKeyEvent (type, msg, wParam, lParam, event)) {
return false;
}
@@ -813,7 +813,7 @@ boolean sendKeyEvent (int type, int msg, int /*long*/ wParam, int /*long*/ lPara
return false;
}
-void setBackgroundImage (int /*long*/ hBitmap) {
+void setBackgroundImage (long /*int*/ hBitmap) {
super.setBackgroundImage (hBitmap);
OS.InvalidateRect (hwndText, null, true);
}
@@ -877,14 +877,14 @@ void setForegroundPixel (int pixel) {
public void setIncrement (int value) {
checkWidget ();
if (value < 1) return;
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
int count = (int)/*64*/OS.SendMessage (hwndUpDown, OS.UDM_GETACCEL, 0, (UDACCEL)null);
- int /*long*/ udaccels = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, UDACCEL.sizeof * count);
+ long /*int*/ udaccels = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, UDACCEL.sizeof * count);
OS.SendMessage (hwndUpDown, OS.UDM_GETACCEL, count, udaccels);
int first = -1;
UDACCEL udaccel = new UDACCEL ();
for (int i = 0; i < count; i++) {
- int /*long*/ offset = udaccels + (i * UDACCEL.sizeof);
+ long /*int*/ offset = udaccels + (i * UDACCEL.sizeof);
OS.MoveMemory (udaccel, offset, UDACCEL.sizeof);
if (first == -1) first = udaccel.nInc;
udaccel.nInc = udaccel.nInc / first * value;
@@ -1102,7 +1102,7 @@ public void setValues (int selection, int minimum, int maximum, int digits, int
void subclass () {
super.subclass ();
- int /*long*/ newProc = display.windowProc;
+ long /*int*/ newProc = display.windowProc;
OS.SetWindowLongPtr (hwndText, OS.GWLP_WNDPROC, newProc);
OS.SetWindowLongPtr (hwndUpDown, OS.GWLP_WNDPROC, newProc);
}
@@ -1176,7 +1176,7 @@ int widgetExtStyle () {
return super.widgetExtStyle () & ~OS.WS_EX_CLIENTEDGE;
}
-int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (hwnd == hwndText || hwnd == hwndUpDown) {
LRESULT result = null;
switch (msg) {
@@ -1236,30 +1236,30 @@ int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*
return super.windowProc (hwnd, msg, wParam, lParam);
}
-LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
super.WM_ERASEBKGND (wParam, lParam);
drawBackground (wParam);
return LRESULT.ONE;
}
-LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
OS.SetFocus (hwndText);
OS.SendMessage (hwndText, OS.EM_SETSEL, 0, -1);
return null;
}
-LRESULT WM_SETFONT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETFONT (wParam, lParam);
if (result != null) return result;
OS.SendMessage (hwndText, OS.WM_SETFONT, wParam, lParam);
return result;
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
if (isDisposed ()) return result;
int width = OS.LOWORD (lParam), height = OS.HIWORD (lParam);
@@ -1272,7 +1272,7 @@ LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT wmIMEChar(int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmIMEChar(long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
/* Process a DBCS character */
Display display = this.display;
@@ -1291,7 +1291,7 @@ LRESULT wmIMEChar(int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
* them to the application.
*/
ignoreCharacter = true;
- int /*long*/ result = callWindowProc (hwnd, OS.WM_IME_CHAR, wParam, lParam);
+ long /*int*/ result = callWindowProc (hwnd, OS.WM_IME_CHAR, wParam, lParam);
MSG msg = new MSG ();
int flags = OS.PM_REMOVE | OS.PM_NOYIELD | OS.PM_QS_INPUT | OS.PM_QS_POSTMESSAGE;
while (OS.PeekMessage (msg, hwnd, OS.WM_CHAR, OS.WM_CHAR, flags)) {
@@ -1306,7 +1306,7 @@ LRESULT wmIMEChar(int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
return new LRESULT (result);
}
-LRESULT wmChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreCharacter) return null;
LRESULT result = super.wmChar (hwnd, wParam, lParam);
if (result != null) return result;
@@ -1327,7 +1327,7 @@ LRESULT wmChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT wmClipboard (int /*long*/ hwndText, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmClipboard (long /*int*/ hwndText, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if ((style & SWT.READ_ONLY) != 0) return null;
// if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return null;
boolean call = false;
@@ -1377,11 +1377,11 @@ LRESULT wmClipboard (int /*long*/ hwndText, int msg, int /*long*/ wParam, int /*
}
TCHAR buffer = new TCHAR (getCodePage (), newText, true);
if (msg == OS.WM_SETTEXT) {
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
int byteCount = buffer.length () * TCHAR.sizeof;
- int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (pszText, buffer, byteCount);
- int /*long*/ code = OS.CallWindowProc (EditProc, hwndText, msg, wParam, pszText);
+ long /*int*/ code = OS.CallWindowProc (EditProc, hwndText, msg, wParam, pszText);
OS.HeapFree (hHeap, 0, pszText);
return new LRESULT (code);
} else {
@@ -1393,7 +1393,7 @@ LRESULT wmClipboard (int /*long*/ hwndText, int msg, int /*long*/ wParam, int /*
return null;
}
-LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) {
int code = OS.HIWORD (wParam);
switch (code) {
case OS.EN_CHANGE:
@@ -1416,7 +1416,7 @@ LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) {
return super.wmCommandChild (wParam, lParam);
}
-LRESULT wmKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreCharacter) return null;
LRESULT result = super.wmKeyDown (hwnd, wParam, lParam);
if (result != null) return result;
@@ -1461,7 +1461,7 @@ LRESULT wmKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam)
return result;
}
-LRESULT wmKillFocus (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmKillFocus (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
boolean [] parseFail = new boolean [1];
int value = getSelectionText (parseFail);
if (parseFail [0]) {
@@ -1475,7 +1475,7 @@ LRESULT wmKillFocus (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam
return super.wmKillFocus (hwnd, wParam, lParam);
}
-LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
switch (hdr.code) {
case OS.UDN_DELTAPOS:
NMUPDOWN lpnmud = new NMUPDOWN ();
@@ -1504,7 +1504,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
return super.wmNotifyChild (hdr, wParam, lParam);
}
-LRESULT wmScrollChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmScrollChild (long /*int*/ wParam, long /*int*/ lParam) {
int code = OS.LOWORD (wParam);
switch (code) {
case OS.SB_THUMBPOSITION:
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java
index f469bcdd25..e1e8b9990a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java
@@ -50,7 +50,7 @@ import org.eclipse.swt.events.*;
public class TabFolder extends Composite {
TabItem [] items;
ImageList imageList;
- static final int /*long*/ TabFolderProc;
+ static final long /*int*/ TabFolderProc;
static final TCHAR TabFolderClass = new TCHAR (0, OS.WC_TABCONTROL, true);
boolean createdAsRTL;
@@ -84,12 +84,12 @@ public class TabFolder extends Composite {
* code, other than SWT, could create a control with
* this class name, and fail unexpectedly.
*/
- int /*long*/ hInstance = OS.GetModuleHandle (null);
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hInstance = OS.GetModuleHandle (null);
+ long /*int*/ hHeap = OS.GetProcessHeap ();
lpWndClass.hInstance = hInstance;
lpWndClass.style &= ~(OS.CS_HREDRAW | OS.CS_VREDRAW | OS.CS_GLOBALCLASS);
int byteCount = TabFolderClass.length () * TCHAR.sizeof;
- int /*long*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ lpszClassName = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (lpszClassName, TabFolderClass, byteCount);
lpWndClass.lpszClassName = lpszClassName;
OS.RegisterClass (lpWndClass);
@@ -162,7 +162,7 @@ public void addSelectionListener(SelectionListener listener) {
addListener(SWT.DefaultSelection,typedListener);
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.CallWindowProc (TabFolderProc, hwnd, msg, wParam, lParam);
}
@@ -269,7 +269,7 @@ void createHandle () {
* is set. The fix is to set TTM_SETMAXTIPWIDTH to
* a large value.
*/
- int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0);
+ long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0);
OS.SendMessage (hwndToolTip, OS.TTM_SETMAXTIPWIDTH, 0, 0x7FFF);
createdAsRTL = (style & SWT.RIGHT_TO_LEFT) != 0;
@@ -307,7 +307,7 @@ void destroyItem (TabItem item) {
}
}
-void drawThemeBackground (int /*long*/ hDC, int /*long*/ hwnd, RECT rect) {
+void drawThemeBackground (long /*int*/ hDC, long /*int*/ hwnd, RECT rect) {
RECT rect2 = new RECT ();
OS.GetClientRect (handle, rect2);
OS.MapWindowPoints (handle, hwnd, rect2, 2);
@@ -467,7 +467,7 @@ int imageIndex (Image image) {
Rectangle bounds = image.getBounds ();
imageList = display.getImageList (style & SWT.RIGHT_TO_LEFT, bounds.width, bounds.height);
int index = imageList.add (image);
- int /*long*/ hImageList = imageList.getHandle ();
+ long /*int*/ hImageList = imageList.getHandle ();
OS.SendMessage (handle, OS.TCM_SETIMAGELIST, 0, hImageList);
return index;
}
@@ -750,7 +750,7 @@ String toolTipText (NMTTDISPINFO hdr) {
return null;
}
int index = (int)/*64*/hdr.idFrom;
- int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0);
+ long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0);
if (hwndToolTip == hdr.hwndFrom) {
/*
* Bug in Windows. For some reason the reading order
@@ -793,7 +793,7 @@ boolean traversePage (boolean next) {
void updateOrientation () {
super.updateOrientation ();
- int /*long*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD);
+ long /*int*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD);
while (hwndChild != 0) {
TCHAR buffer = new TCHAR (0, 128);
OS.GetClassName (hwndChild, buffer, buffer.length ());
@@ -820,7 +820,7 @@ void updateOrientation () {
Point size = imageList.getImageSize ();
display.releaseImageList (imageList);
imageList = display.getImageList (style & SWT.RIGHT_TO_LEFT, size.x, size.y);
- int /*long*/ hImageList = imageList.getHandle ();
+ long /*int*/ hImageList = imageList.getHandle ();
OS.SendMessage (handle, OS.TCM_SETIMAGELIST, 0, hImageList);
TCITEM tcItem = new TCITEM ();
tcItem.mask = OS.TCIF_IMAGE;
@@ -854,11 +854,11 @@ TCHAR windowClass () {
return TabFolderClass;
}
-int /*long*/ windowProc () {
+long /*int*/ windowProc () {
return TabFolderProc;
}
-LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETDLGCODE (wParam, lParam);
/*
* Return DLGC_BUTTON so that mnemonics will be
@@ -869,7 +869,7 @@ LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) {
return new LRESULT (OS.DLGC_BUTTON | OS.DLGC_WANTARROWS);
}
-LRESULT WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Ensure that there is an accessible object created for this
* control because support for publishing the keyboard shortcut
@@ -879,7 +879,7 @@ LRESULT WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_GETOBJECT (wParam, lParam);
}
-LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
switch ((int)/*64*/wParam) {
@@ -894,7 +894,7 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
*/
boolean isRTL = (style & SWT.RIGHT_TO_LEFT) != 0;
if (isRTL != createdAsRTL) {
- int /*long*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam == OS.VK_RIGHT ? OS.VK_LEFT : OS.VK_RIGHT, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam == OS.VK_RIGHT ? OS.VK_LEFT : OS.VK_RIGHT, lParam);
return new LRESULT (code);
}
break;
@@ -902,7 +902,7 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_MOUSELEAVE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSELEAVE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_MOUSELEAVE (wParam, lParam);
if (result != null) return result;
/*
@@ -919,7 +919,7 @@ LRESULT WM_MOUSELEAVE (int /*long*/ wParam, int /*long*/ lParam) {
if (OS.COMCTL32_MAJOR >= 6) {
TOOLINFO lpti = new TOOLINFO ();
lpti.cbSize = TOOLINFO.sizeof;
- int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0);
+ long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.TCM_GETTOOLTIPS, 0, 0);
if (OS.SendMessage (hwndToolTip, OS.TTM_GETCURRENTTOOL, 0, lpti) != 0) {
if ((lpti.uFlags & OS.TTF_IDISHWND) == 0) {
OS.SendMessage (hwndToolTip, OS.TTM_DELTOOL, 0, lpti);
@@ -930,7 +930,7 @@ LRESULT WM_MOUSELEAVE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_NCHITTEST (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NCHITTEST (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_NCHITTEST (wParam, lParam);
if (result != null) return result;
/*
@@ -945,11 +945,11 @@ LRESULT WM_NCHITTEST (int /*long*/ wParam, int /*long*/ lParam) {
* default window proc that returns HTCLIENT when
* the mouse is in the client area.
*/
- int /*long*/ hittest = OS.DefWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam);
+ long /*int*/ hittest = OS.DefWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam);
return new LRESULT (hittest);
}
-LRESULT WM_NOTIFY (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NOTIFY (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When the tab folder window
* proc processes WM_NOTIFY, it forwards this
@@ -973,7 +973,7 @@ LRESULT WM_NOTIFY (int /*long*/ wParam, int /*long*/ lParam) {
return LRESULT.ZERO;
}
-LRESULT WM_PARENTNOTIFY (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PARENTNOTIFY (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_PARENTNOTIFY (wParam, lParam);
if (result != null) return result;
/*
@@ -992,7 +992,7 @@ LRESULT WM_PARENTNOTIFY (int /*long*/ wParam, int /*long*/ lParam) {
switch (code) {
case OS.WM_CREATE: {
int id = OS.HIWORD (wParam);
- int /*long*/ hwnd = lParam;
+ long /*int*/ hwnd = lParam;
if (id == ID_UPDOWN) {
int bits = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE);
OS.SetWindowLong (hwnd, OS.GWL_EXSTYLE, bits | OS.WS_EX_LAYOUTRTL);
@@ -1004,7 +1004,7 @@ LRESULT WM_PARENTNOTIFY (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
/*
* It is possible (but unlikely), that application
@@ -1025,7 +1025,7 @@ LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam);
if (result != null) return result;
if (!OS.IsWindowVisible (handle)) return result;
@@ -1074,7 +1074,7 @@ LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
int code = hdr.code;
switch (code) {
case OS.TCN_SELCHANGE:
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java
index b3d441e71f..35f1845a52 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java
@@ -132,11 +132,11 @@ void _setText (int index, String string) {
if (j < i) string = new String (text, 0, j);
}
}
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hHeap = OS.GetProcessHeap ();
TCHAR buffer = new TCHAR (parent.getCodePage (), string, true);
int byteCount = buffer.length () * TCHAR.sizeof;
- int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (pszText, buffer, byteCount);
TCITEM tcItem = new TCITEM ();
tcItem.mask = OS.TCIF_TEXT;
@@ -302,7 +302,7 @@ public void setImage (Image image) {
if (OS.COMCTL32_MAJOR >= 6) {
if (text.indexOf ('&') != -1) _setText (index, text);
}
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
TCITEM tcItem = new TCITEM ();
tcItem.mask = OS.TCIF_IMAGE;
tcItem.iImage = parent.imageIndex (image);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
index 1f528b680b..751731cf82 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
@@ -79,12 +79,12 @@ public class Table extends Composite {
TableItem currentItem;
TableColumn sortColumn;
RECT focusRect;
- int /*long*/ headerToolTipHandle;
+ long /*int*/ headerToolTipHandle;
boolean ignoreCustomDraw, ignoreDrawForeground, ignoreDrawBackground, ignoreDrawFocus, ignoreDrawSelection, ignoreDrawHot;
boolean customDraw, dragStarted, explorerTheme, firstColumnImage, fixScrollWidth, tipRequested, wasSelected, wasResized, painted;
boolean ignoreActivate, ignoreSelect, ignoreShrink, ignoreResize, ignoreColumnMove, ignoreColumnResize, fullRowSelect;
int itemHeight, lastIndexOf, lastWidth, sortDirection, resizeCount, selectionForeground, hotIndex;
- static /*final*/ int /*long*/ HeaderProc;
+ static /*final*/ long /*int*/ HeaderProc;
static final int INSET = 4;
static final int GRID_WIDTH = 1;
static final int SORT_WIDTH = 10;
@@ -97,7 +97,7 @@ public class Table extends Composite {
static final int DRAG_IMAGE_SIZE = 301;
static final boolean EXPLORER_THEME = true;
static boolean COMPRESS_ITEMS = true;
- static final int /*long*/ TableProc;
+ static final long /*int*/ TableProc;
static final TCHAR TableClass = new TCHAR (0, OS.WC_LISTVIEW, true);
static {
WNDCLASS lpWndClass = new WNDCLASS ();
@@ -426,11 +426,11 @@ public void addSelectionListener (SelectionListener listener) {
addListener (SWT.DefaultSelection,typedListener);
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
return callWindowProc (hwnd, msg, wParam, lParam, false);
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam, boolean forceSelect) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam, boolean forceSelect) {
if (handle == 0) return 0;
if (handle != hwnd) {
return OS.CallWindowProc (HeaderProc, hwnd, msg, wParam, lParam);
@@ -520,7 +520,7 @@ int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, in
if (msg == OS.WM_PAINT) {
int bits0 = OS.GetWindowLong (handle, OS.GWL_STYLE);
if ((bits0 & OS.LVS_NOCOLUMNHEADER) == 0) {
- int /*long*/ hwndParent = OS.GetParent (handle), hwndOwner = 0;
+ long /*int*/ hwndParent = OS.GetParent (handle), hwndOwner = 0;
while (hwndParent != 0) {
int bits1 = OS.GetWindowLong (hwndParent, OS.GWL_EXSTYLE);
if ((bits1 & OS.WS_EX_COMPOSITED) != 0) {
@@ -554,10 +554,10 @@ int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, in
}
}
}
- int /*long*/ code = 0;
+ long /*int*/ code = 0;
if (fixPaint) {
PAINTSTRUCT ps = new PAINTSTRUCT ();
- int /*long*/ hDC = OS.BeginPaint (hwnd, ps);
+ long /*int*/ hDC = OS.BeginPaint (hwnd, ps);
code = OS.CallWindowProc (TableProc, hwnd, OS.WM_PAINT, hDC, lParam);
OS.EndPaint (hwnd, ps);
} else {
@@ -600,7 +600,7 @@ int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, in
OS.SendMessage (handle, OS.LVM_SETBKCOLOR, 0, OS.CLR_NONE);
OS.DefWindowProc (handle, OS.WM_SETREDRAW, 1, 0);
OS.InvalidateRect (handle, null, true);
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
if (hwndHeader != 0) OS.InvalidateRect (hwndHeader, null, true);
}
//FALL THROUGH
@@ -658,8 +658,8 @@ static int checkStyle (int style) {
return checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0);
}
-LRESULT CDDS_ITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) {
- int /*long*/ hDC = nmcd.hdc;
+LRESULT CDDS_ITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) {
+ long /*int*/ hDC = nmcd.hdc;
if (explorerTheme && !ignoreCustomDraw) {
hotIndex = -1;
if (hooks (SWT.EraseItem) && nmcd.left != nmcd.right) {
@@ -694,7 +694,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long
boolean oldIgnore = ignoreCustomDraw;
ignoreCustomDraw = true;
OS.SendMessage (handle, OS. LVM_GETITEMRECT, nmcd.dwItemSpec, rect);
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
int index = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0);
RECT itemRect = new RECT ();
if (index == 0) {
@@ -719,7 +719,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long
return null;
}
-LRESULT CDDS_ITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT CDDS_ITEMPREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) {
/*
* Bug in Windows. When the table has the extended style
* LVS_EX_FULLROWSELECT and LVM_SETBKCOLOR is used with
@@ -751,7 +751,7 @@ LRESULT CDDS_ITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*
hotIndex = (nmcd.uItemState & OS.CDIS_HOT) != 0 ? (int)/*64*/nmcd.dwItemSpec : -1;
if (hooks (SWT.EraseItem) && nmcd.left != nmcd.right) {
OS.SaveDC (nmcd.hdc);
- int /*long*/ hrgn = OS.CreateRectRgn (0, 0, 0, 0);
+ long /*int*/ hrgn = OS.CreateRectRgn (0, 0, 0, 0);
OS.SelectClipRgn (nmcd.hdc, hrgn);
OS.DeleteObject (hrgn);
}
@@ -759,7 +759,7 @@ LRESULT CDDS_ITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*
return new LRESULT (OS.CDRF_NOTIFYSUBITEMDRAW | OS.CDRF_NOTIFYPOSTPAINT);
}
-LRESULT CDDS_POSTPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT CDDS_POSTPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreCustomDraw) return null;
/*
* Bug in Windows. When the table has the extended style
@@ -781,7 +781,7 @@ LRESULT CDDS_POSTPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ l
* has a tooltip, the tooltip is hidden. The fix is to clear
* the tooltip before setting the bits and then reset it.
*/
- int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_SETTOOLTIPS, 0, 0);
+ long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_SETTOOLTIPS, 0, 0);
if (OS.IsWinCE) {
RECT rect = new RECT ();
boolean damaged = OS.GetUpdateRect (handle, rect, true);
@@ -789,7 +789,7 @@ LRESULT CDDS_POSTPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ l
OS.ValidateRect (handle, null);
if (damaged) OS.InvalidateRect (handle, rect, true);
} else {
- int /*long*/ rgn = OS.CreateRectRgn (0, 0, 0, 0);
+ long /*int*/ rgn = OS.CreateRectRgn (0, 0, 0, 0);
int result = OS.GetUpdateRgn (handle, rgn, true);
OS.SendMessage (handle, OS.LVM_SETEXTENDEDLISTVIEWSTYLE, bits, bits);
OS.ValidateRect (handle, null);
@@ -809,7 +809,7 @@ LRESULT CDDS_POSTPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ l
return null;
}
-LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreCustomDraw) {
return new LRESULT (OS.CDRF_NOTIFYITEMDRAW | OS.CDRF_NOTIFYPOSTPAINT);
}
@@ -833,7 +833,7 @@ LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lP
* has a tooltip, the tooltip is hidden. The fix is to clear
* the tooltip before setting the bits and then reset it.
*/
- int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_SETTOOLTIPS, 0, 0);
+ long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_SETTOOLTIPS, 0, 0);
if (OS.IsWinCE) {
RECT rect = new RECT ();
boolean damaged = OS.GetUpdateRect (handle, rect, true);
@@ -841,7 +841,7 @@ LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lP
OS.ValidateRect (handle, null);
if (damaged) OS.InvalidateRect (handle, rect, true);
} else {
- int /*long*/ rgn = OS.CreateRectRgn (0, 0, 0, 0);
+ long /*int*/ rgn = OS.CreateRectRgn (0, 0, 0, 0);
int result = OS.GetUpdateRgn (handle, rgn, true);
OS.SendMessage (handle, OS.LVM_SETEXTENDEDLISTVIEWSTYLE, bits, 0);
OS.ValidateRect (handle, null);
@@ -867,7 +867,7 @@ LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lP
* The fix is to draw the background using custom draw.
*/
if (explorerTheme && columnCount == 0) {
- int /*long*/ hDC = nmcd.hdc;
+ long /*int*/ hDC = nmcd.hdc;
RECT rect = new RECT ();
OS.SetRect (rect, nmcd.left, nmcd.top, nmcd.right, nmcd.bottom);
if (OS.IsWindowEnabled (handle) || findImageControl () != null) {
@@ -898,7 +898,7 @@ LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lP
int clrSortBk = getSortColumnPixel ();
RECT columnRect = new RECT (), headerRect = new RECT ();
OS.GetClientRect (handle, columnRect);
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
if (OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect) != 0) {
OS.MapWindowPoints (hwndHeader, handle, headerRect, 2);
columnRect.left = headerRect.left;
@@ -918,10 +918,10 @@ LRESULT CDDS_PREPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lP
return new LRESULT (OS.CDRF_NOTIFYITEMDRAW | OS.CDRF_NOTIFYPOSTPAINT);
}
-LRESULT CDDS_SUBITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT CDDS_SUBITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreCustomDraw) return null;
if (nmcd.left == nmcd.right) return new LRESULT (OS.CDRF_DODEFAULT);
- int /*long*/ hDC = nmcd.hdc;
+ long /*int*/ hDC = nmcd.hdc;
if (ignoreDrawForeground) OS.RestoreDC (hDC, -1);
if (OS.IsWindowVisible (handle)) {
/*
@@ -937,7 +937,7 @@ LRESULT CDDS_SUBITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*l
if (oldColumn == -1) {
int newColumn = indexOf (sortColumn);
int result = 0;
- int /*long*/ rgn = 0;
+ long /*int*/ rgn = 0;
if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) {
rgn = OS.CreateRectRgn (0, 0, 0, 0);
result = OS.GetUpdateRgn (handle, rgn, true);
@@ -967,8 +967,8 @@ LRESULT CDDS_SUBITEMPOSTPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*l
return null;
}
-LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) {
- int /*long*/ hDC = nmcd.hdc;
+LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) {
+ long /*int*/ hDC = nmcd.hdc;
if (explorerTheme && !ignoreCustomDraw && hooks (SWT.EraseItem) && (nmcd.left != nmcd.right)) {
OS.RestoreDC (hDC, -1);
}
@@ -984,7 +984,7 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*lo
*/
TableItem item = _getItem ((int)/*64*/nmcd.dwItemSpec);
if (item == null || item.isDisposed ()) return null;
- int /*long*/ hFont = item.fontHandle (nmcd.iSubItem);
+ long /*int*/ hFont = item.fontHandle (nmcd.iSubItem);
if (hFont != -1) OS.SelectObject (hDC, hFont);
if (ignoreCustomDraw || (nmcd.left == nmcd.right)) {
return new LRESULT (hFont == -1 ? OS.CDRF_DODEFAULT : OS.CDRF_NEWFONT);
@@ -1031,7 +1031,7 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*lo
lvItem.mask = OS.LVIF_STATE;
lvItem.stateMask = OS.LVIS_SELECTED;
lvItem.iItem = (int)/*64*/nmcd.dwItemSpec;
- int /*long*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem);
+ long /*int*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem);
if ((result != 0 && (lvItem.state & OS.LVIS_SELECTED) != 0)) {
int clrSelection = -1;
if (nmcd.iSubItem == 0) {
@@ -1071,7 +1071,7 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*lo
boolean hasAttributes = true;
if (hFont == -1 && clrText == -1 && clrTextBk == -1) {
if (item.cellForeground == null && item.cellBackground == null && item.cellFont == null) {
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0);
if (count == 1) hasAttributes = false;
}
@@ -1111,7 +1111,7 @@ LRESULT CDDS_SUBITEMPREPAINT (NMLVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*lo
int oldColumn = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSELECTEDCOLUMN, 0, 0);
if (oldColumn != -1 && oldColumn == nmcd.iSubItem) {
int result = 0;
- int /*long*/ rgn = 0;
+ long /*int*/ rgn = 0;
if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) {
rgn = OS.CreateRectRgn (0, 0, 0, 0);
result = OS.GetUpdateRgn (handle, rgn, true);
@@ -1176,7 +1176,7 @@ boolean checkData (TableItem item, int index, boolean redraw) {
return true;
}
-boolean checkHandle (int /*long*/ hwnd) {
+boolean checkHandle (long /*int*/ hwnd) {
if (hwnd == handle) return true;
return hwnd == OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
}
@@ -1469,7 +1469,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
// OS.ReleaseDC (handle, hDC);
// }
// }
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
RECT rect = new RECT ();
OS.GetWindowRect (hwndHeader, rect);
int height = rect.bottom - rect.top;
@@ -1484,10 +1484,10 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
}
bits |= width & 0xFFFF;
}
- int /*long*/ result = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, -1, OS.MAKELPARAM (bits, 0xFFFF));
+ long /*int*/ result = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, -1, OS.MAKELPARAM (bits, 0xFFFF));
int width = OS.LOWORD (result);
- int /*long*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0);
- int /*long*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0);
+ long /*int*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0);
+ long /*int*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0);
int itemHeight = OS.HIWORD (oneItem) - OS.HIWORD (empty);
height += (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0) * itemHeight;
if (width == 0) width = DEFAULT_WIDTH;
@@ -1519,7 +1519,7 @@ void createHandle () {
/* Get the header window proc */
if (HeaderProc == 0) {
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
HeaderProc = OS.GetWindowLongPtr (hwndHeader, OS.GWLP_WNDPROC);
}
@@ -1549,8 +1549,8 @@ void createHandle () {
/* Set the checkbox image list */
if ((style & SWT.CHECK) != 0) {
- int /*long*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0);
- int /*long*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0);
+ long /*int*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0);
+ long /*int*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0);
int width = OS.HIWORD (oneItem) - OS.HIWORD (empty), height = width;
setCheckboxImageList (width, height, false);
OS.SendMessage (handle, OS. LVM_SETCALLBACKMASK, OS.LVIS_STATEIMAGEMASK, 0);
@@ -1568,7 +1568,7 @@ void createHandle () {
* The control will not destroy a font that it did not
* create.
*/
- int /*long*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT);
+ long /*int*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT);
OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0);
/*
@@ -1580,8 +1580,8 @@ void createHandle () {
*/
LVCOLUMN lvColumn = new LVCOLUMN ();
lvColumn.mask = OS.LVCF_TEXT | OS.LVCF_WIDTH;
- int /*long*/ hHeap = OS.GetProcessHeap ();
- int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof);
+ long /*int*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof);
lvColumn.pszText = pszText;
OS.SendMessage (handle, OS.LVM_INSERTCOLUMN, 0, lvColumn);
OS.HeapFree (hHeap, 0, pszText);
@@ -1604,10 +1604,10 @@ void createHandle () {
*/
if (OS.WIN32_VERSION >= OS.VERSION (4, 10)) {
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
int bits2 = OS.GetWindowLong (hwndHeader, OS.GWL_EXSTYLE);
OS.SetWindowLong (hwndHeader, OS.GWL_EXSTYLE, bits2 | OS.WS_EX_LAYOUTRTL);
- int /*long*/ hwndTooltop = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0);
+ long /*int*/ hwndTooltop = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0);
int bits3 = OS.GetWindowLong (hwndTooltop, OS.GWL_EXSTYLE);
OS.SetWindowLong (hwndTooltop, OS.GWL_EXSTYLE, bits3 | OS.WS_EX_LAYOUTRTL);
}
@@ -1734,9 +1734,9 @@ void createItem (TableColumn column, int index) {
OS.SendMessage (handle, OS.LVM_GETCOLUMN, 1, lvColumn);
int width = lvColumn.cx;
int cchTextMax = 1024;
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
int byteCount = cchTextMax * TCHAR.sizeof;
- int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
lvColumn.mask = OS.LVCF_TEXT | OS.LVCF_IMAGE | OS.LVCF_WIDTH | OS.LVCF_FMT;
lvColumn.pszText = pszText;
lvColumn.cchTextMax = cchTextMax;
@@ -1789,7 +1789,7 @@ void createItem (TableColumn column, int index) {
/* Add the tool tip item for the header */
if (headerToolTipHandle != 0) {
RECT rect = new RECT ();
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
if (OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, rect) != 0) {
TOOLINFO lpti = new TOOLINFO ();
lpti.cbSize = TOOLINFO.sizeof;
@@ -1852,7 +1852,7 @@ int defaultBackground () {
void deregister () {
super.deregister ();
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
if (hwndHeader != 0) display.removeControl (hwndHeader);
}
@@ -2008,9 +2008,9 @@ void destroyItem (TableColumn column) {
if (columnCount > 1) {
index = 1;
int cchTextMax = 1024;
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
int byteCount = cchTextMax * TCHAR.sizeof;
- int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
LVCOLUMN lvColumn = new LVCOLUMN ();
lvColumn.mask = OS.LVCF_TEXT | OS.LVCF_IMAGE | OS.LVCF_WIDTH | OS.LVCF_FMT;
lvColumn.pszText = pszText;
@@ -2021,8 +2021,8 @@ void destroyItem (TableColumn column) {
OS.SendMessage (handle, OS.LVM_SETCOLUMN, 0, lvColumn);
if (pszText != 0) OS.HeapFree (hHeap, 0, pszText);
} else {
- int /*long*/ hHeap = OS.GetProcessHeap ();
- int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof);
+ long /*int*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof);
LVCOLUMN lvColumn = new LVCOLUMN ();
lvColumn.mask = OS.LVCF_TEXT | OS.LVCF_IMAGE | OS.LVCF_WIDTH | OS.LVCF_FMT;
lvColumn.pszText = pszText;
@@ -2034,7 +2034,7 @@ void destroyItem (TableColumn column) {
HDITEM hdItem = new HDITEM ();
hdItem.mask = OS.HDI_FORMAT;
hdItem.fmt = OS.HDF_LEFT;
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
OS.SendMessage (hwndHeader, OS.HDM_SETITEM, index, hdItem);
}
}
@@ -2198,7 +2198,7 @@ void destroyItem (TableItem item) {
if (index == count) return;
setDeferResize (true);
ignoreSelect = ignoreShrink = true;
- int /*long*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0);
+ long /*int*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0);
ignoreSelect = ignoreShrink = false;
if (code == 0) error (SWT.ERROR_ITEM_NOT_REMOVED);
_removeItem (index, count);
@@ -2215,11 +2215,11 @@ void fixCheckboxImageList (boolean fixScroll) {
* the state image list to be the same size as the image list.
*/
if ((style & SWT.CHECK) == 0) return;
- int /*long*/ hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0);
+ long /*int*/ hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0);
if (hImageList == 0) return;
int [] cx = new int [1], cy = new int [1];
OS.ImageList_GetIconSize (hImageList, cx, cy);
- int /*long*/ hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0);
+ long /*int*/ hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0);
if (hStateList == 0) return;
int [] stateCx = new int [1], stateCy = new int [1];
OS.ImageList_GetIconSize (hStateList, stateCx, stateCy);
@@ -2229,7 +2229,7 @@ void fixCheckboxImageList (boolean fixScroll) {
void fixCheckboxImageListColor (boolean fixScroll) {
if ((style & SWT.CHECK) == 0) return;
- int /*long*/ hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0);
+ long /*int*/ hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0);
if (hStateList == 0) return;
int [] cx = new int [1], cy = new int [1];
OS.ImageList_GetIconSize (hStateList, cx, cy);
@@ -2268,18 +2268,18 @@ void fixItemHeight (boolean fixScroll) {
setRedraw (false);
setTopIndex (0);
}
- int /*long*/ hOldList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0);
+ long /*int*/ hOldList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0);
if (hOldList != 0) return;
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
RECT rect = new RECT ();
OS.GetWindowRect (hwndHeader, rect);
int height = rect.bottom - rect.top - 1;
- int /*long*/ hImageList = OS.ImageList_Create (1, height, 0, 0, 0);
+ long /*int*/ hImageList = OS.ImageList_Create (1, height, 0, 0, 0);
OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_SMALL, hImageList);
fixCheckboxImageList (false);
OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_SMALL, 0);
if (headerImageList != null) {
- int /*long*/ hHeaderImageList = headerImageList.getHandle ();
+ long /*int*/ hHeaderImageList = headerImageList.getHandle ();
OS.SendMessage (hwndHeader, OS.HDM_SETIMAGELIST, 0, hHeaderImageList);
}
OS.ImageList_Destroy (hImageList);
@@ -2445,7 +2445,7 @@ public int getGridLineWidth () {
*/
public int getHeaderHeight () {
checkWidget ();
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
if (hwndHeader == 0) return 0;
RECT rect = new RECT ();
OS.GetWindowRect (hwndHeader, rect);
@@ -2540,7 +2540,7 @@ public TableItem getItem (Point point) {
RECT rect = new RECT ();
rect.left = OS.LVIR_ICON;
ignoreCustomDraw = true;
- int /*long*/ code = OS.SendMessage (handle, OS.LVM_GETITEMRECT, 0, rect);
+ long /*int*/ code = OS.SendMessage (handle, OS.LVM_GETITEMRECT, 0, rect);
ignoreCustomDraw = false;
if (code != 0) {
pinfo.x = rect.left;
@@ -2575,7 +2575,7 @@ public TableItem getItem (Point point) {
if (pinfo.iItem == 0) {
int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
if ((bits & OS.LVS_NOCOLUMNHEADER) == 0) {
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
if (hwndHeader != 0) {
RECT rect = new RECT ();
OS.GetWindowRect (hwndHeader, rect);
@@ -2621,8 +2621,8 @@ public int getItemCount () {
public int getItemHeight () {
checkWidget ();
if (!painted && hooks (SWT.MeasureItem)) hitTestSelection (0, 0, 0);
- int /*long*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0);
- int /*long*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0);
+ long /*int*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0);
+ long /*int*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0);
return OS.HIWORD (oneItem) - OS.HIWORD (empty);
}
@@ -2853,8 +2853,8 @@ public int getTopIndex () {
}
boolean hasChildren () {
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
- int /*long*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndChild = OS.GetWindow (handle, OS.GW_CHILD);
while (hwndChild != 0) {
if (hwndChild != hwndHeader) return true;
hwndChild = OS.GetWindow (hwndChild, OS.GW_HWNDNEXT);
@@ -2869,10 +2869,10 @@ boolean hitTestSelection (int index, int x, int y) {
boolean result = false;
if (0 <= index && index < count) {
TableItem item = _getItem (index);
- int /*long*/ hDC = OS.GetDC (handle);
- int /*long*/ oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
+ long /*int*/ hDC = OS.GetDC (handle);
+ long /*int*/ oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
- int /*long*/ hFont = item.fontHandle (0);
+ long /*int*/ hFont = item.fontHandle (0);
if (hFont != -1) hFont = OS.SelectObject (hDC, hFont);
Event event = sendMeasureItemEvent (item, index, 0, hDC);
if (event.getBounds ().contains (x, y)) result = true;
@@ -2896,7 +2896,7 @@ int imageIndex (Image image, int column) {
imageList = display.getImageList (style & SWT.RIGHT_TO_LEFT, bounds.width, bounds.height);
int index = imageList.indexOf (image);
if (index == -1) index = imageList.add (image);
- int /*long*/ hImageList = imageList.getHandle ();
+ long /*int*/ hImageList = imageList.getHandle ();
/*
* Bug in Windows. Making any change to an item that
* changes the item height of a table while the table
@@ -2913,8 +2913,8 @@ int imageIndex (Image image, int column) {
}
OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_SMALL, hImageList);
if (headerImageList != null) {
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
- int /*long*/ hHeaderImageList = headerImageList.getHandle ();
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hHeaderImageList = headerImageList.getHandle ();
OS.SendMessage (hwndHeader, OS.HDM_SETIMAGELIST, 0, hHeaderImageList);
}
fixCheckboxImageList (false);
@@ -2937,8 +2937,8 @@ int imageIndexHeader (Image image) {
headerImageList = display.getImageList (style & SWT.RIGHT_TO_LEFT, bounds.width, bounds.height);
int index = headerImageList.indexOf (image);
if (index == -1) index = headerImageList.add (image);
- int /*long*/ hImageList = headerImageList.getHandle ();
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hImageList = headerImageList.getHandle ();
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
OS.SendMessage (hwndHeader, OS.HDM_SETIMAGELIST, 0, hImageList);
return index;
}
@@ -3046,13 +3046,13 @@ public boolean isSelected (int index) {
lvItem.mask = OS.LVIF_STATE;
lvItem.stateMask = OS.LVIS_SELECTED;
lvItem.iItem = index;
- int /*long*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem);
+ long /*int*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem);
return (result != 0) && ((lvItem.state & OS.LVIS_SELECTED) != 0);
}
void register () {
super.register ();
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
if (hwndHeader != 0) display.addControl (hwndHeader, this);
}
@@ -3118,12 +3118,12 @@ void releaseWidget () {
display.releaseImageList (imageList);
}
if (headerImageList != null) {
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
OS.SendMessage (hwndHeader, OS.HDM_SETIMAGELIST, 0, 0);
display.releaseImageList (headerImageList);
}
imageList = headerImageList = null;
- int /*long*/ hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0);
+ long /*int*/ hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0);
OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_STATE, 0);
if (hStateList != 0) OS.ImageList_Destroy (hStateList);
if (headerToolTipHandle != 0) OS.DestroyWindow (headerToolTipHandle);
@@ -3165,7 +3165,7 @@ public void remove (int [] indices) {
TableItem item = _getItem (index, false);
if (item != null && !item.isDisposed ()) item.release (false);
ignoreSelect = ignoreShrink = true;
- int /*long*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0);
+ long /*int*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0);
ignoreSelect = ignoreShrink = false;
if (code == 0) error (SWT.ERROR_ITEM_NOT_REMOVED);
_removeItem(index, count);
@@ -3199,7 +3199,7 @@ public void remove (int index) {
if (item != null && !item.isDisposed ()) item.release (false);
setDeferResize (true);
ignoreSelect = ignoreShrink = true;
- int /*long*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0);
+ long /*int*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0);
ignoreSelect = ignoreShrink = false;
if (code == 0) error (SWT.ERROR_ITEM_NOT_REMOVED);
_removeItem (index, count);
@@ -3240,7 +3240,7 @@ public void remove (int start, int end) {
TableItem item = _getItem (index, false);
if (item != null && !item.isDisposed ()) item.release (false);
ignoreSelect = ignoreShrink = true;
- int /*long*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, start, 0);
+ long /*int*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, start, 0);
ignoreSelect = ignoreShrink = false;
if (code == 0) break;
index++;
@@ -3293,7 +3293,7 @@ public void removeAll () {
int index = itemCount - 1;
while (index >= 0) {
ignoreSelect = ignoreShrink = true;
- int /*long*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0);
+ long /*int*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, index, 0);
ignoreSelect = ignoreShrink = false;
if (code == 0) break;
--index;
@@ -3312,7 +3312,7 @@ public void removeAll () {
if (index != -1) error (SWT.ERROR_ITEM_NOT_REMOVED);
} else {
ignoreSelect = ignoreShrink = true;
- int /*long*/ code = OS.SendMessage (handle, OS.LVM_DELETEALLITEMS, 0, 0);
+ long /*int*/ code = OS.SendMessage (handle, OS.LVM_DELETEALLITEMS, 0, 0);
ignoreSelect = ignoreShrink = false;
if (code == 0) error (SWT.ERROR_ITEM_NOT_REMOVED);
}
@@ -3504,8 +3504,8 @@ public void selectAll () {
ignoreSelect = false;
}
-void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, int /*long*/ lParam, Event measureEvent) {
- int /*long*/ hDC = nmcd.hdc;
+void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, long /*int*/ lParam, Event measureEvent) {
+ long /*int*/ hDC = nmcd.hdc;
int clrText = item.cellForeground != null ? item.cellForeground [nmcd.iSubItem] : -1;
if (clrText == -1) clrText = item.foreground;
int clrTextBk = -1;
@@ -3529,7 +3529,7 @@ void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, int /*long*/ lPara
lvItem.mask = OS.LVIF_STATE;
lvItem.stateMask = OS.LVIS_SELECTED;
lvItem.iItem = (int)/*64*/nmcd.dwItemSpec;
- int /*long*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem);
+ long /*int*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem);
boolean selected = (result != 0 && (lvItem.state & OS.LVIS_SELECTED) != 0);
GCData data = new GCData ();
data.device = display;
@@ -3634,7 +3634,7 @@ void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, int /*long*/ lPara
OS.MoveMemory (lParam, nmcd, NMLVCUSTOMDRAW.sizeof);
}
}
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
boolean firstColumn = nmcd.iSubItem == OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0);
if (ignoreDrawForeground && ignoreDrawHot && !drawDrophilited) {
if (!ignoreDrawBackground && drawBackground) {
@@ -3679,7 +3679,7 @@ void sendEraseItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd, int /*long*/ lPara
rect.right += EXPLORER_EXTRA;
pClipRect.right += EXPLORER_EXTRA;
}
- int /*long*/ hTheme = OS.OpenThemeData (handle, Display.LISTVIEW);
+ long /*int*/ hTheme = OS.OpenThemeData (handle, Display.LISTVIEW);
int iStateId = selected ? OS.LISS_SELECTED : OS.LISS_HOT;
if (OS.GetFocus () != handle && selected && !drawHot) iStateId = OS.LISS_SELECTEDNOTFOCUS;
if (drawDrophilited) iStateId = OS.LISS_SELECTED;
@@ -3731,7 +3731,7 @@ Event sendEraseItemEvent (TableItem item, NMTTCUSTOMDRAW nmcd, int column, RECT
return event;
}
-Event sendMeasureItemEvent (TableItem item, int row, int column, int /*long*/ hDC) {
+Event sendMeasureItemEvent (TableItem item, int row, int column, long /*int*/ hDC) {
GCData data = new GCData ();
data.device = display;
data.font = item.getFont (column);
@@ -3752,7 +3752,7 @@ Event sendMeasureItemEvent (TableItem item, int row, int column, int /*long*/ hD
lvItem.mask = OS.LVIF_STATE;
lvItem.stateMask = OS.LVIS_SELECTED;
lvItem.iItem = (int)/*64*/row;
- int /*long*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem);
+ long /*int*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem);
boolean selected = (result != 0 && (lvItem.state & OS.LVIS_SELECTED) != 0);
if (selected && (column == 0 || (style & SWT.FULL_SELECTION) != 0)) {
if (OS.GetFocus () == handle || display.getHighContrast ()) {
@@ -3772,15 +3772,15 @@ Event sendMeasureItemEvent (TableItem item, int row, int column, int /*long*/ hD
int width = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETCOLUMNWIDTH, 0, 0);
if (event.x + event.width > width) setScrollWidth (event.x + event.width);
}
- int /*long*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0);
- int /*long*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0);
+ long /*int*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0);
+ long /*int*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0);
int itemHeight = OS.HIWORD (oneItem) - OS.HIWORD (empty);
if (event.height > itemHeight) setItemHeight (event.height);
}
return event;
}
-LRESULT sendMouseDownEvent (int type, int button, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT sendMouseDownEvent (int type, int button, int msg, long /*int*/ wParam, long /*int*/ lParam) {
Display display = this.display;
display.captureChanged = false;
if (!sendMouseEvent (type, button, handle, msg, wParam, lParam)) {
@@ -3820,7 +3820,7 @@ LRESULT sendMouseDownEvent (int type, int button, int msg, int /*long*/ wParam,
RECT rect = new RECT ();
rect.left = OS.LVIR_ICON;
ignoreCustomDraw = true;
- int /*long*/ code = OS.SendMessage (handle, OS.LVM_GETITEMRECT, 0, rect);
+ long /*int*/ code = OS.SendMessage (handle, OS.LVM_GETITEMRECT, 0, rect);
ignoreCustomDraw = false;
if (code != 0) {
pinfo.x = rect.left;
@@ -3931,7 +3931,7 @@ LRESULT sendMouseDownEvent (int type, int button, int msg, int /*long*/ wParam,
dragStarted = false;
display.dragCancelled = false;
if (!dragDetect) display.runDragDrop = false;
- int /*long*/ code = callWindowProc (handle, msg, wParam, lParam, forceSelect);
+ long /*int*/ code = callWindowProc (handle, msg, wParam, lParam, forceSelect);
if (!dragDetect) display.runDragDrop = true;
if (fullRowSelect) {
fullRowSelect = false;
@@ -3957,7 +3957,7 @@ LRESULT sendMouseDownEvent (int type, int button, int msg, int /*long*/ wParam,
}
void sendPaintItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd) {
- int /*long*/ hDC = nmcd.hdc;
+ long /*int*/ hDC = nmcd.hdc;
GCData data = new GCData ();
data.device = display;
data.font = item.getFont (nmcd.iSubItem);
@@ -3970,7 +3970,7 @@ void sendPaintItemEvent (TableItem item, NMLVCUSTOMDRAW nmcd) {
lvItem.mask = OS.LVIF_STATE;
lvItem.stateMask = OS.LVIS_SELECTED;
lvItem.iItem = (int)/*64*/nmcd.dwItemSpec;
- int /*long*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem);
+ long /*int*/ result = OS.SendMessage (handle, OS.LVM_GETITEM, 0, lvItem);
boolean selected = result != 0 && (lvItem.state & OS.LVIS_SELECTED) != 0;
boolean drawSelected = false, drawBackground = false, drawHot = false;
if (nmcd.iSubItem == 0 || (style & SWT.FULL_SELECTION) != 0) {
@@ -4086,7 +4086,7 @@ Event sendPaintItemEvent (TableItem item, NMTTCUSTOMDRAW nmcd, int column, RECT
return event;
}
-void setBackgroundImage (int /*long*/ hBitmap) {
+void setBackgroundImage (long /*int*/ hBitmap) {
super.setBackgroundImage (hBitmap);
if (hBitmap != 0) {
setBackgroundTransparent (true);
@@ -4249,7 +4249,7 @@ void setBounds (int x, int y, int width, int height, int flags, boolean defer) {
public void setColumnOrder (int [] order) {
checkWidget ();
if (order == null) error (SWT.ERROR_NULL_ARGUMENT);
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
if (columnCount == 0) {
if (order.length != 0) error (SWT.ERROR_INVALID_ARGUMENT);
return;
@@ -4327,7 +4327,7 @@ void setDeferResize (boolean defer) {
OS.SendMessage (handle, OS.LVM_SETBKCOLOR, 0, OS.CLR_NONE);
OS.DefWindowProc (handle, OS.WM_SETREDRAW, 1, 0);
if (OS.IsWinCE) {
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
if (hwndHeader != 0) OS.InvalidateRect (hwndHeader, null, true);
OS.InvalidateRect (handle, null, true);
} else {
@@ -4357,7 +4357,7 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) {
if (OS.IsWinCE) {
flags |= OS.ILC_COLOR;
} else {
- int /*long*/ hDC = OS.GetDC (handle);
+ long /*int*/ hDC = OS.GetDC (handle);
int bits = OS.GetDeviceCaps (hDC, OS.BITSPIXEL);
int planes = OS.GetDeviceCaps (hDC, OS.PLANES);
OS.ReleaseDC (handle, hDC);
@@ -4373,11 +4373,11 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) {
}
if ((style & SWT.RIGHT_TO_LEFT) != 0) flags |= OS.ILC_MIRROR;
if (OS.COMCTL32_MAJOR < 6 || !OS.IsAppThemed ()) flags |= OS.ILC_MASK;
- int /*long*/ hStateList = OS.ImageList_Create (width, height, flags, count, count);
- int /*long*/ hDC = OS.GetDC (handle);
- int /*long*/ memDC = OS.CreateCompatibleDC (hDC);
- int /*long*/ hBitmap = OS.CreateCompatibleBitmap (hDC, width * count, height);
- int /*long*/ hOldBitmap = OS.SelectObject (memDC, hBitmap);
+ long /*int*/ hStateList = OS.ImageList_Create (width, height, flags, count, count);
+ long /*int*/ hDC = OS.GetDC (handle);
+ long /*int*/ memDC = OS.CreateCompatibleDC (hDC);
+ long /*int*/ hBitmap = OS.CreateCompatibleBitmap (hDC, width * count, height);
+ long /*int*/ hOldBitmap = OS.SelectObject (memDC, hBitmap);
RECT rect = new RECT ();
OS.SetRect (rect, 0, 0, width * count, height);
int clrBackground;
@@ -4391,10 +4391,10 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) {
clrBackground = 0x0200FF00;
}
}
- int /*long*/ hBrush = OS.CreateSolidBrush (clrBackground);
+ long /*int*/ hBrush = OS.CreateSolidBrush (clrBackground);
OS.FillRect (memDC, rect, hBrush);
OS.DeleteObject (hBrush);
- int /*long*/ oldFont = OS.SelectObject (hDC, defaultFont ());
+ long /*int*/ oldFont = OS.SelectObject (hDC, defaultFont ());
TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
OS.GetTextMetrics (hDC, tm);
OS.SelectObject (hDC, oldFont);
@@ -4403,7 +4403,7 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) {
int left = (width - itemWidth) / 2, top = (height - itemHeight) / 2 + 1;
OS.SetRect (rect, left, top, left + itemWidth, top + itemHeight);
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
- int /*long*/ hTheme = display.hButtonTheme ();
+ long /*int*/ hTheme = display.hButtonTheme ();
OS.DrawThemeBackground (hTheme, memDC, OS.BP_CHECKBOX, OS.CBS_UNCHECKEDNORMAL, rect, null);
rect.left += width; rect.right += width;
OS.DrawThemeBackground (hTheme, memDC, OS.BP_CHECKBOX, OS.CBS_CHECKEDNORMAL, rect, null);
@@ -4459,7 +4459,7 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) {
setRedraw (false);
setTopIndex (0);
}
- int /*long*/ hOldStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0);
+ long /*int*/ hOldStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0);
OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_STATE, hStateList);
if (hOldStateList != 0) OS.ImageList_Destroy (hOldStateList);
/*
@@ -4469,7 +4469,7 @@ void setCheckboxImageList (int width, int height, boolean fixScroll) {
* LVSIL_SMALL image list.
*/
if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) {
- int /*long*/ hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0);
+ long /*int*/ hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0);
OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_SMALL, hImageList);
}
if (fixScroll && topIndex != 0) {
@@ -4530,7 +4530,7 @@ public void setFont (Font font) {
* to be redrawn but not the column headers. The fix is
* to force a redraw of the column headers.
*/
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
OS.InvalidateRect (hwndHeader, null, true);
}
@@ -4632,7 +4632,7 @@ public void setItemCount (int count) {
if (item != null && !item.isDisposed ()) item.release (false);
if (!isVirtual) {
ignoreSelect = ignoreShrink = true;
- int /*long*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, count, 0);
+ long /*int*/ code = OS.SendMessage (handle, OS.LVM_DELETEITEM, count, 0);
ignoreSelect = ignoreShrink = false;
if (code == 0) break;
}
@@ -4685,7 +4685,7 @@ void setItemHeight (boolean fixScroll) {
* WM_SETFONT which recomputes and assigns the default item
* height.
*/
- int /*long*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
+ long /*int*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0);
} else {
/*
@@ -4806,7 +4806,7 @@ public void setRedraw (boolean redraw) {
*/
setDeferResize (true);
OS.SendMessage (handle, OS.WM_SETREDRAW, 1, 0);
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
if (hwndHeader != 0) OS.SendMessage (hwndHeader, OS.WM_SETREDRAW, 1, 0);
if ((state & HIDDEN) != 0) {
state &= ~HIDDEN;
@@ -4827,7 +4827,7 @@ public void setRedraw (boolean redraw) {
} else {
if (drawCount++ == 0) {
OS.SendMessage (handle, OS.WM_SETREDRAW, 0, 0);
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
if (hwndHeader != 0) OS.SendMessage (hwndHeader, OS.WM_SETREDRAW, 0, 0);
/*
@@ -4867,7 +4867,7 @@ void setScrollWidth (int width) {
if (redraw) {
OS.DefWindowProc (handle, OS.WM_SETREDRAW, 1, 0);
if (OS.IsWinCE) {
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
if (hwndHeader != 0) OS.InvalidateRect (hwndHeader, null, true);
OS.InvalidateRect (handle, null, true);
} else {
@@ -4898,7 +4898,7 @@ boolean setScrollWidth (TableItem item, boolean force) {
int itemCount = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0);
while (index < itemCount) {
String string = null;
- int /*long*/ hFont = -1;
+ long /*int*/ hFont = -1;
if (item != null) {
string = item.text;
imageIndent = Math.max (imageIndent, item.imageIndent);
@@ -4913,8 +4913,8 @@ boolean setScrollWidth (TableItem item, boolean force) {
}
if (string != null && string.length () != 0) {
if (hFont != -1) {
- int /*long*/ hDC = OS.GetDC (handle);
- int /*long*/ oldFont = OS.SelectObject (hDC, hFont);
+ long /*int*/ hDC = OS.GetDC (handle);
+ long /*int*/ oldFont = OS.SelectObject (hDC, hFont);
int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX;
TCHAR buffer = new TCHAR (getCodePage (), string, false);
RECT rect = new RECT ();
@@ -4944,13 +4944,13 @@ boolean setScrollWidth (TableItem item, boolean force) {
TCHAR buffer = new TCHAR (getCodePage (), " ", true);
newWidth = Math.max (newWidth, (int)/*64*/OS.SendMessage (handle, OS.LVM_GETSTRINGWIDTH, 0, buffer));
}
- int /*long*/ hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0);
+ long /*int*/ hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0);
if (hStateList != 0) {
int [] cx = new int [1], cy = new int [1];
OS.ImageList_GetIconSize (hStateList, cx, cy);
newWidth += cx [0] + INSET;
}
- int /*long*/ hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0);
+ long /*int*/ hImageList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0);
if (hImageList != 0) {
int [] cx = new int [1], cy = new int [1];
OS.ImageList_GetIconSize (hImageList, cx, cy);
@@ -5213,12 +5213,12 @@ void setTableEmpty () {
* Windows to reserve the smallest possible space when an image
* list is removed.
*/
- int /*long*/ hImageList = OS.ImageList_Create (1, 1, 0, 0, 0);
+ long /*int*/ hImageList = OS.ImageList_Create (1, 1, 0, 0, 0);
OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_SMALL, hImageList);
OS.SendMessage (handle, OS.LVM_SETIMAGELIST, OS.LVSIL_SMALL, 0);
if (headerImageList != null) {
- int /*long*/ hHeaderImageList = headerImageList.getHandle ();
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hHeaderImageList = headerImageList.getHandle ();
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
OS.SendMessage (hwndHeader, OS.HDM_SETIMAGELIST, 0, hHeaderImageList);
}
OS.ImageList_Destroy (hImageList);
@@ -5504,7 +5504,7 @@ public void showSelection () {
void subclass () {
super.subclass ();
if (HeaderProc != 0) {
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
OS.SetWindowLongPtr (hwndHeader, OS.GWLP_WNDPROC, display.windowProc);
}
}
@@ -5523,7 +5523,7 @@ RECT toolTipRect (RECT rect) {
if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) {
OS.SetRect (toolRect, rect.left - 1, rect.top - 1, rect.right + 1, rect.bottom + 1);
} else {
- int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0);
+ long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0);
OS.SetRect (toolRect, rect.left, rect.top, rect.right, rect.bottom);
int dwStyle = OS.GetWindowLong (hwndToolTip, OS.GWL_STYLE);
int dwExStyle = OS.GetWindowLong (hwndToolTip, OS.GWL_EXSTYLE);
@@ -5533,7 +5533,7 @@ RECT toolTipRect (RECT rect) {
}
String toolTipText (NMTTDISPINFO hdr) {
- int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0);
+ long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0);
if (hwndToolTip == hdr.hwndFrom && toolTipText != null) return ""; //$NON-NLS-1$
if (headerToolTipHandle == hdr.hwndFrom) {
for (int i=0; i DRAG_IMAGE_SIZE) break;
if (rect.bottom > clientRect.bottom) break;
RECT itemRect = item.getBounds (selection, 0, true, true, true);
- int /*long*/ rectRgn = OS.CreateRectRgn (rect.left, itemRect.top, rect.right, itemRect.bottom);
+ long /*int*/ rectRgn = OS.CreateRectRgn (rect.left, itemRect.top, rect.right, itemRect.bottom);
OS.CombineRgn (hRgn, hRgn, rectRgn, OS.RGN_OR);
OS.DeleteObject (rectRgn);
rect.bottom = itemRect.bottom;
@@ -5873,8 +5873,8 @@ int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*
OS.GetRgnBox (hRgn, rect);
/* Create resources */
- int /*long*/ hdc = OS.GetDC (handle);
- int /*long*/ memHdc = OS.CreateCompatibleDC (hdc);
+ long /*int*/ hdc = OS.GetDC (handle);
+ long /*int*/ memHdc = OS.CreateCompatibleDC (hdc);
BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER ();
bmiHeader.biSize = BITMAPINFOHEADER.sizeof;
bmiHeader.biWidth = rect.right - rect.left;
@@ -5884,10 +5884,10 @@ int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*
bmiHeader.biCompression = OS.BI_RGB;
byte [] bmi = new byte [BITMAPINFOHEADER.sizeof];
OS.MoveMemory (bmi, bmiHeader, BITMAPINFOHEADER.sizeof);
- int /*long*/ [] pBits = new int /*long*/ [1];
- int /*long*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
+ long /*int*/ [] pBits = new long /*int*/ [1];
+ long /*int*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
if (memDib == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ oldMemBitmap = OS.SelectObject (memHdc, memDib);
+ long /*int*/ oldMemBitmap = OS.SelectObject (memHdc, memDib);
int colorKey = 0x0000FD;
POINT pt = new POINT();
OS.SetWindowOrgEx (memHdc, rect.left, rect.top, pt);
@@ -5918,7 +5918,7 @@ int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*
return super.windowProc (hwnd, msg, wParam, lParam);
}
-LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CHAR (wParam, lParam);
if (result != null) return result;
switch ((int)/*64*/wParam) {
@@ -5939,7 +5939,7 @@ LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
* This allows the application to cancel an operation that is normally
* performed in WM_KEYDOWN from WM_CHAR.
*/
- int /*long*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam);
return new LRESULT (code);
case SWT.CR:
/*
@@ -5960,7 +5960,7 @@ LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_CONTEXTMENU (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CONTEXTMENU (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. For some reason, when the right
* mouse button is pressed over an item, Windows sends
@@ -5977,7 +5977,7 @@ LRESULT WM_CONTEXTMENU (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_CONTEXTMENU (wParam, lParam);
}
-LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
if (findImageControl () != null) return LRESULT.ONE;
if (!OS.IsWinCE && OS.COMCTL32_MAJOR < 6) {
@@ -5989,7 +5989,7 @@ LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Ensure that there is an accessible object created for this
* control because support for checked item accessibility is
@@ -6001,7 +6001,7 @@ LRESULT WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_GETOBJECT (wParam, lParam);
}
-LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
switch ((int)/*64*/wParam) {
@@ -6047,14 +6047,14 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
* NOTE: The header tooltip can subclass the header proc so the
* current proc must be restored or header tooltips stop working.
*/
- int /*long*/ oldHeaderProc = 0, oldTableProc = 0;
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ oldHeaderProc = 0, oldTableProc = 0;
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
boolean fixSubclass = isOptimizedRedraw ();
if (fixSubclass) {
oldTableProc = OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TableProc);
oldHeaderProc = OS.SetWindowLongPtr (hwndHeader, OS.GWLP_WNDPROC, HeaderProc);
}
- int /*long*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam);
result = code == 0 ? LRESULT.ZERO : new LRESULT (code);
if (fixSubclass) {
OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, oldTableProc);
@@ -6069,7 +6069,7 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KILLFOCUS (wParam, lParam);
/*
* Bug in Windows. When focus is lost, Windows does not
@@ -6083,7 +6083,7 @@ LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When the user selects outside of
@@ -6131,7 +6131,7 @@ LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
return LRESULT.ZERO;
}
-LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. For some reason, capturing
* the mouse after processing the mouse event for the
@@ -6167,7 +6167,7 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_MOUSEHOVER (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEHOVER (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. Despite the fact that hot
* tracking is not enabled, the hot tracking code
@@ -6182,7 +6182,7 @@ LRESULT WM_MOUSEHOVER (int /*long*/ wParam, int /*long*/ lParam) {
return LRESULT.ZERO;
}
-LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PAINT (long /*int*/ wParam, long /*int*/ lParam) {
_checkShrink();
if (fixScrollWidth) setScrollWidth (null, true);
if (!OS.IsWinCE && OS.COMCTL32_MAJOR < 6) {
@@ -6190,7 +6190,7 @@ LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
int bits = (int)/*64*/OS.SendMessage (handle, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0);
if ((bits & OS.LVS_EX_DOUBLEBUFFER) == 0) {
GC gc = null;
- int /*long*/ paintDC = 0;
+ long /*int*/ paintDC = 0;
PAINTSTRUCT ps = new PAINTSTRUCT ();
boolean hooksPaint = hooks (SWT.Paint) || filters (SWT.Paint);
if (hooksPaint) {
@@ -6205,12 +6205,12 @@ LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
int width = ps.right - ps.left;
int height = ps.bottom - ps.top;
if (width != 0 && height != 0) {
- int /*long*/ hDC = OS.CreateCompatibleDC (paintDC);
+ long /*int*/ hDC = OS.CreateCompatibleDC (paintDC);
POINT lpPoint1 = new POINT (), lpPoint2 = new POINT ();
OS.SetWindowOrgEx (hDC, ps.left, ps.top, lpPoint1);
OS.SetBrushOrgEx (hDC, ps.left, ps.top, lpPoint2);
- int /*long*/ hBitmap = OS.CreateCompatibleBitmap (paintDC, width, height);
- int /*long*/ hOldBitmap = OS.SelectObject (hDC, hBitmap);
+ long /*int*/ hBitmap = OS.CreateCompatibleBitmap (paintDC, width, height);
+ long /*int*/ hOldBitmap = OS.SelectObject (hDC, hBitmap);
if ((int)/*64*/OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) != OS.CLR_NONE) {
RECT rect = new RECT ();
OS.SetRect (rect, ps.left, ps.top, ps.right, ps.bottom);
@@ -6247,7 +6247,7 @@ LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_PAINT (wParam, lParam);
}
-LRESULT WM_RBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_RBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When the user selects outside of
* a table item, Windows deselects all the items, even
@@ -6271,7 +6271,7 @@ LRESULT WM_RBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
return LRESULT.ZERO;
}
-LRESULT WM_RBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_RBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. For some reason, capturing
* the mouse after processing the mouse event for the
@@ -6282,7 +6282,7 @@ LRESULT WM_RBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return sendMouseDownEvent (SWT.MouseDown, 3, OS.WM_RBUTTONDOWN, wParam, lParam);
}
-LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETFOCUS (wParam, lParam);
/*
* Bug in Windows. When focus is gained after the
@@ -6317,7 +6317,7 @@ LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SETFONT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFONT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETFONT (wParam, lParam);
if (result != null) return result;
@@ -6332,7 +6332,7 @@ LRESULT WM_SETFONT (int /*long*/ wParam, int /*long*/ lParam) {
* the header so that all that is necessary here is to
* set the default first.
*/
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
OS.SendMessage (hwndHeader, OS.WM_SETFONT, 0, lParam);
if (headerToolTipHandle != 0) {
@@ -6341,7 +6341,7 @@ LRESULT WM_SETFONT (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SETREDRAW (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETREDRAW (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETREDRAW (wParam, lParam);
if (result != null) return result;
/*
@@ -6364,7 +6364,7 @@ LRESULT WM_SETREDRAW (int /*long*/ wParam, int /*long*/ lParam) {
* which stops all graphics output to the control.
*/
OS.DefWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam);
- int /*long*/ code = callWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam);
if (wParam == 0) {
if ((int)/*64*/OS.SendMessage (handle, OS.LVM_GETBKCOLOR, 0, 0) == OS.CLR_NONE) {
OS.SendMessage (handle, OS.LVM_SETBKCOLOR, 0, 0xFFFFFF);
@@ -6373,7 +6373,7 @@ LRESULT WM_SETREDRAW (int /*long*/ wParam, int /*long*/ lParam) {
return code == 0 ? LRESULT.ZERO : new LRESULT (code);
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreResize) return null;
if (hooks (SWT.EraseItem) || hooks (SWT.PaintItem)) {
OS.InvalidateRect (handle, null, true);
@@ -6385,7 +6385,7 @@ LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_SIZE (wParam, lParam);
}
-LRESULT WM_SYSCOLORCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SYSCOLORCHANGE (wParam, lParam);
if (result != null) return result;
if (findBackgroundControl () == null) {
@@ -6401,7 +6401,7 @@ LRESULT WM_SYSCOLORCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_HSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_HSCROLL (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Bug in Windows. When a table that is drawing grid lines
* is slowly scrolled horizontally to the left, the table does
@@ -6430,8 +6430,8 @@ LRESULT WM_HSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
* NOTE: The header tooltip can subclass the header proc so the
* current proc must be restored or header tooltips stop working.
*/
- int /*long*/ oldHeaderProc = 0, oldTableProc = 0;
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ oldHeaderProc = 0, oldTableProc = 0;
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
boolean fixSubclass = isOptimizedRedraw ();
if (fixSubclass) {
oldTableProc = OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TableProc);
@@ -6517,7 +6517,7 @@ LRESULT WM_HSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_VSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) {
/*
* When there are many columns in a table, scrolling performance
* can be improved by temporarily unsubclassing the window proc
@@ -6529,8 +6529,8 @@ LRESULT WM_VSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
* NOTE: The header tooltip can subclass the header proc so the
* current proc must be restored or header tooltips stop working.
*/
- int /*long*/ oldHeaderProc = 0, oldTableProc = 0;
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ oldHeaderProc = 0, oldTableProc = 0;
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
boolean fixSubclass = isOptimizedRedraw ();
if (fixSubclass) {
oldTableProc = OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TableProc);
@@ -6617,8 +6617,8 @@ LRESULT WM_VSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
RECT clientRect = new RECT ();
OS.GetClientRect (handle, clientRect);
clientRect.top += headerHeight;
- int /*long*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0);
- int /*long*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0);
+ long /*int*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0);
+ long /*int*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0);
int itemHeight = OS.HIWORD (oneItem) - OS.HIWORD (empty);
if (code == OS.SB_LINEDOWN) {
clientRect.top = clientRect.bottom - itemHeight - GRID_WIDTH;
@@ -6636,12 +6636,12 @@ LRESULT WM_VSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT wmMeasureChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmMeasureChild (long /*int*/ wParam, long /*int*/ lParam) {
MEASUREITEMSTRUCT struct = new MEASUREITEMSTRUCT ();
OS.MoveMemory (struct, lParam, MEASUREITEMSTRUCT.sizeof);
if (itemHeight == -1) {
- int /*long*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0);
- int /*long*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0);
+ long /*int*/ empty = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 0, 0);
+ long /*int*/ oneItem = OS.SendMessage (handle, OS.LVM_APPROXIMATEVIEWRECT, 1, 0);
struct.itemHeight = OS.HIWORD (oneItem) - OS.HIWORD (empty);
} else {
struct.itemHeight = itemHeight;
@@ -6650,13 +6650,13 @@ LRESULT wmMeasureChild (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT wmNotify (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
- int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0);
+LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
+ long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0);
if (hdr.hwndFrom == hwndToolTip) {
LRESULT result = wmNotifyToolTip (hdr, wParam, lParam);
if (result != null) return result;
}
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
if (hdr.hwndFrom == hwndHeader) {
LRESULT result = wmNotifyHeader (hdr, wParam, lParam);
if (result != null) return result;
@@ -6664,7 +6664,7 @@ LRESULT wmNotify (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
return super.wmNotify (hdr, wParam, lParam);
}
-LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
switch (hdr.code) {
case OS.LVN_ODFINDITEMA:
case OS.LVN_ODFINDITEMW: {
@@ -6731,7 +6731,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
RECT rect = new RECT ();
rect.left = OS.LVIR_BOUNDS;
ignoreCustomDraw = true;
- int /*long*/ code = OS.SendMessage (handle, OS. LVM_GETITEMRECT, plvfi.iItem, rect);
+ long /*int*/ code = OS.SendMessage (handle, OS. LVM_GETITEMRECT, plvfi.iItem, rect);
ignoreCustomDraw = false;
if (code != 0) OS.InvalidateRect (handle, rect, true);
break;
@@ -6838,7 +6838,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
break;
}
case OS.NM_CUSTOMDRAW: {
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
if (hdr.hwndFrom == hwndHeader) break;
if (!customDraw && findImageControl () == null) {
/*
@@ -6931,7 +6931,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
}
}
if (hooks (SWT.EraseItem) || hooks (SWT.PaintItem)) {
- int /*long*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
int count = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0);
if (count != 0) {
forceResize ();
@@ -6988,7 +6988,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
return super.wmNotifyChild (hdr, wParam, lParam);
}
-LRESULT wmNotifyHeader (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. On NT, the automatically created
* header control is created as a UNICODE window, not an
@@ -7169,7 +7169,7 @@ LRESULT wmNotifyHeader (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT wmNotifyToolTip (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotifyToolTip (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
if (OS.IsWinCE) return null;
switch (hdr.code) {
case OS.NM_CUSTOMDRAW: {
@@ -7187,7 +7187,7 @@ LRESULT wmNotifyToolTip (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
LRESULT result = super.wmNotify (hdr, wParam, lParam);
if (result != null) return result;
if (hdr.code != OS.TTN_SHOW) tipRequested = true;
- int /*long*/ code = callWindowProc (handle, OS.WM_NOTIFY, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_NOTIFY, wParam, lParam);
if (hdr.code != OS.TTN_SHOW) tipRequested = false;
if (toolTipText != null) break;
if (isCustomToolTip ()) {
@@ -7206,10 +7206,10 @@ LRESULT wmNotifyToolTip (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
*/
if (OS.SendMessage (handle, OS.LVM_SUBITEMHITTEST, 0, pinfo) >= 0) {
TableItem item = _getItem (pinfo.iItem);
- int /*long*/ hDC = OS.GetDC (handle);
- int /*long*/ oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
+ long /*int*/ hDC = OS.GetDC (handle);
+ long /*int*/ oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
- int /*long*/ hFont = item.fontHandle (pinfo.iSubItem);
+ long /*int*/ hFont = item.fontHandle (pinfo.iSubItem);
if (hFont != -1) hFont = OS.SelectObject (hDC, hFont);
Event event = sendMeasureItemEvent (item, pinfo.iItem, pinfo.iSubItem, hDC);
if (!isDisposed () && !item.isDisposed ()) {
@@ -7218,7 +7218,7 @@ LRESULT wmNotifyToolTip (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
if (hdr.code == OS.TTN_SHOW) {
RECT toolRect = toolTipRect (itemRect);
OS.MapWindowPoints (handle, 0, toolRect, 2);
- int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0);
+ long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.LVM_GETTOOLTIPS, 0, 0);
int flags = OS.SWP_NOACTIVATE | OS.SWP_NOZORDER;
int width = toolRect.right - toolRect.left, height = toolRect.bottom - toolRect.top;
SetWindowPos (hwndToolTip, 0, toolRect.left , toolRect.top, width, height, flags);
@@ -7280,7 +7280,7 @@ LRESULT wmNotifyToolTip (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT wmNotifyToolTip (NMTTCUSTOMDRAW nmcd, int /*long*/ lParam) {
+LRESULT wmNotifyToolTip (NMTTCUSTOMDRAW nmcd, long /*int*/ lParam) {
if (OS.IsWinCE) return null;
switch (nmcd.dwDrawStage) {
case OS.CDDS_PREPAINT: {
@@ -7308,10 +7308,10 @@ LRESULT wmNotifyToolTip (NMTTCUSTOMDRAW nmcd, int /*long*/ lParam) {
*/
if (OS.SendMessage (handle, OS.LVM_SUBITEMHITTEST, 0, pinfo) >= 0) {
TableItem item = _getItem (pinfo.iItem);
- int /*long*/ hDC = OS.GetDC (handle);
- int /*long*/ hFont = item.fontHandle (pinfo.iSubItem);
+ long /*int*/ hDC = OS.GetDC (handle);
+ long /*int*/ hFont = item.fontHandle (pinfo.iSubItem);
if (hFont == -1) hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
- int /*long*/ oldFont = OS.SelectObject (hDC, hFont);
+ long /*int*/ oldFont = OS.SelectObject (hDC, hFont);
boolean drawForeground = true;
RECT cellRect = item.getBounds (pinfo.iItem, pinfo.iSubItem, true, true, false, false, hDC);
if (hooks (SWT.EraseItem)) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java
index f9ce520915..735d2d9aa3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java
@@ -308,7 +308,7 @@ public int getWidth () {
checkWidget ();
int index = parent.indexOf (this);
if (index == -1) return 0;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
return (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0);
}
@@ -327,7 +327,7 @@ public void pack () {
checkWidget ();
int index = parent.indexOf (this);
if (index == -1) return;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
int oldWidth = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0);
TCHAR buffer = new TCHAR (parent.getCodePage (), text, true);
int headerWidth = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETSTRINGWIDTH, 0, buffer) + Table.HEADER_MARGIN;
@@ -351,7 +351,7 @@ public void pack () {
}
int margin = 0;
if (OS.COMCTL32_VERSION >= OS.VERSION (5, 80)) {
- int /*long*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0);
margin = (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_GETBITMAPMARGIN, 0, 0);
} else {
margin = OS.GetSystemMetrics (OS.SM_CXEDGE) * 3;
@@ -362,17 +362,17 @@ public void pack () {
int columnWidth = 0;
if (parent.hooks (SWT.MeasureItem)) {
RECT headerRect = new RECT ();
- int /*long*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0);
OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect);
OS.MapWindowPoints (hwndHeader, hwnd, headerRect, 2);
- int /*long*/ hDC = OS.GetDC (hwnd);
- int /*long*/ oldFont = 0, newFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0);
+ long /*int*/ hDC = OS.GetDC (hwnd);
+ long /*int*/ oldFont = 0, newFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
int count = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETITEMCOUNT, 0, 0);
for (int i=0; i= 6) {
int index = parent.indexOf (this);
if (index == -1) return;
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0);
HDITEM hdItem = new HDITEM ();
hdItem.mask = OS.HDI_FORMAT | OS.HDI_IMAGE;
OS.SendMessage (hwndHeader, OS.HDM_GETITEM, index, hdItem);
@@ -792,7 +792,7 @@ public void setText (String string) {
* text does not draw. The fix is to query and then
* set the alignment.
*/
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
LVCOLUMN lvColumn = new LVCOLUMN ();
lvColumn.mask = OS.LVCF_FMT;
OS.SendMessage (hwnd, OS.LVM_GETCOLUMN, index, lvColumn);
@@ -806,14 +806,14 @@ public void setText (String string) {
* with spaces.
*/
boolean replace = !OS.IsWinCE && OS.WIN32_VERSION <= OS.VERSION (4, 10);
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
TCHAR buffer = new TCHAR (parent.getCodePage (), fixMnemonic (string, replace), true);
int byteCount = buffer.length () * TCHAR.sizeof;
- int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (pszText, buffer, byteCount);
lvColumn.mask |= OS.LVCF_TEXT;
lvColumn.pszText = pszText;
- int /*long*/ result = OS.SendMessage (hwnd, OS.LVM_SETCOLUMN, index, lvColumn);
+ long /*int*/ result = OS.SendMessage (hwnd, OS.LVM_SETCOLUMN, index, lvColumn);
if (pszText != 0) OS.HeapFree (hHeap, 0, pszText);
if (result == 0) error (SWT.ERROR_CANNOT_SET_TEXT);
}
@@ -843,7 +843,7 @@ public void setText (String string) {
public void setToolTipText (String string) {
checkWidget();
toolTipText = string;
- int /*long*/ hwndHeaderToolTip = parent.headerToolTipHandle;
+ long /*int*/ hwndHeaderToolTip = parent.headerToolTipHandle;
if (hwndHeaderToolTip == 0) {
parent.createHeaderToolTips ();
parent.updateHeaderToolTips ();
@@ -865,17 +865,17 @@ public void setWidth (int width) {
if (width < 0) return;
int index = parent.indexOf (this);
if (index == -1) return;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
if (width != (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETCOLUMNWIDTH, index, 0)) {
OS.SendMessage (hwnd, OS.LVM_SETCOLUMNWIDTH, index, width);
}
}
void updateToolTip (int index) {
- int /*long*/ hwndHeaderToolTip = parent.headerToolTipHandle;
+ long /*int*/ hwndHeaderToolTip = parent.headerToolTipHandle;
if (hwndHeaderToolTip != 0) {
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0);
RECT rect = new RECT ();
if (OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, rect) != 0) {
TOOLINFO lpti = new TOOLINFO ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java
index 67884d2eee..55fcdd2dc3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java
@@ -147,7 +147,7 @@ void destroyWidget () {
releaseHandle ();
}
-int /*long*/ fontHandle (int index) {
+long /*int*/ fontHandle (int index) {
if (cellFont != null && cellFont [index] != null) return cellFont [index].handle;
if (font != null) return font.handle;
return -1;
@@ -243,7 +243,7 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean
return getBounds (row, column, getText, getImage, fullText, false, 0);
}
-RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean fullText, boolean fullImage, int /*long*/ hDC) {
+RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean fullText, boolean fullImage, long /*int*/ hDC) {
if (!getText && !getImage) return new RECT ();
int columnCount = parent.getColumnCount ();
if (!(0 <= column && column < Math.max (1, columnCount))) {
@@ -251,24 +251,24 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean
}
if (parent.fixScrollWidth) parent.setScrollWidth (null, true);
RECT rect = new RECT ();
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
int bits = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0);
if (column == 0 && (bits & OS.LVS_EX_FULLROWSELECT) == 0) {
if (parent.explorerTheme) {
rect.left = OS.LVIR_ICON;
parent.ignoreCustomDraw = true;
- int /*long*/ code = OS.SendMessage (hwnd, OS. LVM_GETITEMRECT, row, rect);
+ long /*int*/ code = OS.SendMessage (hwnd, OS. LVM_GETITEMRECT, row, rect);
parent.ignoreCustomDraw = false;
if (code == 0) return new RECT ();
if (getText) {
int width = 0;
- int /*long*/ hFont = fontHandle (column);
+ long /*int*/ hFont = fontHandle (column);
if (hFont == -1 && hDC == 0) {
TCHAR buffer = new TCHAR (parent.getCodePage (), text, true);
width = (int)/*64*/OS.SendMessage (hwnd, OS.LVM_GETSTRINGWIDTH, 0, buffer);
} else {
TCHAR buffer = new TCHAR (parent.getCodePage (), text, false);
- int /*long*/ textDC = hDC != 0 ? hDC : OS.GetDC (hwnd), oldFont = -1;
+ long /*int*/ textDC = hDC != 0 ? hDC : OS.GetDC (hwnd), oldFont = -1;
if (hDC == 0) {
if (hFont == -1) hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0);
oldFont = OS.SelectObject (textDC, hFont);
@@ -289,7 +289,7 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean
if (getText) {
rect.left = OS.LVIR_SELECTBOUNDS;
parent.ignoreCustomDraw = true;
- int /*long*/ code = OS.SendMessage (hwnd, OS.LVM_GETITEMRECT, row, rect);
+ long /*int*/ code = OS.SendMessage (hwnd, OS.LVM_GETITEMRECT, row, rect);
parent.ignoreCustomDraw = false;
if (code == 0) return new RECT ();
if (!getImage) {
@@ -303,14 +303,14 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean
} else {
rect.left = OS.LVIR_ICON;
parent.ignoreCustomDraw = true;
- int /*long*/ code = OS.SendMessage (hwnd, OS.LVM_GETITEMRECT, row, rect);
+ long /*int*/ code = OS.SendMessage (hwnd, OS.LVM_GETITEMRECT, row, rect);
parent.ignoreCustomDraw = false;
if (code == 0) return new RECT ();
}
}
if (fullText || fullImage) {
RECT headerRect = new RECT ();
- int /*long*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0);
OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, 0, headerRect);
OS.MapWindowPoints (hwndHeader, hwnd, headerRect, 2);
if (getText && fullText) rect.right = headerRect.right;
@@ -334,7 +334,7 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean
*/
rect.left = getText ? OS.LVIR_LABEL : OS.LVIR_ICON;
parent.ignoreCustomDraw = true;
- int /*long*/ code = OS.SendMessage (hwnd, OS. LVM_GETSUBITEMRECT, row, rect);
+ long /*int*/ code = OS.SendMessage (hwnd, OS. LVM_GETSUBITEMRECT, row, rect);
parent.ignoreCustomDraw = false;
if (code == 0) return new RECT ();
/*
@@ -368,7 +368,7 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean
}
if (column == 0 && fullImage) {
RECT headerRect = new RECT ();
- int /*long*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0);
+ long /*int*/ hwndHeader = OS.SendMessage (hwnd, OS.LVM_GETHEADER, 0, 0);
OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, 0, headerRect);
OS.MapWindowPoints (hwndHeader, hwnd, headerRect, 2);
rect.left = headerRect.left;
@@ -376,7 +376,7 @@ RECT getBounds (int row, int column, boolean getText, boolean getImage, boolean
} else {
rect.left = OS.LVIR_ICON;
parent.ignoreCustomDraw = true;
- int /*long*/ code = OS.SendMessage (hwnd, OS. LVM_GETSUBITEMRECT, row, rect);
+ long /*int*/ code = OS.SendMessage (hwnd, OS. LVM_GETSUBITEMRECT, row, rect);
parent.ignoreCustomDraw = false;
if (code == 0) return new RECT ();
if (!hasImage) rect.right = rect.left;
@@ -682,7 +682,7 @@ public Rectangle getTextBounds (int index) {
void redraw () {
if (parent.currentItem == this || !parent.getDrawing ()) return;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
if (!OS.IsWindowVisible (hwnd)) return;
int index = parent.indexOf (this);
if (index == -1) return;
@@ -691,7 +691,7 @@ void redraw () {
void redraw (int column, boolean drawText, boolean drawImage) {
if (parent.currentItem == this || !parent.getDrawing ()) return;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
if (!OS.IsWindowVisible (hwnd)) return;
int index = parent.indexOf (this);
if (index == -1) return;
@@ -859,7 +859,7 @@ public void setFont (Font font){
if ((parent.style & SWT.VIRTUAL) == 0 && cached) {
int itemIndex = parent.indexOf (this);
if (itemIndex != -1) {
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
LVITEM lvItem = new LVITEM ();
lvItem.mask = OS.LVIF_TEXT;
lvItem.iItem = itemIndex;
@@ -923,7 +923,7 @@ public void setFont (int index, Font font) {
if ((parent.style & SWT.VIRTUAL) == 0 && cached) {
int itemIndex = parent.indexOf (this);
if (itemIndex != -1) {
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
LVITEM lvItem = new LVITEM ();
lvItem.mask = OS.LVIF_TEXT;
lvItem.iItem = itemIndex;
@@ -1132,7 +1132,7 @@ public void setImageIndent (int indent) {
} else {
int index = parent.indexOf (this);
if (index != -1) {
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
LVITEM lvItem = new LVITEM ();
lvItem.mask = OS.LVIF_INDENT;
lvItem.iItem = index;
@@ -1213,7 +1213,7 @@ public void setText (int index, String string) {
if ((parent.style & SWT.VIRTUAL) == 0 && cached) {
int itemIndex = parent.indexOf (this);
if (itemIndex != -1) {
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
LVITEM lvItem = new LVITEM ();
lvItem.mask = OS.LVIF_TEXT;
lvItem.iItem = itemIndex;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskBar.java
index 3eb5d6bf60..958b08a534 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskBar.java
@@ -36,7 +36,7 @@ import org.eclipse.swt.*;
public class TaskBar extends Widget {
int itemCount;
TaskItem [] items = new TaskItem [4];
- int /*long*/ mTaskbarList3;
+ long /*int*/ mTaskbarList3;
static final char [] EXE_PATH;
static final char [] ICO_DIR = {'i','c','o','_','d','i','r','\0'};
@@ -98,7 +98,7 @@ TaskBar (Display display, int style) {
}
void createHandle () {
- int /*long*/[] ppv = new int /*long*/ [1];
+ long /*int*/[] ppv = new long /*int*/ [1];
int hr = OS.CoCreateInstance (CLSID_TaskbarList, 0, OS.CLSCTX_INPROC_SERVER, IID_ITaskbarList3, ppv);
if (hr != OS.S_OK) error (SWT.ERROR_NO_HANDLES);
mTaskbarList3 = ppv [0];
@@ -124,17 +124,17 @@ void createItems () {
getItem (null);
}
-int /*long*/ createShellLink (MenuItem item, String directory) {
+long /*int*/ createShellLink (MenuItem item, String directory) {
int style = item.getStyle ();
if ((style & SWT.CASCADE) != 0) return 0;
- int /*long*/ [] ppv = new int /*long*/ [1];
+ long /*int*/ [] ppv = new long /*int*/ [1];
int hr = OS.CoCreateInstance (CLSID_ShellLink, 0, OS.CLSCTX_INPROC_SERVER, IID_IShellLinkW, ppv);
if (hr != OS.S_OK) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ pLink = ppv [0];
+ long /*int*/ pLink = ppv [0];
- int /*long*/ hHeap = OS.GetProcessHeap ();
- int /*long*/ pv = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, OS.PROPVARIANT_sizeof());
- int /*long*/ titlePtr = 0;
+ long /*int*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ pv = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, OS.PROPVARIANT_sizeof());
+ long /*int*/ titlePtr = 0;
PROPERTYKEY key;
if ((style & SWT.SEPARATOR) != 0) {
OS.MoveMemory (pv, new short [] {OS.VT_BOOL}, 2);
@@ -148,7 +148,7 @@ int /*long*/ createShellLink (MenuItem item, String directory) {
titlePtr = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, buffer.length * 2);
OS.MoveMemory (titlePtr, buffer, buffer.length * 2);
OS.MoveMemory (pv, new short [] {OS.VT_LPWSTR}, 2);
- OS.MoveMemory (pv + 8, new int /*long*/ [] {titlePtr}, OS.PTR_SIZEOF);
+ OS.MoveMemory (pv + 8, new long /*int*/ [] {titlePtr}, OS.PTR_SIZEOF);
key = PKEY_Title;
/*IShellLink::SetPath*/
@@ -217,7 +217,7 @@ int /*long*/ createShellLink (MenuItem item, String directory) {
/*IUnknown::QueryInterface*/
hr = OS.VtblCall (0, pLink, IID_IPropertyStore, ppv);
if (hr != OS.S_OK) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ pPropStore = ppv [0];
+ long /*int*/ pPropStore = ppv [0];
/*IPropertyStore::SetValue*/
hr = OS.VtblCall (6, pPropStore, key, pv);
if (hr != OS.S_OK) error (SWT.ERROR_INVALID_ARGUMENT);
@@ -231,15 +231,15 @@ int /*long*/ createShellLink (MenuItem item, String directory) {
return pLink;
}
-int /*long*/ createShellLinkArray (MenuItem [] items, String directory) {
+long /*int*/ createShellLinkArray (MenuItem [] items, String directory) {
if (items == null) return 0;
if (items.length == 0) return 0;
- int /*long*/ [] ppv = new int /*long*/ [1];
+ long /*int*/ [] ppv = new long /*int*/ [1];
int hr = OS.CoCreateInstance (CLSID_EnumerableObjectCollection, 0, OS.CLSCTX_INPROC_SERVER, IID_IObjectCollection, ppv);
if (hr != OS.S_OK) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ pObjColl = ppv [0];
+ long /*int*/ pObjColl = ppv [0];
for (int i = 0; i < items.length; i++) {
- int /*long*/ pLink = createShellLink (items[i], directory);
+ long /*int*/ pLink = createShellLink (items[i], directory);
if (pLink != 0) {
/*IObjectCollection::AddObject*/
hr = OS.VtblCall (5, pObjColl, pLink);
@@ -251,7 +251,7 @@ int /*long*/ createShellLinkArray (MenuItem [] items, String directory) {
/*IUnknown::QueryInterface*/
hr = OS.VtblCall (0, pObjColl, IID_IObjectArray, ppv);
if (hr != OS.S_OK) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ poa = ppv [0];
+ long /*int*/ poa = ppv [0];
/*IUnknown::Release*/
OS.VtblCall (2, pObjColl);
return poa;
@@ -289,24 +289,24 @@ String getDirectory (char[] appName) {
}
}
String result = null;
- int /*long*/ [] ppv = new int /*long*/ [1];
+ long /*int*/ [] ppv = new long /*int*/ [1];
int hr = OS.SHCreateItemInKnownFolder (FOLDERID_LocalAppData, 0, null, IID_IShellItem, ppv);
if (hr == OS.S_OK) {
- int /*long*/ psiRoot = ppv [0];
+ long /*int*/ psiRoot = ppv [0];
hr = OS.CoCreateInstance (CLSID_FileOperation, 0, OS.CLSCTX_INPROC_SERVER, IID_IFileOperation, ppv);
if (hr == OS.S_OK) {
- int /*long*/ pfo = ppv [0];
+ long /*int*/ pfo = ppv [0];
/*IFileOperation.SetOperationFlags*/
hr = OS.VtblCall (5, pfo, OS.FOF_NO_UI);
if (hr == OS.S_OK) {
- int /*long*/ psiAppDir = getDirectory (psiRoot, pfo, appDir, false);
+ long /*int*/ psiAppDir = getDirectory (psiRoot, pfo, appDir, false);
if (psiAppDir != 0) {
- int /*long*/ psiIcoDir = getDirectory (psiAppDir, pfo, ICO_DIR, true);
+ long /*int*/ psiIcoDir = getDirectory (psiAppDir, pfo, ICO_DIR, true);
if (psiIcoDir != 0) {
/*IShellItem::GetDisplayName*/
hr = OS.VtblCall (5, psiIcoDir, OS.SIGDN_FILESYSPATH, ppv);
if (hr == OS.S_OK) {
- int /*long*/ wstr = ppv [0];
+ long /*int*/ wstr = ppv [0];
int length = OS.wcslen (wstr);
char [] buffer = new char [length];
OS.MoveMemory (buffer, wstr, length * 2);
@@ -329,8 +329,8 @@ String getDirectory (char[] appName) {
return result;
}
-int /*long*/ getDirectory (int /*long*/ parent, int /*long*/ pfo, char [] name, boolean delete) {
- int /*long*/ [] ppv = new int /*long*/ [1];
+long /*int*/ getDirectory (long /*int*/ parent, long /*int*/ pfo, char [] name, boolean delete) {
+ long /*int*/ [] ppv = new long /*int*/ [1];
int hr = OS.SHCreateItemFromRelativeName (parent, name, 0, IID_IShellItem, ppv);
if (hr == OS.S_OK) {
if (delete) {
@@ -497,10 +497,10 @@ void reskinChildren (int flags) {
}
void setMenu (Menu menu) {
- int /*long*/ [] ppv = new int /*long*/ [1];
+ long /*int*/ [] ppv = new long /*int*/ [1];
int hr = OS.CoCreateInstance (CLSID_DestinationList, 0, OS.CLSCTX_INPROC_SERVER, IID_ICustomDestinationList, ppv);
if (hr != OS.S_OK) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ pDestList = ppv[0];
+ long /*int*/ pDestList = ppv[0];
String appName = Display.APP_NAME;
char [] buffer = {'S', 'W', 'T', '\0'};
if (appName != null && appName.length () > 0) {
@@ -519,7 +519,7 @@ void setMenu (Menu menu) {
break;
}
}
- int /*long*/ poa = createShellLinkArray (items, directory);
+ long /*int*/ poa = createShellLinkArray (items, directory);
if (poa != 0) {
/*ICustomDestinationList::SetAppID*/
@@ -530,7 +530,7 @@ void setMenu (Menu menu) {
int [] cMaxSlots = new int [1];
OS.VtblCall (4, pDestList, cMaxSlots, IID_IObjectArray, ppv);
if (hr != OS.S_OK) error (SWT.ERROR_INVALID_ARGUMENT);
- int /*long*/ pRemovedItems = ppv [0];
+ long /*int*/ pRemovedItems = ppv [0];
int [] count = new int [1];
/*IObjectArray::GetCount*/
@@ -556,7 +556,7 @@ void setMenu (Menu menu) {
}
}
}
- int /*long*/ poa2 = createShellLinkArray (subItems, directory);
+ long /*int*/ poa2 = createShellLinkArray (subItems, directory);
if (poa2 != 0) {
/*IObjectArray::GetCount*/
OS.VtblCall (3, poa2, count);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java
index 15331c5739..ce27010198 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TaskItem.java
@@ -285,8 +285,8 @@ public void setOverlayImage (Image overlayImage) {
if (overlayText.length () != 0) {
updateText ();
} else {
- int /*long*/ mTaskbarList3 = parent.mTaskbarList3;
- int /*long*/ hwnd = shell.handle;
+ long /*int*/ mTaskbarList3 = parent.mTaskbarList3;
+ long /*int*/ hwnd = shell.handle;
/* ITaskbarList3::SetOverlayIcon */
OS.VtblCall (18, mTaskbarList3, hwnd, 0, 0);
}
@@ -330,8 +330,8 @@ public void setOverlayText (String overlayText) {
if (overlayImage != null) {
updateImage ();
} else {
- int /*long*/ mTaskbarList3 = parent.mTaskbarList3;
- int /*long*/ hwnd = shell.handle;
+ long /*int*/ mTaskbarList3 = parent.mTaskbarList3;
+ long /*int*/ hwnd = shell.handle;
/* ITaskbarList3::SetOverlayIcon */
OS.VtblCall (18, mTaskbarList3, hwnd, 0, 0);
}
@@ -428,7 +428,7 @@ void setShell (Shell shell) {
void updateImage () {
showingText = false;
Image image2 = null;
- int /*long*/ hIcon = 0;
+ long /*int*/ hIcon = 0;
switch (overlayImage.type) {
case SWT.BITMAP:
image2 = Display.createIcon (overlayImage);
@@ -438,8 +438,8 @@ void updateImage () {
hIcon = overlayImage.handle;
break;
}
- int /*long*/ mTaskbarList3 = parent.mTaskbarList3;
- int /*long*/ hwnd = shell.handle;
+ long /*int*/ mTaskbarList3 = parent.mTaskbarList3;
+ long /*int*/ hwnd = shell.handle;
/* ITaskbarList3::SetOverlayIcon */
OS.VtblCall (18, mTaskbarList3, hwnd, hIcon, 0);
if (image2 != null) image2.dispose ();
@@ -448,8 +448,8 @@ void updateImage () {
void updateProgress () {
if (progressState == SWT.INDETERMINATE) return;
if (progressState == SWT.DEFAULT) return;
- int /*long*/ mTaskbarList3 = parent.mTaskbarList3;
- int /*long*/ hwnd = shell.handle;
+ long /*int*/ mTaskbarList3 = parent.mTaskbarList3;
+ long /*int*/ hwnd = shell.handle;
/* ITaskbarList3::SetProgressValue */
OS.VtblCall (9, mTaskbarList3, hwnd, (long)progress, (long)PROGRESS_MAX);
}
@@ -462,8 +462,8 @@ void updateProgressState () {
case SWT.PAUSED: tbpFlags = OS.TBPF_PAUSED; break;
case SWT.INDETERMINATE: tbpFlags = OS.TBPF_INDETERMINATE; break;
}
- int /*long*/ mTaskbarList3 = parent.mTaskbarList3;
- int /*long*/ hwnd = shell.handle;
+ long /*int*/ mTaskbarList3 = parent.mTaskbarList3;
+ long /*int*/ hwnd = shell.handle;
/* ITaskbarList3::SetProgressValue */
OS.VtblCall (9, mTaskbarList3, hwnd, (long)progress, (long)PROGRESS_MAX);
/* ITaskbarList3::SetProgressState */
@@ -474,7 +474,7 @@ void updateText () {
showingText = true;
/* Create resources */
int width = 16, height = 16;
- int /*long*/ hdc = OS.GetDC (0);
+ long /*int*/ hdc = OS.GetDC (0);
BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER ();
bmiHeader.biSize = BITMAPINFOHEADER.sizeof;
bmiHeader.biWidth = width;
@@ -484,23 +484,23 @@ void updateText () {
bmiHeader.biCompression = OS.BI_RGB;
byte [] bmi = new byte [BITMAPINFOHEADER.sizeof];
OS.MoveMemory (bmi, bmiHeader, BITMAPINFOHEADER.sizeof);
- int /*long*/ [] pBits = new int /*long*/ [1];
- int /*long*/ hBitmap = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
+ long /*int*/ [] pBits = new long /*int*/ [1];
+ long /*int*/ hBitmap = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
if (hBitmap == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ dstHdc = OS.CreateCompatibleDC (hdc);
- int /*long*/ oldBitmap = OS.SelectObject (dstHdc, hBitmap);
- int /*long*/ hMask = OS.CreateBitmap (width, height, 1, 1, null);
+ long /*int*/ dstHdc = OS.CreateCompatibleDC (hdc);
+ long /*int*/ oldBitmap = OS.SelectObject (dstHdc, hBitmap);
+ long /*int*/ hMask = OS.CreateBitmap (width, height, 1, 1, null);
if (hMask == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ maskHdc = OS.CreateCompatibleDC (hdc);
- int /*long*/ oldMask = OS.SelectObject (maskHdc, hMask);
+ long /*int*/ maskHdc = OS.CreateCompatibleDC (hdc);
+ long /*int*/ oldMask = OS.SelectObject (maskHdc, hMask);
/* Draw content */
OS.PatBlt (maskHdc, 0, 0, width, height, OS.WHITENESS);
- int /*long*/ oldBrush = OS.SelectObject (maskHdc, OS.GetStockObject (OS.BLACK_BRUSH));
+ long /*int*/ oldBrush = OS.SelectObject (maskHdc, OS.GetStockObject (OS.BLACK_BRUSH));
OS.RoundRect (maskHdc, 0, 0, width, height, 8, 8);
OS.SelectObject (maskHdc, oldBrush);
- int /*long*/ brush = OS.CreateSolidBrush (OS.GetSysColor (OS.COLOR_HIGHLIGHT));
+ long /*int*/ brush = OS.CreateSolidBrush (OS.GetSysColor (OS.COLOR_HIGHLIGHT));
oldBrush = OS.SelectObject (dstHdc, brush);
OS.RoundRect (dstHdc, 0, 0, width, height, 8, 8);
OS.SelectObject (dstHdc, oldBrush);
@@ -510,7 +510,7 @@ void updateText () {
RECT rect = new RECT ();
TCHAR buffer = new TCHAR (shell.getCodePage (), overlayText, false);
int length = buffer.length();
- int /*long*/ hFont = 0, oldHFont = 0;
+ long /*int*/ hFont = 0, oldHFont = 0;
NONCLIENTMETRICS info = OS.IsUnicode ? (NONCLIENTMETRICS) new NONCLIENTMETRICSW () : new NONCLIENTMETRICSA ();
info.cbSize = NONCLIENTMETRICS.sizeof;
if (OS.SystemParametersInfo (OS.SPI_GETNONCLIENTMETRICS, 0, info, 0)) {
@@ -549,13 +549,13 @@ void updateText () {
iconInfo.fIcon = true;
iconInfo.hbmColor = hBitmap;
iconInfo.hbmMask = hMask;
- int /*long*/ hIcon = OS.CreateIconIndirect (iconInfo);
+ long /*int*/ hIcon = OS.CreateIconIndirect (iconInfo);
if (hIcon == 0) error (SWT.ERROR_NO_HANDLES);
OS.DeleteObject (hBitmap);
OS.DeleteObject (hMask);
- int /*long*/ mTaskbarList3 = parent.mTaskbarList3;
- int /*long*/ hwnd = shell.handle;
+ long /*int*/ mTaskbarList3 = parent.mTaskbarList3;
+ long /*int*/ hwnd = shell.handle;
/* ITaskbarList3::SetOverlayIcon */
OS.VtblCall (18, mTaskbarList3, hwnd, hIcon, 0);
OS.DestroyIcon (hIcon);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java
index 3df3919bff..b56f2343e7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java
@@ -96,7 +96,7 @@ public class Text extends Scrollable {
DELIMITER = "\r\n";
}
- static final int /*long*/ EditProc;
+ static final long /*int*/ EditProc;
static final TCHAR EditClass = new TCHAR (0, "EDIT", true);
static {
WNDCLASS lpWndClass = new WNDCLASS ();
@@ -105,7 +105,7 @@ public class Text extends Scrollable {
/*
* This code is intentionally commented.
*/
-// int /*long*/ hwndText = OS.CreateWindowEx (0,
+// long /*int*/ hwndText = OS.CreateWindowEx (0,
// EditClass,
// null,
// OS.WS_OVERLAPPED | OS.ES_PASSWORD,
@@ -161,7 +161,7 @@ public Text (Composite parent, int style) {
super (parent, checkStyle (style));
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
boolean redraw = false;
switch (msg) {
@@ -184,13 +184,13 @@ int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, in
}
}
if (doubleBuffer || drawMessage) {
- int /*long*/ paintDC = 0;
+ long /*int*/ paintDC = 0;
PAINTSTRUCT ps = new PAINTSTRUCT ();
paintDC = OS.BeginPaint (handle, ps);
int width = ps.right - ps.left;
int height = ps.bottom - ps.top;
if (width != 0 && height != 0) {
- int /*long*/ hDC = paintDC, hBitmap = 0, hOldBitmap = 0;
+ long /*int*/ hDC = paintDC, hBitmap = 0, hOldBitmap = 0;
POINT lpPoint1 = null, lpPoint2 = null;
if (doubleBuffer) {
hDC = OS.CreateCompatibleDC (paintDC);
@@ -215,7 +215,7 @@ int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, in
if (drawMessage) {
RECT rect = new RECT();
OS.GetClientRect(handle, rect);
- int /*long*/ margins = OS.SendMessage (handle, OS.EM_GETMARGINS, 0, 0);
+ long /*int*/ margins = OS.SendMessage (handle, OS.EM_GETMARGINS, 0, 0);
rect.left += OS.LOWORD (margins);
rect.right -= OS.HIWORD (margins);
if ((style & SWT.BORDER) != 0) {
@@ -234,8 +234,8 @@ int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, in
case SWT.CENTER: uFormat |= OS.DT_CENTER;
case SWT.RIGHT: uFormat |= (rtl ? OS.DT_LEFT : OS.DT_RIGHT); break;
}
- int /*long*/ hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0);
- int /*long*/ hOldFont = OS.SelectObject (hDC, hFont);
+ long /*int*/ hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0);
+ long /*int*/ hOldFont = OS.SelectObject (hDC, hFont);
OS.SetTextColor (hDC, OS.GetSysColor (OS.COLOR_GRAYTEXT));
OS.SetBkMode (hDC, OS.TRANSPARENT);
OS.DrawText (hDC, buffer, buffer.length (), rect, uFormat);
@@ -257,7 +257,7 @@ int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, in
break;
}
}
- int /*long*/ code = OS.CallWindowProc (EditProc, hwnd, msg, wParam, lParam);
+ long /*int*/ code = OS.CallWindowProc (EditProc, hwnd, msg, wParam, lParam);
switch (msg) {
case OS.WM_HSCROLL:
case OS.WM_VSCROLL: {
@@ -516,7 +516,7 @@ void applySegments () {
newChars [length] = 0;
buffer = new TCHAR (cp, newChars, false);
OS.SendMessage (handle, OS.EM_SETSEL, 0, -1);
- int /*long*/ undo = OS.SendMessage (handle, OS.EM_CANUNDO, 0, 0);
+ long /*int*/ undo = OS.SendMessage (handle, OS.EM_CANUNDO, 0, 0);
OS.SendMessage (handle, OS.EM_REPLACESEL, undo, buffer);
/* Restore selection */
start [0] = translateOffset (start [0]);
@@ -591,7 +591,7 @@ void clearSegments (boolean applyText) {
* menu. Sending OS.EM_REPLACESEL message instead.
*/
OS.SendMessage (handle, OS.EM_SETSEL, 0, -1);
- int /*long*/ undo = OS.SendMessage (handle, OS.EM_CANUNDO, 0, 0);
+ long /*int*/ undo = OS.SendMessage (handle, OS.EM_CANUNDO, 0, 0);
OS.SendMessage (handle, OS.EM_REPLACESEL, undo, buffer);
/* Restore selection */
if (!OS.IsUnicode && OS.IsDBLocale) {
@@ -634,8 +634,8 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
int height = 0, width = 0;
if (wHint == SWT.DEFAULT || hHint == SWT.DEFAULT) {
- int /*long*/ newFont, oldFont = 0;
- int /*long*/ hDC = OS.GetDC (handle);
+ long /*int*/ newFont, oldFont = 0;
+ long /*int*/ hDC = OS.GetDC (handle);
newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
@@ -686,7 +686,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
* the single-line text widget in an editable combo
* box.
*/
- int /*long*/ margins = OS.SendMessage(handle, OS.EM_GETMARGINS, 0, 0);
+ long /*int*/ margins = OS.SendMessage(handle, OS.EM_GETMARGINS, 0, 0);
rect.x -= OS.LOWORD (margins);
rect.width += OS.LOWORD (margins) + OS.HIWORD (margins);
if ((style & SWT.H_SCROLL) != 0) rect.width++;
@@ -783,12 +783,12 @@ TCHAR deprocessText (TCHAR text, int start, int end, boolean terminate) {
return text;
}
-boolean dragDetect (int /*long*/ hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) {
+boolean dragDetect (long /*int*/ hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) {
if (filter) {
int [] start = new int [1], end = new int [1];
OS.SendMessage (handle, OS.EM_GETSEL, start, end);
if (start [0] != end [0]) {
- int /*long*/ lParam = OS.MAKELPARAM (x, y);
+ long /*int*/ lParam = OS.MAKELPARAM (x, y);
int position = OS.LOWORD (OS.SendMessage (handle, OS.EM_CHARFROMPOS, 0, lParam));
if (start [0] <= position && position < end [0]) {
if (super.dragDetect (hwnd, x, y, filter, detect, consume)) {
@@ -912,7 +912,7 @@ public Point getCaretLocation () {
* pixel coordinates (0,0).
*/
int position = translateOffset (getCaretPosition ());
- int /*long*/ caretPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, position, 0);
+ long /*int*/ caretPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, position, 0);
if (caretPos == -1) {
caretPos = 0;
if (position >= OS.GetWindowTextLength (handle)) {
@@ -984,9 +984,9 @@ public int getCaretPosition () {
if (lpgui.hwndCaret == handle || lpgui.hwndCaret == 0) {
POINT ptCurrentPos = new POINT ();
if (OS.GetCaretPos (ptCurrentPos)) {
- int /*long*/ endPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, end [0], 0);
+ long /*int*/ endPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, end [0], 0);
if (endPos == -1) {
- int /*long*/ startPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, start [0], 0);
+ long /*int*/ startPos = OS.SendMessage (handle, OS.EM_POSFROMCHAR, start [0], 0);
int startX = OS.GET_X_LPARAM (startPos);
if (ptCurrentPos.x > startX) caret = end [0];
} else {
@@ -1128,8 +1128,8 @@ public String getLineDelimiter () {
*/
public int getLineHeight () {
checkWidget ();
- int /*long*/ newFont, oldFont = 0;
- int /*long*/ hDC = OS.GetDC (handle);
+ long /*int*/ newFont, oldFont = 0;
+ long /*int*/ hDC = OS.GetDC (handle);
newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
@@ -1198,7 +1198,7 @@ public String getMessage () {
/*public*/ int getPosition (Point point) {
checkWidget();
if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
- int /*long*/ lParam = OS.MAKELPARAM (point.x, point.y);
+ long /*int*/ lParam = OS.MAKELPARAM (point.x, point.y);
int position = OS.LOWORD (OS.SendMessage (handle, OS.EM_CHARFROMPOS, 0, lParam));
if (!OS.IsUnicode && OS.IsDBLocale) position = mbcsToWcsPos (position);
return untranslateOffset (position);
@@ -1296,10 +1296,10 @@ public int getTabs () {
}
int getTabWidth (int tabs) {
- int /*long*/ oldFont = 0;
+ long /*int*/ oldFont = 0;
RECT rect = new RECT ();
- int /*long*/ hDC = OS.GetDC (handle);
- int /*long*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
+ long /*int*/ hDC = OS.GetDC (handle);
+ long /*int*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE | OS.DT_NOPREFIX;
TCHAR SPACE = new TCHAR (getCodePage (), " ", false);
@@ -1471,7 +1471,7 @@ public int getTopPixel () {
* of Rich Edit return zero.
*/
int [] buffer = new int [2];
- int /*long*/ code = OS.SendMessage (handle, OS.EM_GETSCROLLPOS, 0, buffer);
+ long /*int*/ code = OS.SendMessage (handle, OS.EM_GETSCROLLPOS, 0, buffer);
if (code == 1) return buffer [1];
return getTopIndex () * getLineHeight ();
}
@@ -1700,7 +1700,7 @@ public void selectAll () {
OS.SendMessage (handle, OS.EM_SETSEL, 0, -1);
}
-boolean sendKeyEvent (int type, int msg, int /*long*/ wParam, int /*long*/ lParam, Event event) {
+boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lParam, Event event) {
if (!super.sendKeyEvent (type, msg, wParam, lParam, event)) {
return false;
}
@@ -1833,7 +1833,7 @@ void setBounds (int x, int y, int width, int height, int flags) {
if ((flags & OS.SWP_NOSIZE) == 0 && width != 0) {
RECT rect = new RECT ();
OS.GetWindowRect (handle, rect);
- int /*long*/ margins = OS.SendMessage (handle, OS.EM_GETMARGINS, 0, 0);
+ long /*int*/ margins = OS.SendMessage (handle, OS.EM_GETMARGINS, 0, 0);
int marginWidth = OS.LOWORD (margins) + OS.HIWORD (margins);
if (rect.right - rect.left <= marginWidth) {
int [] start = new int [1], end = new int [1];
@@ -1857,8 +1857,8 @@ void setBounds (int x, int y, int width, int height, int flags) {
if ((flags & OS.SWP_NOSIZE) == 0) {
int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
if ((bits & OS.ES_MULTILINE) != 0) {
- int /*long*/ newFont, oldFont = 0;
- int /*long*/ hDC = OS.GetDC (handle);
+ long /*int*/ newFont, oldFont = 0;
+ long /*int*/ hDC = OS.GetDC (handle);
newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
@@ -1868,7 +1868,7 @@ void setBounds (int x, int y, int width, int height, int flags) {
RECT rect = new RECT();
OS.GetClientRect (handle, rect);
if ((rect.bottom - rect.top) < tm.tmHeight) {
- int /*long*/ margins = OS.SendMessage (handle, OS.EM_GETMARGINS, 0, 0);
+ long /*int*/ margins = OS.SendMessage (handle, OS.EM_GETMARGINS, 0, 0);
rect.left += OS.LOWORD (margins);
rect.right -= OS.HIWORD (margins);
rect.top = 0;
@@ -2513,13 +2513,13 @@ TCHAR windowClass () {
return EditClass;
}
-int /*long*/ windowProc () {
+long /*int*/ windowProc () {
return EditProc;
}
-int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
boolean processSegments = false, redraw = false;
- int /*long*/ code;
+ long /*int*/ code;
if (hooks (SWT.Segments) || filters (SWT.Segments)) {
switch (msg) {
case OS.EM_UNDO:
@@ -2579,7 +2579,7 @@ int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*
return code;
}
-LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreCharacter) return null;
LRESULT result = super.WM_CHAR (wParam, lParam);
if (result != null) return result;
@@ -2617,19 +2617,19 @@ LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_CLEAR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CLEAR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CLEAR (wParam, lParam);
if (result != null) return result;
return wmClipboard (OS.WM_CLEAR, wParam, lParam);
}
-LRESULT WM_CUT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CUT (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CUT (wParam, lParam);
if (result != null) return result;
return wmClipboard (OS.WM_CUT, wParam, lParam);
}
-LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
if ((style & SWT.READ_ONLY) != 0) {
if ((style & (SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL)) == 0) {
@@ -2655,7 +2655,7 @@ LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETDLGCODE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_GETDLGCODE (wParam, lParam);
if (result != null) return result;
@@ -2681,14 +2681,14 @@ LRESULT WM_GETDLGCODE (int /*long*/ wParam, int /*long*/ lParam) {
* so DLGC_WANTARROWS should not be cleared.
*/
if ((style & SWT.READ_ONLY) != 0) {
- int /*long*/ code = callWindowProc (handle, OS.WM_GETDLGCODE, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_GETDLGCODE, wParam, lParam);
code &= ~(OS.DLGC_WANTALLKEYS | OS.DLGC_WANTTAB);
return new LRESULT (code);
}
return null;
}
-LRESULT WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Ensure that there is an accessible object created for this
* control because support for search text accessibility is
@@ -2700,7 +2700,7 @@ LRESULT WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_GETOBJECT (wParam, lParam);
}
-LRESULT WM_IME_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_IME_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
/* Process a DBCS character */
Display display = this.display;
@@ -2719,7 +2719,7 @@ LRESULT WM_IME_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
* them to the application.
*/
ignoreCharacter = true;
- int /*long*/ result = callWindowProc (handle, OS.WM_IME_CHAR, wParam, lParam);
+ long /*int*/ result = callWindowProc (handle, OS.WM_IME_CHAR, wParam, lParam);
MSG msg = new MSG ();
int flags = OS.PM_REMOVE | OS.PM_NOYIELD | OS.PM_QS_INPUT | OS.PM_QS_POSTMESSAGE;
while (OS.PeekMessage (msg, handle, OS.WM_CHAR, OS.WM_CHAR, flags)) {
@@ -2734,7 +2734,7 @@ LRESULT WM_IME_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
return new LRESULT (result);
}
-LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Prevent Windows from processing WM_LBUTTONDBLCLK
* when double clicking behavior is disabled by not
@@ -2772,7 +2772,7 @@ LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
if (OS.IsPPC) {
LRESULT result = null;
Display display = this.display;
@@ -2816,19 +2816,19 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_LBUTTONDOWN (wParam, lParam);
}
-LRESULT WM_PASTE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_PASTE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_PASTE (wParam, lParam);
if (result != null) return result;
return wmClipboard (OS.WM_PASTE, wParam, lParam);
}
-LRESULT WM_UNDO (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_UNDO (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_UNDO (wParam, lParam);
if (result != null) return result;
return wmClipboard (OS.WM_UNDO, wParam, lParam);
}
-LRESULT wmClipboard (int msg, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmClipboard (int msg, long /*int*/ wParam, long /*int*/ lParam) {
if ((style & SWT.READ_ONLY) != 0) return null;
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return null;
boolean call = false;
@@ -2904,7 +2904,7 @@ LRESULT wmClipboard (int msg, int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) {
if ((style & SWT.READ_ONLY) != 0) {
if ((style & (SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL)) == 0) {
int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
@@ -2929,7 +2929,7 @@ LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
return super.wmColorChild (wParam, lParam);
}
-LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) {
int code = OS.HIWORD (wParam);
switch (code) {
case OS.EN_CHANGE:
@@ -2981,7 +2981,7 @@ LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) {
return super.wmCommandChild (wParam, lParam);
}
-LRESULT wmKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.wmKeyDown (hwnd, wParam, lParam);
if (result != null) return result;
@@ -2991,7 +2991,7 @@ LRESULT wmKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam)
case OS.VK_UP:
case OS.VK_RIGHT:
case OS.VK_DOWN:
- int /*long*/ code = 0;
+ long /*int*/ code = 0;
int [] start = new int [1], end = new int [1], newStart = new int [1], newEnd = new int [1];
OS.SendMessage (handle, OS.EM_GETSEL, start, end);
while (true) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
index 9cb33cf35d..485e7070f2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
@@ -50,7 +50,7 @@ public class ToolBar extends Composite {
ToolItem [] tabItemList;
boolean ignoreResize, ignoreMouse;
ImageList imageList, disabledImageList, hotImageList;
- static final int /*long*/ ToolBarProc;
+ static final long /*int*/ ToolBarProc;
static final TCHAR ToolBarClass = new TCHAR (0, OS.TOOLBARCLASSNAME, true);
static {
WNDCLASS lpWndClass = new WNDCLASS ();
@@ -139,7 +139,7 @@ public ToolBar (Composite parent, int style) {
}
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
/*
* Bug in Windows. For some reason, during the processing
@@ -330,7 +330,7 @@ void createHandle () {
* bar currently sets this value to 300 so it is not
* necessary to set TTM_SETMAXTIPWIDTH.
*/
-// int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0);
+// long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0);
// OS.SendMessage (hwndToolTip, OS.TTM_SETMAXTIPWIDTH, 0, 0x7FFF);
/*
@@ -345,7 +345,7 @@ void createHandle () {
* The control will not destroy a font that it did not
* create.
*/
- int /*long*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT);
+ long /*int*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT);
OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0);
/* Set the button struct, bitmap and button sizes */
@@ -510,7 +510,7 @@ public ToolItem getItem (int index) {
int count = (int)/*64*/OS.SendMessage (handle, OS.TB_BUTTONCOUNT, 0, 0);
if (!(0 <= index && index < count)) error (SWT.ERROR_INVALID_RANGE);
TBBUTTON lpButton = new TBBUTTON ();
- int /*long*/ result = OS.SendMessage (handle, OS.TB_GETBUTTON, index, lpButton);
+ long /*int*/ result = OS.SendMessage (handle, OS.TB_GETBUTTON, index, lpButton);
if (result == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
return items [lpButton.idCommand];
}
@@ -693,7 +693,7 @@ void layoutItems () {
* the tool items. The fix is to use WM_SETFONT to force
* the tool bar to redraw and lay out.
*/
- int /*long*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
+ long /*int*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0);
setDropDownItems (true);
}
@@ -715,7 +715,7 @@ void layoutItems () {
TBBUTTONINFO info = new TBBUTTONINFO ();
info.cbSize = TBBUTTONINFO.sizeof;
info.dwMask = OS.TBIF_SIZE;
- int /*long*/ size = OS.SendMessage (handle, OS.TB_GETBUTTONSIZE, 0, 0);
+ long /*int*/ size = OS.SendMessage (handle, OS.TB_GETBUTTONSIZE, 0, 0);
info.cx = (short) OS.LOWORD (size);
int index = 0;
while (index < items.length) {
@@ -724,7 +724,7 @@ void layoutItems () {
index++;
}
if (index < items.length) {
- int /*long*/ padding = OS.SendMessage (handle, OS.TB_GETPADDING, 0, 0);
+ long /*int*/ padding = OS.SendMessage (handle, OS.TB_GETPADDING, 0, 0);
info.cx += OS.LOWORD (padding) * 2;
}
for (int i=0; i= 6) {
TOOLINFO lpti = new TOOLINFO ();
lpti.cbSize = TOOLINFO.sizeof;
- int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0);
+ long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.TB_GETTOOLTIPS, 0, 0);
if (OS.SendMessage (hwndToolTip, OS.TTM_GETCURRENTTOOL, 0, lpti) != 0) {
if ((lpti.uFlags & OS.TTF_IDISHWND) == 0) {
OS.SendMessage (hwndToolTip, OS.TTM_DELTOOL, 0, lpti);
@@ -1371,12 +1371,12 @@ LRESULT WM_MOUSELEAVE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_MOUSEMOVE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOUSEMOVE (long /*int*/ wParam, long /*int*/ lParam) {
if (OS.GetMessagePos () != display.lastMouse) lastArrowId = -1;
return super.WM_MOUSEMOVE (wParam, lParam);
}
-LRESULT WM_NOTIFY (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NOTIFY (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When the toolbar window
* proc processes WM_NOTIFY, it forwards this
@@ -1400,7 +1400,7 @@ LRESULT WM_NOTIFY (int /*long*/ wParam, int /*long*/ lParam) {
return LRESULT.ZERO;
}
-LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETFOCUS (wParam, lParam);
if (lastFocusId != -1 && handle == OS.GetFocus ()) {
int index = (int)/*64*/OS.SendMessage (handle, OS.TB_COMMANDTOINDEX, lastFocusId, 0);
@@ -1409,9 +1409,9 @@ LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreResize) {
- int /*long*/ code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_SIZE, wParam, lParam);
if (code == 0) return LRESULT.ZERO;
return new LRESULT (code);
}
@@ -1451,7 +1451,7 @@ LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam);
if (result != null) return result;
if (ignoreResize) return result;
@@ -1493,13 +1493,13 @@ LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) {
ToolItem child = items [OS.LOWORD (wParam)];
if (child == null) return null;
return child.wmCommandChild (wParam, lParam);
}
-LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
switch (hdr.code) {
case OS.TBN_DROPDOWN:
NMTOOLBAR lpnmtb = new NMTOOLBAR ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java
index c8caddbbe7..e536d9548f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java
@@ -176,7 +176,7 @@ protected void checkSubclass () {
}
void click (boolean dropDown) {
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
if (OS.GetKeyState (OS.VK_LBUTTON) < 0) return;
int index = (int)/*64*/OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0);
RECT rect = new RECT ();
@@ -191,7 +191,7 @@ void click (boolean dropDown) {
* properly.
*/
int y = rect.top + (rect.bottom - rect.top) / 2;
- int /*long*/ lParam = OS.MAKELPARAM (dropDown ? rect.right - 1 : rect.left, y);
+ long /*int*/ lParam = OS.MAKELPARAM (dropDown ? rect.right - 1 : rect.left, y);
parent.ignoreMouse = true;
OS.SendMessage (hwnd, OS.WM_LBUTTONDOWN, 0, lParam);
OS.SendMessage (hwnd, OS.WM_LBUTTONUP, 0, lParam);
@@ -233,7 +233,7 @@ void destroyWidget () {
*/
public Rectangle getBounds () {
checkWidget();
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
int index = (int)/*64*/OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0);
RECT rect = new RECT ();
OS.SendMessage (hwnd, OS.TB_GETITEMRECT, index, rect);
@@ -297,8 +297,8 @@ public boolean getEnabled () {
if ((style & SWT.SEPARATOR) != 0) {
return (state & DISABLED) == 0;
}
- int /*long*/ hwnd = parent.handle;
- int /*long*/ fsState = OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ fsState = OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0);
return (fsState & OS.TBSTATE_ENABLED) != 0;
}
@@ -356,8 +356,8 @@ public ToolBar getParent () {
public boolean getSelection () {
checkWidget();
if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return false;
- int /*long*/ hwnd = parent.handle;
- int /*long*/ fsState = OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ fsState = OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0);
return (fsState & OS.TBSTATE_CHECKED) != 0;
}
@@ -388,7 +388,7 @@ public String getToolTipText () {
*/
public int getWidth () {
checkWidget();
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
int index = (int)/*64*/OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0);
RECT rect = new RECT ();
OS.SendMessage (hwnd, OS.TB_GETITEMRECT, index, rect);
@@ -449,7 +449,7 @@ void releaseImages () {
TBBUTTONINFO info = new TBBUTTONINFO ();
info.cbSize = TBBUTTONINFO.sizeof;
info.dwMask = OS.TBIF_IMAGE | OS.TBIF_STYLE;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
OS.SendMessage (hwnd, OS.TB_GETBUTTONINFO, id, info);
/*
* Feature in Windows. For some reason, a tool item that has
@@ -565,7 +565,7 @@ public void setControl (Control control) {
*/
if ((parent.style & (SWT.WRAP | SWT.VERTICAL)) != 0) {
boolean changed = false;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
TBBUTTONINFO info = new TBBUTTONINFO ();
info.cbSize = TBBUTTONINFO.sizeof;
info.dwMask = OS.TBIF_STYLE | OS.TBIF_STATE;
@@ -628,7 +628,7 @@ public void setControl (Control control) {
*/
public void setEnabled (boolean enabled) {
checkWidget();
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
int fsState = (int)/*64*/OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0);
/*
* Feature in Windows. When TB_SETSTATE is used to set the
@@ -735,7 +735,7 @@ boolean setRadioSelection (boolean value) {
public void setSelection (boolean selected) {
checkWidget();
if ((style & (SWT.CHECK | SWT.RADIO)) == 0) return;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
int fsState = (int)/*64*/OS.SendMessage (hwnd, OS.TB_GETSTATE, id, 0);
/*
* Feature in Windows. When TB_SETSTATE is used to set the
@@ -770,7 +770,7 @@ public void setSelection (boolean selected) {
boolean setTabItemFocus () {
if (parent.setTabItemFocus ()) {
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
int index = (int)/*64*/OS.SendMessage (hwnd, OS.TB_COMMANDTOINDEX, id, 0);
OS.SendMessage (hwnd, OS.TB_SETHOTITEM, index, 0);
return true;
@@ -809,12 +809,12 @@ public void setText (String string) {
if ((style & SWT.SEPARATOR) != 0) return;
if (string.equals (text)) return;
super.setText (string);
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
TBBUTTONINFO info = new TBBUTTONINFO ();
info.cbSize = TBBUTTONINFO.sizeof;
info.dwMask = OS.TBIF_TEXT | OS.TBIF_STYLE;
info.fsStyle = (byte) (widgetStyle () | OS.BTNS_AUTOSIZE);
- int /*long*/ hHeap = OS.GetProcessHeap (), pszText = 0;
+ long /*int*/ hHeap = OS.GetProcessHeap (), pszText = 0;
if (string.length () != 0) {
info.fsStyle |= OS.BTNS_SHOWTEXT;
TCHAR buffer = new TCHAR (parent.getCodePage (), string, true);
@@ -835,7 +835,7 @@ public void setText (String string) {
* the tool bar to redraw and layout.
*/
parent.setDropDownItems (false);
- int /*long*/ hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0);
+ long /*int*/ hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0);
OS.SendMessage (hwnd, OS.WM_SETFONT, hFont, 0);
parent.setDropDownItems (true);
parent.layoutItems ();
@@ -887,7 +887,7 @@ public void setWidth (int width) {
checkWidget();
if ((style & SWT.SEPARATOR) == 0) return;
if (width < 0) return;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
TBBUTTONINFO info = new TBBUTTONINFO ();
info.cbSize = TBBUTTONINFO.sizeof;
info.dwMask = OS.TBIF_SIZE;
@@ -898,7 +898,7 @@ public void setWidth (int width) {
void updateImages (boolean enabled) {
if ((style & SWT.SEPARATOR) != 0) return;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
TBBUTTONINFO info = new TBBUTTONINFO ();
info.cbSize = TBBUTTONINFO.sizeof;
info.dwMask = OS.TBIF_IMAGE;
@@ -988,7 +988,7 @@ void updateImages (boolean enabled) {
info.dwMask |= OS.TBIF_SIZE;
info.cx = 0;
OS.SendMessage (hwnd, OS.TB_SETBUTTONINFO, id, info);
- int /*long*/ hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0);
+ long /*int*/ hFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0);
OS.SendMessage (hwnd, OS.WM_SETFONT, hFont, 0);
parent.layoutItems ();
}
@@ -1008,7 +1008,7 @@ int widgetStyle () {
return OS.BTNS_BUTTON;
}
-LRESULT wmCommandChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmCommandChild (long /*int*/ wParam, long /*int*/ lParam) {
if ((style & SWT.RADIO) != 0) {
if ((parent.getStyle () & SWT.NO_RADIO_GROUP) == 0) {
selectRadio ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java
index a28bba7e51..0da8f6f6fe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java
@@ -215,7 +215,7 @@ public boolean getVisible () {
checkWidget();
if (OS.IsWinCE) return false;
if (item != null) return visible;
- int /*long*/ hwndToolTip = hwndToolTip ();
+ long /*int*/ hwndToolTip = hwndToolTip ();
if (OS.SendMessage (hwndToolTip, OS.TTM_GETCURRENTTOOL, 0, 0) != 0) {
TOOLINFO lpti = new TOOLINFO ();
lpti.cbSize = TOOLINFO.sizeof;
@@ -226,7 +226,7 @@ public boolean getVisible () {
return false;
}
-int /*long*/ hwndToolTip () {
+long /*int*/ hwndToolTip () {
return (style & SWT.BALLOON) != 0 ? parent.balloonTipHandle () : parent.toolTipHandle ();
}
@@ -261,7 +261,7 @@ void releaseWidget () {
super.releaseWidget ();
if (item == null) {
if (autoHide) {
- int /*long*/ hwndToolTip = hwndToolTip ();
+ long /*int*/ hwndToolTip = hwndToolTip ();
if (OS.SendMessage (hwndToolTip, OS.TTM_GETCURRENTTOOL, 0, 0) != 0) {
TOOLINFO lpti = new TOOLINFO ();
lpti.cbSize = TOOLINFO.sizeof;
@@ -443,12 +443,12 @@ public void setVisible (boolean visible) {
if (OS.IsWinCE) return;
if (visible == getVisible ()) return;
if (item == null) {
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
TOOLINFO lpti = new TOOLINFO ();
lpti.cbSize = TOOLINFO.sizeof;
lpti.uId = id;
lpti.hwnd = hwnd;
- int /*long*/ hwndToolTip = hwndToolTip ();
+ long /*int*/ hwndToolTip = hwndToolTip ();
Shell shell = parent.getShell ();
if (text.length () != 0) {
int icon = OS.TTI_NONE;
@@ -465,7 +465,7 @@ public void setVisible (boolean visible) {
OS.SystemParametersInfo (OS.SPI_GETWORKAREA, 0, rect, 0);
maxWidth = (rect.right - rect.left) / 4;
} else {
- int /*long*/ hmonitor = OS.MonitorFromWindow (hwnd, OS.MONITOR_DEFAULTTONEAREST);
+ long /*int*/ hmonitor = OS.MonitorFromWindow (hwnd, OS.MONITOR_DEFAULTTONEAREST);
MONITORINFO lpmi = new MONITORINFO ();
lpmi.cbSize = MONITORINFO.sizeof;
OS.GetMonitorInfo (hmonitor, lpmi);
@@ -481,7 +481,7 @@ public void setVisible (boolean visible) {
nY = pt.y;
}
}
- int /*long*/ lParam = OS.MAKELPARAM (nX, nY);
+ long /*int*/ lParam = OS.MAKELPARAM (nX, nY);
OS.SendMessage (hwndToolTip, OS.TTM_TRACKPOSITION, 0, lParam);
/*
@@ -497,7 +497,7 @@ public void setVisible (boolean visible) {
OS.GetClientRect (hwnd, rect);
OS.MapWindowPoints (hwnd, 0, rect, 2);
if (!OS.PtInRect (rect, pt)) {
- int /*long*/ hCursor = OS.GetCursor ();
+ long /*int*/ hCursor = OS.GetCursor ();
OS.SetCursor (0);
OS.SetCursorPos (rect.left, rect.top);
OS.SendMessage (hwndToolTip, OS.TTM_TRACKACTIVATE, 1, lpti);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java
index a181d6eb4f..8a95e01dae 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java
@@ -45,11 +45,11 @@ public class Tracker extends Widget {
boolean tracking, cancelled, stippled;
Rectangle [] rectangles = new Rectangle [0], proportions = rectangles;
Rectangle bounds;
- int /*long*/ resizeCursor;
+ long /*int*/ resizeCursor;
Cursor clientCursor;
int cursorOrientation = SWT.NONE;
boolean inEvent = false;
- int /*long*/ hwndTransparent, hwndOpaque, oldTransparentProc, oldOpaqueProc;
+ long /*int*/ hwndTransparent, hwndOpaque, oldTransparentProc, oldOpaqueProc;
int oldX, oldY;
static boolean IsVista = !OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0);
@@ -248,7 +248,7 @@ Point adjustResizeCursor () {
* the appropriate resize cursor.
*/
if (clientCursor == null) {
- int /*long*/ newCursor = 0;
+ long /*int*/ newCursor = 0;
switch (cursorOrientation) {
case SWT.UP:
newCursor = OS.LoadCursor (0, OS.IDC_SIZENS);
@@ -371,9 +371,9 @@ void drawRectangles (Rectangle [] rects, boolean stippled) {
return;
}
int bandWidth = 1;
- int /*long*/ hwndTrack = parent == null ? OS.GetDesktopWindow () : parent.handle;
- int /*long*/ hDC = OS.GetDCEx (hwndTrack, 0, OS.DCX_CACHE);
- int /*long*/ hBitmap = 0, hBrush = 0, oldBrush = 0;
+ long /*int*/ hwndTrack = parent == null ? OS.GetDesktopWindow () : parent.handle;
+ long /*int*/ hDC = OS.GetDCEx (hwndTrack, 0, OS.DCX_CACHE);
+ long /*int*/ hBitmap = 0, hBrush = 0, oldBrush = 0;
if (stippled) {
bandWidth = 3;
byte [] bits = {-86, 0, 85, 0, -86, 0, 85, 0, -86, 0, 85, 0, -86, 0, 85, 0};
@@ -513,7 +513,7 @@ public boolean open () {
null);
OS.SetLayeredWindowAttributes (hwndOpaque, 0xFFFFFF, (byte)0xFF, OS.LWA_COLORKEY | OS.LWA_ALPHA);
newProc = new Callback (this, "transparentProc", 4); //$NON-NLS-1$
- int /*long*/ newProcAddress = newProc.getAddress ();
+ long /*int*/ newProcAddress = newProc.getAddress ();
if (newProcAddress == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
oldTransparentProc = OS.GetWindowLongPtr (hwndTransparent, OS.GWLP_WNDPROC);
OS.SetWindowLongPtr (hwndTransparent, OS.GWLP_WNDPROC, newProcAddress);
@@ -542,7 +542,7 @@ public boolean open () {
OS.GetModuleHandle (null),
null);
newProc = new Callback (this, "transparentProc", 4); //$NON-NLS-1$
- int /*long*/ newProcAddress = newProc.getAddress ();
+ long /*int*/ newProcAddress = newProc.getAddress ();
if (newProcAddress == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
oldTransparentProc = OS.GetWindowLongPtr (hwndTransparent, OS.GWLP_WNDPROC);
OS.SetWindowLongPtr (hwndTransparent, OS.GWLP_WNDPROC, newProcAddress);
@@ -869,7 +869,7 @@ public void setStippled (boolean stippled) {
this.stippled = stippled;
}
-int /*long*/ transparentProc (int /*long*/ hwnd, int /*long*/ msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ transparentProc (long /*int*/ hwnd, long /*int*/ msg, long /*int*/ wParam, long /*int*/ lParam) {
switch ((int)/*64*/msg) {
/*
* We typically do not want to answer that the transparent window is
@@ -896,9 +896,9 @@ int /*long*/ transparentProc (int /*long*/ hwnd, int /*long*/ msg, int /*long*/
case OS.WM_PAINT:
if (hwndOpaque == hwnd) {
PAINTSTRUCT ps = new PAINTSTRUCT();
- int /*long*/ hDC = OS.BeginPaint (hwnd, ps);
- int /*long*/ hBitmap = 0, hBrush = 0, oldBrush = 0;
- int /*long*/ transparentBrush = OS.CreateSolidBrush(0xFFFFFF);
+ long /*int*/ hDC = OS.BeginPaint (hwnd, ps);
+ long /*int*/ hBitmap = 0, hBrush = 0, oldBrush = 0;
+ long /*int*/ transparentBrush = OS.CreateSolidBrush(0xFFFFFF);
oldBrush = OS.SelectObject (hDC, transparentBrush);
OS.PatBlt (hDC, ps.left, ps.top, ps.right - ps.left, ps.bottom - ps.top, OS.PATCOPY);
OS.SelectObject (hDC, oldBrush);
@@ -953,7 +953,7 @@ void update () {
}
}
-LRESULT wmKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.wmKeyDown (hwnd, wParam, lParam);
if (result != null) return result;
boolean isMirrored = parent != null && (parent.style & SWT.MIRRORED) != 0;
@@ -1087,7 +1087,7 @@ LRESULT wmKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam)
return result;
}
-LRESULT wmSysKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmSysKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.wmSysKeyDown (hwnd, wParam, lParam);
if (result != null) return result;
cancelled = true;
@@ -1095,7 +1095,7 @@ LRESULT wmSysKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lPara
return result;
}
-LRESULT wmMouse (int message, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmMouse (int message, long /*int*/ wParam, long /*int*/ lParam) {
boolean isMirrored = parent != null && (parent.style & SWT.MIRRORED) != 0;
int newPos = OS.GetMessagePos ();
int newX = OS.GET_X_LPARAM (newPos);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java
index 969b2595b9..d0bc4c0134 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java
@@ -245,7 +245,7 @@ public boolean getVisible () {
return visible;
}
-int /*long*/ messageProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ messageProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When the user clicks on the tray
* icon, another application may be the foreground window.
@@ -439,7 +439,7 @@ public void setImage (Image image) {
super.setImage (image);
if (image2 != null) image2.dispose ();
image2 = null;
- int /*long*/ hIcon = 0;
+ long /*int*/ hIcon = 0;
Image icon = image;
if (icon != null) {
switch (icon.type) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
index 71b64db533..c2f1d48474 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
@@ -82,9 +82,9 @@ public class Tree extends Composite {
TreeItem currentItem;
TreeColumn sortColumn;
RECT focusRect;
- int /*long*/ hwndParent, hwndHeader, hAnchor, hInsert, hSelect;
+ long /*int*/ hwndParent, hwndHeader, hAnchor, hInsert, hSelect;
int lastID;
- int /*long*/ hFirstIndexOf, hLastIndexOf;
+ long /*int*/ hFirstIndexOf, hLastIndexOf;
int lastIndexOf, itemCount, sortDirection;
boolean dragStarted, gestureCompleted, insertAfter, shrink, ignoreShrink;
boolean ignoreSelect, ignoreExpand, ignoreDeselect, ignoreResize;
@@ -94,8 +94,8 @@ public class Tree extends Composite {
boolean ignoreDrawSelection, ignoreDrawHot, ignoreFullSelection, explorerTheme;
boolean createdAsRTL;
int scrollWidth, selectionForeground;
- int /*long*/ headerToolTipHandle, itemToolTipHandle;
- int /*long*/ lastTimerID = -1;
+ long /*int*/ headerToolTipHandle, itemToolTipHandle;
+ long /*int*/ lastTimerID = -1;
int lastTimerCount;
static final boolean ENABLE_TVS_EX_FADEINOUTEXPANDOS = System.getProperty("org.eclipse.swt.internal.win32.enableFadeInOutExpandos") != null;
static final int TIMER_MAX_COUNT = 8;
@@ -108,9 +108,9 @@ public class Tree extends Composite {
static final int EXPLORER_EXTRA = 2;
static final int DRAG_IMAGE_SIZE = 301;
static final boolean EXPLORER_THEME = true;
- static final int /*long*/ TreeProc;
+ static final long /*int*/ TreeProc;
static final TCHAR TreeClass = new TCHAR (0, OS.WC_TREEVIEW, true);
- static final int /*long*/ HeaderProc;
+ static final long /*int*/ HeaderProc;
static final TCHAR HeaderClass = new TCHAR (0, OS.WC_HEADER, true);
static {
WNDCLASS lpWndClass = new WNDCLASS ();
@@ -240,7 +240,7 @@ void _addListener (int eventType, Listener listener) {
}
}
-TreeItem _getItem (int /*long*/ hItem) {
+TreeItem _getItem (long /*int*/ hItem) {
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM;
tvItem.hItem = hItem;
@@ -250,7 +250,7 @@ TreeItem _getItem (int /*long*/ hItem) {
return null;
}
-TreeItem _getItem (int /*long*/ hItem, int id) {
+TreeItem _getItem (long /*int*/ hItem, int id) {
if ((style & SWT.VIRTUAL) == 0) return items [id];
return id != -1 ? items [id] : new TreeItem (this, SWT.NONE, -1, -1, hItem);
}
@@ -355,14 +355,14 @@ public void addTreeListener(TreeListener listener) {
addListener (SWT.Collapse, typedListener);
}
-int /*long*/ borderHandle () {
+long /*int*/ borderHandle () {
return hwndParent != 0 ? hwndParent : handle;
}
-LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreCustomDraw) return null;
if (nmcd.left == nmcd.right) return new LRESULT (OS.CDRF_DODEFAULT);
- int /*long*/ hDC = nmcd.hdc;
+ long /*int*/ hDC = nmcd.hdc;
OS.RestoreDC (hDC, -1);
TreeItem item = getItem (nmcd);
@@ -477,7 +477,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long
}
}
draw = false;
- int /*long*/ hTheme = OS.OpenThemeData (handle, Display.TREEVIEW);
+ long /*int*/ hTheme = OS.OpenThemeData (handle, Display.TREEVIEW);
int iStateId = selected ? OS.TREIS_SELECTED : OS.TREIS_HOT;
if (OS.GetFocus () != handle && selected && !hot) iStateId = OS.TREIS_SELECTEDNOTFOCUS;
OS.DrawThemeBackground (hTheme, hDC, OS.TVP_TREEITEM, iStateId, pRect, pClipRect);
@@ -547,7 +547,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long
backgroundRect = rect;
}
int clrText = -1, clrTextBk = -1;
- int /*long*/ hFont = item.fontHandle (index);
+ long /*int*/ hFont = item.fontHandle (index);
if (selectionForeground != -1) clrText = selectionForeground;
if (OS.IsWindowEnabled (handle)) {
boolean drawForeground = false;
@@ -692,7 +692,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long
backgroundRect = selectionRect;
}
}
- int /*long*/ hTheme = OS.OpenThemeData (handle, Display.TREEVIEW);
+ long /*int*/ hTheme = OS.OpenThemeData (handle, Display.TREEVIEW);
int iStateId = selected ? OS.TREIS_SELECTED : OS.TREIS_HOT;
if (OS.GetFocus () != handle && selected && !hot) iStateId = OS.TREIS_SELECTEDNOTFOCUS;
OS.DrawThemeBackground (hTheme, hDC, OS.TVP_TREEITEM, iStateId, pRect, backgroundRect);
@@ -885,7 +885,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long
if (handle == OS.GetFocus ()) {
int uiState = (int)/*64*/OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0);
if ((uiState & OS.UISF_HIDEFOCUS) == 0) {
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
if (hItem == item.handle) {
if (!ignoreDrawFocus && findImageControl () != null) {
if ((style & SWT.FULL_SELECTION) != 0) {
@@ -909,7 +909,7 @@ LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long
return new LRESULT (OS.CDRF_DODEFAULT);
}
-LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) {
/*
* Even when custom draw is being ignored, the font needs
* to be selected into the HDC so that the item bounds are
@@ -927,9 +927,9 @@ LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*
* COMCTL32.DLL,
*/
if (item == null) return null;
- int /*long*/ hDC = nmcd.hdc;
+ long /*int*/ hDC = nmcd.hdc;
int index = hwndHeader != 0 ? (int)/*64*/OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0) : 0;
- int /*long*/ hFont = item.fontHandle (index);
+ long /*int*/ hFont = item.fontHandle (index);
if (hFont != -1) OS.SelectObject (hDC, hFont);
if (ignoreCustomDraw || nmcd.left == nmcd.right) {
return new LRESULT (hFont == -1 ? OS.CDRF_DODEFAULT : OS.CDRF_NEWFONT);
@@ -1090,7 +1090,7 @@ LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*
}
pRect.left -= EXPLORER_EXTRA;
pClipRect.left -= EXPLORER_EXTRA;
- int /*long*/ hTheme = OS.OpenThemeData (handle, Display.TREEVIEW);
+ long /*int*/ hTheme = OS.OpenThemeData (handle, Display.TREEVIEW);
int iStateId = selected ? OS.TREIS_SELECTED : OS.TREIS_HOT;
if (OS.GetFocus () != handle && selected && !hot) iStateId = OS.TREIS_SELECTEDNOTFOCUS;
OS.DrawThemeBackground (hTheme, hDC, OS.TVP_TREEITEM, iStateId, pRect, pClipRect);
@@ -1305,7 +1305,7 @@ LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*
}
OS.SaveDC (hDC);
if (clipRect != null) {
- int /*long*/ hRgn = OS.CreateRectRgn (clipRect.left, clipRect.top, clipRect.right, clipRect.bottom);
+ long /*int*/ hRgn = OS.CreateRectRgn (clipRect.left, clipRect.top, clipRect.right, clipRect.bottom);
POINT lpPoint = new POINT ();
OS.GetWindowOrgEx (hDC, lpPoint);
OS.OffsetRgn (hRgn, -lpPoint.x, -lpPoint.y);
@@ -1315,7 +1315,7 @@ LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*
return result;
}
-LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) {
if (ignoreCustomDraw) return null;
if (OS.IsWindowVisible (handle)) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
@@ -1340,7 +1340,7 @@ LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ l
* NOTE: This problem only happens on Vista during
* WM_NOTIFY with NM_CUSTOMDRAW and CDDS_POSTPAINT.
*/
- int /*long*/ hItem = 0;
+ long /*int*/ hItem = 0;
if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) {
hItem = getBottomItem ();
} else {
@@ -1364,7 +1364,7 @@ LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ l
}
}
if (linesVisible) {
- int /*long*/ hDC = nmcd.hdc;
+ long /*int*/ hDC = nmcd.hdc;
if (hwndHeader != 0) {
int x = 0;
RECT rect = new RECT ();
@@ -1396,7 +1396,7 @@ LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ l
* NOTE: This problem only happens on Vista during
* WM_NOTIFY with NM_CUSTOMDRAW and CDDS_POSTPAINT.
*/
- int /*long*/ hItem = 0;
+ long /*int*/ hItem = 0;
if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) {
hItem = getBottomItem ();
} else {
@@ -1425,7 +1425,7 @@ LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ l
return new LRESULT (OS.CDRF_DODEFAULT);
}
-LRESULT CDDS_PREPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT CDDS_PREPAINT (NMTVCUSTOMDRAW nmcd, long /*int*/ wParam, long /*int*/ lParam) {
if (explorerTheme) {
if ((OS.IsWindowEnabled (handle) && hooks (SWT.EraseItem)) || findImageControl () != null) {
RECT rect = new RECT ();
@@ -1436,7 +1436,7 @@ LRESULT CDDS_PREPAINT (NMTVCUSTOMDRAW nmcd, int /*long*/ wParam, int /*long*/ lP
return new LRESULT (OS.CDRF_NOTIFYITEMDRAW | OS.CDRF_NOTIFYPOSTPAINT);
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
if (hwndParent != 0 && hwnd == hwndParent) {
return OS.DefWindowProc (hwnd, msg, wParam, lParam);
@@ -1455,7 +1455,7 @@ int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, in
* only the focus is assigned.
*/
if ((style & SWT.SINGLE) != 0) break;
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
if (hItem == 0) {
hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0);
if (hItem != 0) {
@@ -1476,7 +1476,7 @@ int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, in
break;
}
}
- int /*long*/ hItem = 0;
+ long /*int*/ hItem = 0;
boolean redraw = false;
switch (msg) {
/* Keyboard messages */
@@ -1531,7 +1531,7 @@ int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, in
break;
}
}
- int /*long*/ code = OS.CallWindowProc (TreeProc, hwnd, msg, wParam, lParam);
+ long /*int*/ code = OS.CallWindowProc (TreeProc, hwnd, msg, wParam, lParam);
switch (msg) {
/* Keyboard messages */
case OS.WM_KEYDOWN:
@@ -1635,7 +1635,7 @@ boolean checkData (TreeItem item, int index, boolean redraw) {
* is to detect that the top item has changed and redraw
* the entire tree.
*/
- int /*long*/ hTopItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0);
+ long /*int*/ hTopItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0);
sendEvent (SWT.SetData, event);
//widget could be disposed at this point
currentItem = oldItem;
@@ -1648,11 +1648,11 @@ boolean checkData (TreeItem item, int index, boolean redraw) {
return true;
}
-boolean checkHandle (int /*long*/ hwnd) {
+boolean checkHandle (long /*int*/ hwnd) {
return hwnd == handle || (hwndParent != 0 && hwnd == hwndParent) || (hwndHeader != 0 && hwnd == hwndHeader);
}
-boolean checkScroll (int /*long*/ hItem) {
+boolean checkScroll (long /*int*/ hItem) {
/*
* Feature in Windows. If redraw is turned off using WM_SETREDRAW
* and a tree item that is not a child of the first root is selected or
@@ -1665,8 +1665,8 @@ boolean checkScroll (int /*long*/ hItem) {
* callers of this method.
*/
if (getDrawing ()) return false;
- int /*long*/ hRoot = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
- int /*long*/ hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hItem);
+ long /*int*/ hRoot = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
+ long /*int*/ hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hItem);
while (hParent != hRoot && hParent != 0) {
hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hParent);
}
@@ -1702,7 +1702,7 @@ protected void checkSubclass () {
*/
public void clear (int index, boolean all) {
checkWidget ();
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
if (hItem == 0) error (SWT.ERROR_INVALID_RANGE);
hItem = findItem (hItem, index);
if (hItem == 0) error (SWT.ERROR_INVALID_RANGE);
@@ -1715,7 +1715,7 @@ public void clear (int index, boolean all) {
}
}
-void clear (int /*long*/ hItem, TVITEM tvItem) {
+void clear (long /*int*/ hItem, TVITEM tvItem) {
tvItem.hItem = hItem;
TreeItem item = null;
if (OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem) != 0) {
@@ -1749,7 +1749,7 @@ void clear (int /*long*/ hItem, TVITEM tvItem) {
*/
public void clearAll (boolean all) {
checkWidget ();
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
if (hItem == 0) return;
if (all) {
boolean redraw = false;
@@ -1768,18 +1768,18 @@ public void clearAll (boolean all) {
}
}
-void clearAll (int /*long*/ hItem, TVITEM tvItem, boolean all) {
+void clearAll (long /*int*/ hItem, TVITEM tvItem, boolean all) {
while (hItem != 0) {
clear (hItem, tvItem);
if (all) {
- int /*long*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem);
+ long /*int*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem);
clearAll (hFirstItem, tvItem, all);
}
hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem);
}
}
-int /*long*/ CompareFunc (int /*long*/ lParam1, int /*long*/ lParam2, int /*long*/ lParamSort) {
+long /*int*/ CompareFunc (long /*int*/ lParam1, long /*int*/ lParam2, long /*int*/ lParamSort) {
TreeItem item1 = items [(int)/*64*/lParam1], item2 = items [(int)/*64*/lParam2];
String text1 = item1.getText ((int)/*64*/lParamSort), text2 = item2.getText ((int)/*64*/lParamSort);
return sortDirection == SWT.UP ? text1.compareTo (text2) : text2.compareTo (text1);
@@ -1800,7 +1800,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
height += rect.bottom - rect.top;
}
RECT rect = new RECT ();
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
while (hItem != 0) {
if ((style & SWT.VIRTUAL) == 0 && !painted) {
TVITEM tvItem = new TVITEM ();
@@ -1890,7 +1890,7 @@ void createHandle () {
* The control will not destroy a font that it did not
* create.
*/
- int /*long*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT);
+ long /*int*/ hFont = OS.GetStockObject (OS.SYSTEM_FONT);
OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0);
createdAsRTL = (style & SWT.RIGHT_TO_LEFT) != 0;
@@ -1997,8 +1997,8 @@ void createItem (TreeColumn column, int index) {
* if is not possible to set the text at a later time.
* The fix is to insert the item with an empty string.
*/
- int /*long*/ hHeap = OS.GetProcessHeap ();
- int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof);
+ long /*int*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, TCHAR.sizeof);
HDITEM hdItem = new HDITEM ();
hdItem.mask = OS.HDI_TEXT | OS.HDI_FORMAT;
hdItem.pszText = pszText;
@@ -2059,7 +2059,7 @@ void createItem (TreeColumn column, int index) {
}
}
-void createItem (TreeItem item, int /*long*/ hParent, int /*long*/ hInsertAfter, int /*long*/ hItem) {
+void createItem (TreeItem item, long /*int*/ hParent, long /*int*/ hInsertAfter, long /*int*/ hItem) {
int id = -1;
if (item != null) {
id = lastID < items.length ? lastID : 0;
@@ -2084,8 +2084,8 @@ void createItem (TreeItem item, int /*long*/ hParent, int /*long*/ hInsertAfter,
}
lastID = id + 1;
}
- int /*long*/ hNewItem = 0;
- int /*long*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hParent);
+ long /*int*/ hNewItem = 0;
+ long /*int*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hParent);
boolean fixParent = hFirstItem == 0;
if (hItem == 0) {
TVINSERTSTRUCT tvInsert = new TVINSERTSTRUCT ();
@@ -2164,7 +2164,7 @@ void createItem (TreeItem item, int /*long*/ hParent, int /*long*/ hInsertAfter,
OS.OffsetRect (damageRect, 0, rect.bottom - rect.top);
OS.InvalidateRect (handle, damageRect, true);
} else {
- int /*long*/ rgn = OS.CreateRectRgn (0, 0, 0, 0);
+ long /*int*/ rgn = OS.CreateRectRgn (0, 0, 0, 0);
int result = OS.GetUpdateRgn (handle, rgn, true);
if (result != OS.NULLREGION) {
OS.OffsetRgn (rgn, 0, rect.bottom - rect.top);
@@ -2264,7 +2264,7 @@ void createParent () {
if (hwndHeader == 0) error (SWT.ERROR_NO_HANDLES);
OS.SetWindowLongPtr (hwndHeader, OS.GWLP_ID, hwndHeader);
if (OS.IsDBLocale) {
- int /*long*/ hIMC = OS.ImmGetContext (handle);
+ long /*int*/ hIMC = OS.ImmGetContext (handle);
OS.ImmAssociateContext (hwndParent, hIMC);
OS.ImmAssociateContext (hwndHeader, hIMC);
OS.ImmReleaseContext (handle, hIMC);
@@ -2277,9 +2277,9 @@ void createParent () {
// OS.SetWindowLong (handle, OS.GWL_EXSTYLE, oldExStyle);
// }
// }
- int /*long*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
+ long /*int*/ hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (hFont != 0) OS.SendMessage (hwndHeader, OS.WM_SETFONT, hFont, 0);
- int /*long*/ hwndInsertAfter = OS.GetWindow (handle, OS.GW_HWNDPREV);
+ long /*int*/ hwndInsertAfter = OS.GetWindow (handle, OS.GW_HWNDPREV);
int flags = OS.SWP_NOSIZE | OS.SWP_NOMOVE | OS.SWP_NOACTIVATE;
SetWindowPos (hwndParent, hwndInsertAfter, 0, 0, 0, 0, flags);
SCROLLINFO info = new SCROLLINFO ();
@@ -2296,7 +2296,7 @@ void createParent () {
if ((oldStyle & OS.WS_VISIBLE) != 0) {
OS.ShowWindow (hwndParent, OS.SW_SHOW);
}
- int /*long*/ hwndFocus = OS.GetFocus ();
+ long /*int*/ hwndFocus = OS.GetFocus ();
if (hwndFocus == handle) OS.SetFocus (hwndParent);
OS.SetParent (handle, hwndParent);
if (hwndFocus == handle) OS.SetFocus (handle);
@@ -2321,13 +2321,13 @@ void deregister () {
if (hwndHeader != 0) display.removeControl (hwndHeader);
}
-void deselect (int /*long*/ hItem, TVITEM tvItem, int /*long*/ hIgnoreItem) {
+void deselect (long /*int*/ hItem, TVITEM tvItem, long /*int*/ hIgnoreItem) {
while (hItem != 0) {
if (hItem != hIgnoreItem) {
tvItem.hItem = hItem;
OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem);
}
- int /*long*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem);
+ long /*int*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem);
deselect (hFirstItem, tvItem, hIgnoreItem);
hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem);
}
@@ -2375,16 +2375,16 @@ public void deselectAll () {
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE;
tvItem.stateMask = OS.TVIS_SELECTED;
if ((style & SWT.SINGLE) != 0) {
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
if (hItem != 0) {
tvItem.hItem = hItem;
OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem);
}
} else {
- int /*long*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC);
+ long /*int*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC);
OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc);
if ((style & SWT.VIRTUAL) != 0) {
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
deselect (hItem, tvItem, 0);
} else {
for (int i=0; i= OS.VERSION (6, 0)) {
- int /*long*/ hwndToolTip = OS.SendMessage (handle, OS.TVM_GETTOOLTIPS, 0, 0);
+ long /*int*/ hwndToolTip = OS.SendMessage (handle, OS.TVM_GETTOOLTIPS, 0, 0);
if (hwndToolTip != 0) OS.SendMessage (hwndToolTip, OS.TTM_POP, 0 ,0);
}
@@ -2704,8 +2704,8 @@ boolean findCell (int x, int y, TreeItem [] item, int [] index, RECT [] cellRect
POINT pt = new POINT ();
pt.x = x;
pt.y = y;
- int /*long*/ hDC = OS.GetDC (handle);
- int /*long*/ oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
+ long /*int*/ hDC = OS.GetDC (handle);
+ long /*int*/ oldFont = 0, newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
RECT rect = new RECT ();
if (hwndParent != 0) {
@@ -2720,7 +2720,7 @@ boolean findCell (int x, int y, TreeItem [] item, int [] index, RECT [] cellRect
index [0] = 0;
boolean quit = false;
while (index [0] < count && !quit) {
- int /*long*/ hFont = item [0].fontHandle (order [index [0]]);
+ long /*int*/ hFont = item [0].fontHandle (order [index [0]]);
if (hFont != -1) hFont = OS.SelectObject (hDC, hFont);
cellRect [0] = item [0].getBounds (order [index [0]], true, false, true, false, true, hDC);
if (cellRect [0].left > rect.right) {
@@ -2754,7 +2754,7 @@ boolean findCell (int x, int y, TreeItem [] item, int [] index, RECT [] cellRect
return found;
}
-int findIndex (int /*long*/ hFirstItem, int /*long*/ hItem) {
+int findIndex (long /*int*/ hFirstItem, long /*int*/ hItem) {
if (hFirstItem == 0) return -1;
if (hFirstItem == hFirstIndexOf) {
if (hFirstIndexOf == hItem) {
@@ -2762,12 +2762,12 @@ int findIndex (int /*long*/ hFirstItem, int /*long*/ hItem) {
return lastIndexOf = 0;
}
if (hLastIndexOf == hItem) return lastIndexOf;
- int /*long*/ hPrevItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUS, hLastIndexOf);
+ long /*int*/ hPrevItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUS, hLastIndexOf);
if (hPrevItem == hItem) {
hLastIndexOf = hPrevItem;
return --lastIndexOf;
}
- int /*long*/ hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hLastIndexOf);
+ long /*int*/ hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hLastIndexOf);
if (hNextItem == hItem) {
hLastIndexOf = hNextItem;
return ++lastIndexOf;
@@ -2793,7 +2793,7 @@ int findIndex (int /*long*/ hFirstItem, int /*long*/ hItem) {
return -1;
}
int index = 0;
- int /*long*/ hNextItem = hFirstItem;
+ long /*int*/ hNextItem = hFirstItem;
while (hNextItem != 0 && hNextItem != hItem) {
hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hNextItem);
index++;
@@ -2807,11 +2807,11 @@ int findIndex (int /*long*/ hFirstItem, int /*long*/ hItem) {
return -1;
}
-Widget findItem (int /*long*/ hItem) {
+Widget findItem (long /*int*/ hItem) {
return _getItem (hItem);
}
-int /*long*/ findItem (int /*long*/ hFirstItem, int index) {
+long /*int*/ findItem (long /*int*/ hFirstItem, int index) {
if (hFirstItem == 0) return 0;
if (hFirstItem == hFirstIndexOf) {
if (index == 0) {
@@ -2829,7 +2829,7 @@ int /*long*/ findItem (int /*long*/ hFirstItem, int index) {
}
if (index < lastIndexOf) {
int previousIndex = lastIndexOf - 1;
- int /*long*/ hPrevItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUS, hLastIndexOf);
+ long /*int*/ hPrevItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUS, hLastIndexOf);
while (hPrevItem != 0 && index < previousIndex) {
hPrevItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUS, hPrevItem);
--previousIndex;
@@ -2840,7 +2840,7 @@ int /*long*/ findItem (int /*long*/ hFirstItem, int index) {
}
} else {
int nextIndex = lastIndexOf + 1;
- int /*long*/ hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hLastIndexOf);
+ long /*int*/ hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hLastIndexOf);
while (hNextItem != 0 && nextIndex < index) {
hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hNextItem);
nextIndex++;
@@ -2853,7 +2853,7 @@ int /*long*/ findItem (int /*long*/ hFirstItem, int index) {
return 0;
}
int nextIndex = 0;
- int /*long*/ hNextItem = hFirstItem;
+ long /*int*/ hNextItem = hFirstItem;
while (hNextItem != 0 && nextIndex < index) {
hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hNextItem);
nextIndex++;
@@ -2869,7 +2869,7 @@ int /*long*/ findItem (int /*long*/ hFirstItem, int index) {
TreeItem getFocusItem () {
// checkWidget ();
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
return hItem != 0 ? _getItem (hItem) : null;
}
@@ -2941,12 +2941,12 @@ Point getImageSize () {
return new Point (0, getItemHeight ());
}
-int /*long*/ getBottomItem () {
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0);
+long /*int*/ getBottomItem () {
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0);
if (hItem == 0) return 0;
int index = 0, count = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETVISIBLECOUNT, 0, 0);
while (index <= count) {
- int /*long*/ hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hItem);
+ long /*int*/ hNextItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hItem);
if (hNextItem == 0) return hItem;
hItem = hNextItem;
index++;
@@ -3102,9 +3102,9 @@ public TreeColumn [] getColumns () {
public TreeItem getItem (int index) {
checkWidget ();
if (index < 0) error (SWT.ERROR_INVALID_RANGE);
- int /*long*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
+ long /*int*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
if (hFirstItem == 0) error (SWT.ERROR_INVALID_RANGE);
- int /*long*/ hItem = findItem (hFirstItem, index);
+ long /*int*/ hItem = findItem (hFirstItem, index);
if (hItem == 0) error (SWT.ERROR_INVALID_RANGE);
return _getItem (hItem);
}
@@ -3193,14 +3193,14 @@ public TreeItem getItem (Point point) {
*/
public int getItemCount () {
checkWidget ();
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
if (hItem == 0) return 0;
return getItemCount (hItem);
}
-int getItemCount (int /*long*/ hItem) {
+int getItemCount (long /*int*/ hItem) {
int count = 0;
- int /*long*/ hFirstItem = hItem;
+ long /*int*/ hFirstItem = hItem;
if (hItem == hFirstIndexOf) {
if (itemCount != -1) return itemCount;
hFirstItem = hLastIndexOf;
@@ -3249,14 +3249,14 @@ public int getItemHeight () {
*/
public TreeItem [] getItems () {
checkWidget ();
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
if (hItem == 0) return new TreeItem [0];
return getItems (hItem);
}
-TreeItem [] getItems (int /*long*/ hTreeItem) {
+TreeItem [] getItems (long /*int*/ hTreeItem) {
int count = 0;
- int /*long*/ hItem = hTreeItem;
+ long /*int*/ hItem = hTreeItem;
while (hItem != 0) {
hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem);
count++;
@@ -3312,7 +3312,7 @@ public boolean getLinesVisible () {
return linesVisible;
}
-int /*long*/ getNextSelection (int /*long*/ hItem, TVITEM tvItem) {
+long /*int*/ getNextSelection (long /*int*/ hItem, TVITEM tvItem) {
while (hItem != 0) {
int state = 0;
if (OS.IsWinCE) {
@@ -3323,8 +3323,8 @@ int /*long*/ getNextSelection (int /*long*/ hItem, TVITEM tvItem) {
state = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMSTATE, hItem, OS.TVIS_SELECTED);
}
if ((state & OS.TVIS_SELECTED) != 0) return hItem;
- int /*long*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem);
- int /*long*/ hSelected = getNextSelection (hFirstItem, tvItem);
+ long /*int*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem);
+ long /*int*/ hSelected = getNextSelection (hFirstItem, tvItem);
if (hSelected != 0) return hSelected;
hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem);
}
@@ -3348,7 +3348,7 @@ public TreeItem getParentItem () {
return null;
}
-int getSelection (int /*long*/ hItem, TVITEM tvItem, TreeItem [] selection, int index, int count, boolean bigSelection, boolean all) {
+int getSelection (long /*int*/ hItem, TVITEM tvItem, TreeItem [] selection, int index, int count, boolean bigSelection, boolean all) {
while (hItem != 0) {
if (OS.IsWinCE || bigSelection) {
tvItem.hItem = hItem;
@@ -3372,7 +3372,7 @@ int getSelection (int /*long*/ hItem, TVITEM tvItem, TreeItem [] selection, int
}
if (index == count) break;
if (all) {
- int /*long*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem);
+ long /*int*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem);
if ((index = getSelection (hFirstItem, tvItem, selection, index, count, bigSelection, all)) == count) {
break;
}
@@ -3403,7 +3403,7 @@ int getSelection (int /*long*/ hItem, TVITEM tvItem, TreeItem [] selection, int
public TreeItem [] getSelection () {
checkWidget ();
if ((style & SWT.SINGLE) != 0) {
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
if (hItem == 0) return new TreeItem [0];
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM | OS.TVIF_STATE;
@@ -3414,12 +3414,12 @@ public TreeItem [] getSelection () {
}
int count = 0;
TreeItem [] guess = new TreeItem [(style & SWT.VIRTUAL) != 0 ? 8 : 1];
- int /*long*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC);
+ long /*int*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC);
OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc);
if ((style & SWT.VIRTUAL) != 0) {
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM | OS.TVIF_STATE;
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
count = getSelection (hItem, tvItem, guess, 0, -1, false, true);
} else {
TVITEM tvItem = null;
@@ -3430,7 +3430,7 @@ public TreeItem [] getSelection () {
for (int i=0; i itemCount / 2;
if (count != getSelection (hItem, tvItem, result, 0, count, bigSelection, false)) {
@@ -3480,7 +3480,7 @@ public TreeItem [] getSelection () {
public int getSelectionCount () {
checkWidget ();
if ((style & SWT.SINGLE) != 0) {
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
if (hItem == 0) return 0;
int state = 0;
if (OS.IsWinCE) {
@@ -3495,7 +3495,7 @@ public int getSelectionCount () {
return (state & OS.TVIS_SELECTED) == 0 ? 0 : 1;
}
int count = 0;
- int /*long*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC);
+ long /*int*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC);
TVITEM tvItem = null;
if (OS.IsWinCE) {
tvItem = new TVITEM ();
@@ -3503,13 +3503,13 @@ public int getSelectionCount () {
}
OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc);
if ((style & SWT.VIRTUAL) != 0) {
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
count = getSelection (hItem, tvItem, null, 0, -1, false, true);
} else {
for (int i=0; i= OS.VERSION (6, 0)) {
OS.SetScrollInfo (handle, OS.SB_VERT, vInfo, true);
}
- int /*long*/ vThumb = OS.MAKELPARAM (OS.SB_THUMBPOSITION, vInfo.nPos);
+ long /*int*/ vThumb = OS.MAKELPARAM (OS.SB_THUMBPOSITION, vInfo.nPos);
OS.SendMessage (handle, OS.WM_VSCROLL, vThumb, 0);
if (redraw) {
OS.DefWindowProc (handle, OS.WM_SETREDRAW, 1, 0);
@@ -4338,9 +4338,9 @@ public void selectAll () {
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE;
tvItem.state = OS.TVIS_SELECTED;
tvItem.stateMask = OS.TVIS_SELECTED;
- int /*long*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC);
+ long /*int*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC);
OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc);
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
select (hItem, tvItem);
OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, oldProc);
}
@@ -4374,7 +4374,7 @@ Event sendEraseItemEvent (TreeItem item, NMTTCUSTOMDRAW nmcd, int column, RECT c
return event;
}
-Event sendMeasureItemEvent (TreeItem item, int index, int /*long*/ hDC, int detail) {
+Event sendMeasureItemEvent (TreeItem item, int index, long /*int*/ hDC, int detail) {
RECT itemRect = item.getBounds (index, true, true, false, false, false, hDC);
int nSavedDC = OS.SaveDC (hDC);
GCData data = new GCData ();
@@ -4434,7 +4434,7 @@ Event sendPaintItemEvent (TreeItem item, NMTTCUSTOMDRAW nmcd, int column, RECT i
return event;
}
-void setBackgroundImage (int /*long*/ hBitmap) {
+void setBackgroundImage (long /*int*/ hBitmap) {
super.setBackgroundImage (hBitmap);
if (hBitmap != 0) {
/*
@@ -4507,7 +4507,7 @@ void setCursor () {
* is IDC_ARROW.
*/
Cursor cursor = findCursor ();
- int /*long*/ hCursor = cursor == null ? OS.LoadCursor (0, OS.IDC_ARROW) : cursor.handle;
+ long /*int*/ hCursor = cursor == null ? OS.LoadCursor (0, OS.IDC_ARROW) : cursor.handle;
OS.SetCursor (hCursor);
}
@@ -4588,7 +4588,7 @@ void setCheckboxImageList () {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
flags |= OS.ILC_COLOR32;
} else {
- int /*long*/ hDC = OS.GetDC (handle);
+ long /*int*/ hDC = OS.GetDC (handle);
int bits = OS.GetDeviceCaps (hDC, OS.BITSPIXEL);
int planes = OS.GetDeviceCaps (hDC, OS.PLANES);
OS.ReleaseDC (handle, hDC);
@@ -4606,11 +4606,11 @@ void setCheckboxImageList () {
}
if ((style & SWT.RIGHT_TO_LEFT) != 0) flags |= OS.ILC_MIRROR;
int height = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETITEMHEIGHT, 0, 0), width = height;
- int /*long*/ hStateList = OS.ImageList_Create (width, height, flags, count, count);
- int /*long*/ hDC = OS.GetDC (handle);
- int /*long*/ memDC = OS.CreateCompatibleDC (hDC);
- int /*long*/ hBitmap = OS.CreateCompatibleBitmap (hDC, width * count, height);
- int /*long*/ hOldBitmap = OS.SelectObject (memDC, hBitmap);
+ long /*int*/ hStateList = OS.ImageList_Create (width, height, flags, count, count);
+ long /*int*/ hDC = OS.GetDC (handle);
+ long /*int*/ memDC = OS.CreateCompatibleDC (hDC);
+ long /*int*/ hBitmap = OS.CreateCompatibleBitmap (hDC, width * count, height);
+ long /*int*/ hOldBitmap = OS.SelectObject (memDC, hBitmap);
RECT rect = new RECT ();
OS.SetRect (rect, 0, 0, width * count, height);
/*
@@ -4630,10 +4630,10 @@ void setCheckboxImageList () {
clrBackground = 0x0200FF00;
}
}
- int /*long*/ hBrush = OS.CreateSolidBrush (clrBackground);
+ long /*int*/ hBrush = OS.CreateSolidBrush (clrBackground);
OS.FillRect (memDC, rect, hBrush);
OS.DeleteObject (hBrush);
- int /*long*/ oldFont = OS.SelectObject (hDC, defaultFont ());
+ long /*int*/ oldFont = OS.SelectObject (hDC, defaultFont ());
TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
OS.GetTextMetrics (hDC, tm);
OS.SelectObject (hDC, oldFont);
@@ -4642,7 +4642,7 @@ void setCheckboxImageList () {
int left = (width - itemWidth) / 2, top = (height - itemHeight) / 2 + 1;
OS.SetRect (rect, left + width, top, left + width + itemWidth, top + itemHeight);
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
- int /*long*/ hTheme = display.hButtonTheme ();
+ long /*int*/ hTheme = display.hButtonTheme ();
OS.DrawThemeBackground (hTheme, memDC, OS.BP_CHECKBOX, OS.CBS_UNCHECKEDNORMAL, rect, null);
rect.left += width; rect.right += width;
OS.DrawThemeBackground (hTheme, memDC, OS.BP_CHECKBOX, OS.CBS_CHECKEDNORMAL, rect, null);
@@ -4668,7 +4668,7 @@ void setCheckboxImageList () {
OS.ImageList_AddMasked (hStateList, hBitmap, clrBackground);
}
OS.DeleteObject (hBitmap);
- int /*long*/ hOldStateList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_STATE, 0);
+ long /*int*/ hOldStateList = OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_STATE, 0);
OS.SendMessage (handle, OS.TVM_SETIMAGELIST, OS.TVSIL_STATE, hStateList);
if (hOldStateList != 0) OS.ImageList_Destroy (hOldStateList);
}
@@ -4753,7 +4753,7 @@ public void setRedraw (boolean redraw) {
* when redraw is turned on and there are no items in
* the tree.
*/
- int /*long*/ hItem = 0;
+ long /*int*/ hItem = 0;
if (redraw) {
if (drawCount == 1) {
int count = (int)/*64*/OS.SendMessage (handle, OS.TVM_GETCOUNT, 0, 0);
@@ -4822,7 +4822,7 @@ void setScrollWidth (int width) {
horizontalBar.setPageIncrement (info.nPage);
}
OS.GetClientRect (hwndParent, rect);
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
HDLAYOUT playout = new HDLAYOUT ();
playout.prc = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, RECT.sizeof);
playout.pwpos = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, WINDOWPOS.sizeof);
@@ -4843,7 +4843,7 @@ void setScrollWidth (int width) {
ignoreResize = oldIgnore;
}
-void setSelection (int /*long*/ hItem, TVITEM tvItem, TreeItem [] selection) {
+void setSelection (long /*int*/ hItem, TVITEM tvItem, TreeItem [] selection) {
while (hItem != 0) {
int index = 0;
while (index < selection.length) {
@@ -4864,7 +4864,7 @@ void setSelection (int /*long*/ hItem, TVITEM tvItem, TreeItem [] selection) {
OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem);
}
}
- int /*long*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem);
+ long /*int*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hItem);
setSelection (hFirstItem, tvItem, selection);
hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXT, hItem);
}
@@ -4933,8 +4933,8 @@ public void setSelection (TreeItem [] items) {
TreeItem item = items [0];
if (item != null) {
if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
- int /*long*/ hOldItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
- int /*long*/ hNewItem = hAnchor = item.handle;
+ long /*int*/ hOldItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hNewItem = hAnchor = item.handle;
/*
* Bug in Windows. When TVM_SELECTITEM is used to select and
@@ -4958,7 +4958,7 @@ public void setSelection (TreeItem [] items) {
ignoreSelect = false;
if (OS.SendMessage (handle, OS.TVM_GETVISIBLECOUNT, 0, 0) == 0) {
OS.SendMessage (handle, OS.TVM_SELECTITEM, OS.TVGN_FIRSTVISIBLE, hNewItem);
- int /*long*/ hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hNewItem);
+ long /*int*/ hParent = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hNewItem);
if (hParent == 0) OS.SendMessage (handle, OS.WM_HSCROLL, OS.SB_TOP, 0);
}
if (fixScroll) {
@@ -4989,10 +4989,10 @@ public void setSelection (TreeItem [] items) {
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE;
tvItem.stateMask = OS.TVIS_SELECTED;
- int /*long*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC);
+ long /*int*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC);
OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc);
if ((style & SWT.VIRTUAL) != 0) {
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
setSelection (hItem, tvItem, items);
} else {
for (int i=0; i DRAG_IMAGE_SIZE) break;
if (rect.bottom > clientRect.bottom) break;
@@ -5906,7 +5906,7 @@ int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*
itemRect.left = Math.max (itemRect.left, clientRect.left);
itemRect.right = Math.min (itemRect.right, clientRect.right);
}
- int /*long*/ rectRgn = OS.CreateRectRgn (itemRect.left, itemRect.top, itemRect.right, itemRect.bottom);
+ long /*int*/ rectRgn = OS.CreateRectRgn (itemRect.left, itemRect.top, itemRect.right, itemRect.bottom);
OS.CombineRgn (hRgn, hRgn, rectRgn, OS.RGN_OR);
OS.DeleteObject (rectRgn);
rect.bottom = itemRect.bottom;
@@ -5915,8 +5915,8 @@ int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*
OS.GetRgnBox (hRgn, rect);
/* Create resources */
- int /*long*/ hdc = OS.GetDC (handle);
- int /*long*/ memHdc = OS.CreateCompatibleDC (hdc);
+ long /*int*/ hdc = OS.GetDC (handle);
+ long /*int*/ memHdc = OS.CreateCompatibleDC (hdc);
BITMAPINFOHEADER bmiHeader = new BITMAPINFOHEADER ();
bmiHeader.biSize = BITMAPINFOHEADER.sizeof;
bmiHeader.biWidth = rect.right - rect.left;
@@ -5926,10 +5926,10 @@ int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*
bmiHeader.biCompression = OS.BI_RGB;
byte [] bmi = new byte [BITMAPINFOHEADER.sizeof];
OS.MoveMemory (bmi, bmiHeader, BITMAPINFOHEADER.sizeof);
- int /*long*/ [] pBits = new int /*long*/ [1];
- int /*long*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
+ long /*int*/ [] pBits = new long /*int*/ [1];
+ long /*int*/ memDib = OS.CreateDIBSection (0, bmi, OS.DIB_RGB_COLORS, pBits, 0, 0);
if (memDib == 0) error (SWT.ERROR_NO_HANDLES);
- int /*long*/ oldMemBitmap = OS.SelectObject (memHdc, memDib);
+ long /*int*/ oldMemBitmap = OS.SelectObject (memHdc, memDib);
int colorKey = 0x0000FD;
POINT pt = new POINT ();
OS.SetWindowOrgEx (memHdc, rect.left, rect.top, pt);
@@ -5960,7 +5960,7 @@ int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*
return super.windowProc (hwnd, msg, wParam, lParam);
}
-LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CHAR (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CHAR (wParam, lParam);
if (result != null) return result;
/*
@@ -5974,7 +5974,7 @@ LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
*/
switch ((int)/*64*/wParam) {
case ' ': {
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
if (hItem != 0) {
hAnchor = hItem;
OS.SendMessage (handle, OS.TVM_ENSUREVISIBLE, 0, hItem);
@@ -5993,7 +5993,7 @@ LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
tvItem.state = state << 12;
OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem);
if (!OS.IsWinCE) {
- int /*long*/ id = hItem;
+ long /*int*/ id = hItem;
if (OS.COMCTL32_MAJOR >= 6) {
id = OS.SendMessage (handle, OS.TVM_MAPHTREEITEMTOACCID, hItem, 0);
}
@@ -6035,7 +6035,7 @@ LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
* using NM_RETURN.
*/
Event event = new Event ();
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
if (hItem != 0) event.item = _getItem (hItem);
sendSelectionEvent (SWT.DefaultSelection, event, false);
return LRESULT.ZERO;
@@ -6046,14 +6046,14 @@ LRESULT WM_CHAR (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ERASEBKGND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
if ((style & SWT.DOUBLE_BUFFERED) != 0) return LRESULT.ONE;
if (findImageControl () != null) return LRESULT.ONE;
return result;
}
-LRESULT WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_GETOBJECT (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Ensure that there is an accessible object created for this
* control because support for checked item and tree column
@@ -6066,7 +6066,7 @@ LRESULT WM_GETOBJECT (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_GETOBJECT (wParam, lParam);
}
-LRESULT WM_HSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_HSCROLL (long /*int*/ wParam, long /*int*/ lParam) {
boolean fixScroll = false;
if ((style & SWT.DOUBLE_BUFFERED) != 0) {
fixScroll = (style & SWT.VIRTUAL) != 0 || hooks (SWT.EraseItem) || hooks (SWT.PaintItem);
@@ -6088,7 +6088,7 @@ LRESULT WM_HSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KEYDOWN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KEYDOWN (wParam, lParam);
if (result != null) return result;
switch ((int)/*64*/wParam) {
@@ -6103,7 +6103,7 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
*/
boolean isRTL = (style & SWT.RIGHT_TO_LEFT) != 0;
if (isRTL != createdAsRTL) {
- int /*long*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam == OS.VK_RIGHT ? OS.VK_LEFT : OS.VK_RIGHT, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam == OS.VK_RIGHT ? OS.VK_LEFT : OS.VK_RIGHT, lParam);
return new LRESULT (code);
}
break;
@@ -6139,17 +6139,17 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
if (itemToolTipHandle != 0) OS.ShowWindow (itemToolTipHandle, OS.SW_HIDE);
if ((style & SWT.SINGLE) != 0) break;
if (OS.GetKeyState (OS.VK_SHIFT) < 0) {
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
if (hItem != 0) {
if (hAnchor == 0) hAnchor = hItem;
ignoreSelect = ignoreDeselect = true;
- int /*long*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam);
ignoreSelect = ignoreDeselect = false;
- int /*long*/ hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE;
tvItem.stateMask = OS.TVIS_SELECTED;
- int /*long*/ hDeselectItem = hItem;
+ long /*int*/ hDeselectItem = hItem;
RECT rect1 = new RECT ();
if (!OS.TreeView_GetItemRect (handle, hAnchor, rect1, false)) {
hAnchor = hItem;
@@ -6163,7 +6163,7 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem);
hDeselectItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, flags, hDeselectItem);
}
- int /*long*/ hSelectItem = hAnchor;
+ long /*int*/ hSelectItem = hAnchor;
OS.TreeView_GetItemRect (handle, hNewItem, rect1, false);
OS.TreeView_GetItemRect (handle, hSelectItem, rect2, false);
tvItem.state = OS.TVIS_SELECTED;
@@ -6185,7 +6185,7 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
}
}
if (OS.GetKeyState (OS.VK_CONTROL) < 0) {
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
if (hItem != 0) {
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE;
@@ -6193,7 +6193,7 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
tvItem.hItem = hItem;
OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem);
boolean oldSelected = (tvItem.state & OS.TVIS_SELECTED) != 0;
- int /*long*/ hNewItem = 0;
+ long /*int*/ hNewItem = 0;
switch ((int)/*64*/wParam) {
case OS.VK_UP:
hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PREVIOUSVISIBLE, hItem);
@@ -6216,7 +6216,7 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
OS.GetClientRect (handle, clientRect);
hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0);
do {
- int /*long*/ hVisible = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hNewItem);
+ long /*int*/ hVisible = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hNewItem);
if (hVisible == 0) break;
if (!OS.TreeView_GetItemRect (handle, hVisible, rect, false)) break;
if (rect.bottom > clientRect.bottom) break;
@@ -6270,7 +6270,7 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
}
}
}
- int /*long*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam);
hAnchor = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
return new LRESULT (code);
}
@@ -6278,7 +6278,7 @@ LRESULT WM_KEYDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
/*
* Bug in Windows. When a tree item that has an image
* with alpha is expanded or collapsed, the area where
@@ -6308,7 +6308,7 @@ LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_KILLFOCUS (wParam, lParam);
}
-LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDBLCLK (long /*int*/ wParam, long /*int*/ lParam) {
TVHITTESTINFO lpht = new TVHITTESTINFO ();
lpht.x = OS.GET_X_LPARAM (lParam);
lpht.y = OS.GET_Y_LPARAM (lParam);
@@ -6343,7 +6343,7 @@ LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
tvItem.state = state << 12;
OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem);
if (!OS.IsWinCE) {
- int /*long*/ id = tvItem.hItem;
+ long /*int*/ id = tvItem.hItem;
if (OS.COMCTL32_MAJOR >= 6) {
id = OS.SendMessage (handle, OS.TVM_MAPHTREEITEMTOACCID, tvItem.hItem, 0);
}
@@ -6380,7 +6380,7 @@ LRESULT WM_LBUTTONDBLCLK (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_LBUTTONDOWN (long /*int*/ wParam, long /*int*/ lParam) {
/*
* In a multi-select tree, if the user is collapsing a subtree that
* contains selected items, clear the selection from these items and
@@ -6402,7 +6402,7 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
return LRESULT.ZERO;
}
boolean fixSelection = false, deselected = false;
- int /*long*/ hOldSelection = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hOldSelection = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
if (lpht.hItem != 0 && (style & SWT.MULTI) != 0) {
if (hOldSelection != 0) {
TVITEM tvItem = new TVITEM ();
@@ -6412,7 +6412,7 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
if ((tvItem.state & OS.TVIS_EXPANDED) != 0) {
fixSelection = true;
tvItem.stateMask = OS.TVIS_SELECTED;
- int /*long*/ hNext = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, lpht.hItem);
+ long /*int*/ hNext = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, lpht.hItem);
while (hNext != 0) {
if (hNext == hAnchor) hAnchor = 0;
tvItem.hItem = hNext;
@@ -6420,7 +6420,7 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
if ((tvItem.state & OS.TVIS_SELECTED) != 0) deselected = true;
tvItem.state = 0;
OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem);
- int /*long*/ hItem = hNext = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hNext);
+ long /*int*/ hItem = hNext = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_NEXTVISIBLE, hNext);
while (hItem != 0 && hItem != lpht.hItem) {
hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, hItem);
}
@@ -6434,7 +6434,7 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
hSelect = lpht.hItem;
ignoreDeselect = ignoreSelect = lockSelection = true;
}
- int /*long*/ code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam);
if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) {
if (OS.GetFocus () != handle) OS.SetFocus (handle);
}
@@ -6442,7 +6442,7 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
hSelect = 0;
ignoreDeselect = ignoreSelect = lockSelection = false;
}
- int /*long*/ hNewSelection = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hNewSelection = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
if (hOldSelection != hNewSelection) hAnchor = hNewSelection;
if (dragStarted) {
if (!display.captureChanged && !isDisposed ()) {
@@ -6463,7 +6463,7 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
if ((bits & OS.TVS_FULLROWSELECT) == 0) {
if (OS.SendMessage (handle, OS.TVM_GETIMAGELIST, OS.TVSIL_NORMAL, 0) == 0) {
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
if (hItem != 0) {
RECT rect = new RECT ();
if (OS.TreeView_GetItemRect (handle, hItem, rect, false)) {
@@ -6510,7 +6510,7 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
tvItem.state = state << 12;
OS.SendMessage (handle, OS.TVM_SETITEM, 0, tvItem);
if (!OS.IsWinCE) {
- int /*long*/ id = tvItem.hItem;
+ long /*int*/ id = tvItem.hItem;
if (OS.COMCTL32_MAJOR >= 6) {
id = OS.SendMessage (handle, OS.TVM_MAPHTREEITEMTOACCID, tvItem.hItem, 0);
}
@@ -6558,7 +6558,7 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
}
return LRESULT.ZERO;
}
- int /*long*/ code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam);
if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) {
if (OS.GetFocus () != handle) OS.SetFocus (handle);
}
@@ -6581,7 +6581,7 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
}
/* Get the selected state of the last selected item */
- int /*long*/ hOldItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hOldItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
if ((style & SWT.MULTI) != 0) {
tvItem.hItem = hOldItem;
OS.SendMessage (handle, OS.TVM_GETITEM, 0, tvItem);
@@ -6634,11 +6634,11 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
hSelect = lpht.hItem;
dragStarted = gestureCompleted = false;
ignoreDeselect = ignoreSelect = true;
- int /*long*/ code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam);
+ long /*int*/ code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam);
if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) {
if (OS.GetFocus () != handle) OS.SetFocus (handle);
}
- int /*long*/ hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hNewItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
if (fakeSelection) {
if (hOldItem == 0 || (hNewItem == hOldItem && lpht.hItem != hOldItem)) {
OS.SendMessage (handle, OS.TVM_SELECTITEM, OS.TVGN_CARET, lpht.hItem);
@@ -6714,10 +6714,10 @@ LRESULT WM_LBUTTONDOWN (int /*long*/ wParam, int /*long*/ lParam) {
if ((wParam & OS.MK_CONTROL) == 0) {
if (!hittestSelected || !dragStarted) {
tvItem.state = 0;
- int /*long*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC);
+ long /*int*/ oldProc = OS.GetWindowLongPtr (handle, OS.GWLP_WNDPROC);
OS.SetWindowLongPtr (handle, OS.GWLP_WNDPROC, TreeProc);
if ((style & SWT.VIRTUAL) != 0) {
- int /*long*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
+ long /*int*/ hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
deselect (hItem, tvItem, hNewItem);
} else {
for (int i=0; i= OS.VERSION (6, 0)) {
- int /*long*/ code = OS.DefWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam);
+ long /*int*/ code = OS.DefWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam);
return code == 0 ? LRESULT.ZERO : new LRESULT (code);
}
return result;
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
if (itemToolTipHandle != 0) OS.ShowWindow (itemToolTipHandle, OS.SW_HIDE);
/*
* Bug in Windows. When TVS_NOHSCROLL is set when the
@@ -7139,7 +7139,7 @@ LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_SIZE (wParam, lParam);
}
-LRESULT WM_SYSCOLORCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SYSCOLORCHANGE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SYSCOLORCHANGE (wParam, lParam);
if (result != null) return result;
/*
@@ -7155,7 +7155,7 @@ LRESULT WM_SYSCOLORCHANGE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_VSCROLL (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_VSCROLL (long /*int*/ wParam, long /*int*/ lParam) {
boolean fixScroll = false;
if ((style & SWT.DOUBLE_BUFFERED) != 0) {
int code = OS.LOWORD (wParam);
@@ -7201,7 +7201,7 @@ LRESULT WM_TIMER (int wParam, int lParam) {
* Note: Just killing the timer could cause some internal clean up task related to the
* animation not to run.
*/
- int /*long*/ bits = OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0);
+ long /*int*/ bits = OS.SendMessage (handle, OS.TVM_GETEXTENDEDSTYLE, 0, 0);
if ((bits & OS.TVS_EX_FADEINOUTEXPANDOS) != 0) {
if (!OS.IsWindowVisible (handle)) {
if (lastTimerID == wParam) {
@@ -7223,7 +7223,7 @@ LRESULT WM_TIMER (int wParam, int lParam) {
return result;
};
-LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmColorChild (long /*int*/ wParam, long /*int*/ lParam) {
if (findImageControl () != null) {
if (OS.COMCTL32_MAJOR < 6) {
return super.wmColorChild (wParam, lParam);
@@ -7240,7 +7240,7 @@ LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT wmNotify (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotify (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
if (hdr.hwndFrom == itemToolTipHandle) {
LRESULT result = wmNotifyToolTip (hdr, wParam, lParam);
if (result != null) return result;
@@ -7252,7 +7252,7 @@ LRESULT wmNotify (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
return super.wmNotify (hdr, wParam, lParam);
}
-LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotifyChild (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
switch (hdr.code) {
case OS.TVN_GETDISPINFOA:
case OS.TVN_GETDISPINFOW: {
@@ -7579,7 +7579,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
* The fix is to detect this case and run the TVN_ITEMEXPANDED
* code in this method.
*/
- int /*long*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, tvItem.hItem);
+ long /*int*/ hFirstItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, tvItem.hItem);
runExpanded = hFirstItem == 0;
}
if (!runExpanded) break;
@@ -7681,7 +7681,7 @@ LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
return super.wmNotifyChild (hdr, wParam, lParam);
}
-LRESULT wmNotifyHeader (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotifyHeader (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. On NT, the automatically created
* header control is created as a UNICODE window, not an
@@ -7883,7 +7883,7 @@ LRESULT wmNotifyHeader (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT wmNotifyToolTip (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNotifyToolTip (NMHDR hdr, long /*int*/ wParam, long /*int*/ lParam) {
if (OS.IsWinCE) return null;
switch (hdr.code) {
case OS.NM_CUSTOMDRAW: {
@@ -7917,7 +7917,7 @@ LRESULT wmNotifyToolTip (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT wmNotifyToolTip (NMTTCUSTOMDRAW nmcd, int /*long*/ lParam) {
+LRESULT wmNotifyToolTip (NMTTCUSTOMDRAW nmcd, long /*int*/ lParam) {
if (OS.IsWinCE) return null;
switch (nmcd.dwDrawStage) {
case OS.CDDS_PREPAINT: {
@@ -7948,10 +7948,10 @@ LRESULT wmNotifyToolTip (NMTTCUSTOMDRAW nmcd, int /*long*/ lParam) {
OS.POINTSTOPOINT (pt, pos);
OS.ScreenToClient (handle, pt);
if (findCell (pt.x, pt.y, item, index, cellRect, itemRect)) {
- int /*long*/ hDC = OS.GetDC (handle);
- int /*long*/ hFont = item [0].fontHandle (index [0]);
+ long /*int*/ hDC = OS.GetDC (handle);
+ long /*int*/ hFont = item [0].fontHandle (index [0]);
if (hFont == -1) hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
- int /*long*/ oldFont = OS.SelectObject (hDC, hFont);
+ long /*int*/ oldFont = OS.SelectObject (hDC, hFont);
boolean drawForeground = true;
cellRect [0] = item [0].getBounds (index [0], true, true, false, false, false, hDC);
if (hooks (SWT.EraseItem)) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java
index f796cc2113..fe90b9fade 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java
@@ -310,7 +310,7 @@ public int getWidth () {
checkWidget ();
int index = parent.indexOf (this);
if (index == -1) return 0;
- int /*long*/ hwndHeader = parent.hwndHeader;
+ long /*int*/ hwndHeader = parent.hwndHeader;
if (hwndHeader == 0) return 0;
HDITEM hdItem = new HDITEM ();
hdItem.mask = OS.HDI_WIDTH;
@@ -334,11 +334,11 @@ public void pack () {
int index = parent.indexOf (this);
if (index == -1) return;
int columnWidth = 0;
- int /*long*/ hwnd = parent.handle, hwndHeader = parent.hwndHeader;
+ long /*int*/ hwnd = parent.handle, hwndHeader = parent.hwndHeader;
RECT headerRect = new RECT ();
OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect);
- int /*long*/ hDC = OS.GetDC (hwnd);
- int /*long*/ oldFont = 0, newFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0);
+ long /*int*/ hDC = OS.GetDC (hwnd);
+ long /*int*/ oldFont = 0, newFont = OS.SendMessage (hwnd, OS.WM_GETFONT, 0, 0);
if (newFont != 0) oldFont = OS.SelectObject (hDC, newFont);
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM | OS.TVIF_STATE;
@@ -354,7 +354,7 @@ public void pack () {
if (isDisposed () || parent.isDisposed ()) break;
itemRight = event.x + event.width;
} else {
- int /*long*/ hFont = item.fontHandle (index);
+ long /*int*/ hFont = item.fontHandle (index);
if (hFont != -1) hFont = OS.SelectObject (hDC, hFont);
RECT itemRect = item.getBounds (index, true, true, false, false, false, hDC);
if (hFont != -1) OS.SelectObject (hDC, hFont);
@@ -483,7 +483,7 @@ public void setAlignment (int alignment) {
if (index == -1 || index == 0) return;
style &= ~(SWT.LEFT | SWT.RIGHT | SWT.CENTER);
style |= alignment & (SWT.LEFT | SWT.RIGHT | SWT.CENTER);
- int /*long*/ hwndHeader = parent.hwndHeader;
+ long /*int*/ hwndHeader = parent.hwndHeader;
if (hwndHeader == 0) return;
HDITEM hdItem = new HDITEM ();
hdItem.mask = OS.HDI_FORMAT;
@@ -494,7 +494,7 @@ public void setAlignment (int alignment) {
if ((style & SWT.RIGHT) == SWT.RIGHT) hdItem.fmt |= OS.HDF_RIGHT;
OS.SendMessage (hwndHeader, OS.HDM_SETITEM, index, hdItem);
if (index != 0) {
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
parent.forceResize ();
RECT rect = new RECT (), headerRect = new RECT ();
OS.GetClientRect (hwnd, rect);
@@ -519,7 +519,7 @@ public void setImage (Image image) {
void setImage (Image image, boolean sort, boolean right) {
int index = parent.indexOf (this);
if (index == -1) return;
- int /*long*/ hwndHeader = parent.hwndHeader;
+ long /*int*/ hwndHeader = parent.hwndHeader;
if (hwndHeader == 0) return;
HDITEM hdItem = new HDITEM ();
hdItem.mask = OS.HDI_FORMAT | OS.HDI_IMAGE | OS.HDI_BITMAP;
@@ -590,7 +590,7 @@ public void setResizable (boolean resizable) {
void setSortDirection (int direction) {
if (OS.COMCTL32_MAJOR >= 6) {
- int /*long*/ hwndHeader = parent.hwndHeader;
+ long /*int*/ hwndHeader = parent.hwndHeader;
if (hwndHeader != 0) {
int index = parent.indexOf (this);
if (index == -1) return;
@@ -621,7 +621,7 @@ void setSortDirection (int direction) {
}
OS.SendMessage (hwndHeader, OS.HDM_SETITEM, index, hdItem);
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
parent.forceResize ();
RECT rect = new RECT (), headerRect = new RECT ();
OS.GetClientRect (hwnd, rect);
@@ -660,17 +660,17 @@ public void setText (String string) {
* with spaces.
*/
boolean replace = !OS.IsWinCE && OS.WIN32_VERSION <= OS.VERSION (4, 10);
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
TCHAR buffer = new TCHAR (parent.getCodePage (), fixMnemonic (string, replace), true);
int byteCount = buffer.length () * TCHAR.sizeof;
- int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (pszText, buffer, byteCount);
- int /*long*/ hwndHeader = parent.hwndHeader;
+ long /*int*/ hwndHeader = parent.hwndHeader;
if (hwndHeader == 0) return;
HDITEM hdItem = new HDITEM ();
hdItem.mask = OS.HDI_TEXT;
hdItem.pszText = pszText;
- int /*long*/ result = OS.SendMessage (hwndHeader, OS.HDM_SETITEM, index, hdItem);
+ long /*int*/ result = OS.SendMessage (hwndHeader, OS.HDM_SETITEM, index, hdItem);
if (pszText != 0) OS.HeapFree (hHeap, 0, pszText);
if (result == 0) error (SWT.ERROR_CANNOT_SET_TEXT);
}
@@ -700,7 +700,7 @@ public void setText (String string) {
public void setToolTipText (String string) {
checkWidget();
toolTipText = string;
- int /*long*/ hwndHeaderToolTip = parent.headerToolTipHandle;
+ long /*int*/ hwndHeaderToolTip = parent.headerToolTipHandle;
if (hwndHeaderToolTip == 0) {
parent.createHeaderToolTips ();
parent.updateHeaderToolTips ();
@@ -722,7 +722,7 @@ public void setWidth (int width) {
if (width < 0) return;
int index = parent.indexOf (this);
if (index == -1) return;
- int /*long*/ hwndHeader = parent.hwndHeader;
+ long /*int*/ hwndHeader = parent.hwndHeader;
if (hwndHeader == 0) return;
HDITEM hdItem = new HDITEM ();
hdItem.mask = OS.HDI_WIDTH;
@@ -731,7 +731,7 @@ public void setWidth (int width) {
RECT headerRect = new RECT ();
OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, headerRect);
parent.forceResize ();
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
RECT rect = new RECT ();
OS.GetClientRect (hwnd, rect);
rect.left = headerRect.left;
@@ -740,9 +740,9 @@ public void setWidth (int width) {
}
void updateToolTip (int index) {
- int /*long*/ hwndHeaderToolTip = parent.headerToolTipHandle;
+ long /*int*/ hwndHeaderToolTip = parent.headerToolTipHandle;
if (hwndHeaderToolTip != 0) {
- int /*long*/ hwndHeader = parent.hwndHeader;
+ long /*int*/ hwndHeader = parent.hwndHeader;
RECT rect = new RECT ();
if (OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, index, rect) != 0) {
TOOLINFO lpti = new TOOLINFO ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java
index b781d611d9..671802bfe2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java
@@ -47,7 +47,7 @@ public class TreeItem extends Item {
*
* @noreference This field is not intended to be referenced by clients.
*/
- public int /*long*/ handle;
+ public long /*int*/ handle;
Tree parent;
String [] strings;
Image [] images;
@@ -197,7 +197,7 @@ public TreeItem (TreeItem parentItem, int style, int index) {
this (checkNull (parentItem).parent, style, parentItem.handle, findPrevious (parentItem, index), 0);
}
-TreeItem (Tree parent, int style, int /*long*/ hParent, int /*long*/ hInsertAfter, int /*long*/ hItem) {
+TreeItem (Tree parent, int style, long /*int*/ hParent, long /*int*/ hInsertAfter, long /*int*/ hItem) {
super (parent, style);
this.parent = parent;
parent.createItem (this, hParent, hInsertAfter, hItem);
@@ -208,25 +208,25 @@ static TreeItem checkNull (TreeItem item) {
return item;
}
-static int /*long*/ findPrevious (Tree parent, int index) {
+static long /*int*/ findPrevious (Tree parent, int index) {
if (parent == null) return 0;
if (index < 0) SWT.error (SWT.ERROR_INVALID_RANGE);
if (index == 0) return OS.TVI_FIRST;
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
- int /*long*/ hItem = parent.findItem (hFirstItem, index - 1);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_ROOT, 0);
+ long /*int*/ hItem = parent.findItem (hFirstItem, index - 1);
if (hItem == 0) SWT.error (SWT.ERROR_INVALID_RANGE);
return hItem;
}
-static int /*long*/ findPrevious (TreeItem parentItem, int index) {
+static long /*int*/ findPrevious (TreeItem parentItem, int index) {
if (parentItem == null) return 0;
if (index < 0) SWT.error (SWT.ERROR_INVALID_RANGE);
if (index == 0) return OS.TVI_FIRST;
Tree parent = parentItem.parent;
- int /*long*/ hwnd = parent.handle, hParent = parentItem.handle;
- int /*long*/ hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hParent);
- int /*long*/ hItem = parent.findItem (hFirstItem, index - 1);
+ long /*int*/ hwnd = parent.handle, hParent = parentItem.handle;
+ long /*int*/ hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, hParent);
+ long /*int*/ hItem = parent.findItem (hFirstItem, index - 1);
if (hItem == 0) SWT.error (SWT.ERROR_INVALID_RANGE);
return hItem;
}
@@ -241,7 +241,7 @@ void clear () {
strings = null;
images = null;
if ((parent.style & SWT.CHECK) != 0) {
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE;
tvItem.stateMask = OS.TVIS_STATEIMAGEMASK;
@@ -281,8 +281,8 @@ void clear () {
*/
public void clear (int index, boolean all) {
checkWidget ();
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle);
if (hItem == 0) error (SWT.ERROR_INVALID_RANGE);
hItem = parent.findItem (hItem, index);
if (hItem == 0) error (SWT.ERROR_INVALID_RANGE);
@@ -316,8 +316,8 @@ public void clear (int index, boolean all) {
*/
public void clearAll (boolean all) {
checkWidget ();
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle);
if (hItem == 0) return;
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM;
@@ -332,7 +332,7 @@ void destroyWidget () {
releaseHandle ();
}
-int /*long*/ fontHandle (int index) {
+long /*int*/ fontHandle (int index) {
if (cellFont != null && cellFont [index] != null) return cellFont [index].handle;
if (font != null) return font.handle;
return -1;
@@ -426,9 +426,9 @@ RECT getBounds (int index, boolean getText, boolean getImage, boolean fullText)
}
//TODO - take into account grid (add boolean arg) to damage less during redraw
-RECT getBounds (int index, boolean getText, boolean getImage, boolean fullText, boolean fullImage, boolean clip, int /*long*/ hDC) {
+RECT getBounds (int index, boolean getText, boolean getImage, boolean fullText, boolean fullImage, boolean clip, long /*int*/ hDC) {
if (!getText && !getImage) return new RECT ();
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
if ((parent.style & SWT.VIRTUAL) == 0 && !cached && !parent.painted) {
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_TEXT;
@@ -440,7 +440,7 @@ RECT getBounds (int index, boolean getText, boolean getImage, boolean fullText,
}
boolean firstColumn = index == 0;
int columnCount = 0;
- int /*long*/ hwndHeader = parent.hwndHeader;
+ long /*int*/ hwndHeader = parent.hwndHeader;
if (hwndHeader != 0) {
columnCount = parent.columnCount;
firstColumn = index == OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0);
@@ -512,7 +512,7 @@ RECT getBounds (int index, boolean getText, boolean getImage, boolean fullText,
RECT textRect = new RECT ();
TCHAR buffer = new TCHAR (parent.getCodePage (), string, false);
int flags = OS.DT_NOPREFIX | OS.DT_SINGLELINE | OS.DT_CALCRECT;
- int /*long*/ hNewDC = hDC, hFont = 0;
+ long /*int*/ hNewDC = hDC, hFont = 0;
if (hDC == 0) {
hNewDC = OS.GetDC (hwnd);
hFont = fontHandle (index);
@@ -563,12 +563,12 @@ public boolean getChecked () {
checkWidget ();
if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED);
if ((parent.style & SWT.CHECK) == 0) return false;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE;
tvItem.stateMask = OS.TVIS_STATEIMAGEMASK;
tvItem.hItem = handle;
- int /*long*/ result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem);
+ long /*int*/ result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem);
return (result != 0) && (((tvItem.state >> 12) & 1) == 0);
}
@@ -586,7 +586,7 @@ public boolean getChecked () {
*/
public boolean getExpanded () {
checkWidget ();
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
int state = 0;
if (OS.IsWinCE) {
TVITEM tvItem = new TVITEM ();
@@ -707,12 +707,12 @@ public boolean getGrayed () {
checkWidget ();
if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED);
if ((parent.style & SWT.CHECK) == 0) return false;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE;
tvItem.stateMask = OS.TVIS_STATEIMAGEMASK;
tvItem.hItem = handle;
- int /*long*/ result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem);
+ long /*int*/ result = OS.SendMessage (hwnd, OS.TVM_GETITEM, 0, tvItem);
return (result != 0) && ((tvItem.state >> 12) > 2);
}
@@ -737,10 +737,10 @@ public TreeItem getItem (int index) {
checkWidget ();
if (index < 0) error (SWT.ERROR_INVALID_RANGE);
if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED);
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hFirstItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle);
if (hFirstItem == 0) error (SWT.ERROR_INVALID_RANGE);
- int /*long*/ hItem = parent.findItem (hFirstItem, index);
+ long /*int*/ hItem = parent.findItem (hFirstItem, index);
if (hItem == 0) error (SWT.ERROR_INVALID_RANGE);
return parent._getItem (hItem);
}
@@ -759,8 +759,8 @@ public TreeItem getItem (int index) {
public int getItemCount () {
checkWidget ();
if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED);
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle);
if (hItem == 0) return 0;
return parent.getItemCount (hItem);
}
@@ -784,8 +784,8 @@ public int getItemCount () {
public TreeItem [] getItems () {
checkWidget ();
if (!parent.checkData (this, true)) error (SWT.ERROR_WIDGET_DISPOSED);
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle);
if (hItem == 0) return new TreeItem [0];
return parent.getItems (hItem);
}
@@ -872,8 +872,8 @@ public Tree getParent () {
*/
public TreeItem getParentItem () {
checkWidget ();
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, handle);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_PARENT, handle);
return hItem != 0 ? parent._getItem (hItem) : null;
}
@@ -961,14 +961,14 @@ public int indexOf (TreeItem item) {
checkWidget ();
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle);
return hItem == 0 ? -1 : parent.findIndex (hItem, item.handle);
}
void redraw () {
if (parent.currentItem == this || !parent.getDrawing ()) return;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
if (!OS.IsWindowVisible (hwnd)) return;
/*
* When there are no columns and the tree is not
@@ -992,7 +992,7 @@ void redraw () {
void redraw (int column, boolean drawText, boolean drawImage) {
if (parent.currentItem == this || !parent.getDrawing ()) return;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
if (!OS.IsWindowVisible (hwnd)) return;
boolean fullImage = column == 0 && drawText && drawImage;
RECT rect = getBounds (column, drawText, drawImage, true, fullImage, true, 0);
@@ -1034,7 +1034,7 @@ void releaseWidget () {
*/
public void removeAll () {
checkWidget ();
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_PARAM;
tvItem.hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle);
@@ -1142,7 +1142,7 @@ public void setBackground (int index, Color color) {
public void setChecked (boolean checked) {
checkWidget ();
if ((parent.style & SWT.CHECK) == 0) return;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE;
tvItem.stateMask = OS.TVIS_STATEIMAGEMASK;
@@ -1190,7 +1190,7 @@ public void setExpanded (boolean expanded) {
checkWidget ();
/* Do nothing when the item is a leaf or already expanded */
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
if (OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle) == 0) {
return;
}
@@ -1229,9 +1229,9 @@ public void setExpanded (boolean expanded) {
RECT [] rects = null;
SCROLLINFO oldInfo = null;
int count = 0;
- int /*long*/ hBottomItem = 0;
+ long /*int*/ hBottomItem = 0;
boolean redraw = false, noScroll = true;
- int /*long*/ hTopItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0);
+ long /*int*/ hTopItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_FIRSTVISIBLE, 0);
if (noScroll && hTopItem != 0) {
oldInfo = new SCROLLINFO ();
oldInfo.cbSize = SCROLLINFO.sizeof;
@@ -1243,7 +1243,7 @@ public void setExpanded (boolean expanded) {
boolean noAnimate = true;
count = (int)/*64*/OS.SendMessage (hwnd, OS.TVM_GETVISIBLECOUNT, 0, 0);
rects = new RECT [count + 1];
- int /*long*/ hItem = hTopItem;
+ long /*int*/ hItem = hTopItem;
int index = 0;
while (hItem != 0 && (noAnimate || hItem != handle) && index < count) {
RECT rect = new RECT ();
@@ -1258,7 +1258,7 @@ public void setExpanded (boolean expanded) {
hBottomItem = hItem;
oldRect = new RECT ();
OS.GetClientRect (hwnd, oldRect);
- int /*long*/ topHandle = parent.topHandle ();
+ long /*int*/ topHandle = parent.topHandle ();
OS.UpdateWindow (topHandle);
OS.DefWindowProc (topHandle, OS.WM_SETREDRAW, 0, 0);
if (hwnd != topHandle) {
@@ -1285,7 +1285,7 @@ public void setExpanded (boolean expanded) {
* check whether the selection has changed and issue
* the event.
*/
- int /*long*/ hOldItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hOldItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
/* Expand or collapse the item */
parent.ignoreExpand = true;
@@ -1313,7 +1313,7 @@ public void setExpanded (boolean expanded) {
newInfo.fMask = OS.SIF_ALL;
if (OS.GetScrollInfo (hwnd, OS.SB_HORZ, newInfo)) {
if (oldInfo.nPos != newInfo.nPos) {
- int /*long*/ lParam = OS.MAKELPARAM (OS.SB_THUMBPOSITION, oldInfo.nPos);
+ long /*int*/ lParam = OS.MAKELPARAM (OS.SB_THUMBPOSITION, oldInfo.nPos);
OS.SendMessage (hwnd, OS.WM_HSCROLL, lParam, 0);
}
}
@@ -1324,7 +1324,7 @@ public void setExpanded (boolean expanded) {
RECT newRect = new RECT ();
OS.GetClientRect (hwnd, newRect);
if (OS.EqualRect (oldRect, newRect)) {
- int /*long*/ hItem = hTopItem;
+ long /*int*/ hItem = hTopItem;
int index = 0;
while (hItem != 0 && index < count) {
RECT rect = new RECT ();
@@ -1339,7 +1339,7 @@ public void setExpanded (boolean expanded) {
fixScroll = index == count && hItem == hBottomItem;
}
}
- int /*long*/ topHandle = parent.topHandle ();
+ long /*int*/ topHandle = parent.topHandle ();
OS.DefWindowProc (topHandle, OS.WM_SETREDRAW, 1, 0);
if (hwnd != topHandle) {
OS.DefWindowProc (hwnd, OS.WM_SETREDRAW, 1, 0);
@@ -1375,7 +1375,7 @@ public void setExpanded (boolean expanded) {
}
/* Check for a selection event */
- int /*long*/ hNewItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
+ long /*int*/ hNewItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
if (hNewItem != hOldItem) {
Event event = new Event ();
if (hNewItem != 0) {
@@ -1423,7 +1423,7 @@ public void setFont (Font font){
if ((parent.style & SWT.VIRTUAL) == 0 && !cached && !parent.painted) {
return;
}
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_TEXT;
tvItem.hItem = handle;
@@ -1478,7 +1478,7 @@ public void setFont (int index, Font font) {
if ((parent.style & SWT.VIRTUAL) == 0 && !cached && !parent.painted) {
return;
}
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_TEXT;
tvItem.hItem = handle;
@@ -1580,7 +1580,7 @@ public void setForeground (int index, Color color){
public void setGrayed (boolean grayed) {
checkWidget ();
if ((parent.style & SWT.CHECK) == 0) return;
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_STATE;
tvItem.stateMask = OS.TVIS_STATEIMAGEMASK;
@@ -1689,7 +1689,7 @@ public void setImage (int index, Image image) {
if ((parent.style & SWT.VIRTUAL) == 0 &&!cached && !parent.painted) {
return;
}
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_IMAGE | OS.TVIF_SELECTEDIMAGE;
tvItem.hItem = handle;
@@ -1729,8 +1729,8 @@ public void setImage (Image image) {
public void setItemCount (int count) {
checkWidget ();
count = Math.max (0, count);
- int /*long*/ hwnd = parent.handle;
- int /*long*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle);
+ long /*int*/ hwnd = parent.handle;
+ long /*int*/ hItem = OS.SendMessage (hwnd, OS.TVM_GETNEXTITEM, OS.TVGN_CHILD, handle);
parent.setItemCount (count, handle, hItem);
}
@@ -1796,7 +1796,7 @@ public void setText (int index, String string) {
if ((parent.style & SWT.VIRTUAL) == 0 && !cached && !parent.painted) {
return;
}
- int /*long*/ hwnd = parent.handle;
+ long /*int*/ hwnd = parent.handle;
TVITEM tvItem = new TVITEM ();
tvItem.mask = OS.TVIF_HANDLE | OS.TVIF_TEXT;
tvItem.hItem = handle;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java
index 1d163f08f9..723256bc8c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java
@@ -213,7 +213,7 @@ public void addDisposeListener (DisposeListener listener) {
addListener (SWT.Dispose, typedListener);
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
return 0;
}
@@ -385,7 +385,7 @@ void destroyWidget () {
releaseHandle ();
}
-int /*long*/ DeferWindowPos(int /*long*/ hWinPosInfo, int /*long*/ hWnd, int /*long*/ hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags){
+long /*int*/ DeferWindowPos(long /*int*/ hWinPosInfo, long /*int*/ hWnd, long /*int*/ hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags){
if (OS.IsWinCE) {
/*
* Feature in Windows. On Windows CE, DeferWindowPos always causes
@@ -446,7 +446,7 @@ public void dispose () {
release (true);
}
-boolean dragDetect (int /*long*/ hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) {
+boolean dragDetect (long /*int*/ hwnd, int x, int y, boolean filter, boolean [] detect, boolean [] consume) {
if (consume != null) consume [0] = false;
if (detect != null) detect [0] = true;
POINT pt = new POINT ();
@@ -472,7 +472,7 @@ boolean filters (int eventType) {
return display.filters (eventType);
}
-Widget findItem (int /*long*/ id) {
+Widget findItem (long /*int*/ id) {
return null;
}
@@ -741,7 +741,7 @@ boolean isValidThread () {
return getDisplay ().isValidThread ();
}
-void mapEvent (int /*long*/ hwnd, Event event) {
+void mapEvent (long /*int*/ hwnd, Event event) {
}
GC new_GC (GCData data) {
@@ -1094,23 +1094,23 @@ void sendSelectionEvent (int type, Event event, boolean send) {
sendEvent (type, event, send);
}
-boolean sendKeyEvent (int type, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lParam) {
Event event = new Event ();
if (!setKeyState (event, type, wParam, lParam)) return true;
return sendKeyEvent (type, msg, wParam, lParam, event);
}
-boolean sendKeyEvent (int type, int msg, int /*long*/ wParam, int /*long*/ lParam, Event event) {
+boolean sendKeyEvent (int type, int msg, long /*int*/ wParam, long /*int*/ lParam, Event event) {
sendEvent (type, event);
if (isDisposed ()) return false;
return event.doit;
}
-boolean sendMouseEvent (int type, int button, int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+boolean sendMouseEvent (int type, int button, long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
return sendMouseEvent (type, button, display.getClickCount (type, button, hwnd, lParam), 0, false, hwnd, msg, wParam, lParam);
}
-boolean sendMouseEvent (int type, int button, int count, int detail, boolean send, int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+boolean sendMouseEvent (int type, int button, int count, int detail, boolean send, long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (!hooks (type) && !filters (type)) return true;
Event event = new Event ();
event.button = button;
@@ -1129,7 +1129,7 @@ boolean sendMouseEvent (int type, int button, int count, int detail, boolean sen
return event.doit;
}
-boolean sendMouseWheelEvent (int type, int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+boolean sendMouseWheelEvent (int type, long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
int delta = OS.GET_WHEEL_DELTA_WPARAM (wParam);
int detail = 0;
if (type == SWT.MouseWheel) {
@@ -1316,7 +1316,7 @@ boolean setInputState (Event event, int type) {
return true;
}
-boolean setKeyState (Event event, int type, int /*long*/ wParam, int /*long*/ lParam) {
+boolean setKeyState (Event event, int type, long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When the user presses Ctrl+Backspace
@@ -1380,7 +1380,7 @@ boolean setKeyState (Event event, int type, int /*long*/ wParam, int /*long*/ lP
return setInputState (event, type);
}
-int setLocationMask (Event event, int type, int /*long*/ wParam, int /*long*/ lParam) {
+int setLocationMask (Event event, int type, long /*int*/ wParam, long /*int*/ lParam) {
int location = SWT.NONE;
if (display.lastVirtual) {
switch (display.lastKey) {
@@ -1430,7 +1430,7 @@ boolean setTabItemFocus () {
return false;
}
-boolean SetWindowPos (int /*long*/ hWnd, int /*long*/ hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags) {
+boolean SetWindowPos (long /*int*/ hWnd, long /*int*/ hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags) {
if (OS.IsWinCE) {
/*
* Feature in Windows. On Windows CE, SetWindowPos() always causes
@@ -1503,12 +1503,12 @@ void updateMenuLocation (Event event) {
/* Do nothing */
}
-LRESULT wmCaptureChanged (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmCaptureChanged (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
display.captureChanged = true;
return null;
}
-LRESULT wmChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
/*
* Do not report a lead byte as a key pressed.
*/
@@ -1525,7 +1525,7 @@ LRESULT wmChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT wmContextMenu (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmContextMenu (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
if (wParam != hwnd) return null;
/*
@@ -1574,7 +1574,7 @@ LRESULT wmContextMenu (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lPar
return showMenu (x, y, detail) ? LRESULT.ZERO : null;
}
-LRESULT wmIMEChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmIMEChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
Display display = this.display;
display.lastKey = 0;
display.lastAscii = (int)/*64*/wParam;
@@ -1588,7 +1588,7 @@ LRESULT wmIMEChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam)
return LRESULT.ONE;
}
-LRESULT wmKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
/* Ignore repeating modifier keys by testing key down state */
switch ((int)/*64*/wParam) {
@@ -1827,7 +1827,7 @@ LRESULT wmKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam)
return null;
}
-LRESULT wmKeyUp (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmKeyUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
Display display = this.display;
/* Check for hardware keys */
@@ -1929,9 +1929,9 @@ LRESULT wmKeyUp (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT wmKillFocus (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmKillFocus (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
display.scrollRemainder = display.scrollHRemainder = 0;
- int /*long*/ code = callWindowProc (hwnd, OS.WM_KILLFOCUS, wParam, lParam);
+ long /*int*/ code = callWindowProc (hwnd, OS.WM_KILLFOCUS, wParam, lParam);
sendFocusEvent (SWT.FocusOut);
// widget could be disposed at this point
@@ -1947,7 +1947,7 @@ LRESULT wmKillFocus (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam
return new LRESULT (code);
}
-LRESULT wmLButtonDblClk (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmLButtonDblClk (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. Windows sends the following
* messages when the user double clicks the mouse:
@@ -1976,7 +1976,7 @@ LRESULT wmLButtonDblClk (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lP
return result;
}
-LRESULT wmLButtonDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmLButtonDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
Display display = this.display;
LRESULT result = null;
int x = OS.GET_X_LPARAM (lParam);
@@ -2064,7 +2064,7 @@ LRESULT wmLButtonDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lPar
return result;
}
-LRESULT wmLButtonUp (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmLButtonUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
Display display = this.display;
LRESULT result = null;
if (sendMouseEvent (SWT.MouseUp, 1, hwnd, OS.WM_LBUTTONUP, wParam, lParam)) {
@@ -2086,7 +2086,7 @@ LRESULT wmLButtonUp (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam
return result;
}
-LRESULT wmMButtonDblClk (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmMButtonDblClk (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. Windows sends the following
* messages when the user double clicks the mouse:
@@ -2115,7 +2115,7 @@ LRESULT wmMButtonDblClk (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lP
return result;
}
-LRESULT wmMButtonDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmMButtonDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = null;
Display display = this.display;
display.captureChanged = false;
@@ -2130,7 +2130,7 @@ LRESULT wmMButtonDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lPar
return result;
}
-LRESULT wmMButtonUp (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmMButtonUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
Display display = this.display;
LRESULT result = null;
if (sendMouseEvent (SWT.MouseUp, 2, hwnd, OS.WM_MBUTTONUP, wParam, lParam)) {
@@ -2152,14 +2152,14 @@ LRESULT wmMButtonUp (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam
return result;
}
-LRESULT wmMouseHover (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmMouseHover (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
if (!sendMouseEvent (SWT.MouseHover, 0, hwnd, OS.WM_MOUSEHOVER, wParam, lParam)) {
return LRESULT.ZERO;
}
return null;
}
-LRESULT wmMouseLeave (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmMouseLeave (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
if (!hooks (SWT.MouseExit) && !filters (SWT.MouseExit)) return null;
int pos = OS.GetMessagePos ();
POINT pt = new POINT ();
@@ -2172,7 +2172,7 @@ LRESULT wmMouseLeave (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lPara
return null;
}
-LRESULT wmMouseMove (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmMouseMove (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = null;
Display display = this.display;
int pos = OS.GetMessagePos ();
@@ -2224,19 +2224,19 @@ LRESULT wmMouseMove (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam
return result;
}
-LRESULT wmMouseWheel (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmMouseWheel (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
return sendMouseWheelEvent(SWT.MouseWheel, hwnd, wParam, lParam) ? null : LRESULT.ZERO;
}
-LRESULT wmMouseHWheel (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmMouseHWheel (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
return sendMouseWheelEvent(SWT.MouseHorizontalWheel, hwnd, wParam, lParam) ? null : LRESULT.ZERO;
}
-LRESULT wmNCPaint (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmNCPaint (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
return null;
}
-LRESULT wmPaint (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmPaint (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
/* Exit early - don't draw the background */
if (!hooks (SWT.Paint) && !filters (SWT.Paint)) {
@@ -2244,7 +2244,7 @@ LRESULT wmPaint (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
}
/* Issue a paint event */
- int /*long*/ result = 0;
+ long /*int*/ result = 0;
if (OS.IsWinCE) {
RECT rect = new RECT ();
OS.GetUpdateRect (hwnd, rect, false);
@@ -2282,7 +2282,7 @@ LRESULT wmPaint (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
gc.dispose ();
}
} else {
- int /*long*/ rgn = OS.CreateRectRgn (0, 0, 0, 0);
+ long /*int*/ rgn = OS.CreateRectRgn (0, 0, 0, 0);
OS.GetUpdateRgn (hwnd, rgn, false);
result = callWindowProc (hwnd, OS.WM_PAINT, wParam, lParam);
GCData data = new GCData ();
@@ -2295,7 +2295,7 @@ LRESULT wmPaint (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
int width = rect.right - rect.left;
int height = rect.bottom - rect.top;
if (width != 0 && height != 0) {
- int /*long*/ hDC = gc.handle;
+ long /*int*/ hDC = gc.handle;
OS.SelectClipRgn (hDC, rgn);
OS.SetMetaRgn (hDC);
Event event = new Event ();
@@ -2317,7 +2317,7 @@ LRESULT wmPaint (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
return new LRESULT (result);
}
-LRESULT wmPrint (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmPrint (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
/*
* Bug in Windows. When WM_PRINT is used to print the contents
* of a control that has WS_EX_CLIENTEDGE, the old 3D border is
@@ -2328,7 +2328,7 @@ LRESULT wmPrint (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
int bits = OS.GetWindowLong (hwnd, OS.GWL_EXSTYLE);
if ((bits & OS.WS_EX_CLIENTEDGE) != 0) {
- int /*long*/ code = callWindowProc (hwnd, OS.WM_PRINT, wParam, lParam);
+ long /*int*/ code = callWindowProc (hwnd, OS.WM_PRINT, wParam, lParam);
RECT rect = new RECT ();
OS.GetWindowRect (hwnd, rect);
rect.right -= rect.left;
@@ -2344,7 +2344,7 @@ LRESULT wmPrint (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
return null;
}
-LRESULT wmRButtonDblClk (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmRButtonDblClk (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. Windows sends the following
* messages when the user double clicks the mouse:
@@ -2373,7 +2373,7 @@ LRESULT wmRButtonDblClk (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lP
return result;
}
-LRESULT wmRButtonDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmRButtonDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = null;
Display display = this.display;
display.captureChanged = false;
@@ -2388,7 +2388,7 @@ LRESULT wmRButtonDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lPar
return result;
}
-LRESULT wmRButtonUp (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmRButtonUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
Display display = this.display;
LRESULT result = null;
if (sendMouseEvent (SWT.MouseUp, 3, hwnd, OS.WM_RBUTTONUP, wParam, lParam)) {
@@ -2412,8 +2412,8 @@ LRESULT wmRButtonUp (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam
return result;
}
-LRESULT wmSetFocus (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
- int /*long*/ code = callWindowProc (hwnd, OS.WM_SETFOCUS, wParam, lParam);
+LRESULT wmSetFocus (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
+ long /*int*/ code = callWindowProc (hwnd, OS.WM_SETFOCUS, wParam, lParam);
sendFocusEvent (SWT.FocusIn);
// widget could be disposed at this point
@@ -2429,7 +2429,7 @@ LRESULT wmSetFocus (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam)
return new LRESULT (code);
}
-LRESULT wmSysChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmSysChar (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
Display display = this.display;
display.lastAscii = (int)/*64*/wParam;
display.lastNull = wParam == 0;
@@ -2442,7 +2442,7 @@ LRESULT wmSysChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam)
/* Call the window proc to determine whether it is a system key or mnemonic */
boolean oldKeyHit = display.mnemonicKeyHit;
display.mnemonicKeyHit = true;
- int /*long*/ result = callWindowProc (hwnd, OS.WM_SYSCHAR, wParam, lParam);
+ long /*int*/ result = callWindowProc (hwnd, OS.WM_SYSCHAR, wParam, lParam);
boolean consumed = false;
if (!display.mnemonicKeyHit) {
consumed = !sendKeyEvent (SWT.KeyDown, OS.WM_SYSCHAR, wParam, lParam);
@@ -2453,7 +2453,7 @@ LRESULT wmSysChar (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam)
return consumed ? LRESULT.ONE : new LRESULT (result);
}
-LRESULT wmSysKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmSysKeyDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. When WM_SYSKEYDOWN is sent,
* the user pressed ALT+ or F10 to get to the
@@ -2470,7 +2470,7 @@ LRESULT wmSysKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lPara
/* Ignore well known system keys */
switch ((int)/*64*/wParam) {
case OS.VK_F4: {
- int /*long*/ hwndShell = hwnd;
+ long /*int*/ hwndShell = hwnd;
while (OS.GetParent (hwndShell) != 0) {
if (OS.GetWindow (hwndShell, OS.GW_OWNER) != 0) break;
hwndShell = OS.GetParent (hwndShell);
@@ -2576,11 +2576,11 @@ LRESULT wmSysKeyDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lPara
return null;
}
-LRESULT wmSysKeyUp (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmSysKeyUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
return wmKeyUp (hwnd, wParam, lParam);
}
-LRESULT wmXButtonDblClk (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmXButtonDblClk (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
/*
* Feature in Windows. Windows sends the following
* messages when the user double clicks the mouse:
@@ -2610,7 +2610,7 @@ LRESULT wmXButtonDblClk (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lP
return result;
}
-LRESULT wmXButtonDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmXButtonDown (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = null;
Display display = this.display;
display.captureChanged = false;
@@ -2627,7 +2627,7 @@ LRESULT wmXButtonDown (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lPar
return result;
}
-LRESULT wmXButtonUp (int /*long*/ hwnd, int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT wmXButtonUp (long /*int*/ hwnd, long /*int*/ wParam, long /*int*/ lParam) {
Display display = this.display;
LRESULT result = null;
int button = OS.HIWORD (wParam) == OS.XBUTTON1 ? 4 : 5;
diff --git a/bundles/org.eclipse.swt/buildFragment.xml b/bundles/org.eclipse.swt/buildFragment.xml
index 6779396048..f02d74464f 100644
--- a/bundles/org.eclipse.swt/buildFragment.xml
+++ b/bundles/org.eclipse.swt/buildFragment.xml
@@ -428,12 +428,12 @@
Is64=${is64}
-
- Converting java files to 64 bit
-
-
-
-
+
+ Converting java files to 32 bit
+
+
+
+
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml
index f477ae10a3..1c90f65041 100644
--- a/bundles/org.eclipse.swt/buildSWT.xml
+++ b/bundles/org.eclipse.swt/buildSWT.xml
@@ -480,8 +480,8 @@
-
-
+
+
--
cgit v1.2.3